From d137b351bcbb9f146bea8faf053d43d66c18fec4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 30 Jan 2017 23:30:25 +0000 Subject: luaotfload (30jan17) git-svn-id: svn://tug.org/texlive/trunk@43092 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/source/luatex/luaotfload/Makefile | 18 ++++---- .../source/luatex/luaotfload/luaotfload-main.tex | 17 +++++++- .../source/luatex/luaotfload/luaotfload-tool.rst | 4 +- .../source/luatex/luaotfload/luaotfload.conf.rst | 49 +++++++++++----------- 4 files changed, 52 insertions(+), 36 deletions(-) (limited to 'Master/texmf-dist/source/luatex/luaotfload') diff --git a/Master/texmf-dist/source/luatex/luaotfload/Makefile b/Master/texmf-dist/source/luatex/luaotfload/Makefile index a131f3ace05..e59b43e290c 100644 --- a/Master/texmf-dist/source/luatex/luaotfload/Makefile +++ b/Master/texmf-dist/source/luatex/luaotfload/Makefile @@ -198,16 +198,18 @@ $(TDS_ZIP): $(DOCS) $(ALL_STATUS) check sign: $(CTAN_ZIPSIG) -.PHONY: package install manifest clean mrproper show showtargets check import news +.PHONY: package install manifest clean mrproper show showtargets +.PHONY: check import news tds ctan sign package loader +ifndef DESTDIR install: - @echo " ××××××××××××××××××××××××××××××××" - @echo " There is no “install” target." - @echo " ××××××××××××××××××××××××××××××××" - @echo " Compile a TDS zipball (make tds)" - @echo " and extract that into your local" - @echo " TEXMF instead." - @echo " ××××××××××××××××××××××××××××××××" + $(error "in order to install you need to provide $$DESTDIR") +else +install: $(TDS_ZIP) + $(info installing to destination “$(DESTDIR)”) + install -dm755 "$(DESTDIR)" + unzip "$(TDS_ZIP)" -d "$(DESTDIR)" +endif manifest: @echo "Source files:" diff --git a/Master/texmf-dist/source/luatex/luaotfload/luaotfload-main.tex b/Master/texmf-dist/source/luatex/luaotfload/luaotfload-main.tex index f6c7301a4a4..c26235e479d 100644 --- a/Master/texmf-dist/source/luatex/luaotfload/luaotfload-main.tex +++ b/Master/texmf-dist/source/luatex/luaotfload/luaotfload-main.tex @@ -1,4 +1,4 @@ -%% Copyright (C) 2009-2016 +%% Copyright (C) 2009-2017 %% %% by Elie Roux %% and Khaled Hosny @@ -32,7 +32,7 @@ \beginfrontmatter \setdocumenttitle {The \identifier{luaotfload} package} - \setdocumentdate {2016/06/16 v2.7} + \setdocumentdate {2017/01/29 v2.8} \setdocumentauthor {Elie Roux · Khaled Hosny · Philipp Gesang\\ Home: \hyperlink {https://github.com/lualatex/luaotfload}\\ Support: \email {lualatex-dev@tug.org}} @@ -424,6 +424,19 @@ non-standard directory: \font \gfsporson = "[/tmp/GFSPorson.otf]" at 12pt \endlisting +\identifier{TrueType} collection files (the extension is usually +\inlinecode{.ttc}) contain more than a single font. In order to refer to these +subfonts, the respective index may be added in parentheses after the file +name.\footnote{% + Incidentally, this syntactical detail also prevents one from loading files + that end in balanced parentheses. +} + +\beginlisting + \font \cambriamain = "file:cambria.ttc(0)" at 10pt + \font \cambriamath = "file:cambria.ttc(1)" at 10pt +\endlisting + \endsubsubsection \beginsubsubsection{Loading by Font Name} diff --git a/Master/texmf-dist/source/luatex/luaotfload/luaotfload-tool.rst b/Master/texmf-dist/source/luatex/luaotfload/luaotfload-tool.rst index 28f8e0099c6..1eeba11aaed 100644 --- a/Master/texmf-dist/source/luatex/luaotfload/luaotfload-tool.rst +++ b/Master/texmf-dist/source/luatex/luaotfload/luaotfload-tool.rst @@ -6,9 +6,9 @@ generate and query the Luaotfload font names database ----------------------------------------------------------------------- -:Date: 2016-06-16 +:Date: 2017-01-28 :Copyright: GPL v2.0 -:Version: 2.7 +:Version: 2.8 :Manual section: 1 :Manual group: text processing diff --git a/Master/texmf-dist/source/luatex/luaotfload/luaotfload.conf.rst b/Master/texmf-dist/source/luatex/luaotfload/luaotfload.conf.rst index 051ec7fb981..fbef8ec70a2 100644 --- a/Master/texmf-dist/source/luatex/luaotfload/luaotfload.conf.rst +++ b/Master/texmf-dist/source/luatex/luaotfload/luaotfload.conf.rst @@ -6,9 +6,9 @@ Luaotfload configuration file ----------------------------------------------------------------------- -:Date: 2016-06-16 +:Date: 2017-01-29 :Copyright: GPL v2.0 -:Version: 2.7 +:Version: 2.8 :Manual section: 5 :Manual group: text processing @@ -125,25 +125,25 @@ the variable is unset. Section ``db`` ----------------------------------------------------------------------- -+-----------------+--------+---------------------------+ -| variable | type | default | -+-----------------+--------+---------------------------+ -| compress | b | ``true`` | -+-----------------+--------+---------------------------+ -| formats | s | ``"otf,ttf,ttc"`` | -+-----------------+--------+---------------------------+ -| max-fonts | n | ``2^51`` | -+-----------------+--------+---------------------------+ -| scan-local | b | ``false`` | -+-----------------+--------+---------------------------+ -| skip-read | b | ``false`` | -+-----------------+--------+---------------------------+ -| strip | b | ``true`` | -+-----------------+--------+---------------------------+ -| update-live | b | ``true`` | -+-----------------+--------+---------------------------+ -| use-fontforge | b | ``false`` | -+-----------------+--------+---------------------------+ ++--------------------+--------+---------------------------+ +| variable | type | default | ++--------------------+--------+---------------------------+ +| compress | b | ``true`` | ++--------------------+--------+---------------------------+ +| designsize-dimen | b | ``bp`` | ++--------------------+--------+---------------------------+ +| formats | s | ``"otf,ttf,ttc"`` | ++--------------------+--------+---------------------------+ +| max-fonts | n | ``2^51`` | ++--------------------+--------+---------------------------+ +| scan-local | b | ``false`` | ++--------------------+--------+---------------------------+ +| skip-read | b | ``false`` | ++--------------------+--------+---------------------------+ +| strip | b | ``true`` | ++--------------------+--------+---------------------------+ +| update-live | b | ``true`` | ++--------------------+--------+---------------------------+ The flag ``compress`` determines whether the font index (usually ``luaotfload-names.lua[.gz]`` will be stored in compressed forms. @@ -152,6 +152,10 @@ If unset it is equivalent of passing ``--no-compress`` to and has no effect on the runtime behavior of Luaotfload, the flag should remain set. Most editors come with zlib support anyways. +The setting ``designsize-dimen`` applies when looking up fonts from +families with design sizes. The default of DTP-style “big points” +can be changed for ``pt`` or even ``dd``. + The list of ``formats`` must be a comma separated sequence of strings containing one or more of these elements: @@ -189,9 +193,6 @@ cannot find a requested font. Those who prefer to update manually using **luaotfload-tool** should unset this flag. This option does not affect rebuilds due to version mismatch. -The option ``use-fontforge`` had a meaning during the transition to the -Lua-only Opentype reader. At present it is ignored. - Section ``default-features`` ----------------------------------------------------------------------- -- cgit v1.2.3