From f64715886f780dbe1414b1b35a55b6177de54022 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 22 Mar 2020 20:48:39 +0000 Subject: markdown (22mar20) git-svn-id: svn://tug.org/texlive/trunk@54482 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/context/third/markdown/t-markdown.tex | 2 +- Master/texmf-dist/tex/generic/markdown/markdown.tex | 17 +++++++++-------- Master/texmf-dist/tex/latex/markdown/markdown.sty | 2 +- Master/texmf-dist/tex/luatex/markdown/markdown.lua | 11 +++++++---- 4 files changed, 18 insertions(+), 14 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/context/third/markdown/t-markdown.tex b/Master/texmf-dist/tex/context/third/markdown/t-markdown.tex index bba5f689d01..c7a27aedf3c 100644 --- a/Master/texmf-dist/tex/context/third/markdown/t-markdown.tex +++ b/Master/texmf-dist/tex/context/third/markdown/t-markdown.tex @@ -6,7 +6,7 @@ %% %% markdown.dtx (with options: `context') %% -%% Copyright (C) 2016-2019 Vít Novotný +%% Copyright (C) 2016-2020 Vít Novotný %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/generic/markdown/markdown.tex b/Master/texmf-dist/tex/generic/markdown/markdown.tex index cf53a16eefe..9e2083313cf 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) 2016-2019 Vít Novotný +%% Copyright (C) 2016-2020 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{2019/04/30}% -\def\markdownVersion{2.8.1}% +\def\markdownLastModified{2020/03/20}% +\def\markdownVersion{2.8.2}% \let\markdownBegin\relax \let\markdownEnd\relax \let\markdownInput\relax @@ -496,7 +496,10 @@ local convert = md.new(\markdownLuaOptions) |markdownInfo{The ending token sequence was found}@ |immediate|closeout|markdownOutputFileStream@ |endgroup@ - |markdownInput|markdownOptionInputTempFileName@ + |markdownInput{@ + |markdownOptionOutputDir@ + /|markdownOptionInputTempFileName@ + }@ #2}@ |fi@ ^^M}@ @@ -593,10 +596,8 @@ local convert = md.new(\markdownLuaOptions) |closein|markdownInputFileStream |markdownLuaExecute{% |markdownPrepare - local input = assert(io.open("% - |markdownOptionOutputDir - /#1", "r"):read("*a")) - print(convert(input:gsub("\r\n?", "\n")))}}% + local input = assert(io.open("#1", "r"):read("*a")) + print(convert(input:gsub("\r\n?", "\n") .. "\n"))}}% |endgroup \endinput %% diff --git a/Master/texmf-dist/tex/latex/markdown/markdown.sty b/Master/texmf-dist/tex/latex/markdown/markdown.sty index 301434928a5..2a1e14dbe7f 100644 --- a/Master/texmf-dist/tex/latex/markdown/markdown.sty +++ b/Master/texmf-dist/tex/latex/markdown/markdown.sty @@ -6,7 +6,7 @@ %% %% markdown.dtx (with options: `latex') %% -%% Copyright (C) 2016-2019 Vít Novotný +%% Copyright (C) 2016-2020 Vít Novotný %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/luatex/markdown/markdown.lua b/Master/texmf-dist/tex/luatex/markdown/markdown.lua index 3760928f9b8..36d2b611a78 100644 --- a/Master/texmf-dist/tex/luatex/markdown/markdown.lua +++ b/Master/texmf-dist/tex/luatex/markdown/markdown.lua @@ -20,7 +20,7 @@ -- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -- --- Copyright (C) 2016-2019 Vít Novotný +-- Copyright (C) 2016-2020 Vít Novotný -- -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either version 1.3 @@ -58,11 +58,11 @@ -- those in the standard .ins files. -- local metadata = { - version = "2.8.1", + version = "2.8.2", 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-2019 Vít Novotný"}, + "2016-2020 Vít Novotný"}, license = "LPPL 1.3" } @@ -2548,11 +2548,13 @@ function M.writer.new(options) end function self.verbatim(s) if not self.is_writing then return "" end + s = string.gsub(s, '[\r\n%s]*$', '') local name = util.cache(options.cacheDir, s, nil, nil, ".verbatim") return {"\\markdownRendererInputVerbatim{",name,"}"} end function self.fencedCode(i, s) if not self.is_writing then return "" end + s = string.gsub(s, '[\r\n%s]*$', '') local name = util.cache(options.cacheDir, s, nil, nil, ".verbatim") return {"\\markdownRendererInputFencedCode{",name,"}{",i,"}"} end @@ -3496,7 +3498,8 @@ larsers.PipeTable = Ct(larsers.table_row * parsers.newline end end end - larsers.Str = parsers.normalchar^1 / writer.string + larsers.Str = (parsers.normalchar * (parsers.normalchar + parsers.at)^0) + / writer.string larsers.Symbol = (parsers.specialchar - parsers.tightblocksep) / writer.string -- cgit v1.2.3