summaryrefslogtreecommitdiff
path: root/luaotfload-merged.lua
diff options
context:
space:
mode:
authorPhilipp Gesang <phg42.2a@gmail.com>2013-08-24 04:04:16 -0700
committerPhilipp Gesang <phg42.2a@gmail.com>2013-08-24 04:04:16 -0700
commit6c668c8f2624a22a1f4ddd99d9f561ddf2f4bf0a (patch)
tree69c75c7af9464e78445c624a851d2ff9bdbf0e8c /luaotfload-merged.lua
parentcc85c3bba06afda8553158abeac3a05b2e58ec8b (diff)
parenta8cacb62596f720cdb333532974ef8764293cd9b (diff)
downloadluaotfload-6c668c8f2624a22a1f4ddd99d9f561ddf2f4bf0a.tar.gz
Merge pull request #125 from phi-gamma/master
[fontloader] sync with Context as of 2013-08-24
Diffstat (limited to 'luaotfload-merged.lua')
-rw-r--r--luaotfload-merged.lua41
1 files changed, 39 insertions, 2 deletions
diff --git a/luaotfload-merged.lua b/luaotfload-merged.lua
index eb41947..0a19be1 100644
--- a/luaotfload-merged.lua
+++ b/luaotfload-merged.lua
@@ -1,6 +1,6 @@
-- merged file : luatex-fonts-merged.lua
-- parent file : luatex-fonts.lua
--- merge date : 08/22/13 15:28:35
+-- merge date : 08/24/13 12:19:21
do -- begin closure to overcome local limits and interference
@@ -2621,6 +2621,7 @@ local tracedchar = string.tracedchar
local autosingle = string.autosingle
local autodouble = string.autodouble
local sequenced = table.sequenced
+local formattednumber = number.formatted
]]
local template=[[
%s
@@ -2817,6 +2818,39 @@ end
local format_W=function(f)
return format("nspaces[%s]",tonumber(f) or 0)
end
+local digit=patterns.digit
+local period=patterns.period
+local three=digit*digit*digit
+local splitter=Cs (
+ (((1-(three^1*period))^1+C(three))*(Carg(1)*three)^1+C((1-period)^1))*(P(1)/""*Carg(2))*C(2)
+)
+patterns.formattednumber=splitter
+function number.formatted(n,sep1,sep2)
+ local s=type(s)=="string" and n or format("%0.2f",n)
+ if sep1==true then
+ return lpegmatch(splitter,s,1,".",",")
+ elseif sep1=="." then
+ return lpegmatch(splitter,s,1,sep1,sep2 or ",")
+ elseif sep1=="," then
+ return lpegmatch(splitter,s,1,sep1,sep2 or ".")
+ else
+ return lpegmatch(splitter,s,1,sep1 or ",",sep2 or ".")
+ end
+end
+local format_m=function(f)
+ n=n+1
+ if not f or f=="" then
+ f=","
+ end
+ return format([[formattednumber(a%s,%q,".")]],n,f)
+end
+local format_M=function(f)
+ n=n+1
+ if not f or f=="" then
+ f="."
+ end
+ return format([[formattednumber(a%s,%q,",")]],n,f)
+end
local format_rest=function(s)
return format("%q",s)
end
@@ -2854,7 +2888,8 @@ local builder=Cs { "start",
+V("w")
+V("W")
+V("a")
-+V("A")
++V("A")
++V("m")+V("M")
+V("*")
)+V("*")
)*(P(-1)+Carg(1))
@@ -2890,6 +2925,8 @@ local builder=Cs { "start",
["I"]=(prefix_any*P("I"))/format_I,
["w"]=(prefix_any*P("w"))/format_w,
["W"]=(prefix_any*P("W"))/format_W,
+ ["m"]=(prefix_tab*P("m"))/format_m,
+ ["M"]=(prefix_tab*P("M"))/format_M,
["a"]=(prefix_any*P("a"))/format_a,
["A"]=(prefix_any*P("A"))/format_A,
["*"]=Cs(((1-P("%"))^1+P("%%")/"%%")^1)/format_rest,