Merge branch 'master' of https://github.com/jgm/pandoc into textcolor-support

3 files changed, 7 insertions, 5 deletions

diff --git a/test/lua/hello-world-doc.lua b/test/lua/hello-world-doc.lua
index 221321a60..62236584e 100644
--- a/test/lua/hello-world-doc.lua
+++ b/test/lua/hello-world-doc.lua
@@ -1,10 +1,10 @@
 return {
   {
-    Doc = function(doc)
+    Pandoc = function(doc)
       local meta = {}
       local hello = { pandoc.Str "Hello,", pandoc.Space(), pandoc.Str "World!" }
       local blocks = { pandoc.Para(hello) }
-      return pandoc.Doc(blocks, meta)
+      return pandoc.Pandoc(blocks, meta)
     end
   }
 }
diff --git a/test/lua/implicit-doc-filter.lua b/test/lua/implicit-doc-filter.lua
index 320d22105..253462d1c 100644
--- a/test/lua/implicit-doc-filter.lua
+++ b/test/lua/implicit-doc-filter.lua
@@ -2,5 +2,5 @@ function Doc (doc)
   local meta = {}
   local hello = { pandoc.Str "Hello,", pandoc.Space(), pandoc.Str "World!" }
   local blocks = { pandoc.Para(hello) }
-  return pandoc.Doc(blocks, meta)
+  return pandoc.Pandoc(blocks, meta)
 end
diff --git a/test/lua/single-to-double-quoted.lua b/test/lua/single-to-double-quoted.lua
index 45c184c95..b985b215c 100644
--- a/test/lua/single-to-double-quoted.lua
+++ b/test/lua/single-to-double-quoted.lua
@@ -1,7 +1,9 @@
 return {
   {
-    SingleQuoted = function (elem)
-      elem.quotetype = "DoubleQuote"
+    Quoted = function (elem)
+      if elem.quotetype == "SingleQuote" then
+        elem.quotetype = "DoubleQuote"
+      end
       return elem
     end,
   }