From 176eb4a0fb38bc08a1b93b60d9d68f613e08411e Mon Sep 17 00:00:00 2001
From: Marius <mariausol@gmail.com>
Date: Mon, 4 Nov 2013 13:00:19 +0200
Subject: beta 2013.11.04 11:52
---
tex/generic/context/luatex/luatex-fonts-merged.lua | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
(limited to 'tex/generic')
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index d46a163a8..3e89856fb 100644
--- a/tex/generic/context/luatex/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
-- merged file : luatex-fonts-merged.lua
-- parent file : luatex-fonts.lua
--- merge date : 11/04/13 11:26:47
+-- merge date : 11/04/13 11:52:02
do -- begin closure to overcome local limits and interference
@@ -2894,6 +2894,10 @@ local format_M=function(f)
end
return format([[formattednumber(a%s,%q,",")]],n,f)
end
+local format_z=function(f)
+ n=n+(tonumber(f) or 1)
+ return "''"
+end
local format_rest=function(s)
return format("%q",s)
end
@@ -2932,7 +2936,8 @@ local builder=Cs { "start",
+V("a")
+V("A")
+V("j")+V("J")
-+V("m")+V("M")
++V("m")+V("M")
++V("z")
+V("*")
)+V("*")
)*(P(-1)+Carg(1))
@@ -2972,6 +2977,7 @@ local builder=Cs { "start",
["J"]=(prefix_any*P("J"))/format_J,
["m"]=(prefix_tab*P("m"))/format_m,
["M"]=(prefix_tab*P("M"))/format_M,
+ ["z"]=(prefix_any*P("z"))/format_z,
["a"]=(prefix_any*P("a"))/format_a,
["A"]=(prefix_any*P("A"))/format_A,
["*"]=Cs(((1-P("%"))^1+P("%%")/"%%")^1)/format_rest,
--
cgit v1.2.3