Rename to lualibs

Rename luaextra->lualibs when sensible, also use luatexbase instead of
luatextra.

21 files changed, 84 insertions, 81 deletions

diff --git a/Makefile b/Makefile
index 6ebf497..6d7673b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,19 @@
-# Makefile for luaextra.
+# Makefile for lualibs.
 
-NAME = luaextra
+NAME = lualibs
 DTX = $(wildcard *.dtx)
 DOC_DTX = $(patsubst %.dtx, %.pdf, $(DTX))
-EXTRA = $(wildcard luaextra-*.lua)
+MODULES = $(wildcard lualibs-*.lua)
 
 # Files grouped by generation mode
-UNPACKED= luaextra.lua 
+UNPACKED= lualibs.lua
 COMPILED = $(DOC_DTX)
 GENERATED = $(UNPACKED) $(DOC_DTX)
-SOURCE = $(DTX) $(EXTRA) README Makefile News
+SOURCE = $(DTX) $(MODULES) README Makefile NEWS
 
 # Files grouped by installation location
-RUNFILES = $(UNPACKED) $(EXTRA)
-DOCFILES = $(DOC_DTX) README News
+RUNFILES = $(UNPACKED) $(MODULES)
+DOCFILES = $(DOC_DTX) README NEWS
 SRCFILES = $(DTX) $(SRC_TEX) Makefile
 
 # The following definitions should be equivalent
@@ -50,7 +50,7 @@ world: all ctan
 	$(DO_PDFLATEX)
 	$(DO_PDFLATEX)
 
-$(UNPACKED): luaextra.dtx
+$(UNPACKED): lualibs.dtx
 	$(DO_TEX)
 
 $(CTAN_ZIP): $(SOURCE) $(COMPILED) $(TDS_ZIP)
diff --git a/News b/NEWS
index a6cad74..7ddbfb7 100644
--- a/News
+++ b/NEWS
@@ -1,4 +1,7 @@
-                        History of the luaextra package
+                        History of the lualibs package
+
+2010/05/10
+    * renamed the package from luaextra to lualibs
 
 2010/03/28
     * now a separate package (previously part of the luatextra bundle)
diff --git a/README b/README
index 4474015..7e7d1eb 100644
--- a/README
+++ b/README
@@ -1,12 +1,12 @@
-                          The luaextra generic package
+                          The lualibs generic package
 
 
-Luaextra is a collection of Lua modules useful for general programming.
+Lualibs is a collection of Lua modules useful for general programming.
 
 This work is based on lua modules shipped with ConTeXt, and are made available
 this package to be used independent of ConTeXt.
 
-This package is developed on <http://github.com/mpg/luaextra>, see the 'News'
+This package is developed on <http://github.com/mpg/luaextra>, see the 'NEWS'
 file for version history.
 
 Installation
@@ -15,10 +15,10 @@ Installation
 Here are the recommended installation methods (preferred first).
 The methods "commented out" are currently not available.
 
-1. If you are using TeX Live 2009 or later, use 'tlmgr install luaextra'.
+1. If you are using TeX Live 2010 or later, use 'tlmgr install lualibs'.
    Alternatively, try your (TeX or Linux) distribution's package management system.
 
-2. a. Grab luaextra.tds.zip on CTAN.
+2. a. Grab lualibs.tds.zip on CTAN.
    b. Unzip it at the root of one or your TDS trees.
    c. You may need to update some filename database after this, see your TeX
       distribution's manual for details.
@@ -31,31 +31,31 @@ Manifest
 --------
 
 Source files:
