diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/oberdiek/hycolor.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/oberdiek/hycolor.dtx | 90 |
1 files changed, 73 insertions, 17 deletions
diff --git a/Master/texmf-dist/source/latex/oberdiek/hycolor.dtx b/Master/texmf-dist/source/latex/oberdiek/hycolor.dtx index 92d507d7d52..c152f4fd797 100644 --- a/Master/texmf-dist/source/latex/oberdiek/hycolor.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/hycolor.dtx @@ -19,7 +19,8 @@ % hycolor.sty, hycolor.pdf, hycolor.ins, hycolor.drv, % xcolor-patch.sty, hycolor-test1.tex, hycolor-test2.tex, % hycolor-test3.tex, hycolor-test-xcol1.tex, -% hycolor-test-xcol2.tex, hycolor-test-xcol3.tex. +% hycolor-test-xcol2.tex, hycolor-test-xcol3.tex, +% hycolor-test-xcol4.tex. % % Distribution: % CTAN:macros/latex/contrib/oberdiek/hycolor.dtx @@ -61,6 +62,7 @@ % TDS:doc/latex/oberdiek/test/hycolor-test-xcol1.tex % TDS:doc/latex/oberdiek/test/hycolor-test-xcol2.tex % TDS:doc/latex/oberdiek/test/hycolor-test-xcol3.tex +% TDS:doc/latex/oberdiek/test/hycolor-test-xcol4.tex % TDS:source/latex/oberdiek/hycolor.dtx % %<*ignore> @@ -76,7 +78,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: hycolor 2008/08/01 v1.3 Code for color options of hyperref/bookmark (HO)} +\Msg{* Package: hycolor 2008/09/08 v1.4 Code for color options of hyperref/bookmark (HO)} \Msg{************************************************************************} \keepsilent @@ -106,7 +108,8 @@ and the derived files hycolor.sty, hycolor.pdf, hycolor.ins, hycolor.drv, xcolor-patch.sty, hycolor-test1.tex, hycolor-test2.tex, hycolor-test3.tex, hycolor-test-xcol1.tex, - hycolor-test-xcol2.tex, hycolor-test-xcol3.tex. + hycolor-test-xcol2.tex, hycolor-test-xcol3.tex, + hycolor-test-xcol4.tex. \endpreamble \let\MetaPrefix\DoubleperCent @@ -124,6 +127,7 @@ and the derived files \file{hycolor-test-xcol1.tex}{\from{hycolor.dtx}{test-xcolor,xcol1}}% \file{hycolor-test-xcol2.tex}{\from{hycolor.dtx}{test-xcolor,xcol2}}% \file{hycolor-test-xcol3.tex}{\from{hycolor.dtx}{test-xcolor,xcol3}}% + \file{hycolor-test-xcol4.tex}{\from{hycolor.dtx}{test-xcolor-fbox}}% } \obeyspaces @@ -153,7 +157,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{hycolor.drv}% - [2008/08/01 v1.3 Code for color options of hyperref/bookmark (HO)]% + [2008/09/08 v1.4 Code for color options of hyperref/bookmark (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2008/08/11] \usepackage[ruled]{algorithm2e} @@ -197,7 +201,7 @@ and the derived files %</driver> % \fi % -% \CheckSum{1702} +% \CheckSum{1744} % % \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 @@ -218,7 +222,7 @@ and the derived files % \GetFileInfo{hycolor.drv} % % \title{The \xpackage{hycolor} package} -% \date{2008/08/01 v1.3} +% \date{2008/09/08 v1.4} % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}} % % \maketitle @@ -320,11 +324,11 @@ and the derived files %<*package> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hycolor}% - [2008/08/01 v1.3 Code for color options of hyperref/bookmark (HO)]% + [2008/09/08 v1.4 Code for color options of hyperref/bookmark (HO)]% % \end{macrocode} % % \begin{macrocode} -\RequirePackage{xcolor-patch}[2008/08/01] +\RequirePackage{xcolor-patch}[2008/09/08] % \end{macrocode} % % \subsection{Normalization} @@ -1230,7 +1234,7 @@ and the derived files % \begin{macrocode} %<*xcolor> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{xcolor-patch}[2008/08/01 xcolor patch] +\ProvidesPackage{xcolor-patch}[2008/09/08 xcolor patch] % \end{macrocode} % \begin{macrocode} \@ifpackageloaded{xcolor}{% @@ -1401,9 +1405,36 @@ and the derived files }% }% \fi -} % \end{macrocode} % \end{macro} +% +% \subsubsection{Fix fragile \cs{@frameb@x}} +% +% \cs{fbox} becomes fragile, because the internal \cs{@frameb@x} +% is redefined by package \xpackage{xcolor}. The redefinition is +% no longer robust. Test file: +%\begin{quote} +%\begin{verbatim} +%\documentclass{article} +%\usepackage{xcolor} +%\makeatletter +%\protected@edef\x{\fbox{abc}} +%\@@end +%\end{verbatim} +%\end{quote} +% \begin{macrocode} + \@ifundefined{XC@frameb@x }{% + \expandafter\let\csname XC@frameb@x \endcsname\XC@frameb@x + \edef\XC@frameb@x{% + \noexpand\protect + \expandafter\noexpand\csname XC@frameb@x \endcsname + }% + \expandafter\ifx\csname XC@frameb@x \endcsname\@frameb@x + \let\@frameb@x\XC@frameb@x + \fi + }{}% +} +% \end{macrocode} % \begin{macrocode} %</xcolor> % \end{macrocode} @@ -1412,19 +1443,19 @@ and the derived files % % \begin{macrocode} %<*test1> -\ProvidesFile{hycolor-test1.tex}[2008/08/01 test file 1] +\ProvidesFile{hycolor-test1.tex}[2008/09/08 test file 1] %</test1> % \end{macrocode} % % \begin{macrocode} %<*test2> -\ProvidesFile{hycolor-test2.tex}[2008/08/01 test file 2] +\ProvidesFile{hycolor-test2.tex}[2008/09/08 test file 2] \let\pdfmatch\relax %</test2> % \end{macrocode} % % \begin{macrocode} -%<test3>\ProvidesFile{hycolor-test3.tex}[2008/08/01 test file 3] +%<test3>\ProvidesFile{hycolor-test3.tex}[2008/09/08 test file 3] % \end{macrocode} % % \begin{macrocode} @@ -1470,7 +1501,7 @@ and the derived files \Expect*{\@ResultErrorMessage}*{\@ExpectErrorMessage}% } \usepackage{scrlfile} -\usepackage{hycolor}[2008/08/01] +\usepackage{hycolor}[2008/09/08] %</test> % \end{macrocode} % @@ -1859,15 +1890,15 @@ and the derived files \documentclass{minimal} %<*xcol1> \usepackage{xcolor} -\usepackage{xcolor-patch}[2008/08/01] +\usepackage{xcolor-patch}[2008/09/08] %</xcol1> %<*xcol2> \usepackage{scrlfile} -\usepackage{xcolor-patch}[2008/08/01] +\usepackage{xcolor-patch}[2008/09/08] \usepackage{xcolor} %</xcol2> %<*xcol3> -\usepackage{xcolor-patch}[2008/08/01] +\usepackage{xcolor-patch}[2008/09/08] \usepackage{xcolor} \begin{document} %</xcol3> @@ -1907,6 +1938,25 @@ and the derived files %</test-xcolor> % \end{macrocode} % +% \subsubsection{Test for \cs{@frameb@x}/\cs{fbox}} +% +% \begin{macrocode} +%<*test-xcolor-fbox> +\NeedsTeXFormat{LaTeX2e} +\documentclass{article} +\usepackage{xcolor} +\usepackage{xcolor-patch}[2008/09/08] +\makeatletter +\protected@edef\x{\fbox{abc}} +\let\@tempa\@undefined +\protected@edef\x{\fbox{abc}} +\makeatother +\begin{document} +\MakeUppercase{\fbox{abc}} +\end{document} +%</test-xcolor-fbox> +% \end{macrocode} +% % \section{Installation} % % \subsection{Download} @@ -1975,6 +2025,7 @@ and the derived files % test/hycolor-test-xcol1.tex & doc/latex/oberdiek/test/hycolor-test-xcol1.tex\\ % test/hycolor-test-xcol2.tex & doc/latex/oberdiek/test/hycolor-test-xcol2.tex\\ % test/hycolor-test-xcol3.tex & doc/latex/oberdiek/test/hycolor-test-xcol3.tex\\ +% test/hycolor-test-xcol4.tex & doc/latex/oberdiek/test/hycolor-test-xcol4.tex\\ % hycolor.dtx & source/latex/oberdiek/hycolor.dtx\\ % \end{tabular}^^A % }^^A @@ -2113,6 +2164,11 @@ and the derived files % Patch package \xpackage{xcolor-patch} added that fixes bugs in % package \xpackage{xcolor} to get the test files running. % \end{Version} +% \begin{Version}{2008/09/08 v1.4} +% \item +% Fix added to package \xpackage{xcolor-patch}: +% Fragile \cs{@frameb@x} (used in \cs{fbox}) is made robust. +% \end{Version} % \end{History} % % \PrintIndex |