From 74ae3a907a72186eacfc79efc0c7c4e52dc1743b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 17 Jul 2014 23:45:27 +0000 Subject: luaotfload (17jul14) git-svn-id: svn://tug.org/texlive/trunk@34644 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/luatex/luaotfload/luaotfload.pdf | Bin 170441 -> 170441 bytes .../doc/man/man1/luaotfload-tool.man1.pdf | Bin 18400 -> 18400 bytes .../scripts/luaotfload/luaotfload-tool.lua | 4 +- Master/texmf-dist/scripts/luaotfload/mkstatus | 5 +- .../texmf-dist/source/luatex/luaotfload/Makefile | 32 ++++++++++-- .../tex/luatex/luaotfload/luaotfload-database.lua | 2 +- .../luatex/luaotfload/luaotfload-fontloader.lua | 35 ++++++++++--- .../tex/luatex/luaotfload/luaotfload-log.lua | 6 ++- .../tex/luatex/luaotfload/luaotfload-main.lua | 9 ++-- .../tex/luatex/luaotfload/luaotfload-status.lua | 56 ++++++++++----------- .../tex/luatex/luaotfload/luaotfload.sty | 4 +- 11 files changed, 102 insertions(+), 51 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 6572c7b121f..2163a8ec774 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/doc/man/man1/luaotfload-tool.man1.pdf b/Master/texmf-dist/doc/man/man1/luaotfload-tool.man1.pdf index 39103c39cd8..c8559704dc6 100644 Binary files a/Master/texmf-dist/doc/man/man1/luaotfload-tool.man1.pdf and b/Master/texmf-dist/doc/man/man1/luaotfload-tool.man1.pdf differ diff --git a/Master/texmf-dist/scripts/luaotfload/luaotfload-tool.lua b/Master/texmf-dist/scripts/luaotfload/luaotfload-tool.lua index 4c5550891b2..89f5483b6a3 100755 --- a/Master/texmf-dist/scripts/luaotfload/luaotfload-tool.lua +++ b/Master/texmf-dist/scripts/luaotfload/luaotfload-tool.lua @@ -6,11 +6,11 @@ -- AUTHOR: Khaled Hosny, Élie Roux, Philipp Gesang -- VERSION: 2.5 -- LICENSE: GPL v2.0 --- MODIFIED: 2014-05-15 21:47:39+0200 +-- MODIFIED: 2014-07-16 19:45:40+0200 ----------------------------------------------------------------------- luaotfload = luaotfload or { } -local version = "2.5" --- .- +local version = "2.5-1" --- .- luaotfload.version = version luaotfload.self = "luaotfload-tool" diff --git a/Master/texmf-dist/scripts/luaotfload/mkstatus b/Master/texmf-dist/scripts/luaotfload/mkstatus index 15cb97cf207..802b2cd4555 100755 --- a/Master/texmf-dist/scripts/luaotfload/mkstatus +++ b/Master/texmf-dist/scripts/luaotfload/mkstatus @@ -128,7 +128,7 @@ hash_all = function (list, acc) local finfo = list[#list] list[#list] = nil if finfo then - local fpath + local fpath, fname if type (finfo) == "table" then local d, f = finfo [1], finfo [2] if lfs.isdir (d) then @@ -136,6 +136,7 @@ hash_all = function (list, acc) else fpath = f end + fname = f else fpath = finfo end @@ -149,7 +150,7 @@ hash_all = function (list, acc) iowrite (sum) iowrite "\"\n" end - acc[#acc+1] = { fpath, sum } + acc[#acc+1] = { fname, sum } return hash_all (list, acc) end return acc diff --git a/Master/texmf-dist/source/luatex/luaotfload/Makefile b/Master/texmf-dist/source/luatex/luaotfload/Makefile index c27ffd41850..4124a1a49b3 100644 --- a/Master/texmf-dist/source/luatex/luaotfload/Makefile +++ b/Master/texmf-dist/source/luatex/luaotfload/Makefile @@ -72,6 +72,7 @@ TEXMFROOT = $(shell kpsewhich --var-value TEXMFHOME) DISTDIR = $(BUILDDIR)/$(NAME) CTAN_ZIPFILE = $(NAME).zip +CTAN_ZIPSIG = $(BUILDDIR)/$(CTAN_ZIPFILE).asc TDS_ZIPFILE = $(NAME).tds.zip CTAN_ZIP = $(BUILDDIR)/$(CTAN_ZIPFILE) TDS_ZIP = $(BUILDDIR)/$(TDS_ZIPFILE) @@ -86,7 +87,22 @@ DO_GLYPHS = $(LUA) $(GLYPHSCRIPT) > /dev/null DO_CHARS = $(LUA) $(CHARSCRIPT) > /dev/null DO_STATUS = $(LUA) $(STATUSSCRIPT) > /dev/null +define check-lua-files +@echo validating syntax +@for f in $$(find . -name '*.lua') ; do \ + echo -n checking $$f ...; \ + if texluac -p $$f &>/dev/null; then \ + echo -e " \e[1;32mgood.\e[m"; \ + else \ + echo -e " \e[1;31mBAD.\e[m"; \ + exit 1; \ + fi; \ +done +endef + show: showtargets +check: + $(check-lua-files) all: ctan builddir: $(BUILDDIR) @@ -123,7 +139,7 @@ $(BUILDDIR): /dev/null mkdir -p $(BUILDDIR) define make-ctandir -@$(RM) -rf $(DISTDIR) +@$(RM) -rf -- $(DISTDIR) @mkdir -p $(DISTDIR) && cp $(RESOURCES) $(DOCPDF) $(VGND) $(CONFDEMO) $(SOURCE) $(DISTDIR) endef @@ -133,6 +149,11 @@ $(CTAN_ZIP): $(DOCS) $(SOURCE) $(TDS_ZIP) $(make-ctandir) cd $(BUILDDIR) && zip -r -9 $(CTAN_ZIPFILE) $(TDS_ZIPFILE) $(NAME) >/dev/null +$(CTAN_ZIPSIG): $(CTAN_ZIP) + @echo "Signing package $(CTAN_ZIP)" + @$(RM) -- $@ + @gpg --batch --armor --detach-sign "$(CTAN_ZIP)" + define run-install-doc @mkdir -p $(DOCDIR) && cp -- $(DOCSTATUS) $(VGND) $(CONFDEMO) $(DOCDIR) @mkdir -p $(SRCDIR) && cp -- $(SRCSTATUS) $(SRCDIR) @@ -146,7 +167,7 @@ define run-install endef $(TDS_ZIP): TEXMFROOT=./tmp-texmf -$(TDS_ZIP): $(DOCS) $(ALL_STATUS) +$(TDS_ZIP): $(DOCS) $(ALL_STATUS) check @echo "Making TDS-ready archive $@." @$(RM) -- $@ $(run-install-doc) @@ -154,7 +175,9 @@ $(TDS_ZIP): $(DOCS) $(ALL_STATUS) @cd $(TEXMFROOT) && zip -9 ../$@ -r . >/dev/null @$(RM) -r -- $(TEXMFROOT) -.PHONY: install manifest clean mrproper show showtargets +sign: $(CTAN_ZIPSIG) + +.PHONY: install manifest clean mrproper show showtargets check install: $(ALL_STATUS) @echo "Installing in '$(TEXMFROOT)'." @@ -185,6 +208,8 @@ mrproper: clean showtargets: @echo "Available targets:" @echo + @echo " check check Lua files for syntax errors" + @echo @echo " doc compile PDF documentation" @echo " resources generate resource files (chars, glyphs)" @echo @@ -198,6 +223,7 @@ showtargets: @echo @echo " tds package a zipball according to the TDS" @echo " ctan package a zipball for uploading to CTAN" + @echo " sign sign zipball" @echo # vim:noexpandtab:tabstop=8:shiftwidth=2 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 ", - ["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} -- cgit v1.2.3