Made ucw-luacsplain work

Heavy magic around...

diff --git a/Makefile b/Makefile
index 6769095805423655d44655985a896d875de3aeee..8ba18ab5b80374ae35587df280e23624c4a799f5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,8 @@ export LUAINPUTS=.//:
 %.fmt: %.ini
        $(LUATEX) -file-line-error -jobname $* -ini $<
 
+.SECONDARY: ucw-luacsplain.fmt
+
 else ifdef USE_DVI
 
 %.dvi: %.tex $(MACROS)

diff --git a/test.tex b/test.tex
index 2e1b230692c258c69ce16d87aa1a8d94b7d7ec6a..6d47beb44816bcdbf6ed7eced4f4d156e4dd7e26 100644 (file)
--- a/test.tex
+++ b/test.tex
@@ -1,5 +1,8 @@
 \input ucwmac.tex
-\input ucw-ofs.tex
+\ifx\setfonts\undefined
+       % Preloaded in ucw-luacsplain
+       \input ucw-ofs.tex
+\fi
 \input ucw-verb.tex
 \input ucw-algo.tex
 

diff --git a/ucw-luacsplain.ini b/ucw-luacsplain.ini
index a8564cbcd1b52529151a5a28e6ef7d194bf3d6da..392952ac32b96e8bd32680b77afe94f58ccc5689 100644 (file)
--- a/ucw-luacsplain.ini
+++ b/ucw-luacsplain.ini
@@ -1,7 +1,11 @@
 %% Czech format for LuaTeX + ucwmac
 %%
 %% This is a cousin of Petr Olšák's csplain/luaplain living in LuaTeX land.
-%% It is based on ε-TeX
+%% It is based on ε-TeX.
+%%
+%% WARNING: This is experimental. We currently depend on internals of csplain
+%% and also on various packages related to LuaTeX, which tend to be rapidly
+%% changing.
 %%
 %% Written by Martin Mareš <mj@ucw.cz> in 2017 and placed into public domain
 
@@ -30,26 +34,28 @@
 \let\orifont=\undefined
 
 \input luatex-unicode-letters.tex      % Set properties of Unicode characters
-\input ltluatex.tex                    % LuaTeX support for plain TeX
+% \input ltluatex.tex                  % LuaTeX support for plain TeX
 \input luatex85.sty                    % Backward compatibility with pdfTeX
 \input pdftexconfig.tex                        % Initialize PDF output parameters
 \input pdftexmagfix.tex                        % Fix \magnification
 \input plaina4.tex                     % Set paper size to A4
 \input ucode.tex                       % \uv and similar macros for Czech typesetting
-\input luaotfload.sty                  % OTF loader
+% \input luaotfload.sty                        % OTF loader
 
 % Ask csplain to load LM fonts
-\def\fontfeatures{mode=base;script=latn;+tlig}
-\let\luafonts=\relax                   % Avoid inclusion of csplain's luafonts.tex
-\input lmfonts.tex
-\let\fontfeatures=\undefined
+% (currently disabled, because it is broken in some versions; use ucw-luaofs.tex instead)
+% \def\fontfeatures{mode=base;script=latn;+tlig}
+% \let\luafonts=\relax                 % Avoid inclusion of csplain's luafonts.tex
+% \input lmfonts.tex
+% \let\fontfeatures=\undefined
 
 \everyjob={%
-   \message{Loaded ucw-luacsplain 2017-10}%
+   \message{Loaded ucw-luacsplain 2018-06}%
    % Set resolution of bitmap fonts
    \directlua{kpse.init_prog("luatex", 600, "ljfour")}%
-   % We need to reload the OTF loader
-   \input luaotfload.sty
+   % These packages do not survive dumping, defer loading to \everyjob
+   \input ltluatex.tex
+   \input ucw-luaofs.tex
 }
 
 \dump