summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorManuel Pégourié-Gonnard <mpg@elzevir.fr>2010-11-19 17:02:09 +0000
committerManuel Pégourié-Gonnard <mpg@elzevir.fr>2010-11-19 17:02:09 +0000
commitb21be1479112cb049f743ba282027dc2fc97d522 (patch)
tree3709ea4b278b1bca9666863e88d8767ee26eaf52 /Master
parent42c262c3d990eed1f2bcb7bbbaf9e596f9287f85 (diff)
luainputenc 0.973
git-svn-id: svn://tug.org/texlive/trunk@20491 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/lualatex/luainputenc/NEWS7
-rw-r--r--Master/texmf-dist/doc/lualatex/luainputenc/luainputenc.pdfbin403516 -> 404095 bytes
-rw-r--r--Master/texmf-dist/doc/lualatex/luainputenc/test.tex7
-rw-r--r--Master/texmf-dist/source/lualatex/luainputenc/luainputenc.dtx48
-rw-r--r--Master/texmf-dist/tex/lualatex/luainputenc/luainputenc.sty23
-rw-r--r--Master/texmf-dist/tex/lualatex/luainputenc/lutf8x.def8
6 files changed, 53 insertions, 40 deletions
diff --git a/Master/texmf-dist/doc/lualatex/luainputenc/NEWS b/Master/texmf-dist/doc/lualatex/luainputenc/NEWS
index e9e63b9b8d2..ab5603073b5 100644
--- a/Master/texmf-dist/doc/lualatex/luainputenc/NEWS
+++ b/Master/texmf-dist/doc/lualatex/luainputenc/NEWS
@@ -1,9 +1,12 @@
History of the luainputenc package
-2010/10/10 v0.972
+2010/11/19 v0.973
+ * fix stupid bug introduced in 0.971, spotted by Benoît Rivet
+
+2010/11/10 v0.972
* adapt to luatexbase 0.3
-2010/10/05 v0.971
+2010/11/05 v0.971
* improved documentation
* no longer loading luatextra
* fix bug under pdftex/xetex, thanks to Ulrike
diff --git a/Master/texmf-dist/doc/lualatex/luainputenc/luainputenc.pdf b/Master/texmf-dist/doc/lualatex/luainputenc/luainputenc.pdf
index 631c5181295..d6db0888b31 100644
--- a/Master/texmf-dist/doc/lualatex/luainputenc/luainputenc.pdf
+++ b/Master/texmf-dist/doc/lualatex/luainputenc/luainputenc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/lualatex/luainputenc/test.tex b/Master/texmf-dist/doc/lualatex/luainputenc/test.tex
index beb78725aec..ad205a05cfb 100644
--- a/Master/texmf-dist/doc/lualatex/luainputenc/test.tex
+++ b/Master/texmf-dist/doc/lualatex/luainputenc/test.tex
@@ -25,8 +25,11 @@
%% luainputenc.sty, luainputenc.lua, lutf8.def, lutf8x.def,
%% and luainputenc.pdf
%%
-\RequirePackage{luainputenc}
-\stop
+\documentclass{article}
+\usepackage[utf8]{luainputenc}
+\begin{document}
+bla
+\end{document}
\endinput
%%
%% End of file `test.tex'.
diff --git a/Master/texmf-dist/source/lualatex/luainputenc/luainputenc.dtx b/Master/texmf-dist/source/lualatex/luainputenc/luainputenc.dtx
index 0d6cb3a56cd..807d7344b86 100644
--- a/Master/texmf-dist/source/lualatex/luainputenc/luainputenc.dtx
+++ b/Master/texmf-dist/source/lualatex/luainputenc/luainputenc.dtx
@@ -1,4 +1,4 @@
-% \iffalse meta-comment
+% \iffalse meta-comment -- by the way, this file contains UTF-8
%
% Written in 2009, 2010 by Manuel Pégourié-Gonnard and Élie Roux.
% <mpg@elzevir.fr>
@@ -121,7 +121,7 @@ and the derived files
%<package>
%<package>\NeedsTeXFormat{LaTeX2e}
%<package>\ProvidesPackage{luainputenc}
-%<package> [2010/10/10 v0.972 inputenc package for LuaTeX]
+%<package> [2010/11/19 v0.973 inputenc package for LuaTeX]
%<package>
% \fi
%<*driver>
@@ -165,7 +165,7 @@ and the derived files
% Right brace \} Tilde \~}
%
% \title{The \textsf{luainputenc} package}
-% \date{2010/10/10 v0.972}
+% \date{2010/11/19 v0.973}
% \author{%
% Manuel P\'egouri\'e-Gonnard \email{mpg@elzevir.fr} \\
% \'Elie Roux \email{elie.roux@telecom-bretagne.eu}}
@@ -453,11 +453,13 @@ and the derived files
% \end{macrocode}
%
% Here we know we are called with Lua\TeX . We first require
-% \textsf{luatextra}, then we load the \texttt{lua} file.
+% \textsf{luatextra} and ensure a few primitives, then we load the
+% \texttt{lua} file.
%
% \begin{macrocode}
\RequirePackage{luatexbase}
+\luatexbase@ensure@primitive{luaescapestring}
\RequireLuaModule{luainputenc}
@@ -527,7 +529,7 @@ and the derived files
by input encoding change to `#1'\MessageBreak}%
\fi
\the\inpenc@posthook
- \luadirect{luainputenc.set_option([[#1]])}
+ \luatexbase@directlua{luainputenc.set_option("\luatexluaescapestring{#1}")}
}
\newtoks\inpenc@prehook
\newtoks\inpenc@posthook
@@ -584,7 +586,7 @@ and the derived files
\DeclareOption{unactivate}{%
\edef\inputencodingname{unactivate}%
- \luadirect{luainputenc.set_option([[unactivate]])}
+ \luatexbase@directlua{luainputenc.set_option([[unactivate]])}
}
% \end{macrocode}
@@ -612,7 +614,7 @@ and the derived files
\ifnum\luatexversion>42
\newcommand*{\lIE@activate}[0]{%
- \luadirect{luainputenc.register_callbacks()}%
+ \luatexbase@directlua{luainputenc.register_callbacks()}%
}
\else
@@ -629,13 +631,13 @@ and the derived files
\newcommand*\lIE@setstarted[0]{%
\ifnum\lIE@activated=1 %
- \luadirect{luainputenc.setstarted()}%
+ \luatexbase@directlua{luainputenc.setstarted()}%
\fi %
}
\newcommand*\lIE@setstopped[0]{%
\ifnum\lIE@activated=1 %
- \luadirect{luainputenc.setstopped()}%
+ \luatexbase@directlua{luainputenc.setstopped()}%
\fi %
}
@@ -662,7 +664,7 @@ and the derived files
% \begin{macrocode}
\newcommand*\lIE@SetUtfFile[1]{%
- \luadirect{luainputenc.set_unicode_file([[#1]])}%
+ \luatexbase@directlua{luainputenc.set_unicode_file("\luatexluaescapestring{#1}")}%
}
% \end{macrocode}
@@ -678,7 +680,7 @@ and the derived files
% \begin{macrocode}
\newcommand*\lIE@SetNonUtfFile[1]{%
- \luadirect{luainputenc.set_non_unicode_file([[#1]])}%
+ \luatexbase@directlua{luainputenc.set_non_unicode_file("\luatexluaescapestring{#1}")}%
}
% \end{macrocode}
@@ -692,7 +694,7 @@ and the derived files
% \begin{macrocode}
\newcommand*\lIE@UnsetFile[1]{%
- \luadirect{luainputenc.unset_file([[#1]])}%
+ \luatexbase@directlua{luainputenc.unset_file("\luatexluaescapestring{#1}")}%
}
% \end{macrocode}
@@ -711,7 +713,7 @@ and the derived files
% \begin{macrocode}
\newcommand*\lIE@SetUtfExt[1]{%
- \luadirect{luainputenc.set_unicode_extention([[#1]])}%
+ \luatexbase@directlua{luainputenc.set_unicode_extention("\luatexluaescapestring{#1}")}%
}
% \end{macrocode}
@@ -725,7 +727,7 @@ and the derived files
% \begin{macrocode}
\newcommand*\lIE@SetNonUtfExt[1]{
- \luadirect{luainputenc.set_non_unicode_extention([[#1]])}
+ \luatexbase@directlua{luainputenc.set_non_unicode_extention("\luatexluaescapestring{#1}")}
}
% \end{macrocode}
@@ -971,7 +973,7 @@ and the derived files
\gdef\DeclareUnicodeCharacter#1#2{%
\@tempcnta"#1%
- \luadirect{luainputenc.declare_character('\the\@tempcnta')}%
+ \luatexbase@directlua{luainputenc.declare_character('\the\@tempcnta')}%
\catcode\@tempcnta\active %
\DeclareInputText{\the\@tempcnta}{#2}%
}
@@ -997,15 +999,15 @@ and the derived files
% \begin{macrocode}
\def\lIE@ActivateUnicodeCatcodes{%
-\luadirect{luainputenc.activate_characters()}%
+\luatexbase@directlua{luainputenc.activate_characters()}%
}
\def\lIE@DesactivateUnicodeCatcodes{%
-\luadirect{luainputenc.desactivate_characters()}%
+\luatexbase@directlua{luainputenc.desactivate_characters()}%
}
\def\lIE@CharactersActivated{%
-\luadirect{luainputenc.force_characters_activated()}
+\luatexbase@directlua{luainputenc.force_characters_activated()}
}
\edef\lIE@EU{EU2}
@@ -1445,12 +1447,16 @@ end
%
% \section{Test file}
%
-% Very minimal, just check that the package correctly loads.
+% Very minimal, just check that the package correctly loads with an option
+% and doesn't crash on a one-line plain ASCII document body\dots
%
% \begin{macrocode}
%<*test>
-\RequirePackage{luainputenc}
-\stop
+\documentclass{article}
+\usepackage[utf8]{luainputenc}
+\begin{document}
+bla
+\end{document}
%</test>
% \end{macrocode}
%
diff --git a/Master/texmf-dist/tex/lualatex/luainputenc/luainputenc.sty b/Master/texmf-dist/tex/lualatex/luainputenc/luainputenc.sty
index 0e4efb3e91c..9e2db995a4a 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/10/10 v0.972 inputenc package for LuaTeX]
+ [2010/11/19 v0.973 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
@@ -73,6 +73,7 @@
\RequirePackage{luatexbase}
+\luatexbase@ensure@primitive{luaescapestring}
\RequireLuaModule{luainputenc}
@@ -124,7 +125,7 @@
by input encoding change to `#1'\MessageBreak}%
\fi
\the\inpenc@posthook
- \luadirect{luainputenc.set_option([[#1]])}
+ \luatexbase@directlua{luainputenc.set_option("\luatexluaescapestring{#1}")}
}
\newtoks\inpenc@prehook
\newtoks\inpenc@posthook
@@ -168,7 +169,7 @@
\DeclareOption{unactivate}{%
\edef\inputencodingname{unactivate}%
- \luadirect{luainputenc.set_option([[unactivate]])}
+ \luatexbase@directlua{luainputenc.set_option([[unactivate]])}
}
@@ -182,7 +183,7 @@
\ifnum\luatexversion>42
\newcommand*{\lIE@activate}[0]{%
- \luadirect{luainputenc.register_callbacks()}%
+ \luatexbase@directlua{luainputenc.register_callbacks()}%
}
\else
@@ -190,39 +191,39 @@
\newcommand*\lIE@setstarted[0]{%
\ifnum\lIE@activated=1 %
- \luadirect{luainputenc.setstarted()}%
+ \luatexbase@directlua{luainputenc.setstarted()}%
\fi %
}
\newcommand*\lIE@setstopped[0]{%
\ifnum\lIE@activated=1 %
- \luadirect{luainputenc.setstopped()}%
+ \luatexbase@directlua{luainputenc.setstopped()}%
\fi %
}
\newcommand*\lIE@SetUtfFile[1]{%
- \luadirect{luainputenc.set_unicode_file([[#1]])}%
+ \luatexbase@directlua{luainputenc.set_unicode_file("\luatexluaescapestring{#1}")}%
}
\newcommand*\lIE@SetNonUtfFile[1]{%
- \luadirect{luainputenc.set_non_unicode_file([[#1]])}%
+ \luatexbase@directlua{luainputenc.set_non_unicode_file("\luatexluaescapestring{#1}")}%
}
\newcommand*\lIE@UnsetFile[1]{%
- \luadirect{luainputenc.unset_file([[#1]])}%
+ \luatexbase@directlua{luainputenc.unset_file("\luatexluaescapestring{#1}")}%
}
\newcommand*\lIE@SetUtfExt[1]{%
- \luadirect{luainputenc.set_unicode_extention([[#1]])}%
+ \luatexbase@directlua{luainputenc.set_unicode_extention("\luatexluaescapestring{#1}")}%
}
\newcommand*\lIE@SetNonUtfExt[1]{
- \luadirect{luainputenc.set_non_unicode_extention([[#1]])}
+ \luatexbase@directlua{luainputenc.set_non_unicode_extention("\luatexluaescapestring{#1}")}
}
diff --git a/Master/texmf-dist/tex/lualatex/luainputenc/lutf8x.def b/Master/texmf-dist/tex/lualatex/luainputenc/lutf8x.def
index b30eae6dc02..8d3cd64ff17 100644
--- a/Master/texmf-dist/tex/lualatex/luainputenc/lutf8x.def
+++ b/Master/texmf-dist/tex/lualatex/luainputenc/lutf8x.def
@@ -58,7 +58,7 @@
\gdef\DeclareUnicodeCharacter#1#2{%
\@tempcnta"#1%
- \luadirect{luainputenc.declare_character('\the\@tempcnta')}%
+ \luatexbase@directlua{luainputenc.declare_character('\the\@tempcnta')}%
\catcode\@tempcnta\active %
\DeclareInputText{\the\@tempcnta}{#2}%
}
@@ -78,15 +78,15 @@
\def\lIE@ActivateUnicodeCatcodes{%
-\luadirect{luainputenc.activate_characters()}%
+\luatexbase@directlua{luainputenc.activate_characters()}%
}
\def\lIE@DesactivateUnicodeCatcodes{%
-\luadirect{luainputenc.desactivate_characters()}%
+\luatexbase@directlua{luainputenc.desactivate_characters()}%
}
\def\lIE@CharactersActivated{%
-\luadirect{luainputenc.force_characters_activated()}
+\luatexbase@directlua{luainputenc.force_characters_activated()}
}
\edef\lIE@EU{EU2}