diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | TODO | 3 | ||||
| -rw-r--r-- | luamcallbacks.dtx | 6 | ||||
| -rw-r--r-- | luatexbase-attr.dtx | 20 | ||||
| -rw-r--r-- | luatexbase-cctb.dtx | 21 | ||||
| -rw-r--r-- | luatexbase-loader.dtx | 13 | ||||
| -rw-r--r-- | luatexbase-modutils.dtx | 12 | ||||
| -rw-r--r-- | luatexbase-regs.dtx | 13 |
8 files changed, 33 insertions, 59 deletions
@@ -86,11 +86,11 @@ check-regs: $(UNPACKED_REGS) luatex --interaction=batchmode test-regs-plain.tex >/dev/null lualatex --interaction=batchmode test-regs-latex.tex >/dev/null -check-attr: $(UNPACKED_ATTR) +check-attr: $(UNPACKED_ATTR) $(LOADER_RUN) luatex --interaction=batchmode test-attr-plain.tex >/dev/null lualatex --interaction=batchmode test-attr-latex.tex >/dev/null -check-cctb: $(UNPACKED_CCTB) +check-cctb: $(UNPACKED_CCTB) $(LOADER_RUN) luatex --interaction=batchmode test-cctb-plain.tex >/dev/null lualatex --interaction=batchmode test-cctb-latex.tex >/dev/null @@ -1,8 +1,6 @@ general ------- -- redo module loading in packages once mods is done. -- adjust preamble to avoid duplicated list of files (refer to DTX instead) - add catcode defenses - adjust original luatextra package @@ -37,6 +35,7 @@ loader ------ - a.b.c -> a/b/c or a/b.c or a.b.c? What do to with files under texmf/scripts? +- adujst names of the modules afterwards - write doc modutils diff --git a/luamcallbacks.dtx b/luamcallbacks.dtx index 98cf67a..2260f04 100644 --- a/luamcallbacks.dtx +++ b/luamcallbacks.dtx @@ -32,15 +32,11 @@ \let\MetaPrefix\relax \preamble -This is a generated file. Copyright (C) 2009 by Elie Roux <elie.roux@telecom-bretagne.eu> This work is under the CC0 license. - -This work consists of the main source file luamcallbacks.dtx -and the derived files - luamcallbacks.lua, test-luamcallbacks.tex, luamcallbacks.pdf. +See source file '\inFileName' for details. \endpreamble diff --git a/luatexbase-attr.dtx b/luatexbase-attr.dtx index 7c9cc13..8e6b4a6 100644 --- a/luatexbase-attr.dtx +++ b/luatexbase-attr.dtx @@ -34,17 +34,11 @@ \let\MetaPrefix\relax \preamble -This is a generated file. -Written in 2009, 2010 by Manuel Pégourié-Gonnard and Élie Roux. - <mpg@elzevir.fr> - <elie.roux@telecom-bretagne.eu> +Written in 2009, 2010 by Manuel Pegourie-Gonnard and Elie Roux. This work is under the CC0 license. - -This work consists of the main source file luatexbase-attr.dtx -and the derived files - luatexbase-attr.sty luatexbase.attr.lua ... +See source file '\inFileName' for details. \endpreamble @@ -81,7 +75,7 @@ and the derived files \Msg{* To finish the installation you have to move the following} \Msg{* files into a directory searched by TeX:} \Msg{*} -\Msg{* luatexbase-attr.sty luatexbase.attr.lua ...} +\Msg{* luatexbase-attr.sty luatexbase.attr.lua} \Msg{*} \Msg{* Happy TeXing!} \Msg{*} @@ -230,7 +224,13 @@ and the derived files % Load the supporting Lua module. % % \begin{macrocode} -\directlua{dofile(kpse.find_file('luatexbase.attr.lua', 'lua'))} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname RequirePackage\endcsname\relax + \input luatexbase-loader.sty +\else + \RequirePackage{luatexbase-loader} +\fi +\directlua{require('luatexbase.attr.lua')} % \end{macrocode} % % The allocaton macro. diff --git a/luatexbase-cctb.dtx b/luatexbase-cctb.dtx index 729faf0..435bc0d 100644 --- a/luatexbase-cctb.dtx +++ b/luatexbase-cctb.dtx @@ -34,18 +34,11 @@ \let\MetaPrefix\relax \preamble -This is a generated file. -Written in 2009, 2010 by Manuel Pégourié-Gonnard and Élie Roux. - <mpg@elzevir.fr> - <elie.roux@telecom-bretagne.eu> +Written in 2009, 2010 by Manuel Pegourie-Gonnard and Elie Roux. This work is under the CC0 license. - -This work consists of the main source file luatexbase-cctb.dtx -and the derived files - luatexbase-cctb.sty luatexbase.cctb.lua - test-cctb-plain.tex test-cctb-latex.tex +See source file '\inFileName' for details. \endpreamble @@ -82,7 +75,7 @@ and the derived files \Msg{* To finish the installation you have to move the following} \Msg{* files into a directory searched by TeX:} \Msg{*} -\Msg{* luatexbase-cctb.sty cctb.lua ...} +\Msg{* luatexbase-cctb.sty luatexbase.cctb.lua} \Msg{*} \Msg{* Happy TeXing!} \Msg{*} @@ -254,7 +247,13 @@ and the derived files % Load the supporting Lua module. % % \begin{macrocode} -\directlua{dofile(kpse.find_file('luatexbase.cctb.lua', 'lua'))} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname RequirePackage\endcsname\relax + \input luatexbase-loader.sty +\else + \RequirePackage{luatexbase-loader} +\fi +\directlua{require('luatexbase.cctb.lua')} % \end{macrocode} % % The allocation macro. Allocate tables starting with 1, since table 0 is diff --git a/luatexbase-loader.dtx b/luatexbase-loader.dtx index 48633d2..cb5079c 100644 --- a/luatexbase-loader.dtx +++ b/luatexbase-loader.dtx @@ -34,18 +34,11 @@ \let\MetaPrefix\relax \preamble -This is a generated file. -Written in 2009, 2010 by Manuel Pégourié-Gonnard and Élie Roux. - <mpg@elzevir.fr> - <elie.roux@telecom-bretagne.eu> +Written in 2009, 2010 by Manuel Pegourie-Gonnard and Elie Roux. This work is under the CC0 license. - -This work consists of the main source file luatexbase-loader.dtx -and the derived files - luatexbase-loader.sty luatexbase.loader.lua - test-loader-plain.tex test-loader-latex.tex +See source file '\inFileName' for details. \endpreamble @@ -82,7 +75,7 @@ and the derived files \Msg{* To finish the installation you have to move the following} \Msg{* files into a directory searched by TeX:} \Msg{*} -\Msg{* luatexbase-loader.sty loader.lua ...} +\Msg{* luatexbase-loader.sty luatex.loader.lua} \Msg{*} \Msg{* Happy TeXing!} \Msg{*} diff --git a/luatexbase-modutils.dtx b/luatexbase-modutils.dtx index 4a1580b..6cea769 100644 --- a/luatexbase-modutils.dtx +++ b/luatexbase-modutils.dtx @@ -34,17 +34,11 @@ \let\MetaPrefix\relax \preamble -This is a generated file. -Written in 2009, 2010 by Manuel Pégourié-Gonnard and Élie Roux. - <mpg@elzevir.fr> - <elie.roux@telecom-bretagne.eu> +Written in 2009, 2010 by Manuel Pegourie-Gonnard and Elie Roux. This work is under the CC0 license. - -This work consists of the main source file luatexbase-modutils.dtx -and the derived files - luatexbase-modutils.sty modutils.lua ... +See source file '\inFileName' for details. \endpreamble @@ -83,7 +77,7 @@ and the derived files \Msg{* To finish the installation you have to move the following} \Msg{* files into a directory searched by TeX:} \Msg{*} -\Msg{* luatexbase-modutils.sty modutils.lua ...} +\Msg{* luatexbase-modutils.sty luatexbase.modutils.lua} \Msg{*} \Msg{* Happy TeXing!} \Msg{*} diff --git a/luatexbase-regs.dtx b/luatexbase-regs.dtx index 30e477d..bf532ed 100644 --- a/luatexbase-regs.dtx +++ b/luatexbase-regs.dtx @@ -37,18 +37,11 @@ \askforoverwritefalse \preamble -This is a generated file. -Written in 2009, 2010 by Manuel P'egouri'e-Gonnard and 'Elie Roux. - <mpg@elzevir.fr> - <elie.roux@telecom-bretagne.eu> +Written in 2009, 2010 by Manuel Pegourie-Gonnard and Elie Roux. This work is under the CC0 license. - -This work consists of the main source file luatexbase-regs.dtx -and the derived files - luatexbase-regs.pdf luatexbase-regs.sty - test-regs-plain.tex test-regs-latex.tex +See source file '\inFileName' for details. \endpreamble @@ -69,7 +62,7 @@ and the derived files \Msg{* To finish the installation you have to move the following} \Msg{* files into a directory searched by TeX:} \Msg{*} -\Msg{* luatexbase-regs.sty luatexbase-regs-latex.tex ...} +\Msg{* luatexbase-regs.sty} \Msg{*} \Msg{* Happy TeXing!} \Msg{*} |