oberdiek update (12jan10)

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

1 files changed, 27 insertions, 4 deletions

diff --git a/Master/texmf-dist/tex/latex/oberdiek/inputenx.sty b/Master/texmf-dist/tex/latex/oberdiek/inputenx.sty
index 227cc3d49dc..8ea9b7edac1 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/inputenx.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/inputenx.sty
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2006-2009 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+%% Copyright (C) 2006-2010 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -40,7 +40,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{inputenx}%
-  [2009/12/15 v1.5 Enhanced input encoding handling (HO)]%
+  [2010/01/11 v1.6 Enhanced input encoding handling (HO)]%
 \providecommand*{\CurrentInputEncodingName}{}
 \providecommand*{\CurrentInputEncodingOption}{}
 \def\IEX@LookupEncoding#1{%
@@ -123,20 +123,43 @@
   \fi
 }
 \ProcessOptions*
+\let\IEX@OptionList\@empty
 \@for\CurrentOption:=\IEX@enclist\do{%
   \IEX@LookupEncoding\CurrentOption
   \ifx\CurrentInputEncodingOption\@empty
   \else
-    \PassOptionsToPackage{\CurrentInputEncodingOption}{inputenc}%
+    \edef\IEX@OptionList{%
+      \ifx\IEX@OptionList\@empty
+      \else
+        \IEX@OptionList,%
+      \fi
+      \CurrentInputEncodingOption
+    }%
   \fi
 }
 \RequirePackage{inputenc}
+\@for\IEX@Option:=\IEX@OptionList\do{%
+  \inputencoding{\IEX@Option}%
+}
+\def\IEX@BeforeHook{}
+\def\IEX@AfterHook{}
+\newcommand*{\BeforeInputEncoding}{%
+  \g@addto@macro\IEX@BeforeHook
+}
+\newcommand*{\AfterInputEncoding}{%
+  \g@addto@macro\IEX@AfterHook
+}
 \newcommand*{\InputEncoding}[1]{%
-  \IEX@LookupEncoding{#1}%
+  \let\InputEncodingNameOld\CurrentInputEncodingName
+  \let\InputEncodingOptionOld\CurrentInputEncodingOption
+  \edef\InputEncodingNew{#1}%
+  \IEX@BeforeHook
+  \IEX@LookupEncoding\InputEncodingNew
   \ifx\CurrentInputEncodingOption\@empty
   \else
     \inputencoding{\CurrentInputEncodingOption}%
   \fi
+  \IEX@AfterHook
 }
 \ifIEX@math
   \RequirePackage{inpmath}%