luainputenc update (13may10)

git-svn-id: svn://tug.org/texlive/trunk@18253 c570f23f-e606-0410-a88d-b1316a301751

9 files changed, 36 insertions, 33 deletions

diff --git a/Master/texmf-dist/doc/lualatex/luainputenc/News b/Master/texmf-dist/doc/lualatex/luainputenc/NEWS
index f48618afb4d..3c18dc5064c 100644
--- a/Master/texmf-dist/doc/lualatex/luainputenc/News
+++ b/Master/texmf-dist/doc/lualatex/luainputenc/NEWS
@@ -1,5 +1,8 @@
                      History of the luainputenc bundle
 
+2010/02/07, luainputenc v0.97:
+    * adapting to the new luatexbase system
+
 2010/02/07, luainputenc v0.96:
     * removing the files eu2enc.def and eu2lmr.fd from luainputenc, they
         can now be found in the euenc package.
diff --git a/Master/texmf-dist/doc/lualatex/luainputenc/README b/Master/texmf-dist/doc/lualatex/luainputenc/README
index d2d72dbcdb3..1cfb98966f5 100644
--- a/Master/texmf-dist/doc/lualatex/luainputenc/README
+++ b/Master/texmf-dist/doc/lualatex/luainputenc/README
@@ -16,7 +16,7 @@ documents.
 
 Please see luatextra-reference.pdf for an introduction.
                    
-This package is developed on <http://github.com/mpg/luainputenc>, see the 'News'
+This package is developed on <http://github.com/mpg/luainputenc>, see the 'NEWS'
 file for version history.
 
 Installation
diff --git a/Master/texmf-dist/doc/lualatex/luainputenc/luainputenc.pdf b/Master/texmf-dist/doc/lualatex/luainputenc/luainputenc.pdf
index 945dea368ed..09f0151b6f5 100644
--- a/Master/texmf-dist/doc/lualatex/luainputenc/luainputenc.pdf
+++ b/Master/texmf-dist/doc/lualatex/luainputenc/luainputenc.pdf
diff --git a/Master/texmf-dist/source/lualatex/luainputenc/Makefile b/Master/texmf-dist/source/lualatex/luainputenc/Makefile
index 5978cfc0373..1ff57d2c8ef 100644
--- a/Master/texmf-dist/source/lualatex/luainputenc/Makefile
+++ b/Master/texmf-dist/source/lualatex/luainputenc/Makefile
@@ -8,13 +8,13 @@ DTX = $(NAME).dtx
 COMPILED = $(DOC)
 UNPACKED = lutf8.def lutf8x.def inputenc.sty.diff \
 	   luainputenc.sty luainputenc.lua 
-SOURCE = $(DTX) README Makefile News
+SOURCE = $(DTX) README Makefile NEWS
 GENERATED = $(COMPILED) $(UNPACKED)
 
 # Files grouped by installation location
 UNPACKED_DOC = inputenc.sty.diff
 RUNFILES = $(filter-out $(UNPACKED_DOC), $(UNPACKED))
-DOCFILES = $(DOC) $(UNPACKED_DOC) README News
+DOCFILES = $(DOC) $(UNPACKED_DOC) README NEWS
 SRCFILES = $(DTX) Makefile
 
 # The following definitions should be equivalent
diff --git a/Master/texmf-dist/source/lualatex/luainputenc/luainputenc.dtx b/Master/texmf-dist/source/lualatex/luainputenc/luainputenc.dtx
index 67a3710c61c..2e149c53daa 100644
--- a/Master/texmf-dist/source/lualatex/luainputenc/luainputenc.dtx
+++ b/Master/texmf-dist/source/lualatex/luainputenc/luainputenc.dtx
@@ -41,7 +41,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: luainputenc 2010/02/07 v0.96 inputenc package for LuaTeX}
+\Msg{* Package: luainputenc 2010/05/10 v0.97 inputenc package for LuaTeX}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -126,7 +126,7 @@ and the derived files
 %<package>
 %<package>\NeedsTeXFormat{LaTeX2e}
 %<package>\ProvidesPackage{luainputenc}
-%<package>  [2010/02/07 v0.96 inputenc package for LuaTeX]
+%<package>  [2010/05/10 v0.97 inputenc package for LuaTeX]
 %<package>
 % \fi
 %<*driver>
@@ -161,7 +161,7 @@ and the derived files
 % \GetFileInfo{luainputenc.sty}
 %
 % \title{The \textsf{luainputenc} package}
