luainputenc 0.973

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

2 files changed, 16 insertions, 15 deletions

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}