From f64715886f780dbe1414b1b35a55b6177de54022 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Sun, 22 Mar 2020 20:48:39 +0000
Subject: markdown (22mar20)

git-svn-id: svn://tug.org/texlive/trunk@54482 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/tex/luatex/markdown/markdown.lua | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'Master/texmf-dist/tex/luatex')

diff --git a/Master/texmf-dist/tex/luatex/markdown/markdown.lua b/Master/texmf-dist/tex/luatex/markdown/markdown.lua
index 3760928f9b8..36d2b611a78 100644
--- a/Master/texmf-dist/tex/luatex/markdown/markdown.lua
+++ b/Master/texmf-dist/tex/luatex/markdown/markdown.lua
@@ -20,7 +20,7 @@
 -- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 -- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 -- 
--- Copyright (C) 2016-2019 Vít Novotný
+-- Copyright (C) 2016-2020 Vít Novotný
 -- 
 -- This work may be distributed and/or modified under the
 -- conditions of the LaTeX Project Public License, either version 1.3
@@ -58,11 +58,11 @@
 -- those in the standard .ins files.
 -- 
 local metadata = {
-    version   = "2.8.1",
+    version   = "2.8.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-2019 Vít Novotný"},
+                 "2016-2020 Vít Novotný"},
     license   = "LPPL 1.3"
 }
 
@@ -2548,11 +2548,13 @@ function M.writer.new(options)
   end
   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")
     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
@@ -3496,7 +3498,8 @@ larsers.PipeTable = Ct(larsers.table_row * parsers.newline
       end
     end
   end
-  larsers.Str      = parsers.normalchar^1 / writer.string
+  larsers.Str      = (parsers.normalchar * (parsers.normalchar + parsers.at)^0)
+                   / writer.string
 
   larsers.Symbol   = (parsers.specialchar - parsers.tightblocksep)
                    / writer.string
-- 
cgit v1.2.3