Support ATTR_HTML above source and example blocks

Ref https://github.com/kaushalmodi/ox-hugo/issues/113

ox-blackfriday.el

@@ -360,22 +360,23 @@ CONTENTS is nil.  INFO is a plist holding contextual
 information."
   (let* ((parent-element (org-export-get-parent example-block))
          (parent-type (car parent-element))
-         (backticks (make-string org-blackfriday--code-block-num-backticks ?`)))
+         (backticks (make-string org-blackfriday--code-block-num-backticks ?`))
+         ret)
     ;; (message "[ox-bf example-block DBG]")
     ;; (message "[ox-bf example-block DBG] parent type: %S" parent-type)
-    (prog1
-        (format "%stext\n%s%s"
-                backticks
-                (org-export-format-code-default example-block info)
-                backticks)
-      (when (equal 'quote-block parent-type)
-        ;; If the current example block is inside a quote block,
-        ;; future example/code blocks (especially the ones outside
-        ;; this quote block) will require higher number of backticks.
-        ;; Workaround for
-        ;; https://github.com/russross/blackfriday/issues/407.
-        (setq org-blackfriday--code-block-num-backticks
-              (1+ org-blackfriday--code-block-num-backticks))))))
+    (setq ret (format "%stext\n%s%s"
+                      backticks
+                      (org-export-format-code-default example-block info)
+                      backticks))
+    (setq ret (org-blackfriday--div-wrap-maybe example-block ret))
+    (when (equal 'quote-block parent-type)
+      ;; If the current example block is inside a quote block, future
+      ;; example/code blocks (especially the ones outside this quote
+      ;; block) will require higher number of backticks.  Workaround
+      ;; for https://github.com/russross/blackfriday/issues/407.
+      (setq org-blackfriday--code-block-num-backticks
+            (1+ org-blackfriday--code-block-num-backticks)))
+    ret))
 
 ;;;; Fixed Width
 (defun org-blackfriday-fixed-width (fixed-width _contents info)

ox-hugo.el

@@ -969,11 +969,12 @@ created.
 
 CONTENTS is nil.  INFO is a plist holding contextual
 information."
-  (let ((text (org-export-format-code-default example-block info))
-        ;; See `org-element-example-block-parser' for all EXAMPLE-BLOCK properties.
-        (number-lines (org-element-property :number-lines example-block))) ;Non-nil if -n or +n switch is used
+  (let (;; See `org-element-example-block-parser' for all EXAMPLE-BLOCK properties.
+        (number-lines (org-element-property :number-lines example-block)) ;Non-nil if -n or +n switch is used
+        ret)
     (if number-lines
-        (let* ((linenostart-str (progn
+        (let* ((text (org-export-format-code-default example-block info))
+               (linenostart-str (progn
                                   ;; Extract the start line number of the example block.
                                   (string-match "\\`\\([0-9]+\\)\\s-\\{2\\}" text)
                                   (match-string-no-properties 1 text)))
@@ -982,8 +983,10 @@ information."
           ;; line as the Hugo highlight shortcode will be used instead
           ;; of literally inserting the line numbers.
           (setq text (replace-regexp-in-string "^[0-9]+\\s-\\{2\\}" "" text))
-          (format "{{< highlight text %s>}}\n%s{{< /highlight >}}\n" linenos-str text))
-      (org-blackfriday-example-block example-block nil info))))
+          (setq text (format "{{< highlight text %s>}}\n%s{{< /highlight >}}\n" linenos-str text))
+          (setq ret (org-blackfriday--div-wrap-maybe example-block text)))
+      (setq ret (org-blackfriday-example-block example-block nil info)))
+    ret))
 
 ;;;; Export Snippet
 (defun org-hugo-export-snippet (export-snippet _contents _info)
@@ -1624,6 +1627,7 @@ channel."
                       (format highlight-args-str linenos-str hllines-str)
                       code)))))
     (setq ret (concat label content caption-html))
+    (setq ret (org-blackfriday--div-wrap-maybe src-block ret))
     ret))
 
 

test/site/content-org/all-posts.org

@@ -333,7 +333,7 @@ get escaped.. =foo_bar= must not become =foo\_bar=.
 :END:
 This post will be exported without =title= in the front-matter because
 it is explicitly set to /empty/ using =:EXPORT_TITLE:=.
-** En dash --, Em dash ---, Horizontal ellipsis ... in titles          :@upstream:
+** En dash --, Em dash ---, Horizontal ellipsis ... in titles     :@upstream:
 :PROPERTIES:
 :EXPORT_FILE_NAME: en-dash-em-dash-hellip-in-titles
 :END:
@@ -1281,6 +1281,21 @@ with =md= language).
 *It is necessary to set the Hugo site config variable
 =pygmentsCodeFences= to =true= for syntax highlighting to work for
 fenced code blocks.*
+** Source blocks with ATTR_HTML                      :attr___html:attr___css:
+:PROPERTIES:
+:EXPORT_FILE_NAME: source-blocks-with-attr-html
+:END:
+Some text.
+
+#+ATTR_HTML: :class indent-block
+#+ATTR_CSS: :padding-left 50px
+#+BEGIN_SRC emacs-lisp
+(message (mapconcat #'identity
+                    '("Hello," "how" "are" "you?")
+                    " "))
+#+END_SRC
+
+Some more text.
 ** Org Source Block via Pygments                          :pygments:noexport:
 :PROPERTIES:
 :EXPORT_FILE_NAME: org-source-block-pygments
@@ -1441,7 +1456,21 @@ line 23
 line 33
 line 34
 #+END_EXAMPLE
+** Example blocks with ATTR_HTML                     :attr___html:attr___css:
+:PROPERTIES:
+:EXPORT_FILE_NAME: example-blocks-with-attr-html
+:END:
+Some text.
+
+#+ATTR_HTML: :class indent-block
+#+ATTR_CSS: :padding-left 50px
+#+BEGIN_EXAMPLE
+This is an example
+Line 2
+Line 3
+#+END_EXAMPLE
 
+Some more text.
 * Menu in front matter                                                 :menu:
 ** Menu Meta Data in TOML Front Matter
 :PROPERTIES:

test/site/content/posts/example-blocks-with-attr-html.md

@@ -0,0 +1,21 @@
++++
+title = "Example blocks with ATTR_HTML"
+tags = ["example", "attr_html", "attr_css"]
+draft = false
++++
+
+Some text.
+
+<style>.indent-block { padding-left: 50px;  }</style>
+
+<div class="indent-block">
+  <div></div>
+
+```text
+This is an example
+Line 2
+Line 3
+```
+</div>
+
+Some more text.

test/site/content/posts/source-blocks-with-attr-html.md

@@ -0,0 +1,21 @@
++++
+title = "Source blocks with ATTR_HTML"
+tags = ["src-block", "attr_html", "attr_css"]
+draft = false
++++
+
+Some text.
+
+<style>.indent-block { padding-left: 50px;  }</style>
+
+<div class="indent-block">
+  <div></div>
+
+```emacs-lisp
+(message (mapconcat #'identity
+                    '("Hello," "how" "are" "you?")
+                    " "))
+```
+</div>
+
+Some more text.