diff options
| author | Hans Hagen <pragma@wxs.nl> | 2013-03-05 16:40:00 +0100 |
|---|---|---|
| committer | Hans Hagen <pragma@wxs.nl> | 2013-03-05 16:40:00 +0100 |
| commit | 7be0d39244155e874321d77ef81078c5bd2817a9 (patch) | |
| tree | 0c09404e97c825961c5ee25a31ecab080eff54e6 /tex/generic | |
| parent | 4eeccc18e84e817ecf7045bcb0a8d35875006f42 (diff) | |
| download | context-7be0d39244155e874321d77ef81078c5bd2817a9.tar.gz | |
beta 2013.03.05 16:40
Diffstat (limited to 'tex/generic')
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index fe68795ec..9b7689ac1 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 : 03/04/13 18:28:23 +-- merge date : 03/05/13 16:40:59 do -- begin closure to overcome local limits and interference @@ -2209,7 +2209,7 @@ local boolean=boolean function boolean.tonumber(b) if b then return 1 else return 0 end end -function toboolean(str,tolerant) +function toboolean(str,tolerant) if str==nil then return false elseif str==false then @@ -2232,18 +2232,16 @@ function toboolean(str,tolerant) end string.toboolean=toboolean function string.booleanstring(str) - if str==nil then - return false - elseif str==false then + if str=="0" then return false - elseif str==true then - return true - elseif str=="true" then + elseif str=="1" then return true - elseif str=="false" then + elseif str=="" then return false - elseif str==0 then + elseif str=="false" then return false + elseif str=="true" then + return true elseif (tonumber(str) or 0)>0 then return true else |