From d920a872558b4a7a19e0af8b459cacbe0f8e4017 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 31 Jan 2024 20:58:14 +0000 Subject: refstyle (31jan24) git-svn-id: svn://tug.org/texlive/trunk@69648 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/refstyle/README | 2 +- Master/texmf-dist/doc/latex/refstyle/refconfig.pdf | Bin 292980 -> 303725 bytes Master/texmf-dist/doc/latex/refstyle/refstyle.pdf | Bin 484262 -> 485427 bytes .../texmf-dist/source/latex/refstyle/refconfig.dtx | 33 ++-- .../texmf-dist/source/latex/refstyle/refstyle.dtx | 21 ++- .../texmf-dist/source/latex/refstyle/refstyle.ins | 189 ++++++++++----------- Master/texmf-dist/tex/latex/refstyle/refstyle.cfg | 18 +- Master/texmf-dist/tex/latex/refstyle/refstyle.sty | 15 +- 8 files changed, 134 insertions(+), 144 deletions(-) diff --git a/Master/texmf-dist/doc/latex/refstyle/README b/Master/texmf-dist/doc/latex/refstyle/README index 158c69fa150..93d23dc15e1 100644 --- a/Master/texmf-dist/doc/latex/refstyle/README +++ b/Master/texmf-dist/doc/latex/refstyle/README @@ -11,7 +11,7 @@ The package provides a user interface to define sets of reference and label commands for each referable object such as an equation or a table, etc. -Copyright: 2002--2010 Danie Els +Copyright: 2002--2024 Danie Els Licence: LPPL FILES IN DISTRIBUTION diff --git a/Master/texmf-dist/doc/latex/refstyle/refconfig.pdf b/Master/texmf-dist/doc/latex/refstyle/refconfig.pdf index f4dcb8d15a2..c16ae09cca4 100644 Binary files a/Master/texmf-dist/doc/latex/refstyle/refconfig.pdf and b/Master/texmf-dist/doc/latex/refstyle/refconfig.pdf differ diff --git a/Master/texmf-dist/doc/latex/refstyle/refstyle.pdf b/Master/texmf-dist/doc/latex/refstyle/refstyle.pdf index 0e94b7db283..a7bc4632952 100644 Binary files a/Master/texmf-dist/doc/latex/refstyle/refstyle.pdf and b/Master/texmf-dist/doc/latex/refstyle/refstyle.pdf differ diff --git a/Master/texmf-dist/source/latex/refstyle/refconfig.dtx b/Master/texmf-dist/source/latex/refstyle/refconfig.dtx index 1d646e4a921..22a675b8ac2 100644 --- a/Master/texmf-dist/source/latex/refstyle/refconfig.dtx +++ b/Master/texmf-dist/source/latex/refstyle/refconfig.dtx @@ -1,7 +1,7 @@ % \iffalse % % refconfig.dtx -% Copyright (C) 2002--2010 Danie Els +% Copyright (C) 2002--2024 Danie Els % % ------------------------------------------------------------------- % The refstyle package @@ -13,10 +13,11 @@ % of this license is in % http://www.latex-project.org/lppl.txt % and version 1.3c or later is part of all distributions of LaTeX -% version 2005/12/01 or later. +% version 2008/12/01 or later. % -% This work is "maintained" (as per LPPL maintenance status) -% by Danie Els (dnjels@sun.ac.za). +% This work has the LPPL maintenance status 'maintained'. +% +% This Current Maintainer of this work is Danie Els (dnjels@gmail.com) % % This package consists of the files: refstyle.dtx % refconfig.dtx @@ -25,7 +26,6 @@ % refstyle.cfg % ------------------------------------------------------------------- % -% %<*driver> \documentclass[a4paper]{ltxdoc} \EnableCrossrefs @@ -91,7 +91,7 @@ % % \fi % -% \CheckSum{1098} +% \CheckSum{1092} % % \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 @@ -114,6 +114,7 @@ % \changes{v0.3}{2006/09/07}{Documentation update} % \changes{v0.4}{2010/10/21}{Add \cmd{\RSlsttwotxt} for lists} % \changes{v0.5}{2010/11/02}{Bug fixes} +% \changes{v0.6}{2024/01/31}{robustification of AMS' \cmd{\eqref}} % % \DoNotIndex{ % \",\@chapapp,\@ifpackageloaded,\AtBeginDocument, @@ -131,9 +132,7 @@ % \fileversion, last revised % \filedate.}} % \author{Danie Els\\[1ex] -% \small Department of Mechanical and Mechatroncs Engineering\\ -% \small University of Stellenbosch, South Africa.\\ -% \normalsize e-mail: \texttt{dnjels@sun.ac.za}} +% \normalsize e-mail: \texttt{dnjels@gmail}} % \date{\filedate} % \maketitle % @@ -185,8 +184,8 @@ % \subsection{Identification} % \begin{RSframed} % \begin{macrocode} -\ProvidesFile{refstyle.cfg}[2010/11/02\space - 0.5\space +\ProvidesFile{refstyle.cfg}[2024/01/31\space + v0.6\space Configuration file for refstyle (DNJ Els)] % \end{macrocode} % \end{RSframed} @@ -996,10 +995,9 @@ % If \pkg{amsmath.sty} is loaded, store \cmd{\eqref} % and then undefine it before the template is created. % \begin{macrocode} -\@ifpackageloaded{amsmath}% - {\let\AMSeqref\eqref - \let\eqref\relax}% - {} +\AddToHook{package/amsmath/after}% + {\NewCommandCopy\AMSeqref\eqref + \RS@removedef{eqref}}% % \end{macrocode} % \begin{macrocode} \newref{eq}{% @@ -1023,9 +1021,8 @@ % \begin{macrocode} \AtBeginDocument{% \@ifpackageloaded{amsmath}% - {\RS@ifundefined{AMSeqref}{\let\AMSeqref\eqref}{}% - \let\RSeqrefform\AMSeqref}% - {}% + {\DeclareCommandCopy\RSeqrefform\AMSeqref}% + {}% \let\eqref=\RSeqref } % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/refstyle/refstyle.dtx b/Master/texmf-dist/source/latex/refstyle/refstyle.dtx index 46fa9e3c66c..1b5b6509d6d 100644 --- a/Master/texmf-dist/source/latex/refstyle/refstyle.dtx +++ b/Master/texmf-dist/source/latex/refstyle/refstyle.dtx @@ -1,7 +1,7 @@ % \iffalse % % refstyle.dtx -% Copyright (C) 2002--2010 Danie Els +% Copyright (C) 2002--2024 Danie Els % % ------------------------------------------------------------------- % The refstyle package @@ -13,10 +13,11 @@ % of this license is in % http://www.latex-project.org/lppl.txt % and version 1.3c or later is part of all distributions of LaTeX -% version 2005/12/01 or later. +% version 2008/12/01 or later. % -% This work is "maintained" (as per LPPL maintenance status) -% by Danie Els (dnjels@sun.ac.za). +% This work has the LPPL maintenance status 'maintained'. +% +% This Current Maintainer of this work is Danie Els (dnjels@gmail.com) % % This package consists of the files: refstyle.dtx % refconfig.dtx @@ -26,8 +27,8 @@ % ------------------------------------------------------------------- % %<*pkg> -\newcommand*{\RefstyleFileDate}{2010/11/02} -\newcommand*{\RefstyleFileVersion}{v0.5} +\newcommand*{\RefstyleFileDate}{2024/01/31} +\newcommand*{\RefstyleFileVersion}{v0.6} % % % @@ -234,10 +235,8 @@ % \fileversion, last revised % \filedate.}} % \author{Danie Els\\[1ex] -% \small Department of Mechanical and Mechatronics Engineering\\ -% \small University of Stellenbosch, South Africa.\\ -% \normalsize e-mail: \texttt{\href{mailto:dnjels@sun.ac.za}% -% {dnjels@sun.ac.za}}} +% \normalsize e-mail: \texttt{\href{mailto:dnjels@gmail.com}% +% {dnjels@gmail.com}}} % \date{\filedate} % \maketitle % \begin{center} @@ -1078,7 +1077,7 @@ % \subsection{Identification} % \begin{macrocode} %<*pkg> -\NeedsTeXFormat{LaTeX2e}[1999/12/01] +\NeedsTeXFormat{LaTeX2e} \ProvidesPackage{refstyle}[\RefstyleFileDate\space \RefstyleFileVersion\space Reference formatting (DNJ Els)] diff --git a/Master/texmf-dist/source/latex/refstyle/refstyle.ins b/Master/texmf-dist/source/latex/refstyle/refstyle.ins index ced9ef97226..5d69497509d 100644 --- a/Master/texmf-dist/source/latex/refstyle/refstyle.ins +++ b/Master/texmf-dist/source/latex/refstyle/refstyle.ins @@ -1,97 +1,92 @@ -% refstyle.ins -% Copyright (C) 2002--2010 Danie Els -% -% ------------------------------------------------------------------- -% The refstyle package -% for the formatting of references -% ------------------------------------------------------------------- -% This work may be distributed and/or modified under the conditions -% of the LaTeX Project Public License, either version 1.3c of this -% license or (at your option) any later version. The latest version -% of this license is in -% http://www.latex-project.org/lppl.txt -% and version 1.3c or later is part of all distributions of LaTeX -% version 2005/12/01 or later. -% -% This work is "maintained" (as per LPPL maintenance status) -% by Danie Els (dnjels@sun.ac.za). -% -% This package consists of the files: refstyle.dtx -% refconfig.dtx -% refstyle.ins -% and the derived files: refstyle.sty -% refstyle.cfg -% ------------------------------------------------------------------- -% This file will generate fast loadable files and documentation -% driver files from the doc files in this package when run through -% LaTeX or TeX. -% ------------------------------------------------------------------- - -\def\batchfile{refstyle.ins} -\def\filedate{2010/10/21} -\input docstrip.tex -\keepsilent - -\declarepreamble\package - -Copyright (C) 2002--2010 Danie Els - -------------------------------------------------------------------- - The refstyle package - for the formatting of references -------------------------------------------------------------------- -This work may be distributed and/or modified under the conditions -of the LaTeX Project Public License, either version 1.3c of this -license or (at your option) any later version. The latest version -of this license is in - http://www.latex-project.org/lppl.txt -and version 1.3c or later is part of all distributions of LaTeX -version 2005/12/01 or later. - -This work is "maintained" (as per LPPL maintenance status) -by Danie Els (dnjels@sun.ac.za). -------------------------------------------------------------------- - -\endpreamble - -\generate{% - \askforoverwritefalse - \usepreamble\package - \file{refstyle.sty}{\from{refstyle.dtx}{pkg}}} - - - - -\declarepreamble\config - -------------------------------------------------------------------- - The refstyle package - for the formatting of references -------------------------------------------------------------------- -This file may be customized to suit specific user requirements. - -Original by Danie Els -------------------------------------------------------------------- - -\endpreamble -\generate{% - \askforoverwritefalse - \usepreamble\config - \file{refstyle.cfg}{\from{refconfig.dtx}{cfg}}} - - -\obeyspaces -\Msg{**********************************************************} -\Msg{* *} -\Msg{* To finish the installation you have to move the *} -\Msg{* following files into a directory searched by TeX: *} -\Msg{* *} -\Msg{* refstyle.sty *} -\Msg{* refstyle.cfg *} -\Msg{* *} -\Msg{* To produce the documentation run the file ustitle.dtx *} -\Msg{* through LaTeX. *} -\Msg{* *} -\Msg{* Happy TeXing! *} -\Msg{**********************************************************} -\endbatchfile +% refstyle.ins +% Copyright (C) 2002--2024 Danie Els +% +% ------------------------------------------------------------------- +% The refstyle package +% for the formatting of references +% ------------------------------------------------------------------- +% This work may be distributed and/or modified under the conditions +% of the LaTeX Project Public License, either version 1.3c of this +% license or (at your option) any later version. The latest version +% of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3c or later is part of all distributions of LaTeX +% version 2008/12/01 or later. +% +% This work has the LPPL maintenance status 'maintained'. +% +% This Current Maintainer of this work is Danie Els (dnjels@gmail.com) +% +% This package consists of the files: refstyle.dtx +% refconfig.dtx +% refstyle.ins +% and the derived files: refstyle.sty +% refstyle.cfg +% ------------------------------------------------------------------- + +\def\batchfile{refstyle.ins} +\def\filedate{2024/01/31} +\input docstrip.tex +\keepsilent + +\declarepreamble\package + +Copyright (C) 2002--2024 Danie Els + +------------------------------------------------------------------- + The refstyle package + for the formatting of references +------------------------------------------------------------------- +This work may be distributed and/or modified under the conditions +of the LaTeX Project Public License, either version 1.3c of this +license or (at your option) any later version. The latest version +of this license is in + http://www.latex-project.org/lppl.txt +and version 1.3c or later is part of all distributions of LaTeX +version 2008/12/01 or later. + +This work has the LPPL maintenance status 'maintained'. + +This Current Maintainer of this work is Danie Els (dnjels@gmail.com) +------------------------------------------------------------------- + +\endpreamble + +\generate{% + \askforoverwritefalse + \usepreamble\package + \file{refstyle.sty}{\from{refstyle.dtx}{pkg}}} + + +\declarepreamble\config + +------------------------------------------------------------------- + The refstyle package + for the formatting of references +------------------------------------------------------------------- +This file may be customized to suit specific user requirements. + +Original by Danie Els (dnjels@gmail.com) +------------------------------------------------------------------- + +\endpreamble +\generate{% + \askforoverwritefalse + \usepreamble\config + \file{refstyle.cfg}{\from{refconfig.dtx}{cfg}}} + + +\obeyspaces +\Msg{*************************************************************} +\Msg{* To finish the installation you have to move the *} +\Msg{* following files into a directory searched by TeX: *} +\Msg{* refstyle.sty *} +\Msg{* refstyle.cfg *} +\Msg{* *} +\Msg{* To produce the documentation run through LaTeX the files: *} +\Msg{* refstyle.dtx *} +\Msg{* refconfig.dtx *} +\Msg{* *} +\Msg{* Happy TeXing! *} +\Msg{*************************************************************} +\endbatchfile diff --git a/Master/texmf-dist/tex/latex/refstyle/refstyle.cfg b/Master/texmf-dist/tex/latex/refstyle/refstyle.cfg index 11ad74d2bee..031a2aac185 100644 --- a/Master/texmf-dist/tex/latex/refstyle/refstyle.cfg +++ b/Master/texmf-dist/tex/latex/refstyle/refstyle.cfg @@ -12,11 +12,11 @@ %% ------------------------------------------------------------------- %% This file may be customized to suit specific user requirements. %% -%% Original by Danie Els +%% Original by Danie Els (dnjels@gmail.com) %% ------------------------------------------------------------------- %% -\ProvidesFile{refstyle.cfg}[2010/11/02\space - 0.5\space +\ProvidesFile{refstyle.cfg}[2024/01/31\space + v0.6\space Configuration file for refstyle (DNJ Els)] %%-- ENGLISH ------------------------------------ \newcommand\RSukenglish{% @@ -511,10 +511,9 @@ lsttxt = \RSlsttxt} %%-- TEMPLATE FOR EQUATIONS --------------------- \newcommand*{\RSeqrefform}[1]{\textup{(\ref{#1})}} -\@ifpackageloaded{amsmath}% - {\let\AMSeqref\eqref - \let\eqref\relax}% - {} +\AddToHook{package/amsmath/after}% + {\NewCommandCopy\AMSeqref\eqref + \RS@removedef{eqref}}% \newref{eq}{% name = \RSeqtxt, names = \RSeqstxt, @@ -528,9 +527,8 @@ \let\eqref\relax \AtBeginDocument{% \@ifpackageloaded{amsmath}% - {\RS@ifundefined{AMSeqref}{\let\AMSeqref\eqref}{}% - \let\RSeqrefform\AMSeqref}% - {}% + {\DeclareCommandCopy\RSeqrefform\AMSeqref}% + {}% \let\eqref=\RSeqref } %%-- TEMPLATE FOR FIGURES ----------------------- diff --git a/Master/texmf-dist/tex/latex/refstyle/refstyle.sty b/Master/texmf-dist/tex/latex/refstyle/refstyle.sty index b482db84d9b..9bb88debe82 100644 --- a/Master/texmf-dist/tex/latex/refstyle/refstyle.sty +++ b/Master/texmf-dist/tex/latex/refstyle/refstyle.sty @@ -6,7 +6,7 @@ %% %% refstyle.dtx (with options: `pkg') %% -%% Copyright (C) 2002--2010 Danie Els +%% Copyright (C) 2002--2024 Danie Els %% %% ------------------------------------------------------------------- %% The refstyle package @@ -18,16 +18,17 @@ %% of this license is in %% http://www.latex-project.org/lppl.txt %% and version 1.3c or later is part of all distributions of LaTeX -%% version 2005/12/01 or later. +%% version 2008/12/01 or later. %% -%% This work is "maintained" (as per LPPL maintenance status) -%% by Danie Els (dnjels@sun.ac.za). +%% This work has the LPPL maintenance status 'maintained'. +%% +%% This Current Maintainer of this work is Danie Els (dnjels@gmail.com) %% ------------------------------------------------------------------- %% -\newcommand*{\RefstyleFileDate}{2010/11/02} -\newcommand*{\RefstyleFileVersion}{v0.5} +\newcommand*{\RefstyleFileDate}{2024/01/31} +\newcommand*{\RefstyleFileVersion}{v0.6} -\NeedsTeXFormat{LaTeX2e}[1999/12/01] +\NeedsTeXFormat{LaTeX2e} \ProvidesPackage{refstyle}[\RefstyleFileDate\space \RefstyleFileVersion\space Reference formatting (DNJ Els)] -- cgit v1.2.3