summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-auxiliary.lua
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luaotfload/luaotfload-auxiliary.lua')
-rw-r--r--Master/texmf-dist/tex/luatex/luaotfload/luaotfload-auxiliary.lua34
1 files changed, 24 insertions, 10 deletions
diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-auxiliary.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-auxiliary.lua
index bb1e8f9048b..8fc84772161 100644
--- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-auxiliary.lua
+++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-auxiliary.lua
@@ -2,9 +2,9 @@
-----------------------------------------------------------------------
-- FILE: luaotfload-auxiliary.lua
-- DESCRIPTION: part of luaotfload
--- REQUIREMENTS: luaotfload 2.2
+-- REQUIREMENTS: luaotfload 2.3
-- AUTHOR: Khaled Hosny, Élie Roux, Philipp Gesang
--- VERSION: 2.2
+-- VERSION: 2.3
-- CREATED: 2013-05-01 14:40:50+0200
-----------------------------------------------------------------------
--
@@ -42,6 +42,21 @@ local tablecopy = table.copy
--- font patches
-----------------------------------------------------------------------
+--- https://github.com/khaledhosny/luaotfload/issues/54
+
+local rewrite_fontname = function (tfmdata, specification)
+ tfmdata.name = [["]] .. specification .. [["]]
+end
+
+luatexbase.add_to_callback(
+ "luaotfload.patch_font",
+ rewrite_fontname,
+ "luaotfload.rewrite_fontname")
+
+--- as of 2.3 the compatibility hacks for TL 2013 are made optional
+
+if config.luaotfload.compatibility == true then
+
--[[doc--
The font object (tfmdata) structure has changed since version 1.x, so
@@ -101,13 +116,10 @@ local add_fontdata_fallbacks = function (fontdata)
return fontdata
end
---if config.luaotfload.compatibility == true then
-if true then
- luatexbase.add_to_callback(
- "luaotfload.patch_font",
- add_fontdata_fallbacks,
- "luaotfload.fontdata_fallbacks")
-end
+luatexbase.add_to_callback(
+ "luaotfload.patch_font",
+ add_fontdata_fallbacks,
+ "luaotfload.fontdata_fallbacks")
--[[doc--
@@ -124,6 +136,8 @@ font.getfont() since Hans made it a harmless wrapper [1].)
fonts.identifiers = fonts.hashes.identifiers
fonts.ids = fonts.hashes.identifiers
+end
+
--[[doc--
This sets two dimensions apparently relied upon by the unicode-math
package.
@@ -344,7 +358,7 @@ do
local index = function (t, k)
if chardata == nil then
log("Loading character metadata from %s.", chardef)
- chardata = dofile(kpse.find_file("luaotfload-characters.lua"))
+ chardata = dofile(kpse.find_file(chardef, "lua"))
if chardata == nil then
warning("Could not load %s; continuing with empty character table.",
chardef)