summaryrefslogtreecommitdiff
path: root/tex/generic
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2013-11-04 11:52:00 +0100
committerHans Hagen <pragma@wxs.nl>2013-11-04 11:52:00 +0100
commit1026ff3db40f833a3bb9b421f211cfa6770980b2 (patch)
treef1eeb93f7e012a8a04aea6e6f42e2b0957256ce0 /tex/generic
parent66f2e80dd3658ce08c7182cb318272d8e3567c85 (diff)
downloadcontext-1026ff3db40f833a3bb9b421f211cfa6770980b2.tar.gz
beta 2013.11.04 11:52
Diffstat (limited to 'tex/generic')
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua10
1 files changed, 8 insertions, 2 deletions
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,