10 files changed, 174 insertions, 68 deletions
diff --git a/Master/texmf-dist/doc/lualatex/luainputenc/NEWS b/Master/texmf-dist/doc/lualatex/luainputenc/NEWS
index 3c18dc5064c..47d98748771 100644
--- a/Master/texmf-dist/doc/lualatex/luainputenc/NEWS
+++ b/Master/texmf-dist/doc/lualatex/luainputenc/NEWS
@@ -1,6 +1,11 @@
                      History of the luainputenc bundle
 
-2010/02/07, luainputenc v0.97:
+2010/10/05, luainputenc v0.971:
+    * improved documentation
+    * no longer loading luatextra
+    * fix bug under pdftex/xetex, thanks to Ulrike
+
+2010/05/11, luainputenc v0.97:
     * adapting to the new luatexbase system
 
 2010/02/07, luainputenc v0.96:
diff --git a/Master/texmf-dist/doc/lualatex/luainputenc/README b/Master/texmf-dist/doc/lualatex/luainputenc/README
index 1cfb98966f5..90f24396404 100644
--- a/Master/texmf-dist/doc/lualatex/luainputenc/README
+++ b/Master/texmf-dist/doc/lualatex/luainputenc/README
@@ -2,20 +2,14 @@
 
 
 luainputenc is an adaptation of inputenc for LuaTeX, as the old inputenc does
-not work (at all) with the LuaTeX engine.
-
-You need luatextra to use this package.
-
-Please note that you have to use this package even for UTF-8 encoded sources.
-This is needed for compatibility with non-Unicode fonts and may be worked around
-in the future.
+not work (at all) with the LuaTeX engine. It is used only for compatibility
+with old documents. New documents should be encoded in UTF-8 and use Unicode
+fonts (eg with a recent verion of the fontspec package).
 
 This package automatically calls the old inputenc when running with pdfTeX, and
 xetex-inputenc when running XeTeX, so you can safely use it with all your
 documents.
 
-Please see luatextra-reference.pdf for an introduction.
-                   
 This package is developed on <http://github.com/mpg/luainputenc>, see the 'NEWS'
 file for version history.
 
@@ -36,8 +30,6 @@ distribution's manual for details.
    b. Run 'make install TEXMFROOT=/path/to/texmf'.
    c. See 2c.
 
-4. Try to figure it out by looking at the Makefile and comments in the sources.
-
 
 Manifest
 --------
@@ -81,6 +73,6 @@ For further details about their license, please see the comments in these files.
 The other derived files are
   luainputenc.lua
   inputenc.sty.diff
-  
+
 These files are under the CC0 license only.
 
