fix #759: restore {{\< to {{< and \>}} to >}}

this should be fine in most cases; if the restoration is not expected, users can set options(blogdown.restore.shortcode = FALSE) in .Rprofile

DESCRIPTION

@@ -1,7 +1,7 @@
 Type: Package
 Package: blogdown
 Title: Create Blogs and Websites with R Markdown
-Version: 1.18.1
+Version: 1.18.2
 Authors@R: c(
     person("Yihui", "Xie", role = c("aut", "cre"), email = "[email protected]", comment = c(ORCID = "0000-0003-0645-5666")),
     person("Christophe", "Dervieux", role = "aut", email = "[email protected]", comment = c(ORCID = "0000-0003-4474-2498")),

NEWS.md

@@ -1,5 +1,6 @@
 # CHANGES IN blogdown VERSION 1.19
 
+- Fixed the bug that shortcodes were mangled when there are raw HTML blocks in the Markdown output from R Markdown (thanks, @Redcozmo, #759).
 
 # CHANGES IN blogdown VERSION 1.18
 

R/render.R

@@ -251,7 +251,13 @@ process_markdown = function(res, x = read_utf8(res)) {
       options = c('--wrap=preserve', '--preserve-tabs'),
       citeproc = TRUE
     )
-    x = c(bookdown:::fetch_yaml(x), '', read_utf8(mds[2]))
+    x2 = read_utf8(mds[2])
+    # pandoc will escape < and > in shortcodes, and below is a hack to restore them
+    if (get_option('blogdown.restore.shortcode', TRUE)) {
+      x2 = gsub('^\\{\\{\\\\< ([^ ])', '{{< \\1', x2)
+      x2 = gsub('([^ ]) \\\\>\\}\\}$', '\\1 >}}', x2)
+    }
+    x = c(bookdown:::fetch_yaml(x), '', x2)
   }
   x
 }