summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luaotfload
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-07-17 23:45:27 +0000
committerKarl Berry <karl@freefriends.org>2014-07-17 23:45:27 +0000
commit74ae3a907a72186eacfc79efc0c7c4e52dc1743b (patch)
tree8475e8d7e28a4f5b258d248fd30a205b63c73aed /Master/texmf-dist/tex/luatex/luaotfload
parentf2d101901cd3549d0f705fed19ba8c50cc8ddb2b (diff)
luaotfload (17jul14)
git-svn-id: svn://tug.org/texlive/trunk@34644 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luaotfload')
-rw-r--r--Master/texmf-dist/tex/luatex/luaotfload/luaotfload-database.lua2
-rw-r--r--Master/texmf-dist/tex/luatex/luaotfload/luaotfload-fontloader.lua35
-rw-r--r--Master/texmf-dist/tex/luatex/luaotfload/luaotfload-log.lua6
-rw-r--r--Master/texmf-dist/tex/luatex/luaotfload/luaotfload-main.lua9
-rw-r--r--Master/texmf-dist/tex/luatex/luaotfload/luaotfload-status.lua56
-rw-r--r--Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty4
6 files changed, 68 insertions, 44 deletions
diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-database.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-database.lua
index 7a01ca626bf..4c5522e968e 100644
--- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-database.lua
+++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-database.lua
@@ -357,7 +357,7 @@ mtx-fonts has in names.tma:
--- string list -> string option -> dbobj
local initialize_namedata = function (formats, created)
- local now = os.date "%F %T"
+ local now = os.date "%Y-%m-%d %H:%M:%S" --- i. e. "%F %T" on POSIX systems
return {
--families = { },
status = { }, -- was: status; map abspath -> mapping
diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-fontloader.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-fontloader.lua
index 2f26be70e21..09582f98018 100644
--- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-fontloader.lua
+++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-fontloader.lua
@@ -1,6 +1,6 @@
-- merged file : luatex-fonts-merged.lua
-- parent file : luatex-fonts.lua
--- merge date : 07/06/14 22:50:12
+-- merge date : 07/14/14 19:25:59
do -- begin closure to overcome local limits and interference
@@ -6681,7 +6681,7 @@ local report_otf=logs.reporter("fonts","otf loading")
local fonts=fonts
local otf=fonts.handlers.otf
otf.glists={ "gsub","gpos" }
-otf.version=2.756
+otf.version=2.758
otf.cache=containers.define("fonts","otf",otf.version,true)
local fontdata=fonts.hashes.identifiers
local chardata=characters and characters.data
@@ -7241,7 +7241,7 @@ end
end
if not unicode or unicode==-1 then
if not name then
- name=format("u%06X",private)
+ name=format("u%06X.ctx",private)
end
unicode=private
unicodes[name]=private
@@ -7252,7 +7252,7 @@ end
nofnames=nofnames+1
else
if not name then
- name=format("u%06X",unicode)
+ name=format("u%06X.ctx",unicode)
end
unicodes[name]=unicode
nofunicodes=nofunicodes+1
@@ -7293,12 +7293,29 @@ end
end
private=private+1
else
+ if unicode>criterium then
+ local taken=descriptions[unicode]
+ if taken then
+ if unicode>=private then
+ private=unicode+1
+ else
+ private=private+1
+ end
+ descriptions[private]=taken
+ unicodes[taken.name]=private
+ indices[taken.index]=private
+ if trace_private then
+ report_otf("slot %U is moved to %U due to private in font",unicode)
+ end
+ else
+ if unicode>=private then
+ private=unicode+1
+ end
+ end
+ end
unicodes[name]=unicode
end
indices[index]=unicode
- if not name then
- name=format("u%06X",unicode)
- end
descriptions[unicode]={
boundingbox=glyph.boundingbox,
name=name,
@@ -7909,7 +7926,9 @@ local function check_variants(unicode,the_variants,splitter,unicodes)
for i=1,#glyphs do
local g=glyphs[i]
if done[g] then
- report_otf("skipping cyclic reference %U in math variant %U",g,unicode)
+ if i>1 then
+ report_otf("skipping cyclic reference %U in math variant %U",g,unicode)
+ end
else
if n==0 then
n=1
diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-log.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-log.lua
index 5698c841fd8..a0e78bde9cc 100644
--- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-log.lua
+++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-log.lua
@@ -91,7 +91,8 @@ local set_logout = function (s, finalizers)
logout = "redirect"
local chan = choose_logfile ()
chan:write (stringformat ("logging initiated at %s",
- osdate ("%F %T", ostime ())))
+ osdate ("%Y-%m-%d %h:%m:%s", --- i. e. osdate "%F %T"
+ ostime ())))
local writefile = function (...)
if select ("#", ...) == 2 then
chan:write (select (2, ...))
@@ -117,7 +118,8 @@ local set_logout = function (s, finalizers)
finalizers[#finalizers+1] = function ()
chan:write (stringformat ("\nlogging finished at %s\n",
- osdate ("%F %T", ostime ())))
+ osdate ("%Y-%m-%d %h:%m:%s", --- i. e. osdate "%F %T"
+ ostime ())))
chan:close ()
texiowrite = texio.write
texiowrite_nl = texio.write_nl
diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-main.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-main.lua
index d1cba4c4300..0d81abbfa4e 100644
--- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-main.lua
+++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-main.lua
@@ -4,7 +4,7 @@
-- REQUIREMENTS: luatex v.0.79 or later; packages lualibs, luatexbase
-- AUTHOR: Élie Roux, Khaled Hosny, Philipp Gesang
-- VERSION: same as Luaotfload
--- MODIFIED: 2014-07-13 15:35:13+0200
+-- MODIFIED: 2014-07-16 19:48:30+0200
-----------------------------------------------------------------------
--
--- Note:
@@ -48,11 +48,12 @@ local initial_log_level = 0
luaotfload = luaotfload or { }
local luaotfload = luaotfload
luaotfload.log = luaotfload.log or { }
+luaotfload.version = "2.5-1" -- FIXME version belongs in common init
luaotfload.module = {
name = "luaotfload-main",
- version = 2.50000,
- date = "2014/07/13",
+ version = 2.50001,
+ date = "2014/07/16",
description = "OpenType layout system.",
author = "Elie Roux & Hans Hagen",
copyright = "Elie Roux",
@@ -100,7 +101,7 @@ luaotfload.log.tex = {
--doc]]--
-local min_luatex_version = 76
+local min_luatex_version = 79
if tex.luatexversion < min_luatex_version then
warning ("LuaTeX v%.2f is old, v%.2f or later is recommended.",
diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-status.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-status.lua
index d613883235a..4fc54b2dcec 100644
--- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-status.lua
+++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-status.lua
@@ -1,35 +1,35 @@
return {
["hashes"]={
- { "scripts/mkstatus", "fe7c02e1ecc0482033dc6bffd0974c10" },
- { "scripts/mkglyphlist", "62bc2c915a0fc936f9249deb0eddcaf3" },
- { "scripts/mkcharacters", "ec694a87f77067912eb73402ec99040d" },
- { "src/luaotfload-tool.lua", "741ba3e814cbd08ea026f56073e88162" },
- { "src/luaotfload-parsers.lua", "3dd1cb4175729c2f21dad158db4c633f" },
- { "src/luaotfload-override.lua", "e6f67a268fa9362d5ebc5cbecad1a900" },
- { "src/luaotfload-fontloader.lua", "f3055735e2d0b624000a9ce73b9dedc0" },
- { "src/luaotfload-main.lua", "cb35ddba0c110fb53908e4c0a2541839" },
- { "src/luaotfload-log.lua", "3c74574876352137b32073b763defbbf" },
- { "src/luaotfload-loaders.lua", "c364151f603514433fa3128939825d16" },
- { "src/luaotfload-letterspace.lua", "06cfb1e742d496b99c8980fdfd3f29f4" },
- { "build/luaotfload-glyphlist.lua", "ff440162d1b8a78a586375ee65630c21" },
- { "src/luaotfload-fonts-tfm.lua", "8fd3865240e4e87e99e0739abeda2322" },
- { "src/luaotfload-fonts-lua.lua", "50b8edb1db7009b6c661ab71ff24a466" },
- { "src/luaotfload-fonts-ext.lua", "0eee87fb26b7d135da88ac0a43a8037a" },
- { "src/luaotfload-fonts-enc.lua", "32775266bfc9eb6bbd9a16e3a7de398d" },
- { "src/luaotfload-fonts-def.lua", "8dc05f2aa96d2fd0245242c8fd3320eb" },
- { "src/luaotfload-fonts-cbk.lua", "c1b7a4e5508d68f45a99cdc38c2d0885" },
- { "src/luaotfload-features.lua", "6c3e33f4bd1090883851b7f63d45e7fc" },
- { "src/luaotfload-diagnostics.lua", "273afde55dff486fb222a50981b3b1d7" },
- { "src/luaotfload-database.lua", "9ea266330bbe2d974179e8dbb83997a5" },
- { "src/luaotfload-colors.lua", "99878378ef0954d0b67f13db8456dea7" },
- { "build/luaotfload-characters.lua", "9b9820f9fb6ec694df43b648026fc444" },
- { "src/luaotfload-basics-nod.lua", "7fdaff58d8c32e3115286504cbd7bcac" },
- { "src/luaotfload-basics-gen.lua", "9d5c3fc031af110ba67f3faa1a569779" },
- { "src/luaotfload-auxiliary.lua", "b3c893f68217b4147e5d3ba694648583" },
+ { "mkstatus", "38dd7ee3f5b372550e9d5e47466ac6c4" },
+ { "mkglyphlist", "62bc2c915a0fc936f9249deb0eddcaf3" },
+ { "mkcharacters", "ec694a87f77067912eb73402ec99040d" },
+ { "luaotfload-tool.lua", "9624861e9c8127a1d518c4a924f2af87" },
+ { "luaotfload-parsers.lua", "3dd1cb4175729c2f21dad158db4c633f" },
+ { "luaotfload-override.lua", "e6f67a268fa9362d5ebc5cbecad1a900" },
+ { "luaotfload-fontloader.lua", "e1eaddea90c7ae93d8babb2e6ff7a687" },
+ { "luaotfload-main.lua", "9fb22eef3cfd92922a688fa0ca2c7d27" },
+ { "luaotfload-log.lua", "1f8aee13a8b8a7a20cd8b03285ab425a" },
+ { "luaotfload-loaders.lua", "c364151f603514433fa3128939825d16" },
+ { "luaotfload-letterspace.lua", "06cfb1e742d496b99c8980fdfd3f29f4" },
+ { "luaotfload-glyphlist.lua", "ff440162d1b8a78a586375ee65630c21" },
+ { "luaotfload-fonts-tfm.lua", "8fd3865240e4e87e99e0739abeda2322" },
+ { "luaotfload-fonts-lua.lua", "50b8edb1db7009b6c661ab71ff24a466" },
+ { "luaotfload-fonts-ext.lua", "0eee87fb26b7d135da88ac0a43a8037a" },
+ { "luaotfload-fonts-enc.lua", "32775266bfc9eb6bbd9a16e3a7de398d" },
+ { "luaotfload-fonts-def.lua", "8dc05f2aa96d2fd0245242c8fd3320eb" },
+ { "luaotfload-fonts-cbk.lua", "c1b7a4e5508d68f45a99cdc38c2d0885" },
+ { "luaotfload-features.lua", "6c3e33f4bd1090883851b7f63d45e7fc" },
+ { "luaotfload-diagnostics.lua", "273afde55dff486fb222a50981b3b1d7" },
+ { "luaotfload-database.lua", "7c9bb668c81769a891d84e30ca9f1279" },
+ { "luaotfload-colors.lua", "99878378ef0954d0b67f13db8456dea7" },
+ { "luaotfload-characters.lua", "9b9820f9fb6ec694df43b648026fc444" },
+ { "luaotfload-basics-nod.lua", "7fdaff58d8c32e3115286504cbd7bcac" },
+ { "luaotfload-basics-gen.lua", "9d5c3fc031af110ba67f3faa1a569779" },
+ { "luaotfload-auxiliary.lua", "b3c893f68217b4147e5d3ba694648583" },
},
["notes"]={
["committer"]="Philipp Gesang <phg42.2a@gmail.com>",
- ["revision"]="5dc362a7098d9ecd4bfd446b59d7e895107f6e5e",
- ["timestamp"]="2014-07-13 22:03:26 +0200",
+ ["revision"]="95c6d7f9eefcac7a3fd042917df15166935d690d",
+ ["timestamp"]="2014-07-16 20:03:11 +0200",
},
} \ No newline at end of file
diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty
index 9848a223d53..f09193ba5d6 100644
--- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty
+++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty
@@ -38,7 +38,9 @@
\else
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{luaotfload}%
- [2014/07/13 v2.5 OpenType layout system]
+ %% FIXME The date is meaningless, we need to find a way to
+ %% use the git revision instead.
+ [2014/07/16 v2.5-1 OpenType layout system]
\RequirePackage{luatexbase}
\fi
\RequireLuaModule{luaotfload-main}