diff --git a/Master/texmf-dist/doc/lualatex/luainputenc/luainputenc.pdf b/Master/texmf-dist/doc/lualatex/luainputenc/luainputenc.pdf
index 09f0151b6f5..e689f9f12f6 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/doc/lualatex/luainputenc/test.tex b/Master/texmf-dist/doc/lualatex/luainputenc/test.tex
new file mode 100644
index 00000000000..beb78725aec
--- /dev/null
+++ b/Master/texmf-dist/doc/lualatex/luainputenc/test.tex
@@ -0,0 +1,32 @@
+%%
+%% This is file `test.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% luainputenc.dtx  (with options: `test')
+%% This is a generated file.
+%% 
+%% Written in 2009, 2010 by Manuel Pegourie-Gonnard and Elie Roux.
+%% 
+%% This work is under the CC0 license. As an exception, the files
+%% luainputenc.sty, lutf8.def and lutf8x.def have more restrictions.
+%% See these file for more details.
+%% 
+%% People who helped on this package:
+%%   Javier Bezos
+%%   Will Robertson
+%%   Hans Hagen
+%%   Heiko Oberdiek
+%%   Javier Mugica
+%% 
+%% This work consists of the main source file luainputenc.dtx
+%% and the derived files
+%%    luainputenc.sty, luainputenc.lua, lutf8.def, lutf8x.def,
+%%    and luainputenc.pdf
+%% 
+\RequirePackage{luainputenc}
+\stop
+\endinput
+%%
+%% End of file `test.tex'.
diff --git a/Master/texmf-dist/source/lualatex/luainputenc/Makefile b/Master/texmf-dist/source/lualatex/luainputenc/Makefile
index 1ff57d2c8ef..b6916247b5c 100644
--- a/Master/texmf-dist/source/lualatex/luainputenc/Makefile
+++ b/Master/texmf-dist/source/lualatex/luainputenc/Makefile
@@ -13,8 +13,8 @@ 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
+RUNFILES = $(filter-out $(UNPACKED_DOC) test.tex, $(UNPACKED))
+DOCFILES = $(DOC) $(UNPACKED_DOC) test.tex README NEWS
 SRCFILES = $(DTX) Makefile
 
 # The following definitions should be equivalent
@@ -33,25 +33,25 @@ TDS_ZIP = $(NAME).tds.zip
 ZIPS = $(CTAN_ZIP) $(TDS_ZIP)
 
 DO_TEX = tex --interaction=batchmode $< >/dev/null
-DO_PDFLATEX = pdflatex --interaction=batchmode $< >/dev/null
-DO_MAKEINDEX = makeindex -s gind.ist $(subst .dtx,,$<) >/dev/null 2>&1
+DO_LATEXMK = latexmk -silent $< >/dev/null
 
 all: $(GENERATED)
 doc: $(COMPILED)
 unpack: $(UNPACKED)
-ctan: $(CTAN_ZIP)
+ctan: check $(CTAN_ZIP)
 tds: $(TDS_ZIP)
 world: all ctan
+.PHONY: all doc unpack ctan tds world check
 
-$(COMPILED): $(DTX)
-	$(DO_PDFLATEX)
-	$(DO_MAKEINDEX)
-	$(DO_PDFLATEX)
-	$(DO_PDFLATEX)
+%.pdf: %.dtx
+	$(DO_LATEXMK)
 
 $(UNPACKED): $(DTX)
 	$(DO_TEX)
 
+check: $(UNPACKED)
+	lualatex --interaction=batchmode test.tex >/dev/null
+
 $(CTAN_ZIP): $(SOURCE) $(COMPILED) $(TDS_ZIP)
 	@echo "Making $@ for CTAN upload."
 	@$(RM) -- $@
@@ -84,9 +84,11 @@ manifest:
 	@echo "Derived files:"
 	@for f in $(GENERATED); do echo $$f; done
 
-clean: 
-	@$(RM) -- *.log *.aux *.toc *.idx *.ind *.ilg
+clean:
+	@latexmk -silent -c *.dtx >/dev/null
+	@# for tex-only runs:
+	@$(RM) -- *.log
 
 mrproper: clean
-	@$(RM) -- $(GENERATED) $(ZIPS)
+	@$(RM) -- $(GENERATED) $(ZIPS) test.*
 
diff --git a/Master/texmf-dist/source/lualatex/luainputenc/luainputenc.dtx b/Master/texmf-dist/source/lualatex/luainputenc/luainputenc.dtx
index 2e149c53daa..53af6207aca 100644
--- a/Master/texmf-dist/source/lualatex/luainputenc/luainputenc.dtx
+++ b/Master/texmf-dist/source/lualatex/luainputenc/luainputenc.dtx
@@ -1,6 +1,8 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 2009 by Elie Roux <elie.roux@telecom-bretagne.eu>
+% Written in 2009, 2010 by Manuel Pégourié-Gonnard and Élie Roux.
+%     <mpg@elzevir.fr>
+%     <elie.roux@telecom-bretagne.eu>
 %
 % This work is under the CC0 license. As an exception, the files 
 % luainputenc.sty, lutf8.def and lutf8x.def have more restrictions. 
@@ -23,11 +25,6 @@
 % Documentation: 
 %    pdflatex luainputenc.dtx
 %
-%    The class ltxdoc loads the configuration file ltxdoc.cfg
-%    if available. Here you can specify further options, e.g.
-%    use A4 as paper format:
-%       \PassOptionsToClass{a4paper}{article}
-%
 %<*ignore>
 \begingroup
   \def\x{LaTeX2e}%
@@ -39,10 +36,6 @@
 %</ignore>
 %<*install>
 \input docstrip.tex
-\Msg{************************************************************************}
-\Msg{* Installation}
-\Msg{* Package: luainputenc 2010/05/10 v0.97 inputenc package for LuaTeX}
-\Msg{************************************************************************}
 
 \keepsilent
 \askforoverwritefalse
@@ -52,7 +45,7 @@
 \preamble
 This is a generated file.
 
-Copyright (C) 2009 by Elie Roux <elie.roux@telecom-bretagne.eu>
+Written in 2009, 2010 by Manuel Pegourie-Gonnard and Elie Roux.
 
 This work is under the CC0 license. As an exception, the files 
 luainputenc.sty, lutf8.def and lutf8x.def have more restrictions. 
@@ -81,8 +74,10 @@ and the derived files
   \file{lutf8x.def}{\from{luainputenc.dtx}{defx}}%
 }
 
-% The following hacks are to generate a lua file with lua comments starting by
-% -- instead of %%
+\generate{%
+  \usedir{doc/luatex/luainputenc}%
+  \file{test.tex}{\from{luainputenc.dtx}{test}}%
+}
 
 \def\MetaPrefix{-- }
 
@@ -126,14 +121,25 @@ and the derived files
 %<package>
 %<package>\NeedsTeXFormat{LaTeX2e}
 %<package>\ProvidesPackage{luainputenc}
-%<package>  [2010/05/10 v0.97 inputenc package for LuaTeX]
+%<package>  [2010/10/05 v0.971 inputenc package for LuaTeX]
 %<package>
 % \fi
 %<*driver>
 \documentclass{ltxdoc}
+\usepackage[utf8]{inputenc}
+\usepackage[T1]{fontenc}
+\usepackage{textcomp}
+\usepackage{lmodern}
+\usepackage{metalogo}
 \usepackage[lmargin=5cm, textwidth=14cm]{geometry}
-\EnableCrossrefs
-\CodelineIndex
+\usepackage[bookmarks=true, colorlinks=true]{hyperref}
+\usepackage{bookmark}
+\usepackage[english]{babel}
+\providecommand\eTeX{e\TeX}
+\newcommand\pf{\textsf}
+\newcommand\file{\texorpdfstring{\nolinkurl}{}}
+\newcommand\code{\texttt}
+\newcommand*\email[1]{\href{mailto:#1}{#1}}
 \begin{document}
   \DocInput{luainputenc.dtx}%
 \end{document}
@@ -158,21 +164,74 @@ and the derived files
 %   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %   Right brace   \}     Tilde         \~}
 %
-% \GetFileInfo{luainputenc.sty}
-%
 % \title{The \textsf{luainputenc} package}
-% \date{2010/05/10 v0.97}
-% \author{Elie Roux \\ \texttt{elie.roux@telecom-bretagne.eu}}
+% \date{2010/10/05 v0.971}
+% \author{%
+%   Manuel P\'egouri\'e-Gonnard \email{mpg@elzevir.fr} \\
+%   \'Elie Roux \email{elie.roux@telecom-bretagne.eu}}
 %
 % \maketitle
 %
 % \begin{abstract}
-% Input encoding management for Lua\TeX . For an introduction on this package
-% (among others), please refer to \texttt{luatex-reference.pdf}.
+% Input encoding management for Lua\TeX, needed only for compatibility with
+% old documents. For new documents, using UTF-8 encoding and Unicode fonts is
+% \emph{strongly} recommended. You've been warned!
 % \end{abstract}
 %
 % \tableofcontents
 %
+% \section{Overview: When (not) to use this package}
+%
+% This package is strictly meant for compatibility. It is usefull in the two
+% (overlapping) following cases:
+% \begin{enumerate}
+% \item You source is not encoded in UTF-8 and you don't want to reencode it
+% for some reason.
+% \item Your document is using legacy 8-bit fonts (with \pf{fontenc}), as
+% opposed to modern Unicode fonts (most probably with \pf{fontspec} or
+% \pf{luaotfload} and \pf{fontenc} with option \code{EU2}).
+% \end{enumerate}
+% Surprisingly enough, in the second case \pf{luainputenc} is needed, due to
+% the way \LaTeX\ implements font encodings.
+%
+% From the user point of view, adapting an old document for \LuaTeX\ is really
+% easy: replacing \pf{inputenc} by \pf{luainputenc} in the preamble is
+% enough.
+%
+% Note that \pf{luainputenc} automatically loads \pf{inputenc} if called
+% with an old engine, so you will still be able to compile your documents with
+% pdf\TeX\ without changing them.
+%
+% \pf{luainputenc} has several modes of operation. By default, is basically
+% turns \LuaTeX\ into an 8-bit engine, which means you loose half of the
+% benefits from using \LuaTeX. If you are using only Unicode fonts, you can
+% activate a nicer mode of operation using the \code{unactivate} package
+% option. That way, \LuaTeX\ remains a true Unicode engine.
+%
+% Unicode fonts with \LuaTeX\ are handled using a new encoding: \code{EU2}. It
+% is used internally by the \pf{fontspec} package when loading Unicode fonts.
+% This encoding is special as it needs non-ASCII characters to be non-active
+% (unlike other font encodings), so you cannot mix old encodings and EU2. If
+% you're using only Unicode fonts, this isn't a problem: use the
+% \code{unactivate} package option mentioned in the previous paragraph.
+%
+% But if you
+% want to use both 8-bit fonts and Unicode fonts in your document, you need to
+% use another package option, \code{lutf8x}. This option
+% overrides \LaTeX's mechanism for font encoding switching, so that it
+% (un)activates non-ASCII characters on-the-fly. With this options, you'll be
+% able change the font encoding from/to \code{EU2}, for example:
+% 
+% \begin{verbatim}
+% abc
+% {
+% \fontencoding{EU2}\usefont
+% \font\foo="MyOtfFont.otf"\foo
+% abc
+% }
+% abc
+% \end{verbatim}
+%
 % \section{Documentation}
 %
 % \subsection{Introduction}
@@ -207,15 +266,16 @@ and the derived files
 % can keep the default behaviour, which will be compatible with pdfTeX in 
 % most cases, but you can consider the machinery obsolete.
 %
-% For these old versions, \textsf{luainputenc} only changes the input behaviour, it does not change
-% the ouput behaviour (when files are written for example). The consequence is
-% that files will still be written by Lua\TeX\ in UTF-8 (fake UTF-8 in this
-% case), even if the asked input encoding is a 8-bit encoding. In most cases
-% it's not a problem, as most files will be written in LICR, meaning ASCII,
-% which is both 8-bit and UTF-8. The problem comes when characters with a
-% number $>$ 128 are written in a 8-bit encoding. This may happen if you use
-% |\protect| in a section for example. In these cases, Lua\TeX\ will write
-% fake UTF-8, and try to read 8-bit encoding, so it will get confused.
+% For these old versions, \textsf{luainputenc} only changes the input
+% behaviour, it does not change the ouput behaviour (when files are written
+% for example). The consequence is that files will still be written by
+% Lua\TeX\ in UTF-8 (fake UTF-8 in this case), even if the asked input
+% encoding is a 8-bit encoding. In most cases it's not a problem, as most
+% files will be written in LICR, meaning ASCII, which is both 8-bit and UTF-8.
+% The problem comes when characters with a number $>$ 128 are written in a
+% 8-bit encoding. This may happen if you use |\protect| in a section for
+% example. In these cases, Lua\TeX\ will write fake UTF-8, and try to read
+% 8-bit encoding, so it will get confused.
 %
 % The proposed solution is to unactivate the input conversion when we read
 % certain files or extentions. This package should work with no change for
@@ -371,22 +431,22 @@ and the derived files
 \RequirePackage{ifxetex}
 
 \ifxetex
-  \RequirePackage{xetex-inputenc}
   \DeclareOption{unactivate}{\PassOptionsToPackage{utf8}{xetex-inputenc}}
   \DeclareOption{lutf8}{\PassOptionsToPackage{utf8}{xetex-inputenc}}
   \DeclareOption{lutf8x}{\PassOptionsToPackage{utf8}{xetex-inputenc}}
   \DeclareOption*{\PassOptionsToPackage{\CurrentOption}{xetex-inputenc}}
   \ProcessOptions*
+  \RequirePackage{xetex-inputenc}
   \expandafter\endinput
 \fi
 
 \ifluatex\else
-  \RequirePackage{inputenc}
   \DeclareOption{unactivate}{\PassOptionsToPackage{utf8}{inputenc}}
   \DeclareOption{lutf8}{\PassOptionsToPackage{utf8}{inputenc}}
   \DeclareOption{lutf8x}{\PassOptionsToPackage{utf8}{inputenc}}
   \DeclareOption*{\PassOptionsToPackage{\CurrentOption}{inputenc}}
   \ProcessOptions*
+  \RequirePackage{inputenc}
   \expandafter\endinput
 \fi
 
@@ -397,7 +457,9 @@ and the derived files
 %
 %    \begin{macrocode}
 
-\RequirePackage{luatextra}
+\RequirePackage{luatexbase}
+\RequirePackage{luatexbase-mcb}
+\RequirePackage{luatexbase-modutils}
 
 \luatexUseModule{luainputenc}
 
@@ -1383,5 +1445,16 @@ end
 %</lua>
 % \fi
 %
+%    \section{Test file}
+%
+%    Very minimal, just check that the package correctly loads.
+%
+%    \begin{macrocode}
+%<*test>
+\RequirePackage{luainputenc}
+\stop
+%</test>
+%    \end{macrocode}
+%
 % \Finale
 \endinput
diff --git a/Master/texmf-dist/tex/lualatex/luainputenc/luainputenc.lua b/Master/texmf-dist/tex/lualatex/luainputenc/luainputenc.lua
index dde3ed0a792..f0c6347b184 100644
--- a/Master/texmf-dist/tex/lualatex/luainputenc/luainputenc.lua
+++ b/Master/texmf-dist/tex/lualatex/luainputenc/luainputenc.lua
@@ -7,7 +7,7 @@
 --  luainputenc.dtx  (with options: `lua')
 --  This is a generated file.
 --  
