From d0d20a6ba7cff5159a2f78b414326262f45b0542 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 7 Aug 2021 20:19:27 +0000 Subject: markdown (7aug21) git-svn-id: svn://tug.org/texlive/trunk@60182 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/generic/markdown/markdown.tex | 54 ++++++++++++++-------- 1 file changed, 36 insertions(+), 18 deletions(-) (limited to 'Master/texmf-dist/tex/generic') diff --git a/Master/texmf-dist/tex/generic/markdown/markdown.tex b/Master/texmf-dist/tex/generic/markdown/markdown.tex index 61327f92397..f3c4d4e8b43 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-2020 Vít Novotný +%% Copyright (C) 2016-2021 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{2020/09/14}% -\def\markdownVersion{2.9.0}% +\def\markdownLastModified{2021/08/06}% +\def\markdownVersion{2.10.0}% \let\markdownBegin\relax \let\markdownEnd\relax \let\markdownInput\relax @@ -80,7 +80,9 @@ \let\markdownOptionSlice\undefined \let\markdownOptionSmartEllipses\undefined \let\markdownOptionStartNumber\undefined +\let\markdownOptionStripIndent\undefined \let\markdownOptionTableCaptions\undefined +\let\markdownOptionTeXComments\undefined \let\markdownOptionTightLists\undefined \def\markdownOptionStripPercentSigns{false}% \def\markdownRendererInterblockSeparator{% @@ -201,6 +203,8 @@ \markdownRendererTextCitePrototype}% \def\markdownRendererTable{% \markdownRendererTablePrototype}% +\def\markdownRendererInlineHtmlComment{% + \markdownRendererInlineHtmlCommentPrototype}% \def\markdownRendererInterblockSeparatorPrototype{}% \def\markdownRendererLineBreakPrototype{}% \def\markdownRendererEllipsisPrototype{}% @@ -260,9 +264,7 @@ \def\markdownRendererCitePrototype#1{}% \def\markdownRendererTextCitePrototype#1{}% \def\markdownRendererTablePrototype#1#2#3{}% -\def\markdownInfo#1{}% -\def\markdownWarning#1{}% -\def\markdownError#1#2{}% +\def\markdownRendererInlineHtmlCommentPrototype#1{}% \let\markdownMakeOther\relax \let\markdownReadAndConvert\relax \begingroup @@ -280,13 +282,19 @@ \fi \def\markdownLuaRegisterIBCallback#1{\relax}% \def\markdownLuaUnregisterIBCallback#1{\relax}% -\def\markdownInfo#1{% - \immediate\write-1{(l.\the\inputlineno) markdown.tex info: #1.}}% -\def\markdownWarning#1{% - \immediate\write16{(l.\the\inputlineno) markdown.tex warning: #1}}% -\def\markdownError#1#2{% - \errhelp{#2.}% - \errmessage{(l.\the\inputlineno) markdown.tex error: #1}}% +\ifx\markdownInfo\undefined + \def\markdownInfo#1{% + \immediate\write-1{(l.\the\inputlineno) markdown.tex info: #1.}}% +\fi +\ifx\markdownWarning\undefined + \def\markdownWarning#1{% + \immediate\write16{(l.\the\inputlineno) markdown.tex warning: #1}}% +\fi +\ifx\markdownError\undefined + \def\markdownError#1#2{% + \errhelp{#2.}% + \errmessage{(l.\the\inputlineno) markdown.tex error: #1}}% +\fi \newcount\markdownFrozenCacheCounter \def\markdownRendererInterblockSeparatorPrototype{\par}% \def\markdownRendererLineBreakPrototype{\hfil\break}% @@ -428,9 +436,15 @@ \ifx\markdownOptionStartNumber\undefined\else startNumber = \markdownOptionStartNumber, \fi +\ifx\markdownOptionStripIndent\undefined\else + stripIndent = \markdownOptionStripIndent, +\fi \ifx\markdownOptionTableCaptions\undefined\else tableCaptions = \markdownOptionTableCaptions, \fi +\ifx\markdownOptionTeXComments\undefined\else + texComments = \markdownOptionTeXComments, +\fi \ifx\markdownOptionTightLists\undefined\else tightLists = \markdownOptionTightLists, \fi @@ -565,8 +579,8 @@ "|markdownOptionHelperScriptFileName"}% |immediate|write|markdownOutputFileStream{% local ran_ok, error = pcall(function() - local kpse = require("kpse") - kpse.set_program_name("luatex") + local ran_ok, kpse = pcall(require, "kpse") + if ran_ok then kpse.set_program_name("luatex") end #1 end) if not ran_ok then @@ -600,6 +614,8 @@ \catcode`|=0% \catcode`\\=12% |gdef|markdownInput#1{% + |begingroup + |catcode`|%=12 |markdownIfOption{FrozenCache}{% |ifnum|markdownFrozenCacheCounter=0|relax |markdownInfo{Reading frozen cache from @@ -609,21 +625,23 @@ |markdownInfo{Including markdown document number "|the|markdownFrozenCacheCounter" from frozen cache}% |csname markdownFrozenCache|the|markdownFrozenCacheCounter|endcsname - |advance|markdownFrozenCacheCounter by 1|relax + |global|advance|markdownFrozenCacheCounter by 1|relax }{% |markdownInfo{Including markdown document "#1"}% |openin|markdownInputFileStream#1 |closein|markdownInputFileStream |markdownLuaExecute{% |markdownPrepare - local file = assert(io.open("#1", "r")) + local file = assert(io.open("#1", "r"), + [[could not open file "#1" for reading]]) local input = assert(file:read("*a")) assert(file:close()) print(convert(input:gsub("\r\n?", "\n") .. "\n"))}% |markdownIfOption{FinalizeCache}{% - |advance|markdownFrozenCacheCounter by 1|relax + |global|advance|markdownFrozenCacheCounter by 1|relax }% }% + |endgroup }% |endgroup \endinput -- cgit v1.2.3