From 57b43df4ca8a972693fe78b62f5309329658c162 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Tue, 23 Apr 2013 13:47:14 +0200 Subject: update filegraph --- luaotfload.dtx | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'luaotfload.dtx') diff --git a/luaotfload.dtx b/luaotfload.dtx index 7c74a37..e78e4b6 100644 --- a/luaotfload.dtx +++ b/luaotfload.dtx @@ -158,6 +158,8 @@ and the derived files \newcommand*\email[1]{\href{mailto:#1}{#1}} +\renewcommand\partname{Part}%% gets rid of the stupid “file” heading + \VerbatimFootnotes \begin{document} \DocInput{luaotfload.dtx}% @@ -882,6 +884,15 @@ and the derived files % \CONTEXT beta, all you have to do is remove % \fileent{luaotfload-merged.lua} from the search path. % +% Also, the merged file at some point +% loads the Adobe Glyph List from a \LUA table that is contained in +% \fileent{font-age.lua}, which has also been imported unmodified from +% \CONTEXT.\footnote{% +% See \fileent{luaotfload-font-enc.lua}. +% The hard-coded file name is why the file lacks the \fileent{luaotfload-} +% prefix. +% } +% % In addition to these, \identifier{luaotfload} requires a number of % files not contained in the merge. Some of these have no equivalent in % \LUATEX-Fonts or \CONTEXT, some were taken unmodified from the -- cgit v1.2.3 From 80ab69f3c89c4ee576310e073510f286ad0f3b66 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Tue, 23 Apr 2013 14:13:11 +0200 Subject: update documentation with info about ``mkglyphlist`` --- luaotfload.dtx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'luaotfload.dtx') diff --git a/luaotfload.dtx b/luaotfload.dtx index e78e4b6..dbc822f 100644 --- a/luaotfload.dtx +++ b/luaotfload.dtx @@ -886,12 +886,15 @@ and the derived files % % Also, the merged file at some point % loads the Adobe Glyph List from a \LUA table that is contained in -% \fileent{font-age.lua}, which has also been imported unmodified from -% \CONTEXT.\footnote{% +% \fileent{font-age.lua}, which is automatically generated by the +% script \fileent{mkglyphlist}.\footnote{% % See \fileent{luaotfload-font-enc.lua}. % The hard-coded file name is why the file lacks the \fileent{luaotfload-} % prefix. % } +% There is a make target \identifier{glyphs} that will create a fresh +% \fileent{font-age.lua} so we don’t need to import it from \CONTEXT +% any longer. % % In addition to these, \identifier{luaotfload} requires a number of % files not contained in the merge. Some of these have no equivalent in -- cgit v1.2.3 From 3f9f0bc4a14f7deae0ede11db626d93ba031c6b7 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Tue, 23 Apr 2013 15:38:16 +0200 Subject: update doc for new file names --- luaotfload.dtx | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) (limited to 'luaotfload.dtx') diff --git a/luaotfload.dtx b/luaotfload.dtx index dbc822f..5fd6954 100644 --- a/luaotfload.dtx +++ b/luaotfload.dtx @@ -907,21 +907,20 @@ and the derived files % \normalitem{\fileent{#1}}% % \space--\hskip1em % } -% \ouritem {luaotfload-font-otc.lua} \fileent{font-otc} from \CONTEXT; -% font feature handling. -% \ouritem {luaotfload-lib-dir.lua} \fileent{l-dir} from \CONTEXT; -% contains functionality required -% by \fileent{luaotfload-font-nms.lua}. -% \ouritem {luaotfload-luat-ovr.lua} overrides the \CONTEXT logging -% functionality. -% \ouritem {luaotfload-font-pfb.lua} registers the \OpenType -% font reader as handler for -% Postscript fonts. -% \ouritem {luaotfload-font-nms.lua} font database. -% \ouritem {luaotfload-font-clr.lua} color handling. -% \ouritem {luaotfload-font-ltx.lua} font feature handling. -% \ouritem {luaotfload-features.lua} definitions of the \verb|anum| and -% \verb|tlig| features. +% \ouritem {luaotfload-features.lua} font feature handling; +% incorporates some of the code from +% \fileent{font-otc} from \CONTEXT; +% \ouritem {luaotfload-lib-dir.lua} \fileent{l-dir} from \CONTEXT; +% contains functionality required +% by \fileent{luaotfload-font-nms.lua}. +% \ouritem {luaotfload-override.lua} overrides the \CONTEXT logging +% functionality. +% \ouritem {luaotfload-loaders.lua} registers the \OpenType +% font reader as handler for +% Postscript fonts +% (\abbrev{pfa}, \abbrev{pfb}). +% \ouritem {luaotfload-database.lua} font names database. +% \ouritem {luaotfload-colors.lua} color handling. % \end{itemize} % % \begin{figure}[b] -- cgit v1.2.3 From 6dde139e75c033014531882bc2b32282f8b3a760 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Tue, 23 Apr 2013 18:36:07 +0200 Subject: add link to dev repo --- luaotfload.dtx | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'luaotfload.dtx') diff --git a/luaotfload.dtx b/luaotfload.dtx index 5fd6954..e5e6abe 100644 --- a/luaotfload.dtx +++ b/luaotfload.dtx @@ -935,6 +935,10 @@ and the derived files % version of this package before reporting a bug, as % \identifier{luaotfload} is under active development and still a % moving target. +% The development takes place on \identifier{github} at +% \url{https://github.com/lualatex/luaotfload} where there is an issue +% tracker for submitting bug reports, feature requests and the likes +% requests and the likes. % % Errors during database generation can be traced by increasing % verbosity levels and redirecting log output to \fileent{stdout}: -- cgit v1.2.3 From 7a6d92c7860fd0a606e3efed7b96a81e64f9ebfe Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Tue, 23 Apr 2013 19:59:15 +0200 Subject: set minimum luatex version to 0.76; reduce verbosity of fontdbutil --- luaotfload.dtx | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'luaotfload.dtx') diff --git a/luaotfload.dtx b/luaotfload.dtx index e5e6abe..58fb9e1 100644 --- a/luaotfload.dtx +++ b/luaotfload.dtx @@ -1041,13 +1041,19 @@ local error, warning, info, log = luatexbase.provides_module(luaotfload.module) % \end{macrocode} -% -% We set the minimum version requirement for \LUATEX to v0.74, as it was -% the first version to include version 5.2 of the \LUA interpreter. +% We set the minimum version requirement for \LUATEX to v0.76, +% because the font loader requires recent features like direct +% attribute indexing and \luafunction{node.end_of_math()} that aren’t +% available in earlier versions.\footnote{% +% See Taco’s announcement of v0.76: +% \url{http://comments.gmane.org/gmane.comp.tex.luatex.user/4042} +% and this commit by Hans that introduced those features. +% \url{http://repo.or.cz/w/context.git/commitdiff/a51f6cf6ee087046a2ae5927ed4edff0a1acec1b}. +% } % % \begin{macrocode} -local luatex_version = 74 +local luatex_version = 76 if tex.luatexversion < luatex_version then warning("LuaTeX v%.2f is old, v%.2f is recommended.", @@ -1110,7 +1116,6 @@ end % \fileent{luaotfload-merged.lua}. % If this file cannot be found, the original libraries from \CONTEXT of % which the merged code was composed are loaded instead. -% % The imported font loader will call \luafunction{callback.register} once % while reading \fileent{font-def.lua}. % This is unavoidable unless we modify the imported files, but harmless @@ -1418,8 +1423,10 @@ end % \begin{macrocode} local read_font_file = fonts.definers.read -local patch_defined_font = function (...) - local tfmdata = read_font_file(...)-- spec -> size -> id -> tmfdata + +--- spec -> size -> id -> tmfdata +local patch_defined_font = function (specification, size, id) + local tfmdata = read_font_file(specification, size, id) if type(tfmdata) == "table" then call_callback("luaotfload.patch_font", tfmdata) end @@ -1489,7 +1496,6 @@ loadmodule"features.lua" --- contains what was “font-ltx” and “font-otc” -- vim:tw=71:sw=4:ts=4:expandtab - % \end{macrocode} % % \iffalse -- cgit v1.2.3 From 7e703cea3a68c7f6e52e63f0335f22ed1a231f84 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Tue, 23 Apr 2013 23:57:40 +0200 Subject: update basics-gen.lua --- luaotfload.dtx | 2 ++ 1 file changed, 2 insertions(+) (limited to 'luaotfload.dtx') diff --git a/luaotfload.dtx b/luaotfload.dtx index 58fb9e1..e265389 100644 --- a/luaotfload.dtx +++ b/luaotfload.dtx @@ -870,6 +870,7 @@ and the derived files % \incitem{font-otf.lua} \incitem{font-otb.lua} % \incitem{node-inj.lua} \incitem{font-ota.lua} % \incitem{font-otn.lua} \incitem{font-def.lua} +% \incitem{font-otp.lua} % \end{itemize} % \end{multicols} % \end{itemize} @@ -1273,6 +1274,7 @@ else--- the loading sequence is known to change, so this might have to loadmodule('node-inj.lua') loadmodule('font-ota.lua') loadmodule('font-otn.lua') + loadmodule('font-otp.lua')--- since 2013-04-23 loadmodule('luatex-fonts-lua.lua') loadmodule('font-def.lua') loadmodule('luatex-fonts-def.lua') -- cgit v1.2.3 From 24a3ecb19d3ca204ac4432e8f2f0b2bf53954b05 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Wed, 24 Apr 2013 18:58:02 +0200 Subject: catch irregular ``file:`` lookups we now index base names and extensionless base names of font files as well so as to work around quirks of the Xetex compatibility layer. this will probably get removed after the syntax parser is redone. --- luaotfload.dtx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'luaotfload.dtx') diff --git a/luaotfload.dtx b/luaotfload.dtx index e265389..81f1873 100644 --- a/luaotfload.dtx +++ b/luaotfload.dtx @@ -1328,6 +1328,8 @@ add_to_callback("find_vf_file", loadmodule"lib-dir.lua" --- required by luaofload-database.lua loadmodule"override.lua" --- “luat-ovr” +logs.set_loglevel(2) + % \end{macrocode} % \CONTEXT does not support ofm, these lines were added in order to make it % work. However they do not seem necessary so they are commented for now. @@ -1399,7 +1401,7 @@ local define_font_wrapper = function (...) --- definers.read if stringfind(k, "Percent") then -- keep percent values as is - print(k,v) + --print(k,v) mathconstants[k] = v else mathconstants[k] = v / units_per_em * size -- cgit v1.2.3 From 988854282eb83a9c8bdcc0f97ac85937bb8f9ff8 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Wed, 24 Apr 2013 22:40:07 +0200 Subject: make db reloading require a reason; decrease nesting depth of conditionals --- luaotfload.dtx | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'luaotfload.dtx') diff --git a/luaotfload.dtx b/luaotfload.dtx index 81f1873..18e01d8 100644 --- a/luaotfload.dtx +++ b/luaotfload.dtx @@ -1328,7 +1328,7 @@ add_to_callback("find_vf_file", loadmodule"lib-dir.lua" --- required by luaofload-database.lua loadmodule"override.lua" --- “luat-ovr” -logs.set_loglevel(2) +logs.set_loglevel(0) % \end{macrocode} % \CONTEXT does not support ofm, these lines were added in order to make it @@ -1351,9 +1351,17 @@ loadmodule"colors.lua" --- “font-clr” % \end{macrocode} % This hack makes fonts called with file method found by fonts.names.resolve -% instead of just trying to find them with kpse. It is necessary in case -% of fonts that are not accessible by kpse but present in the database, a -% quite common case under Linux. +% instead of just trying to find them with \identifier{kpse}. +% It is necessary in cases when font files are not reachable by +% \identifier{kpse} but present in the database, a quite common case +% under Linux. +% +% As of 2013-04-24 we have a workaround in the resolver that handles +% \verb|file:| lookups diverted this way. +% It requires some overhead due to additional extra data saved in the +% names database, and might vanish entirely once the font request syntax +% is understood. +% Until then it is considered a kludge, like the hack below. % % \begin{macrocode} -- cgit v1.2.3