[latex3-commits] [git/LaTeX3-latex3-latex2e] master: merge in egreg's xcite package (6f6ed1bd)

[David Carlisle]

Repository : https://github.com/latex3/latex2e
On branch  : master
Link       : https://github.com/latex3/latex2e/commit/6f6ed1bd26a1c87880f880f3d81bfdee9ece003b

>---------------------------------------------------------------

commit 6f6ed1bd26a1c87880f880f3d81bfdee9ece003b
Author: David Carlisle <d.p.carlisle at gmail.com>
Date:   Tue Jul 23 09:03:34 2019 +0100

    merge in egreg's xcite package


>---------------------------------------------------------------

6f6ed1bd26a1c87880f880f3d81bfdee9ece003b
 required/tools/xr.dtx | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/required/tools/xr.dtx b/required/tools/xr.dtx
index 7889f713..8ba21dd0 100644
--- a/required/tools/xr.dtx
+++ b/required/tools/xr.dtx
@@ -1,7 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
-% 2006 2008 2009 2018 2019
+% Copyright 1993-2019
 % The LaTeX3 Project and any individual authors listed elsewhere
 % in this file.
 %
@@ -21,11 +20,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 +55,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 +83,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 +99,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 +165,13 @@
 \long\def\XR at test#1#2#3#4\XR@{%
   \let\XR at tempa\@gobbletwo
   \ifx#1\newlabel
-    \let\XR at tempa\@firstoftwo%
+    \let\XR at tempa\@firstoftwo
+  \else\ifx#1\bibcite
+    \let\XR at tempa\@firstoftwo
   \else\ifx#1\@input
      \let\XR at tempa\@secondoftwo
-  \fi\fi
-   \XR at tempa{\newlabel{\XR at prefix#2}{#3}}{\edef\XR at list{\XR at list#2\relax}}%
+  \fi\fi\fi
+   \XR at tempa{#1{\XR at prefix#2}{#3}}{\edef\XR at list{\XR at list#2\relax}}%
   \ifeof\@inputcheck\expandafter\XR at aux
   \else\expandafter\XR at read\fi}
 %    \end{macrocode}