-% \date{2010/02/07 v0.96}
+% \date{2010/05/10 v0.97}
 % \author{Elie Roux \\ \texttt{elie.roux@telecom-bretagne.eu}}
 %
 % \maketitle
@@ -776,7 +776,7 @@ and the derived files
 
 
 \ProvidesFile{lutf8.def}
-   [2010/02/07 v0.96 UTF-8 support for luainputenc]
+   [2010/05/10 v0.97 UTF-8 support for luainputenc]
 
 \makeatletter
 \catcode`\ \saved@space@catcode
@@ -892,7 +892,7 @@ and the derived files
 %    \begin{macrocode}
 
 \ProvidesFile{lutf8x.def}
-   [2010/02/07 v0.96 UTF-8 support for luainputenc]
+   [2010/05/10 v0.97 UTF-8 support for luainputenc]
 
 \makeatletter
 \catcode`\ \saved@space@catcode
@@ -1034,24 +1034,24 @@ and the derived files
 %
 %    \begin{macrocode}
 
-luainputenc = { }
+module('luainputenc', package.seeall)
 
 luainputenc.module = {
     name          = "luainputenc",
-    version       =  0.96,
-    date          = "2010/02/07",
+    version       =  0.97,
+    date          = "2010/05/10",
     description   = "Lua simple inputenc package.",
     author        = "Elie Roux",
     copyright     = "Elie Roux",
     license       = "CC0",
 }
 
-luatextra.provides_module(luainputenc.module)
+luatexbase.provides_module(luainputenc.module)
 
 local format = string.format
 
 luainputenc.log = luainputenc.log or function(...)
-  luatextra.module_log('luainputenc', format(...))
+  luatexbase.module_log('luainputenc', format(...))
 end
 
 %    \end{macrocode}
@@ -1137,8 +1137,8 @@ end
 if tex.luatexversion > 42 then
 
     function luainputenc.register_callbacks()
-        callback.add('process_output_buffer', luainputenc.fake_utf_write, 'luainputenc.fake_utf_write')
-        callback.add('process_input_buffer', luainputenc.fake_utf_read, 'luainputenc.fake_utf_read')
+        luatexbase.add_to_callback('process_output_buffer', luainputenc.fake_utf_write, 'luainputenc.fake_utf_write')
+        luatexbase.add_to_callback('process_input_buffer', luainputenc.fake_utf_read, 'luainputenc.fake_utf_read')
     end
     
 else
@@ -1174,7 +1174,7 @@ else
     end
 
     function luainputenc.start()
