From fa76f542d750b3feef1c43ce4e72e9bf20ac4154 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= <mpg@elzevir.fr>
Date: Sun, 28 Mar 2010 19:25:44 +0200
Subject: Change lua file names, using new loader.

---
 Makefile                | 6 +++---
 TODO                    | 2 +-
 luatexbase-attr.dtx     | 8 ++++----
 luatexbase-cctb.dtx     | 8 ++++----
 luatexbase-modutils.dtx | 6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 2425163..9e40e38 100644
--- a/Makefile
+++ b/Makefile
@@ -5,16 +5,16 @@ 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
 
 # Files grouped by generation mode
 UNPACKED_MCB = luamcallbacks.lua \
 			   test-callbacks-latex.tex test-callbacks-plain.tex
 UNPACKED_REGS = luatexbase-regs.sty \
 				test-regs-plain.tex test-regs-latex.tex
-UNPACKED_ATTR = luatexbase-attr.sty luatexbase.attr.lua \
+UNPACKED_ATTR = luatexbase-attr.sty attr.lua \
 				test-attr-plain.tex test-attr-latex.tex
-UNPACKED_CCTB = luatexbase-cctb.sty luatexbase.cctb.lua \
+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
diff --git a/TODO b/TODO
index 378e6c1..df326e0 100644
--- a/TODO
+++ b/TODO
@@ -2,6 +2,7 @@ general
 -------
 
 - check for user macros starting with \luatex
+- problems for testing since the loader changed. review Makefile
 
 compat
 ------
@@ -13,7 +14,6 @@ compat
 loader
 ------
 
-- adujst names of the other modules
 - write doc
 - make a real test using a fake texmf tree as TEXMFHOME?
 - ensure compatibility with older versions of LuaTeX (no 'lua' type for
diff --git a/luatexbase-attr.dtx b/luatexbase-attr.dtx
index f095f05..56885f8 100644
--- a/luatexbase-attr.dtx
+++ b/luatexbase-attr.dtx
@@ -8,7 +8,7 @@
 %
 % This work consists of the main source file luatexbase-attr.dtx
 % and the derived files
-%    luatexbase-attr.sty luatexbase.attr.lua
+%    luatexbase-attr.sty attr.lua
 %    test-regs-plain.tex test-regs-latex.tex
 %
 % Unpacking:
@@ -66,7 +66,7 @@ See source file '\inFileName' for details.
 
 \generate{%
   \usedir{tex/luatex/luatexbase}%
-  \file{luatexbase.attr.lua}{\from{luatexbase-attr.dtx}{luamodule}}%
+  \file{attr.lua}{\from{luatexbase-attr.dtx}{luamodule}}%
 }
 
 \obeyspaces
@@ -75,7 +75,7 @@ See source file '\inFileName' for details.
 \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 attr.lua}
 \Msg{*}
 \Msg{* Happy TeXing!}
 \Msg{*}
@@ -259,7 +259,7 @@ See source file '\inFileName' for details.
 \else
   \RequirePackage{luatexbase-loader}
 \fi
-\directlua{require('luatexbase.attr.lua')}
+\directlua{require('attr.lua')}
 %    \end{macrocode}
 %
 %    \subsection{User macros}
diff --git a/luatexbase-cctb.dtx b/luatexbase-cctb.dtx
index 7a2bd6f..ddd6c68 100644
--- a/luatexbase-cctb.dtx
+++ b/luatexbase-cctb.dtx
@@ -8,7 +8,7 @@
 %
 % This work consists of the main source file luatexbase-cctb.dtx
 % and the derived files
-%    luatexbase-cctb.sty luatexbase.cctb.lua
+%    luatexbase-cctb.sty cctb.lua
 %    test-cctb-plain.tex test-cctb-latex.tex
 %
 % Unpacking:
@@ -66,7 +66,7 @@ See source file '\inFileName' for details.
 
 \generate{%
   \usedir{tex/luatex/luatexbase}%
-  \file{luatexbase.cctb.lua}{\from{luatexbase-cctb.dtx}{luamodule}}%
+  \file{cctb.lua}{\from{luatexbase-cctb.dtx}{luamodule}}%
 }
 
 \obeyspaces
@@ -75,7 +75,7 @@ See source file '\inFileName' for details.
 \Msg{* To finish the installation you have to move the following}
 \Msg{* files into a directory searched by TeX:}
 \Msg{*}
-\Msg{*     luatexbase-cctb.sty luatexbase.cctb.lua}
+\Msg{*     luatexbase-cctb.sty cctb.lua}
 \Msg{*}
 \Msg{* Happy TeXing!}
 \Msg{*}
@@ -282,7 +282,7 @@ See source file '\inFileName' for details.
 \else
   \RequirePackage{luatexbase-loader}
 \fi
-\directlua{require('luatexbase.cctb.lua')}
+\directlua{require('cctb.lua')}
 %    \end{macrocode}
 %
 %    \subsubsection{User macros}
diff --git a/luatexbase-modutils.dtx b/luatexbase-modutils.dtx
index cd173ec..c5633ae 100644
--- a/luatexbase-modutils.dtx
+++ b/luatexbase-modutils.dtx
@@ -66,7 +66,7 @@ See source file '\inFileName' for details.
 
 \generate{%
   \usedir{tex/luatex/luatexbase}%
-  \file{luatexbase.modutils.lua}{\from{luatexbase-modutils.dtx}{luamodule}}%
+  \file{modutils.lua}{\from{luatexbase-modutils.dtx}{luamodule}}%
   \usedir{doc/luatex/luatexbase}%
   \file{test-modutils.lua}{\from{luatexbase-modutils.dtx}{testdummy}}%
 }
@@ -77,7 +77,7 @@ See source file '\inFileName' for details.
 \Msg{* To finish the installation you have to move the following}
 \Msg{* files into a directory searched by TeX:}
 \Msg{*}
-\Msg{*     luatexbase-modutils.sty luatexbase.modutils.lua}
+\Msg{*     luatexbase-modutils.sty modutils.lua}
 \Msg{*}
 \Msg{* Happy TeXing!}
 \Msg{*}
@@ -283,7 +283,7 @@ See the module #1 documentation for explanation.^^J ...^^J}%
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\directlua{dofile(assert(kpse.find_file('luatexbase.modutils.lua', 'tex')))}
+\directlua{dofile(assert(kpse.find_file('modutils.lua', 'tex')))}
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-- 
cgit v1.2.3