From e93e40e44167098e535e26cc41e3daf0fdb81245 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= <mpg@elzevir.fr>
Date: Sat, 27 Mar 2010 14:25:12 +0100
Subject: Cleanup Lua names.

---
 luatexbase-cctb.dtx | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

(limited to 'luatexbase-cctb.dtx')

diff --git a/luatexbase-cctb.dtx b/luatexbase-cctb.dtx
index 5eeefc9..7c6a907 100644
--- a/luatexbase-cctb.dtx
+++ b/luatexbase-cctb.dtx
@@ -175,7 +175,7 @@ and the derived files
 % catcode table. Since |\chardef| is used for the definition of the control
 % sequence, this is rather easy to do. However, for extra ease of use, the
 % numbers are also directly accessible from Lua as the value of the table
-% |luatextra.catcodetables|, whose keys is the name of the control sequence
+% |luatexbase.catcodetables|, whose keys is the name of the control sequence
 % (without any leading backslash). Moreover, nickames are available for the
 % predefined catcode tables:
 % \begin{itemize}
@@ -270,7 +270,7 @@ and the derived files
     \global\chardef#1\allocationnumber
     \luatexinitcatcodetable\allocationnumber
     \begingroup\escapechar\m@ne \expandafter\endgroup
-    \directlua{luatextra.catcodetabledef_from_tex(
+    \directlua{luatexbase.catcodetabledef_from_tex(
       '\luatexluaescapestring{\string#1}', '\number\allocationnumber')}%
     \wlog{\string#1=\string\luatexcatcodetable\the\allocationnumber}%
   \else
@@ -391,7 +391,7 @@ and the derived files
 %    Finally do the shortcuts.
 %
 %    \begin{macrocode}
-\directlua{luatextra.catcodetable_do_shortcuts()}
+\directlua{luatexbase.catcodetable_do_shortcuts()}
 %</texpackage>
 %    \end{macrocode}
 %
@@ -399,28 +399,26 @@ and the derived files
 %
 %    \begin{macrocode}
 %<*luamodule>
-module('luatextra', package.seeall)
+module('luatexbase', package.seeall)
 %    \end{macrocode}
 %
-%    In the same way, the table \texttt{tex.catcodetablenumber} contains the
-%    numbers of the catcodetables registered with
-%    \texttt{\string\newluacatcodetable}.
+%    The number associated to a CS name is remembered in the |catcodetables|
+%    table.
 %
 %    \begin{macrocode}
 catcodetables = {}
-tex.catcodetablenumber = catcodetables
 function catcodetabledef_from_tex(name, number)
     catcodetables[name] = tonumber(number)
 end
 %    \end{macrocode}
 %
-%    With this function we create some shortcuts for a better readability in
-%    lua code. This makes |tex.catcodetablenumber.latex| equivalent to
-%    |tex.catcodetablenumber['CatcodeTableLaTeX']|.
+%    The next function creates some shortcuts for better readability in lua
+%    code. This makes |luatexbase.catcodetables.latex| equivalent to
+%    |luatexbase.catcodetables.CatcodeTableLaTeX|.
 %
 %    \begin{macrocode}
 function catcodetable_do_shortcuts()
-    local cat = luatextra.catcodetables
+    local cat = catcodetables
     cat['latex']                = cat.CatcodeTableLaTeX
     cat['latex-package']        = cat.CatcodeTableLaTeXAtLetter
     cat['latex-atletter']       = cat.CatcodeTableLaTeXAtLetter
@@ -447,7 +445,7 @@ end
 %<testlatex>\RequirePackage{luatexbase-cctb}
 %<*testplain,testlatex>
 \newluatexcatcodetable\testcctb
-\directlua{assert(luatextra.catcodetables.testcctb)}
+\directlua{assert(luatexbase.catcodetables.testcctb)}
 %    \end{macrocode}
 %
 %    Also check that the catcodetable's number is remembered well,
@@ -458,7 +456,7 @@ end
 \escapechar64
 \newluatexcatcodetable\anothercctb
 \endgroup
-\directlua{assert(luatextra.catcodetables.anothercctb)}
+\directlua{assert(luatexbase.catcodetables.anothercctb)}
 %    \end{macrocode}
 %
 %    Now, play a little bit with predefined tables.
@@ -471,7 +469,7 @@ end
 %<testlatex>\documentclass{minimal}
 \directlua{%
   tex.sprint('\string\\setbox0=\string\\hbox{')
-  tex.sprint(luatextra.catcodetables.string, "\string\\undef # _^&")
+  tex.sprint(luatexbase.catcodetables.string, "\string\\undef # _^&")
   tex.sprint('}')
   }
 %    \end{macrocode}
-- 
cgit v1.2.3


From 86a8b1f74fad27b60acb9a14f0ad74a0f020885a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= <mpg@elzevir.fr>
Date: Sat, 27 Mar 2010 14:31:03 +0100
Subject: s/\luatexsetcatcoderange/\setcatcoderange/

---
 luatexbase-cctb.dtx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'luatexbase-cctb.dtx')

diff --git a/luatexbase-cctb.dtx b/luatexbase-cctb.dtx
index 7c6a907..198da9c 100644
--- a/luatexbase-cctb.dtx
+++ b/luatexbase-cctb.dtx
@@ -142,7 +142,7 @@ and the derived files
 % (once they are allocated), two helper macros are available.
 %
 % \begin{quote}
-% \cs{luatexsetcatcoderange}\marg{from}\marg{to}\marg{value}
+% \cs{setcatcoderange}\marg{from}\marg{to}\marg{value}
 % \end{quote}
 % Set all characters code in the range \meta{from}--\meta{to} to the given
 % catcode \meta{value}.
@@ -292,7 +292,7 @@ and the derived files
 %    Set the catcodes for a range of characters.
 %
 %    \begin{macrocode}
-\def\luatexsetcatcoderange#1#2#3{%
+\def\setcatcoderange#1#2#3{%
   \edef\luaSCR@temp{%
     \noexpand\@tempcnta=\the\@tempcnta
     \noexpand\@tempcntb=\the\@tempcntb
@@ -333,8 +333,8 @@ and the derived files
   \catcode0   12 % nul
   \catcode13  12 % carriage return
   \catcode37  12 % percent
-  \luatexsetcatcoderange{65}{90}{12}% A-Z
-  \luatexsetcatcoderange{97}{122}{12}% a-z
+  \setcatcoderange{65}{90}{12}% A-Z
+  \setcatcoderange{97}{122}{12}% a-z
   \catcode92  12 % backslash
   \catcode127 12 }
 %    \end{macrocode}
@@ -352,7 +352,7 @@ and the derived files
 \newluatexcatcodetable\CatcodeTableLaTeX
 \setluatexcatcodetable\CatcodeTableLaTeX{%
   \luatexcatcodetable\CatcodeTableIniTeX
-  \luatexsetcatcoderange{0}{31}{15}%
+  \setcatcoderange{0}{31}{15}%
   \catcode9   10 % tab
   \catcode12  13 % form feed
   \catcode13  5  % carriage return
-- 
cgit v1.2.3