-    luaextra.dtx
-    luaextra-aux.lua
-    luaextra-boolean.lua
-    luaextra-dimen.lua
-    luaextra-dir.lua
-    luaextra-file.lua
-    luaextra-io.lua
-    luaextra-lpeg.lua
-    luaextra-math.lua
-    luaextra-md5.lua
-    luaextra-number.lua
-    luaextra-os.lua
-    luaextra-set.lua
-    luaextra-string.lua
-    luaextra-table.lua
-    luaextra-unicode.lua
-    luaextra-url.lua
-    luaextra-utils.lua
+    lualibs.dtx
+    lualibs-aux.lua
+    lualibs-boolean.lua
+    lualibs-dimen.lua
+    lualibs-dir.lua
+    lualibs-file.lua
+    lualibs-io.lua
+    lualibs-lpeg.lua
+    lualibs-math.lua
+    lualibs-md5.lua
+    lualibs-number.lua
+    lualibs-os.lua
+    lualibs-set.lua
+    lualibs-string.lua
+    lualibs-table.lua
+    lualibs-unicode.lua
+    lualibs-url.lua
+    lualibs-utils.lua
     README
     Makefile
-    News
+    NEWS
 
 Derived files:
-    luaextra.lua
-    luaextra.pdf
+    lualibs.lua
+    lualibs.pdf
 
 License
 -------
@@ -70,7 +70,7 @@ and a FAQ at
 
 http://wiki.creativecommons.org/CC0
 
-The files luaextra-*.lua are under the GNU GPLv2 license. Their legal notice
+The files lualibs-*.lua are under the GNU GPLv2 license. Their legal notice
 starts by:
 
 "
diff --git a/luaextra-aux.lua b/lualibs-aux.lua
index 7950a03..7950a03 100644
--- a/luaextra-aux.lua
+++ b/lualibs-aux.lua
diff --git a/luaextra-boolean.lua b/lualibs-boolean.lua
index be7ec7d..be7ec7d 100644
--- a/luaextra-boolean.lua
+++ b/lualibs-boolean.lua
diff --git a/luaextra-dimen.lua b/lualibs-dimen.lua
index a8faa27..a8faa27 100644
--- a/luaextra-dimen.lua
+++ b/lualibs-dimen.lua
diff --git a/luaextra-dir.lua b/lualibs-dir.lua
index 0d08362..0d08362 100644
--- a/luaextra-dir.lua
+++ b/lualibs-dir.lua
diff --git a/luaextra-file.lua b/lualibs-file.lua
index 6f5f5d0..6f5f5d0 100644
--- a/luaextra-file.lua
+++ b/lualibs-file.lua
diff --git a/luaextra-io.lua b/lualibs-io.lua
index 5a126da..5a126da 100644
--- a/luaextra-io.lua
+++ b/lualibs-io.lua
diff --git a/luaextra-lpeg.lua b/lualibs-lpeg.lua
index 2e366a9..2e366a9 100644
--- a/luaextra-lpeg.lua
+++ b/lualibs-lpeg.lua
diff --git a/luaextra-math.lua b/lualibs-math.lua
index fc8db47..fc8db47 100644
--- a/luaextra-math.lua
+++ b/lualibs-math.lua
diff --git a/luaextra-md5.lua b/lualibs-md5.lua
index 27955ef..27955ef 100644
--- a/luaextra-md5.lua
+++ b/lualibs-md5.lua
diff --git a/luaextra-number.lua b/lualibs-number.lua
index a1249f0..a1249f0 100644
--- a/luaextra-number.lua
+++ b/lualibs-number.lua
diff --git a/luaextra-os.lua b/lualibs-os.lua
index 4f0c0c1..4f0c0c1 100644
--- a/luaextra-os.lua
+++ b/lualibs-os.lua
diff --git a/luaextra-set.lua b/lualibs-set.lua
index f844d0b..f844d0b 100644
--- a/luaextra-set.lua
+++ b/lualibs-set.lua
diff --git a/luaextra-string.lua b/lualibs-string.lua
index 25b8f8e..25b8f8e 100644
--- a/luaextra-string.lua
+++ b/lualibs-string.lua
diff --git a/luaextra-table.lua b/lualibs-table.lua
index e8f72ed..e8f72ed 100644
--- a/luaextra-table.lua
+++ b/lualibs-table.lua
diff --git a/luaextra-unicode.lua b/lualibs-unicode.lua
index 290234d..290234d 100644
--- a/luaextra-unicode.lua
+++ b/lualibs-unicode.lua
diff --git a/luaextra-url.lua b/lualibs-url.lua
index e3e6f81..e3e6f81 100644
--- a/luaextra-url.lua
+++ b/lualibs-url.lua
diff --git a/luaextra-utils.lua b/lualibs-utils.lua
index a5bc9d7..a5bc9d7 100644
--- a/luaextra-utils.lua
+++ b/lualibs-utils.lua
diff --git a/luaextra.dtx b/lualibs.dtx
index 0f450d5..56aba9d 100644
--- a/luaextra.dtx
+++ b/lualibs.dtx
@@ -4,14 +4,14 @@
 %
 % See ConTeXt's mreadme.pdf for the license.
 %
