summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile17
-rw-r--r--luatexbase-attr.dtx2
-rw-r--r--luatexbase-cctb.dtx2
-rw-r--r--luatexbase-modutils.dtx2
4 files changed, 12 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index e342741..c8fefae 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,8 @@ DTX = $(wildcard *.dtx)
DOC = $(patsubst %.dtx, %.pdf, $(DTX))
DTXSTY = lltxb-dtxstyle.tex
LOADER_RUN = luatexbase-loader.sty luatexbase.loader.lua
-MOD_RUN = luatexbase-modutils.sty luatexbase.modutils.lua
+MOD_RUN = luatexbase-modutils.sty modutils.lua
+LINKS = luatexbase.attr.lua luatexbase.cctb.lua luatexbase.modutils.lua
# Files grouped by generation mode
UNPACKED_MCB = luamcallbacks.lua \
@@ -18,8 +19,8 @@ UNPACKED_CCTB = luatexbase-cctb.sty cctb.lua \
test-cctb-plain.tex test-cctb-latex.tex
UNPACKED_LOADER = $(LOADER_RUN) \
test-loader-plain.tex test-loader-latex.tex
-UNPACKED_MODUTILS = $(MOD_RUN) \
- test-modutils-plain.tex test-modutils-latex.tex test-modutils.lua
+UNPACKED_MODUTILS = $(MOD_RUN) test-modutils.lua \
+ test-modutils-plain.tex test-modutils-latex.tex
UNPACKED = $(UNPACKED_MCB) $(UNPACKED_REGS) $(UNPACKED_ATTR) $(UNPACKED_CCTB) \
$(UNPACKED_LOADER) $(UNPACKED_MODUTILS)
COMPILED = $(DOC)
@@ -90,11 +91,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) $(LOADER_RUN)
+check-attr: $(UNPACKED_ATTR) $(LOADER_RUN) $(LINKS)
luatex --interaction=batchmode test-attr-plain.tex >/dev/null
lualatex --interaction=batchmode test-attr-latex.tex >/dev/null
-check-cctb: $(UNPACKED_CCTB) $(LOADER_RUN)
+check-cctb: $(UNPACKED_CCTB) $(LOADER_RUN) $(LINKS)
luatex --interaction=batchmode test-cctb-plain.tex >/dev/null
lualatex --interaction=batchmode test-cctb-latex.tex >/dev/null
@@ -102,11 +103,11 @@ check-loader: $(UNPACKED_LOADER)
luatex --interaction=batchmode test-loader-plain.tex >/dev/null
lualatex --interaction=batchmode test-loader-latex.tex >/dev/null
-check-modutils: $(UNPACKED_MODUTILS) $(LOADER_RUN)
+check-modutils: $(UNPACKED_MODUTILS) $(LOADER_RUN) $(LINKS)
luatex --interaction=batchmode test-modutils-plain.tex >/dev/null
lualatex --interaction=batchmode test-modutils-latex.tex >/dev/null
-check-mcb: $(UNPACKED_MCB) $(LOADER_RUN) $(MOD_RUN)
+check-mcb: $(UNPACKED_MCB) $(LOADER_RUN) $(MOD_RUN) $(LINKS)
luatex --interaction=batchmode test-callbacks-plain.tex >/dev/null
lualatex --interaction=batchmode test-callbacks-latex.tex >/dev/null
@@ -146,5 +147,5 @@ clean:
@$(RM) -- *.log *.aux *.toc *.idx *.ind *.ilg *.out test-*.pdf
mrproper: clean
- @$(RM) -- $(GENERATED) $(ZIPS)
+ @$(RM) -- $(GENERATED) $(ZIPS) $(LINKS)
diff --git a/luatexbase-attr.dtx b/luatexbase-attr.dtx
index 56885f8..41d7b88 100644
--- a/luatexbase-attr.dtx
+++ b/luatexbase-attr.dtx
@@ -259,7 +259,7 @@ See source file '\inFileName' for details.
\else
\RequirePackage{luatexbase-loader}
\fi
-\directlua{require('attr.lua')}
+\directlua{require('luatexbase.attr')}
% \end{macrocode}
%
% \subsection{User macros}
diff --git a/luatexbase-cctb.dtx b/luatexbase-cctb.dtx
index ddd6c68..0777106 100644
--- a/luatexbase-cctb.dtx
+++ b/luatexbase-cctb.dtx
@@ -282,7 +282,7 @@ See source file '\inFileName' for details.
\else
\RequirePackage{luatexbase-loader}
\fi
-\directlua{require('cctb.lua')}
+\directlua{require('luatexbase.cctb')}
% \end{macrocode}
%
% \subsubsection{User macros}
diff --git a/luatexbase-modutils.dtx b/luatexbase-modutils.dtx
index c5633ae..cc8032e 100644
--- a/luatexbase-modutils.dtx
+++ b/luatexbase-modutils.dtx
@@ -283,7 +283,7 @@ See the module #1 documentation for explanation.^^J ...^^J}%
% \end{macrocode}
%
% \begin{macrocode}
-\directlua{dofile(assert(kpse.find_file('modutils.lua', 'tex')))}
+\directlua{require('luatexbase.modutils')}
% \end{macrocode}
%
% \begin{macrocode}