summaryrefslogtreecommitdiff
path: root/tex/generic
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2011-10-19 00:02:00 +0200
committerHans Hagen <pragma@wxs.nl>2011-10-19 00:02:00 +0200
commit6b9f1e30b7fb3e3498dbef507e46e05c361a4055 (patch)
tree5b10d5fedb542215cce42152b291c917d092cda4 /tex/generic
parent44113dd5530d4653fe335ad13ccf80fb8882d5e7 (diff)
downloadcontext-6b9f1e30b7fb3e3498dbef507e46e05c361a4055.tar.gz
beta 2011.10.19 00:02
Diffstat (limited to 'tex/generic')
-rw-r--r--tex/generic/context/luatex/luatex-basics-gen.lua2
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua9
2 files changed, 10 insertions, 1 deletions
diff --git a/tex/generic/context/luatex/luatex-basics-gen.lua b/tex/generic/context/luatex/luatex-basics-gen.lua
index c0fc396ad..bdbc3cf51 100644
--- a/tex/generic/context/luatex/luatex-basics-gen.lua
+++ b/tex/generic/context/luatex/luatex-basics-gen.lua
@@ -80,6 +80,8 @@ local remapper = {
dfont = "truetype fonts", -- "truetype dictionary",
cid = "cid maps",
fea = "font feature files",
+ pfa = "type1 fonts", -- this is for Khaled, in ConTeXt we don't use this!
+ pfb = "type1 fonts", -- this is for Khaled, in ConTeXt we don't use this!
}
function resolvers.findfile(name,fileformat)
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index a115ae001..6c947293d 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 : 10/18/11 22:09:27
+-- merge date : 10/19/11 00:02:57
do -- begin closure to overcome local limits and interference
@@ -2688,6 +2688,8 @@ local remapper = {
dfont = "truetype fonts", -- "truetype dictionary",
cid = "cid maps",
fea = "font feature files",
+ pfa = "type1 fonts", -- this is for Khaled, in ConTeXt we don't use this!
+ pfb = "type1 fonts", -- this is for Khaled, in ConTeXt we don't use this!
}
function resolvers.findfile(name,fileformat)
@@ -6937,6 +6939,11 @@ local function copytotfm(data,cache_id)
local fullname = metadata.fullname or fontname
local units = metadata.units_per_em or 1000
--
+ if units == 0 then -- catch bugs in fonts
+ units = 1000
+ metadata.units_per_em = 1000
+ end
+ --
parameters.slant = 0
parameters.space = spaceunits -- 3.333 (cmr10)
parameters.space_stretch = units/2 -- 500 -- 1.666 (cmr10)