diff options
author | Karl Berry <karl@freefriends.org> | 2019-10-04 20:57:14 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-10-04 20:57:14 +0000 |
commit | 70aaae3b3c98fb6357c846ad54ce2367e9682f50 (patch) | |
tree | f0446e015c31510a11ada780ad4978dce03ad104 /Master/texmf-dist/source/latex/tools/xr.dtx | |
parent | be53f9d0af947622afca67b99c89a90d5c08dbd4 (diff) |
latex2e (4oct19)
git-svn-id: svn://tug.org/texlive/trunk@52286 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/tools/xr.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/tools/xr.dtx | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/Master/texmf-dist/source/latex/tools/xr.dtx b/Master/texmf-dist/source/latex/tools/xr.dtx index 7889f713e91..417a98c1c1e 100644 --- a/Master/texmf-dist/source/latex/tools/xr.dtx +++ b/Master/texmf-dist/source/latex/tools/xr.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment % -% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 -% 2006 2008 2009 2018 2019 +% Copyright (C) 1993-2019 +% % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -21,11 +21,11 @@ % % \fi % \iffalse -%% File: xr.dtx Copyright (C) 1994-1994 2018 2019 David Carlisle +%% File: xr.dtx Copyright (C) 1993-2019 David Carlisle % %<package>\NeedsTeXFormat{LaTeX2e} %<package>\ProvidesPackage{xr} -%<package> [2019/01/05 v5.04 eXternal References (DPC)] +%<package> [2019/07/22 v5.05 eXternal References (DPC)] % %<*driver> \documentclass{ltxdoc} @@ -56,7 +56,8 @@ % aux files of \cmd\include'ed files. (Reported by J-PD)} % % \changes{v5.02}{1994/05/28}{Update for LaTeX2e} -% \changes{v5.02}{1994/05/28}{Fix for conditionals in aux file} +% \changes{v5.03}{2018/10/01}{Fix for conditionals in aux file} +% \changes{v5.05}{2019/07/20}{include xcite} % % % This package implements a system for eXternal References. @@ -83,6 +84,11 @@ % characters can not usually be used in |\label|, and similarly may not % be used in the optional argument to |\externaldocument|. % +% As first suggested in Enrico Gregorio's |xcite| package, the current version +% also allows |\cite| to reference |\bibitem| in the external document. +% For fcompatibility with |xcite|, |\externalcitedocument| is made available +% as an alias for |\externaldocument| +% % \StopEventually{} % % \section{The macros} @@ -94,6 +100,7 @@ % Check for the optional argument. % \begin{macrocode} \def\externaldocument{\@ifnextchar[\XR@{\XR@[]}} +\let\externalcitedocument\externaldocument % \end{macrocode} % % Save the optional prefix. Start processing the first |aux| file. @@ -159,11 +166,13 @@ \long\def\XR@test#1#2#3#4\XR@{% \let\XR@tempa\@gobbletwo \ifx#1\newlabel - \let\XR@tempa\@firstoftwo% + \let\XR@tempa\@firstoftwo + \else\ifx#1\bibcite + \let\XR@tempa\@firstoftwo \else\ifx#1\@input \let\XR@tempa\@secondoftwo - \fi\fi - \XR@tempa{\newlabel{\XR@prefix#2}{#3}}{\edef\XR@list{\XR@list#2\relax}}% + \fi\fi\fi + \XR@tempa{#1{\XR@prefix#2}{#3}}{\edef\XR@list{\XR@list#2\relax}}% \ifeof\@inputcheck\expandafter\XR@aux \else\expandafter\XR@read\fi} % \end{macrocode} |