markdown (5apr19)

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

1 files changed, 17 insertions, 7 deletions

diff --git a/Master/texmf-dist/tex/generic/markdown/markdown.tex b/Master/texmf-dist/tex/generic/markdown/markdown.tex
index 8b33ee045de..6091f6ea530 100644
--- a/Master/texmf-dist/tex/generic/markdown/markdown.tex
+++ b/Master/texmf-dist/tex/generic/markdown/markdown.tex
@@ -6,7 +6,7 @@
 %%
 %% markdown.dtx  (with options: `tex')
 %% 
-%% Copyright (C) 2018 Vít Novotný
+%% Copyright (C) 2016-2019 Vít Novotný
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -45,8 +45,8 @@
 %% 
 %% The names of the source files used are shown above.
 %% 
-\def\markdownLastModified{2018/04/08}%
-\def\markdownVersion{2.5.6}%
+\def\markdownLastModified{2019/04/04}%
+\def\markdownVersion{2.7.0}%
 \let\markdownBegin\relax
 \let\markdownEnd\relax
 \let\markdownInput\relax
@@ -54,8 +54,8 @@
 \def\markdownOptionInputTempFileName{\jobname.markdown.in}%
 \def\markdownOptionOutputTempFileName{\jobname.markdown.out}%
 \def\markdownOptionErrorTempFileName{\jobname.markdown.err}%
-\def\markdownOptionCacheDir{\markdownOptionOutputDir/_markdown_\jobname}%
 \def\markdownOptionOutputDir{.}%
+\def\markdownOptionCacheDir{\markdownOptionOutputDir/_markdown_\jobname}%
 \let\markdownOptionBlankBeforeBlockquote\undefined
 \let\markdownOptionBlankBeforeCodeFence\undefined
 \let\markdownOptionBlankBeforeHeading\undefined
@@ -68,10 +68,12 @@
 \let\markdownOptionFootnotes\undefined
 \let\markdownOptionFencedCode\undefined
 \let\markdownOptionHashEnumerators\undefined
+\let\markdownOptionHeaderAttributes\undefined
 \let\markdownOptionHtml\undefined
 \let\markdownOptionHybrid\undefined
 \let\markdownOptionInlineFootnotes\undefined
 \let\markdownOptionPreserveTabs\undefined
+\let\markdownOptionSlice\undefined
 \let\markdownOptionSmartEllipses\undefined
 \let\markdownOptionStartNumber\undefined
 \let\markdownOptionTightLists\undefined
@@ -338,7 +340,7 @@
 \def\markdownRendererBlockQuoteBeginPrototype{\par\begingroup\it}%
 \def\markdownRendererBlockQuoteEndPrototype{\endgroup\par}%
 \def\markdownRendererInputVerbatimPrototype#1{%
-  \par{\tt\input"#1"\relax{}}\par}%
+  \par{\tt\input#1\relax{}}\par}%
 \def\markdownRendererInputFencedCodePrototype#1#2{%
   \markdownRendererInputVerbatimPrototype{#1}}%
 \def\markdownRendererHeadingOnePrototype#1{#1}%
@@ -393,6 +395,9 @@
 \ifx\markdownOptionHashEnumerators\undefined\else
   hashEnumerators = \markdownOptionHashEnumerators,
 \fi
+\ifx\markdownOptionHeaderAttributes\undefined\else
+  headerAttributes = \markdownOptionHeaderAttributes,
+\fi
 \ifx\markdownOptionHtml\undefined\else
   html = \markdownOptionHtml,
 \fi
@@ -405,6 +410,9 @@
 \ifx\markdownOptionPreserveTabs\undefined\else
   preserveTabs = \markdownOptionPreserveTabs,
 \fi
+\ifx\markdownOptionSlice\undefined\else
+  slice = "\markdownOptionSlice",
+\fi
 \ifx\markdownOptionSmartEllipses\undefined\else
   smartEllipses = \markdownOptionSmartEllipses,
 \fi
@@ -443,7 +451,7 @@ local convert = md.new(\markdownLuaOptions)
   |gdef|markdownReadAndConvert#1#2{@
     |begingroup@
     |immediate|openout|markdownOutputFileStream@
-      |markdownOptionInputTempFileName@
+      |markdownOptionInputTempFileName|relax@
     |markdownInfo{Buffering markdown input into the temporary @
       input file "|markdownOptionInputTempFileName" and scanning @
       for the closing token sequence "#1"}@
@@ -570,7 +578,9 @@ local convert = md.new(\markdownLuaOptions)
     |closein|markdownInputFileStream
     |markdownLuaExecute{%
       |markdownPrepare
-      local input = assert(io.open("#1", "r"):read("*a"))
+      local input = assert(io.open("%
+        |markdownOptionOutputDir
+        /#1", "r"):read("*a"))
       print(convert(input:gsub("\r\n?", "\n")))}}%
 |endgroup
 \endinput