From 42f2231df8b6636480bf0971fc0672110cf509db Mon Sep 17 00:00:00 2001 From: Dohyun Kim Date: Mon, 30 Nov 2015 11:15:17 +0900 Subject: [init] typo --- src/luaotfload-init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/luaotfload-init.lua b/src/luaotfload-init.lua index a8fc77b..b07dda1 100644 --- a/src/luaotfload-init.lua +++ b/src/luaotfload-init.lua @@ -366,7 +366,7 @@ local init_main = function () local _void = require (fontloader) elseif kpselookup (fontloader) then - local pth = kpselookup (fontloader) + local path = kpselookup (fontloader) logreport ("both", 2, "init", "Attempting to load fontloader “%s” from kpse-resolved path “%s”.", fontloader, path) -- cgit v1.2.3 From 5725506aca4a679e6f85092a25318b425e70d96e Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Wed, 2 Dec 2015 07:22:37 +0100 Subject: [build] include fontloader source in packages --- Makefile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index bda7fbc..8375ac3 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,7 @@ DOCSRCDIR = ./doc SCRIPTSRCDIR = ./scripts SRCSRCDIR = ./src FONTLOADERDIR = $(SRCSRCDIR)/fontloader/runtime +FONTLOADERSRCDIR= $(SRCSRCDIR)/fontloader/misc PACKAGEDIR = $(SRCSRCDIR)/fontloader BUILDDIR = ./build MISCDIR = ./misc @@ -34,6 +35,8 @@ CONFNAME = luaotfload.conf GRAPH = filegraph DOCSRC = $(addprefix $(DOCSRCDIR)/$(NAME), -main.tex -latex.tex) +LOADERSRC = $(wildcard $(FONTLOADERSRCDIR)/*.lua) +LOADERSRC += $(wildcard $(FONTLOADERSRCDIR)/*.tex) GRAPHSRC = $(DOCSRCDIR)/$(GRAPH).dot MANSRC = $(DOCSRCDIR)/$(TOOLNAME).rst $(DOCSRCDIR)/$(CONFNAME).rst @@ -51,7 +54,8 @@ CHARS = $(BUILDDIR)/$(NAME)-characters.lua STATUS = $(BUILDDIR)/$(NAME)-status.lua LOADER = $(BUILDDIR)/fontloader-$(shell date +%F).lua RESOURCES = $(GLYPHS) $(CHARS) $(LOADER) $(STATUS) -SOURCE = $(DOCSRC) $(MANSRC) $(SRC) README COPYING Makefile NEWS $(RESOURCESCRIPTS) +SOURCE = $(DOCSRC) $(LOADERSRC) $(MANSRC) +SOURCE += $(SRC) README COPYING Makefile NEWS $(RESOURCESCRIPTS) # Files grouped by installation location SCRIPTSTATUS = $(TOOL) $(RESOURCESCRIPTS) @@ -162,7 +166,7 @@ $(CTAN_ZIP): $(DOCS) $(SOURCE) $(TDS_ZIP) @echo "Making $@ for CTAN upload." @$(RM) -- $@ $(make-ctandir) - cd $(BUILDDIR) && zip -r -9 $(CTAN_ZIPFILE) $(TDS_ZIPFILE) $(NAME) >/dev/null + @cd $(BUILDDIR) && zip -r -9 $(CTAN_ZIPFILE) $(TDS_ZIPFILE) $(NAME) >/dev/null $(CTAN_ZIPSIG): $(CTAN_ZIP) @echo "Signing package $(CTAN_ZIP)" @@ -170,8 +174,8 @@ $(CTAN_ZIPSIG): $(CTAN_ZIP) @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) +@mkdir -p $(DOCDIR) && cp -- $(DOCSTATUS) $(VGND) $(CONFDEMO) $(DOCDIR) +@mkdir -p $(SRCDIR) && cp -- $(SRCSTATUS) $(SRCDIR) @mkdir -p $(MAN1DIR) && cp -- $(TOOLMAN) $(MAN1DIR) @mkdir -p $(MAN5DIR) && cp -- $(CONFMAN) $(MAN5DIR) endef @@ -179,6 +183,7 @@ endef define run-install @mkdir -p $(SCRIPTDIR) && cp -- $(SCRIPTSTATUS) $(SCRIPTDIR) @mkdir -p $(RUNDIR) && cp -- $(RESOURCES) $(RUNSTATUS) $(RUNDIR) +@mkdir -p $(SRCDIR) && cp -- $(LOADERSRC) $(SRCDIR) endef $(TDS_ZIP): TEXMFROOT=./tmp-texmf -- cgit v1.2.3 From 1e158b164cdea1c70e144f305da28c797ec0f6d2 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Wed, 2 Dec 2015 07:37:45 +0100 Subject: [doc] load luatexbase for the catcodetable stuff --- doc/Makefile | 2 +- doc/luaotfload-latex.tex | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/Makefile b/doc/Makefile index 0355a0e..d6b576c 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -29,7 +29,7 @@ all: manuals doc graph: $(DOTPDF) manuals: $(TOOLMAN) $(CONFMAN) -$(DOCPDF): $(DOCSRC) +$(DOCPDF): $(DOCSRC) graph @echo "creating PDF documentation ($@)" $(DO_LATEX) $(DO_LATEX) diff --git a/doc/luaotfload-latex.tex b/doc/luaotfload-latex.tex index e3541c5..1cff661 100644 --- a/doc/luaotfload-latex.tex +++ b/doc/luaotfload-latex.tex @@ -206,6 +206,7 @@ %% one that we could map directly onto Latex’s \verb|…|. \usepackage {listings} +\usepackage {luatexbase} \lstset { basicstyle=\ttfamily, } -- cgit v1.2.3 From 2ad0d24a32a8bb29bbc72ebab392031817e2cbce Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Wed, 2 Dec 2015 23:51:58 +0100 Subject: [tool] fix path displayed in help message This extends commit 78a1273715.. to the tool. Also fixes the wrong path being issued to the formatter. Luckily, this is not a functional defect since the path is used for display purposes only. --- src/luaotfload-tool.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/luaotfload-tool.lua b/src/luaotfload-tool.lua index ab495a9..69b6c97 100755 --- a/src/luaotfload-tool.lua +++ b/src/luaotfload-tool.lua @@ -296,7 +296,7 @@ local help_msg = function (version) luaotfload.self, names_gzip, names_bin, - caches.getwritablepath (config.luaotfload.cache_dir))) + caches.getwritablepath (config.luaotfload.paths.cache_dir, ""))) end local about = [[ -- cgit v1.2.3 From 0a283ac66f2fc597e81faa6f7ce39d975f11cce7 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Thu, 3 Dec 2015 00:39:57 +0100 Subject: [build] keep fontloader source in tex subtree to keep kpse happy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit kpathsea doesn’t return paths to files in the source subtree so loading the unpackaged fontloader files is broken. Fix this by moving the relevant files in the tex tree. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8375ac3..9b1d356 100644 --- a/Makefile +++ b/Makefile @@ -183,7 +183,7 @@ endef define run-install @mkdir -p $(SCRIPTDIR) && cp -- $(SCRIPTSTATUS) $(SCRIPTDIR) @mkdir -p $(RUNDIR) && cp -- $(RESOURCES) $(RUNSTATUS) $(RUNDIR) -@mkdir -p $(SRCDIR) && cp -- $(LOADERSRC) $(SRCDIR) +@mkdir -p $(RUNDIR) && cp -- $(LOADERSRC) $(RUNDIR) endef $(TDS_ZIP): TEXMFROOT=./tmp-texmf -- cgit v1.2.3 From e6aa4d71589ed6f35a6a62850c001e644900f13a Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Wed, 9 Dec 2015 08:27:56 +0100 Subject: [init] suppress one less useful message --- src/luaotfload-init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/luaotfload-init.lua b/src/luaotfload-init.lua index b07dda1..895e32e 100644 --- a/src/luaotfload-init.lua +++ b/src/luaotfload-init.lua @@ -391,7 +391,7 @@ local init_main = function () ---load_fontloader_module "font-odv.lua" --- <= Devanagari support from Context - logreport ("both", 0, "init", + logreport ("log", 0, "init", "Context OpenType loader version “%s”", fonts.handlers.otf.version) end --- [init_main] -- cgit v1.2.3 From 334aceef887d77f2ad53aba2a8623aedf77a6370 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Wed, 9 Dec 2015 22:52:54 +0100 Subject: [*] bump version and date We still had some 2014 values lingering around dark corners. In theory this is all meaningless wrt. the Git repo. --- NEWS | 29 +++++++++++++++-------------- doc/luaotfload-latex.tex | 2 +- doc/luaotfload-main.tex | 2 +- doc/luaotfload-tool.rst | 4 ++-- doc/luaotfload.conf.rst | 2 +- src/fontloader/luaotfload-package.lua | 3 +-- src/luaotfload-database.lua | 4 ++-- src/luaotfload-features.lua | 2 +- src/luaotfload-log.lua | 2 +- src/luaotfload-main.lua | 2 +- src/luaotfload.sty | 2 +- 11 files changed, 27 insertions(+), 27 deletions(-) diff --git a/NEWS b/NEWS index 4ed320a..c1e5000 100644 --- a/NEWS +++ b/NEWS @@ -1,23 +1,24 @@ Change History -------------- -2015/0X/XX, luaotfload v2.6 - * Add ``sign`` target to makefile for automated package signing +2015/12/09, luaotfload v2.6 + * Add ``sign`` target to makefile for automated package signing. * Add ``--dumpconf`` option to luaotfload-tool for generating configuration - files - * Move fontloader files to subtree src/fontloader + files. + * Move fontloader files to subtree src/fontloader. * New script ``mkimport`` facilitates maintainance of code imported from - Context - * Revised letterspacing, now utilizing the ``node.direct`` interface - * Revized colorization of fonts, utilizing ``node.direct`` (Dohyun Kim) - * Colorization was moved to the ``post_linebreak_filter`` stage + Context. + * Revised letterspacing, now utilizing the ``node.direct`` interface. + * Revized colorization of fonts, utilizing ``node.direct`` (Dohyun Kim). + * Colorization was moved to the ``post_linebreak_filter`` stage. * Move remaining functionality from ``luaotfload-override`` into - initialization - * Write names index if fonts were removed - * Separate module loading from initialization - * Custom fontloader package with the files from Lualibs removed - * Lualibs are now a dependency when used in a TeX run as well - * Respect interword spaces when letterspacing + initialization. + * Write names index if fonts were removed. + * Separate module loading from initialization. + * Custom fontloader package with the files from Lualibs removed. + * Swappable fontloader via configuration option. + * Lualibs are now a dependency when used in a TeX run as well. + * Respect interword spaces when letterspacing. 2014/07/13, luaotfload v2.5 * Remove legacy code. diff --git a/doc/luaotfload-latex.tex b/doc/luaotfload-latex.tex index 1cff661..bdcf45f 100644 --- a/doc/luaotfload-latex.tex +++ b/doc/luaotfload-latex.tex @@ -1,5 +1,5 @@ \suppresslongerror1%% sigh ... -%% Copyright (C) 2009-2014 +%% Copyright (C) 2009-2015 %% %% by Elie Roux %% and Khaled Hosny diff --git a/doc/luaotfload-main.tex b/doc/luaotfload-main.tex index 26d7314..967f5a2 100644 --- a/doc/luaotfload-main.tex +++ b/doc/luaotfload-main.tex @@ -32,7 +32,7 @@ \beginfrontmatter \setdocumenttitle {The \identifier{luaotfload} package} - \setdocumentdate {2015/11/05 v2.6} + \setdocumentdate {2015/12/09 v2.6} \setdocumentauthor {Elie Roux · Khaled Hosny · Philipp Gesang\\ Home: \hyperlink {https://github.com/lualatex/luaotfload}\\ Support: \email {lualatex-dev@tug.org}} diff --git a/doc/luaotfload-tool.rst b/doc/luaotfload-tool.rst index 99e3fb2..4c05c44 100644 --- a/doc/luaotfload-tool.rst +++ b/doc/luaotfload-tool.rst @@ -6,9 +6,9 @@ generate and query the Luaotfload font names database ----------------------------------------------------------------------- -:Date: 2014-07-24 +:Date: 2015-12-09 :Copyright: GPL v2.0 -:Version: 2.5 +:Version: 2.6 :Manual section: 1 :Manual group: text processing diff --git a/doc/luaotfload.conf.rst b/doc/luaotfload.conf.rst index 958ecee..d624e00 100644 --- a/doc/luaotfload.conf.rst +++ b/doc/luaotfload.conf.rst @@ -6,7 +6,7 @@ Luaotfload configuration file ----------------------------------------------------------------------- -:Date: 2015-04-20 +:Date: 2015-12-09 :Copyright: GPL v2.0 :Version: 2.6 :Manual section: 5 diff --git a/src/fontloader/luaotfload-package.lua b/src/fontloader/luaotfload-package.lua index 725c498..524dbcb 100644 --- a/src/fontloader/luaotfload-package.lua +++ b/src/fontloader/luaotfload-package.lua @@ -2,10 +2,9 @@ ----------------------------------------------------------------------- -- FILE: luaotfload-package.lua -- DESCRIPTION: Luatex fontloader packaging --- REQUIREMENTS: luatex +-- REQUIREMENTS: luatex, mtx-package -- AUTHOR: Philipp Gesang -- LICENSE: GNU GPL v2.0 --- CREATED: 2015-03-29 12:07:33+0200 ----------------------------------------------------------------------- -- diff --git a/src/luaotfload-database.lua b/src/luaotfload-database.lua index 881cfe8..367723b 100644 --- a/src/luaotfload-database.lua +++ b/src/luaotfload-database.lua @@ -1,5 +1,5 @@ if not modules then modules = { } end modules ['luaotfload-database'] = { - version = "2.5", + version = "2.6", comment = "companion to luaotfload-main.lua", author = "Khaled Hosny, Elie Roux, Philipp Gesang", copyright = "Luaotfload Development Team", @@ -3529,7 +3529,7 @@ return { fonts.definers = fonts.definers or { resolvers = { } } names.blacklist = blacklist - names.version = 2.51 + names.version = 2.6 names.data = nil --- contains the loaded database names.lookups = nil --- contains the lookup cache diff --git a/src/luaotfload-features.lua b/src/luaotfload-features.lua index 6fb2114..962806c 100644 --- a/src/luaotfload-features.lua +++ b/src/luaotfload-features.lua @@ -1,5 +1,5 @@ if not modules then modules = { } end modules ["features"] = { - version = "2.5", + version = "2.6", comment = "companion to luaotfload-main.lua", author = "Hans Hagen, Khaled Hosny, Elie Roux, Philipp Gesang", copyright = "PRAGMA ADE / ConTeXt Development Team", diff --git a/src/luaotfload-log.lua b/src/luaotfload-log.lua index e5db310..5c678a5 100644 --- a/src/luaotfload-log.lua +++ b/src/luaotfload-log.lua @@ -1,5 +1,5 @@ if not modules then modules = { } end modules ["luaotfload-log"] = { - version = "2.5", + version = "2.6", comment = "companion to Luaotfload", author = "Khaled Hosny, Elie Roux, Philipp Gesang", copyright = "Luaotfload Development Team", diff --git a/src/luaotfload-main.lua b/src/luaotfload-main.lua index b8050e4..9525ca4 100644 --- a/src/luaotfload-main.lua +++ b/src/luaotfload-main.lua @@ -30,7 +30,7 @@ local authors = "\z luaotfload.module = { name = "luaotfload-main", version = 2.60001, - date = "2015/11/05", + date = "2015/12/09", description = "OpenType layout system.", author = authors, copyright = authors, diff --git a/src/luaotfload.sty b/src/luaotfload.sty index c674ab0..836d819 100644 --- a/src/luaotfload.sty +++ b/src/luaotfload.sty @@ -41,7 +41,7 @@ \ProvidesPackage{luaotfload}% %% FIXME The date is meaningless, we need to find a way to %% use the git revision instead. - [2015/03/29 v2.6 OpenType layout system] + [2015/12/09 v2.6 OpenType layout system] \fi \directlua{ require('luaotfload-main') -- cgit v1.2.3 From 656e7a115ab7c87743be59808713908f1d22fa6c Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Wed, 9 Dec 2015 23:02:31 +0100 Subject: [build] include package, import, and test scripts in tree --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index 9b1d356..f23c6b8 100644 --- a/Makefile +++ b/Makefile @@ -23,10 +23,12 @@ GLYPHSCRIPT = $(SCRIPTSRCDIR)/mkglyphlist CHARSCRIPT = $(SCRIPTSRCDIR)/mkcharacters STATUSSCRIPT = $(SCRIPTSRCDIR)/mkstatus IMPORTSCRIPT = $(SCRIPTSRCDIR)/mkimport +TESTSCRIPT = $(SCRIPTSRCDIR)/mktests GLYPHSOURCE = $(BUILDDIR)/glyphlist.txt RESOURCESCRIPTS = $(GLYPHSCRIPT) $(CHARSCRIPT) $(STATUSSCRIPT) +RESOURCESCRIPTS+= $(IMPORTSCRIPT) $(TESTSCRIPT) TOOLNAME = luaotfload-tool TOOL = $(SRCSRCDIR)/$(TOOLNAME).lua @@ -37,6 +39,7 @@ GRAPH = filegraph DOCSRC = $(addprefix $(DOCSRCDIR)/$(NAME), -main.tex -latex.tex) LOADERSRC = $(wildcard $(FONTLOADERSRCDIR)/*.lua) LOADERSRC += $(wildcard $(FONTLOADERSRCDIR)/*.tex) +LOADERSRC += $(PACKAGEDIR)/luaotfload-package.lua GRAPHSRC = $(DOCSRCDIR)/$(GRAPH).dot MANSRC = $(DOCSRCDIR)/$(TOOLNAME).rst $(DOCSRCDIR)/$(CONFNAME).rst -- cgit v1.2.3