diff options
author | Norbert Preining <preining@logic.at> | 2013-05-27 01:24:47 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2013-05-27 01:24:47 +0000 |
commit | 04a64779a0d27806141d9b0f6363b27807fba240 (patch) | |
tree | 9f734437a02d6c613113c25bb6f92ac9fed39f06 /Master/texmf-dist/tex/luatex/lualibs/lualibs-extended-merged.lua | |
parent | 14b2656fed04defad4cdc723d7a1de0fd2d21414 (diff) |
lualibs update 5/27
git-svn-id: svn://tug.org/texlive/trunk@30700 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/lualibs/lualibs-extended-merged.lua')
-rw-r--r-- | Master/texmf-dist/tex/luatex/lualibs/lualibs-extended-merged.lua | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Master/texmf-dist/tex/luatex/lualibs/lualibs-extended-merged.lua b/Master/texmf-dist/tex/luatex/lualibs/lualibs-extended-merged.lua index fe87e8a09b8..249f8c7f51b 100644 --- a/Master/texmf-dist/tex/luatex/lualibs/lualibs-extended-merged.lua +++ b/Master/texmf-dist/tex/luatex/lualibs/lualibs-extended-merged.lua @@ -1,6 +1,6 @@ -- merged file : lualibs-extended-merged.lua -- parent file : lualibs-extended.lua --- merge date : Sat May 18 12:25:20 2013 +-- merge date : Thu May 23 21:13:25 2013 do -- begin closure to overcome local limits and interference @@ -766,9 +766,9 @@ function table.deserialize(str) end return code end -function table.load(filename) +function table.load(filename,loader) if filename then - local t=io.loaddata(filename) + local t=(loader or io.loaddata)(filename) if t and t~="" then t=load(t) if type(t)=="function" then @@ -1289,8 +1289,7 @@ local escape=P('\\') local separator=S(' ,') local key=C((1-equal)^1) local value=dquote*C((1-dquote-escape*dquote)^0)*dquote -local pattern=Cf(Ct("")*Cg(key*equal*value)*separator^0,rawset)^0*P(-1) -patterns.keq_to_hash_c=pattern +local pattern=Cf(Ct("")*(Cg(key*equal*value)*separator^0)^1,rawset)^0*P(-1) function parsers.keq_to_hash(str) if str and str~="" then return lpegmatch(pattern,str) |