summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/luatex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-07-11 23:26:48 +0000
committerKarl Berry <karl@freefriends.org>2013-07-11 23:26:48 +0000
commit73f6b8fbb951d9acae74a72fb07cc8e237fe3bc3 (patch)
tree88e8d515f41f68c748fcea803ea50b3eb0f1afea /Master/texmf-dist/source/luatex
parent1407e4e5ea60e9d4e79a57bca0c2f248f6e9de9a (diff)
luaotfload (11jul13)
git-svn-id: svn://tug.org/texlive/trunk@31169 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/luatex')
-rw-r--r--Master/texmf-dist/source/luatex/luaotfload/Makefile55
-rw-r--r--Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx14
2 files changed, 38 insertions, 31 deletions
diff --git a/Master/texmf-dist/source/luatex/luaotfload/Makefile b/Master/texmf-dist/source/luatex/luaotfload/Makefile
index 3807ec5e99b..7ea09713a84 100644
--- a/Master/texmf-dist/source/luatex/luaotfload/Makefile
+++ b/Master/texmf-dist/source/luatex/luaotfload/Makefile
@@ -8,8 +8,9 @@ OTFL = $(wildcard luaotfload-*.lua) luaotfload-blacklist.cnf
GLYPHSCRIPT = mkglyphlist
GLYPHSOURCE = glyphlist.txt
CHARSCRIPT = mkcharacters
+STATUSSCRIPT = mkstatus
-RESOURCESCRIPTS = $(GLYPHSCRIPT) $(CHARSCRIPT)
+RESOURCESCRIPTS = $(GLYPHSCRIPT) $(CHARSCRIPT) $(STATUSSCRIPT)
SCRIPTNAME = luaotfload-tool
SCRIPT = $(SCRIPTNAME).lua
@@ -24,7 +25,8 @@ DOT = $(GRAPH).dot
# Files grouped by generation mode
GLYPHS = luaotfload-glyphlist.lua
CHARS = luaotfload-characters.lua
-RESOURCES = $(GLYPHS) $(CHARS)
+STATUS = luaotfload-status.lua
+RESOURCES = $(GLYPHS) $(CHARS) $(STATUS)
GRAPHED = $(DOTPDF)
MAN = $(MANPAGE)
COMPILED = $(DOC)
@@ -34,20 +36,20 @@ SOURCE = $(DTX) $(MANSOURCE) $(OTFL) README Makefile NEWS $(RESOURCESCRIPTS)
# test files
TESTDIR = tests
-TESTFILES = $(wildcard $(TESTDIR)/*.tex $(TESTDIR)/*.ltx)
-TESTFILES_SYS = $(TESTDIR)/systemfonts.tex $(TESTDIR)/fontconfig_conf_reading.tex
-TESTFILES_TL = $(filter-out $(TESTFILES_SYS), $(TESTFILES))
+TESTSTATUS = $(wildcard $(TESTDIR)/*.tex $(TESTDIR)/*.ltx)
+TESTSTATUS_SYS = $(TESTDIR)/systemfonts.tex $(TESTDIR)/fontconfig_conf_reading.tex
+TESTSTATUS_TL = $(filter-out $(TESTSTATUS_SYS), $(TESTSTATUS))
# Files grouped by installation location
-SCRIPTFILES = $(SCRIPT) $(OLDSCRIPT) $(RESOURCESCRIPTS)
-RUNFILES = $(UNPACKED) $(filter-out $(SCRIPTFILES),$(OTFL))
-DOCFILES = $(DOC) $(DOTPDF) README NEWS
-MANFILES = $(MANPAGE)
-SRCFILES = $(DTX) Makefile
+SCRIPTSTATUS = $(SCRIPT) $(OLDSCRIPT) $(RESOURCESCRIPTS)
+RUNSTATUS = $(UNPACKED) $(filter-out $(SCRIPTSTATUS),$(OTFL))
+DOCSTATUS = $(DOC) $(DOTPDF) README NEWS
+MANSTATUS = $(MANPAGE)
+SRCSTATUS = $(DTX) Makefile
# The following definitions should be equivalent
-# ALL_FILES = $(RUNFILES) $(DOCFILES) $(SRCFILES)
-ALL_FILES = $(GENERATED) $(SOURCE)
+# ALL_STATUS = $(RUNSTATUS) $(DOCSTATUS) $(SRCSTATUS)
+ALL_STATUS = $(GENERATED) $(SOURCE)
# Installation locations
FORMAT = luatex
@@ -66,10 +68,11 @@ LUA = texlua
DO_TEX = luatex --interaction=batchmode $< >/dev/null
# (with the next version of latexmk: -pdf -pdflatex=lualatex)
-DO_LATEX = latexmk -pdf -e '$$pdflatex = q(lualatex %O %S)' -silent $< >/dev/null
+DO_LATEX = latexmk -pdf -e '$$pdflatex=lualatex' -silent $< >/dev/null
DO_GRAPHVIZ = dot -Tpdf -o $@ $< > /dev/null
DO_GLYPHS = $(LUA) $(GLYPHSCRIPT) > /dev/null
DO_CHARS = $(LUA) $(CHARSCRIPT) > /dev/null
+DO_STATUS = $(LUA) $(STATUSSCRIPT) > /dev/null
DO_DOCUTILS = rst2man $< >$@ 2>/dev/null
all: $(GENERATED)
@@ -79,6 +82,7 @@ manual: $(MAN)
unpack: $(UNPACKED)
resources: $(RESOURCES)
chars: $(CHARS)
+status: $(STATUS)
ctan: $(CTAN_ZIP)
tds: $(TDS_ZIP)
world: all ctan
@@ -89,6 +93,9 @@ $(GLYPHS): /dev/null
$(CHARS): /dev/null
$(DO_CHARS)
+$(STATUS): /dev/null
+ $(DO_STATUS)
+
$(GRAPHED): $(DOT)
$(DO_GRAPHVIZ)
@@ -107,15 +114,15 @@ $(CTAN_ZIP): $(SOURCE) $(COMPILED) $(TDS_ZIP)
@zip -9 $@ $^ >/dev/null
define run-install
-@mkdir -p $(SCRIPTDIR) && cp $(SCRIPTFILES) $(SCRIPTDIR)
-@mkdir -p $(RUNDIR) && cp $(RUNFILES) $(RUNDIR)
-@mkdir -p $(DOCDIR) && cp $(DOCFILES) $(DOCDIR)
-@mkdir -p $(SRCDIR) && cp $(SRCFILES) $(SRCDIR)
-@mkdir -p $(MANDIR) && cp $(MANFILES) $(MANDIR)
+@mkdir -p $(SCRIPTDIR) && cp $(SCRIPTSTATUS) $(SCRIPTDIR)
+@mkdir -p $(RUNDIR) && cp $(RUNSTATUS) $(RUNDIR)
+@mkdir -p $(DOCDIR) && cp $(DOCSTATUS) $(DOCDIR)
+@mkdir -p $(SRCDIR) && cp $(SRCSTATUS) $(SRCDIR)
+@mkdir -p $(MANDIR) && cp $(MANSTATUS) $(MANDIR)
endef
$(TDS_ZIP): TEXMFROOT=./tmp-texmf
-$(TDS_ZIP): $(ALL_FILES)
+$(TDS_ZIP): $(ALL_STATUS)
@echo "Making TDS-ready archive $@."
@$(RM) -- $@
$(run-install)
@@ -124,20 +131,20 @@ $(TDS_ZIP): $(ALL_FILES)
.PHONY: install manifest clean mrproper
-install: $(ALL_FILES)
+install: $(ALL_STATUS)
@echo "Installing in '$(TEXMFROOT)'."
$(run-install)
-check: $(RUNFILES) $(TESTFILES_TL)
+check: $(RUNSTATUS) $(TESTSTATUS_TL)
@rm -rf var
- @for f in $(TESTFILES_TL); do \
+ @for f in $(TESTSTATUS_TL); do \
echo "check: luatex $$f"; \
luatex --interaction=batchmode $$f \
> /dev/null || exit $$?; \
done
-check-all: $(TESTFILES_SYS) check
- @cd $(TESTDIR); for f in $(TESTFILES_SYS); do \
+check-all: $(TESTSTATUS_SYS) check
+ @cd $(TESTDIR); for f in $(TESTSTATUS_SYS); do \
echo "check: luatex $$f"; \
$(TESTENV) luatex --interaction=batchmode ../$$f \
> /dev/null || exit $$?; \
diff --git a/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx b/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx
index b8bee750ed7..d647efb0c50 100644
--- a/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx
+++ b/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx
@@ -40,7 +40,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: luaotfload v2.3 OpenType layout system}
+\Msg{* Package: luaotfload v2.3a OpenType layout system}
\Msg{************************************************************************}
\keepsilent
@@ -111,7 +111,7 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{luaotfload.drv}%
- [2013/05/23 v2.3d OpenType layout system]%
+ [2013/07/10 v2.3a OpenType layout system]%
\documentclass{ltxdoc}
\usepackage{metalogo,multicol,mdwlist,fancyvrb,xspace}
\usepackage[x11names]{xcolor}
@@ -231,7 +231,7 @@ and the derived files
% \GetFileInfo{luaotfload.drv}
%
% \title{The \identifier{luaotfload} package}
-% \date{2013/05/23 v2.3d}
+% \date{2013/07/10 v2.3a}
% \author{Elie Roux · Khaled Hosny · Philipp Gesang\\
% Home: \url{https://github.com/lualatex/luaotfload}\\
% Support: \email{lualatex-dev@tug.org}}
@@ -1474,12 +1474,12 @@ config.luaotfload.color_callback = config.luaotfload.color_callback or "pre_l
config.luaotfload.prioritize = config.luaotfload.prioritize or "sys"
config.luaotfload.names_dir = config.luaotfload.names_dir or "names"
config.luaotfload.cache_dir = config.luaotfload.cache_dir or "fonts"
-config.luaotfload.names_file = config.luaotfload.names_file or "luaotfload-names.lua"
+config.luaotfload.index_file = config.luaotfload.index_file or "luaotfload-names.lua"
luaotfload.module = {
name = "luaotfload",
- version = 2.3,
- date = "2013/06/02",
+ version = 2.3001,
+ date = "2013/07/10",
description = "OpenType layout system.",
author = "Elie Roux & Hans Hagen",
copyright = "Elie Roux",
@@ -2069,7 +2069,7 @@ loadmodule"auxiliary.lua" --- additionaly high-level functionality (new)
\else
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{luaotfload}%
- [2013/05/23 v2.3d OpenType layout system]
+ [2013/07/10 v2.3a OpenType layout system]
\RequirePackage{luatexbase}
\fi
\ifnum\luatexversion<76