---  Copyright (C) 2009 by Elie Roux <elie.roux@telecom-bretagne.eu>
+--  Written in 2009, 2010 by Manuel Pegourie-Gonnard and Elie Roux.
 --  
 --  This work is under the CC0 license. As an exception, the files
 --  luainputenc.sty, lutf8.def and lutf8x.def have more restrictions.
diff --git a/Master/texmf-dist/tex/lualatex/luainputenc/luainputenc.sty b/Master/texmf-dist/tex/lualatex/luainputenc/luainputenc.sty
index 78b4f12843e..5f592adc1f7 100644
--- a/Master/texmf-dist/tex/lualatex/luainputenc/luainputenc.sty
+++ b/Master/texmf-dist/tex/lualatex/luainputenc/luainputenc.sty
@@ -7,7 +7,7 @@
 %% luainputenc.dtx  (with options: `package')
 %% This is a generated file.
 %% 
-%% Copyright (C) 2009 by Elie Roux <elie.roux@telecom-bretagne.eu>
+%% Written in 2009, 2010 by Manuel Pegourie-Gonnard and Elie Roux.
 %% 
 %% This work is under the CC0 license. As an exception, the files
 %% luainputenc.sty, lutf8.def and lutf8x.def have more restrictions.
@@ -28,7 +28,7 @@
 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{luainputenc}
-  [2010/05/10 v0.97 inputenc package for LuaTeX]
+  [2010/10/05 v0.971 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
@@ -52,27 +52,29 @@
 \RequirePackage{ifxetex}
 
 \ifxetex
-  \RequirePackage{xetex-inputenc}
   \DeclareOption{unactivate}{\PassOptionsToPackage{utf8}{xetex-inputenc}}
   \DeclareOption{lutf8}{\PassOptionsToPackage{utf8}{xetex-inputenc}}
   \DeclareOption{lutf8x}{\PassOptionsToPackage{utf8}{xetex-inputenc}}
   \DeclareOption*{\PassOptionsToPackage{\CurrentOption}{xetex-inputenc}}
   \ProcessOptions*
+  \RequirePackage{xetex-inputenc}
   \expandafter\endinput
 \fi
 
 \ifluatex\else
-  \RequirePackage{inputenc}
   \DeclareOption{unactivate}{\PassOptionsToPackage{utf8}{inputenc}}
   \DeclareOption{lutf8}{\PassOptionsToPackage{utf8}{inputenc}}
   \DeclareOption{lutf8x}{\PassOptionsToPackage{utf8}{inputenc}}
   \DeclareOption*{\PassOptionsToPackage{\CurrentOption}{inputenc}}
   \ProcessOptions*
+  \RequirePackage{inputenc}
   \expandafter\endinput
 \fi
 
 
-\RequirePackage{luatextra}
+\RequirePackage{luatexbase}
+\RequirePackage{luatexbase-mcb}
+\RequirePackage{luatexbase-modutils}
 
 \luatexUseModule{luainputenc}
 
diff --git a/Master/texmf-dist/tex/lualatex/luainputenc/lutf8.def b/Master/texmf-dist/tex/lualatex/luainputenc/lutf8.def
index 3cfbebb8bc9..79322a6507e 100644
--- a/Master/texmf-dist/tex/lualatex/luainputenc/lutf8.def
+++ b/Master/texmf-dist/tex/lualatex/luainputenc/lutf8.def
@@ -7,7 +7,7 @@
 %% luainputenc.dtx  (with options: `def')
 %% This is a generated file.
 %% 
-%% Copyright (C) 2009 by Elie Roux <elie.roux@telecom-bretagne.eu>
+%% Written in 2009, 2010 by Manuel Pegourie-Gonnard and Elie Roux.
 %% 
 %% This work is under the CC0 license. As an exception, the files
 %% luainputenc.sty, lutf8.def and lutf8x.def have more restrictions.
diff --git a/Master/texmf-dist/tex/lualatex/luainputenc/lutf8x.def b/Master/texmf-dist/tex/lualatex/luainputenc/lutf8x.def
index 06ffcad98de..b30eae6dc02 100644
--- a/Master/texmf-dist/tex/lualatex/luainputenc/lutf8x.def
+++ b/Master/texmf-dist/tex/lualatex/luainputenc/lutf8x.def
@@ -7,7 +7,7 @@
 %% luainputenc.dtx  (with options: `defx')
 %% This is a generated file.
 %% 
-%% Copyright (C) 2009 by Elie Roux <elie.roux@telecom-bretagne.eu>
+%% Written in 2009, 2010 by Manuel Pegourie-Gonnard and Elie Roux.
 %% 
 %% This work is under the CC0 license. As an exception, the files
 %% luainputenc.sty, lutf8.def and lutf8x.def have more restrictions.