markdown (9apr18)

git-svn-id: svn://tug.org/texlive/trunk@47397 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 10 insertions, 10 deletions

diff --git a/Master/texmf-dist/tex/luatex/markdown/markdown.lua b/Master/texmf-dist/tex/luatex/markdown/markdown.lua
index 61f2b734bbc..25d45c32da2 100644
--- a/Master/texmf-dist/tex/luatex/markdown/markdown.lua
+++ b/Master/texmf-dist/tex/luatex/markdown/markdown.lua
@@ -58,22 +58,22 @@
 -- those in the standard .ins files.
 -- 
 local metadata = {
-    version   = "2.5.5",
+    version   = "2.5.6",
     comment   = "A module for the conversion from markdown to plain TeX",
     author    = "John MacFarlane, Hans Hagen, Vít Novotný",
-    copyright = "2009-2016 John MacFarlane, Hans Hagen; " ..
-                "2016-2018 Vít Novotný",
+    copyright = {"2009-2016 John MacFarlane, Hans Hagen",
+                 "2016-2018 Vít Novotný"},
     license   = "LPPL 1.3"
 }
+
 if not modules then modules = { } end
 modules['markdown'] = metadata
 local lpeg = require("lpeg")
 local unicode = require("unicode")
 local md5 = require("md5")
-local M = {}
+local M = {metadata = metadata}
 local defaultOptions = {}
 defaultOptions.cacheDir = "."
-defaultOptions.outputDir = "."
 defaultOptions.blankBeforeBlockquote = false
 defaultOptions.blankBeforeCodeFence = false
 defaultOptions.blankBeforeHeading = false
@@ -508,7 +508,7 @@ function M.writer.new(options)
     return s
   end
   function self.pack(name)
-    return [[\input"]] .. name .. [["\relax]]
+    return [[\input"]] .. name .. [["\relax{}]]
   end
   self.interblocksep = "\\markdownRendererInterblockSeparator\n{}"
   self.eof = [[\relax]]
@@ -573,13 +573,13 @@ function M.writer.new(options)
                            "{",self.string(tit or ""),"}"}
   end
 local languages_json = (function()
-  local kpse = require('kpse')
-  kpse.set_program_name('luatex')
+  local kpse = require("kpse")
+  kpse.set_program_name("luatex")
   local base, prev, curr
   for _, file in ipairs{kpse.lookup(options.contentBlocksLanguageMap,
                                     { all=true })} do
-    json = assert(io.open(file, "r")):read("*all")
-                                     :gsub('("[^\n]-"):','[%1]=')
+    json = io.open(file, "r"):read("*all")
+                             :gsub('("[^\n]-"):','[%1]=')
     curr = (function()
       local _ENV={ json=json, load=load } -- run in sandbox
       return load("return "..json)()