From 6493cf86a1d745dfcdd7efa8b6c2855d7f1bb1ad Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 21 Jan 2020 21:44:13 +0000 Subject: xcite (21jan20) git-svn-id: svn://tug.org/texlive/trunk@53486 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/xcite/README | 10 +- Master/texmf-dist/doc/latex/xcite/xcite.pdf | Bin 206721 -> 158232 bytes Master/texmf-dist/source/latex/xcite/xcite.dtx | 125 +++---------------------- Master/texmf-dist/source/latex/xcite/xcite.ins | 4 +- Master/texmf-dist/tex/latex/xcite/xcite.sty | 34 +------ 5 files changed, 24 insertions(+), 149 deletions(-) diff --git a/Master/texmf-dist/doc/latex/xcite/README b/Master/texmf-dist/doc/latex/xcite/README index b93b15c7ad3..c9a2f139e1f 100644 --- a/Master/texmf-dist/doc/latex/xcite/README +++ b/Master/texmf-dist/doc/latex/xcite/README @@ -1,9 +1,13 @@ The xcite lets you use citations keys used in another document, just like the package xr does with labels. -This is version 1.0 of the package +This is version 16383.99998 of the package. -Copyright (C) 2011 by Enrico Gregorio +Actually this is the final version which just loads +xr, which now includes the facilities previously in +xcite. + +Copyright (C) 2011-2020 by Enrico Gregorio ------------------------------------------------------- @@ -37,5 +41,5 @@ o run "pdflatex xcite.dtx" o run "makeindex -s gglo.ist -o xcite.gls xcite.glo" o run "pdflatex xcite.dtx" -2011/09/02 +2020/01/21 Enrico Gregorio diff --git a/Master/texmf-dist/doc/latex/xcite/xcite.pdf b/Master/texmf-dist/doc/latex/xcite/xcite.pdf index 5d5ad24c1a4..5b564e83907 100644 Binary files a/Master/texmf-dist/doc/latex/xcite/xcite.pdf and b/Master/texmf-dist/doc/latex/xcite/xcite.pdf differ diff --git a/Master/texmf-dist/source/latex/xcite/xcite.dtx b/Master/texmf-dist/source/latex/xcite/xcite.dtx index d341e4399d2..52fb1c8eb02 100644 --- a/Master/texmf-dist/source/latex/xcite/xcite.dtx +++ b/Master/texmf-dist/source/latex/xcite/xcite.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 2011 Enrico Gregorio +% Copyright 2011-2020 Enrico Gregorio % % This file may be distributed and/or modified under the conditions of % the LaTeX Project Public License, either version 1.3c of this @@ -28,7 +28,7 @@ %\NeedsTeXFormat{LaTeX2e} %\ProvidesPackage{xcite} %<*package> - [2011/09/02 v1.0 eXternal Citations (EG)] + [2020/01/21 v16383.99998 eXternal Citations (EG)] % % %<*driver> @@ -45,8 +45,10 @@ % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% \CheckSum{82} +% \CheckSum{2} % +% \changes{v16383.99998}{2020/01/21} +% {Final version} % \changes{v1.00}{2011/09/02} % {First version} % @@ -55,51 +57,14 @@ % \title{The \textsf{xcite} package\thanks{This file % has version number \fileversion, last % revised \filedate.}} -% \author{Enrico Gregorio\thanks{% -% This package derives from \textsf{xr} by David Carlisle}\\ -% {\small\texttt{Enrico dot Gregorio at univr dot it}}} +% \author{Enrico Gregorio\thanks{\texttt{Enrico dot Gregorio at univr dot it}}} % \date{\filedate} % \maketitle % % \section{Description} -% This package implements a system for eXternal Citations. -% If one document needs to refer to citations in another, say |aaa.tex|, -% then this package may be loaded in the main file, and the command\\[\topsep] -% |\externalcitedocument{aaa}|\\[\topsep] -% given in the preamble. -% -% Then you may use |\cite| to refer to anything which has been -% declared by |\bibitem| in either |aaa.tex| or the main document. -% You may declare any number of such external documents. Notice that -% |\bibitem| commands may not appear in |aaa.tex|, but rather in -% |aaa.bbl| if \textsc{Bib}\negthinspace\TeX{} or Biber are used to -% generate the bibliography, but this doesn't matter. The important -% thing is that |aaa.tex| is in final form with all citations resolved -% and that |aaa.aux| is readable. -% -% If any of the external documents, or the main document, use the same -% citation key then an error will occur as the label will be multiply -% defined. To overcome this problem |\externalcitedocument| has an -% optional argument. If you declare\\[\topsep] -% |\externalcitedocument[A-]{aaa}|\\[\topsep] -% then all references from |aaa| are prefixed by |A-|. So for -% instance, if |aaa.tex| had |\bibitem{xyz}|, then this could be -% referenced with |\cite{A-xyz}|. The prefix need not be |A-|, it can -% be any string chosen to ensure that all the keys imported from -% external files are unique. Note however that if your style declares -% certain active characters (|:| in French, |"| in German) then these -% characters can not usually be used in |\cite|, and similarly may -% not be used in the optional argument to |\externalcitedocument|. -% -% \section{Acknowledgment} -% This package is just a straightforward modification of David -% Carlisle's \textsf{xr} package (based on Jean-Pierre Drucbert's -% work). The changes consisted in renaming the main command and -% substituting |\newlabel| with |\bibcite|; the |XR| prefix to -% internal commands has been changed into |XC|. -% -% These modifications are possible because |\newlabel| and |\bibcite| -% are almost the same command in disguise. +% This package is a stub that just loads \texttt{xr}, that, +% starting from version 5.05 (released 2019/07/20) includes +% the facilities previously in \texttt{xcite}. % % This package originated from a question in % |TeX.StackExchange.com|.\footnote{\ttfamily @@ -113,77 +78,11 @@ %<*package> % \end{macrocode} % -% Save the optional prefix. Start processing the first |aux| file. +% Load \texttt{xr} % \begin{macrocode} -\newcommand\externalcitedocument[2][]{{% - \makeatletter - \def\XC@prefix{#1}% - \XC@next#2.aux\relax\\}} -% \end{macrocode} -% -% Process the next |aux| file in the list and remove it from the head of -% the list of files to process. -% \begin{macrocode} -\def\XC@next#1\relax#2\\{% - \edef\XC@list{#2}% - \XC@loop{#1}} -% \end{macrocode} -% -% Check whether the list of |aux| files is empty. -% \begin{macrocode} -\def\XC@aux{% - \ifx\XC@list\@empty\else\expandafter\XC@explist\fi} -% \end{macrocode} -% -% Expand the list of |aux| files, and call |\XC@next| to process the first -% one. -% \begin{macrocode} -\def\XC@explist{\expandafter\XC@next\XC@list\\} -% \end{macrocode} -% -% If the |aux| file exists, loop through line by line, looking for -% |\bibcite| and |\@input|. Otherwise process the next file in the -% list. -% \begin{macrocode} -\def\XC@loop#1{\openin\@inputcheck#1\relax - \ifeof\@inputcheck - \PackageWarning{xc}{^^JNo file #1^^JLABELS NOT IMPORTED.^^J}% - \expandafter\XC@aux - \else - \PackageInfo{xc}{IMPORTING LABELS FROM #1}% - \expandafter\XC@read\fi} -% \end{macrocode} -% -% Read the next line of the aux file. -% \begin{macrocode} -\def\XC@read{% - \read\@inputcheck to\XC@line -% \end{macrocode} -% The |...| make sure that |\XC@test| always has sufficient arguments. -% \begin{macrocode} - \expandafter\XC@test\XC@line...\XC@} -% \end{macrocode} -% -% Look at the first token of the line. -% If it is |\bibcite|, do the |\bibcite|. If it is |\@input|, add the -% filename to the list of files to process. Otherwise ignore. -% Go around the loop if not at end of file. Finally process the next -% file in the list. -% \begin{macrocode} -\long\def\XC@test#1#2#3#4\XC@{% - \ifx#1\bibcite - \bibcite{\XC@prefix#2}{#3}% - \else\ifx#1\@input - \edef\XC@list{\XC@list#2\relax}% - \fi\fi - \ifeof\@inputcheck\expandafter\XC@aux - \else\expandafter\XC@read\fi} -% \end{macrocode} -% -% \begin{macrocode} -% +\RequirePackage{xr} +\endinput % \end{macrocode} % % \Finale % - diff --git a/Master/texmf-dist/source/latex/xcite/xcite.ins b/Master/texmf-dist/source/latex/xcite/xcite.ins index 91dc70f7f67..32899ceb0d1 100644 --- a/Master/texmf-dist/source/latex/xcite/xcite.ins +++ b/Master/texmf-dist/source/latex/xcite/xcite.ins @@ -1,4 +1,4 @@ -% Copyright (C) 2011 by Enrico Gregorio +% Copyright (C) 2011-2020 by Enrico Gregorio % % ------------------------------------------------------- % @@ -28,7 +28,7 @@ This is a generated file. -Copyright (C) 2011 by Enrico Gregorio +Copyright (C) 2011-2020 by Enrico Gregorio ------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/xcite/xcite.sty b/Master/texmf-dist/tex/latex/xcite/xcite.sty index ce30889ce6c..8eb583ef7c3 100644 --- a/Master/texmf-dist/tex/latex/xcite/xcite.sty +++ b/Master/texmf-dist/tex/latex/xcite/xcite.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2011 by Enrico Gregorio +%% Copyright (C) 2011-2020 by Enrico Gregorio %% %% ------------------------------------------------------- %% @@ -31,36 +31,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{xcite} - [2011/09/02 v1.0 eXternal Citations (EG)] -\newcommand\externalcitedocument[2][]{{% - \makeatletter - \def\XC@prefix{#1}% - \XC@next#2.aux\relax\\}} -\def\XC@next#1\relax#2\\{% - \edef\XC@list{#2}% - \XC@loop{#1}} -\def\XC@aux{% - \ifx\XC@list\@empty\else\expandafter\XC@explist\fi} -\def\XC@explist{\expandafter\XC@next\XC@list\\} -\def\XC@loop#1{\openin\@inputcheck#1\relax - \ifeof\@inputcheck - \PackageWarning{xc}{^^JNo file #1^^JLABELS NOT IMPORTED.^^J}% - \expandafter\XC@aux - \else - \PackageInfo{xc}{IMPORTING LABELS FROM #1}% - \expandafter\XC@read\fi} -\def\XC@read{% - \read\@inputcheck to\XC@line - \expandafter\XC@test\XC@line...\XC@} -\long\def\XC@test#1#2#3#4\XC@{% - \ifx#1\bibcite - \bibcite{\XC@prefix#2}{#3}% - \else\ifx#1\@input - \edef\XC@list{\XC@list#2\relax}% - \fi\fi - \ifeof\@inputcheck\expandafter\XC@aux - \else\expandafter\XC@read\fi} - + [2020/01/21 v16383.99998 eXternal Citations (EG)] +\RequirePackage{xr} \endinput %% %% End of file `xcite.sty'. -- cgit v1.2.3