summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-12-13 23:42:37 +0000
committerKarl Berry <karl@freefriends.org>2015-12-13 23:42:37 +0000
commit7937119a4012996251798f6a286ea904a05749f2 (patch)
tree7743f51a2906c0f0c9685f681e2a36646751290f /Master/texmf-dist/source
parent3807f54388c3f5abc707c05be526c6c9c0c04623 (diff)
luaotfload (13dec15)
git-svn-id: svn://tug.org/texlive/trunk@39093 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r--Master/texmf-dist/source/luatex/luaotfload/Makefile6
-rw-r--r--Master/texmf-dist/source/luatex/luaotfload/filegraph.dot10
-rw-r--r--Master/texmf-dist/source/luatex/luaotfload/luaotfload-main.tex27
3 files changed, 15 insertions, 28 deletions
diff --git a/Master/texmf-dist/source/luatex/luaotfload/Makefile b/Master/texmf-dist/source/luatex/luaotfload/Makefile
index f23c6b84c23..a131f3ace05 100644
--- a/Master/texmf-dist/source/luatex/luaotfload/Makefile
+++ b/Master/texmf-dist/source/luatex/luaotfload/Makefile
@@ -39,7 +39,6 @@ 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
@@ -99,8 +98,7 @@ DO_GLYPHS = $(LUA) $(GLYPHSCRIPT) > /dev/null
DO_CHARS = $(LUA) $(CHARSCRIPT) > /dev/null
DO_STATUS = $(LUA) $(STATUSSCRIPT) --fontloader=$(LOADER) >/dev/null
DO_IMPORT = $(LUA) $(IMPORTSCRIPT) import >/dev/null
-DO_PACKAGE = $(LUA) $(IMPORTSCRIPT) package \
- $(PACKAGEDIR)/luaotfload-package.lua $(LOADER) >/dev/null
+DO_PACKAGE = $(LUA) $(IMPORTSCRIPT) package $(LOADER) >/dev/null
define check-lua-files
@echo validating syntax
@@ -200,7 +198,7 @@ $(TDS_ZIP): $(DOCS) $(ALL_STATUS) check
sign: $(CTAN_ZIPSIG)
-.PHONY: install manifest clean mrproper show showtargets check import news
+.PHONY: package install manifest clean mrproper show showtargets check import news
install:
@echo " ××××××××××××××××××××××××××××××××"
diff --git a/Master/texmf-dist/source/luatex/luaotfload/filegraph.dot b/Master/texmf-dist/source/luatex/luaotfload/filegraph.dot
index 9773ebd426f..de6082372f9 100644
--- a/Master/texmf-dist/source/luatex/luaotfload/filegraph.dot
+++ b/Master/texmf-dist/source/luatex/luaotfload/filegraph.dot
@@ -54,7 +54,7 @@ strict digraph luaotfload_files { //looks weird with circo ...
fontdbutil -> fontdbutil_diagnostics [label="--diagnose"]
fontdbutil -> status [label="version information"]
- luaotfload_package -> fontloader [label="merges", style=dashed]
+ mkimport -> fontloader [label="merges", style=dashed]
merged_luatex_fonts -> characters [label="luaotfload-auxiliary.lua",
ltail=cluster_merged]
@@ -108,14 +108,6 @@ strict digraph luaotfload_files { //looks weird with circo ...
style = "filled,rounded",
penwidth=2]
- luaotfload_package [label = "luaotfload-package.lua",
- shape = rect,
- width = "3.2cm",
- height = "1.2cm",
- color = "#01012222",
- style = "filled,rounded",
- penwidth=2]
-
fontdbutil_diagnostics [label = "luaotfload-diagnostics.lua",
shape = rect,
width = "3.2cm",
diff --git a/Master/texmf-dist/source/luatex/luaotfload/luaotfload-main.tex b/Master/texmf-dist/source/luatex/luaotfload/luaotfload-main.tex
index 967f5a2b346..ca1bc96e701 100644
--- a/Master/texmf-dist/source/luatex/luaotfload/luaotfload-main.tex
+++ b/Master/texmf-dist/source/luatex/luaotfload/luaotfload-main.tex
@@ -32,7 +32,7 @@
\beginfrontmatter
\setdocumenttitle {The \identifier{luaotfload} package}
- \setdocumentdate {2015/12/09 v2.6}
+ \setdocumentdate {2015/12/12 v2.6}
\setdocumentauthor {Elie Roux · Khaled Hosny · Philipp Gesang\\
Home: \hyperlink {https://github.com/lualatex/luaotfload}\\
Support: \email {lualatex-dev@tug.org}}
@@ -1076,8 +1076,8 @@ format.
It integrates the font loader, written entirely in \LUA, as distributed
in the \identifier{\LUATEX-Fonts} package.
%
-The original \LUA source files have been combined using the
-\fileent{mtx-package} script into a single, self-contained blob. In
+The original \LUA source files have been combined using the \CONTEXT
+packaging library into a single, self-contained blob. In
this form the font loader depends only on the \identifier{lualibs}
package and requires only minor adaptions to integrate into
\identifier{luaotfload}.
@@ -1106,17 +1106,14 @@ See figure \ref{file-graph} on page \pageref{file-graph} for a
graphical representation of the dependencies.
%
\label{package}%
-Through the script \fileent{luaotfload-package.lua} the \CONTEXT
-utility \fileent{mtx-package} is invoked to create the
-\identifier{luaotfload} fontloader as a merged (amalgamated) source
-file.\footnote{%
- \fileent{mtx-package}, a \LUA source code merging tool developed by
- Hans Hagen, is
- \hyperlink [part of \CONTEXT]{https://bitbucket.org/phg/context-mirror/src/726a663be481042003566d4614266b940b5a0c91/scripts/context/lua/mtx-package.lua?at=beta}
- and requires \fileent{mtxrun}.
- Run
- \inlinecode {mtxrun --script package --help}
- to display further information.
+Through the script \fileent{mkimport} a \CONTEXT library
+is invoked to create the \identifier{luaotfload} fontloader as a merged
+(amalgamated) source file.\footnote{%
+ In \CONTEXT, this facility can be accessed by means of a
+ \hyperlink[script]{https://bitbucket.org/phg/context-mirror/src/beta/scripts/context/lua/mtx-package.lua?at=beta}
+ which is integrated into \fileent{mtxrun} as a subcommand.
+ Run \inlinecode {mtxrun --script package --help} to display further
+ information.
For the actual merging code see the file
\fileent{util-mrg.lua} that is part of \CONTEXT.
}
@@ -1334,7 +1331,7 @@ The subcommand for importing takes the prefix of the desired \CONTEXT
Whereas the command for packaging requires a path to the
\emphasis{package description file} and the output name to be passed.
\beginlisting
-./scripts/mkimport package ./src/fontloader/luaotfload-package.lua fontloader-custom.lua
+./scripts/mkimport package fontloader-custom.lua
\endlisting
From the toplevel makefile, the targets \inlinecode{import} and