summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/context/third/markdown/t-markdown.tex7
-rw-r--r--Master/texmf-dist/tex/generic/markdown/markdown.tex1154
-rw-r--r--Master/texmf-dist/tex/latex/markdown/markdown.sty252
-rw-r--r--Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_dot.sty7
-rw-r--r--Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_graphicx_http.sty7
-rw-r--r--Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_tilde.sty7
-rw-r--r--Master/texmf-dist/tex/luatex/markdown/markdown.lua2082
7 files changed, 1847 insertions, 1669 deletions
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 6c55e9a8d48..7c5500e2ff8 100644
--- a/Master/texmf-dist/tex/context/third/markdown/t-markdown.tex
+++ b/Master/texmf-dist/tex/context/third/markdown/t-markdown.tex
@@ -6,18 +6,15 @@
%%
%% markdown.dtx (with options: `context')
%%
-%% Copyright (C) 2016-2021 Vít Novotný
+%% Copyright (C) 2016-2022 Vít Novotný
%%
%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%%
%% http://www.latex-project.org/lppl.txt
%%
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
-%%
%% This work has the LPPL maintenance status `maintained'.
%% The Current Maintainer of this work is Vít Novotný.
%%
diff --git a/Master/texmf-dist/tex/generic/markdown/markdown.tex b/Master/texmf-dist/tex/generic/markdown/markdown.tex
index cce17fdc4fa..35028f1f0c4 100644
--- a/Master/texmf-dist/tex/generic/markdown/markdown.tex
+++ b/Master/texmf-dist/tex/generic/markdown/markdown.tex
@@ -6,18 +6,15 @@
%%
%% markdown.dtx (with options: `tex')
%%
-%% Copyright (C) 2016-2021 Vít Novotný
+%% Copyright (C) 2016-2022 Vít Novotný
%%
%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%%
%% http://www.latex-project.org/lppl.txt
%%
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
-%%
%% This work has the LPPL maintenance status `maintained'.
%% The Current Maintainer of this work is Vít Novotný.
%%
@@ -52,470 +49,535 @@
\seq_new:N \g__markdown_lua_options_seq
\prop_new:N \g__markdown_lua_option_types_prop
\prop_new:N \g__markdown_default_lua_options_prop
-\seq_put_right:Nn
- \g__markdown_lua_options_seq
- { cacheDir }
-\prop_put:Nnn
- \g__markdown_lua_option_types_prop
- { cacheDir }
- { string }
-\prop_put:Nnn
- \g__markdown_default_lua_options_prop
+\seq_new:N \g__markdown_option_layers_seq
+\tl_const:Nn \c__markdown_option_layer_lua_tl { lua }
+\seq_put_right:NV \g__markdown_option_layers_seq \c__markdown_option_layer_lua_tl
+\cs_new:Nn
+ \__markdown_add_lua_option:nnn
+ {
+ \__markdown_add_option:Vnnn
+ \c__markdown_option_layer_lua_tl
+ { #1 }
+ { #2 }
+ { #3 }
+ }
+\cs_new:Nn
+ \__markdown_add_option:nnnn
+ {
+ \seq_put_right:cn
+ { g__markdown_ #1 _options_seq }
+ { #2 }
+ \prop_put:cnn
+ { g__markdown_ #1 _option_types_prop }
+ { #2 }
+ { #3 }
+ \prop_put:cnn
+ { g__markdown_default_ #1 _options_prop }
+ { #2 }
+ { #4 }
+ \__markdown_typecheck_option:n
+ { #2 }
+ }
+\cs_generate_variant:Nn
+ \__markdown_add_option:nnnn
+ { Vnnn }
+\tl_const:Nn \c__markdown_option_value_true_tl { true }
+\tl_const:Nn \c__markdown_option_value_false_tl { false }
+\cs_new:Nn \__markdown_typecheck_option:n
+ {
+ \__markdown_get_option_type:nN
+ { #1 }
+ \l_tmpa_tl
+ \str_case_e:Vn
+ \l_tmpa_tl
+ {
+ { \c__markdown_option_type_boolean_tl }
+ {
+ \__markdown_get_option_value:nN
+ { #1 }
+ \l_tmpa_tl
+ \bool_if:nF
+ {
+ \str_if_eq_p:VV
+ \l_tmpa_tl
+ \c__markdown_option_value_true_tl ||
+ \str_if_eq_p:VV
+ \l_tmpa_tl
+ \c__markdown_option_value_false_tl
+ }
+ {
+ \msg_error:nnnV
+ { __markdown }
+ { failed-typecheck-for-boolean-option }
+ { #1 }
+ \l_tmpa_tl
+ }
+ }
+ }
+ }
+\msg_new:nnn
+ { __markdown }
+ { failed-typecheck-for-boolean-option }
+ {
+ Option~#1~has~value~#2,~
+ but~a~boolean~(true~or~false)~was~expected.
+ }
+\cs_generate_variant:Nn
+ \str_case_e:nn
+ { Vn }
+\cs_generate_variant:Nn
+ \msg_error:nnnn
+ { nnnV }
+\seq_new:N \g__markdown_option_types_seq
+\tl_const:Nn \c__markdown_option_type_counter_tl { counter }
+\seq_put_right:NV \g__markdown_option_types_seq \c__markdown_option_type_counter_tl
+\tl_const:Nn \c__markdown_option_type_boolean_tl { boolean }
+\seq_put_right:NV \g__markdown_option_types_seq \c__markdown_option_type_boolean_tl
+\tl_const:Nn \c__markdown_option_type_number_tl { number }
+\seq_put_right:NV \g__markdown_option_types_seq \c__markdown_option_type_number_tl
+\tl_const:Nn \c__markdown_option_type_path_tl { path }
+\seq_put_right:NV \g__markdown_option_types_seq \c__markdown_option_type_path_tl
+\tl_const:Nn \c__markdown_option_type_slice_tl { slice }
+\seq_put_right:NV \g__markdown_option_types_seq \c__markdown_option_type_slice_tl
+\tl_const:Nn \c__markdown_option_type_string_tl { string }
+\seq_put_right:NV \g__markdown_option_types_seq \c__markdown_option_type_string_tl
+\cs_new:Nn
+ \__markdown_get_option_type:nN
+ {
+ \bool_set_false:N
+ \l_tmpa_bool
+ \seq_map_inline:Nn
+ \g__markdown_option_layers_seq
+ {
+ \prop_get:cnNT
+ { g__markdown_ ##1 _option_types_prop }
+ { #1 }
+ \l_tmpa_tl
+ {
+ \bool_set_true:N
+ \l_tmpa_bool
+ \seq_map_break:
+ }
+ }
+ \bool_if:nF
+ \l_tmpa_bool
+ {
+ \msg_error:nnn
+ { __markdown }
+ { undefined-option }
+ { #1 }
+ }
+ \seq_if_in:NVF
+ \g__markdown_option_types_seq
+ \l_tmpa_tl
+ {
+ \msg_error:nnnV
+ { __markdown }
+ { unknown-option-type }
+ { #1 }
+ \l_tmpa_tl
+ }
+ \tl_set_eq:NN
+ #2
+ \l_tmpa_tl
+ }
+\msg_new:nnn
+ { __markdown }
+ { unknown-option-type }
+ {
+ Option~#1~has~unknown~type~#2.
+ }
+\msg_new:nnn
+ { __markdown }
+ { undefined-option }
+ {
+ Option~#1~is~undefined.
+ }
+\cs_new:Nn
+ \__markdown_get_default_option_value:nN
+ {
+ \bool_set_false:N
+ \l_tmpa_bool
+ \seq_map_inline:Nn
+ \g__markdown_option_layers_seq
+ {
+ \prop_get:cnNT
+ { g__markdown_default_ ##1 _options_prop }
+ { #1 }
+ #2
+ {
+ \bool_set_true:N
+ \l_tmpa_bool
+ \seq_map_break:
+ }
+ }
+ \bool_if:nF
+ \l_tmpa_bool
+ {
+ \msg_error:nnn
+ { __markdown }
+ { undefined-option }
+ { #1 }
+ }
+ }
+\cs_new:Nn
+ \__markdown_get_option_value:nN
+ {
+ \__markdown_option_tl_to_csname:nN
+ { #1 }
+ \l_tmpa_tl
+ \cs_if_free:cTF
+ { \l_tmpa_tl }
+ {
+ \__markdown_get_default_option_value:nN
+ { #1 }
+ #2
+ }
+ {
+ \__markdown_get_option_type:nN
+ { #1 }
+ \l_tmpa_tl
+ \str_if_eq:NNTF
+ \c__markdown_option_type_counter_tl
+ \l_tmpa_tl
+ {
+ \__markdown_option_tl_to_csname:nN
+ { #1 }
+ \l_tmpa_tl
+ \tl_set:Nx
+ #2
+ { \the \cs:w \l_tmpa_tl \cs_end: }
+ }
+ {
+ \__markdown_option_tl_to_csname:nN
+ { #1 }
+ \l_tmpa_tl
+ \tl_set:Nv
+ #2
+ { \l_tmpa_tl }
+ }
+ }
+ }
+\cs_new:Nn \__markdown_option_tl_to_csname:nN
+ {
+ \tl_set:Nn
+ \l_tmpa_tl
+ { \str_upper_case:n { #1 } }
+ \tl_set:Nx
+ #2
+ {
+ markdownOption
+ \tl_head:f { \l_tmpa_tl }
+ \tl_tail:n { #1 }
+ }
+ }
+\__markdown_add_lua_option:nnn
{ cacheDir }
- { . }
-\seq_put_right:Nn
- \g__markdown_lua_options_seq
- { frozenCacheFileName }
-\prop_put:Nnn
- \g__markdown_lua_option_types_prop
- { frozenCacheFileName }
- { string }
-\prop_put:Nnn
- \g__markdown_default_lua_options_prop
+ { path }
+ { \markdownOptionOutputDir / _markdown_\jobname }
+\__markdown_add_lua_option:nnn
{ frozenCacheFileName }
- { frozenCache.tex }
-\seq_put_right:Nn
- \g__markdown_lua_options_seq
- { blankBeforeBlockquote }
-\prop_put:Nnn
- \g__markdown_lua_option_types_prop
+ { path }
+ { \markdownOptionCacheDir / frozenCache.tex }
+\__markdown_add_lua_option:nnn
{ blankBeforeBlockquote }
{ boolean }
-\prop_put:Nnn
- \g__markdown_default_lua_options_prop
- { blankBeforeBlockquote }
{ false }
-\seq_put_right:Nn
- \g__markdown_lua_options_seq
- { blankBeforeCodeFence }
-\prop_put:Nnn
- \g__markdown_lua_option_types_prop
+\__markdown_add_lua_option:nnn
{ blankBeforeCodeFence }
{ boolean }
-\prop_put:Nnn
- \g__markdown_default_lua_options_prop
- { blankBeforeCodeFence }
{ false }
-\seq_put_right:Nn
- \g__markdown_lua_options_seq
- { blankBeforeHeading }
-\prop_put:Nnn
- \g__markdown_lua_option_types_prop
+\__markdown_add_lua_option:nnn
{ blankBeforeHeading }
{ boolean }
-\prop_put:Nnn
- \g__markdown_default_lua_options_prop
- { blankBeforeHeading }
{ false }
-\seq_put_right:Nn
- \g__markdown_lua_options_seq
- { breakableBlockquotes }
-\prop_put:Nnn
- \g__markdown_lua_option_types_prop
+\__markdown_add_lua_option:nnn
{ breakableBlockquotes }
{ boolean }
-\prop_put:Nnn
- \g__markdown_default_lua_options_prop
- { breakableBlockquotes }
{ false }
-\seq_put_right:Nn
- \g__markdown_lua_options_seq
- { citationNbsps }
-\prop_put:Nnn
- \g__markdown_lua_option_types_prop
+\__markdown_add_lua_option:nnn
{ citationNbsps }
{ boolean }
-\prop_put:Nnn
- \g__markdown_default_lua_options_prop
- { citationNbsps }
{ true }
-\seq_put_right:Nn
- \g__markdown_lua_options_seq
- { citations }
-\prop_put:Nnn
- \g__markdown_lua_option_types_prop
+\__markdown_add_lua_option:nnn
{ citations }
{ boolean }
-\prop_put:Nnn
- \g__markdown_default_lua_options_prop
- { citations }
{ false }
-\seq_put_right:Nn
- \g__markdown_lua_options_seq
- { codeSpans }
-\prop_put:Nnn
- \g__markdown_lua_option_types_prop
+\__markdown_add_lua_option:nnn
{ codeSpans }
{ boolean }
-\prop_put:Nnn
- \g__markdown_default_lua_options_prop
- { codeSpans }
{ true }
-\seq_put_right:Nn
- \g__markdown_lua_options_seq
- { contentBlocks }
-\prop_put:Nnn
- \g__markdown_lua_option_types_prop
+\__markdown_add_lua_option:nnn
{ contentBlocks }
{ boolean }
-\prop_put:Nnn
- \g__markdown_default_lua_options_prop
- { contentBlocks }
{ false }
-\seq_put_right:Nn
- \g__markdown_lua_options_seq
- { contentBlocksLanguageMap }
-\prop_put:Nnn
- \g__markdown_lua_option_types_prop
- { contentBlocksLanguageMap }
- { string }
-\prop_put:Nnn
- \g__markdown_default_lua_options_prop
+\__markdown_add_lua_option:nnn
{ contentBlocksLanguageMap }
+ { path }
{ markdown-languages.json }
-\seq_put_right:Nn
- \g__markdown_lua_options_seq
- { definitionLists }
-\prop_put:Nnn
- \g__markdown_lua_option_types_prop
+\__markdown_add_lua_option:nnn
{ definitionLists }
{ boolean }
-\prop_put:Nnn
- \g__markdown_default_lua_options_prop
- { definitionLists }
{ false }
-\seq_put_right:Nn
- \g__markdown_lua_options_seq
- { eagerCache }
-\prop_put:Nnn
- \g__markdown_lua_option_types_prop
+\__markdown_add_lua_option:nnn
{ eagerCache }
{ boolean }
-\prop_put:Nnn
- \g__markdown_default_lua_options_prop
- { eagerCache }
{ true }
-\seq_put_right:Nn
- \g__markdown_lua_options_seq
- { expectJekyllData }
-\prop_put:Nnn
- \g__markdown_lua_option_types_prop
+\__markdown_add_lua_option:nnn
{ expectJekyllData }
{ boolean }
-\prop_put:Nnn
- \g__markdown_default_lua_options_prop
- { expectJekyllData }
{ false }
-\seq_put_right:Nn
- \g__markdown_lua_options_seq
- { fencedCode }
-\prop_put:Nnn
- \g__markdown_lua_option_types_prop
+\__markdown_add_lua_option:nnn
{ fencedCode }
{ boolean }
-\prop_put:Nnn
- \g__markdown_default_lua_options_prop
- { fencedCode }
{ false }
-\seq_put_right:Nn
- \g__markdown_lua_options_seq
- { finalizeCache }
-\prop_put:Nnn
- \g__markdown_lua_option_types_prop
+\__markdown_add_lua_option:nnn
{ finalizeCache }
{ boolean }
-\prop_put:Nnn
- \g__markdown_default_lua_options_prop
- { finalizeCache }
{ false }
-\seq_put_right:Nn
- \g__markdown_lua_options_seq
- { footnotes }
-\prop_put:Nnn
- \g__markdown_lua_option_types_prop
+\__markdown_add_lua_option:nnn
{ footnotes }
{ boolean }
-\prop_put:Nnn
- \g__markdown_default_lua_options_prop
- { footnotes }
{ false }
-\seq_put_right:Nn
- \g__markdown_lua_options_seq
- { frozenCacheCounter }
-\prop_put:Nnn
- \g__markdown_lua_option_types_prop
+\__markdown_add_lua_option:nnn
{ frozenCacheCounter }
{ counter }
-\prop_put:Nnn
- \g__markdown_default_lua_options_prop
- { frozenCacheCounter }
{ 0 }
-\seq_put_right:Nn
- \g__markdown_lua_options_seq
- { hardLineBreaks }
-\prop_put:Nnn
- \g__markdown_lua_option_types_prop
+\__markdown_add_lua_option:nnn
{ hardLineBreaks }
{ boolean }
-\prop_put:Nnn
- \g__markdown_default_lua_options_prop
- { hardLineBreaks }
{ false }
-\seq_put_right:Nn
- \g__markdown_lua_options_seq
- { hashEnumerators }
-\prop_put:Nnn
- \g__markdown_lua_option_types_prop
+\__markdown_add_lua_option:nnn
{ hashEnumerators }
{ boolean }
-\prop_put:Nnn
- \g__markdown_default_lua_options_prop
- { hashEnumerators }
{ false }
-\seq_put_right:Nn
- \g__markdown_lua_options_seq
- { headerAttributes }
-\prop_put:Nnn
- \g__markdown_lua_option_types_prop
+\__markdown_add_lua_option:nnn
{ headerAttributes }
{ boolean }
-\prop_put:Nnn
- \g__markdown_default_lua_options_prop
- { headerAttributes }
{ false }
-\seq_put_right:Nn
- \g__markdown_lua_options_seq
- { html }
-\prop_put:Nnn
- \g__markdown_lua_option_types_prop
+\__markdown_add_lua_option:nnn
{ html }
{ boolean }
-\prop_put:Nnn
- \g__markdown_default_lua_options_prop
- { html }
{ false }
-\seq_put_right:Nn
- \g__markdown_lua_options_seq
- { hybrid }
-\prop_put:Nnn
- \g__markdown_lua_option_types_prop
+\__markdown_add_lua_option:nnn
{ hybrid }
{ boolean }
-\prop_put:Nnn
- \g__markdown_default_lua_options_prop
- { hybrid }
{ false }
-\seq_put_right:Nn
- \g__markdown_lua_options_seq
- { inlineFootnotes }
-\prop_put:Nnn
- \g__markdown_lua_option_types_prop
+\__markdown_add_lua_option:nnn
{ inlineFootnotes }
{ boolean }
-\prop_put:Nnn
- \g__markdown_default_lua_options_prop
- { inlineFootnotes }
{ false }
-\seq_put_right:Nn
- \g__markdown_lua_options_seq
- { jekyllData }
-\prop_put:Nnn
- \g__markdown_lua_option_types_prop
+\__markdown_add_lua_option:nnn
{ jekyllData }
{ boolean }
-\prop_put:Nnn
- \g__markdown_default_lua_options_prop
- { jekyllData }
{ false }
-\seq_put_right:Nn
- \g__markdown_lua_options_seq
- { pipeTables }
-\prop_put:Nnn
- \g__markdown_lua_option_types_prop
+\__markdown_add_lua_option:nnn
{ pipeTables }
{ boolean }
-\prop_put:Nnn
- \g__markdown_default_lua_options_prop
- { pipeTables }
{ false }
-\seq_put_right:Nn
- \g__markdown_lua_options_seq
- { preserveTabs }
-\prop_put:Nnn
- \g__markdown_lua_option_types_prop
+\__markdown_add_lua_option:nnn
{ preserveTabs }
{ boolean }
-\prop_put:Nnn
- \g__markdown_default_lua_options_prop
- { preserveTabs }
{ false }
-\seq_put_right:Nn
- \g__markdown_lua_options_seq
- { relativeReferences }
-\prop_put:Nnn
- \g__markdown_lua_option_types_prop
+\__markdown_add_lua_option:nnn
{ relativeReferences }
{ boolean }
-\prop_put:Nnn
- \g__markdown_default_lua_options_prop
- { relativeReferences }
{ false }
-\seq_put_right:Nn
- \g__markdown_lua_options_seq
- { shiftHeadings }
-\prop_put:Nnn
- \g__markdown_lua_option_types_prop
+\__markdown_add_lua_option:nnn
{ shiftHeadings }
{ number }
-\prop_put:Nnn
- \g__markdown_default_lua_options_prop
- { shiftHeadings }
{ 0 }
-\seq_put_right:Nn
- \g__markdown_lua_options_seq
+\__markdown_add_lua_option:nnn
{ slice }
-\prop_put:Nnn
- \g__markdown_lua_option_types_prop
- { slice }
- { string }
-\prop_put:Nnn
- \g__markdown_default_lua_options_prop
{ slice }
{ ^~$ }
-\seq_put_right:Nn
- \g__markdown_lua_options_seq
- { smartEllipses }
-\prop_put:Nnn
- \g__markdown_lua_option_types_prop
+\__markdown_add_lua_option:nnn
{ smartEllipses }
{ boolean }
-\prop_put:Nnn
- \g__markdown_default_lua_options_prop
- { smartEllipses }
{ false }
-\seq_put_right:Nn
- \g__markdown_lua_options_seq
- { startNumber }
-\prop_put:Nnn
- \g__markdown_lua_option_types_prop
+\__markdown_add_lua_option:nnn
{ startNumber }
{ boolean }
-\prop_put:Nnn
- \g__markdown_default_lua_options_prop
- { startNumber }
{ true }
-\seq_put_right:Nn
- \g__markdown_lua_options_seq
- { stripIndent }
-\prop_put:Nnn
- \g__markdown_lua_option_types_prop
+\__markdown_add_lua_option:nnn
{ stripIndent }
{ boolean }
-\prop_put:Nnn
- \g__markdown_default_lua_options_prop
- { stripIndent }
{ false }
-\seq_put_right:Nn
- \g__markdown_lua_options_seq
- { tableCaptions }
-\prop_put:Nnn
- \g__markdown_lua_option_types_prop
+\__markdown_add_lua_option:nnn
{ tableCaptions }
{ boolean }
-\prop_put:Nnn
- \g__markdown_default_lua_options_prop
- { tableCaptions }
{ false }
-\seq_put_right:Nn
- \g__markdown_lua_options_seq
- { taskLists }
-\prop_put:Nnn
- \g__markdown_lua_option_types_prop
+\__markdown_add_lua_option:nnn
{ taskLists }
{ boolean }
-\prop_put:Nnn
- \g__markdown_default_lua_options_prop
- { taskLists }
{ false }
-\seq_put_right:Nn
- \g__markdown_lua_options_seq
- { texComments }
-\prop_put:Nnn
- \g__markdown_lua_option_types_prop
+\__markdown_add_lua_option:nnn
{ texComments }
{ boolean }
-\prop_put:Nnn
- \g__markdown_default_lua_options_prop
- { texComments }
{ false }
-\seq_put_right:Nn
- \g__markdown_lua_options_seq
- { tightLists }
-\prop_put:Nnn
- \g__markdown_lua_option_types_prop
+\__markdown_add_lua_option:nnn
{ tightLists }
{ boolean }
-\prop_put:Nnn
- \g__markdown_default_lua_options_prop
- { tightLists }
{ true }
-\seq_put_right:Nn
- \g__markdown_lua_options_seq
- { underscores }
-\prop_put:Nnn
- \g__markdown_lua_option_types_prop
+\__markdown_add_lua_option:nnn
{ underscores }
{ boolean }
-\prop_put:Nnn
- \g__markdown_default_lua_options_prop
- { underscores }
{ true }
\ExplSyntaxOff
-\def\markdownLastModified{2022/05/31}%
-\def\markdownVersion{2.15.2-0-gb238dbc}%
+\def\markdownLastModified{2022/06/27}%
+\def\markdownVersion{2.15.3-0-g7c8e03d}%
\let\markdownBegin\relax
\let\markdownEnd\relax
\let\markdownInput\relax
-\let\markdownOptionFinalizeCache\undefined
-\def\markdownOptionHelperScriptFileName{\jobname.markdown.lua}%
-\def\markdownOptionInputTempFileName{\jobname.markdown.in}%
-\def\markdownOptionOutputTempFileName{\jobname.markdown.out}%
-\def\markdownOptionErrorTempFileName{\jobname.markdown.err}%
-\def\markdownOptionOutputDir{.}%
-\def\markdownOptionCacheDir{\markdownOptionOutputDir/_markdown_\jobname}%
-\def\markdownOptionFrozenCacheFileName{\markdownOptionCacheDir/frozenCache.tex}
-\let\markdownOptionBlankBeforeBlockquote\undefined
-\let\markdownOptionBlankBeforeCodeFence\undefined
-\let\markdownOptionBlankBeforeHeading\undefined
-\let\markdownOptionBreakableBlockquotes\undefined
-\let\markdownOptionCitations\undefined
-\let\markdownOptionCitationNbsps\undefined
-\let\markdownOptionContentBlocks\undefined
-\let\markdownOptionContentBlocksLanguageMap\undefined
-\let\markdownOptionDefinitionLists\undefined
-\let\markdownOptionEagerCache\undefined
-\let\markdownOptionFootnotes\undefined
-\let\markdownOptionFencedCode\undefined
-\let\markdownOptionHardLineBreaks\undefined
-\let\markdownOptionHashEnumerators\undefined
-\let\markdownOptionHeaderAttributes\undefined
-\let\markdownOptionHtml\undefined
-\let\markdownOptionHybrid\undefined
-\let\markdownOptionInlineFootnotes\undefined
-\let\markdownOptionJekyllData\undefined
-\let\markdownOptionPipeTables\undefined
-\let\markdownOptionPreserveTabs\undefined
-\let\markdownOptionRelativeReferences\undefined
-\let\markdownOptionShiftHeadings\undefined
-\let\markdownOptionSlice\undefined
-\let\markdownOptionSmartEllipses\undefined
-\let\markdownOptionStartNumber\undefined
-\let\markdownOptionStripIndent\undefined
-\let\markdownOptionTableCaptions\undefined
-\let\markdownOptionTaskLists\undefined
-\let\markdownOptionTexComments\undefined
-\let\markdownOptionTightLists\undefined
-\def\markdownOptionStripPercentSigns{false}%
+\ExplSyntaxOn
+\seq_new:N \g__markdown_plain_tex_options_seq
+\prop_new:N \g__markdown_plain_tex_option_types_prop
+\prop_new:N \g__markdown_default_plain_tex_options_prop
+\tl_const:Nn \c__markdown_option_layer_plain_tex_tl { plain_tex }
+\seq_put_right:NV \g__markdown_option_layers_seq \c__markdown_option_layer_plain_tex_tl
+\cs_new:Nn
+ \__markdown_add_plain_tex_option:nnn
+ {
+ \__markdown_add_option:Vnnn
+ \c__markdown_option_layer_plain_tex_tl
+ { #1 }
+ { #2 }
+ { #3 }
+ }
+\__markdown_add_plain_tex_option:nnn
+ { frozenCache }
+ { boolean }
+ { false }
+\__markdown_add_plain_tex_option:nnn
+ { helperScriptFileName }
+ { path }
+ { \jobname.markdown.lua }
+\str_new:N
+ \g_luabridge_helper_script_filename_str
+\tl_gset:Nn
+ \g_luabridge_helper_script_filename_str
+ { \markdownOptionHelperScriptFileName }
+\__markdown_add_plain_tex_option:nnn
+ { inputTempFileName }
+ { path }
+ { \jobname.markdown.in }
+\__markdown_add_plain_tex_option:nnn
+ { outputTempFileName }
+ { path }
+ { \jobname.markdown.out }
+\str_new:N
+ \g_luabridge_standard_output_filename_str
+\tl_gset:Nn
+ \g_luabridge_standard_output_filename_str
+ { \markdownOptionOutputTempFileName }
+\__markdown_add_plain_tex_option:nnn
+ { errorTempFileName }
+ { path }
+ { \jobname.markdown.err }
+\str_new:N
+ \g_luabridge_error_output_filename_str
+\tl_gset:Nn
+ \g_luabridge_error_output_filename_str
+ { \markdownOptionErrorTempFileName }
+\__markdown_add_plain_tex_option:nnn
+ { outputDir }
+ { path }
+ { . }
+\str_new:N
+ \g_luabridge_output_dirname_str
+\tl_gset:Nn
+ \g_luabridge_output_dirname_str
+ { \markdownOptionOutputDir }
+\cs_new:Nn \__markdown_plain_tex_define_option_commands:
+ {
+ \seq_map_inline:Nn
+ \g__markdown_option_layers_seq
+ {
+ \seq_map_inline:cn
+ { g__markdown_ ##1 _options_seq }
+ {
+ \__markdown_plain_tex_define_option_command:n
+ { ####1 }
+ }
+ }
+ }
+\cs_new:Nn \__markdown_plain_tex_define_option_command:n
+ {
+ \__markdown_get_default_option_value:nN
+ { #1 }
+ \l_tmpa_tl
+ \__markdown_set_option_value:nV
+ { #1 }
+ \l_tmpa_tl
+ }
+\cs_new:Nn
+ \__markdown_set_option_value:nn
+ {
+ \__markdown_define_option:n
+ { #1 }
+ \__markdown_get_option_type:nN
+ { #1 }
+ \l_tmpa_tl
+ \str_if_eq:NNTF
+ \c__markdown_option_type_counter_tl
+ \l_tmpa_tl
+ {
+ \__markdown_option_tl_to_csname:nN
+ { #1 }
+ \l_tmpa_tl
+ \int_gset:cn
+ { \l_tmpa_tl }
+ { #2 }
+ }
+ {
+ \__markdown_option_tl_to_csname:nN
+ { #1 }
+ \l_tmpa_tl
+ \cs_set:cpn
+ { \l_tmpa_tl }
+ { #2 }
+ }
+ }
+\cs_generate_variant:Nn
+ \__markdown_set_option_value:nn
+ { nV }
+\cs_new:Nn
+ \__markdown_define_option:n
+ {
+ \__markdown_option_tl_to_csname:nN
+ { #1 }
+ \l_tmpa_tl
+ \cs_if_free:cT
+ { \l_tmpa_tl }
+ {
+ \__markdown_get_option_type:nN
+ { #1 }
+ \l_tmpb_tl
+ \str_if_eq:NNT
+ \c__markdown_option_type_counter_tl
+ \l_tmpb_tl
+ {
+ \__markdown_option_tl_to_csname:nN
+ { #1 }
+ \l_tmpa_tl
+ \int_new:c
+ { \l_tmpa_tl }
+ }
+ }
+ }
+\__markdown_plain_tex_define_option_commands:
+\seq_put_right:Nn
+ \g__markdown_plain_tex_options_seq
+ { stripPercentSigns }
+\prop_put:Nnn
+ \g__markdown_plain_tex_option_types_prop
+ { stripPercentSigns }
+ { boolean }
+\prop_put:Nnx
+ \g__markdown_default_plain_tex_options_prop
+ { stripPercentSigns }
+ { false }
+\ExplSyntaxOff
\ExplSyntaxOn
\seq_new:N \g__markdown_renderers_seq
\prop_new:N \g__markdown_renderer_arities_prop
@@ -1449,84 +1511,57 @@
{ markdown/jekyllData }
{ }
\ExplSyntaxOff
-\def\markdownRendererAttributeIdentifierPrototype#1{}%
-\def\markdownRendererAttributeClassNamePrototype#1{}%
-\def\markdownRendererAttributeKeyValuePrototype#1#2{}%
-\def\markdownRendererDocumentBeginPrototype{}%
-\def\markdownRendererDocumentEndPrototype{}%
-\def\markdownRendererInterblockSeparatorPrototype{}%
-\def\markdownRendererLineBreakPrototype{}%
-\def\markdownRendererEllipsisPrototype{}%
-\def\markdownRendererHeaderAttributeContextBeginPrototype{}%
-\def\markdownRendererHeaderAttributeContextEndPrototype{}%
-\def\markdownRendererNbspPrototype{}%
-\def\markdownRendererLeftBracePrototype{}%
-\def\markdownRendererRightBracePrototype{}%
-\def\markdownRendererDollarSignPrototype{}%
-\def\markdownRendererPercentSignPrototype{}%
-\def\markdownRendererAmpersandPrototype{}%
-\def\markdownRendererUnderscorePrototype{}%
-\def\markdownRendererHashPrototype{}%
-\def\markdownRendererCircumflexPrototype{}%
-\def\markdownRendererBackslashPrototype{}%
-\def\markdownRendererTildePrototype{}%
-\def\markdownRendererPipePrototype{}%
-\def\markdownRendererCodeSpanPrototype#1{}%
-\def\markdownRendererLinkPrototype#1#2#3#4{}%
-\def\markdownRendererImagePrototype#1#2#3#4{}%
-\def\markdownRendererContentBlockPrototype#1#2#3#4{}%
-\def\markdownRendererContentBlockOnlineImagePrototype#1#2#3#4{}%
-\def\markdownRendererContentBlockCodePrototype#1#2#3#4#5{}%
-\def\markdownRendererUlBeginPrototype{}%
-\def\markdownRendererUlBeginTightPrototype{}%
-\def\markdownRendererUlItemPrototype{}%
-\def\markdownRendererUlItemEndPrototype{}%
-\def\markdownRendererUlEndPrototype{}%
-\def\markdownRendererUlEndTightPrototype{}%
-\def\markdownRendererOlBeginPrototype{}%
-\def\markdownRendererOlBeginTightPrototype{}%
-\def\markdownRendererOlItemPrototype{}%
-\def\markdownRendererOlItemWithNumberPrototype#1{}%
-\def\markdownRendererOlItemEndPrototype{}%
-\def\markdownRendererOlEndPrototype{}%
-\def\markdownRendererOlEndTightPrototype{}%
-\def\markdownRendererDlBeginPrototype{}%
-\def\markdownRendererDlBeginTightPrototype{}%
-\def\markdownRendererDlItemPrototype#1{}%
-\def\markdownRendererDlItemEndPrototype{}%
-\def\markdownRendererDlDefinitionBeginPrototype{}%
-\def\markdownRendererDlDefinitionEndPrototype{}%
-\def\markdownRendererDlEndPrototype{}%
-\def\markdownRendererDlEndTightPrototype{}%
-\def\markdownRendererEmphasisPrototype#1{}%
-\def\markdownRendererStrongEmphasisPrototype#1{}%
-\def\markdownRendererBlockQuoteBeginPrototype{}%
-\def\markdownRendererBlockQuoteEndPrototype{}%
-\def\markdownRendererInputVerbatimPrototype#1{}%
-\def\markdownRendererInputFencedCodePrototype#1#2{}%
-\def\markdownRendererJekyllDataBeginPrototype{}%
-\def\markdownRendererJekyllDataEndPrototype{}%
-\def\markdownRendererHeadingOnePrototype#1{}%
-\def\markdownRendererHeadingTwoPrototype#1{}%
-\def\markdownRendererHeadingThreePrototype#1{}%
-\def\markdownRendererHeadingFourPrototype#1{}%
-\def\markdownRendererHeadingFivePrototype#1{}%
-\def\markdownRendererHeadingSixPrototype#1{}%
-\def\markdownRendererHorizontalRulePrototype{}%
-\def\markdownRendererFootnotePrototype#1{}%
-\def\markdownRendererCitePrototype#1{}%
-\def\markdownRendererTextCitePrototype#1{}%
-\def\markdownRendererTablePrototype#1#2#3{}%
-\def\markdownRendererInlineHtmlCommentPrototype#1{}%
-\let\markdownRendererBlockHtmlCommentBeginPrototype=\iffalse
-\let\markdownRendererBlockHtmlCommentBegin=\iffalse
-\let\markdownRendererBlockHtmlCommentEndPrototype=\fi
-\let\markdownRendererBlockHtmlCommentEnd=\fi
-\def\markdownRendererInlineHtmlTagPrototype#1{}%
-\def\markdownRendererInputBlockHtmlElementPrototype#1{}%
-\def\markdownRendererTickedBoxPrototype{}%
-\def\markdownRendererHalfTickedBoxPrototype{}%
-\def\markdownRendererUntickedBoxPrototype{}%
+\ExplSyntaxOn
+\cs_new:Nn \__markdown_plaintex_define_renderer_prototypes:
+ {
+ \seq_map_function:NN
+ \g__markdown_renderers_seq
+ \__markdown_plaintex_define_renderer_prototype:n
+ \let\markdownRendererBlockHtmlCommentBeginPrototype=\iffalse
+ \let\markdownRendererBlockHtmlCommentBegin=\iffalse
+ \let\markdownRendererBlockHtmlCommentEndPrototype=\fi
+ \let\markdownRendererBlockHtmlCommentEnd=\fi
+ }
+\cs_new:Nn \__markdown_plaintex_define_renderer_prototype:n
+ {
+ \__markdown_renderer_prototype_tl_to_csname:nN
+ { #1 }
+ \l_tmpa_tl
+ \prop_get:NnN
+ \g__markdown_renderer_arities_prop
+ { #1 }
+ \l_tmpb_tl
+ \__markdown_plaintex_define_renderer_prototype:cV
+ { \l_tmpa_tl }
+ \l_tmpb_tl
+ }
+\cs_new:Nn \__markdown_renderer_prototype_tl_to_csname:nN
+ {
+ \tl_set:Nn
+ \l_tmpa_tl
+ { \str_upper_case:n { #1 } }
+ \tl_set:Nx
+ #2
+ {
+ markdownRenderer
+ \tl_head:f { \l_tmpa_tl }
+ \tl_tail:n { #1 }
+ Prototype
+ }
+ }
+\cs_new:Nn \__markdown_plaintex_define_renderer_prototype:Nn
+ {
+ \cs_generate_from_arg_count:NNnn
+ #1
+ \cs_set:Npn
+ { #2 }
+ { }
+ }
+\cs_generate_variant:Nn
+ \__markdown_plaintex_define_renderer_prototype:Nn
+ { cV }
+\__markdown_plaintex_define_renderer_prototypes:
+\ExplSyntaxOff
\let\markdownMakeOther\relax
\let\markdownReadAndConvert\relax
\begingroup
@@ -1535,13 +1570,42 @@
|markdownReadAndConvert{\markdownEnd}%
{|markdownEnd}}%
|endgroup
-\ifx\markdownMode\undefined
- \ifx\directlua\undefined
- \def\markdownMode{0}%
- \else
- \def\markdownMode{2}%
- \fi
-\fi
+\ExplSyntaxOn
+\cs_if_exist:NF
+ \markdownMode
+ {
+ \file_if_exist:nTF
+ { lt3luabridge.tex }
+ {
+ \cs_new:Npn
+ \markdownMode
+ { 3 }
+ }
+ {
+ \cs_if_exist:NTF
+ \directlua
+ {
+ \cs_new:Npn
+ \markdownMode
+ { 2 }
+ }
+ {
+ \cs_new:Npn
+ \markdownMode
+ { 0 }
+ }
+ }
+ }
+\int_compare:nF
+ { \markdownMode = 3 }
+ {
+ \int_new:N
+ \g_luabridge_method_int
+ \int_gset:Nn
+ \g_luabridge_method_int
+ { \markdownMode }
+ }
+\ExplSyntaxOff
\def\markdownLuaRegisterIBCallback#1{\relax}%
\def\markdownLuaUnregisterIBCallback#1{\relax}%
\ifx\markdownInfo\undefined
@@ -1557,7 +1621,6 @@
\errhelp{#2.}%
\errmessage{(l.\the\inputlineno) markdown.tex error: #1}}%
\fi
-\newcount\markdownFrozenCacheCounter
\def\markdownRendererInterblockSeparatorPrototype{\par}%
\def\markdownRendererLineBreakPrototype{\hfil\break}%
\let\markdownRendererEllipsisPrototype\dots
@@ -1638,7 +1701,7 @@
\seq_get_right:NN
\g__markdown_jekyll_data_datatypes_seq
\l_tmpa_tl
- \tl_if_eq:NNTF
+ \str_if_eq:NNTF
\l_tmpa_tl
\c__markdown_jekyll_data_sequence_tl
{
@@ -1746,10 +1809,6 @@
\ExplSyntaxOff
\ExplSyntaxOn
\tl_new:N \g__markdown_formatted_lua_options_tl
-\tl_const:Nn \c__markdown_lua_option_type_boolean { boolean }
-\tl_const:Nn \c__markdown_lua_option_type_counter { counter }
-\tl_const:Nn \c__markdown_lua_option_type_number { number }
-\tl_const:Nn \c__markdown_lua_option_type_string { string }
\cs_new:Nn \__markdown_format_lua_options:
{
\tl_gclear:N
@@ -1760,109 +1819,38 @@
}
\cs_new:Nn \__markdown_format_lua_option:n
{
- \__markdown_typecheck_lua_option:n { #1 }
- \tl_set:Nn
- \l_tmpb_tl
- { \str_upper_case:n { #1 } }
- \tl_set:Nx
- \l_tmpa_tl
- {
- markdownOption
- \tl_head:f { \l_tmpb_tl }
- \tl_tail:n { #1 }
- }
- \prop_get:NnN
- \g__markdown_lua_option_types_prop
+ \__markdown_typecheck_option:n
+ { #1 }
+ \__markdown_get_option_type:nN
{ #1 }
- \l_tmpb_tl
- \cs_if_free:cTF
- { \l_tmpa_tl }
- { }
- {
- \tl_case:NnF
- \l_tmpb_tl
- {
- \c__markdown_lua_option_type_string
- {
- \tl_gput_right:Nx
- \g__markdown_formatted_lua_options_tl
- { #1~=~" \cs:w \l_tmpa_tl \cs_end: ",~ }
- }
- \c__markdown_lua_option_type_counter
- {
- \tl_gput_right:Nx
- \g__markdown_formatted_lua_options_tl
- { #1~=~ \the \cs:w \l_tmpa_tl \cs_end: ,~ }
- }
- }
- {
- \tl_gput_right:Nx
- \g__markdown_formatted_lua_options_tl
- { #1~=~ \cs:w \l_tmpa_tl \cs_end: ,~ }
- }
- }
- }
-\msg_new:nnn
- { markdown }
- { undefined-lua-option }
- {
- Lua~option~#1~is~undefined.
- }
-\msg_new:nnn
- { markdown }
- { failed-typecheck-for-boolean-lua-option }
- {
- Lua~option~#1~has~value~#2,~
- but~a~boolean~(true~or~false)~was~expected.
- }
-\cs_new:Nn \__markdown_typecheck_lua_option:n
- {
- \tl_set:Nn
- \l_tmpb_tl
- { \str_upper_case:n { #1 } }
- \tl_set:Nx
\l_tmpa_tl
+ \bool_if:nTF
{
- markdownOption
- \tl_head:f { \l_tmpb_tl }
- \tl_tail:n { #1 }
+ \str_if_eq_p:VV
+ \l_tmpa_tl
+ \c__markdown_option_type_boolean_tl ||
+ \str_if_eq_p:VV
+ \l_tmpa_tl
+ \c__markdown_option_type_number_tl ||
+ \str_if_eq_p:VV
+ \l_tmpa_tl
+ \c__markdown_option_type_counter_tl
}
- \prop_get:NnNTF
- \g__markdown_lua_option_types_prop
- { #1 }
- \l_tmpb_tl
{
- \cs_if_free:cTF
- { \l_tmpa_tl }
- { }
- {
- \tl_case:Nn
- \l_tmpb_tl
- {
- \c__markdown_lua_option_type_boolean
- {
- \tl_case:cnF
- { \l_tmpa_tl }
- {
- \c__markdown_lua_option_value_true { }
- \c__markdown_lua_option_value_false { }
- }
- {
- \msg_error:nnxx
- { markdown }
- { failed-typecheck-for-boolean-lua-option }
- { #1 }
- { \l_tmpa_tl }
- }
- }
- }
- }
+ \__markdown_get_option_value:nN
+ { #1 }
+ \l_tmpa_tl
+ \tl_gput_right:Nx
+ \g__markdown_formatted_lua_options_tl
+ { #1~=~ \l_tmpa_tl ,~ }
}
{
- \msg_error:nnn
- { markdown }
- { undefined-lua-option }
+ \__markdown_get_option_value:nN
{ #1 }
+ \l_tmpa_tl
+ \tl_gput_right:Nx
+ \g__markdown_formatted_lua_options_tl
+ { #1~=~ " \l_tmpa_tl " ,~ }
}
}
\let\markdownPrepareLuaOptions=\__markdown_format_lua_options:
@@ -1878,39 +1866,38 @@
local convert = md.new(\markdownLuaOptions)
}%
\ExplSyntaxOn
-\tl_const:Nn \c__markdown_lua_option_value_true { true }
-\tl_const:Nn \c__markdown_lua_option_value_false { false }
-\cs_new:Nn \__markdown_if_option:nTF
+\cs_new:Nn
+ \__markdown_if_option:nTF
{
- \tl_set:Nn
- \l_tmpb_tl
- { \str_upper_case:n { #1 } }
- \tl_set:Nx
+ \__markdown_get_option_type:nN
+ { #1 }
\l_tmpa_tl
+ \str_if_eq:NNF
+ \l_tmpa_tl
+ \c__markdown_option_type_boolean_tl
{
- markdownOption
- \tl_head:f { \l_tmpb_tl }
- \tl_tail:n { #1 }
- }
- \cs_if_free:cTF
- { \l_tmpa_tl }
- {
- \prop_get:NnN
- \g__markdown_default_lua_options_prop
+ \msg_error:nnxx
+ { __markdown }
+ { expected-boolean-option }
{ #1 }
- \l_tmpb_tl
- }
- {
- \tl_set:Nf
- \l_tmpb_tl
- { \cs:w \l_tmpa_tl \cs_end: }
+ { \l_tmpa_tl }
}
- \tl_if_eq:NNTF
- \l_tmpb_tl
- \c__markdown_lua_option_value_true
+ \__markdown_get_option_value:nN
+ { #1 }
+ \l_tmpa_tl
+ \str_if_eq:NNTF
+ \l_tmpa_tl
+ \c__markdown_option_value_true_tl
{ #2 }
{ #3 }
}
+\msg_new:nnn
+ { __markdown }
+ { expected-boolean-option }
+ {
+ Option~#1~has~type~#2,~
+ but~a~boolean~was~expected.
+ }
\let\markdownIfOption=\__markdown_if_option:nTF
\ExplSyntaxOff
\csname newread\endcsname\markdownInputFileStream
@@ -1982,11 +1969,24 @@
^^M}@
^^M}@
|endgroup
+\ExplSyntaxOn
+\int_compare:nT
+ { \markdownMode = 3 }
+ {
+ \markdownInfo{Using~mode~3:~The~lt3luabridge~package}
+ \file_input:n { lt3luabridge.tex }
+ \cs_new:Npn
+ \markdownLuaExecute
+ { \luabridgeExecute }
+ }
+\ExplSyntaxOff
\ifnum\markdownMode<2\relax
\ifnum\markdownMode=0\relax
- \markdownInfo{Using mode 0: Shell escape via write18}%
+ \markdownWarning{Using mode 0: Shell escape via write18
+ (deprecated, to be removed in Markdown 3.0.0)}%
\else
- \markdownInfo{Using mode 1: Shell escape via os.execute}%
+ \markdownWarning{Using mode 1: Shell escape via os.execute
+ (deprecated, to be removed in Markdown 3.0.0)}%
\fi
\ifx\pdfshellescape\undefined
\ifx\shellescape\undefined
@@ -2053,8 +2053,10 @@
/|markdownOptionOutputTempFileName"}%
|input|markdownOptionOutputTempFileName|relax}%
|endgroup
-\else
-\markdownInfo{Using mode 2: Direct Lua access}%
+\fi
+\ifnum\markdownMode=2\relax
+ \markdownWarning{Using mode 2: Direct Lua access
+ (deprecated, to be removed in Markdown 3.0.0)}%
\begingroup
\catcode`|=0%
\catcode`\\=12%
@@ -2079,15 +2081,15 @@
|begingroup
|catcode`|%=12
|markdownIfOption{frozenCache}{%
- |ifnum|markdownFrozenCacheCounter=0|relax
+ |ifnum|markdownOptionFrozenCacheCounter=0|relax
|markdownInfo{Reading frozen cache from
"|markdownOptionFrozenCacheFileName"}%
|input|markdownOptionFrozenCacheFileName|relax
|fi
|markdownInfo{Including markdown document number
- "|the|markdownFrozenCacheCounter" from frozen cache}%
- |csname markdownFrozenCache|the|markdownFrozenCacheCounter|endcsname
- |global|advance|markdownFrozenCacheCounter by 1|relax
+ "|the|markdownOptionFrozenCacheCounter" from frozen cache}%
+ |csname markdownFrozenCache|the|markdownOptionFrozenCacheCounter|endcsname
+ |global|advance|markdownOptionFrozenCacheCounter by 1|relax
}{%
|markdownInfo{Including markdown document "#1"}%
|openin|markdownInputFileStream#1
@@ -2101,7 +2103,7 @@
assert(file:close())
print(convert(input:gsub("\r\n?", "\n") .. "\n"))}%
|markdownIfOption{finalizeCache}{%
- |global|advance|markdownFrozenCacheCounter by 1|relax
+ |global|advance|markdownOptionFrozenCacheCounter by 1|relax
}%
}%
|endgroup
diff --git a/Master/texmf-dist/tex/latex/markdown/markdown.sty b/Master/texmf-dist/tex/latex/markdown/markdown.sty
index da080d33d5b..49ec9ee9e6f 100644
--- a/Master/texmf-dist/tex/latex/markdown/markdown.sty
+++ b/Master/texmf-dist/tex/latex/markdown/markdown.sty
@@ -6,18 +6,15 @@
%%
%% markdown.dtx (with options: `latex')
%%
-%% Copyright (C) 2016-2021 Vít Novotný
+%% Copyright (C) 2016-2022 Vít Novotný
%%
%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%%
%% http://www.latex-project.org/lppl.txt
%%
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
-%%
%% This work has the LPPL maintenance status `maintained'.
%% The Current Maintainer of this work is Vít Novotný.
%%
@@ -48,6 +45,10 @@
\RequirePackage{keyval}
\RequirePackage{xstring}
\RequirePackage{expl3}
+\newcommand\markdownInfo[1]{\PackageInfo{markdown}{#1}}%
+\newcommand\markdownWarning[1]{\PackageWarning{markdown}{#1}}%
+\newcommand\markdownError[2]{\PackageError{markdown}{#1}{#2.}}%
+\input markdown/markdown
\newenvironment{markdown}\relax\relax
\newenvironment{markdown*}[1]\relax\relax
\newcommand\markdownSetup[1]{%
@@ -69,15 +70,26 @@
\@ifundefined
{markdownLaTeXSetupSnippet\markdownLaTeXThemeName#1}%
{#3}{#2}}%
-\newif\ifmarkdownLaTeXPlain
- \markdownLaTeXPlainfalse
-\define@key{markdownOptions}{plain}[true]{%
- \ifmarkdownLaTeXLoaded
- \markdownWarning
- {The plain option must be specified when loading the package}%
- \else
- \markdownLaTeXPlaintrue
- \fi}
+\ExplSyntaxOn
+\seq_new:N \g__markdown_latex_options_seq
+\prop_new:N \g__markdown_latex_option_types_prop
+\prop_new:N \g__markdown_default_latex_options_prop
+\tl_const:Nn \c__markdown_option_layer_latex_tl { latex }
+\seq_put_right:NV \g__markdown_option_layers_seq \c__markdown_option_layer_latex_tl
+\cs_new:Nn
+ \__markdown_add_latex_option:nnn
+ {
+ \__markdown_add_option:Vnnn
+ \c__markdown_option_layer_latex_tl
+ { #1 }
+ { #2 }
+ { #3 }
+ }
+\__markdown_add_latex_option:nnn
+ { plain }
+ { boolean }
+ { false }
+\ExplSyntaxOff
\newif\ifmarkdownLaTeXLoaded
\markdownLaTeXLoadedfalse
\AtEndOfPackage{\markdownLaTeXLoadedtrue}
@@ -104,96 +116,62 @@
{The setup snippet is undefined}%
}%
}%
-\define@key{markdownOptions}{helperScriptFileName}{%
- \def\markdownOptionHelperScriptFileName{#1}}%
-\define@key{markdownOptions}{inputTempFileName}{%
- \def\markdownOptionInputTempFileName{#1}}%
-\define@key{markdownOptions}{outputTempFileName}{%
- \def\markdownOptionOutputTempFileName{#1}}%
-\define@key{markdownOptions}{errorTempFileName}{%
- \def\markdownOptionErrorTempFileName{#1}}%
-\define@key{markdownOptions}{cacheDir}{%
- \def\markdownOptionCacheDir{#1}}%
-\define@key{markdownOptions}{outputDir}{%
- \def\markdownOptionOutputDir{#1}}%
-\define@key{markdownOptions}{blankBeforeBlockquote}[true]{%
- \def\markdownOptionBlankBeforeBlockquote{#1}}%
-\define@key{markdownOptions}{blankBeforeCodeFence}[true]{%
- \def\markdownOptionBlankBeforeCodeFence{#1}}%
-\define@key{markdownOptions}{blankBeforeHeading}[true]{%
- \def\markdownOptionBlankBeforeHeading{#1}}%
-\define@key{markdownOptions}{breakableBlockquotes}[true]{%
- \def\markdownOptionBreakableBlockquotes{#1}}%
-\define@key{markdownOptions}{citations}[true]{%
- \def\markdownOptionCitations{#1}}%
-\define@key{markdownOptions}{citationNbsps}[true]{%
- \def\markdownOptionCitationNbsps{#1}}%
-\define@key{markdownOptions}{contentBlocks}[true]{%
- \def\markdownOptionContentBlocks{#1}}%
-\define@key{markdownOptions}{codeSpans}[true]{%
- \def\markdownOptionCodeSpans{#1}}%
-\define@key{markdownOptions}{contentBlocksLanguageMap}{%
- \def\markdownOptionContentBlocksLanguageMap{#1}}%
-\define@key{markdownOptions}{definitionLists}[true]{%
- \def\markdownOptionDefinitionLists{#1}}%
-\define@key{markdownOptions}{eagerCache}[true]{%
- \def\markdownOptionEagerCache{#1}}%
-\define@key{markdownOptions}{expectJekyllData}[true]{%
- \def\markdownOptionExpectJekyllData{#1}}%
-\define@key{markdownOptions}{footnotes}[true]{%
- \def\markdownOptionFootnotes{#1}}%
-\define@key{markdownOptions}{fencedCode}[true]{%
- \def\markdownOptionFencedCode{#1}}%
-\define@key{markdownOptions}{jekyllData}[true]{%
- \def\markdownOptionJekyllData{#1}}%
-\define@key{markdownOptions}{hardLineBreaks}[true]{%
- \def\markdownOptionHardLineBreaks{#1}}%
-\define@key{markdownOptions}{hashEnumerators}[true]{%
- \def\markdownOptionHashEnumerators{#1}}%
-\define@key{markdownOptions}{headerAttributes}[true]{%
- \def\markdownOptionHeaderAttributes{#1}}%
-\define@key{markdownOptions}{html}[true]{%
- \def\markdownOptionHtml{#1}}%
-\define@key{markdownOptions}{hybrid}[true]{%
- \def\markdownOptionHybrid{#1}}%
-\define@key{markdownOptions}{inlineFootnotes}[true]{%
- \def\markdownOptionInlineFootnotes{#1}}%
-\define@key{markdownOptions}{pipeTables}[true]{%
- \def\markdownOptionPipeTables{#1}}%
-\define@key{markdownOptions}{preserveTabs}[true]{%
- \def\markdownOptionPreserveTabs{#1}}%
-\define@key{markdownOptions}{relativeReferences}[true]{%
- \def\markdownOptionRelativeReferences{#1}}%
-\define@key{markdownOptions}{smartEllipses}[true]{%
- \def\markdownOptionSmartEllipses{#1}}%
-\define@key{markdownOptions}{shiftHeadings}{%
- \def\markdownOptionShiftHeadings{#1}}%
-\define@key{markdownOptions}{slice}{%
- \def\markdownOptionSlice{#1}}%
-\define@key{markdownOptions}{startNumber}[true]{%
- \def\markdownOptionStartNumber{#1}}%
-\define@key{markdownOptions}{stripIndent}[true]{%
- \def\markdownOptionStripIndent{#1}}%
-\define@key{markdownOptions}{tableCaptions}[true]{%
- \def\markdownOptionTableCaptions{#1}}%
-\define@key{markdownOptions}{taskLists}[true]{%
- \def\markdownOptionTaskLists{#1}}%
-\define@key{markdownOptions}{texComments}[true]{%
- \def\markdownOptionTexComments{#1}}%
-\define@key{markdownOptions}{tightLists}[true]{%
- \def\markdownOptionTightLists{#1}}%
-\define@key{markdownOptions}{underscores}[true]{%
- \def\markdownOptionUnderscores{#1}}%
-\define@key{markdownOptions}{stripPercentSigns}[true]{%
- \def\markdownOptionStripPercentSigns{#1}}%
-\define@key{markdownOptions}{finalizeCache}[true]{%
- \def\markdownOptionFinalizeCache{#1}}%
+\ExplSyntaxOn
+\cs_new:Nn \__markdown_latex_define_option_commands_and_keyvals:
+ {
+ \seq_map_inline:Nn
+ \g__markdown_latex_options_seq
+ {
+ \__markdown_plain_tex_define_option_command:n
+ { ##1 }
+ }
+ \seq_map_inline:Nn
+ \g__markdown_option_layers_seq
+ {
+ \seq_map_inline:cn
+ { g__markdown_ ##1 _options_seq }
+ {
+ \__markdown_latex_define_option_keyval:nn
+ { ##1 }
+ { ####1 }
+ }
+ }
+ }
+\cs_new:Nn \__markdown_latex_define_option_keyval:nn
+ {
+ \prop_get:cnN
+ { g__markdown_ #1 _option_types_prop }
+ { #2 }
+ \l_tmpa_tl
+ \str_if_eq:VVTF
+ \l_tmpa_tl
+ \c__markdown_option_type_boolean_tl
+ {
+ \define@key
+ { markdownOptions }
+ { #2 }
+ [ true ]
+ {
+ \__markdown_set_option_value:nn
+ { #2 }
+ { ##1 }
+ }
+ }
+ {
+ \define@key
+ { markdownOptions }
+ { #2 }
+ {
+ \__markdown_set_option_value:nn
+ { #2 }
+ { ##1 }
+ }
+ }
+ }
+\__markdown_latex_define_option_commands_and_keyvals:
+\ExplSyntaxOff
\DeclareOption{finalizecache}{\markdownSetup{finalizeCache}}
-\define@key{markdownOptions}{frozenCache}[true]{%
- \def\markdownOptionFrozenCache{#1}}%
\DeclareOption{frozencache}{\markdownSetup{frozenCache}}
-\define@key{markdownOptions}{frozenCacheFileName}{%
- \def\markdownOptionFrozenCacheFileName{#1}}%
\ExplSyntaxOn
\cs_new:Nn \__markdown_latex_define_renderers:
{
@@ -203,16 +181,9 @@
}
\cs_new:Nn \__markdown_latex_define_renderer:n
{
- \tl_set:Nn
- \l_tmpb_tl
- { \str_upper_case:n { #1 } }
- \tl_set:Nx
+ \__markdown_renderer_tl_to_csname:nN
+ { #1 }
\l_tmpa_tl
- {
- markdownRenderer
- \tl_head:f { \l_tmpb_tl }
- \tl_tail:n { #1 }
- }
\prop_get:NnN
\g__markdown_renderer_arities_prop
{ #1 }
@@ -222,6 +193,19 @@
{ \l_tmpa_tl }
\l_tmpb_tl
}
+\cs_new:Nn \__markdown_renderer_tl_to_csname:nN
+ {
+ \tl_set:Nn
+ \l_tmpa_tl
+ { \str_upper_case:n { #1 } }
+ \tl_set:Nx
+ #2
+ {
+ markdownRenderer
+ \tl_head:f { \l_tmpa_tl }
+ \tl_tail:n { #1 }
+ }
+ }
\cs_new:Nn \__markdown_latex_define_renderer:nNn
{
\define@key
@@ -248,17 +232,9 @@
}
\cs_new:Nn \__markdown_latex_define_renderer_prototype:n
{
- \tl_set:Nn
- \l_tmpb_tl
- { \str_upper_case:n { #1 } }
- \tl_set:Nx
+ \__markdown_renderer_prototype_tl_to_csname:nN
+ { #1 }
\l_tmpa_tl
- {
- markdownRenderer
- \tl_head:f { \l_tmpb_tl }
- \tl_tail:n { #1 }
- Prototype
- }
\prop_get:NnN
\g__markdown_renderer_arities_prop
{ #1 }
@@ -285,10 +261,6 @@
\__markdown_latex_define_renderer_prototype:nNn
{ ncV }
\ExplSyntaxOff
-\newcommand\markdownInfo[1]{\PackageInfo{markdown}{#1}}%
-\newcommand\markdownWarning[1]{\PackageWarning{markdown}{#1}}%
-\newcommand\markdownError[2]{\PackageError{markdown}{#1}{#2.}}%
-\input markdown/markdown
\def\markdownVersionSpace{ }%
\ProvidesPackage{markdown}[\markdownLastModified\markdownVersionSpace v%
\markdownVersion\markdownVersionSpace markdown renderer]%
@@ -357,7 +329,7 @@
\setkeys{markdownRendererPrototypes}{#1}%
\def\KV@prefix{KV@markdownOptions@}}%
\define@key{markdownOptions}{code}{#1}%
-\ifmarkdownLaTeXPlain\else
+\markdownIfOption{plain}{\iffalse}{\iftrue}
\markdownIfOption{tightLists}{
\@ifclassloaded{beamer}{}{\RequirePackage{paralist}}%
}{}
@@ -811,16 +783,34 @@
\next
}
\def\markdownLaTeXRendererAutolink#1#2{%
- \tl_set:Nx
+ \tl_set:Nn
\l_tmpa_tl
- { \str_range:nnn { #2 } { 1 } { 1 } }
- \str_if_eq:NNTF
+ { #2 }
+ \tl_trim_spaces:N
\l_tmpa_tl
+ \tl_set:Nx
+ \l_tmpb_tl
+ {
+ \tl_range:Nnn
+ \l_tmpa_tl
+ { 1 }
+ { 1 }
+ }
+ \str_if_eq:NNTF
+ \l_tmpb_tl
\c_hash_str
{
- \exp_args:No
+ \tl_set:Nx
+ \l_tmpb_tl
+ {
+ \tl_range:Nnn
+ \l_tmpa_tl
+ { 2 }
+ { -1 }
+ }
+ \exp_args:NV
\ref
- { \str_range:nnn { #2 } { 2 } { -1 } }
+ \l_tmpb_tl
}{
\url { #2 }
}
diff --git a/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_dot.sty b/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_dot.sty
index fe77cc14fa0..c0e11e67e34 100644
--- a/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_dot.sty
+++ b/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_dot.sty
@@ -6,18 +6,15 @@
%%
%% markdown.dtx (with options: `latex-themes-witiko-dot')
%%
-%% Copyright (C) 2016-2021 Vít Novotný
+%% Copyright (C) 2016-2022 Vít Novotný
%%
%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%%
%% http://www.latex-project.org/lppl.txt
%%
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
-%%
%% This work has the LPPL maintenance status `maintained'.
%% The Current Maintainer of this work is Vít Novotný.
%%
diff --git a/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_graphicx_http.sty b/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_graphicx_http.sty
index 04d35bba4e0..6c30e7ec187 100644
--- a/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_graphicx_http.sty
+++ b/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_graphicx_http.sty
@@ -6,18 +6,15 @@
%%
%% markdown.dtx (with options: `latex-themes-witiko-graphicx-http')
%%
-%% Copyright (C) 2016-2021 Vít Novotný
+%% Copyright (C) 2016-2022 Vít Novotný
%%
%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%%
%% http://www.latex-project.org/lppl.txt
%%
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
-%%
%% This work has the LPPL maintenance status `maintained'.
%% The Current Maintainer of this work is Vít Novotný.
%%
diff --git a/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_tilde.sty b/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_tilde.sty
index 104b93088d3..f75c6ab41fc 100644
--- a/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_tilde.sty
+++ b/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_tilde.sty
@@ -6,18 +6,15 @@
%%
%% markdown.dtx (with options: `latex-themes-witiko-tilde')
%%
-%% Copyright (C) 2016-2021 Vít Novotný
+%% Copyright (C) 2016-2022 Vít Novotný
%%
%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%%
%% http://www.latex-project.org/lppl.txt
%%
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
-%%
%% This work has the LPPL maintenance status `maintained'.
%% The Current Maintainer of this work is Vít Novotný.
%%
diff --git a/Master/texmf-dist/tex/luatex/markdown/markdown.lua b/Master/texmf-dist/tex/luatex/markdown/markdown.lua
index 6ba03750eb6..2913503f2ce 100644
--- a/Master/texmf-dist/tex/luatex/markdown/markdown.lua
+++ b/Master/texmf-dist/tex/luatex/markdown/markdown.lua
@@ -58,7 +58,7 @@
-- those in the standard .ins files.
--
local metadata = {
- version = "2.15.2-0-gb238dbc",
+ version = "2.15.3-0-g7c8e03d",
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",
@@ -2300,9 +2300,8 @@ end
M.writer = {}
function M.writer.new(options)
local self = {}
- options = options or {}
- setmetatable(options, { __index = function (_, key)
- return defaultOptions[key] end })
+ self.cacheDir = options.cacheDir
+ self.hybrid = options.hybrid
local slice_specifiers = {}
for specifier in options.slice:gmatch("[^%s]+") do
table.insert(slice_specifiers, specifier)
@@ -2351,26 +2350,19 @@ function M.writer.new(options)
if not self.is_writing then return "" end
return "\\markdownRendererHorizontalRule{}"
end
- local escaped_uri_chars = {
- ["{"] = "\\markdownRendererLeftBrace{}",
- ["}"] = "\\markdownRendererRightBrace{}",
- ["%"] = "\\markdownRendererPercentSign{}",
- ["\\"] = "\\markdownRendererBackslash{}",
- }
- local escaped_citation_chars = {
+ self.escaped_uri_chars = {
["{"] = "\\markdownRendererLeftBrace{}",
["}"] = "\\markdownRendererRightBrace{}",
["%"] = "\\markdownRendererPercentSign{}",
["\\"] = "\\markdownRendererBackslash{}",
- ["#"] = "\\markdownRendererHash{}",
}
- local escaped_minimal_strings = {
+ self.escaped_minimal_strings = {
["^^"] = "\\markdownRendererCircumflex\\markdownRendererCircumflex ",
["☒"] = "\\markdownRendererTickedBox{}",
["⌛"] = "\\markdownRendererHalfTickedBox{}",
["☐"] = "\\markdownRendererUntickedBox{}",
}
- local escaped_chars = {
+ self.escaped_chars = {
["{"] = "\\markdownRendererLeftBrace{}",
["}"] = "\\markdownRendererRightBrace{}",
["%"] = "\\markdownRendererPercentSign{}",
@@ -2383,21 +2375,16 @@ function M.writer.new(options)
["~"] = "\\markdownRendererTilde{}",
["|"] = "\\markdownRendererPipe{}",
}
- local escape = util.escaper(escaped_chars, escaped_minimal_strings)
- local escape_citation = util.escaper(escaped_citation_chars,
- escaped_minimal_strings)
- local escape_uri = util.escaper(escaped_uri_chars, escaped_minimal_strings)
- local escape_minimal = util.escaper({}, escaped_minimal_strings)
+ self.escape = util.escaper(self.escaped_chars, self.escaped_minimal_strings)
+ self.escape_uri = util.escaper(self.escaped_uri_chars, self.escaped_minimal_strings)
+ self.escape_minimal = util.escaper({}, self.escaped_minimal_strings)
if options.hybrid then
- self.string = escape_minimal
- self.citation = escape_minimal
- self.uri = escape_minimal
+ self.string = self.escape_minimal
+ self.uri = self.escape_minimal
else
- self.string = escape
- self.citation = escape_citation
- self.uri = escape_uri
+ self.string = self.escape
+ self.uri = self.escape_uri
end
- self.escape = escape
function self.code(s)
return {"\\markdownRendererCodeSpan{",self.escape(s),"}"}
end
@@ -2407,85 +2394,12 @@ function M.writer.new(options)
"{",self.uri(src),"}",
"{",self.string(tit or ""),"}"}
end
- function self.table(rows, caption)
- if not self.is_writing then return "" end
- local buffer = {"\\markdownRendererTable{",
- caption or "", "}{", #rows - 1, "}{", #rows[1], "}"}
- local temp = rows[2] -- put alignments on the first row
- rows[2] = rows[1]
- rows[1] = temp
- for i, row in ipairs(rows) do
- table.insert(buffer, "{")
- for _, column in ipairs(row) do
- if i > 1 then -- do not use braces for alignments
- table.insert(buffer, "{")
- end
- table.insert(buffer, column)
- if i > 1 then
- table.insert(buffer, "}")
- end
- end
- table.insert(buffer, "}")
- end
- return buffer
- end
function self.image(lab,src,tit)
return {"\\markdownRendererImage{",lab,"}",
"{",self.string(src),"}",
"{",self.uri(src),"}",
"{",self.string(tit or ""),"}"}
end
- local languages_json = (function()
- local ran_ok, kpse = pcall(require, "kpse")
- if ran_ok then
- kpse.set_program_name("luatex")
- else
- kpse = {lookup=function(filename, options) return filename end}
- end
- local base, prev, curr
- for _, filename in ipairs{kpse.lookup(options.contentBlocksLanguageMap,
- { all=true })} do
- local file = io.open(filename, "r")
- if not file then goto continue end
- json = file:read("*all"):gsub('("[^\n]-"):','[%1]=')
- curr = (function()
- local _ENV={ json=json, load=load } -- run in sandbox
- return load("return "..json)()
- end)()
- if type(curr) == "table" then
- if base == nil then
- base = curr
- else
- setmetatable(prev, { __index = curr })
- end
- prev = curr
- end
- ::continue::
- end
- return base or {}
- end)()
- function self.contentblock(src,suf,type,tit)
- if not self.is_writing then return "" end
- src = src.."."..suf
- suf = suf:lower()
- if type == "onlineimage" then
- return {"\\markdownRendererContentBlockOnlineImage{",suf,"}",
- "{",self.string(src),"}",
- "{",self.uri(src),"}",
- "{",self.string(tit or ""),"}"}
- elseif languages_json[suf] then
- return {"\\markdownRendererContentBlockCode{",suf,"}",
- "{",self.string(languages_json[suf]),"}",
- "{",self.string(src),"}",
- "{",self.uri(src),"}",
- "{",self.string(tit or ""),"}"}
- else
- return {"\\markdownRendererContentBlock{",suf,"}",
- "{",self.string(src),"}",
- "{",self.uri(src),"}",
- "{",self.string(tit or ""),"}"}
- end
- end
local function ulitem(s)
return {"\\markdownRendererUlItem ",s,
"\\markdownRendererUlItemEnd "}
@@ -2548,33 +2462,9 @@ function M.writer.new(options)
end
function self.block_html_element(s)
if not self.is_writing then return "" end
- local name = util.cache(options.cacheDir, s, nil, nil, ".verbatim")
+ local name = util.cache(self.cacheDir, s, nil, nil, ".verbatim")
return {"\\markdownRendererInputBlockHtmlElement{",name,"}"}
end
- local function dlitem(term, defs)
- local retVal = {"\\markdownRendererDlItem{",term,"}"}
- for _, def in ipairs(defs) do
- retVal[#retVal+1] = {"\\markdownRendererDlDefinitionBegin ",def,
- "\\markdownRendererDlDefinitionEnd "}
- end
- retVal[#retVal+1] = "\\markdownRendererDlItemEnd "
- return retVal
- end
-
- function self.definitionlist(items,tight)
- if not self.is_writing then return "" end
- local buffer = {}
- for _,item in ipairs(items) do
- buffer[#buffer + 1] = dlitem(item.term, item.definitions)
- end
- if tight and options.tightLists then
- return {"\\markdownRendererDlBeginTight\n", buffer,
- "\n\\markdownRendererDlEndTight"}
- else
- return {"\\markdownRendererDlBegin\n", buffer,
- "\n\\markdownRendererDlEnd"}
- end
- end
function self.emphasis(s)
return {"\\markdownRendererEmphasis{",s,"}"}
end
@@ -2598,15 +2488,9 @@ function M.writer.new(options)
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")
+ local name = util.cache(self.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
function self.document(d)
local active_attributes = self.active_attributes
local buf = {"\\markdownRendererDocumentBegin\n", d}
@@ -2626,88 +2510,6 @@ function M.writer.new(options)
return buf
end
- function self.jekyllData(d, t, p)
- if not self.is_writing then return "" end
-
- local buf = {}
-
- local keys = {}
- for k, _ in pairs(d) do
- table.insert(keys, k)
- end
- table.sort(keys)
-
- if not p then
- table.insert(buf, "\\markdownRendererJekyllDataBegin")
- end
-
- if #d > 0 then
- table.insert(buf, "\\markdownRendererJekyllDataSequenceBegin{")
- table.insert(buf, self.uri(p or "null"))
- table.insert(buf, "}{")
- table.insert(buf, #keys)
- table.insert(buf, "}")
- else
- table.insert(buf, "\\markdownRendererJekyllDataMappingBegin{")
- table.insert(buf, self.uri(p or "null"))
- table.insert(buf, "}{")
- table.insert(buf, #keys)
- table.insert(buf, "}")
- end
-
- for _, k in ipairs(keys) do
- local v = d[k]
- local typ = type(v)
- k = tostring(k or "null")
- if typ == "table" and next(v) ~= nil then
- table.insert(
- buf,
- self.jekyllData(v, t, k)
- )
- else
- k = self.uri(k)
- v = tostring(v)
- if typ == "boolean" then
- table.insert(buf, "\\markdownRendererJekyllDataBoolean{")
- table.insert(buf, k)
- table.insert(buf, "}{")
- table.insert(buf, v)
- table.insert(buf, "}")
- elseif typ == "number" then
- table.insert(buf, "\\markdownRendererJekyllDataNumber{")
- table.insert(buf, k)
- table.insert(buf, "}{")
- table.insert(buf, v)
- table.insert(buf, "}")
- elseif typ == "string" then
- table.insert(buf, "\\markdownRendererJekyllDataString{")
- table.insert(buf, k)
- table.insert(buf, "}{")
- table.insert(buf, t(v))
- table.insert(buf, "}")
- elseif typ == "table" then
- table.insert(buf, "\\markdownRendererJekyllDataEmpty{")
- table.insert(buf, k)
- table.insert(buf, "}")
- else
- error(format("Unexpected type %s for value of " ..
- "YAML key %s", typ, k))
- end
- end
- end
-
- if #d > 0 then
- table.insert(buf, "\\markdownRendererJekyllDataSequenceEnd")
- else
- table.insert(buf, "\\markdownRendererJekyllDataMappingEnd")
- end
-
- if not p then
- table.insert(buf, "\\markdownRendererJekyllDataEnd")
- end
-
- return buf
- end
self.active_attributes = {}
function self.heading(s, level, attributes)
attributes = attributes or {}
@@ -2826,18 +2628,6 @@ function M.writer.new(options)
return buf
end
- function self.note(s)
- return {"\\markdownRendererFootnote{",s,"}"}
- end
- function self.citations(text_cites, cites)
- local buffer = {"\\markdownRenderer", text_cites and "TextCite" or "Cite",
- "{", #cites, "}"}
- for _,cite in ipairs(cites) do
- buffer[#buffer+1] = {cite.suppress_author and "-" or "+", "{",
- cite.prenote or "", "}{", cite.postnote or "", "}{", cite.name, "}"}
- end
- return buffer
- end
function self.get_state()
return {
is_writing=self.is_writing,
@@ -2905,8 +2695,6 @@ parsers.letter = R("AZ","az")
parsers.alphanumeric = R("AZ","az","09")
parsers.keyword = parsers.letter
* parsers.alphanumeric^0
-parsers.citation_chars = parsers.alphanumeric
- + S("#$%&-+<>~/_")
parsers.internal_punctuation = S(":;,.?")
parsers.doubleasterisks = P("**")
@@ -3162,204 +2950,6 @@ parsers.title = parsers.title_d + parsers.title_s + parsers.title_p
parsers.optionaltitle
= parsers.spnl * parsers.title * parsers.spacechar^0
+ Cc("")
-parsers.contentblock_tail
- = parsers.optionaltitle
- * (parsers.newline + parsers.eof)
-
--- case insensitive online image suffix:
-parsers.onlineimagesuffix
- = (function(...)
- local parser = nil
- for _,suffix in ipairs({...}) do
- local pattern=nil
- for i=1,#suffix do
- local char=suffix:sub(i,i)
- char = S(char:lower()..char:upper())
- if pattern == nil then
- pattern = char
- else
- pattern = pattern * char
- end
- end
- if parser == nil then
- parser = pattern
- else
- parser = parser + pattern
- end
- end
- return parser
- end)("png", "jpg", "jpeg", "gif", "tif", "tiff")
-
--- online image url for iA Writer content blocks with mandatory suffix,
--- allowing nested brackets:
-parsers.onlineimageurl
- = (parsers.less
- * Cs((parsers.anyescaped
- - parsers.more
- - #(parsers.period
- * parsers.onlineimagesuffix
- * parsers.more
- * parsers.contentblock_tail))^0)
- * parsers.period
- * Cs(parsers.onlineimagesuffix)
- * parsers.more
- + (Cs((parsers.inparens
- + (parsers.anyescaped
- - parsers.spacing
- - parsers.rparent
- - #(parsers.period
- * parsers.onlineimagesuffix
- * parsers.contentblock_tail)))^0)
- * parsers.period
- * Cs(parsers.onlineimagesuffix))
- ) * Cc("onlineimage")
-
--- filename for iA Writer content blocks with mandatory suffix:
-parsers.localfilepath
- = parsers.slash
- * Cs((parsers.anyescaped
- - parsers.tab
- - parsers.newline
- - #(parsers.period
- * parsers.alphanumeric^1
- * parsers.contentblock_tail))^1)
- * parsers.period
- * Cs(parsers.alphanumeric^1)
- * Cc("localfile")
-parsers.citation_name = Cs(parsers.dash^-1) * parsers.at
- * Cs(parsers.citation_chars
- * (((parsers.citation_chars + parsers.internal_punctuation
- - parsers.comma - parsers.semicolon)
- * -#((parsers.internal_punctuation - parsers.comma
- - parsers.semicolon)^0
- * -(parsers.citation_chars + parsers.internal_punctuation
- - parsers.comma - parsers.semicolon)))^0
- * parsers.citation_chars)^-1)
-
-parsers.citation_body_prenote
- = Cs((parsers.alphanumeric^1
- + parsers.bracketed
- + parsers.inticks
- + (parsers.anyescaped
- - (parsers.rbracket + parsers.blankline^2))
- - (parsers.spnl * parsers.dash^-1 * parsers.at))^0)
-
-parsers.citation_body_postnote
- = Cs((parsers.alphanumeric^1
- + parsers.bracketed
- + parsers.inticks
- + (parsers.anyescaped
- - (parsers.rbracket + parsers.semicolon
- + parsers.blankline^2))
- - (parsers.spnl * parsers.rbracket))^0)
-
-parsers.citation_body_chunk
- = parsers.citation_body_prenote
- * parsers.spnl * parsers.citation_name
- * (parsers.internal_punctuation - parsers.semicolon)^-1
- * parsers.spnl * parsers.citation_body_postnote
-
-parsers.citation_body
- = parsers.citation_body_chunk
- * (parsers.semicolon * parsers.spnl
- * parsers.citation_body_chunk)^0
-
-parsers.citation_headless_body_postnote
- = Cs((parsers.alphanumeric^1
- + parsers.bracketed
- + parsers.inticks
- + (parsers.anyescaped
- - (parsers.rbracket + parsers.at
- + parsers.semicolon + parsers.blankline^2))
- - (parsers.spnl * parsers.rbracket))^0)
-
-parsers.citation_headless_body
- = parsers.citation_headless_body_postnote
- * (parsers.sp * parsers.semicolon * parsers.spnl
- * parsers.citation_body_chunk)^0
-local function strip_first_char(s)
- return s:sub(2)
-end
-
-parsers.RawNoteRef = #(parsers.lbracket * parsers.circumflex)
- * parsers.tag / strip_first_char
-local function make_pipe_table_rectangular(rows)
- local num_columns = #rows[2]
- local rectangular_rows = {}
- for i = 1, #rows do
- local row = rows[i]
- local rectangular_row = {}
- for j = 1, num_columns do
- rectangular_row[j] = row[j] or ""
- end
- table.insert(rectangular_rows, rectangular_row)
- end
- return rectangular_rows
-end
-
-local function pipe_table_row(allow_empty_first_column
- , nonempty_column
- , column_separator
- , column)
- local row_beginning
- if allow_empty_first_column then
- row_beginning = -- empty first column
- #(parsers.spacechar^4
- * column_separator)
- * parsers.optionalspace
- * column
- * parsers.optionalspace
- -- non-empty first column
- + parsers.nonindentspace
- * nonempty_column^-1
- * parsers.optionalspace
- else
- row_beginning = parsers.nonindentspace
- * nonempty_column^-1
- * parsers.optionalspace
- end
-
- return Ct(row_beginning
- * (-- single column with no leading pipes
- #(column_separator
- * parsers.optionalspace
- * parsers.newline)
- * column_separator
- * parsers.optionalspace
- -- single column with leading pipes or
- -- more than a single column
- + (column_separator
- * parsers.optionalspace
- * column
- * parsers.optionalspace)^1
- * (column_separator
- * parsers.optionalspace)^-1))
-end
-
-parsers.table_hline_separator = parsers.pipe + parsers.plus
-parsers.table_hline_column = (parsers.dash
- - #(parsers.dash
- * (parsers.spacechar
- + parsers.table_hline_separator
- + parsers.newline)))^1
- * (parsers.colon * Cc("r")
- + parsers.dash * Cc("d"))
- + parsers.colon
- * (parsers.dash
- - #(parsers.dash
- * (parsers.spacechar
- + parsers.table_hline_separator
- + parsers.newline)))^1
- * (parsers.colon * Cc("c")
- + parsers.dash * Cc("l"))
-parsers.table_hline = pipe_table_row(false
- , parsers.table_hline_column
- , parsers.table_hline_separator
- , parsers.table_hline_column)
-parsers.table_caption_beginning = parsers.skipblanklines
- * parsers.nonindentspace
- * (P("Table")^-1 * parsers.colon)
- * parsers.optionalspace
-- case-insensitive match (we assume s is lowercase). must be single byte encoding
parsers.keyword_exact = function(s)
local parser = P(0)
@@ -3478,49 +3068,11 @@ parsers.between = function(p, starter, ender)
end
parsers.urlchar = parsers.anyescaped - parsers.newline - parsers.more
-parsers.OnlineImageURL
- = parsers.leader
- * parsers.onlineimageurl
- * parsers.optionaltitle
-
-parsers.LocalFilePath
- = parsers.leader
- * parsers.localfilepath
- * parsers.optionaltitle
-
-parsers.TildeFencedCode
- = parsers.fencehead(parsers.tilde)
- * Cs(parsers.fencedline(parsers.tilde)^0)
- * parsers.fencetail(parsers.tilde)
-
-parsers.BacktickFencedCode
- = parsers.fencehead(parsers.backtick)
- * Cs(parsers.fencedline(parsers.backtick)^0)
- * parsers.fencetail(parsers.backtick)
-
-parsers.JekyllFencedCode
- = parsers.fencehead(parsers.dash)
- * Cs(parsers.fencedline(parsers.dash)^0)
- * parsers.fencetail(parsers.dash)
-
parsers.lineof = function(c)
return (parsers.leader * (P(c) * parsers.optionalspace)^3
* (parsers.newline * parsers.blankline^1
+ parsers.newline^-1 * parsers.eof))
end
-parsers.defstartchar = S("~:")
-parsers.defstart = ( parsers.defstartchar * #parsers.spacing
- * (parsers.tab + parsers.space^-3)
- + parsers.space * parsers.defstartchar * #parsers.spacing
- * (parsers.tab + parsers.space^-2)
- + parsers.space * parsers.space * parsers.defstartchar
- * #parsers.spacing
- * (parsers.tab + parsers.space^-1)
- + parsers.space * parsers.space * parsers.space
- * parsers.defstartchar * #parsers.spacing
- )
-
-parsers.dlchunk = Cs(parsers.line * (parsers.indentedline - parsers.blankline)^0)
parsers.heading_attribute = C(parsers.css_identifier)
+ C((parsers.attribute_key_char
- parsers.rbrace)^1
@@ -3544,12 +3096,19 @@ local function strip_atx_end(s)
return s:gsub("[#%s]*\n$","")
end
M.reader = {}
-function M.reader.new(writer, options)
+function M.reader.new(writer, options, extensions)
local self = {}
- options = options or {}
- setmetatable(options, { __index = function (_, key)
- return defaultOptions[key] end })
- local function normalize_tag(tag)
+ self.writer = writer
+ self.parsers = {}
+ (function(parsers)
+ setmetatable(self.parsers, {
+ __index = function (_, key)
+ return parsers[key]
+ end
+ })
+ end)(parsers)
+ local parsers = self.parsers
+ function self.normalize_tag(tag)
return string.lower(
gsub(util.rope_to_string(tag), "[ \n\r\t]+", " "))
end
@@ -3557,21 +3116,20 @@ function M.reader.new(writer, options)
rope = lpeg.match(Ct((parsers.line / f)^1), s)
return util.rope_to_string(rope)
end
- local expandtabs
if options.preserveTabs then
- expandtabs = function(s) return s end
+ self.expandtabs = function(s) return s end
else
- expandtabs = function(s)
- if s:find("\t") then
- return iterlines(s, util.expand_tabs_in_line)
- else
- return s
- end
- end
+ self.expandtabs = function(s)
+ if s:find("\t") then
+ return iterlines(s, util.expand_tabs_in_line)
+ else
+ return s
+ end
+ end
end
- local larsers = {}
- local function create_parser(name, grammar, toplevel)
- return function(str)
+ self.parser_functions = {}
+ self.create_parser = function(name, grammar, toplevel)
+ self.parser_functions[name] = function(str)
if toplevel and options.stripIndent then
local min_prefix_length, min_prefix = nil, ''
str = iterlines(str, function(line)
@@ -3603,154 +3161,75 @@ function M.reader.new(writer, options)
end
end
- local parse_blocks
- = create_parser("parse_blocks",
- function()
- return larsers.blocks
- end, true)
-
- local parse_blocks_nested
- = create_parser("parse_blocks_nested",
- function()
- return larsers.blocks_nested
- end, false)
-
- local parse_inlines
- = create_parser("parse_inlines",
- function()
- return larsers.inlines
- end, false)
-
- local parse_inlines_no_link
- = create_parser("parse_inlines_no_link",
- function()
- return larsers.inlines_no_link
- end, false)
-
- local parse_inlines_no_inline_note
- = create_parser("parse_inlines_no_inline_note",
- function()
- return larsers.inlines_no_inline_note
- end, false)
-
- local parse_inlines_no_html
- = create_parser("parse_inlines_no_html",
- function()
- return larsers.inlines_no_html
- end, false)
-
- local parse_inlines_nbsp
- = create_parser("parse_inlines_nbsp",
- function()
- return larsers.inlines_nbsp
- end, false)
+ self.create_parser("parse_blocks",
+ function()
+ return parsers.blocks
+ end, true)
+
+ self.create_parser("parse_blocks_nested",
+ function()
+ return parsers.blocks_nested
+ end, false)
+
+ self.create_parser("parse_inlines",
+ function()
+ return parsers.inlines
+ end, false)
+
+ self.create_parser("parse_inlines_no_link",
+ function()
+ return parsers.inlines_no_link
+ end, false)
+
+ self.create_parser("parse_inlines_no_inline_note",
+ function()
+ return parsers.inlines_no_inline_note
+ end, false)
+
+ self.create_parser("parse_inlines_no_html",
+ function()
+ return parsers.inlines_no_html
+ end, false)
+
+ self.create_parser("parse_inlines_nbsp",
+ function()
+ return parsers.inlines_nbsp
+ end, false)
if options.hashEnumerators then
- larsers.dig = parsers.digit + parsers.hash
+ parsers.dig = parsers.digit + parsers.hash
else
- larsers.dig = parsers.digit
+ parsers.dig = parsers.digit
end
- larsers.enumerator = C(larsers.dig^3 * parsers.period) * #parsers.spacing
- + C(larsers.dig^2 * parsers.period) * #parsers.spacing
+ parsers.enumerator = C(parsers.dig^3 * parsers.period) * #parsers.spacing
+ + C(parsers.dig^2 * parsers.period) * #parsers.spacing
* (parsers.tab + parsers.space^1)
- + C(larsers.dig * parsers.period) * #parsers.spacing
+ + C(parsers.dig * parsers.period) * #parsers.spacing
* (parsers.tab + parsers.space^-2)
- + parsers.space * C(larsers.dig^2 * parsers.period)
+ + parsers.space * C(parsers.dig^2 * parsers.period)
* #parsers.spacing
- + parsers.space * C(larsers.dig * parsers.period)
+ + parsers.space * C(parsers.dig * parsers.period)
* #parsers.spacing
* (parsers.tab + parsers.space^-1)
- + parsers.space * parsers.space * C(larsers.dig^1
+ + parsers.space * parsers.space * C(parsers.dig^1
* parsers.period) * #parsers.spacing
-- strip off leading > and indents, and run through blocks
- larsers.blockquote_body = ((parsers.leader * parsers.more * parsers.space^-1)/""
+ parsers.blockquote_body = ((parsers.leader * parsers.more * parsers.space^-1)/""
* parsers.linechar^0 * parsers.newline)^1
* (-(parsers.leader * parsers.more
+ parsers.blankline) * parsers.linechar^1
* parsers.newline)^0
if not options.breakableBlockquotes then
- larsers.blockquote_body = larsers.blockquote_body
+ parsers.blockquote_body = parsers.blockquote_body
* (parsers.blankline^0 / "")
end
- larsers.citations = function(text_cites, raw_cites)
- local function normalize(str)
- if str == "" then
- str = nil
- else
- str = (options.citationNbsps and parse_inlines_nbsp or
- parse_inlines)(str)
- end
- return str
- end
-
- local cites = {}
- for i = 1,#raw_cites,4 do
- cites[#cites+1] = {
- prenote = normalize(raw_cites[i]),
- suppress_author = raw_cites[i+1] == "-",
- name = writer.citation(raw_cites[i+2]),
- postnote = normalize(raw_cites[i+3]),
- }
- end
- return writer.citations(text_cites, cites)
- end
- local rawnotes = {}
-
- -- like indirect_link
- local function lookup_note(ref)
- return writer.defer_call(function()
- local found = rawnotes[normalize_tag(ref)]
- if found then
- return writer.note(parse_blocks_nested(found))
- else
- return {"[", parse_inlines("^" .. ref), "]"}
- end
- end)
- end
-
- local function register_note(ref,rawnote)
- rawnotes[normalize_tag(ref)] = rawnote
- return ""
- end
-
- larsers.NoteRef = parsers.RawNoteRef / lookup_note
-
- larsers.NoteBlock = parsers.leader * parsers.RawNoteRef * parsers.colon
- * parsers.spnl * parsers.indented_blocks(parsers.chunk)
- / register_note
-
- larsers.InlineNote = parsers.circumflex
- * (parsers.tag / parse_inlines_no_inline_note) -- no notes inside notes
- / writer.note
-larsers.table_row = pipe_table_row(true
- , (C((parsers.linechar - parsers.pipe)^1)
- / parse_inlines)
- , parsers.pipe
- , (C((parsers.linechar - parsers.pipe)^0)
- / parse_inlines))
-
-if options.tableCaptions then
- larsers.table_caption = #parsers.table_caption_beginning
- * parsers.table_caption_beginning
- * Ct(parsers.IndentedInline^1)
- * parsers.newline
-else
- larsers.table_caption = parsers.fail
-end
-
-larsers.PipeTable = Ct(larsers.table_row * parsers.newline
- * parsers.table_hline
- * (parsers.newline * larsers.table_row)^0)
- / make_pipe_table_rectangular
- * larsers.table_caption^-1
- / writer.table
-- List of references defined in the document
local references
-- add a reference to the list
local function register_link(tag,url,title)
- references[normalize_tag(tag)] = { url = url, title = title }
+ references[self.normalize_tag(tag)] = { url = url, title = title }
return ""
end
@@ -3765,16 +3244,20 @@ larsers.PipeTable = Ct(larsers.table_row * parsers.newline
tag = label
tagpart = "[]"
else
- tagpart = {"[", parse_inlines(tag), "]"}
+ tagpart = {"[",
+ self.parser_functions.parse_inlines(tag),
+ "]"}
end
if sps then
tagpart = {sps, tagpart}
end
- local r = references[normalize_tag(tag)]
+ local r = references[self.normalize_tag(tag)]
if r then
return r
else
- return nil, {"[", parse_inlines(label), "]", tagpart}
+ return nil, {"[",
+ self.parser_functions.parse_inlines(label),
+ "]", tagpart}
end
end
@@ -3784,7 +3267,9 @@ larsers.PipeTable = Ct(larsers.table_row * parsers.newline
return writer.defer_call(function()
local r,fallback = lookup_reference(label,sps,tag)
if r then
- return writer.link(parse_inlines_no_link(label), r.url, r.title)
+ return writer.link(
+ self.parser_functions.parse_inlines_no_link(label),
+ r.url, r.title)
else
return fallback
end
@@ -3803,56 +3288,51 @@ larsers.PipeTable = Ct(larsers.table_row * parsers.newline
end
end)
end
- larsers.Str = (parsers.normalchar * (parsers.normalchar + parsers.at)^0)
+ parsers.Str = (parsers.normalchar * (parsers.normalchar + parsers.at)^0)
/ writer.string
- larsers.Symbol = (parsers.specialchar - parsers.tightblocksep)
+ parsers.Symbol = (parsers.specialchar - parsers.tightblocksep)
/ writer.string
- larsers.Ellipsis = P("...") / writer.ellipsis
+ parsers.Ellipsis = P("...") / writer.ellipsis
- larsers.Smart = larsers.Ellipsis
+ parsers.Smart = parsers.Ellipsis
- larsers.Code = parsers.inticks / writer.code
+ parsers.Code = parsers.inticks / writer.code
if options.blankBeforeBlockquote then
- larsers.bqstart = parsers.fail
+ parsers.bqstart = parsers.fail
else
- larsers.bqstart = parsers.more
+ parsers.bqstart = parsers.more
end
if options.blankBeforeHeading then
- larsers.headerstart = parsers.fail
+ parsers.headerstart = parsers.fail
else
- larsers.headerstart = parsers.hash
+ parsers.headerstart = parsers.hash
+ (parsers.line * (parsers.equal^1 + parsers.dash^1)
* parsers.optionalspace * parsers.newline)
end
- if not options.fencedCode or options.blankBeforeCodeFence then
- larsers.fencestart = parsers.fail
- else
- larsers.fencestart = parsers.fencehead(parsers.backtick)
- + parsers.fencehead(parsers.tilde)
- end
+ parsers.EndlineExceptions
+ = parsers.blankline -- paragraph break
+ + parsers.tightblocksep -- nested list
+ + parsers.eof -- end of document
+ + parsers.bqstart
+ + parsers.headerstart
- larsers.Endline = parsers.newline * -( -- newline, but not before...
- parsers.blankline -- paragraph break
- + parsers.tightblocksep -- nested list
- + parsers.eof -- end of document
- + larsers.bqstart
- + larsers.headerstart
- + larsers.fencestart
- ) * parsers.spacechar^0
+ parsers.Endline = parsers.newline
+ * -V("EndlineExceptions")
+ * parsers.spacechar^0
/ (options.hardLineBreaks and writer.linebreak
or writer.space)
- larsers.OptionalIndent
+ parsers.OptionalIndent
= parsers.spacechar^1 / writer.space
- larsers.Space = parsers.spacechar^2 * larsers.Endline / writer.linebreak
- + parsers.spacechar^1 * larsers.Endline^-1 * parsers.eof / ""
- + parsers.spacechar^1 * larsers.Endline
+ parsers.Space = parsers.spacechar^2 * parsers.Endline / writer.linebreak
+ + parsers.spacechar^1 * parsers.Endline^-1 * parsers.eof / ""
+ + parsers.spacechar^1 * parsers.Endline
* parsers.optionalspace
/ (options.hardLineBreaks
and writer.linebreak
@@ -3860,22 +3340,17 @@ larsers.PipeTable = Ct(larsers.table_row * parsers.newline
+ parsers.spacechar^1 * parsers.optionalspace
/ writer.space
- larsers.NonbreakingEndline
- = parsers.newline * -( -- newline, but not before...
- parsers.blankline -- paragraph break
- + parsers.tightblocksep -- nested list
- + parsers.eof -- end of document
- + larsers.bqstart
- + larsers.headerstart
- + larsers.fencestart
- ) * parsers.spacechar^0
+ parsers.NonbreakingEndline
+ = parsers.newline
+ * -V("EndlineExceptions")
+ * parsers.spacechar^0
/ (options.hardLineBreaks and writer.linebreak
or writer.nbsp)
- larsers.NonbreakingSpace
- = parsers.spacechar^2 * larsers.Endline / writer.linebreak
- + parsers.spacechar^1 * larsers.Endline^-1 * parsers.eof / ""
- + parsers.spacechar^1 * larsers.Endline
+ parsers.NonbreakingSpace
+ = parsers.spacechar^2 * parsers.Endline / writer.linebreak
+ + parsers.spacechar^1 * parsers.Endline^-1 * parsers.eof / ""
+ + parsers.spacechar^1 * parsers.Endline
* parsers.optionalspace
/ (options.hardLineBreaks
and writer.linebreak
@@ -3884,35 +3359,35 @@ larsers.PipeTable = Ct(larsers.table_row * parsers.newline
/ writer.nbsp
if options.underscores then
- larsers.Strong = ( parsers.between(parsers.Inline, parsers.doubleasterisks,
+ parsers.Strong = ( parsers.between(parsers.Inline, parsers.doubleasterisks,
parsers.doubleasterisks)
+ parsers.between(parsers.Inline, parsers.doubleunderscores,
parsers.doubleunderscores)
) / writer.strong
- larsers.Emph = ( parsers.between(parsers.Inline, parsers.asterisk,
+ parsers.Emph = ( parsers.between(parsers.Inline, parsers.asterisk,
parsers.asterisk)
+ parsers.between(parsers.Inline, parsers.underscore,
parsers.underscore)
) / writer.emphasis
else
- larsers.Strong = ( parsers.between(parsers.Inline, parsers.doubleasterisks,
+ parsers.Strong = ( parsers.between(parsers.Inline, parsers.doubleasterisks,
parsers.doubleasterisks)
) / writer.strong
- larsers.Emph = ( parsers.between(parsers.Inline, parsers.asterisk,
+ parsers.Emph = ( parsers.between(parsers.Inline, parsers.asterisk,
parsers.asterisk)
) / writer.emphasis
end
- larsers.AutoLinkUrl = parsers.less
+ parsers.AutoLinkUrl = parsers.less
* C(parsers.alphanumeric^1 * P("://") * parsers.urlchar^1)
* parsers.more
/ function(url)
return writer.link(writer.escape(url), url)
end
- larsers.AutoLinkEmail = parsers.less
+ parsers.AutoLinkEmail = parsers.less
* C((parsers.alphanumeric + S("-._+"))^1
* P("@") * parsers.urlchar^1)
* parsers.more
@@ -3921,7 +3396,7 @@ larsers.PipeTable = Ct(larsers.table_row * parsers.newline
"mailto:"..email)
end
- larsers.AutoLinkRelativeReference
+ parsers.AutoLinkRelativeReference
= parsers.less
* C(parsers.urlchar^1)
* parsers.more
@@ -3929,7 +3404,7 @@ larsers.PipeTable = Ct(larsers.table_row * parsers.newline
return writer.link(writer.escape(url), url)
end
- larsers.DirectLink = (parsers.tag / parse_inlines_no_link) -- no links inside links
+ parsers.DirectLink = (parsers.tag / self.parser_functions.parse_inlines_no_link)
* parsers.spnl
* parsers.lparent
* (parsers.url + Cc("")) -- link can be empty [foo]()
@@ -3937,14 +3412,14 @@ larsers.PipeTable = Ct(larsers.table_row * parsers.newline
* parsers.rparent
/ writer.link
- larsers.IndirectLink = parsers.tag * (C(parsers.spnl) * parsers.tag)^-1
+ parsers.IndirectLink = parsers.tag * (C(parsers.spnl) * parsers.tag)^-1
/ indirect_link
-- parse a link or image (direct or indirect)
- larsers.Link = larsers.DirectLink + larsers.IndirectLink
+ parsers.Link = parsers.DirectLink + parsers.IndirectLink
- larsers.DirectImage = parsers.exclamation
- * (parsers.tag / parse_inlines)
+ parsers.DirectImage = parsers.exclamation
+ * (parsers.tag / self.parser_functions.parse_inlines)
* parsers.spnl
* parsers.lparent
* (parsers.url + Cc("")) -- link can be empty [foo]()
@@ -3952,115 +3427,50 @@ larsers.PipeTable = Ct(larsers.table_row * parsers.newline
* parsers.rparent
/ writer.image
- larsers.IndirectImage = parsers.exclamation * parsers.tag
+ parsers.IndirectImage = parsers.exclamation * parsers.tag
* (C(parsers.spnl) * parsers.tag)^-1 / indirect_image
- larsers.Image = larsers.DirectImage + larsers.IndirectImage
-
- larsers.TextCitations = Ct((parsers.spnl
- * Cc("")
- * parsers.citation_name
- * ((parsers.spnl
- * parsers.lbracket
- * parsers.citation_headless_body
- * parsers.rbracket) + Cc("")))^1)
- / function(raw_cites)
- return larsers.citations(true, raw_cites)
- end
-
- larsers.ParenthesizedCitations
- = Ct((parsers.spnl
- * parsers.lbracket
- * parsers.citation_body
- * parsers.rbracket)^1)
- / function(raw_cites)
- return larsers.citations(false, raw_cites)
- end
-
- larsers.Citations = larsers.TextCitations + larsers.ParenthesizedCitations
+ parsers.Image = parsers.DirectImage + parsers.IndirectImage
-- avoid parsing long strings of * or _ as emph/strong
- larsers.UlOrStarLine = parsers.asterisk^4 + parsers.underscore^4
+ parsers.UlOrStarLine = parsers.asterisk^4 + parsers.underscore^4
/ writer.string
- larsers.EscapedChar = parsers.backslash * C(parsers.escapable) / writer.string
+ parsers.EscapedChar = parsers.backslash * C(parsers.escapable) / writer.string
- larsers.InlineHtml = parsers.emptyelt_any / writer.inline_html_tag
- + (parsers.htmlcomment / parse_inlines_no_html)
+ parsers.InlineHtml = parsers.emptyelt_any / writer.inline_html_tag
+ + (parsers.htmlcomment / self.parser_functions.parse_inlines_no_html)
/ writer.inline_html_comment
+ parsers.htmlinstruction
+ parsers.openelt_any / writer.inline_html_tag
+ parsers.closeelt_any / writer.inline_html_tag
- larsers.HtmlEntity = parsers.hexentity / entities.hex_entity / writer.string
+ parsers.HtmlEntity = parsers.hexentity / entities.hex_entity / writer.string
+ parsers.decentity / entities.dec_entity / writer.string
+ parsers.tagentity / entities.char_entity / writer.string
- larsers.ContentBlock = parsers.leader
- * (parsers.localfilepath + parsers.onlineimageurl)
- * parsers.contentblock_tail
- / writer.contentblock
-
- larsers.DisplayHtml = (parsers.htmlcomment / parse_blocks_nested)
+ parsers.DisplayHtml = (parsers.htmlcomment / self.parser_functions.parse_blocks_nested)
/ writer.block_html_comment
+ parsers.emptyelt_block / writer.block_html_element
+ parsers.openelt_exact("hr") / writer.block_html_element
+ parsers.in_matched_block_tags / writer.block_html_element
+ parsers.htmlinstruction
- larsers.Verbatim = Cs( (parsers.blanklines
+ parsers.Verbatim = Cs( (parsers.blanklines
* ((parsers.indentedline - parsers.blankline))^1)^1
- ) / expandtabs / writer.verbatim
+ ) / self.expandtabs / writer.verbatim
- larsers.FencedCode = (parsers.TildeFencedCode
- + parsers.BacktickFencedCode)
- / function(infostring, code)
- return writer.fencedCode(writer.string(infostring),
- expandtabs(code))
- end
+ parsers.Blockquote = Cs(parsers.blockquote_body^1)
+ / self.parser_functions.parse_blocks_nested
+ / writer.blockquote
- larsers.JekyllData = Cmt( C((parsers.line - P("---") - P("..."))^0)
- , function(s, i, text)
- local data
- local ran_ok, error = pcall(function()
- local tinyyaml = require("markdown-tinyyaml")
- data = tinyyaml.parse(text, {timestamps=false})
- end)
- if ran_ok and data ~= nil then
- return true, writer.jekyllData(data, function(s)
- return parse_blocks_nested(s)
- end, nil)
- else
- return false
- end
- end
- )
-
- larsers.UnexpectedJekyllData
- = P("---")
- * parsers.blankline / 0
- * #(-parsers.blankline) -- if followed by blank, it's an hrule
- * larsers.JekyllData
- * (P("---") + P("..."))
-
- larsers.ExpectedJekyllData
- = ( P("---")
- * parsers.blankline / 0
- * #(-parsers.blankline) -- if followed by blank, it's an hrule
- )^-1
- * larsers.JekyllData
- * (P("---") + P("..."))^-1
-
- larsers.Blockquote = Cs(larsers.blockquote_body^1)
- / parse_blocks_nested / writer.blockquote
-
- larsers.HorizontalRule = ( parsers.lineof(parsers.asterisk)
+ parsers.HorizontalRule = ( parsers.lineof(parsers.asterisk)
+ parsers.lineof(parsers.dash)
+ parsers.lineof(parsers.underscore)
) / writer.hrule
- larsers.Reference = parsers.define_reference_parser / register_link
+ parsers.Reference = parsers.define_reference_parser / register_link
- larsers.Paragraph = parsers.nonindentspace * Ct(parsers.Inline^1)
+ parsers.Paragraph = parsers.nonindentspace * Ct(parsers.Inline^1)
* ( parsers.newline
* ( parsers.blankline^1
+ #parsers.hash
@@ -4070,52 +3480,52 @@ larsers.PipeTable = Ct(larsers.table_row * parsers.newline
+ parsers.eof )
/ writer.paragraph
- larsers.Plain = parsers.nonindentspace * Ct(parsers.Inline^1)
+ parsers.Plain = parsers.nonindentspace * Ct(parsers.Inline^1)
/ writer.plain
- larsers.starter = parsers.bullet + larsers.enumerator
+ parsers.starter = parsers.bullet + parsers.enumerator
if options.taskLists then
- larsers.tickbox = ( parsers.ticked_box
+ parsers.tickbox = ( parsers.ticked_box
+ parsers.halfticked_box
+ parsers.unticked_box
) / writer.tickbox
else
- larsers.tickbox = parsers.fail
+ parsers.tickbox = parsers.fail
end
-- we use \001 as a separator between a tight list item and a
-- nested list under it.
- larsers.NestedList = Cs((parsers.optionallyindentedline
- - larsers.starter)^1)
+ parsers.NestedList = Cs((parsers.optionallyindentedline
+ - parsers.starter)^1)
/ function(a) return "\001"..a end
- larsers.ListBlockLine = parsers.optionallyindentedline
+ parsers.ListBlockLine = parsers.optionallyindentedline
- parsers.blankline - (parsers.indent^-1
- * larsers.starter)
+ * parsers.starter)
- larsers.ListBlock = parsers.line * larsers.ListBlockLine^0
+ parsers.ListBlock = parsers.line * parsers.ListBlockLine^0
- larsers.ListContinuationBlock = parsers.blanklines * (parsers.indent / "")
- * larsers.ListBlock
+ parsers.ListContinuationBlock = parsers.blanklines * (parsers.indent / "")
+ * parsers.ListBlock
- larsers.TightListItem = function(starter)
- return -larsers.HorizontalRule
- * (Cs(starter / "" * larsers.tickbox^-1 * larsers.ListBlock * larsers.NestedList^-1)
- / parse_blocks_nested)
+ parsers.TightListItem = function(starter)
+ return -parsers.HorizontalRule
+ * (Cs(starter / "" * parsers.tickbox^-1 * parsers.ListBlock * parsers.NestedList^-1)
+ / self.parser_functions.parse_blocks_nested)
* -(parsers.blanklines * parsers.indent)
end
- larsers.LooseListItem = function(starter)
- return -larsers.HorizontalRule
- * Cs( starter / "" * larsers.tickbox^-1 * larsers.ListBlock * Cc("\n")
- * (larsers.NestedList + larsers.ListContinuationBlock^0)
+ parsers.LooseListItem = function(starter)
+ return -parsers.HorizontalRule
+ * Cs( starter / "" * parsers.tickbox^-1 * parsers.ListBlock * Cc("\n")
+ * (parsers.NestedList + parsers.ListContinuationBlock^0)
* (parsers.blanklines / "\n\n")
- ) / parse_blocks_nested
+ ) / self.parser_functions.parse_blocks_nested
end
- larsers.BulletList = ( Ct(larsers.TightListItem(parsers.bullet)^1) * Cc(true)
+ parsers.BulletList = ( Ct(parsers.TightListItem(parsers.bullet)^1) * Cc(true)
* parsers.skipblanklines * -parsers.bullet
- + Ct(larsers.LooseListItem(parsers.bullet)^1) * Cc(false)
+ + Ct(parsers.LooseListItem(parsers.bullet)^1) * Cc(false)
* parsers.skipblanklines )
/ writer.bulletlist
@@ -4131,100 +3541,37 @@ larsers.PipeTable = Ct(larsers.table_row * parsers.newline
return writer.orderedlist(items,tight,startNumber)
end
- larsers.OrderedList = Cg(larsers.enumerator, "listtype") *
- ( Ct(larsers.TightListItem(Cb("listtype"))
- * larsers.TightListItem(larsers.enumerator)^0)
- * Cc(true) * parsers.skipblanklines * -larsers.enumerator
- + Ct(larsers.LooseListItem(Cb("listtype"))
- * larsers.LooseListItem(larsers.enumerator)^0)
+ parsers.OrderedList = Cg(parsers.enumerator, "listtype") *
+ ( Ct(parsers.TightListItem(Cb("listtype"))
+ * parsers.TightListItem(parsers.enumerator)^0)
+ * Cc(true) * parsers.skipblanklines * -parsers.enumerator
+ + Ct(parsers.LooseListItem(Cb("listtype"))
+ * parsers.LooseListItem(parsers.enumerator)^0)
* Cc(false) * parsers.skipblanklines
) * Cb("listtype") / ordered_list
-
- local function definition_list_item(term, defs, tight)
- return { term = parse_inlines(term), definitions = defs }
- end
-
- larsers.DefinitionListItemLoose = C(parsers.line) * parsers.skipblanklines
- * Ct((parsers.defstart
- * parsers.indented_blocks(parsers.dlchunk)
- / parse_blocks_nested)^1)
- * Cc(false) / definition_list_item
-
- larsers.DefinitionListItemTight = C(parsers.line)
- * Ct((parsers.defstart * parsers.dlchunk
- / parse_blocks_nested)^1)
- * Cc(true) / definition_list_item
-
- larsers.DefinitionList = ( Ct(larsers.DefinitionListItemLoose^1) * Cc(false)
- + Ct(larsers.DefinitionListItemTight^1)
- * (parsers.skipblanklines
- * -larsers.DefinitionListItemLoose * Cc(true))
- ) / writer.definitionlist
- larsers.Blank = parsers.blankline / ""
- + larsers.NoteBlock
- + larsers.Reference
+ parsers.Blank = parsers.blankline / ""
+ + parsers.Reference
+ (parsers.tightblocksep / "\n")
-- parse atx header
- if options.headerAttributes then
- larsers.AtxHeading = Cg(parsers.HeadingStart,"level")
- * parsers.optionalspace
- * (C(((parsers.linechar
- - ((parsers.hash^1
- * parsers.optionalspace
- * parsers.HeadingAttributes^-1
- + parsers.HeadingAttributes)
- * parsers.optionalspace
- * parsers.newline))
- * (parsers.linechar
- - parsers.hash
- - parsers.lbrace)^0)^1)
- / parse_inlines)
- * Cg(Ct(parsers.newline
- + (parsers.hash^1
- * parsers.optionalspace
- * parsers.HeadingAttributes^-1
- + parsers.HeadingAttributes)
- * parsers.optionalspace
- * parsers.newline), "attributes")
- * Cb("level")
- * Cb("attributes")
- / writer.heading
-
- larsers.SetextHeading = #(parsers.line * S("=-"))
- * (C(((parsers.linechar
- - (parsers.HeadingAttributes
- * parsers.optionalspace
- * parsers.newline))
- * (parsers.linechar
- - parsers.lbrace)^0)^1)
- / parse_inlines)
- * Cg(Ct(parsers.newline
- + (parsers.HeadingAttributes
- * parsers.optionalspace
- * parsers.newline)), "attributes")
- * parsers.HeadingLevel
- * Cb("attributes")
- * parsers.optionalspace
- * parsers.newline
- / writer.heading
- else
- larsers.AtxHeading = Cg(parsers.HeadingStart,"level")
- * parsers.optionalspace
- * (C(parsers.line) / strip_atx_end / parse_inlines)
- * Cb("level")
- / writer.heading
-
- larsers.SetextHeading = #(parsers.line * S("=-"))
- * Ct(parsers.linechar^1 / parse_inlines)
- * parsers.newline
- * parsers.HeadingLevel
- * parsers.optionalspace
- * parsers.newline
- / writer.heading
- end
+ parsers.AtxHeading = Cg(parsers.HeadingStart,"level")
+ * parsers.optionalspace
+ * (C(parsers.line)
+ / strip_atx_end
+ / self.parser_functions.parse_inlines)
+ * Cb("level")
+ / writer.heading
+
+ parsers.SetextHeading = #(parsers.line * S("=-"))
+ * Ct(parsers.linechar^1
+ / self.parser_functions.parse_inlines)
+ * parsers.newline
+ * parsers.HeadingLevel
+ * parsers.optionalspace
+ * parsers.newline
+ / writer.heading
- larsers.Heading = larsers.AtxHeading + larsers.SetextHeading
- local syntax =
+ parsers.Heading = parsers.AtxHeading + parsers.SetextHeading
+ self.syntax =
{ "Blocks",
Blocks = ( V("ExpectedJekyllData")
@@ -4236,10 +3583,10 @@ larsers.PipeTable = Ct(larsers.table_row * parsers.newline
* V("Block"))^0
* V("Blank")^0 * parsers.eof,
- Blank = larsers.Blank,
+ Blank = parsers.Blank,
- UnexpectedJekyllData = larsers.UnexpectedJekyllData,
- ExpectedJekyllData = larsers.ExpectedJekyllData,
+ UnexpectedJekyllData = parsers.fail,
+ ExpectedJekyllData = parsers.fail,
Block = V("ContentBlock")
+ V("UnexpectedJekyllData")
@@ -4256,19 +3603,20 @@ larsers.PipeTable = Ct(larsers.table_row * parsers.newline
+ V("Paragraph")
+ V("Plain"),
- ContentBlock = larsers.ContentBlock,
- Blockquote = larsers.Blockquote,
- Verbatim = larsers.Verbatim,
- FencedCode = larsers.FencedCode,
- HorizontalRule = larsers.HorizontalRule,
- BulletList = larsers.BulletList,
- OrderedList = larsers.OrderedList,
- Heading = larsers.Heading,
- DefinitionList = larsers.DefinitionList,
- DisplayHtml = larsers.DisplayHtml,
- Paragraph = larsers.Paragraph,
- PipeTable = larsers.PipeTable,
- Plain = larsers.Plain,
+ ContentBlock = parsers.fail,
+ Blockquote = parsers.Blockquote,
+ Verbatim = parsers.Verbatim,
+ FencedCode = parsers.fail,
+ HorizontalRule = parsers.HorizontalRule,
+ BulletList = parsers.BulletList,
+ OrderedList = parsers.OrderedList,
+ Heading = parsers.Heading,
+ DefinitionList = parsers.fail,
+ DisplayHtml = parsers.DisplayHtml,
+ Paragraph = parsers.Paragraph,
+ PipeTable = parsers.fail,
+ Plain = parsers.Plain,
+ EndlineExceptions = parsers.EndlineExceptions,
Inline = V("Str")
+ V("Space")
@@ -4312,117 +3660,86 @@ larsers.PipeTable = Ct(larsers.table_row * parsers.newline
+ V("Smart")
+ V("Symbol"),
- Str = larsers.Str,
- Space = larsers.Space,
- OptionalIndent = larsers.OptionalIndent,
- Endline = larsers.Endline,
- UlOrStarLine = larsers.UlOrStarLine,
- Strong = larsers.Strong,
- Emph = larsers.Emph,
- InlineNote = larsers.InlineNote,
- NoteRef = larsers.NoteRef,
- Citations = larsers.Citations,
- Link = larsers.Link,
- Image = larsers.Image,
- Code = larsers.Code,
- AutoLinkUrl = larsers.AutoLinkUrl,
- AutoLinkEmail = larsers.AutoLinkEmail,
+ Str = parsers.Str,
+ Space = parsers.Space,
+ OptionalIndent = parsers.OptionalIndent,
+ Endline = parsers.Endline,
+ UlOrStarLine = parsers.UlOrStarLine,
+ Strong = parsers.Strong,
+ Emph = parsers.Emph,
+ InlineNote = parsers.fail,
+ NoteRef = parsers.fail,
+ Citations = parsers.fail,
+ Link = parsers.Link,
+ Image = parsers.Image,
+ Code = parsers.Code,
+ AutoLinkUrl = parsers.AutoLinkUrl,
+ AutoLinkEmail = parsers.AutoLinkEmail,
AutoLinkRelativeReference
- = larsers.AutoLinkRelativeReference,
- InlineHtml = larsers.InlineHtml,
- HtmlEntity = larsers.HtmlEntity,
- EscapedChar = larsers.EscapedChar,
- Smart = larsers.Smart,
- Symbol = larsers.Symbol,
+ = parsers.AutoLinkRelativeReference,
+ InlineHtml = parsers.InlineHtml,
+ HtmlEntity = parsers.HtmlEntity,
+ EscapedChar = parsers.EscapedChar,
+ Smart = parsers.Smart,
+ Symbol = parsers.Symbol,
}
- if not options.citations then
- syntax.Citations = parsers.fail
- end
-
- if not options.contentBlocks then
- syntax.ContentBlock = parsers.fail
+ for _, extension in ipairs(extensions) do
+ extension.extend_writer(writer)
+ extension.extend_reader(self)
end
if not options.codeSpans then
- syntax.Code = parsers.fail
- end
-
- if not options.definitionLists then
- syntax.DefinitionList = parsers.fail
- end
-
- if not options.fencedCode then
- syntax.FencedCode = parsers.fail
- end
-
- if not options.footnotes then
- syntax.NoteRef = parsers.fail
+ self.syntax.Code = parsers.fail
end
if not options.html then
- syntax.DisplayHtml = parsers.fail
- syntax.InlineHtml = parsers.fail
- syntax.HtmlEntity = parsers.fail
- end
-
- if not options.inlineFootnotes then
- syntax.InlineNote = parsers.fail
- end
-
- if not options.jekyllData then
- syntax.UnexpectedJekyllData = parsers.fail
- end
-
- if not options.jekyllData or not options.expectJekyllData then
- syntax.ExpectedJekyllData = parsers.fail
+ self.syntax.DisplayHtml = parsers.fail
+ self.syntax.InlineHtml = parsers.fail
+ self.syntax.HtmlEntity = parsers.fail
end
if options.preserveTabs then
options.stripIndent = false
end
- if not options.pipeTables then
- syntax.PipeTable = parsers.fail
- end
-
if not options.smartEllipses then
- syntax.Smart = parsers.fail
+ self.syntax.Smart = parsers.fail
end
if not options.relativeReferences then
- syntax.AutoLinkRelativeReference = parsers.fail
+ self.syntax.AutoLinkRelativeReference = parsers.fail
end
- local blocks_nested_t = util.table_copy(syntax)
+ local blocks_nested_t = util.table_copy(self.syntax)
blocks_nested_t.ExpectedJekyllData = parsers.fail
- larsers.blocks_nested = Ct(blocks_nested_t)
+ parsers.blocks_nested = Ct(blocks_nested_t)
- larsers.blocks = Ct(syntax)
+ parsers.blocks = Ct(self.syntax)
- local inlines_t = util.table_copy(syntax)
+ local inlines_t = util.table_copy(self.syntax)
inlines_t[1] = "Inlines"
inlines_t.Inlines = parsers.Inline^0 * (parsers.spacing^0 * parsers.eof / "")
- larsers.inlines = Ct(inlines_t)
+ parsers.inlines = Ct(inlines_t)
local inlines_no_link_t = util.table_copy(inlines_t)
inlines_no_link_t.Link = parsers.fail
- larsers.inlines_no_link = Ct(inlines_no_link_t)
+ parsers.inlines_no_link = Ct(inlines_no_link_t)
local inlines_no_inline_note_t = util.table_copy(inlines_t)
inlines_no_inline_note_t.InlineNote = parsers.fail
- larsers.inlines_no_inline_note = Ct(inlines_no_inline_note_t)
+ parsers.inlines_no_inline_note = Ct(inlines_no_inline_note_t)
local inlines_no_html_t = util.table_copy(inlines_t)
inlines_no_html_t.DisplayHtml = parsers.fail
inlines_no_html_t.InlineHtml = parsers.fail
inlines_no_html_t.HtmlEntity = parsers.fail
- larsers.inlines_no_html = Ct(inlines_no_html_t)
+ parsers.inlines_no_html = Ct(inlines_no_html_t)
local inlines_nbsp_t = util.table_copy(inlines_t)
- inlines_nbsp_t.Endline = larsers.NonbreakingEndline
- inlines_nbsp_t.Space = larsers.NonbreakingSpace
- larsers.inlines_nbsp = Ct(inlines_nbsp_t)
+ inlines_nbsp_t.Endline = parsers.NonbreakingEndline
+ inlines_nbsp_t.Space = parsers.NonbreakingSpace
+ parsers.inlines_nbsp = Ct(inlines_nbsp_t)
function self.convert(input)
references = {}
local opt_string = {}
@@ -4436,7 +3753,7 @@ larsers.PipeTable = Ct(larsers.table_row * parsers.newline
local salt = table.concat(opt_string, ",") .. "," .. metadata.version
local output
local function convert(input)
- local document = parse_blocks(input)
+ local document = self.parser_functions.parse_blocks(input)
return util.rope_to_string(writer.document(document))
end
if options.eagerCache or options.finalizeCache then
@@ -4464,9 +3781,890 @@ larsers.PipeTable = Ct(larsers.table_row * parsers.newline
end
return self
end
+M.extensions = {}
+M.extensions.citations = function(citation_nbsps)
+ local escaped_citation_chars = {
+ ["{"] = "\\markdownRendererLeftBrace{}",
+ ["}"] = "\\markdownRendererRightBrace{}",
+ ["%"] = "\\markdownRendererPercentSign{}",
+ ["\\"] = "\\markdownRendererBackslash{}",
+ ["#"] = "\\markdownRendererHash{}",
+ }
+ return {
+ extend_writer = function(self)
+ local escape_citation = util.escaper(
+ escaped_citation_chars,
+ self.escaped_minimal_strings)
+ if self.hybrid then
+ self.citation = self.escape_minimal
+ else
+ self.citation = escape_citation
+ end
+ function self.citations(text_cites, cites)
+ local buffer = {"\\markdownRenderer", text_cites and "TextCite" or "Cite",
+ "{", #cites, "}"}
+ for _,cite in ipairs(cites) do
+ buffer[#buffer+1] = {cite.suppress_author and "-" or "+", "{",
+ cite.prenote or "", "}{", cite.postnote or "", "}{", cite.name, "}"}
+ end
+ return buffer
+ end
+ end, extend_reader = function(self)
+ local parsers = self.parsers
+ local syntax = self.syntax
+ local writer = self.writer
+
+ local citation_chars
+ = parsers.alphanumeric
+ + S("#$%&-+<>~/_")
+
+ local citation_name
+ = Cs(parsers.dash^-1) * parsers.at
+ * Cs(citation_chars
+ * (((citation_chars + parsers.internal_punctuation
+ - parsers.comma - parsers.semicolon)
+ * -#((parsers.internal_punctuation - parsers.comma
+ - parsers.semicolon)^0
+ * -(citation_chars + parsers.internal_punctuation
+ - parsers.comma - parsers.semicolon)))^0
+ * citation_chars)^-1)
+
+ local citation_body_prenote
+ = Cs((parsers.alphanumeric^1
+ + parsers.bracketed
+ + parsers.inticks
+ + (parsers.anyescaped
+ - (parsers.rbracket + parsers.blankline^2))
+ - (parsers.spnl * parsers.dash^-1 * parsers.at))^0)
+
+ local citation_body_postnote
+ = Cs((parsers.alphanumeric^1
+ + parsers.bracketed
+ + parsers.inticks
+ + (parsers.anyescaped
+ - (parsers.rbracket + parsers.semicolon
+ + parsers.blankline^2))
+ - (parsers.spnl * parsers.rbracket))^0)
+
+ local citation_body_chunk
+ = citation_body_prenote
+ * parsers.spnl * citation_name
+ * (parsers.internal_punctuation - parsers.semicolon)^-1
+ * parsers.spnl * citation_body_postnote
+
+ local citation_body
+ = citation_body_chunk
+ * (parsers.semicolon * parsers.spnl
+ * citation_body_chunk)^0
+
+ local citation_headless_body_postnote
+ = Cs((parsers.alphanumeric^1
+ + parsers.bracketed
+ + parsers.inticks
+ + (parsers.anyescaped
+ - (parsers.rbracket + parsers.at
+ + parsers.semicolon + parsers.blankline^2))
+ - (parsers.spnl * parsers.rbracket))^0)
+
+ local citation_headless_body
+ = citation_headless_body_postnote
+ * (parsers.sp * parsers.semicolon * parsers.spnl
+ * citation_body_chunk)^0
+
+ local citations
+ = function(text_cites, raw_cites)
+ local function normalize(str)
+ if str == "" then
+ str = nil
+ else
+ str = (citation_nbsps and
+ self.parser_functions.parse_inlines_nbsp or
+ self.parser_functions.parse_inlines)(str)
+ end
+ return str
+ end
+
+ local cites = {}
+ for i = 1,#raw_cites,4 do
+ cites[#cites+1] = {
+ prenote = normalize(raw_cites[i]),
+ suppress_author = raw_cites[i+1] == "-",
+ name = writer.citation(raw_cites[i+2]),
+ postnote = normalize(raw_cites[i+3]),
+ }
+ end
+ return writer.citations(text_cites, cites)
+ end
+
+ local TextCitations
+ = Ct((parsers.spnl
+ * Cc("")
+ * citation_name
+ * ((parsers.spnl
+ * parsers.lbracket
+ * citation_headless_body
+ * parsers.rbracket) + Cc("")))^1)
+ / function(raw_cites)
+ return citations(true, raw_cites)
+ end
+
+ local ParenthesizedCitations
+ = Ct((parsers.spnl
+ * parsers.lbracket
+ * citation_body
+ * parsers.rbracket)^1)
+ / function(raw_cites)
+ return citations(false, raw_cites)
+ end
+
+ local Citations = TextCitations + ParenthesizedCitations
+
+ syntax.Citations = Citations
+ end
+ }
+end
+M.extensions.content_blocks = function(language_map)
+ local languages_json = (function()
+ local ran_ok, kpse = pcall(require, "kpse")
+ if ran_ok then
+ kpse.set_program_name("luatex")
+ else
+ kpse = {lookup=function(filename, options) return filename end}
+ end
+ local base, prev, curr
+ for _, filename in ipairs{kpse.lookup(language_map, { all=true })} do
+ local file = io.open(filename, "r")
+ if not file then goto continue end
+ json = file:read("*all"):gsub('("[^\n]-"):','[%1]=')
+ curr = (function()
+ local _ENV={ json=json, load=load } -- run in sandbox
+ return load("return "..json)()
+ end)()
+ if type(curr) == "table" then
+ if base == nil then
+ base = curr
+ else
+ setmetatable(prev, { __index = curr })
+ end
+ prev = curr
+ end
+ ::continue::
+ end
+ return base or {}
+ end)()
+
+ return {
+ extend_writer = function(self)
+ function self.contentblock(src,suf,type,tit)
+ if not self.is_writing then return "" end
+ src = src.."."..suf
+ suf = suf:lower()
+ if type == "onlineimage" then
+ return {"\\markdownRendererContentBlockOnlineImage{",suf,"}",
+ "{",self.string(src),"}",
+ "{",self.uri(src),"}",
+ "{",self.string(tit or ""),"}"}
+ elseif languages_json[suf] then
+ return {"\\markdownRendererContentBlockCode{",suf,"}",
+ "{",self.string(languages_json[suf]),"}",
+ "{",self.string(src),"}",
+ "{",self.uri(src),"}",
+ "{",self.string(tit or ""),"}"}
+ else
+ return {"\\markdownRendererContentBlock{",suf,"}",
+ "{",self.string(src),"}",
+ "{",self.uri(src),"}",
+ "{",self.string(tit or ""),"}"}
+ end
+ end
+ end, extend_reader = function(self)
+ local parsers = self.parsers
+ local syntax = self.syntax
+ local writer = self.writer
+
+ local contentblock_tail
+ = parsers.optionaltitle
+ * (parsers.newline + parsers.eof)
+
+ -- case insensitive online image suffix:
+ local onlineimagesuffix
+ = (function(...)
+ local parser = nil
+ for _, suffix in ipairs({...}) do
+ local pattern=nil
+ for i=1,#suffix do
+ local char=suffix:sub(i,i)
+ char = S(char:lower()..char:upper())
+ if pattern == nil then
+ pattern = char
+ else
+ pattern = pattern * char
+ end
+ end
+ if parser == nil then
+ parser = pattern
+ else
+ parser = parser + pattern
+ end
+ end
+ return parser
+ end)("png", "jpg", "jpeg", "gif", "tif", "tiff")
+
+ -- online image url for iA Writer content blocks with mandatory suffix,
+ -- allowing nested brackets:
+ local onlineimageurl
+ = (parsers.less
+ * Cs((parsers.anyescaped
+ - parsers.more
+ - #(parsers.period
+ * onlineimagesuffix
+ * parsers.more
+ * contentblock_tail))^0)
+ * parsers.period
+ * Cs(onlineimagesuffix)
+ * parsers.more
+ + (Cs((parsers.inparens
+ + (parsers.anyescaped
+ - parsers.spacing
+ - parsers.rparent
+ - #(parsers.period
+ * onlineimagesuffix
+ * contentblock_tail)))^0)
+ * parsers.period
+ * Cs(onlineimagesuffix))
+ ) * Cc("onlineimage")
+
+ -- filename for iA Writer content blocks with mandatory suffix:
+ local localfilepath
+ = parsers.slash
+ * Cs((parsers.anyescaped
+ - parsers.tab
+ - parsers.newline
+ - #(parsers.period
+ * parsers.alphanumeric^1
+ * contentblock_tail))^1)
+ * parsers.period
+ * Cs(parsers.alphanumeric^1)
+ * Cc("localfile")
+
+ local ContentBlock
+ = parsers.leader
+ * (localfilepath + onlineimageurl)
+ * contentblock_tail
+ / writer.contentblock
+
+ syntax.ContentBlock = ContentBlock
+ end
+ }
+end
+M.extensions.definition_lists = function(tight_lists)
+ return {
+ extend_writer = function(self)
+ local function dlitem(term, defs)
+ local retVal = {"\\markdownRendererDlItem{",term,"}"}
+ for _, def in ipairs(defs) do
+ retVal[#retVal+1] = {"\\markdownRendererDlDefinitionBegin ",def,
+ "\\markdownRendererDlDefinitionEnd "}
+ end
+ retVal[#retVal+1] = "\\markdownRendererDlItemEnd "
+ return retVal
+ end
+
+ function self.definitionlist(items,tight)
+ if not self.is_writing then return "" end
+ local buffer = {}
+ for _,item in ipairs(items) do
+ buffer[#buffer + 1] = dlitem(item.term, item.definitions)
+ end
+ if tight and tight_lists then
+ return {"\\markdownRendererDlBeginTight\n", buffer,
+ "\n\\markdownRendererDlEndTight"}
+ else
+ return {"\\markdownRendererDlBegin\n", buffer,
+ "\n\\markdownRendererDlEnd"}
+ end
+ end
+ end, extend_reader = function(self)
+ local parsers = self.parsers
+ local syntax = self.syntax
+ local writer = self.writer
+
+ local defstartchar = S("~:")
+
+ local defstart = ( defstartchar * #parsers.spacing
+ * (parsers.tab + parsers.space^-3)
+ + parsers.space * defstartchar * #parsers.spacing
+ * (parsers.tab + parsers.space^-2)
+ + parsers.space * parsers.space * defstartchar
+ * #parsers.spacing
+ * (parsers.tab + parsers.space^-1)
+ + parsers.space * parsers.space * parsers.space
+ * defstartchar * #parsers.spacing
+ )
+
+ local dlchunk = Cs(parsers.line * (parsers.indentedline - parsers.blankline)^0)
+
+ local function definition_list_item(term, defs, tight)
+ return { term = self.parser_functions.parse_inlines(term),
+ definitions = defs }
+ end
+
+ local DefinitionListItemLoose
+ = C(parsers.line) * parsers.skipblanklines
+ * Ct((defstart
+ * parsers.indented_blocks(dlchunk)
+ / self.parser_functions.parse_blocks_nested)^1)
+ * Cc(false) / definition_list_item
+
+ local DefinitionListItemTight
+ = C(parsers.line)
+ * Ct((defstart * dlchunk
+ / self.parser_functions.parse_blocks_nested)^1)
+ * Cc(true) / definition_list_item
+
+ local DefinitionList
+ = ( Ct(DefinitionListItemLoose^1) * Cc(false)
+ + Ct(DefinitionListItemTight^1)
+ * (parsers.skipblanklines
+ * -DefinitionListItemLoose * Cc(true))
+ ) / writer.definitionlist
+
+ syntax.DefinitionList = DefinitionList
+ end
+ }
+end
+M.extensions.fenced_code = function(blank_before_code_fence)
+ return {
+ extend_writer = function(self)
+ function self.fencedCode(i, s)
+ if not self.is_writing then return "" end
+ s = string.gsub(s, '[\r\n%s]*$', '')
+ local name = util.cache(self.cacheDir, s, nil, nil, ".verbatim")
+ return {"\\markdownRendererInputFencedCode{",name,"}{",i,"}"}
+ end
+ end, extend_reader = function(self)
+ local parsers = self.parsers
+ local syntax = self.syntax
+ local writer = self.writer
+
+ local function captures_geq_length(s,i,a,b)
+ return #a >= #b and i
+ end
+
+ local infostring = (parsers.linechar - (parsers.backtick
+ + parsers.space^1 * (parsers.newline + parsers.eof)))^0
+
+ local fenceindent
+ local fencehead = function(char)
+ return C(parsers.nonindentspace) / function(s) fenceindent = #s end
+ * Cg(char^3, "fencelength")
+ * parsers.optionalspace * C(infostring)
+ * parsers.optionalspace * (parsers.newline + parsers.eof)
+ end
+
+ local fencetail = function(char)
+ return parsers.nonindentspace
+ * Cmt(C(char^3) * Cb("fencelength"), captures_geq_length)
+ * parsers.optionalspace * (parsers.newline + parsers.eof)
+ + parsers.eof
+ end
+
+ local fencedline = function(char)
+ return C(parsers.line - fencetail(char))
+ / function(s)
+ i = 1
+ remaining = fenceindent
+ while true do
+ c = s:sub(i, i)
+ if c == " " and remaining > 0 then
+ remaining = remaining - 1
+ i = i + 1
+ elseif c == "\t" and remaining > 3 then
+ remaining = remaining - 4
+ i = i + 1
+ else
+ break
+ end
+ end
+ return s:sub(i)
+ end
+ end
+
+ local TildeFencedCode
+ = fencehead(parsers.tilde)
+ * Cs(fencedline(parsers.tilde)^0)
+ * fencetail(parsers.tilde)
+
+ local BacktickFencedCode
+ = fencehead(parsers.backtick)
+ * Cs(fencedline(parsers.backtick)^0)
+ * fencetail(parsers.backtick)
+
+ local FencedCode = (TildeFencedCode
+ + BacktickFencedCode)
+ / function(infostring, code)
+ return writer.fencedCode(writer.string(infostring),
+ self.expandtabs(code))
+ end
+
+ syntax.FencedCode = FencedCode
+
+ if blank_before_code_fence then
+ fencestart = parsers.fail
+ else
+ fencestart = fencehead(parsers.backtick)
+ + fencehead(parsers.tilde)
+ end
+
+ parsers.EndlineExceptions = parsers.EndlineExceptions + fencestart
+ syntax.EndlineExceptions = parsers.EndlineExceptions
+ end
+ }
+end
+M.extensions.footnotes = function(footnotes, inline_footnotes)
+ assert(footnotes or inline_footnotes)
+ return {
+ extend_writer = function(self)
+ function self.note(s)
+ return {"\\markdownRendererFootnote{",s,"}"}
+ end
+ end, extend_reader = function(self)
+ local parsers = self.parsers
+ local syntax = self.syntax
+ local writer = self.writer
+
+ if footnotes then
+ local function strip_first_char(s)
+ return s:sub(2)
+ end
+
+ local RawNoteRef
+ = #(parsers.lbracket * parsers.circumflex)
+ * parsers.tag / strip_first_char
+
+ local rawnotes = {}
+
+ -- like indirect_link
+ local function lookup_note(ref)
+ return writer.defer_call(function()
+ local found = rawnotes[self.normalize_tag(ref)]
+ if found then
+ return writer.note(
+ self.parser_functions.parse_blocks_nested(found))
+ else
+ return {"[",
+ self.parser_functions.parse_inlines("^" .. ref), "]"}
+ end
+ end)
+ end
+
+ local function register_note(ref,rawnote)
+ rawnotes[self.normalize_tag(ref)] = rawnote
+ return ""
+ end
+
+ local NoteRef = RawNoteRef / lookup_note
+
+ local NoteBlock
+ = parsers.leader * RawNoteRef * parsers.colon
+ * parsers.spnl * parsers.indented_blocks(parsers.chunk)
+ / register_note
+
+ parsers.Blank = NoteBlock + parsers.Blank
+ syntax.Blank = parsers.Blank
+
+ syntax.NoteRef = NoteRef
+ end
+ if inline_footnotes then
+ local InlineNote
+ = parsers.circumflex
+ * (parsers.tag / self.parser_functions.parse_inlines_no_inline_note)
+ / writer.note
+ syntax.InlineNote = InlineNote
+ end
+ end
+ }
+end
+M.extensions.header_attributes = function()
+ return {
+ extend_writer = function(self)
+ end, extend_reader = function(self)
+ local parsers = self.parsers
+ local syntax = self.syntax
+ local writer = self.writer
+
+ parsers.AtxHeading = Cg(parsers.HeadingStart,"level")
+ * parsers.optionalspace
+ * (C(((parsers.linechar
+ - ((parsers.hash^1
+ * parsers.optionalspace
+ * parsers.HeadingAttributes^-1
+ + parsers.HeadingAttributes)
+ * parsers.optionalspace
+ * parsers.newline))
+ * (parsers.linechar
+ - parsers.hash
+ - parsers.lbrace)^0)^1)
+ / self.parser_functions.parse_inlines)
+ * Cg(Ct(parsers.newline
+ + (parsers.hash^1
+ * parsers.optionalspace
+ * parsers.HeadingAttributes^-1
+ + parsers.HeadingAttributes)
+ * parsers.optionalspace
+ * parsers.newline), "attributes")
+ * Cb("level")
+ * Cb("attributes")
+ / writer.heading
+
+ parsers.SetextHeading = #(parsers.line * S("=-"))
+ * (C(((parsers.linechar
+ - (parsers.HeadingAttributes
+ * parsers.optionalspace
+ * parsers.newline))
+ * (parsers.linechar
+ - parsers.lbrace)^0)^1)
+ / self.parser_functions.parse_inlines)
+ * Cg(Ct(parsers.newline
+ + (parsers.HeadingAttributes
+ * parsers.optionalspace
+ * parsers.newline)), "attributes")
+ * parsers.HeadingLevel
+ * Cb("attributes")
+ * parsers.optionalspace
+ * parsers.newline
+ / writer.heading
+
+ parsers.Heading = parsers.AtxHeading + parsers.SetextHeading
+ syntax.Heading = parsers.Heading
+ end
+ }
+end
+M.extensions.jekyll_data = function(expect_jekyll_data)
+ return {
+ extend_writer = function(self)
+ function self.jekyllData(d, t, p)
+ if not self.is_writing then return "" end
+
+ local buf = {}
+
+ local keys = {}
+ for k, _ in pairs(d) do
+ table.insert(keys, k)
+ end
+ table.sort(keys)
+
+ if not p then
+ table.insert(buf, "\\markdownRendererJekyllDataBegin")
+ end
+
+ if #d > 0 then
+ table.insert(buf, "\\markdownRendererJekyllDataSequenceBegin{")
+ table.insert(buf, self.uri(p or "null"))
+ table.insert(buf, "}{")
+ table.insert(buf, #keys)
+ table.insert(buf, "}")
+ else
+ table.insert(buf, "\\markdownRendererJekyllDataMappingBegin{")
+ table.insert(buf, self.uri(p or "null"))
+ table.insert(buf, "}{")
+ table.insert(buf, #keys)
+ table.insert(buf, "}")
+ end
+
+ for _, k in ipairs(keys) do
+ local v = d[k]
+ local typ = type(v)
+ k = tostring(k or "null")
+ if typ == "table" and next(v) ~= nil then
+ table.insert(
+ buf,
+ self.jekyllData(v, t, k)
+ )
+ else
+ k = self.uri(k)
+ v = tostring(v)
+ if typ == "boolean" then
+ table.insert(buf, "\\markdownRendererJekyllDataBoolean{")
+ table.insert(buf, k)
+ table.insert(buf, "}{")
+ table.insert(buf, v)
+ table.insert(buf, "}")
+ elseif typ == "number" then
+ table.insert(buf, "\\markdownRendererJekyllDataNumber{")
+ table.insert(buf, k)
+ table.insert(buf, "}{")
+ table.insert(buf, v)
+ table.insert(buf, "}")
+ elseif typ == "string" then
+ table.insert(buf, "\\markdownRendererJekyllDataString{")
+ table.insert(buf, k)
+ table.insert(buf, "}{")
+ table.insert(buf, t(v))
+ table.insert(buf, "}")
+ elseif typ == "table" then
+ table.insert(buf, "\\markdownRendererJekyllDataEmpty{")
+ table.insert(buf, k)
+ table.insert(buf, "}")
+ else
+ error(format("Unexpected type %s for value of " ..
+ "YAML key %s", typ, k))
+ end
+ end
+ end
+
+ if #d > 0 then
+ table.insert(buf, "\\markdownRendererJekyllDataSequenceEnd")
+ else
+ table.insert(buf, "\\markdownRendererJekyllDataMappingEnd")
+ end
+
+ if not p then
+ table.insert(buf, "\\markdownRendererJekyllDataEnd")
+ end
+
+ return buf
+ end
+ end, extend_reader = function(self)
+ local parsers = self.parsers
+ local syntax = self.syntax
+ local writer = self.writer
+
+ local JekyllData
+ = Cmt( C((parsers.line - P("---") - P("..."))^0)
+ , function(s, i, text)
+ local data
+ local ran_ok, error = pcall(function()
+ local tinyyaml = require("markdown-tinyyaml")
+ data = tinyyaml.parse(text, {timestamps=false})
+ end)
+ if ran_ok and data ~= nil then
+ return true, writer.jekyllData(data, function(s)
+ return self.parser_functions.parse_blocks_nested(s)
+ end, nil)
+ else
+ return false
+ end
+ end
+ )
+
+ local UnexpectedJekyllData
+ = P("---")
+ * parsers.blankline / 0
+ * #(-parsers.blankline) -- if followed by blank, it's an hrule
+ * JekyllData
+ * (P("---") + P("..."))
+
+ local ExpectedJekyllData
+ = ( P("---")
+ * parsers.blankline / 0
+ * #(-parsers.blankline) -- if followed by blank, it's an hrule
+ )^-1
+ * JekyllData
+ * (P("---") + P("..."))^-1
+
+ syntax.UnexpectedJekyllData = UnexpectedJekyllData
+ if expect_jekyll_data then
+ syntax.ExpectedJekyllData = ExpectedJekyllData
+ end
+ end
+ }
+end
+M.extensions.pipe_tables = function(table_captions)
+
+ local function make_pipe_table_rectangular(rows)
+ local num_columns = #rows[2]
+ local rectangular_rows = {}
+ for i = 1, #rows do
+ local row = rows[i]
+ local rectangular_row = {}
+ for j = 1, num_columns do
+ rectangular_row[j] = row[j] or ""
+ end
+ table.insert(rectangular_rows, rectangular_row)
+ end
+ return rectangular_rows
+ end
+
+ local function pipe_table_row(allow_empty_first_column
+ , nonempty_column
+ , column_separator
+ , column)
+ local row_beginning
+ if allow_empty_first_column then
+ row_beginning = -- empty first column
+ #(parsers.spacechar^4
+ * column_separator)
+ * parsers.optionalspace
+ * column
+ * parsers.optionalspace
+ -- non-empty first column
+ + parsers.nonindentspace
+ * nonempty_column^-1
+ * parsers.optionalspace
+ else
+ row_beginning = parsers.nonindentspace
+ * nonempty_column^-1
+ * parsers.optionalspace
+ end
+
+ return Ct(row_beginning
+ * (-- single column with no leading pipes
+ #(column_separator
+ * parsers.optionalspace
+ * parsers.newline)
+ * column_separator
+ * parsers.optionalspace
+ -- single column with leading pipes or
+ -- more than a single column
+ + (column_separator
+ * parsers.optionalspace
+ * column
+ * parsers.optionalspace)^1
+ * (column_separator
+ * parsers.optionalspace)^-1))
+ end
+
+ return {
+ extend_writer = function(self)
+ function self.table(rows, caption)
+ if not self.is_writing then return "" end
+ local buffer = {"\\markdownRendererTable{",
+ caption or "", "}{", #rows - 1, "}{", #rows[1], "}"}
+ local temp = rows[2] -- put alignments on the first row
+ rows[2] = rows[1]
+ rows[1] = temp
+ for i, row in ipairs(rows) do
+ table.insert(buffer, "{")
+ for _, column in ipairs(row) do
+ if i > 1 then -- do not use braces for alignments
+ table.insert(buffer, "{")
+ end
+ table.insert(buffer, column)
+ if i > 1 then
+ table.insert(buffer, "}")
+ end
+ end
+ table.insert(buffer, "}")
+ end
+ return buffer
+ end
+ end, extend_reader = function(self)
+ local parsers = self.parsers
+ local syntax = self.syntax
+ local writer = self.writer
+
+ local table_hline_separator = parsers.pipe + parsers.plus
+
+ local table_hline_column = (parsers.dash
+ - #(parsers.dash
+ * (parsers.spacechar
+ + table_hline_separator
+ + parsers.newline)))^1
+ * (parsers.colon * Cc("r")
+ + parsers.dash * Cc("d"))
+ + parsers.colon
+ * (parsers.dash
+ - #(parsers.dash
+ * (parsers.spacechar
+ + table_hline_separator
+ + parsers.newline)))^1
+ * (parsers.colon * Cc("c")
+ + parsers.dash * Cc("l"))
+
+ local table_hline = pipe_table_row(false
+ , table_hline_column
+ , table_hline_separator
+ , table_hline_column)
+
+ local table_caption_beginning = parsers.skipblanklines
+ * parsers.nonindentspace
+ * (P("Table")^-1 * parsers.colon)
+ * parsers.optionalspace
+
+ local table_row = pipe_table_row(true
+ , (C((parsers.linechar - parsers.pipe)^1)
+ / self.parser_functions.parse_inlines)
+ , parsers.pipe
+ , (C((parsers.linechar - parsers.pipe)^0)
+ / self.parser_functions.parse_inlines))
+
+ local table_caption
+ if table_captions then
+ table_caption = #table_caption_beginning
+ * table_caption_beginning
+ * Ct(parsers.IndentedInline^1)
+ * parsers.newline
+ else
+ table_caption = parsers.fail
+ end
+
+ local PipeTable = Ct(table_row * parsers.newline
+ * table_hline
+ * (parsers.newline * table_row)^0)
+ / make_pipe_table_rectangular
+ * table_caption^-1
+ / writer.table
+
+ syntax.PipeTable = PipeTable
+ end
+ }
+end
function M.new(options)
+ options = options or {}
+ setmetatable(options, { __index = function (_, key)
+ return defaultOptions[key] end })
+ extensions = {}
+
+ if options.citations then
+ citations_extension = M.extensions.citations(options.citationNbsps)
+ table.insert(extensions, citations_extension)
+ end
+
+ if options.contentBlocks then
+ content_blocks_extension = M.extensions.content_blocks(
+ options.contentBlocksLanguageMap)
+ table.insert(extensions, content_blocks_extension)
+ end
+
+ if options.definitionLists then
+ definition_lists_extension = M.extensions.definition_lists(
+ options.tightLists)
+ table.insert(extensions, definition_lists_extension)
+ end
+
+ if options.fencedCode then
+ fenced_code_extension = M.extensions.fenced_code(
+ options.blankBeforeCodeFence)
+ table.insert(extensions, fenced_code_extension)
+ end
+
+ if options.footnotes or options.inlineFootnotes then
+ footnotes_extension = M.extensions.footnotes(
+ options.footnotes, options.inlineFootnotes)
+ table.insert(extensions, footnotes_extension)
+ end
+
+ if options.headerAttributes then
+ header_attributes_extension = M.extensions.header_attributes()
+ table.insert(extensions, header_attributes_extension)
+ end
+
+ if options.jekyllData then
+ jekyll_data_extension = M.extensions.jekyll_data(
+ options.expectJekyllData)
+ table.insert(extensions, jekyll_data_extension)
+ end
+
+ if options.pipeTables then
+ pipe_tables_extension = M.extensions.pipe_tables(
+ options.tableCaptions)
+ table.insert(extensions, pipe_tables_extension)
+ end
+
local writer = M.writer.new(options)
- local reader = M.reader.new(writer, options)
+ local reader = M.reader.new(writer, options, extensions)
+
return reader.convert
end