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/context/base/cont-new.mkiv | 2 +-
tex/context/base/context-version.pdf | Bin 4104 -> 4104 bytes
tex/context/base/context.mkiv | 2 +-
tex/context/base/status-files.pdf | Bin 24559 -> 24572 bytes
tex/context/base/status-lua.pdf | Bin 225277 -> 225232 bytes
tex/context/base/util-str.lua | 12 +++++++++++-
tex/generic/context/luatex/luatex-fonts-merged.lua | 10 ++++++++--
7 files changed, 21 insertions(+), 5 deletions(-)
(limited to 'tex')
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index e3afc90d0..0a084215f 100644
--- a/tex/context/base/cont-new.mkiv
+++ b/tex/context/base/cont-new.mkiv
@@ -11,7 +11,7 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\newcontextversion{2013.11.04 11:26}
+\newcontextversion{2013.11.04 11:52}
%D This file is loaded at runtime, thereby providing an excellent place for
%D hacks, patches, extensions and new features.
diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index 8d46d3fd6..3d5cd990f 100644
Binary files a/tex/context/base/context-version.pdf and b/tex/context/base/context-version.pdf differ
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 730cc4684..c598e9d6c 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -25,7 +25,7 @@
%D up and the dependencies are more consistent.
\edef\contextformat {\jobname}
-\edef\contextversion{2013.11.04 11:26}
+\edef\contextversion{2013.11.04 11:52}
\edef\contextkind {beta}
%D For those who want to use this:
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 2d2f3f1dd..15ebfb22f 100644
Binary files a/tex/context/base/status-files.pdf and b/tex/context/base/status-files.pdf differ
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index 9f87ac30b..8b7df2357 100644
Binary files a/tex/context/base/status-lua.pdf and b/tex/context/base/status-lua.pdf differ
diff --git a/tex/context/base/util-str.lua b/tex/context/base/util-str.lua
index 09fa26f94..24a3f6e82 100644
--- a/tex/context/base/util-str.lua
+++ b/tex/context/base/util-str.lua
@@ -614,6 +614,13 @@ end
--
+local format_z = function(f)
+ n = n + (tonumber(f) or 1)
+ return "''" -- okay, not that efficient to append '' but a special case anyway
+end
+
+--
+
local format_rest = function(s)
return format("%q",s) -- catches " and \n and such
end
@@ -671,6 +678,7 @@ local builder = Cs { "start",
+ V("A") -- new
+ V("j") + V("J") -- stripped e E
+ V("m") + V("M") -- new
+ + V("z") -- new
--
+ V("*") -- ignores probably messed up %
)
@@ -720,6 +728,8 @@ local builder = Cs { "start",
["m"] = (prefix_tab * P("m")) / format_m, -- %m => xxx.xxx.xxx,xx (optional prefix instead of .)
["M"] = (prefix_tab * P("M")) / format_M, -- %M => xxx,xxx,xxx.xx (optional prefix instead of ,)
--
+ ["z"] = (prefix_any * P("z")) / format_z, -- %M => xxx,xxx,xxx.xx (optional prefix instead of ,)
+ --
["a"] = (prefix_any * P("a")) / format_a, -- %a => '...' (forces tostring)
["A"] = (prefix_any * P("A")) / format_A, -- %A => "..." (forces tostring)
--
@@ -750,7 +760,7 @@ local function make(t,str)
p = lpegmatch(builder,str,1,"..",t._extensions_) -- after this we know n
if n > 0 then
p = format(template,preamble,t._preamble_,arguments[n],p)
--- print("builder>",p)
+-- print("builder>",p)
f = loadstripped(p)()
else
f = function() return str end
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