diff options
author | Karl Berry <karl@freefriends.org> | 2019-11-14 21:55:29 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-11-14 21:55:29 +0000 |
commit | 0d0a8e1ba25d24da6db332760588a1a922028652 (patch) | |
tree | 351e53d86b78cb5bc7c0ac04cc11cea0828e0cb8 /Master/texmf-dist/tex/luatex | |
parent | e7c52b7fbf07f5e89c3cae711e6ec9752a1e361f (diff) |
luamplib (14nov19)
git-svn-id: svn://tug.org/texlive/trunk@52795 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex')
-rw-r--r-- | Master/texmf-dist/tex/luatex/luamplib/luamplib.lua | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua b/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua index ac47afc42b3..69ab5cef027 100644 --- a/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua +++ b/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua @@ -580,22 +580,22 @@ luamplib.verbatiminput = false local function protect_expansion (str) if str then - str = str:gsub("\\","\1Control\1") - :gsub("%%","\1Comment\1") - :gsub("#", "\1HashSign\1") - :gsub("{", "\1LBrace\1") - :gsub("}", "\1RBrace\1") + str = str:gsub("\\","!!!Control!!!") + :gsub("%%","!!!Comment!!!") + :gsub("#", "!!!HashSign!!!") + :gsub("{", "!!!LBrace!!!") + :gsub("}", "!!!RBrace!!!") return format("\\unexpanded{%s}",str) end end local function unprotect_expansion (str) if str then - return str:gsub("\1Control\1", "\\") - :gsub("\1Comment\1", "%%") - :gsub("\1HashSign\1","#") - :gsub("\1LBrace\1", "{") - :gsub("\1RBrace\1", "}") + return str:gsub("!!!Control!!!", "\\") + :gsub("!!!Comment!!!", "%%") + :gsub("!!!HashSign!!!","#") + :gsub("!!!LBrace!!!", "{") + :gsub("!!!RBrace!!!", "}") end end @@ -622,7 +622,11 @@ local function process_mplibcode (data) if not luamplib.verbatiminput then data = data:gsub("\".-\"", protect_expansion) + + data = data:gsub("\\%%", "\0PerCent\0") data = data:gsub("%%.-\n","") + data = data:gsub("%zPerCent%z", "\\%%") + run_tex_code(format("\\mplibtmptoks\\expanded{{%s}}",data)) data = texgettoks"mplibtmptoks" data = data:gsub("##", "#") |