Fix removal of escapes from figure shortcodes

Fixes the case where the figure shortcode spans over multiple lines. Fixes https://github.com/kaushalmodi/ox-hugo/issues/191. Also fix the time zone in the date stamp for test to pass over Travis CI.
8 years ago · c7f19a3ca3
parent 598a4d8822
commit c7f19a3ca3
3 changed files with 12 additions and 4 deletions
--- a/ox-hugo-pandoc-cite.el
+++ b/ox-hugo-pandoc-cite.el
@ -188,7 +188,7 @@ Required fixes:
      (save-excursion
        (let ((regexp (concat "{{\\\\<"
                              "\\(\\s-\\|\n\\)+"
-                              "\\(?1:.+?\\)"
+                              "\\(?1:[[:ascii:][:nonascii:]]+?\\)"
                              "\\(\\s-\\|\n\\)+"
                              "\\\\>}}")))
          (while (re-search-forward regexp nil :noerror)
--- a/test/site/content-org/all-posts.org
+++ b/test/site/content-org/all-posts.org
@ -4881,6 +4881,9 @@ rectangle "<html>, <body>, etc." as a  {

 #+RESULTS: code__plantuml_nested_boxes
 [[file:images/citations-with-captions/nested-boxes.svg]]
+*** Figure with caption
+#+caption: A unicorn!
+[[/images/org-mode-unicorn-logo.png]]
 * Export Options                                              :export_option:
 ** Table of Contents (TOC)                                              :toc:
 =ox-hugo= has the =with-toc= option disabled by default as Hugo has an
--- a/test/site/content/posts/citations-with-captions/index.md
+++ b/test/site/content/posts/citations-with-captions/index.md
@ -1,6 +1,6 @@
 +++
 title = "Citations with captions"
-date = 2018-08-19T16:24:00-04:00
+date = 2018-08-19T16:24:00-00:00
 tags = ["pandoc", "citations"]
 draft = false
 +++
@ -17,11 +17,11 @@ an electronic notebook has to happen.

 ## Why use Org mode?

-Check out the code block in [1](#org3d1c8ef).
+Check out the code block in [1](#org4bfd6da).

 ## Using code blocks

-<a id="org3d1c8ef"></a>
+<a id="org4bfd6da"></a>

 ``` plantuml
 rectangle "<html>, <body>, etc." as a  {
@ -39,6 +39,11 @@ rectangle "<html>, <body>, etc." as a  {

 {{< figure src="nested-boxes.svg" >}}

+## Figure with caption
+
+{{< figure src="/images/org-mode-unicorn-logo.png" caption="Figure 1: A
+unicorn!" >}}
+
 ## References {#references}

 <div id="refs" class="references">