-        callback.add('process_input_buffer', luainputenc.fake_utf_read,
+        luatexbase.add_to_callback('process_input_buffer', luainputenc.fake_utf_read,
             'luainputenc.fake_utf_read')
         luainputenc.state = started
         if luainputenc.callback_registered == 0 then
@@ -1183,7 +1183,7 @@ else
     end
     
     function luainputenc.stop()
-        callback.remove('process_input_buffer', 'luainputenc.fake_utf_read')
+        luatexbase.remove_from_callback('process_input_buffer', 'luainputenc.fake_utf_read')
         luainputenc.state = stopped
         return
     end
@@ -1331,9 +1331,9 @@ else
 
     function luainputenc.register_callback()
         if luainputenc.callback_registered == 0 then
-            callback.add('pre_read_file', luainputenc.pre_read_file,
+            luatexbase.add_to_callback('pre_read_file', luainputenc.pre_read_file,
                 'luainputenc.pre_read_file')
-            callback.add('file_close', luainputenc.close, 'luainputenc.close')
+            luatexbase.add_to_callback('file_close', luainputenc.close, 'luainputenc.close')
             luainputenc.callback_registered = 1
         end
     end
diff --git a/Master/texmf-dist/tex/lualatex/luainputenc/luainputenc.lua b/Master/texmf-dist/tex/lualatex/luainputenc/luainputenc.lua
index 0d646dda33d..dde3ed0a792 100644
--- a/Master/texmf-dist/tex/lualatex/luainputenc/luainputenc.lua
+++ b/Master/texmf-dist/tex/lualatex/luainputenc/luainputenc.lua
@@ -26,24 +26,24 @@
 --     and luainputenc.pdf
 --  
 
-luainputenc = { }
+module('luainputenc', package.seeall)
 
 luainputenc.module = {
     name          = "luainputenc",
-    version       =  0.96,
-    date          = "2010/02/07",
+    version       =  0.97,
+    date          = "2010/05/10",
     description   = "Lua simple inputenc package.",
     author        = "Elie Roux",
     copyright     = "Elie Roux",
     license       = "CC0",
 }
 
-luatextra.provides_module(luainputenc.module)
+luatexbase.provides_module(luainputenc.module)
 
 local format = string.format
 
 luainputenc.log = luainputenc.log or function(...)
-  luatextra.module_log('luainputenc', format(...))
+  luatexbase.module_log('luainputenc', format(...))
 end
 
 
@@ -87,8 +87,8 @@ end
 if tex.luatexversion > 42 then
 
     function luainputenc.register_callbacks()
-        callback.add('process_output_buffer', luainputenc.fake_utf_write, 'luainputenc.fake_utf_write')
-        callback.add('process_input_buffer', luainputenc.fake_utf_read, 'luainputenc.fake_utf_read')
+        luatexbase.add_to_callback('process_output_buffer', luainputenc.fake_utf_write, 'luainputenc.fake_utf_write')
+        luatexbase.add_to_callback('process_input_buffer', luainputenc.fake_utf_read, 'luainputenc.fake_utf_read')
     end
 
 else
@@ -117,7 +117,7 @@ else
     end
 
     function luainputenc.start()
-        callback.add('process_input_buffer', luainputenc.fake_utf_read,
+        luatexbase.add_to_callback('process_input_buffer', luainputenc.fake_utf_read,
             'luainputenc.fake_utf_read')
         luainputenc.state = started
         if luainputenc.callback_registered == 0 then
@@ -126,7 +126,7 @@ else
     end
 
     function luainputenc.stop()
-        callback.remove('process_input_buffer', 'luainputenc.fake_utf_read')
+        luatexbase.remove_from_callback('process_input_buffer', 'luainputenc.fake_utf_read')
         luainputenc.state = stopped
         return
     end
@@ -255,9 +255,9 @@ else
 
     function luainputenc.register_callback()
         if luainputenc.callback_registered == 0 then
-            callback.add('pre_read_file', luainputenc.pre_read_file,
+            luatexbase.add_to_callback('pre_read_file', luainputenc.pre_read_file,
                 'luainputenc.pre_read_file')
-            callback.add('file_close', luainputenc.close, 'luainputenc.close')
+            luatexbase.add_to_callback('file_close', luainputenc.close, 'luainputenc.close')
             luainputenc.callback_registered = 1
         end
     end
diff --git a/Master/texmf-dist/tex/lualatex/luainputenc/luainputenc.sty b/Master/texmf-dist/tex/lualatex/luainputenc/luainputenc.sty
index 0f915dd1372..78b4f12843e 100644
--- a/Master/texmf-dist/tex/lualatex/luainputenc/luainputenc.sty
+++ b/Master/texmf-dist/tex/lualatex/luainputenc/luainputenc.sty
@@ -28,7 +28,7 @@
 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{luainputenc}
-  [2010/02/07 v0.96 inputenc package for LuaTeX]
+  [2010/05/10 v0.97 inputenc package for LuaTeX]
 
 %% This file was adapted from inputenc.sty, which copyright is:
 %% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004
diff --git a/Master/texmf-dist/tex/lualatex/luainputenc/lutf8.def b/Master/texmf-dist/tex/lualatex/luainputenc/lutf8.def
index ea5a274a5c1..3cfbebb8bc9 100644
--- a/Master/texmf-dist/tex/lualatex/luainputenc/lutf8.def
+++ b/Master/texmf-dist/tex/lualatex/luainputenc/lutf8.def
@@ -44,7 +44,7 @@
 
 
 \ProvidesFile{lutf8.def}
-   [2010/02/07 v0.96 UTF-8 support for luainputenc]
+   [2010/05/10 v0.97 UTF-8 support for luainputenc]
 
 \makeatletter
 \catcode`\ \saved@space@catcode
diff --git a/Master/texmf-dist/tex/lualatex/luainputenc/lutf8x.def b/Master/texmf-dist/tex/lualatex/luainputenc/lutf8x.def
index 9fa60b48c3f..06ffcad98de 100644
--- a/Master/texmf-dist/tex/lualatex/luainputenc/lutf8x.def
+++ b/Master/texmf-dist/tex/lualatex/luainputenc/lutf8x.def
@@ -44,7 +44,7 @@
 
 
 \ProvidesFile{lutf8x.def}
-   [2010/02/07 v0.96 UTF-8 support for luainputenc]
+   [2010/05/10 v0.97 UTF-8 support for luainputenc]
 
 \makeatletter
 \catcode`\ \saved@space@catcode