From 71e5bc6bd74cdffb42f06b3428b74ac4c2fac518 Mon Sep 17 00:00:00 2001 From: David Carlisle Date: Tue, 23 Jul 2019 09:13:58 +0100 Subject: [PATCH 1/3] merge in egreg's xcite package --- required/tools/xr.dtx | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/required/tools/xr.dtx b/required/tools/xr.dtx index 7889f713e..c8cc83cdc 100644 --- a/required/tools/xr.dtx +++ b/required/tools/xr.dtx @@ -25,7 +25,7 @@ % %\NeedsTeXFormat{LaTeX2e} %\ProvidesPackage{xr} -% [2019/01/05 v5.04 eXternal References (DPC)] +% [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} From 82de30b1e71a00627494f4e0cd2442cc207c4724 Mon Sep 17 00:00:00 2001 From: Frank Mittelbach Date: Thu, 25 Jul 2019 12:33:32 +0200 Subject: [PATCH 2/3] document xr change in ltnews --- doc/ltnews30.tex | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/doc/ltnews30.tex b/doc/ltnews30.tex index 7b4b282cc..2e75baa48 100644 --- a/doc/ltnews30.tex +++ b/doc/ltnews30.tex @@ -13,7 +13,7 @@ % The latest version of this license is in % http://www.latex-project.org/lppl.txt % and version 1.3c or later is part of all distributions of LaTeX -% version 2005/12/01 or later. +% version 2008 or later. % % This file has the LPPL maintenance status "maintained". % @@ -265,7 +265,21 @@ \subsection{\pkg{multicol}: Introduce \texttt{minrows} counter for balancing} now gives you the tools to make local or global adjustments. - +\subsection{\pkg{xr}: Support citations to bibiographies in external documents} + +The \pkg{xr} package can be used to reference labels in external +document, e.g., when a work is split over different documents that +need to be processed separateley, but has \cs{ref} or \cs{pageref} +links between each other. With this update \cs{cite} commands and +their cousins can now also reference bibliographies in external +documents, a feature that was originally made available by the package +\pkg{xcite} by Enrico Gregorio. + +Note that for technical reasons \pkg{xr} doesn't work with +\pkg{hyperref}. Use \pkg{xr-hyper} instead if you need the latter +package. + + \section{Changes to packages in the \pkg{amsmath} category} \subsection{\pkg{amsmath}: Introduce \texttt{overunderset} command} From 7afbbb690566a6c64bed7ef90be3f51d3288e227 Mon Sep 17 00:00:00 2001 From: David Carlisle Date: Sun, 28 Jul 2019 20:47:46 +0100 Subject: [PATCH 3/3] simplify copyright date lists --- required/tools/xr.dtx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/required/tools/xr.dtx b/required/tools/xr.dtx index c8cc83cdc..8ba21dd07 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,7 +20,7 @@ % % \fi % \iffalse -%% File: xr.dtx Copyright (C) 1994-1994 2018 2019 David Carlisle +%% File: xr.dtx Copyright (C) 1993-2019 David Carlisle % %\NeedsTeXFormat{LaTeX2e} %\ProvidesPackage{xr}