summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/hycolor.dtx90
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/hypcap.dtx79
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/inputenx.dtx4
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/oberdiek.ins2
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/oberdiek.tex6
5 files changed, 141 insertions, 40 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
diff --git a/Master/texmf-dist/source/latex/oberdiek/hypcap.dtx b/Master/texmf-dist/source/latex/oberdiek/hypcap.dtx
index 2b6305a0d42..e733da91603 100644
--- a/Master/texmf-dist/source/latex/oberdiek/hypcap.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/hypcap.dtx
@@ -67,7 +67,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: hypcap 2008/08/11 v1.9 Adjusting anchors of captions (HO)}
+\Msg{* Package: hypcap 2008/09/08 v1.10 Adjusting anchors of captions (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -134,7 +134,7 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{hypcap.drv}%
- [2008/08/11 v1.9 Adjusting anchors of captions (HO)]%
+ [2008/09/08 v1.10 Adjusting anchors of captions (HO)]%
\documentclass{ltxdoc}
\usepackage{holtxdoc}[2008/08/11]
\begin{document}
@@ -143,7 +143,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{164}
+% \CheckSum{169}
%
% \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
@@ -164,7 +164,7 @@ and the derived files
% \GetFileInfo{hypcap.drv}
%
% \title{The \xpackage{hypcap} package}
-% \date{2008/08/11 v1.9}
+% \date{2008/09/08 v1.10}
% \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
%
% \maketitle
@@ -181,6 +181,7 @@ and the derived files
%
% \tableofcontents
%
+% \newpage
% \section{Usage}
% The package \Package{hypcap} requires that \Package{hyperref}
% is loaded first:
@@ -247,6 +248,37 @@ and the derived files
% \end{quote}
% Only environments with one optional parameter are
% supported.
+% \item[\cs{capstartfalse}, \cs{capstarttrue}:]^^A
+% \DescribeMacro{\capstartfalse}^^A
+% \DescribeMacro{\capstarttrue}^^A
+% Since 2008/09/08 v1.10.\\
+% They disable and enable \cs{capstart}. They can be used to
+% cancel the effect of a redefined float environment.
+% Example:
+%\begin{quote}
+%\catcode`Y=\active
+%\def Y#1Z{\textit{\cs{#1}}}
+%\begin{verbatim}
+%\documentclass{article}
+%\usepackage{hyperref}
+%\usepackage[figure]{hypcap}[2008/09/08]
+%
+%\begin{document}
+% \section{Hello World}
+% \begin{figure}
+% \caption{Figure with caption A}
+% \end{figure}
+% YcapstartfalseZ
+% \begin{figure}
+% Figure without caption
+% \end{figure}
+% YcapstarttrueZ
+% \begin{figure}
+% \caption{Figure with caption B}
+% \end{figure}
+%\end{document}
+%\end{verbatim}
+%\end{quote}
% \end{description}
%
% \subsection{Limitations}
@@ -266,7 +298,7 @@ and the derived files
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{hypcap}%
- [2008/08/11 v1.9 Adjusting anchors of captions (HO)]
+ [2008/09/08 v1.10 Adjusting anchors of captions (HO)]
% \end{macrocode}
%
% For unique command names this package uses |hc@| as prefix
@@ -308,24 +340,33 @@ and the derived files
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\ifcapstart}
+% \begin{macrocode}
+\newif\ifcapstart
+\capstarttrue
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\capstart}
% The macro \cmd{\capstart} contains the first part of
% the \cmd{\caption} command: Incrementing the counter
% and setting the anchor.
% \begin{macrocode}
\newcommand*\capstart{%
- \H@refstepcounter\@captype % first part of caption
- \hyper@makecurrent\@captype
- \global\let\hc@currentHref\@currentHref
- \vspace*{-\hypcapspace}%
- \begingroup
- \let\leavevmode\relax
- \hyper@@anchor\@currentHref\relax
- \endgroup
- \vspace*{\hypcapspace}%
- \hc@hyperref{\let\caption\hc@caption}%
- \global\@capstarttrue
- \global\advance\csname c@\@captype\endcsname\m@ne
+ \ifcapstart
+ \H@refstepcounter\@captype % first part of caption
+ \hyper@makecurrent\@captype
+ \global\let\hc@currentHref\@currentHref
+ \vspace*{-\hypcapspace}%
+ \begingroup
+ \let\leavevmode\relax
+ \hyper@@anchor\@currentHref\relax
+ \endgroup
+ \vspace*{\hypcapspace}%
+ \hc@hyperref{\let\caption\hc@caption}%
+ \global\@capstarttrue
+ \global\advance\csname c@\@captype\endcsname\m@ne
+ \fi
}
% \end{macrocode}
% \end{macro}
@@ -680,6 +721,10 @@ and the derived files
% \item
% URLs updated.
% \end{Version}
+% \begin{Version}{2008/09/08 v1.10}
+% \item
+% \cs{capstartfalse} and \cs{capstarttrue} added.
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/inputenx.dtx b/Master/texmf-dist/source/latex/oberdiek/inputenx.dtx
index 755af8b812b..46bcc841774 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, 2007 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+% Copyright (C) 2006-2008 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
@@ -125,7 +125,7 @@
This is a generated file.
-Copyright (C) 2006, 2007 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+Copyright (C) 2006-2008 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
diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins b/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins
index 662cd624227..a682f935486 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
-% 2008/08/11
+% 2008/09/09
%
% 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 80f8d241efa..5131f126511 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}{2008/08/11}
+\newcommand*{\Date}{2008/09/09}
% Copyright (C) 2006 by
% Heiko Oberdiek <oberdiek@uni-freiburg.de>
@@ -212,11 +212,11 @@
[\entrysep]
\entry{holtxdoc}{2008/08/11}{0.11}{Private additional ltxdoc support}%
[\entrysep]
-\entry{hycolor}{2008/08/01}{1.3}{Code for color options of hyperref/bookmark}%
+\entry{hycolor}{2008/09/08}{1.4}{Code for color options of hyperref/bookmark}%
[\entrysep]
\entry{hypbmsec}{2007/04/11}{2.4}{Bookmarks in sectioning commands}%
[\entrysep]
-\entry{hypcap}{2008/08/11}{1.9}{Adjusting anchors of captions}%
+\entry{hypcap}{2008/09/08}{1.10}{Adjusting anchors of captions}%
[\entrysep]
\entry{hypdestopt}{2008/08/08}{2.2}{Hyperref destination optimizer}%
[\entrysep]