diff options
| -rw-r--r-- | Master/texmf-dist/doc/generic/markdown/markdown.pdf | bin | 346795 -> 346756 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/generic/markdown/markdown.dtx | 24 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/generic/markdown/markdown.tex | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/luatex/markdown/markdown.lua | 20 |
4 files changed, 32 insertions, 16 deletions
diff --git a/Master/texmf-dist/doc/generic/markdown/markdown.pdf b/Master/texmf-dist/doc/generic/markdown/markdown.pdf Binary files differindex d7d0e73eeb5..4d3419676b9 100644 --- a/Master/texmf-dist/doc/generic/markdown/markdown.pdf +++ b/Master/texmf-dist/doc/generic/markdown/markdown.pdf diff --git a/Master/texmf-dist/source/generic/markdown/markdown.dtx b/Master/texmf-dist/source/generic/markdown/markdown.dtx index 876a9e27dfe..b836b44ef38 100644 --- a/Master/texmf-dist/source/generic/markdown/markdown.dtx +++ b/Master/texmf-dist/source/generic/markdown/markdown.dtx @@ -156,7 +156,7 @@ % \fi % \begin{macrocode} local metadata = { - version = "2.5.1", + version = "2.5.2", comment = "A module for the conversion from markdown to plain TeX", author = "John MacFarlane, Hans Hagen, Vít Novotný", copyright = "2009-2017 John MacFarlane, Hans Hagen; " .. @@ -719,8 +719,8 @@ defaultOptions.underscores = true % \ref{sec:luaoptions}) used during the conversion from markdown to plain % \TeX{}, and for changing the way markdown the tokens are rendered. % \begin{macrocode} -\def\markdownLastModified{2017/04/27}% -\def\markdownVersion{2.5.1}% +\def\markdownLastModified{2017/04/28}% +\def\markdownVersion{2.5.2}% % \end{macrocode} % % The plain \TeX{} interface is implemented by the \t`markdown.tex` file that @@ -3039,7 +3039,9 @@ parsers.letter = R("AZ","az") parsers.alphanumeric = R("AZ","az","09") parsers.keyword = parsers.letter * parsers.alphanumeric^0 -parsers.internal_punctuation = S(":;,.#$%&-+?<>~/_") +parsers.citation_chars = parsers.alphanumeric + + S("#$%&-+<>~/_") +parsers.internal_punctuation = S(":;,.?") parsers.doubleasterisks = P("**") parsers.doubleunderscores = P("__") @@ -3311,9 +3313,14 @@ parsers.localfilepath % \paragraph{Parsers Used for Citations} % \begin{macrocode} parsers.citation_name = Cs(parsers.dash^-1) * parsers.at - * Cs(parsers.alphanumeric - * (parsers.alphanumeric + parsers.internal_punctuation - - parsers.comma - parsers.semicolon)^0) + * 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 @@ -3335,7 +3342,8 @@ parsers.citation_body_postnote parsers.citation_body_chunk = parsers.citation_body_prenote * parsers.spnl * parsers.citation_name - * (parsers.comma * parsers.spnl)^-1 + * ((parsers.internal_punctuation - parsers.semicolon) + * parsers.spnl)^-1 * parsers.citation_body_postnote parsers.citation_body diff --git a/Master/texmf-dist/tex/generic/markdown/markdown.tex b/Master/texmf-dist/tex/generic/markdown/markdown.tex index 15b3a89f688..1e80158f326 100644 --- a/Master/texmf-dist/tex/generic/markdown/markdown.tex +++ b/Master/texmf-dist/tex/generic/markdown/markdown.tex @@ -45,8 +45,8 @@ %% %% The names of the source files used are shown above. %% -\def\markdownLastModified{2017/04/27}% -\def\markdownVersion{2.5.1}% +\def\markdownLastModified{2017/04/28}% +\def\markdownVersion{2.5.2}% \let\markdownBegin\relax \let\markdownEnd\relax \let\markdownInput\relax diff --git a/Master/texmf-dist/tex/luatex/markdown/markdown.lua b/Master/texmf-dist/tex/luatex/markdown/markdown.lua index c1a4b631e4f..e2c7527b3fd 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.5.1", + version = "2.5.2", comment = "A module for the conversion from markdown to plain TeX", author = "John MacFarlane, Hans Hagen, Vít Novotný", copyright = "2009-2017 John MacFarlane, Hans Hagen; " .. @@ -777,7 +777,9 @@ parsers.letter = R("AZ","az") parsers.alphanumeric = R("AZ","az","09") parsers.keyword = parsers.letter * parsers.alphanumeric^0 -parsers.internal_punctuation = S(":;,.#$%&-+?<>~/_") +parsers.citation_chars = parsers.alphanumeric + + S("#$%&-+<>~/_") +parsers.internal_punctuation = S(":;,.?") parsers.doubleasterisks = P("**") parsers.doubleunderscores = P("__") @@ -1031,9 +1033,14 @@ parsers.localfilepath * Cs(parsers.alphanumeric^1) * Cc("localfile") parsers.citation_name = Cs(parsers.dash^-1) * parsers.at - * Cs(parsers.alphanumeric - * (parsers.alphanumeric + parsers.internal_punctuation - - parsers.comma - parsers.semicolon)^0) + * 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 @@ -1055,7 +1062,8 @@ parsers.citation_body_postnote parsers.citation_body_chunk = parsers.citation_body_prenote * parsers.spnl * parsers.citation_name - * (parsers.comma * parsers.spnl)^-1 + * ((parsers.internal_punctuation - parsers.semicolon) + * parsers.spnl)^-1 * parsers.citation_body_postnote parsers.citation_body |