From f3b41bfd3b9b1173b4c132544c708df9cefe0782 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 4 Jan 2014 23:44:02 +0000 Subject: luaotfload (4jan14) git-svn-id: svn://tug.org/texlive/trunk@32575 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/luatex/luaotfload/luaotfload.pdf | Bin 222160 -> 222160 bytes .../luatex/luaotfload/luaotfload-characters.lua | 36 +++++++++++++++++++++ .../tex/luatex/luaotfload/luaotfload-database.lua | 15 +++++++-- .../tex/luatex/luaotfload/luaotfload-status.lua | 8 ++--- 4 files changed, 52 insertions(+), 7 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf b/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf index b40f9443896..2081be708d1 100644 Binary files a/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf and b/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf differ diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-characters.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-characters.lua index 036c69118ed..13f0482bb2d 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-characters.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-characters.lua @@ -163,11 +163,13 @@ return { category="ps", direction="on", mirror=0x0029, + textclass="open", }, { category="pe", direction="on", mirror=0x0028, + textclass="close", }, { category="po", @@ -245,6 +247,7 @@ return { category="sm", direction="on", mirror=0x003E, + textclass="open", }, { category="sm", @@ -254,6 +257,7 @@ return { category="sm", direction="on", mirror=0x003C, + textclass="close", }, { category="po", @@ -371,6 +375,7 @@ return { category="ps", direction="on", mirror=0x005D, + textclass="open", }, { category="po", @@ -380,6 +385,7 @@ return { category="pe", direction="on", mirror=0x005B, + textclass="close", }, { category="sk", @@ -501,6 +507,7 @@ return { category="ps", direction="on", mirror=0x007D, + textclass="open", }, { category="sm", @@ -510,6 +517,7 @@ return { category="pe", direction="on", mirror=0x007B, + textclass="close", }, { category="sm", @@ -695,6 +703,7 @@ return { category="pi", direction="on", mirror=0x00BB, + textclass="open", }, { category="sm", @@ -760,6 +769,7 @@ return { category="pf", direction="on", mirror=0x00AB, + textclass="close", }, { category="no", @@ -28315,11 +28325,13 @@ return { category="pi", direction="on", mirror=0x203A, + textclass="open", }, [0x203A]={ category="pf", direction="on", mirror=0x2039, + textclass="close", }, [0x203B]={ category="po", @@ -28563,11 +28575,13 @@ return { category="ps", direction="on", mirror=0x207E, + textclass="open", }, [0x207E]={ category="pe", direction="on", mirror=0x207D, + textclass="close", }, [0x207F]={ category="ll", @@ -28629,11 +28643,13 @@ return { category="ps", direction="on", mirror=0x208E, + textclass="open", }, [0x208E]={ category="pe", direction="on", mirror=0x208D, + textclass="close", }, [0x2090]={ category="lm", @@ -62939,31 +62955,37 @@ return { category="ps", direction="on", mirror=0xFE5A, + textclass="open", }, [0xFE5A]={ category="pe", direction="on", mirror=0xFE59, + textclass="close", }, [0xFE5B]={ category="ps", direction="on", mirror=0xFE5C, + textclass="open", }, [0xFE5C]={ category="pe", direction="on", mirror=0xFE5B, + textclass="close", }, [0xFE5D]={ category="ps", direction="on", mirror=0xFE5E, + textclass="open", }, [0xFE5E]={ category="pe", direction="on", mirror=0xFE5D, + textclass="close", }, [0xFE5F]={ category="po", @@ -62989,11 +63011,13 @@ return { category="sm", direction="on", mirror=0xFE65, + textclass="open", }, [0xFE65]={ category="sm", direction="on", mirror=0xFE64, + textclass="close", }, [0xFE66]={ category="sm", @@ -63611,11 +63635,13 @@ return { category="ps", direction="on", mirror=0xFF09, + textclass="open", }, [0xFF09]={ category="pe", direction="on", mirror=0xFF08, + textclass="close", }, [0xFF0A]={ category="po", @@ -63693,6 +63719,7 @@ return { category="sm", direction="on", mirror=0xFF1E, + textclass="open", }, [0xFF1D]={ category="sm", @@ -63702,6 +63729,7 @@ return { category="sm", direction="on", mirror=0xFF1C, + textclass="close", }, [0xFF1F]={ category="po", @@ -63819,6 +63847,7 @@ return { category="ps", direction="on", mirror=0xFF3D, + textclass="open", }, [0xFF3C]={ category="po", @@ -63828,6 +63857,7 @@ return { category="pe", direction="on", mirror=0xFF3B, + textclass="close", }, [0xFF3E]={ category="sk", @@ -63949,6 +63979,7 @@ return { category="ps", direction="on", mirror=0xFF5D, + textclass="open", }, [0xFF5C]={ category="sm", @@ -63958,6 +63989,7 @@ return { category="pe", direction="on", mirror=0xFF5B, + textclass="close", }, [0xFF5E]={ category="sm", @@ -63967,11 +63999,13 @@ return { category="ps", direction="on", mirror=0xFF60, + textclass="open", }, [0xFF60]={ category="pe", direction="on", mirror=0xFF5F, + textclass="close", }, [0xFF61]={ category="po", @@ -63981,11 +64015,13 @@ return { category="ps", direction="on", mirror=0xFF63, + textclass="open", }, [0xFF63]={ category="pe", direction="on", mirror=0xFF62, + textclass="close", }, [0xFF64]={ category="po", diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-database.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-database.lua index b47fc8b1f58..9d7d9121d4c 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-database.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-database.lua @@ -83,7 +83,7 @@ local tableconcat = table.concat local tablesort = table.sort local utf8gsub = unicode.utf8.gsub local utf8lower = unicode.utf8.lower -local utf8length = unicode.utf8.length +local utf8len = unicode.utf8.len local zlibcompress = zlib.compress --- these come from Lualibs/Context @@ -574,7 +574,16 @@ load_names = function (dry_run) report ("info", 3, "db", "Loading took %0.f ms.", 1000 * (osgettimeofday () - starttime)) - local db_version, nms_version = data.meta.version, names.version + local db_version, nms_version + if data.meta then + db_version = data.meta.version + else + --- Compatibility branch; the version info used to be + --- stored in the table root which is why updating from + --- an earlier index version broke. + db_version = data.version or -42 --- invalid + end + nms_version = names.version if db_version ~= nms_version then report ("both", 0, "db", [[Version mismatch; expected %4.3f, got %4.3f.]], @@ -2118,7 +2127,7 @@ end local truncate_string = function (str, restrict) local tw = luaotfloadconfig.termwidth local wd = tw - restrict - local len = utf8length (str) + local len = utf8len (str) if wd - len < 0 then --- combined length exceeds terminal, str = ".." .. stringsub(str, len - wd + 2) diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-status.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-status.lua index 376a5055513..33b68e79aca 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-status.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-status.lua @@ -18,16 +18,16 @@ return { { "luaotfload-fonts-cbk.lua", "c1b7a4e5508d68f45a99cdc38c2d0885" }, { "luaotfload-features.lua", "0d97a50852fb55be4133874c8f487832" }, { "luaotfload-diagnostics.lua", "eed12e7b7fe6545daa6786fed1405a4f" }, - { "luaotfload-database.lua", "7280e8cbdf00a4767272a39c0545af29" }, + { "luaotfload-database.lua", "0ddcdd44409cad8cf4c206d5e8d40e31" }, { "luaotfload-colors.lua", "248c4c42586c17e934a4d046c3c873b9" }, - { "luaotfload-characters.lua", "5843d02ff98a7419fae5a3cf904b101e" }, + { "luaotfload-characters.lua", "2673ffb19e8505af4782aad437a76a4f" }, { "luaotfload-basics-nod.lua", "d6b26ec86c0b1c1516936b425df04432" }, { "luaotfload-basics-gen.lua", "3dadc2cd31ab348f7effb28e335af3ae" }, { "luaotfload-auxiliary.lua", "7efa9d365f12006d5c4c7c38e0e2872c" }, }, ["notes"]={ ["committer"]="Philipp Gesang ", - ["revision"]="9fd4c4523b1e69b5c49de7fda01da5540e60fcda", - ["timestamp"]="2014-01-02 17:19:53 +0100", + ["revision"]="5b26498993e9e0e9ba4759ceb3976b17f42d1413", + ["timestamp"]="2014-01-03 18:17:16 +0100", }, } \ No newline at end of file -- cgit v1.2.3