From 01a985ede67216a0656c5bf2ac6d9cfb018fa827 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 30 Mar 2015 23:04:32 +0000 Subject: undolabl (30mar15) git-svn-id: svn://tug.org/texlive/trunk@36681 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/source/latex/undolabl/undolabl.drv | 24 +- .../texmf-dist/source/latex/undolabl/undolabl.dtx | 356 ++++++++++++--------- .../texmf-dist/source/latex/undolabl/undolabl.ins | 42 ++- 3 files changed, 239 insertions(+), 183 deletions(-) (limited to 'Master/texmf-dist/source/latex/undolabl') diff --git a/Master/texmf-dist/source/latex/undolabl/undolabl.drv b/Master/texmf-dist/source/latex/undolabl/undolabl.drv index f92873d39b2..06482ee85db 100644 --- a/Master/texmf-dist/source/latex/undolabl/undolabl.drv +++ b/Master/texmf-dist/source/latex/undolabl/undolabl.drv @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: undolabl -%% Version: 2012/01/01 v1.0k +%% Version: 2015/03/29 v1.0l %% -%% Copyright (C) 2010 - 2012 by +%% Copyright (C) 2010 - 2015 by %% H.-Martin M"unch %% Portions of code copyrighted by other people as marked. %% @@ -34,9 +34,10 @@ %% %% The Current Maintainer of this work is H.-Martin Muench. %% -%% The main code of this package was invented by Ulrich Diez -%% (eu_angelion AT web DOT de) and first published in the comp.text.tex -%% newsgroup at Sun, 20 Apr 2008 16:39:26 +0200, with subject: +%% The main code of this package was invented by +%% Ulrich Diez (eu_angelion AT web DOT de) +%% and first published in the comp.text.tex newsgroup +%% at Sun, 20 Apr 2008 16:39:26 +0200, with subject: %% Re: How to undefine/overwrite a label? (see e.g. %% http://groups.google.de/group/comp.text.tex/msg/af6cfe93917097da?dmode=source %% ). While Ulrich Diez neither wanted to create a package himself yet @@ -49,11 +50,16 @@ %% undolabl.ins, undolabl.drv, %% undolabl-example.tex, undolabl-example.pdf. %% -\NeedsTeXFormat{LaTeX2e}[2011/06/27] +%% In memoriam +%% Claudia Simone Barth + 1996/01/30 +%% Tommy Muench + 2014/01/02 +%% Hans-Klaus Muench + 2014/08/24 +%% +\NeedsTeXFormat{LaTeX2e}[2014/05/01] \ProvidesFile{undolabl.drv}% - [2012/01/01 v1.0k Overriding labels (HMM)] -\documentclass{ltxdoc}[2007/11/11]% v2.0u -\usepackage{holtxdoc}[2011/02/04]% v0.21 + [2015/03/29 v1.0l Overriding labels (HMM)] +\documentclass{ltxdoc}[2014/09/29]% v2.0u +\usepackage{holtxdoc}[2012/03/21]% v0.24 %% undolabl may work with earlier versions of LaTeX2e and those %% class and package, but this was not tested. %% Please consider updating your LaTeX, class, and package diff --git a/Master/texmf-dist/source/latex/undolabl/undolabl.dtx b/Master/texmf-dist/source/latex/undolabl/undolabl.dtx index c8dcfc951dc..180876aefde 100644 --- a/Master/texmf-dist/source/latex/undolabl/undolabl.dtx +++ b/Master/texmf-dist/source/latex/undolabl/undolabl.dtx @@ -1,15 +1,15 @@ % \iffalse meta-comment % % File: undolabl.dtx -% Version: 2012/01/01 v1.0k +% Version: 2015/03/29 v1.0l % -% Copyright (C) 2010 - 2012 by +% Copyright (C) 2010 - 2015 by % H.-Martin M"unch % Portions of code copyrighted by other people as marked. % -% The main code of this package was invented by -% Ulrich Diez (eu_angelion AT web DOT de) and first published in the -% comp.text.tex newsgroup at Sun, 20 Apr 2008 16:39:26 +0200, with subject: +% The main code of this package was invented by Ulrich Diez +% and first published in the comp.text.tex newsgroup +% at Sun, 20 Apr 2008 16:39:26 +0200, with subject: % Re: How to undefine/overwrite a label? (see e.g. % http://groups.google.de/group/comp.text.tex/msg/af6cfe93917097da?dmode=source % ). While Ulrich Diez neither wanted to create a package himself yet @@ -36,48 +36,12 @@ % undolabl.ins, undolabl.drv, % undolabl-example.tex, undolabl-example.pdf. % -% Distribution: -% CTAN:macros/latex/contrib/undolabl/undolabl.dtx -% CTAN:macros/latex/contrib/undolabl/undolabl.pdf -% CTAN:install/macros/latex/contrib/undolabl.tds.zip -% -% Cf. http://ctan.org/pkg/undolabl and -% http://www.tex.ac.uk/tex-archive/help/Catalogue/entries/undolabl.html -% -% Unpacking: -% (a) If undolabl.ins is present: -% tex undolabl.ins -% (b) Without undolabl.ins: -% tex undolabl.dtx -% (c) If you insist on using LaTeX -% latex \let\install=y\input{undolabl.dtx} -% (quote the arguments according to the demands of your shell) -% -% Documentation: -% (a) If undolabl.drv is present: -% (pdf)latex undolabl.drv -% makeindex -s gind.ist undolabl.idx -% (pdf)latex undolabl.drv -% makeindex -s gind.ist undolabl.idx -% (pdf)latex undolabl.drv -% (b) Without undolabl.drv: -% (pdf)latex undolabl.dtx -% makeindex -s gind.ist undolabl.idx -% (pdf)latex undolabl.dtx -% makeindex -s gind.ist undolabl.idx -% (pdf)latex undolabl.dtx -% -% The class ltxdoc loads the configuration file ltxdoc.cfg -% if available. Here you can specify further options, e.g. -% use DIN A4 as paper format: -% \PassOptionsToClass{a4paper}{article} -% -% Installation: -% TDS:tex/latex/undolabl/undolabl.sty -% TDS:doc/latex/undolabl/undolabl.pdf -% TDS:doc/latex/undolabl/undolabl-example.tex -% TDS:doc/latex/undolabl/undolabl-example.pdf -% TDS:source/latex/undolabl/undolabl.dtx +% 'undolabl' is available on CTAN: +% https://www.ctan.org/pkg/undolabl +% +% Also a TDS.ZIP file is provided that contains all the files +% already sorted in a TDS tree: +% http://mirrors.ctan.org/install/macros/latex/contrib/undolabl.tds.zip % %<*ignore> \begingroup @@ -92,10 +56,10 @@ % %<*install> \input docstrip.tex -\Msg{**************************************************************} -\Msg{* Installation *} -\Msg{* Package: undolabl 2012/01/01 v1.0k Overriding labels (HMM) *} -\Msg{**************************************************************} +\Msg{************************************************************} +\Msg{* Installation} +\Msg{* Package: undolabl 2015/03/29 v1.0l Overriding labels (HMM)} +\Msg{************************************************************} \keepsilent \askforoverwritefalse @@ -106,9 +70,9 @@ This is a generated file. Project: undolabl -Version: 2012/01/01 v1.0k +Version: 2015/03/29 v1.0l -Copyright (C) 2010 - 2012 by +Copyright (C) 2010 - 2015 by H.-Martin M"unch Portions of code copyrighted by other people as marked. @@ -131,9 +95,10 @@ This work has the LPPL maintenance status "maintained". The Current Maintainer of this work is H.-Martin Muench. -The main code of this package was invented by Ulrich Diez -(eu_angelion AT web DOT de) and first published in the comp.text.tex -newsgroup at Sun, 20 Apr 2008 16:39:26 +0200, with subject: +The main code of this package was invented by +Ulrich Diez (eu_angelion AT web DOT de) +and first published in the comp.text.tex newsgroup +at Sun, 20 Apr 2008 16:39:26 +0200, with subject: Re: How to undefine/overwrite a label? (see e.g. http://groups.google.de/group/comp.text.tex/msg/af6cfe93917097da?dmode=source ). While Ulrich Diez neither wanted to create a package himself yet @@ -146,6 +111,11 @@ the README, and the derived files undolabl.ins, undolabl.drv, undolabl-example.tex, undolabl-example.pdf. +In memoriam + Claudia Simone Barth + 1996/01/30 + Tommy Muench + 2014/01/02 + Hans-Klaus Muench + 2014/08/24 + \endpreamble \let\MetaPrefix\DoubleperCent @@ -165,7 +135,7 @@ the README, and the derived files \Msg{* To finish the installation you have to move the following} \Msg{* file into a directory searched by TeX:} \Msg{*} -\Msg{* undolabl.sty} +\Msg{* undolabl.sty} \Msg{*} \Msg{* To produce the documentation run the file `undolabl.drv'} \Msg{* through (pdf)LaTeX, e.g.} @@ -191,7 +161,7 @@ the README, and the derived files % \section{The documentation driver file} % % The next bit of code contains the documentation driver file for -% \TeX{}, i.\,e., the file that will produce the documentation you +% \TeX , i.\,e., the file that will produce the documentation you % are currently reading. It will be extracted from this file by the % \texttt{docstrip} programme. That is, run \LaTeX{} on \texttt{docstrip} % and specify the \texttt{driver} option when \texttt{docstrip} @@ -199,11 +169,11 @@ the README, and the derived files % % \begin{macrocode} %<*driver> -\NeedsTeXFormat{LaTeX2e}[2011/06/27] +\NeedsTeXFormat{LaTeX2e}[2014/05/01] \ProvidesFile{undolabl.drv}% - [2012/01/01 v1.0k Overriding labels (HMM)] -\documentclass{ltxdoc}[2007/11/11]% v2.0u -\usepackage{holtxdoc}[2011/02/04]% v0.21 + [2015/03/29 v1.0l Overriding labels (HMM)] +\documentclass{ltxdoc}[2014/09/29]% v2.0u +\usepackage{holtxdoc}[2012/03/21]% v0.24 %% undolabl may work with earlier versions of LaTeX2e and those %% class and package, but this was not tested. %% Please consider updating your LaTeX, class, and package @@ -237,7 +207,7 @@ the README, and the derived files % % \fi % -% \CheckSum{79} +% \CheckSum{107} % % \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 @@ -272,7 +242,7 @@ the README, and the derived files % }%^^A % \expandafter\endgroup\x % -% \DoNotIndex{\\} +% \DoNotIndex{\",\-,\,,\\,\noindent} % \DoNotIndex{\documentclass,\usepackage,\ProvidesPackage,\begin,\end} % \DoNotIndex{\MessageBreak} % \DoNotIndex{\NeedsTeXFormat,\DoNotIndex,\verb} @@ -287,13 +257,13 @@ the README, and the derived files % \DoNotIndex{\Large} % % \title{The \xpackage{undolabl} package} -% \date{2012/01/01 v1.0k} +% \date{2015/03/29 v1.0l} % \author{H.-Martin M\"{u}nch\\\xemail{Martin.Muench at Uni-Bonn.de}} % % \maketitle % % \begin{abstract} -% This \LaTeX{} package allows to override existing labels, +% \noindent This \LaTeX{} package allows to override existing labels, % especially automatically generated ones. % \end{abstract} % @@ -306,13 +276,13 @@ the README, and the derived files % updated by removing the second argument of |\undonewlabel|, i.\,e. the |{\on@line}|.\\ % % \noindent Note: The main code of this package was invented by\\ -% \textbf{ULRICH DIEZ} (\texttt{eu\_angelion@web.de})\\ +% \textbf{ULRICH DIEZ}\\ % and first published in the \Newsgroup{comp.text.tex} newsgroup at\\ % \texttt{Sun,~20~Apr~2008~16:39:26~+0200}, with subject:\\ % \texttt{Re:~How~to~undefine/overwrite~a~label?} (see e.\,g. -% \url{http://groups.google.de/group/comp.text.tex/msg/af6cfe93917097da?dmode=source} +% \url{http://groups.google.de/group/comp.text.tex/msg/af6cfe93917097da?dmode=source}% % ).\\ -% While \textsc{Ulrich Diez} neither wanted to create a~package himself yet +% While \textbf{ULRICH DIEZ} neither wanted to create a~package himself yet % nor have one published under his name, he granted the publication of his code. % Therefore: Thanks! % I submitted this package to CTAN (after some updates of the documentation, @@ -468,7 +438,7 @@ the README, and the derived files % changed although that might not be a correct statement. % \end{description} % -% \textsc{Ulrich Diez} decided to catch this up by his |\undolabl@testdef| command. +% \textbf{ULRICH DIEZ} decided to catch this up by his |\undolabl@testdef| command. % The |\undolabl@testdef|-comparison-mechanism gets enhanced via % \textquotedblleft replacing\textquotedblright{}. This works as follows: % When the \xfile{.aux} file is read at the beginning of the \LaTeX{}-run, @@ -503,8 +473,7 @@ the README, and the derived files % \begin{macrocode} %<*example> \documentclass[british]{article}[2007/10/19]% v1.4h -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\usepackage{undolabl}[2012/01/01]% v1.0k +\usepackage{undolabl}[2015/03/29]% v1.0l %% There are no options for the undolabl package. %% \usepackage[% extension=pdf,% @@ -520,7 +489,7 @@ the README, and the derived files pdfstartview=FitH,% pdfpagelayout=OneColumn,% bookmarksopen=true% -]{hyperref}[2011/12/04]% v6.82m; when you want to use nameref +]{hyperref}[2012/11/06]% v6.83m; when you want to use nameref \gdef\unit#1{\mathord{\thinspace\mathrm{#1}}}% \listfiles \begin{document} @@ -528,7 +497,7 @@ the README, and the derived files \section*{Example for undolabl} This example demonstrates the use of package\newline -\textsf{undolabl}, v1.0k as of 2012/01/01 (HMM).\newline +\textsf{undolabl}, v1.0l as of 2015/03/29 (HMM).\newline For details please see the documentation!\newline \noindent Save per page about $200\unit{ml}$~water, @@ -592,9 +561,9 @@ name-reference: \nameref{testlabel}%% -> Still another test % \end{macrocode} % % \begin{macrocode} -\NeedsTeXFormat{LaTeX2e}[2011/06/27] -\ProvidesPackage{undolabl}[2012/01/01 v1.0k - Overriding labels (HMM)] +\NeedsTeXFormat{LaTeX2e}[2014/05/01] +\ProvidesPackage{undolabl}% + [2015/03/29 v1.0l Overriding labels (HMM)] %% undolabl may work with earlier versions of LaTeX2e, %% but this was not tested. Please consider updating %% your LaTeX2e to the most recent version @@ -602,8 +571,79 @@ name-reference: \nameref{testlabel}%% -> Still another test % \end{macrocode} % +% \begin{macro}{\AtBeginDocument} +% +% |\AtBeginDocument| it is checked whether writing to files is allowed. +% Some packages (e.\,g. \xpackage{tikz} and \xpackage{selectp}) sometimes prevent +% the output to the \xfile{aux} file. In that case a warning or an error message +% is issued. This is no problem as long as there is/was another compilation run +% where the labels can/could be processed via the \xfile{aux} file. +% +% \begin{macrocode} +\AtBeginDocument{% + \if@filesw% +% \end{macrocode} +% +% \noindent then |\relax|.\newline +% When writing to files is not allowed, nothing can be done. But when +% the labels were already processed via the \xfile{aux} file, +% nothing needs to be done (if enough compilation runs have been done before). +% +% \begin{macrocode} + \else% + \@ifpackageloaded{tikz}{% + \PackageWarning{undolabl}% + {The undolabl package was not allowed to write to an\MessageBreak% + .aux file. This package does not work without access\MessageBreak% + to an .aux file.\MessageBreak% + It is OK if the .aux file was already updated\MessageBreak% + by a previouse compiler run\MessageBreak% + and would not have changed anyway.\MessageBreak% + }% + }{\PackageError{undolabl}{No writing to auxiliary file allowed}% + {The undolabl package was not allowed to write to an .aux file.\MessageBreak% + This package does not work without access to an .aux file.\MessageBreak% + Press Ctrl+Z to exit.\MessageBreak% + But it is OK if the .aux file was already updated\MessageBreak% + by a previouse compiler run\MessageBreak% + and would not have changed anyway.\MessageBreak% + }% + }% + \fi% +% \end{macrocode} +% +% \newpage +% +% The \textsf{undolabl} and the \textsf{acronym} packages shared some commands +% with the same names and where therefore incompatible. \textsc{Jan Heisswolf} +% (ITIV at KIT) reported this in 2014 (Thanks!). Changing the macros in the +% \textsf{undolabl} package also required changing them in the \textsf{pageslts} +% package and providing a fallback mechanism for the old commands used in +% existing \xfile{.aux} files. When I wanted to implement this in 2015, +% it turned out the \textsf{acronym} package had been updated a week before +% (Thanks!) and fixed the incompatibility. Now what remained to be done +% was just to check that no older acronym package is used: +% +% \begin{macrocode} + \@ifpackageloaded{acronym}% + {\@ifpackagelater{acronym}{2015/03/20}% + {% later, OK + }{\PackageError{undolabl}{Incompatible old acronym package detected}% + {The undolabl package is not compatible with the acronym package% + \MessageBreak% + older than 2015/03/21 v1.41. Please update your acronym package!% + \MessageBreak% + }% + }% + }{% not loaded, OK + }% + } + +% \end{macrocode} +% \end{macro} +% % \DescribeMacro{\overridelabel} -% In order to override a label, first you need to write to the +% In order to override a label, first one needs to write to the % \xfile{.aux} file to silently undefine the associated |\r@