diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/oberdiek')
5 files changed, 336 insertions, 75 deletions
diff --git a/Master/texmf-dist/source/latex/oberdiek/inputenx.dtx b/Master/texmf-dist/source/latex/oberdiek/inputenx.dtx index a7483ff7622..86921e0e74c 100644 --- a/Master/texmf-dist/source/latex/oberdiek/inputenx.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/inputenx.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% 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 @@ -117,7 +117,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: inputenx 2009/12/15 v1.5 Enhanced input encoding handling (HO)} +\Msg{* Package: inputenx 2010/01/11 v1.6 Enhanced input encoding handling (HO)} \Msg{************************************************************************} \keepsilent @@ -128,7 +128,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 @@ -245,7 +245,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{inputenx.drv}% - [2009/12/15 v1.5 Enhanced input encoding handling (HO)]% + [2010/01/11 v1.6 Enhanced input encoding handling (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2008/08/11] \usepackage{longtable} @@ -255,7 +255,7 @@ and the derived files %</driver> % \fi % -% \CheckSum{9988} +% \CheckSum{10027} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -276,7 +276,7 @@ and the derived files % \GetFileInfo{inputenx.drv} % % \title{The \xpackage{inputenx} package} -% \date{2009/12/15 v1.5} +% \date{2010/01/11 v1.6} % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}} % % \maketitle @@ -291,7 +291,7 @@ and the derived files % % \section{Documentation} % -% The main goal was to have a package allows the selection and +% The original goal was to have a package that allows the selection and % defining input encodings by the characters in question itself. % % The first stage with encoding definition files is implemented. @@ -307,6 +307,7 @@ and the derived files % That means that the deprecated \cs{DeclareInputMath} is not % longer used. Instead package \xpackage{inpmath} is supported by % providing declarations using \cs{DeclareMathMeaning}. +% \item Encoding names can also be given by various alias names. % \end{itemize} % % The second stage that allows selection of input encoding @@ -418,13 +419,70 @@ and the derived files % package \xpackage{inpmath} that extends package \xpackage{inputenc}, % to change the behaviour of input characters if used in math mode. % File \xfile{ix-math.def} provides some definitions of math characters. +% Package option `math' loads package \xpackage{inpmath} and loads +% file \xfile{ix-math.cfg}. If \xfile{ix-math.cfg} does not exist, +% \xfile{ix-math.def} is loaded instead. (The file \xfile{ix-math.cfg} +% may contain |\input{ix-math.def}|.) % -% \subsection{ToDo} +% \subsection{Setting the input encoding} % -% \begin{itemize} -% \item Documentation. -% \end{itemize} +% \subsubsection{Encoding as package option} % +% All other package options are treated as encoding options. +% Global options are ignored. First +% The encoding name or one of its aliases can be given as +% package option. First an alias is dereferenced and then the +% real encoding name (base name of the encoding definition +% file is passed to package \xpackage{inputenc}. +% \cs{CurrentInputEncodingName} and \cs{CurrentInputEncodingOption} +% are set, see below. +% +% \subsubsection{\cs{InputEncoding}} +% +% \begin{declcs}{InputEncoding} \M{encoding} +% \end{declcs} +% After package \xpackage{inputenx} is loaded an encoding can be set +% or changed using \cs{InputEncoding}. Its \meta{encoding} +% can be an encoding or alias name. This is similar to \cs{inputencoding} +% of package \xpackage{inputenc}. That remembers the current encoding +% in macro \cs{inputencodingname}. However \cs{InputEncoding} +% uses remembers the encoding in two macros because of the +% alias support: +% +% \begin{declcs}{CurrentInputEncodingName}\\ +% \cs{CurrentInputEncodingOption} +% \end{declcs} +% \cs{CurrentInputEncodingName} is the name of the encoding given +% as option to \cs{usepackage} or as argument for \cs{InputEncoding}. +% This name can also be an alias name. +% The real encoding name (base file name of the encoding file) is +% remembered in \cs{CurrentInputEncodingOption} (option means option for package +% \xpackage{inputenc}). +% +% \subsubsection{Hooks} +% +% \begin{declcs}{BeforeInputEncoding} \M{code}\\ +% \cs{AfterInputEncoding} \M{code} +% \end{declcs} +% \cs{InputEncoding} supports two hooks that are called at the beginning +% and the end after the encoding is set. \meta{code} is added to the +% hooks by \cs{BeforeInputEncoding} or \cs{AfterInputEncoding}. +% +% \begin{sloppypar} +% \begin{declcs}{InputEncodingNameOld}\\ +% \cs{InputEncodingOptionOld}\\ +% \cs{InputEncodingNew} +% \end{declcs} +% In the hooks the old encoding names are available as macros +% \cs{InputEncodingNameOld} and \cs{InputEncodingOptionOld}. +% They store the meaning of \cs{CurrentInputEncodingName} +% and \cs{CurrentInputEncodingOption} before \cs{InputEncoding}. +% \cs{InputEncodingNew} contains the new input encoding given +% as argument for \cs{InputEncoding}. In \cs{BeforeInputEncoding} +% this macro \cs{InputEncodingNew} can even be changed to a +% better encoding name that will then be used to set the input +% encoding. +% \end{sloppypar} % % \StopEventually{ % } @@ -437,7 +495,7 @@ and the derived files %<*package> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{inputenx}% - [2009/12/15 v1.5 Enhanced input encoding handling (HO)]% + [2010/01/11 v1.6 Enhanced input encoding handling (HO)]% % \end{macrocode} % % \subsection{Encoding names} @@ -557,24 +615,63 @@ and the derived files % \subsubsection{Load \xpackage{inputenc} with encoding options} % % \begin{macrocode} +\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}% +} % \end{macrocode} % % \subsubsection{\cs{InputEncoding}} % +% \begin{macro}{\IEX@BeforeHook} +% \begin{macrocode} +\def\IEX@BeforeHook{} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\IEX@AfterHook} +% \begin{macrocode} +\def\IEX@AfterHook{} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\BeforeInputEncoding} +% \begin{macrocode} +\newcommand*{\BeforeInputEncoding}{% + \g@addto@macro\IEX@BeforeHook +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\AfterInputEncoding} +% \begin{macrocode} +\newcommand*{\AfterInputEncoding}{% + \g@addto@macro\IEX@AfterHook +} +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\InputEncoding} % \cs{InputEncoding} is basically the same as \cs{inputencoding} % of package \xpackage{inputenc}. However aliases are supported. % \begin{macrocode} \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}% @@ -591,6 +688,7 @@ and the derived files % \fi % \fi \fi + \IEX@AfterHook } % \end{macrocode} % \end{macro} @@ -616,7 +714,7 @@ and the derived files % % \begin{macrocode} %<*alias> -\ProvidesFile{ix-alias.def}[2009/12/15 v1.5 Alias list (inputenx)] +\ProvidesFile{ix-alias.def}[2010/01/11 v1.6 Alias list (inputenx)] % \end{macrocode} % The alias mechanism is also used to hide the prefix |x-|: % \begin{macrocode} @@ -696,7 +794,7 @@ and the derived files % \begin{macrocode} %<*ascii> \ProvidesFile{x-ascii.def}% - [2009/12/15 v1.5 Input encoding ascii (inputenx)]% + [2010/01/11 v1.6 Input encoding ascii (inputenx)]% \csname @inpenc@test\endcsname %</ascii> % \end{macrocode} @@ -706,7 +804,7 @@ and the derived files % \begin{macrocode} %<*atarist> \ProvidesFile{x-atarist.def}% - [2009/12/15 v1.5 Input encoding atarist (inputenx)]% + [2010/01/11 v1.6 Input encoding atarist (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textGamma}{% @@ -970,7 +1068,7 @@ and the derived files % \begin{macrocode} %<*iso-8859-1> \ProvidesFile{x-iso-8859-1.def}% - [2009/12/15 v1.5 Input encoding iso-8859-1 (inputenx)]% + [2010/01/11 v1.6 Input encoding iso-8859-1 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textasciiacute}{% @@ -1135,7 +1233,7 @@ and the derived files % \begin{macrocode} %<*iso-8859-2> \ProvidesFile{x-iso-8859-2.def}% - [2009/12/15 v1.5 Input encoding iso-8859-2 (inputenx)]% + [2010/01/11 v1.6 Input encoding iso-8859-2 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textacutedbl}{% @@ -1270,7 +1368,7 @@ and the derived files % \begin{macrocode} %<*iso-8859-3> \ProvidesFile{x-iso-8859-3.def}% - [2009/12/15 v1.5 Input encoding iso-8859-3 (inputenx)]% + [2010/01/11 v1.6 Input encoding iso-8859-3 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textasciiacute}{% @@ -1410,7 +1508,7 @@ and the derived files % \begin{macrocode} %<*iso-8859-4> \ProvidesFile{x-iso-8859-4.def}% - [2009/12/15 v1.5 Input encoding iso-8859-4 (inputenx)]% + [2010/01/11 v1.6 Input encoding iso-8859-4 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textTstroke}{% @@ -1551,7 +1649,7 @@ and the derived files % \begin{macrocode} %<*iso-8859-5> \ProvidesFile{x-iso-8859-5.def}% - [2009/12/15 v1.5 Input encoding iso-8859-5 (inputenx)]% + [2010/01/11 v1.6 Input encoding iso-8859-5 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textnumero}{% @@ -1673,7 +1771,7 @@ and the derived files % \begin{macrocode} %<*iso-8859-8> \ProvidesFile{x-iso-8859-8.def}% - [2009/12/15 v1.5 Input encoding iso-8859-8 (inputenx)]% + [2010/01/11 v1.6 Input encoding iso-8859-8 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textasciiacute}{% @@ -1812,7 +1910,7 @@ and the derived files % \begin{macrocode} %<*iso-8859-9> \ProvidesFile{x-iso-8859-9.def}% - [2009/12/15 v1.5 Input encoding iso-8859-9 (inputenx)]% + [2010/01/11 v1.6 Input encoding iso-8859-9 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textasciiacute}{% @@ -1977,7 +2075,7 @@ and the derived files % \begin{macrocode} %<*iso-8859-10> \ProvidesFile{x-iso-8859-10.def}% - [2009/12/15 v1.5 Input encoding iso-8859-10 (inputenx)]% + [2010/01/11 v1.6 Input encoding iso-8859-10 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textTstroke}{% @@ -2100,7 +2198,7 @@ and the derived files % \begin{macrocode} %<*iso-8859-13> \ProvidesFile{x-iso-8859-13.def}% - [2009/12/15 v1.5 Input encoding iso-8859-13 (inputenx)]% + [2010/01/11 v1.6 Input encoding iso-8859-13 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textbrokenbar}{% @@ -2253,7 +2351,7 @@ and the derived files % \begin{macrocode} %<*iso-8859-14> \ProvidesFile{x-iso-8859-14.def}% - [2009/12/15 v1.5 Input encoding iso-8859-14 (inputenx)]% + [2010/01/11 v1.6 Input encoding iso-8859-14 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \DeclareInputText{160}{\nobreakspace} @@ -2361,7 +2459,7 @@ and the derived files % \begin{macrocode} %<*iso-8859-15> \ProvidesFile{x-iso-8859-15.def}% - [2009/12/15 v1.5 Input encoding iso-8859-15 (inputenx)]% + [2010/01/11 v1.6 Input encoding iso-8859-15 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textasciimacron}{% @@ -2508,7 +2606,7 @@ and the derived files % \begin{macrocode} %<*iso-8859-16> \ProvidesFile{x-iso-8859-16.def}% - [2009/12/15 v1.5 Input encoding iso-8859-16 (inputenx)]% + [2010/01/11 v1.6 Input encoding iso-8859-16 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textcommabelow}[1]{% @@ -2639,7 +2737,7 @@ and the derived files % \begin{macrocode} %<*cp437> \ProvidesFile{x-cp437.def}% - [2009/12/15 v1.5 Input encoding cp437 (inputenx)]% + [2010/01/11 v1.6 Input encoding cp437 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textGamma}{% @@ -2888,7 +2986,7 @@ and the derived files % \begin{macrocode} %<*cp850> \ProvidesFile{x-cp850.def}% - [2009/12/15 v1.5 Input encoding cp850 (inputenx)]% + [2010/01/11 v1.6 Input encoding cp850 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textasciiacute}{% @@ -3103,7 +3201,7 @@ and the derived files % \begin{macrocode} %<*cp852> \ProvidesFile{x-cp852.def}% - [2009/12/15 v1.5 Input encoding cp852 (inputenx)]% + [2010/01/11 v1.6 Input encoding cp852 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textacutedbl}{% @@ -3276,7 +3374,7 @@ and the derived files % \begin{macrocode} %<*cp855> \ProvidesFile{x-cp855.def}% - [2009/12/15 v1.5 Input encoding cp855 (inputenx)]% + [2010/01/11 v1.6 Input encoding cp855 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textblacksquare}{% @@ -3436,7 +3534,7 @@ and the derived files % \begin{macrocode} %<*cp858> \ProvidesFile{x-cp858.def}% - [2009/12/15 v1.5 Input encoding cp858 (inputenx)]% + [2010/01/11 v1.6 Input encoding cp858 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textasciiacute}{% @@ -3654,7 +3752,7 @@ and the derived files % \begin{macrocode} %<*cp865> \ProvidesFile{x-cp865.def}% - [2009/12/15 v1.5 Input encoding cp865 (inputenx)]% + [2010/01/11 v1.6 Input encoding cp865 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textGamma}{% @@ -3900,7 +3998,7 @@ and the derived files % \begin{macrocode} %<*cp866> \ProvidesFile{x-cp866.def}% - [2009/12/15 v1.5 Input encoding cp866 (inputenx)]% + [2010/01/11 v1.6 Input encoding cp866 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textblacksquare}{% @@ -4066,7 +4164,7 @@ and the derived files % \begin{macrocode} %<*cp1250> \ProvidesFile{x-cp1250.def}% - [2009/12/15 v1.5 Input encoding cp1250 (inputenx)]% + [2010/01/11 v1.6 Input encoding cp1250 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textacutedbl}{% @@ -4243,7 +4341,7 @@ and the derived files % \begin{macrocode} %<*cp1251> \ProvidesFile{x-cp1251.def}% - [2009/12/15 v1.5 Input encoding cp1251 (inputenx)]% + [2010/01/11 v1.6 Input encoding cp1251 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textbrokenbar}{% @@ -4417,7 +4515,7 @@ and the derived files % \begin{macrocode} %<*cp1252> \ProvidesFile{x-cp1252.def}% - [2009/12/15 v1.5 Input encoding cp1252 (inputenx)]% + [2010/01/11 v1.6 Input encoding cp1252 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textasciiacute}{% @@ -4615,7 +4713,7 @@ and the derived files % \begin{macrocode} %<*cp1257> \ProvidesFile{x-cp1257.def}% - [2009/12/15 v1.5 Input encoding cp1257 (inputenx)]% + [2010/01/11 v1.6 Input encoding cp1257 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textasciiacute}{% @@ -4803,7 +4901,7 @@ and the derived files % \begin{macrocode} %<*dec-mcs> \ProvidesFile{x-dec-mcs.def}% - [2009/12/15 v1.5 Input encoding dec-mcs (inputenx)]% + [2010/01/11 v1.6 Input encoding dec-mcs (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textcent}{% @@ -4929,7 +5027,7 @@ and the derived files % \begin{macrocode} %<*koi8-r> \ProvidesFile{x-koi8-r.def}% - [2009/12/15 v1.5 Input encoding koi8-r (inputenx)]% + [2010/01/11 v1.6 Input encoding koi8-r (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textapproxequal}{% @@ -5091,7 +5189,7 @@ and the derived files % \begin{macrocode} %<*mac-centeuro> \ProvidesFile{x-mac-centeuro.def}% - [2009/12/15 v1.5 Input encoding mac-centeuro (inputenx)]% + [2010/01/11 v1.6 Input encoding mac-centeuro (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textasciicaron}{% @@ -5270,7 +5368,7 @@ and the derived files % \begin{macrocode} %<*mac-cyrillic> \ProvidesFile{x-mac-cyrillic.def}% - [2009/12/15 v1.5 Input encoding mac-cyrillic (inputenx)]% + [2010/01/11 v1.6 Input encoding mac-cyrillic (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textapproxequal}{% @@ -5466,7 +5564,7 @@ and the derived files % \begin{macrocode} %<*mac-roman> \ProvidesFile{x-mac-roman.def}% - [2009/12/15 v1.5 Input encoding mac-roman (inputenx)]% + [2010/01/11 v1.6 Input encoding mac-roman (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textOmega}{% @@ -5695,7 +5793,7 @@ and the derived files % \begin{macrocode} %<*nextstep> \ProvidesFile{x-nextstep.def}% - [2009/12/15 v1.5 Input encoding nextstep (inputenx)]% + [2010/01/11 v1.6 Input encoding nextstep (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textacutedbl}{% @@ -5916,7 +6014,7 @@ and the derived files % \begin{macrocode} %<*dfu> \ProvidesFile{ix-utf8enc.dfu}% - [2009/12/15 v1.5 Additions of inputenx for utf8enc.dfu]% + [2010/01/11 v1.6 Additions of inputenx for utf8enc.dfu]% \DeclareUnicodeCharacter{00A0}{\nobreakspace} \DeclareUnicodeCharacter{00AD}{\-} \DeclareUnicodeCharacter{0100}{\@tabacckludge=A} @@ -6130,7 +6228,7 @@ and the derived files % \begin{macrocode} %<*name> \ProvidesFile{ix-name.def}% - [2009/12/15 v1.5 Name list (inputenx)]% + [2010/01/11 v1.6 Name list (inputenx)]% % \end{macrocode} % % \textit{List omitted here, see \xfile{ix-name.def}.} @@ -6840,7 +6938,7 @@ and the derived files % \begin{macrocode} %<*slot> \ProvidesFile{ix-slot.def}% - [2009/12/15 v1.5 SLOT and UC to Encodings (inputenx)]% + [2010/01/11 v1.6 SLOT and UC to Encodings (inputenx)]% % \end{macrocode} % % \textit{List omitted here, see \xfile{ix-slot.def}.} @@ -8985,7 +9083,7 @@ and the derived files % \begin{macrocode} %<*uc> \ProvidesFile{ix-uc.def}% - [2009/12/15 v1.5 UC to LICR (inputenx)]% + [2010/01/11 v1.6 UC to LICR (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter % \end{macrocode} @@ -10029,7 +10127,7 @@ and the derived files % \begin{macrocode} %<*math> \ProvidesFile{ix-math.def}% - [2009/12/15 v1.5 Math list (inputenx)]% + [2010/01/11 v1.6 Math list (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter % \end{macrocode} @@ -10121,7 +10219,7 @@ and the derived files % defined by standard \LaTeX\ without extra packages. % \begin{macrocode} %<*licrcmds> - % List of known LICR commdands of inputenx 2009/12/15 v1.5 + % List of known LICR commdands of inputenx 2010/01/11 v1.6 % % Format: \LICRcmd{<command>}{<type>} % Types: @@ -10230,7 +10328,7 @@ and the derived files % % \begin{macrocode} %<*dfudoc> - % inputenx-utf8enc.txt 2009/12/15 v1.5 + % inputenx-utf8enc.txt 2010/01/11 v1.6 % Commented additions for utf8enc.dfu % \end{macrocode} @@ -11577,6 +11675,12 @@ and the derived files % Aliases \xoption{clean7bit}, \xoption{ascii-print}, % \xoption{ascii-printable} added for \xoption{x-ascii}. % \end{Version} +% \begin{Version}{2010/01/11 v1.6} +% \item +% \cs{BeforeInputEncoding} and \cs{AfterInputEncoding} added. +% \item +% Documentation added. +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins b/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins index 0eae61c0e1b..76e53ac4251 100644 --- a/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins +++ b/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins @@ -1,5 +1,5 @@ % oberdiek.ins -% 2009/12/22 +% 2010/01/11 % % Copyright (C) 1999, 2001, 2006 by % Heiko Oberdiek <oberdiek@uni-freiburg.de> diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex b/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex index b8d2c64d0e0..52911fbb64d 100644 --- a/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex +++ b/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex @@ -6,7 +6,7 @@ \newcommand*{\Subject}{CTAN:\CTANdir} \newcommand*{\Author}{Heiko Oberdiek} \newcommand*{\Email}{oberdiek@uni-freiburg.de} -\newcommand*{\Date}{2009/12/22} +\newcommand*{\Date}{2010/01/11} % Copyright (C) 2006 by % Heiko Oberdiek <oberdiek@uni-freiburg.de> @@ -243,7 +243,7 @@ [\entrysep] \entry{infwarerr}{2007/09/09}{1.2}{Providing info/warning/message}% [\entrysep] -\entry{inputenx}{2009/12/15}{1.5}{Enhanced input encoding handling}% +\entry{inputenx}{2010/01/11}{1.6}{Enhanced input encoding handling}% [\entrysep] \entry{intcalc}{2007/09/27}{1.1}{Expandable integer calculations}% [\entrysep] @@ -275,9 +275,9 @@ [\entrysep] \entry{pdfcolmk}{2008/08/11}{1.2}{PDFtex COLor MarK}% [\entrysep] -\entry{pdfcolparallel}{2008/08/11}{1.2}{Fixed parallel with color stacks support}% +\entry{pdfcolparallel}{2010/01/11}{1.3}{Fixed parallel with color stacks support}% [\entrysep] -\entry{pdfcolparcolumns}{2008/08/11}{1.2}{Color stacks support for parcolumns}% +\entry{pdfcolparcolumns}{2010/01/11}{1.3}{Color stacks support for parcolumns}% [\entrysep] \entry{pdfcrypt}{2007/04/26}{1.0}{Setting pdf encryption}% [\entrysep] diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfcolparallel.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfcolparallel.dtx index 09cf6c71a42..79133a5816e 100644 --- a/Master/texmf-dist/source/latex/oberdiek/pdfcolparallel.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/pdfcolparallel.dtx @@ -1,6 +1,7 @@ % \iffalse meta-comment % -% Copyright (C) 2007, 2008 by Heiko Oberdiek <oberdiek@uni-freiburg.de> +% Copyright (C) 2007, 2008, 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 @@ -68,7 +69,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: pdfcolparallel 2008/08/11 v1.2 Fixed parallel with color stacks support (HO)} +\Msg{* Package: pdfcolparallel 2010/01/11 v1.3 Fixed parallel with color stacks support (HO)} \Msg{************************************************************************} \keepsilent @@ -79,7 +80,8 @@ This is a generated file. -Copyright (C) 2007, 2008 by Heiko Oberdiek <oberdiek@uni-freiburg.de> +Copyright (C) 2007, 2008, 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 @@ -137,7 +139,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{pdfcolparallel.drv}% - [2008/08/11 v1.2 Fixed parallel with color stacks support (HO)]% + [2010/01/11 v1.3 Fixed parallel with color stacks support (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2008/08/11] \begin{document} @@ -146,7 +148,7 @@ and the derived files %</driver> % \fi % -% \CheckSum{714} +% \CheckSum{763} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -167,7 +169,7 @@ and the derived files % \GetFileInfo{pdfcolparallel.drv} % % \title{The \xpackage{pdfcolparallel} package} -% \date{2008/08/11 v1.2} +% \date{2010/01/11 v1.3} % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}} % % \maketitle @@ -191,6 +193,24 @@ and the derived files % If color stacks are available then package \xpackage{parallel} % is further patched to support them. % +% \subsection{Option \xoption{rulebetweencolor}} +% +% Package \xpackage{pdfcolparallel} also fixes the color for the +% rule between columns. +% Default color is \cs{normalcolor}. But this can be changed by using +% option \xoption{rulebetweencolor} for |\setkeys{parallel}| +% (see package \xpackage{keyval}). The option takes a color specification +% as value. If the value is empty, then the default (\cs{normalcolor}) +% is used. +% Examples: +% \begin{quote} +% |\setkeys{parallel}{rulebetweencolor=blue}|,\\ +% |\setkeys{parallel}{rulebetweencolor={red}}|,\\ +% |\setkeys{parallel}{rulebetweencolor={}}|, +% \textit{\% \cs{normalcolor} is used}\\ +% |\setkeys{parallel}{rulebetweencolor=[rgb]{1,0,.5}}| +% \end{quote} +% % \subsection{Future} % % If there will be a new version of package \xpackage{parallel} @@ -208,7 +228,7 @@ and the derived files %<*package> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{pdfcolparallel}% - [2008/08/11 v1.2 Fixed parallel with color stacks support (HO)]% + [2010/01/11 v1.3 Fixed parallel with color stacks support (HO)]% % \end{macrocode} % % \subsection{Load and fix package \xpackage{parallel}} @@ -672,7 +692,10 @@ and the derived files \strut \ifnum\ParallelBoolMid=\@ne \hskip\ParallelMainMidSkip - \vrule + \begingroup + \pcp@RuleBetweenColor + \vrule + \endgroup \else \hss \fi @@ -706,6 +729,48 @@ and the derived files } % \end{macrocode} % \end{macro} +% \begin{macro}{\pcp@RuleBetweenColorDefault} +% \begin{macrocode} +\def\pcp@RuleBetweenColorDefault{% + \normalcolor +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\pcp@RuleBetweenColor} +% \begin{macrocode} +\let\pcp@RuleBetweenColor\pcp@RuleBetweenColorDefault +% \end{macrocode} +% \end{macro} +% \begin{macrocode} +\RequirePackage{keyval} +\define@key{parallel}{rulebetweencolor}{% + \edef\pcp@temp{#1}% + \ifx\pcp@temp\@empty + \let\pcp@RuleBetweenColor\pcp@RuleBetweenColorDefault + \else + \edef\pcp@temp{% + \noexpand\@ifnextchar[{% + \def\noexpand\pcp@RuleBetweenColor{% + \noexpand\color\pcp@temp + }% + \noexpand\pcp@GobbleNil + }{% + \def\noexpand\pcp@RuleBetweenColor{% + \noexpand\color{\pcp@temp}% + }% + \noexpand\pcp@GobbleNil + }% + \pcp@temp\noexpand\@nil + }% + \pcp@temp + \fi +} +% \end{macrocode} +% \begin{macro}{\pcp@GobbleNil} +% \begin{macrocode} +\long\def\pcp@GobbleNil#1\@nil{} +% \end{macrocode} +% \end{macro} % % \begin{macrocode} %</package> @@ -728,7 +793,7 @@ and the derived files } \documentclass{article} \usepackage{xcolor} -\usepackage{pdfcolparallel}[2008/08/11] +\usepackage{pdfcolparallel}[2010/01/11] \begin{document} \color{green}% @@ -1027,6 +1092,10 @@ and the derived files % \item % URLs updated. % \end{Version} +% \begin{Version}{2010/01/11 v1.3} +% \item +% Option `rulebetweencolor' added. +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfcolparcolumns.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfcolparcolumns.dtx index 2e1931aee42..1ab2cadfa30 100644 --- a/Master/texmf-dist/source/latex/oberdiek/pdfcolparcolumns.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/pdfcolparcolumns.dtx @@ -1,6 +1,7 @@ % \iffalse meta-comment % -% Copyright (C) 2007, 2008 by Heiko Oberdiek <oberdiek@uni-freiburg.de> +% Copyright (C) 2007, 2008, 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 @@ -68,7 +69,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: pdfcolparcolumns 2008/08/11 v1.2 Color stacks support for parcolumns (HO)} +\Msg{* Package: pdfcolparcolumns 2010/01/11 v1.3 Color stacks support for parcolumns (HO)} \Msg{************************************************************************} \keepsilent @@ -79,7 +80,8 @@ This is a generated file. -Copyright (C) 2007, 2008 by Heiko Oberdiek <oberdiek@uni-freiburg.de> +Copyright (C) 2007, 2008, 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 @@ -137,7 +139,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{pdfcolparcolumns.drv}% - [2008/08/11 v1.2 Color stacks support for parcolumns (HO)]% + [2010/01/11 v1.3 Color stacks support for parcolumns (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2008/08/11] \begin{document} @@ -146,7 +148,7 @@ and the derived files %</driver> % \fi % -% \CheckSum{263} +% \CheckSum{311} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -167,7 +169,7 @@ and the derived files % \GetFileInfo{pdfcolparcolumns.drv} % % \title{The \xpackage{pdfcolparcolumns} package} -% \date{2008/08/11 v1.2} +% \date{2010/01/11 v1.3} % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}} % % \maketitle @@ -190,6 +192,42 @@ and the derived files % macros of \xpackage{parcolumns} are patched to add support % for color stacks. % +% \subsection{Option \xoption{rulebetweencolor}} +% +% Package \xpackage{pdfcolparcolumns} also fixes the color for the +% rule between columns (if \xoption{rulebetween} is set). +% Default color is \cs{normalcolor}. But this can be changed by using +% option \xoption{rulebetweencolor}. It takes a color specification +% as value. If the value is empty, then the default (\cs{normalcolor}) +% is used. +% Examples: +% \begin{quote} +% |rulebetweencolor=blue|,\\ +% |rulebetweencolor={red}|,\\ +% |rulebetweencolor={}|, \textit{\% \cs{normalcolor} is used}\\ +% |rulebetweencolor=[rgb]{1,0,.5}| \textit{\% see below} +% \end{quote} +% If used inside the optional argument of environment \textsf{parcolumns} +% and the value contains an optional argument, then whole value +% must be put in curly braces: +%\begin{quote} +%\begin{verbatim} +%\begin{parcolumns}[ +% rulebetween, +% rulebetweencolor={[rgb]{1,0,.5}}, +%]{2} +% ... +%\end{parcolumns} +%\end{verbatim} +%\end{quote} +% This option \xoption{rulebetweencolor} can also be set using +% \cs{setkeys}: +%\begin{quote} +%\begin{verbatim} +%\setkeys{parcolumns}{rulebetweencolor=green} +%\end{verbatim} +%\end{quote} +% % \subsection{Future} % % Currently package \xpackage{parcolumns} does not seem to be @@ -208,7 +246,7 @@ and the derived files %<*package> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{pdfcolparcolumns}% - [2008/08/11 v1.2 Color stacks support for parcolumns (HO)]% + [2010/01/11 v1.3 Color stacks support for parcolumns (HO)]% % \end{macrocode} % % \subsection{Load packages} @@ -407,7 +445,10 @@ and the derived files \strut \hfill \ifpc@rulebetween - \vrule + \begingroup + \pcpc@RuleBetweenColor + \vrule + \endgroup \hfill \fi \fi @@ -417,6 +458,47 @@ and the derived files } % \end{macrocode} % \end{macro} +% \begin{macro}{\pcpc@RuleBetweenColorDefault} +% \begin{macrocode} +\def\pcpc@RuleBetweenColorDefault{% + \normalcolor +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\pcpc@RuleBetweenColor} +% \begin{macrocode} +\let\pcpc@RuleBetweenColor\pcpc@RuleBetweenColorDefault +% \end{macrocode} +% \end{macro} +% \begin{macrocode} +\define@key{parcolumns}{rulebetweencolor}{% + \edef\pcpc@temp{#1}% + \ifx\pcpc@temp\@empty + \let\pcpc@RuleBetweenColor\pcpc@RuleBetweenColorDefault + \else + \edef\pcpc@temp{% + \noexpand\@ifnextchar[{% + \def\noexpand\pcpc@RuleBetweenColor{% + \noexpand\color\pcpc@temp + }% + \noexpand\pcpc@GobbleNil + }{% + \def\noexpand\pcpc@RuleBetweenColor{% + \noexpand\color{\pcpc@temp}% + }% + \noexpand\pcpc@GobbleNil + }% + \pcpc@temp\noexpand\@nil + }% + \pcpc@temp + \fi +} +% \end{macrocode} +% \begin{macro}{\pcpc@GobbleNil} +% \begin{macrocode} +\long\def\pcpc@GobbleNil#1\@nil{} +% \end{macrocode} +% \end{macro} % % \begin{macrocode} %</package> @@ -694,6 +776,12 @@ and the derived files % \item % URLs updated. % \end{Version} +% \begin{Version}{2010/01/11 v1.3} +% \item +% Fix for rule color. +% \item +% New option \xoption{rulebetweencolor} for environment |parcolumns|. +% \end{Version} % \end{History} % % \PrintIndex |