summaryrefslogtreecommitdiff
path: root/luaotfload-fontloader.lua
diff options
context:
space:
mode:
authorPhilipp Gesang <phg42.2a@gmail.com>2014-02-07 08:11:33 +0100
committerPhilipp Gesang <phg42.2a@gmail.com>2014-02-07 08:11:33 +0100
commit72692325b88bda53a115e62c66b321253297533b (patch)
treeb776f81511e6aa0d28165a1ad6e5ed1ea86a7165 /luaotfload-fontloader.lua
parentc88eb25bd287941119e1db0f52919e4beccb0114 (diff)
parent20e5ffb1360a102ac52e3a0a99513499051318b8 (diff)
downloadluaotfload-72692325b88bda53a115e62c66b321253297533b.tar.gz
Merge pull request #191 from phi-gamma/texlive2014
sync with Context; handle broken ps names
Diffstat (limited to 'luaotfload-fontloader.lua')
-rw-r--r--luaotfload-fontloader.lua10
1 files changed, 8 insertions, 2 deletions
diff --git a/luaotfload-fontloader.lua b/luaotfload-fontloader.lua
index 3986118..8c31750 100644
--- a/luaotfload-fontloader.lua
+++ b/luaotfload-fontloader.lua
@@ -1,6 +1,6 @@
-- merged file : luatex-fonts-merged.lua
-- parent file : luatex-fonts.lua
--- merge date : 02/01/14 14:22:42
+-- merge date : 02/07/14 00:57:35
do -- begin closure to overcome local limits and interference
@@ -6450,7 +6450,7 @@ local report_otf=logs.reporter("fonts","otf loading")
local fonts=fonts
local otf=fonts.handlers.otf
otf.glists={ "gsub","gpos" }
-otf.version=2.750
+otf.version=2.751
otf.cache=containers.define("fonts","otf",otf.version,true)
local fontdata=fonts.hashes.identifiers
local chardata=characters and characters.data
@@ -6602,6 +6602,7 @@ local valid_fields=table.tohash {
"upos",
"use_typo_metrics",
"uwidth",
+ "validation_state",
"version",
"vert_base",
"weight",
@@ -7914,6 +7915,11 @@ actions["check metadata"]=function(data,filename,raw)
ttftables[i].data="deleted"
end
end
+ if metadata.validation_state and table.contains(metadata.validation_state,"bad_ps_fontname") then
+ local name=file.nameonly(filename)
+ metadata.fontname="bad-fontname-"..name
+ metadata.fullname="bad-fullname-"..name
+ end
end
actions["cleanup tables"]=function(data,filename,raw)
data.resources.indices=nil