-% This work consists of the main source file luaextra.dtx
-% and the derived file luaextra.lua.
+% This work consists of the main source file lualibs.dtx
+% and the derived file lualibs.lua.
 %
 % Unpacking:
-%    tex luatextra.dtx
+%    tex lualibs.dtx
 %
 % Documentation:
-%    pdflatex luaextra.dtx
+%    pdflatex lualibs.dtx
 %
 %    The class ltxdoc loads the configuration file ltxdoc.cfg
 %    if available. Here you can specify further options, e.g.
@@ -33,7 +33,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: luaextra 2010/01/11 v0.92 Lua additional functions.}
+\Msg{* Package: lualibs 2010/01/11 v0.92 Lua additional functions.}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -48,8 +48,8 @@ Copyright (C) 2009 by PRAGMA ADE / ConTeXt Development Team
 
 See ConTeXt's mreadme.pdf for the license.
 
-This work consists of the main source file luaextra.dtx
-and the derived file luaextra.lua.
+This work consists of the main source file lualibs.dtx
+and the derived file lualibs.lua.
 
 \endpreamble
 
@@ -66,8 +66,8 @@ and the derived file luaextra.lua.
 \def\currentpostamble{\luapostamble}%
 
 \generate{%
-  \usedir{tex/luatex/luatextra}%
-  \file{luaextra.lua}{\from{luaextra.dtx}{lua}}%
+  \usedir{tex/luatex/lualibs}%
+  \file{lualibs.lua}{\from{lualibs.dtx}{lua}}%
 }
 
 \obeyspaces
@@ -76,7 +76,7 @@ and the derived file luaextra.lua.
 \Msg{* To finish the installation you have to move the following}
 \Msg{* files into a directory searched by TeX:}
 \Msg{*}
-\Msg{*     luaextra.lua}
+\Msg{*     lualibs.lua}
 \Msg{*}
 \Msg{* Happy TeXing!}
 \Msg{*}
@@ -89,13 +89,13 @@ and the derived file luaextra.lua.
 %</ignore>
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesFile{luaextra.drv}
+\ProvidesFile{lualibs.drv}
   [2010/01/11 v0.92 Lua additional functions.]
 \documentclass{ltxdoc}
 \EnableCrossrefs
 \CodelineIndex
 \begin{document}
-  \DocInput{luaextra.dtx}%
+  \DocInput{lualibs.dtx}%
 \end{document}
 %</driver>
 % \fi
@@ -117,10 +117,10 @@ and the derived file luaextra.lua.
 %   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %   Right brace   \}     Tilde         \~}
 %
-% \GetFileInfo{luaextra.drv}
+% \GetFileInfo{lualibs.drv}
 %
-% \title{The \textsf{luaextra} package}
-% \date{2010/01/11 v0.92}
+% \title{The \textsf{lualibs} package}
+% \date{2010/05/10 v0.93}
 % \author{Elie Roux \\ \texttt{elie.roux@telecom-bretagne.eu}}
 %
 % \maketitle
@@ -136,8 +136,8 @@ and the derived file luaextra.lua.
 % Lua is a very minimal language, and it does not have a lot of built-in
 % functions. Some functions will certainly be needed by a lot of packages.
 % Instead of making each of them implement these functions, the aim of this
-% file is to provide a minimal set of functions. All functions are taken from
-% Con\TeX t libraries.
+% package is to provide a standard set of functions. All functions are taken
+% from Con\TeX t libraries.
 %
 % There are some differences with the Con\TeX t funtions though, especially on
 % names: for example the \texttt{file.*} funtions are renamed in
