From e24fc47671ac0421cef5d8b8dcfffdf6d8b068e4 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Wed, 14 Sep 2016 21:07:46 +0000
Subject: markdown (14sep16)

git-svn-id: svn://tug.org/texlive/trunk@42057 c570f23f-e606-0410-a88d-b1316a301751
---
 .../texmf-dist/doc/generic/markdown/markdown.pdf   | Bin 322918 -> 323177 bytes
 .../source/generic/markdown/markdown.dtx           |  25 ++++++++++++---------
 .../texmf-dist/tex/generic/markdown/markdown.tex   |   4 ++--
 Master/texmf-dist/tex/luatex/markdown/markdown.lua |  12 +++++-----
 4 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/Master/texmf-dist/doc/generic/markdown/markdown.pdf b/Master/texmf-dist/doc/generic/markdown/markdown.pdf
index 338ca1c1363..9541b6762c7 100644
Binary files a/Master/texmf-dist/doc/generic/markdown/markdown.pdf and b/Master/texmf-dist/doc/generic/markdown/markdown.pdf differ
diff --git a/Master/texmf-dist/source/generic/markdown/markdown.dtx b/Master/texmf-dist/source/generic/markdown/markdown.dtx
index 4a78e77069c..fcec3ee46ce 100644
--- a/Master/texmf-dist/source/generic/markdown/markdown.dtx
+++ b/Master/texmf-dist/source/generic/markdown/markdown.dtx
@@ -147,7 +147,7 @@
 % \fi
 %  \begin{macrocode}
 local metadata = {
-    version   = "2.1.1",
+    version   = "2.1.2",
     comment   = "A module for the conversion from markdown to plain TeX",
     author    = "John MacFarlane, Hans Hagen, Vít Novotný",
     copyright = "2009-2016 John MacFarlane, Hans Hagen; 2016 Vít Novotný",
@@ -444,7 +444,12 @@ defaultOptions.definitionLists = false
 %   \Optitem[false]{hashEnumerators}{\opt{true}, \opt{false}}
 %     \begin{valuelist}
 %       \item[true] Enable the use of hash symbols (\t`\#`) as ordered item
-%         list markers.
+%         list markers:
+%         \begin{Verbatim}
+% #.  Bird
+% #.  McHale
+% #.  Parish
+%         \end{Verbatim}
 %       \item[false] Disable the use of hash symbols (\t`\#`) as ordered item
 %         list markers.
 %     \end{valuelist}
@@ -581,8 +586,8 @@ defaultOptions.tightLists = 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{2016/09/06}%
-\def\markdownVersion{2.1.1}%
+\def\markdownLastModified{2016/09/13}%
+\def\markdownVersion{2.1.2}%
 %    \end{macrocode}
 %
 % The plain \TeX{} interface is implemented by the \t`markdown.tex` file that
@@ -2009,7 +2014,7 @@ function util.escaper(char_escapes, string_escapes)
 % \]}^^A
 % capture that replaces any occurance of the string \t`k` with the string
 % \t`v` for each $(\t`k`, \t`v`)\in\t`string\_escapes`$. Note that the pattern
-% summation is not commutative and the its operands are inspected in the
+% summation is not commutative and its operands are inspected in the
 % summation order during the matching. As a corrolary, the strings always
 % take precedence over the characters.
 %  \begin{macrocode}
@@ -2611,11 +2616,11 @@ function M.reader.new(writer, options)
 %  \begin{macrocode}
   local bulletchar = C(plus + asterisk + dash)
 
-  local bullet     = ( bulletchar * #spacing * (tab + space^-3)
-                     + space * bulletchar * #spacing * (tab + space^-2)
-                     + space * space * bulletchar * #spacing * (tab + space^-1)
-                     + space * space * space * bulletchar * #spacing
-                     ) * -bulletchar
+  local bullet     = ( Cg(bulletchar, "bulletchar") * #spacing * (tab + space^-3)
+                     + space * Cg(bulletchar, "bulletchar") * #spacing * (tab + space^-2)
+                     + space * space * Cg(bulletchar, "bulletchar") * #spacing * (tab + space^-1)
+                     + space * space * space * Cg(bulletchar, "bulletchar") * #spacing
+                     )
 
   if options.hashEnumerators then
     dig = digit + hash
diff --git a/Master/texmf-dist/tex/generic/markdown/markdown.tex b/Master/texmf-dist/tex/generic/markdown/markdown.tex
index 532fc114507..d058b57541c 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{2016/09/06}%
-\def\markdownVersion{2.1.1}%
+\def\markdownLastModified{2016/09/13}%
+\def\markdownVersion{2.1.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 c62b5ed8b95..a8e6ce7f9e5 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.1.1",
+    version   = "2.1.2",
     comment   = "A module for the conversion from markdown to plain TeX",
     author    = "John MacFarlane, Hans Hagen, Vít Novotný",
     copyright = "2009-2016 John MacFarlane, Hans Hagen; 2016 Vít Novotný",
@@ -545,11 +545,11 @@ function M.reader.new(writer, options)
   end
   local bulletchar = C(plus + asterisk + dash)
 
-  local bullet     = ( bulletchar * #spacing * (tab + space^-3)
-                     + space * bulletchar * #spacing * (tab + space^-2)
-                     + space * space * bulletchar * #spacing * (tab + space^-1)
-                     + space * space * space * bulletchar * #spacing
-                     ) * -bulletchar
+  local bullet     = ( Cg(bulletchar, "bulletchar") * #spacing * (tab + space^-3)
+                     + space * Cg(bulletchar, "bulletchar") * #spacing * (tab + space^-2)
+                     + space * space * Cg(bulletchar, "bulletchar") * #spacing * (tab + space^-1)
+                     + space * space * space * Cg(bulletchar, "bulletchar") * #spacing
+                     )
 
   if options.hashEnumerators then
     dig = digit + hash
-- 
cgit v1.2.3