texlive[44118] Master/texmf-dist: markdown (29apr17)
commits+karl at tug.org
commits+karl at tug.org
Sun Apr 30 00:23:07 CEST 2017
Revision: 44118
http://tug.org/svn/texlive?view=revision&revision=44118
Author: karl
Date: 2017-04-30 00:23:07 +0200 (Sun, 30 Apr 2017)
Log Message:
-----------
markdown (29apr17)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/generic/markdown/markdown.pdf
trunk/Master/texmf-dist/source/generic/markdown/markdown.dtx
trunk/Master/texmf-dist/tex/generic/markdown/markdown.tex
trunk/Master/texmf-dist/tex/luatex/markdown/markdown.lua
Modified: trunk/Master/texmf-dist/doc/generic/markdown/markdown.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/generic/markdown/markdown.dtx
===================================================================
--- trunk/Master/texmf-dist/source/generic/markdown/markdown.dtx 2017-04-29 22:22:55 UTC (rev 44117)
+++ trunk/Master/texmf-dist/source/generic/markdown/markdown.dtx 2017-04-29 22:23:07 UTC (rev 44118)
@@ -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 @@
% \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.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 @@
% \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_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
Modified: trunk/Master/texmf-dist/tex/generic/markdown/markdown.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/markdown/markdown.tex 2017-04-29 22:22:55 UTC (rev 44117)
+++ trunk/Master/texmf-dist/tex/generic/markdown/markdown.tex 2017-04-29 22:23:07 UTC (rev 44118)
@@ -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
Modified: trunk/Master/texmf-dist/tex/luatex/markdown/markdown.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/markdown/markdown.lua 2017-04-29 22:22:55 UTC (rev 44117)
+++ trunk/Master/texmf-dist/tex/luatex/markdown/markdown.lua 2017-04-29 22:23:07 UTC (rev 44118)
@@ -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.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 @@
* 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_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
More information about the tex-live-commits
mailing list