@@ -160,7 +160,7 @@ and the derived file luaextra.lua.
 % printing a table for debugging, or saving a table into a file. Functions are
 % also converted into bytecode to be saved.
 %
-% \section{\texttt{luaextra.lua}}
+% \section{\texttt{lualibs.lua}}
 %
 % \iffalse
 %<*lua>
@@ -168,17 +168,17 @@ and the derived file luaextra.lua.
 %
 %    \begin{macrocode}
 do
-    local luaextra_module = {
-        name          = "luaextra",
-        version       = 0.92,
-        date          = "2010/01/11",
+    local lualibs_module = {
+        name          = "lualibs",
+        version       = 0.93,
+        date          = "2010/05/10",
         description   = "Lua additional functions.",
         author        = "Hans Hagen, PRAGMA-ADE, Hasselt NL & Elie Roux",
         copyright     = "PRAGMA ADE / ConTeXt Development Team",
         license       = "See ConTeXt's mreadme.pdf for the license",
     }
-    if luatextra then
-        luatextra.provides_module(luaextra_module)
+    if luatexbase then
+        luatexbase.provides_module(lualibs_module)
     end
 end
 %    \end{macrocode}
@@ -193,13 +193,13 @@ kpse.set_program_name("luatex")
 % 0.44, and doesn't work in Debian, so we simply use |dofile|.
 %    \begin{macrocode}
 
-local function load_luaextra_module(filename)
+local function load_lualibs_module(filename)
     local path = kpse.find_file(filename)
     if not path then
-        texio.write_nl(string.format("luaextra: error: cannot find file %s", filename))
+        texio.write_nl(string.format("lualibs: error: cannot find file %s", filename))
         return
     end
-    texio.write_nl('log', string.format("luaextra: loading file %s", path))
+    texio.write_nl('log', string.format("lualibs: loading file %s", path))
     --if (tex and tex.luatexversion and tex.luatexversion > 44)
     --    or (status and status.luatex_version and status.luatex_version > 44) then
     --    require(filename)
@@ -208,24 +208,24 @@ local function load_luaextra_module(filename)
     --end
 end
 
-load_luaextra_module("luaextra-string.lua")
-load_luaextra_module("luaextra-lpeg.lua")
-load_luaextra_module("luaextra-boolean.lua")
-load_luaextra_module("luaextra-number.lua")
-load_luaextra_module("luaextra-math.lua")
-load_luaextra_module("luaextra-table.lua")
-load_luaextra_module("luaextra-aux.lua")
-load_luaextra_module("luaextra-io.lua")
-load_luaextra_module("luaextra-os.lua")
-load_luaextra_module("luaextra-file.lua")
-load_luaextra_module("luaextra-md5.lua")
-load_luaextra_module("luaextra-dir.lua")
-load_luaextra_module("luaextra-unicode.lua")
-load_luaextra_module("luaextra-utils.lua")
-load_luaextra_module("luaextra-dimen.lua")
-load_luaextra_module("luaextra-url.lua")
-load_luaextra_module("luaextra-set.lua")
-load_luaextra_module("luaextra-dimen.lua")
+load_lualibs_module("lualibs-string.lua")
+load_lualibs_module("lualibs-lpeg.lua")
+load_lualibs_module("lualibs-boolean.lua")
+load_lualibs_module("lualibs-number.lua")
+load_lualibs_module("lualibs-math.lua")
+load_lualibs_module("lualibs-table.lua")
+load_lualibs_module("lualibs-aux.lua")
+load_lualibs_module("lualibs-io.lua")
+load_lualibs_module("lualibs-os.lua")
+load_lualibs_module("lualibs-file.lua")
+load_lualibs_module("lualibs-md5.lua")
+load_lualibs_module("lualibs-dir.lua")
+load_lualibs_module("lualibs-unicode.lua")
+load_lualibs_module("lualibs-utils.lua")
+load_lualibs_module("lualibs-dimen.lua")
+load_lualibs_module("lualibs-url.lua")
+load_lualibs_module("lualibs-set.lua")
+load_lualibs_module("lualibs-dimen.lua")
 
 %    \end{macrocode}
 % Aliases for backward compatibility.