[latex3-commits] [git/LaTeX3-latex3-latex2e] master: fix for issue #106 (3b63749)

[David Carlisle]

Repository : https://github.com/latex3/latex2e
On branch  : master
Link       : https://github.com/latex3/latex2e/commit/3b63749053de48c5abe4f1e0925cd985631e2d2c

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

commit 3b63749053de48c5abe4f1e0925cd985631e2d2c
Author: David Carlisle <d.p.carlisle at gmail.com>
Date:   Sat Jan 5 14:01:21 2019 +0000

    fix for issue #106


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

3b63749053de48c5abe4f1e0925cd985631e2d2c
 required/tools/changes.txt                         |    8 +++++++
 required/tools/testfiles/github-0106.lvt           |   25 ++++++++++++++++++++
 .../tools/testfiles/github-0106.tlg                |   12 +++++++++-
 required/tools/xr.dtx                              |   14 +++++------
 4 files changed, 51 insertions(+), 8 deletions(-)

diff --git a/required/tools/changes.txt b/required/tools/changes.txt
index f9b3e57..1717b3d 100644
--- a/required/tools/changes.txt
+++ b/required/tools/changes.txt
@@ -18,6 +18,14 @@ are not part of the distribution.
 	obscure to worry about it (gh/101)
 
 #########################
+# 2019-01-05 Release
+#########################
+
+2019-01-05  David Carlisle  <David.Carlisle at latex-project.org>
+
+	* required/tools/xr.dtx: Fix to last update to avoid breaking \include handling.
+
+#########################
 # 2018-12-01 Release
 #########################
 
diff --git a/required/tools/testfiles/github-0106.lvt b/required/tools/testfiles/github-0106.lvt
new file mode 100644
index 0000000..dedbcf0
--- /dev/null
+++ b/required/tools/testfiles/github-0106.lvt
@@ -0,0 +1,25 @@
+\begin{filecontents}{github-0106-a.aux}
+\@input{github-0106-b.aux}
+\end{filecontents}
+\begin{filecontents}{github-0106-b.aux}
+\newlabel{foo}{{111}{222}}
+\end{filecontents}
+
+\input{test2e}
+% test file for xr (github issue 106)
+
+\documentclass{article}
+\usepackage{xr}
+
+\START
+\externaldocument{github-0106-a}
+
+
+
+
+\begin{document}
+
+\sbox0{\ref{foo}}
+\showbox0
+
+\END
diff --git a/base/testfiles/tlb-ealloc-002.tlg b/required/tools/testfiles/github-0106.tlg
similarity index 72%
copy from base/testfiles/tlb-ealloc-002.tlg
copy to required/tools/testfiles/github-0106.tlg
index bb1727a..a896168 100644
--- a/base/testfiles/tlb-ealloc-002.tlg
+++ b/required/tools/testfiles/github-0106.tlg
@@ -1,6 +1,8 @@
 This is a generated file for the LaTeX2e validation system.
 Don't change this file in any respect.
-(tlb-ealloc-002.aux)
+Package xr Info: IMPORTING LABELS FROM github-0106-a.aux on input line ....
+Package xr Info: IMPORTING LABELS FROM github-0106-b.aux on input line ....
+(github-0106.aux)
 LaTeX Font Info:    Checking defaults for OML/cmm/m/it on input line ....
 LaTeX Font Info:    ... okay on input line ....
 LaTeX Font Info:    Checking defaults for T1/cmr/m/n on input line ....
@@ -13,3 +15,11 @@ LaTeX Font Info:    Checking defaults for OMX/cmex/m/n on input line ....
 LaTeX Font Info:    ... okay on input line ....
 LaTeX Font Info:    Checking defaults for U/cmr/m/n on input line ....
 LaTeX Font Info:    ... okay on input line ....
+> \box...=
+\hbox(6.44444+0.0)x15.00005
+.\OT1/cmr/m/n/10 1
+.\OT1/cmr/m/n/10 1
+.\OT1/cmr/m/n/10 1
+.\hbox(0.0+0.0)x0.0
+! OK.
+l. ...\showbox0
diff --git a/required/tools/xr.dtx b/required/tools/xr.dtx
index c4bd41e..7889f71 100644
--- a/required/tools/xr.dtx
+++ b/required/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
+% 2006 2008 2009 2018 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 David Carlisle
+%% File: xr.dtx Copyright (C) 1994-1994 2018 2019 David Carlisle
 %
 %<package>\NeedsTeXFormat{LaTeX2e}
 %<package>\ProvidesPackage{xr}
-%<package>         [2018/10/01 v5.03 eXternal References (DPC)]
+%<package>         [2019/01/05 v5.04 eXternal References (DPC)]
 %
 %<*driver>
 \documentclass{ltxdoc}
@@ -157,13 +157,13 @@
 % 2018 update: make sure the arguments are handled outside the |\ifx| test,
 %    \begin{macrocode}
 \long\def\XR at test#1#2#3#4\XR@{%
-  \let\XR at next\@gobbletwo
+  \let\XR at tempa\@gobbletwo
   \ifx#1\newlabel
-    \let\XR at next\@firstoftwo%
+    \let\XR at tempa\@firstoftwo%
   \else\ifx#1\@input
-     \let\XR at next\@secondoftwo
+     \let\XR at tempa\@secondoftwo
   \fi\fi
-   \XR at next{\newlabel{\XR at prefix#2}{#3}}{\edef\XR at list{\XR at list#2\relax}}%
+   \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}