summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/refstyle/refconfig.pdfbin292010 -> 292980 bytes
-rw-r--r--Master/texmf-dist/doc/latex/refstyle/refstyle.pdfbin482559 -> 484262 bytes
-rw-r--r--Master/texmf-dist/source/latex/refstyle/refconfig.dtx87
-rw-r--r--Master/texmf-dist/source/latex/refstyle/refstyle.dtx144
-rw-r--r--Master/texmf-dist/source/latex/refstyle/refstyle.ins194
-rw-r--r--Master/texmf-dist/tex/latex/refstyle/refstyle.cfg86
-rw-r--r--Master/texmf-dist/tex/latex/refstyle/refstyle.sty75
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds1
8 files changed, 312 insertions, 275 deletions
diff --git a/Master/texmf-dist/doc/latex/refstyle/refconfig.pdf b/Master/texmf-dist/doc/latex/refstyle/refconfig.pdf
index ce75cf1db9e..f4dcb8d15a2 100644
--- a/Master/texmf-dist/doc/latex/refstyle/refconfig.pdf
+++ b/Master/texmf-dist/doc/latex/refstyle/refconfig.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/refstyle/refstyle.pdf b/Master/texmf-dist/doc/latex/refstyle/refstyle.pdf
index 98dae1a413f..0e94b7db283 100644
--- a/Master/texmf-dist/doc/latex/refstyle/refstyle.pdf
+++ b/Master/texmf-dist/doc/latex/refstyle/refstyle.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/refstyle/refconfig.dtx b/Master/texmf-dist/source/latex/refstyle/refconfig.dtx
index a4e871eeeab..1d646e4a921 100644
--- a/Master/texmf-dist/source/latex/refstyle/refconfig.dtx
+++ b/Master/texmf-dist/source/latex/refstyle/refconfig.dtx
@@ -113,6 +113,7 @@
% \changes{v0.2}{2003/07/30}{Updated version}
% \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}
%
% \DoNotIndex{
% \",\@chapapp,\@ifpackageloaded,\AtBeginDocument,
@@ -184,8 +185,8 @@
% \subsection{Identification}
% \begin{RSframed}
% \begin{macrocode}
-\ProvidesFile{refstyle.cfg}[2010/10/21\space
- 0.4\space
+\ProvidesFile{refstyle.cfg}[2010/11/02\space
+ 0.5\space
Configuration file for refstyle (DNJ Els)]
% \end{macrocode}
% \end{RSframed}
@@ -207,36 +208,36 @@
\def\RSlsttxt{, and~}%............... List more: figures 5, 6, and 7
\def\RSparttxt{Part~}%............... Part lowercase singular
\def\RSpartstxt{Parts~}%............. lowercase plural
- \def\RSParttxt{Part~}%............... uppercase singular
- \def\RSPartstxt{Parts~}%............. uppercase plural
+ \def\RSParttxt{Part~}%............... uppercase singular (sentence start)
+ \def\RSPartstxt{Parts~}%............. uppercase plural (sentence start)
\def\RSappendixname{appendix~}%...... Appendix lowercase singular
- \def\RSAppendixname{Appendix~}%...... lowercase plural
- \def\RSappendicesname{appendices~}%.. uppercase singular
- \def\RSAppendicesname{Appendices~}%.. uppercase plural
+ \def\RSappendicesname{appendices~}%.. lowercase plural
+ \def\RSAppendixname{Appendix~}%...... uppercase singular (sentence start)
+ \def\RSAppendicesname{Appendices~}%.. uppercase plural (sentence start)
\def\RSchaptername{chapter~}%........ Chapter lowercase singular
- \def\RSChaptername{Chapter~}%........ lowercase plural
- \def\RSchaptersname{chapters~}%...... uppercase singular
- \def\RSChaptersname{Chapters~}%...... uppercase plural
+ \def\RSchaptersname{chapters~}%...... lowercase plural
+ \def\RSChaptername{Chapter~}%........ uppercase singular (sentence start)
+ \def\RSChaptersname{Chapters~}%...... uppercase plural (sentence start)
\def\RSsectxt{section~}%............. Section lowercase singular
\def\RSsecstxt{sections~}%........... lowercase plural
- \def\RSSectxt{Section~}%............. uppercase singular
- \def\RSSecstxt{Sections~}%........... uppercase plural
+ \def\RSSectxt{Section~}%............. uppercase singular (sentence start)
+ \def\RSSecstxt{Sections~}%........... uppercase plural (sentence start)
\def\RSeqtxt{equation~}%............. Equation lowercase singular
\def\RSeqstxt{equations~}%........... lowercase plural
- \def\RSEqtxt{Equation~}%............. uppercase singular
- \def\RSEqstxt{Equations~}%........... uppercase plural
+ \def\RSEqtxt{Equation~}%............. uppercase singular (sentence start)
+ \def\RSEqstxt{Equations~}%........... uppercase plural (sentence start)
\def\RSfigtxt{figure~}%.............. Figure lowercase singular
\def\RSfigstxt{figures~}%............ lowercase plural
- \def\RSFigtxt{Figure~}%.............. uppercase singular
- \def\RSFigstxt{Figures~}%............ uppercase plural
+ \def\RSFigtxt{Figure~}%.............. uppercase singular (sentence start)
+ \def\RSFigstxt{Figures~}%............ uppercase plural (sentence start)
\def\RStabtxt{table~}%............... Table lowercase singular
\def\RStabstxt{tables~}%............. lowercase plural
- \def\RSTabtxt{Table~}%............... uppercase singular
- \def\RSTabstxt{Tables~}%............. uppercase plural
+ \def\RSTabtxt{Table~}%............... uppercase singular (sentence start)
+ \def\RSTabstxt{Tables~}%............. uppercase plural (sentence start)
\def\RSfootntxt{footnote~}%.......... Footnote lowercase singular
\def\RSfootnstxt{footnotes~}%........ lowercase plural
- \def\RSFootntxt{Footnote~}%.......... uppercase singular
- \def\RSFootnstxt{Footnotes~}%........ uppercase plural
+ \def\RSFootntxt{Footnote~}%.......... uppercase singular (sentence start)
+ \def\RSFootnstxt{Footnotes~}%........ uppercase plural (sentence start)
}
% \end{macrocode}
% \begin{macrocode}
@@ -249,12 +250,12 @@
\def\RSParttxt{Part~}%
\def\RSPartstxt{Parts~}%
\def\RSappendixname{appendix~}%
- \def\RSAppendixname{Appendix~}%
\def\RSappendicesname{appendices~}%
+ \def\RSAppendixname{Appendix~}%
\def\RSAppendicesname{Appendices~}%
\def\RSchaptername{chapter~}%
- \def\RSChaptername{Chapter~}%
\def\RSchaptersname{chapters~}%
+ \def\RSChaptername{Chapter~}%
\def\RSChaptersname{Chapters~}%
\def\RSsectxt{section~}%
\def\RSsecstxt{sections~}%
@@ -319,12 +320,12 @@
\def\RSParttxt{Deel~}%
\def\RSPartstxt{Dele~}%
\def\RSappendixname{bylae~}%
- \def\RSAppendixname{Bylae~}%
\def\RSappendicesname{bylaes~}%
+ \def\RSAppendixname{Bylae~}%
\def\RSAppendicesname{Bylaes~}%
\def\RSchaptername{hoofstuk~}%
- \def\RSChaptername{Hoofstuk~}%
\def\RSchaptersname{hoofstukke~}%
+ \def\RSChaptername{Hoofstuk~}%
\def\RSChaptersname{Hoofstukke~}%
\def\RSsectxt{afdeling~}%
\def\RSsecstxt{afdelings~}%
@@ -379,12 +380,12 @@
\def\RSParttxt{Del~}%
\def\RSPartstxt{Del~}%
\def\RSappendixname{bilag~}% % 'appendiks' is also possible,
- \def\RSAppendixname{Bilag~}% % but 'bilag' is used in Babel
- \def\RSappendicesname{bilag~}%
+ \def\RSappendicesname{bilag~}% % but 'bilag' is used in Babel
+ \def\RSAppendixname{Bilag~}%
\def\RSAppendicesname{Bilag~}%
\def\RSchaptername{kapitel~}%
- \def\RSChaptername{Kapitel~}%
\def\RSchaptersname{kapitel~}%
+ \def\RSChaptername{Kapitel~}%
\def\RSChaptersname{Kapitel~}%
\def\RSsectxt{afsnit~}%
\def\RSsecstxt{afsnit~}%
@@ -439,12 +440,12 @@
\def\RSParttxt{La partie~}%
\def\RSPartstxt{Les parties~}%
\def\RSappendixname{appendice~}%
- \def\RSAppendixname{L'appendice~}%
\def\RSappendicesname{appendices~}%
+ \def\RSAppendixname{L'appendice~}%
\def\RSAppendicesname{Les appendices~}%
\def\RSchaptername{chapitre~}%
- \def\RSChaptername{Le chapitre~}%
\def\RSchaptersname{chapitres~}%
+ \def\RSChaptername{Le chapitre~}%
\def\RSChaptersname{Les chapitres~}%
\def\RSsectxt{section~}%
\def\RSsecstxt{sections~}%
@@ -500,12 +501,12 @@
\def\RSParttxt{Teil~}%
\def\RSPartstxt{Teile~}%
\def\RSappendixname{Anhang~}%
- \def\RSAppendixname{Anhang~}%
\def\RSappendicesname{Anh\"{a}nge~}%
+ \def\RSAppendixname{Anhang~}%
\def\RSAppendicesname{Anh\"{a}nge~}%
\def\RSchaptername{Kapitel~}%
- \def\RSChaptername{Kapitel~}%
\def\RSchaptersname{Kapitel~}%
+ \def\RSChaptername{Kapitel~}%
\def\RSChaptersname{Kapitel~}%
\def\RSsectxt{Abschnitt~}%
\def\RSsecstxt{Abschnitt~}%
@@ -563,12 +564,12 @@
\def\RSParttxt{Parte~}%
\def\RSPartstxt{Parti~}%
\def\RSappendixname{l'appendice~}%
- \def\RSAppendixname{l'Appendice~}%
\def\RSappendicesname{le appendici~}%
+ \def\RSAppendixname{l'Appendice~}%
\def\RSAppendicesname{le Appendici~}%
\def\RSchaptername{il capitolo~}%
- \def\RSChaptername{il Capitolo~}%
\def\RSchaptersname{i capitoli~}%
+ \def\RSChaptername{il Capitolo~}%
\def\RSChaptersname{i Capitoli~}%
\def\RSsectxt{la sezione~}%
\def\RSsecstxt{le sezioni~}%
@@ -628,12 +629,12 @@
\def\RSParttxt{Del~}%
\def\RSPartstxt{Del~}%
\def\RSappendixname{tillegg~}%
- \def\RSAppendixname{Tillegg~}%
\def\RSappendicesname{tillegg~}%
+ \def\RSAppendixname{Tillegg~}%
\def\RSAppendicesname{Tillegg~}%
\def\RSchaptername{kapittel~}%
- \def\RSChaptername{Kapittel~}%
\def\RSchaptersname{kapittel~}%
+ \def\RSChaptername{Kapittel~}%
\def\RSChaptersname{Kapittel~}%
\def\RSsectxt{avsnitt~}%
\def\RSsecstxt{avsnitt~}%
@@ -691,12 +692,12 @@
\def\RSParttxt{Parte~}%
\def\RSPartstxt{Partes~}%
\def\RSappendixname{ap\^{e}ndice~}%
- \def\RSAppendixname{Ap\^{e}ndice~}%
\def\RSappendicesname{ap\^{e}ndices~}%
+ \def\RSAppendixname{Ap\^{e}ndice~}%
\def\RSAppendicesname{Ap\^{e}ndices~}%
\def\RSchaptername{cap\'{i}tulo~}%
- \def\RSChaptername{Cap\'{i}tulo~}%
\def\RSchaptersname{cap\'{i}tulos~}%
+ \def\RSChaptername{Cap\'{i}tulo~}%
\def\RSChaptersname{Cap\'{i}tulos~}%
\def\RSsectxt{se\c{c}\~{a}o~}%
\def\RSsecstxt{se\c{c}\~{o}es~}%
@@ -730,12 +731,12 @@
\def\RSParttxt{Parte~}%
\def\RSPartstxt{Partes~}%
\def\RSappendixname{ap\^{e}ndice~}%
- \def\RSAppendixname{Ap\^{e}ndice~}%
\def\RSappendicesname{ap\^{e}ndices~}%
+ \def\RSAppendixname{Ap\^{e}ndice~}%
\def\RSAppendicesname{Ap\^{e}ndices~}%
\def\RSchaptername{cap\'{i}tulo~}%
- \def\RSChaptername{Cap\'{i}tulo~}%
\def\RSchaptersname{cap\'{i}tulos~}%
+ \def\RSChaptername{Cap\'{i}tulo~}%
\def\RSChaptersname{Cap\'{i}tulos~}%
\def\RSsectxt{sec\c{c}\~{a}o~}%<---------------
\def\RSsecstxt{sec\c{c}\~{o}es~}%<-------------
@@ -794,12 +795,12 @@
\def\RSParttxt{Del~}%
\def\RSPartstxt{Del~}%
\def\RSappendixname{appendix~}%
- \def\RSAppendixname{appendix~}%
- \def\RSappendicesname{Appendix~}%
+ \def\RSappendicesname{appendix~}%
+ \def\RSAppendixname{Appendix~}%
\def\RSAppendicesname{Appendix~}%
\def\RSchaptername{kapitel~}%
- \def\RSChaptername{kapitel~}%
- \def\RSchaptersname{Kapitel~}%
+ \def\RSchaptersname{kapitel~}%
+ \def\RSChaptername{Kapitel~}%
\def\RSChaptersname{Kapitel~}%
\def\RSsectxt{sektion~}%
\def\RSsecstxt{sektion~}%
diff --git a/Master/texmf-dist/source/latex/refstyle/refstyle.dtx b/Master/texmf-dist/source/latex/refstyle/refstyle.dtx
index 21b9ff6d3d5..46fa9e3c66c 100644
--- a/Master/texmf-dist/source/latex/refstyle/refstyle.dtx
+++ b/Master/texmf-dist/source/latex/refstyle/refstyle.dtx
@@ -26,8 +26,8 @@
% -------------------------------------------------------------------
%
%<*pkg>
-\newcommand*{\RefstyleFileDate}{2010/10/21}
-\newcommand*{\RefstyleFileVersion}{v0.4}
+\newcommand*{\RefstyleFileDate}{2010/11/02}
+\newcommand*{\RefstyleFileVersion}{v0.5}
%</pkg>
%
%
@@ -185,7 +185,7 @@
%</driver>
% \fi
%
-% \CheckSum{545}
+% \CheckSum{552}
%
% \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
@@ -209,6 +209,7 @@
% \changes{v0.3}{2006/09/09}{Documentation update}
% \changes{v0.4}{2010/10/21}{Documentation update}
% \changes{v0.4}{2010/10/21}{Add \texttt{nokeyprefix} option}
+% \changes{v0.5}{2010/11/02}{Documentation update}
%
% \DoNotIndex{
% \@backslashchar, \@carcube, \@ehc, \@empty, \@firstoftwo,
@@ -330,6 +331,7 @@
% \end{Ipara}
% is provided to declare the package option \meta{language} and add
% \meta{definitions} to the |\extras|\meta{language} token for \pkg{babel}.
+% It can only be used inside \RScfg\ or \file{refstyle.def}.
%
% \item[(b)]
% Or with an existing configuration with language support and addition
@@ -443,15 +445,15 @@
% \newcommand*{\crsi}{\smash{\rule[0pt]{.4pt}{1.25em}\rule[.5ex]{1.5em}{.4pt}}}^^A
% \newcommand*{\crsl}{\smash{\rule[.5ex]{.4pt}{1.5em}\rule[.5ex]{1.5em}{.4pt}}}^^A
% \begin{Itabb}
-% \hspace*{2em}\=\hspace{2em}\=\kill
+% \hspace*{2em}\=\hspace{2em}\=\hspace{10em}\=\kill
% \cmd{\newref}\marg{\rtp}\mkeylst\tab\mbox{}\\[.75ex]
-% \>\crsi \>\argcmd{{\rtp}}{key}\\[.75ex]
-% \>\crsl \>\argcmd{{\rtp}}{label}\\[.75ex]
-% \>\crsl \>\argcmd{{\rtp}}{ref}\\[.75ex]
-% \>\crsl \>\argcmd{{\Rtp}}{ref}\\[.75ex]
-% \>\crsl \>\argcmd{{\rtp}}{rangeref}\\[.75ex]
-% \>\crsl \>\argcmd{{\Rtp}}{rangeref}\\[.75ex]
-% \>\crsl \>\argcmd{{\rtp}}{pageref}
+% \>\crsi \>\argcmd{{\rtp}}{key} \> Reference argument prefix \\[.75ex]
+% \>\crsl \>\argcmd{{\rtp}}{label} \> Custom label \\[.75ex]
+% \>\crsl \>\argcmd{{\rtp}}{ref} \> In text reference \\[.75ex]
+% \>\crsl \>\argcmd{{\Rtp}}{ref} \> Start of sentence reference \\[.75ex]
+% \>\crsl \>\argcmd{{\rtp}}{rangeref} \> In text range reference \\[.75ex]
+% \>\crsl \>\argcmd{{\Rtp}}{rangeref} \> Start of sentence range reference\quad\mbox{}\\[.75ex]
+% \>\crsl \>\argcmd{{\rtp}}{pageref} \> Page reference
% \end{Itabb}
% \end{cminipage}
% \blankline
@@ -816,8 +818,14 @@
% \>~ $\rightarrow$ |table~\ref{xxx-abc}|
% \end{Itabb}
% For existing documents containing labels such as |\label{tab:xx}|,
-% you can define \opt{key}|={}| and use the existing labels with
-% \RS, e.g.: |\tabref{tab:xx}|.
+% you can use the \opt{nokeyprefix} option which defines \opt{key}|={}|. The
+% normal \cmd{\label} command can then be used and the reference
+% commands defaults to
+% \begin{Itabb}
+% \tab\=\hspace{3.5cm}\=\hspace{2em}\=\kill
+% \>\cmd{\label}|{tab:xx}| \\
+% \>|\tabref{tab:xx}| \>~ $\rightarrow$ |table~\ref{tab:xx}|
+% \end{Itabb}
%
%
% \subsection{Plural form: \opt{s}}
@@ -1034,10 +1042,14 @@
% \Secref[vref, refcmd={\S\ref{#1}, `\nameref{#1}'}]{PRefCmds}
% \end{Ipara}
%
-% \section{Default configuration file}
+% \section{Default configuration files}
+%
+% The \pkg{refstyle} package first searches for the \file{refstyle.def}
+% configuration file, and if it not found, then it uses the default
+% configuration file \RScfg\ that is supplied with the package.
%
% The default configuration file, \RScfg, makes a
-% number of default reference declarations and provides langauge
+% number of default reference declarations and provides language
% definitions for the language parameters. See the file
% \file{refconfig.pdf} for the documentation.
% \medskip
@@ -1045,7 +1057,9 @@
% \begin{center}
% \begin{fminipage}[.55\textwidth]
% \slshape Any user is welcome to customize the
-% local copy of the \RScfg\ file.
+% local copy of the \RScfg\ file or copy
+% the relevant contents to your own \file{refstyle.def}
+% configuration file.
% \end{fminipage}
% \end{center}
%
@@ -1099,6 +1113,19 @@
\@ifundefined{vref@space}{\let\vref@space\space}{}
% \end{macrocode}
%
+% \begin{macro}{\@safe@activestrue}
+% \changes{v0.5}{2010/11/02}{Add \cmd{\@safe@activesfalse}}
+% \begin{macro}{\@safe@activesfalse}
+% \changes{v0.5}{2010/11/02}{Add \cmd{\@safe@activestrue}}
+% If \pkg{babel} is not loaded, make the following
+% commands inactive.
+% \begin{macrocode}
+\providecommand*{\@safe@activestrue}{}
+\providecommand*{\@safe@activesfalse}{}
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
% \subsection{Utility commands}
%
% \begin{macro}{\RS@namelet}
@@ -1319,15 +1346,15 @@
% \begin{macrocode}
\newcommand*{\RS@newref}[2]{%
% \end{macrocode}
-% \bNP[1.5]\noindent Clears an existing template before defining a new one.\eNP
+% \bNP[2.0]\noindent Clears an existing template before defining a new one.\eNP
% \begin{macrocode}
\RS@clearref{#1}%
% \end{macrocode}
-% \bNP[1.5]\noindent Create |\ifRS@|\meta{key}|vref| conditional \eNP
+% \bNP[2.0]\noindent Create |\ifRS@|\meta{key}|vref| conditional \eNP
% \begin{macrocode}
% \expandafter\newif\csname ifRS@#1vref\endcsname%
% \end{macrocode}
-% \bNP[1.5]\noindent Creates a series of key-values for every template
+% \bNP[2.0]\noindent Creates a series of key-values for every template
% that stores the setup for the specific template.\eNP
% \begin{macrocode}
\ifRS@keyactive
@@ -1335,36 +1362,36 @@
\else
\define@key{RS@#1}{key}[]{\RS@namedef{RS@#1@key}{##1}}%
\fi
- \define@key{RS@#1}{s}[true]{\RS@setbool{RSplural}{##1}}%
- \define@key{RS@#1}{name}[]{\RS@namedef{RS@#1@name}{##1}}%
- \define@key{RS@#1}{names}[]{\RS@namedef{RS@#1@names}{##1}}%
- \define@key{RS@#1}{Name}[]{\RS@namedef{RS@#1@Name}{##1}}%
- \define@key{RS@#1}{Names}[]{\RS@namedef{RS@#1@Names}{##1}}%
- \define@key{RS@#1}{rngtxt}[\space to~]{\RS@namedef{RS@#1@rngtxt}{##1}}%
- \define@key{RS@#1}{lsttwotxt}[\space and~]{\RS@namedef{RS@#1@lsttwotxt}{##1}}%
- \define@key{RS@#1}{lsttxt}[\space and~]{\RS@namedef{RS@#1@lsttxt}{##1}}%
- \define@key{RS@#1}{refcmd}[\ref{####1}]{\RS@namedef{RS@#1@rcmd}####1{##1}}%
- \define@key{RS@#1}{xr}[]{\RS@namedef{RS@#1@xr}{##1}}%
- \define@key{RS@#1}{vref}[true]{\RS@namedef{RS@#1vref}{##1}}%
+ \define@key{RS@#1}{s}[true]{\RS@setbool{RSplural}{##1}}%
+ \define@key{RS@#1}{name}[]{\RS@namedef{RS@#1@name}{##1}}%
+ \define@key{RS@#1}{names}[]{\RS@namedef{RS@#1@names}{##1}}%
+ \define@key{RS@#1}{Name}[]{\RS@namedef{RS@#1@Name}{##1}}%
+ \define@key{RS@#1}{Names}[]{\RS@namedef{RS@#1@Names}{##1}}%
+ \define@key{RS@#1}{rngtxt}[\space to~]{\RS@namedef{RS@#1@rngtxt}{##1}}%
+ \define@key{RS@#1}{lsttwotxt}[\space and~]{\RS@namedef{RS@#1@lsttwotxt}{##1}}%
+ \define@key{RS@#1}{lsttxt}[\space and~]{\RS@namedef{RS@#1@lsttxt}{##1}}%
+ \define@key{RS@#1}{refcmd}[\ref{####1}]{\RS@namedef{RS@#1@rcmd}####1{##1}}%
+ \define@key{RS@#1}{xr}[]{\RS@namedef{RS@#1@xr}{##1}}%
+ \define@key{RS@#1}{vref}[true]{\RS@namedef{RS@#1vref}{##1}}%
% \end{macrocode}
-% \bNP[1.5]\noindent Set default key-value parameters.\eNP
+% \bNP[2.0]\noindent Set default key-value parameters.\eNP
% \begin{macrocode}
- \RS@setkeys{RS@#1}{key,
- s=false,
- name,names,Name,Names,
- rngtxt,lsttwotxt,lsttxt,
- refcmd,
- xr,
- vref=false}%
+ \RS@setkeys{RS@#1}{key,
+ s=false,
+ name,names,Name,Names,
+ rngtxt,lsttwotxt,lsttxt,
+ refcmd,
+ xr,
+ vref=false}%
% \end{macrocode}
-% \bNP[1.5]Set key-values according to user definitions.\eNP
+% \bNP[2.0]\noindent Set key-values according to user definitions.\eNP
% \begin{macrocode}
- \RS@setkeys{RS@#1}{#2}%
+ \RS@setkeys{RS@#1}{#2}%
% \end{macrocode}
-% \bNP[1.5]Build the reference commands.\eNP
+% \bNP[2.0]\noindent Build the reference commands.\eNP
% \begin{macrocode}
- \RS@buildref{#1}%
- }
+ \RS@buildref{#1}%
+ }
% \end{macrocode}
% \end{macro}
%
@@ -1450,9 +1477,10 @@
% \subsection{Reference formatting commands}
%
% \begin{macro}{\RS@ref}
+% \changes{v0.5}{2010/11/02}{Add \cmd{\@safe@activestrue} to avoid active chars is ref list}
% \begin{macro}{\RS@@ref}
% \begin{macro}{\RS@@@ref}
-% \changes{v0.4}{2010/10/21}{Add \cmd{\ifRSlsttwo} test for list containing only two parameter}
+% \changes{v0.4}{2010/10/21}{Add \cmd{\ifRSlsttwo} test for list containing only two parameter}
% The command \cmd{\RS@ref}\marg{key}\okeylst\marg{label\_lst}
% typeset the references to the comma-separated reference
% label list according to the configuration for \meta{key}.
@@ -1460,12 +1488,14 @@
% First of all, remove all spaces for the reference label list.
% \begin{macrocode}
\def\RS@ref#1[#2]#3{%
- \begingroup
- \RS@setkeys{RS@#1}{#2}%
- \edef\RS@tmpa{\zap@space#3 \@empty}%
- \edef\RS@tmpa{\noexpand\RS@@ref{#1} \RS@tmpa,\relax\noexpand\@eolst}%
- \RS@tmpa%
- \endgroup}
+ \begingroup
+ \RS@setkeys{RS@#1}{#2}%
+ \@safe@activestrue%
+ \edef\RS@tmpa{\zap@space#3 \@empty}%
+ \@safe@activesfalse%
+ \edef\RS@tmpa{\noexpand\RS@@ref{#1} \RS@tmpa,\relax\noexpand\@eolst}%
+ \RS@tmpa%
+ \endgroup}
% \end{macrocode}
% \end{macro}
% Check if there is a single or multiple references in the
@@ -1699,17 +1729,19 @@
% \end{macro}
%
% \begin{macro}{\DeclareLangOpt}
+% \changes{v0.5}{2010/11/02}{Add \cmd{\extras}\meta{language} to beginning of document.}
% Command to declare a language option and add
% language definitions to the |\extras|\meta{language} token
% for \pkg{babel}.
% \begin{macrocode}
\def\DeclareLangOpt#1#2{%
- \edef\RS@tempa{\expandafter\@gobble\string#2}%
- \RS@ifundefined{\RS@tempa}%
- {\PackageError{\RS@pkgname}%
- {Unknown definitions \@backslashchar\RS@tempa\MessageBreak
- for language option `#1'}{}}%
- {\DeclareOption{#1}{\expandafter\RSaddto\csname extras#1\endcsname #2}}%
+ \edef\RS@tempa{\expandafter\@gobble\string#2}%
+ \RS@ifundefined{\RS@tempa}%
+ {\PackageError{\RS@pkgname}{%
+ Unknown definitions \@backslashchar\RS@tempa\MessageBreak
+ for language option `#1'}{}}%
+ {\DeclareOption{#1}{%
+ \AtBeginDocument{\expandafter\RSaddto\csname extras#1\endcsname #2}}}%
}
% \end{macrocode}
% \end{macro}
diff --git a/Master/texmf-dist/source/latex/refstyle/refstyle.ins b/Master/texmf-dist/source/latex/refstyle/refstyle.ins
index 40765950e03..ced9ef97226 100644
--- a/Master/texmf-dist/source/latex/refstyle/refstyle.ins
+++ b/Master/texmf-dist/source/latex/refstyle/refstyle.ins
@@ -1,97 +1,97 @@
-% 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 <dnjels@sun.ac.za>
--------------------------------------------------------------------
-
-\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--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 <dnjels@sun.ac.za>
+-------------------------------------------------------------------
+
+\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
diff --git a/Master/texmf-dist/tex/latex/refstyle/refstyle.cfg b/Master/texmf-dist/tex/latex/refstyle/refstyle.cfg
index 805d72e82e9..11ad74d2bee 100644
--- a/Master/texmf-dist/tex/latex/refstyle/refstyle.cfg
+++ b/Master/texmf-dist/tex/latex/refstyle/refstyle.cfg
@@ -15,8 +15,8 @@
%% Original by Danie Els <dnjels@sun.ac.za>
%% -------------------------------------------------------------------
%%
-\ProvidesFile{refstyle.cfg}[2010/10/21\space
- 0.4\space
+\ProvidesFile{refstyle.cfg}[2010/11/02\space
+ 0.5\space
Configuration file for refstyle (DNJ Els)]
%%-- ENGLISH ------------------------------------
\newcommand\RSukenglish{%
@@ -25,36 +25,36 @@
\def\RSlsttxt{, and~}%............... List more: figures 5, 6, and 7
\def\RSparttxt{Part~}%............... Part lowercase singular
\def\RSpartstxt{Parts~}%............. lowercase plural
- \def\RSParttxt{Part~}%............... uppercase singular
- \def\RSPartstxt{Parts~}%............. uppercase plural
+ \def\RSParttxt{Part~}%............... uppercase singular (sentence start)
+ \def\RSPartstxt{Parts~}%............. uppercase plural (sentence start)
\def\RSappendixname{appendix~}%...... Appendix lowercase singular
- \def\RSAppendixname{Appendix~}%...... lowercase plural
- \def\RSappendicesname{appendices~}%.. uppercase singular
- \def\RSAppendicesname{Appendices~}%.. uppercase plural
+ \def\RSappendicesname{appendices~}%.. lowercase plural
+ \def\RSAppendixname{Appendix~}%...... uppercase singular (sentence start)
+ \def\RSAppendicesname{Appendices~}%.. uppercase plural (sentence start)
\def\RSchaptername{chapter~}%........ Chapter lowercase singular
- \def\RSChaptername{Chapter~}%........ lowercase plural
- \def\RSchaptersname{chapters~}%...... uppercase singular
- \def\RSChaptersname{Chapters~}%...... uppercase plural
+ \def\RSchaptersname{chapters~}%...... lowercase plural
+ \def\RSChaptername{Chapter~}%........ uppercase singular (sentence start)
+ \def\RSChaptersname{Chapters~}%...... uppercase plural (sentence start)
\def\RSsectxt{section~}%............. Section lowercase singular
\def\RSsecstxt{sections~}%........... lowercase plural
- \def\RSSectxt{Section~}%............. uppercase singular
- \def\RSSecstxt{Sections~}%........... uppercase plural
+ \def\RSSectxt{Section~}%............. uppercase singular (sentence start)
+ \def\RSSecstxt{Sections~}%........... uppercase plural (sentence start)
\def\RSeqtxt{equation~}%............. Equation lowercase singular
\def\RSeqstxt{equations~}%........... lowercase plural
- \def\RSEqtxt{Equation~}%............. uppercase singular
- \def\RSEqstxt{Equations~}%........... uppercase plural
+ \def\RSEqtxt{Equation~}%............. uppercase singular (sentence start)
+ \def\RSEqstxt{Equations~}%........... uppercase plural (sentence start)
\def\RSfigtxt{figure~}%.............. Figure lowercase singular
\def\RSfigstxt{figures~}%............ lowercase plural
- \def\RSFigtxt{Figure~}%.............. uppercase singular
- \def\RSFigstxt{Figures~}%............ uppercase plural
+ \def\RSFigtxt{Figure~}%.............. uppercase singular (sentence start)
+ \def\RSFigstxt{Figures~}%............ uppercase plural (sentence start)
\def\RStabtxt{table~}%............... Table lowercase singular
\def\RStabstxt{tables~}%............. lowercase plural
- \def\RSTabtxt{Table~}%............... uppercase singular
- \def\RSTabstxt{Tables~}%............. uppercase plural
+ \def\RSTabtxt{Table~}%............... uppercase singular (sentence start)
+ \def\RSTabstxt{Tables~}%............. uppercase plural (sentence start)
\def\RSfootntxt{footnote~}%.......... Footnote lowercase singular
\def\RSfootnstxt{footnotes~}%........ lowercase plural
- \def\RSFootntxt{Footnote~}%.......... uppercase singular
- \def\RSFootnstxt{Footnotes~}%........ uppercase plural
+ \def\RSFootntxt{Footnote~}%.......... uppercase singular (sentence start)
+ \def\RSFootnstxt{Footnotes~}%........ uppercase plural (sentence start)
}
\newcommand\RSenglish{%
\def\RSrngtxt{\space to~}%
@@ -65,12 +65,12 @@
\def\RSParttxt{Part~}%
\def\RSPartstxt{Parts~}%
\def\RSappendixname{appendix~}%
- \def\RSAppendixname{Appendix~}%
\def\RSappendicesname{appendices~}%
+ \def\RSAppendixname{Appendix~}%
\def\RSAppendicesname{Appendices~}%
\def\RSchaptername{chapter~}%
- \def\RSChaptername{Chapter~}%
\def\RSchaptersname{chapters~}%
+ \def\RSChaptername{Chapter~}%
\def\RSChaptersname{Chapters~}%
\def\RSsectxt{section~}%
\def\RSsecstxt{sections~}%
@@ -110,12 +110,12 @@
\def\RSParttxt{Deel~}%
\def\RSPartstxt{Dele~}%
\def\RSappendixname{bylae~}%
- \def\RSAppendixname{Bylae~}%
\def\RSappendicesname{bylaes~}%
+ \def\RSAppendixname{Bylae~}%
\def\RSAppendicesname{Bylaes~}%
\def\RSchaptername{hoofstuk~}%
- \def\RSChaptername{Hoofstuk~}%
\def\RSchaptersname{hoofstukke~}%
+ \def\RSChaptername{Hoofstuk~}%
\def\RSChaptersname{Hoofstukke~}%
\def\RSsectxt{afdeling~}%
\def\RSsecstxt{afdelings~}%
@@ -149,12 +149,12 @@
\def\RSParttxt{Del~}%
\def\RSPartstxt{Del~}%
\def\RSappendixname{bilag~}% % 'appendiks' is also possible,
- \def\RSAppendixname{Bilag~}% % but 'bilag' is used in Babel
- \def\RSappendicesname{bilag~}%
+ \def\RSappendicesname{bilag~}% % but 'bilag' is used in Babel
+ \def\RSAppendixname{Bilag~}%
\def\RSAppendicesname{Bilag~}%
\def\RSchaptername{kapitel~}%
- \def\RSChaptername{Kapitel~}%
\def\RSchaptersname{kapitel~}%
+ \def\RSChaptername{Kapitel~}%
\def\RSChaptersname{Kapitel~}%
\def\RSsectxt{afsnit~}%
\def\RSsecstxt{afsnit~}%
@@ -188,12 +188,12 @@
\def\RSParttxt{La partie~}%
\def\RSPartstxt{Les parties~}%
\def\RSappendixname{appendice~}%
- \def\RSAppendixname{L'appendice~}%
\def\RSappendicesname{appendices~}%
+ \def\RSAppendixname{L'appendice~}%
\def\RSAppendicesname{Les appendices~}%
\def\RSchaptername{chapitre~}%
- \def\RSChaptername{Le chapitre~}%
\def\RSchaptersname{chapitres~}%
+ \def\RSChaptername{Le chapitre~}%
\def\RSChaptersname{Les chapitres~}%
\def\RSsectxt{section~}%
\def\RSsecstxt{sections~}%
@@ -227,12 +227,12 @@
\def\RSParttxt{Teil~}%
\def\RSPartstxt{Teile~}%
\def\RSappendixname{Anhang~}%
- \def\RSAppendixname{Anhang~}%
\def\RSappendicesname{Anh\"{a}nge~}%
+ \def\RSAppendixname{Anhang~}%
\def\RSAppendicesname{Anh\"{a}nge~}%
\def\RSchaptername{Kapitel~}%
- \def\RSChaptername{Kapitel~}%
\def\RSchaptersname{Kapitel~}%
+ \def\RSChaptername{Kapitel~}%
\def\RSChaptersname{Kapitel~}%
\def\RSsectxt{Abschnitt~}%
\def\RSsecstxt{Abschnitt~}%
@@ -269,12 +269,12 @@
\def\RSParttxt{Parte~}%
\def\RSPartstxt{Parti~}%
\def\RSappendixname{l'appendice~}%
- \def\RSAppendixname{l'Appendice~}%
\def\RSappendicesname{le appendici~}%
+ \def\RSAppendixname{l'Appendice~}%
\def\RSAppendicesname{le Appendici~}%
\def\RSchaptername{il capitolo~}%
- \def\RSChaptername{il Capitolo~}%
\def\RSchaptersname{i capitoli~}%
+ \def\RSChaptername{il Capitolo~}%
\def\RSChaptersname{i Capitoli~}%
\def\RSsectxt{la sezione~}%
\def\RSsecstxt{le sezioni~}%
@@ -308,12 +308,12 @@
\def\RSParttxt{Del~}%
\def\RSPartstxt{Del~}%
\def\RSappendixname{tillegg~}%
- \def\RSAppendixname{Tillegg~}%
\def\RSappendicesname{tillegg~}%
+ \def\RSAppendixname{Tillegg~}%
\def\RSAppendicesname{Tillegg~}%
\def\RSchaptername{kapittel~}%
- \def\RSChaptername{Kapittel~}%
\def\RSchaptersname{kapittel~}%
+ \def\RSChaptername{Kapittel~}%
\def\RSChaptersname{Kapittel~}%
\def\RSsectxt{avsnitt~}%
\def\RSsecstxt{avsnitt~}%
@@ -350,12 +350,12 @@
\def\RSParttxt{Parte~}%
\def\RSPartstxt{Partes~}%
\def\RSappendixname{ap\^{e}ndice~}%
- \def\RSAppendixname{Ap\^{e}ndice~}%
\def\RSappendicesname{ap\^{e}ndices~}%
+ \def\RSAppendixname{Ap\^{e}ndice~}%
\def\RSAppendicesname{Ap\^{e}ndices~}%
\def\RSchaptername{cap\'{i}tulo~}%
- \def\RSChaptername{Cap\'{i}tulo~}%
\def\RSchaptersname{cap\'{i}tulos~}%
+ \def\RSChaptername{Cap\'{i}tulo~}%
\def\RSChaptersname{Cap\'{i}tulos~}%
\def\RSsectxt{se\c{c}\~{a}o~}%
\def\RSsecstxt{se\c{c}\~{o}es~}%
@@ -387,12 +387,12 @@
\def\RSParttxt{Parte~}%
\def\RSPartstxt{Partes~}%
\def\RSappendixname{ap\^{e}ndice~}%
- \def\RSAppendixname{Ap\^{e}ndice~}%
\def\RSappendicesname{ap\^{e}ndices~}%
+ \def\RSAppendixname{Ap\^{e}ndice~}%
\def\RSAppendicesname{Ap\^{e}ndices~}%
\def\RSchaptername{cap\'{i}tulo~}%
- \def\RSChaptername{Cap\'{i}tulo~}%
\def\RSchaptersname{cap\'{i}tulos~}%
+ \def\RSChaptername{Cap\'{i}tulo~}%
\def\RSChaptersname{Cap\'{i}tulos~}%
\def\RSsectxt{sec\c{c}\~{a}o~}%<---------------
\def\RSsecstxt{sec\c{c}\~{o}es~}%<-------------
@@ -429,12 +429,12 @@
\def\RSParttxt{Del~}%
\def\RSPartstxt{Del~}%
\def\RSappendixname{appendix~}%
- \def\RSAppendixname{appendix~}%
- \def\RSappendicesname{Appendix~}%
+ \def\RSappendicesname{appendix~}%
+ \def\RSAppendixname{Appendix~}%
\def\RSAppendicesname{Appendix~}%
\def\RSchaptername{kapitel~}%
- \def\RSChaptername{kapitel~}%
- \def\RSchaptersname{Kapitel~}%
+ \def\RSchaptersname{kapitel~}%
+ \def\RSChaptername{Kapitel~}%
\def\RSChaptersname{Kapitel~}%
\def\RSsectxt{sektion~}%
\def\RSsecstxt{sektion~}%
diff --git a/Master/texmf-dist/tex/latex/refstyle/refstyle.sty b/Master/texmf-dist/tex/latex/refstyle/refstyle.sty
index a64ddc61ebf..b482db84d9b 100644
--- a/Master/texmf-dist/tex/latex/refstyle/refstyle.sty
+++ b/Master/texmf-dist/tex/latex/refstyle/refstyle.sty
@@ -24,8 +24,8 @@
%% by Danie Els (dnjels@sun.ac.za).
%% -------------------------------------------------------------------
%%
-\newcommand*{\RefstyleFileDate}{2010/10/21}
-\newcommand*{\RefstyleFileVersion}{v0.4}
+\newcommand*{\RefstyleFileDate}{2010/11/02}
+\newcommand*{\RefstyleFileVersion}{v0.5}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{refstyle}[\RefstyleFileDate\space
@@ -38,6 +38,8 @@
\let\@tempc\relax
\KV@do#2,\relax,}
\@ifundefined{vref@space}{\let\vref@space\space}{}
+\providecommand*{\@safe@activestrue}{}
+\providecommand*{\@safe@activesfalse}{}
\newcommand*{\RS@namelet}[1]{\expandafter\let\csname #1\endcsname}
\newcommand*{\RS@nameuse}[1]{\csname #1\endcsname}
\newcommand*{\RS@namedef}[1]{\expandafter\def\csname #1\endcsname}
@@ -110,27 +112,27 @@
\else
\define@key{RS@#1}{key}[]{\RS@namedef{RS@#1@key}{##1}}%
\fi
- \define@key{RS@#1}{s}[true]{\RS@setbool{RSplural}{##1}}%
- \define@key{RS@#1}{name}[]{\RS@namedef{RS@#1@name}{##1}}%
- \define@key{RS@#1}{names}[]{\RS@namedef{RS@#1@names}{##1}}%
- \define@key{RS@#1}{Name}[]{\RS@namedef{RS@#1@Name}{##1}}%
- \define@key{RS@#1}{Names}[]{\RS@namedef{RS@#1@Names}{##1}}%
- \define@key{RS@#1}{rngtxt}[\space to~]{\RS@namedef{RS@#1@rngtxt}{##1}}%
- \define@key{RS@#1}{lsttwotxt}[\space and~]{\RS@namedef{RS@#1@lsttwotxt}{##1}}%
- \define@key{RS@#1}{lsttxt}[\space and~]{\RS@namedef{RS@#1@lsttxt}{##1}}%
- \define@key{RS@#1}{refcmd}[\ref{####1}]{\RS@namedef{RS@#1@rcmd}####1{##1}}%
- \define@key{RS@#1}{xr}[]{\RS@namedef{RS@#1@xr}{##1}}%
- \define@key{RS@#1}{vref}[true]{\RS@namedef{RS@#1vref}{##1}}%
- \RS@setkeys{RS@#1}{key,
- s=false,
- name,names,Name,Names,
- rngtxt,lsttwotxt,lsttxt,
- refcmd,
- xr,
- vref=false}%
- \RS@setkeys{RS@#1}{#2}%
- \RS@buildref{#1}%
- }
+ \define@key{RS@#1}{s}[true]{\RS@setbool{RSplural}{##1}}%
+ \define@key{RS@#1}{name}[]{\RS@namedef{RS@#1@name}{##1}}%
+ \define@key{RS@#1}{names}[]{\RS@namedef{RS@#1@names}{##1}}%
+ \define@key{RS@#1}{Name}[]{\RS@namedef{RS@#1@Name}{##1}}%
+ \define@key{RS@#1}{Names}[]{\RS@namedef{RS@#1@Names}{##1}}%
+ \define@key{RS@#1}{rngtxt}[\space to~]{\RS@namedef{RS@#1@rngtxt}{##1}}%
+ \define@key{RS@#1}{lsttwotxt}[\space and~]{\RS@namedef{RS@#1@lsttwotxt}{##1}}%
+ \define@key{RS@#1}{lsttxt}[\space and~]{\RS@namedef{RS@#1@lsttxt}{##1}}%
+ \define@key{RS@#1}{refcmd}[\ref{####1}]{\RS@namedef{RS@#1@rcmd}####1{##1}}%
+ \define@key{RS@#1}{xr}[]{\RS@namedef{RS@#1@xr}{##1}}%
+ \define@key{RS@#1}{vref}[true]{\RS@namedef{RS@#1vref}{##1}}%
+ \RS@setkeys{RS@#1}{key,
+ s=false,
+ name,names,Name,Names,
+ rngtxt,lsttwotxt,lsttxt,
+ refcmd,
+ xr,
+ vref=false}%
+ \RS@setkeys{RS@#1}{#2}%
+ \RS@buildref{#1}%
+ }
\newcommand*{\RS@clearref}[1]{%
\RS@ifundefined{RS@#1@template}
{\RS@namedef{RS@#1@template}{#1}%
@@ -166,12 +168,14 @@
{\RS@nameuse{RS@#1}{#2}}%
{\RS@nameuse{RS@#1}{#2}[]}}
\def\RS@ref#1[#2]#3{%
- \begingroup
- \RS@setkeys{RS@#1}{#2}%
- \edef\RS@tmpa{\zap@space#3 \@empty}%
- \edef\RS@tmpa{\noexpand\RS@@ref{#1} \RS@tmpa,\relax\noexpand\@eolst}%
- \RS@tmpa%
- \endgroup}
+ \begingroup
+ \RS@setkeys{RS@#1}{#2}%
+ \@safe@activestrue%
+ \edef\RS@tmpa{\zap@space#3 \@empty}%
+ \@safe@activesfalse%
+ \edef\RS@tmpa{\noexpand\RS@@ref{#1} \RS@tmpa,\relax\noexpand\@eolst}%
+ \RS@tmpa%
+ \endgroup}
\def\RS@@ref#1 #2,#3\@eolst{%
\ifx\relax#3\relax
\RS@makename{#1}%
@@ -299,12 +303,13 @@
\fi
\@temptokena{}\toks@\@temptokena}
\def\DeclareLangOpt#1#2{%
- \edef\RS@tempa{\expandafter\@gobble\string#2}%
- \RS@ifundefined{\RS@tempa}%
- {\PackageError{\RS@pkgname}%
- {Unknown definitions \@backslashchar\RS@tempa\MessageBreak
- for language option `#1'}{}}%
- {\DeclareOption{#1}{\expandafter\RSaddto\csname extras#1\endcsname #2}}%
+ \edef\RS@tempa{\expandafter\@gobble\string#2}%
+ \RS@ifundefined{\RS@tempa}%
+ {\PackageError{\RS@pkgname}{%
+ Unknown definitions \@backslashchar\RS@tempa\MessageBreak
+ for language option `#1'}{}}%
+ {\DeclareOption{#1}{%
+ \AtBeginDocument{\expandafter\RSaddto\csname extras#1\endcsname #2}}}%
}
\newcommand*{\RS@cfgfile}{refstyle.cfg}
\newcommand*{\RS@reffile}{refstyle.def}
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 0d7cccd34a5..ad7ff7aea7f 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -621,7 +621,6 @@ $Master = "$mydir/../..";
'ratexdb', "die 'skipping, needs sql, etc.'",
'realcalc', "die 'skipping, nosell license'",
'references', "die 'skipping, requires binary'",
- 'refstyle', "&MAKEcopy",
'renditions', "die 'skipping, per author request'",
'resume', "die 'skipping, nosell license'",
'revnum', "die 'skipping, obsolete'",