[latex3-commits] [git/LaTeX3-latex3-latex2e] master: Revert "merge in egreg's xcite package" (137ccd61)

[David Carlisle]

Repository : https://github.com/latex3/latex2e
On branch  : master
Link       : https://github.com/latex3/latex2e/commit/137ccd61f9066dbb65bb904256ac2206fc0f28b5

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

commit 137ccd61f9066dbb65bb904256ac2206fc0f28b5
Author: David Carlisle <d.p.carlisle at gmail.com>
Date:   Tue Jul 23 09:11:58 2019 +0100

    Revert "merge in egreg's xcite package"
    
    This reverts commit 6f6ed1bd26a1c87880f880f3d81bfdee9ece003b.


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

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

diff --git a/required/tools/xr.dtx b/required/tools/xr.dtx
index 8ba21dd0..7889f713 100644
--- a/required/tools/xr.dtx
+++ b/required/tools/xr.dtx
@@ -1,6 +1,7 @@
 % \iffalse meta-comment
 %
-% Copyright 1993-2019
+% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+% 2006 2008 2009 2018 2019
 % The LaTeX3 Project and any individual authors listed elsewhere
 % in this file.
 %
@@ -20,11 +21,11 @@
 %
 % \fi
 % \iffalse
-%% File: xr.dtx Copyright (C) 1993-2019 David Carlisle
+%% File: xr.dtx Copyright (C) 1994-1994 2018 2019 David Carlisle
 %
 %<package>\NeedsTeXFormat{LaTeX2e}
 %<package>\ProvidesPackage{xr}
-%<package>         [2019/07/22 v5.05 eXternal References (DPC)]
+%<package>         [2019/01/05 v5.04 eXternal References (DPC)]
 %
 %<*driver>
 \documentclass{ltxdoc}
@@ -55,8 +56,7 @@
 %           aux files of \cmd\include'ed files. (Reported by J-PD)}
 %
 % \changes{v5.02}{1994/05/28}{Update for LaTeX2e}
-% \changes{v5.03}{2018/10/01}{Fix for conditionals in aux file}
-% \changes{v5.05}{2019/07/20}{include xcite}
+% \changes{v5.02}{1994/05/28}{Fix for conditionals in aux file}
 %
 %
 % This package implements a system for eXternal References.
@@ -83,11 +83,6 @@
 % 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}
@@ -99,7 +94,6 @@
 % 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.
@@ -165,13 +159,11 @@
 \long\def\XR at test#1#2#3#4\XR@{%
   \let\XR at tempa\@gobbletwo
   \ifx#1\newlabel
-    \let\XR at tempa\@firstoftwo
-  \else\ifx#1\bibcite
-    \let\XR at tempa\@firstoftwo
+    \let\XR at tempa\@firstoftwo%
   \else\ifx#1\@input
      \let\XR at tempa\@secondoftwo
-  \fi\fi\fi
-   \XR at tempa{#1{\XR at prefix#2}{#3}}{\edef\XR at list{\XR at list#2\relax}}%
+  \fi\fi
+   \XR at tempa{\newlabel{\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}