diff options
author | Philipp Gesang <phg42.2a@gmail.com> | 2014-03-24 07:57:09 +0100 |
---|---|---|
committer | Philipp Gesang <phg42.2a@gmail.com> | 2014-03-24 07:57:09 +0100 |
commit | 2d9d2b43c13b24a71e54796fa15166c97be64fbc (patch) | |
tree | fdf6aa12e4ffc178aa0d64a60ee8feb9e1a30516 /src/luaotfload-fontloader.lua | |
parent | d5d47a03f73afd6b1743636b20f4064b0643ba20 (diff) | |
parent | 2d555b40fc580e3ef9328a1f47544d4286b8b860 (diff) | |
download | luaotfload-2d9d2b43c13b24a71e54796fa15166c97be64fbc.tar.gz |
Merge pull request #208 from phi-gamma/texlive2014
add bisect mode
Diffstat (limited to 'src/luaotfload-fontloader.lua')
-rw-r--r-- | src/luaotfload-fontloader.lua | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/luaotfload-fontloader.lua b/src/luaotfload-fontloader.lua index 196fc61..655aedf 100644 --- a/src/luaotfload-fontloader.lua +++ b/src/luaotfload-fontloader.lua @@ -1,6 +1,6 @@ -- merged file : luatex-fonts-merged.lua -- parent file : luatex-fonts.lua --- merge date : 03/16/14 11:40:51 +-- merge date : 03/22/14 15:31:38 do -- begin closure to overcome local limits and interference @@ -2574,9 +2574,11 @@ end if not number then number={} end local stripper=patterns.stripzeros local function points(n) + n=tonumber(n) return (not n or n==0) and "0pt" or lpegmatch(stripper,format("%.5fpt",n/65536)) end local function basepoints(n) + n=tonumber(n) return (not n or n==0) and "0bp" or lpegmatch(stripper,format("%.5fbp",n*(7200/7227)/65536)) end number.points=points @@ -6569,7 +6571,7 @@ local report_otf=logs.reporter("fonts","otf loading") local fonts=fonts local otf=fonts.handlers.otf otf.glists={ "gsub","gpos" } -otf.version=2.754 +otf.version=2.755 otf.cache=containers.define("fonts","otf",otf.version,true) local fontdata=fonts.hashes.identifiers local chardata=characters and characters.data |