From d7657995bee70cf2feba1fe06e2b5c8f133a39b6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 4 Nov 2010 22:57:53 +0000 Subject: refstyle 0.5 (4nov10) git-svn-id: svn://tug.org/texlive/trunk@20318 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/refstyle/refstyle.cfg | 86 +++++++++++------------ Master/texmf-dist/tex/latex/refstyle/refstyle.sty | 75 +++++++++++--------- 2 files changed, 83 insertions(+), 78 deletions(-) (limited to 'Master/texmf-dist/tex') 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 %% ------------------------------------------------------------------- %% -\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} -- cgit v1.2.3