[latex3-commits] [git/LaTeX3-latex3-latex2e] develop: Merge branch 'varioref' into develop added rollback for \labelformat, \rRef and \refstepcounter (d88dc703)

[Frank Mittelbach]

Repository : https://github.com/latex3/latex2e
On branch  : develop
Link       : https://github.com/latex3/latex2e/commit/d88dc703f5653ad853fd220ed1ea7ca5af06ef90

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

commit d88dc703f5653ad853fd220ed1ea7ca5af06ef90
Merge: cffc0dc2 8a7c6017
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Mon Sep 9 15:13:28 2019 +0200

    Merge branch 'varioref' into develop
    added rollback for \labelformat, \rRef and \refstepcounter


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

d88dc703f5653ad853fd220ed1ea7ca5af06ef90
 .gitignore                                         |   15 +-
 base/doc/ltnews30.tex                              |   31 +
 base/ltxref.dtx                                    |   31 +
 required/tools/build.lua                           |    4 +
 required/tools/changes.txt                         |   23 +
 required/tools/config-search.lua                   |    7 +
 .../tools/testfiles-search/support/hyperref.sty    | 8976 ++++++++++++++++++++
 .../tools/testfiles-search/support/nameref.sty     |  534 ++
 .../tools/testfiles-search/tlb-varioref-001.lvt    |   92 +
 .../testfiles-search/tlb-varioref-001.tlg}         | 2051 ++---
 .../tools/testfiles-search/tlb-varioref-002.lvt    |   93 +
 .../testfiles-search/tlb-varioref-002.tlg}         | 2037 ++---
 .../tools/testfiles-search/tlb-varioref-003.lvt    |   94 +
 .../tools/testfiles-search/tlb-varioref-003.tlg    | 1738 ++++
 .../tools/testfiles-search/tlb-varioref-004.lvt    |   91 +
 .../tools/testfiles-search/tlb-varioref-004.tlg    | 1676 ++++
 .../tools/testfiles-search/tlb-varioref-005.lvt    |   96 +
 .../tools/testfiles-search/tlb-varioref-005.tlg    | 1784 ++++
 .../tools/testfiles-search/tlb-varioref-006.lvt    |   45 +
 .../tools/testfiles-search/tlb-varioref-006.tlg    |   12 +
 .../tools/testfiles-search/tlb-varioref-007.lvt    |   47 +
 .../tools/testfiles-search/tlb-varioref-007.tlg    |   13 +
 required/tools/varioref-2016-02-16.sty             |  779 ++
 required/tools/varioref.dtx                        |  606 +-
 required/tools/varioref.ins                        |    2 +-
 support/texlive.sh                                 |    6 +-
 26 files changed, 18747 insertions(+), 2136 deletions(-)

diff --cc base/ltxref.dtx
index a890c11c,a890c11c..1d8c41c4
--- a/base/ltxref.dtx
+++ b/base/ltxref.dtx
@@@ -308,6 -308,6 +308,13 @@@
  %    \end{macrocode}
  % \end{macro}
  %
++%    \begin{macrocode}
++%</2ekernel>
++%<*2ekernel|latexrelease>
++%<latexrelease>\IncludeInRelease{2019/10/01}%
++%<latexrelease>                 {\refstepcounter}{Add \labelformat and \Ref}%
++%    \end{macrocode}
++%    
  %  \begin{macro}{\refstepcounter}
  %     Step the counter and allow for labels to point to its current value.
  %    \begin{macrocode}
@@@ -369,6 -369,6 +376,30 @@@
  %  \end{macro}
  %
  %
++%
++%    \begin{macrocode}
++%</2ekernel|latexrelease>
++%<latexrelease>\EndIncludeInRelease
++%<latexrelease>\IncludeInRelease{0000/00/00}%
++%<latexrelease>                 {\refstepcounter}{Add \labelformat and \Ref}%
++%<latexrelease>
++%<latexrelease>\def\refstepcounter#1{\stepcounter{#1}%
++%<latexrelease>    \protected at edef\@currentlabel
++%<latexrelease>       {\csname p@#1\expandafter\endcsname\csname the#1\endcsname}%
++%<latexrelease>}
++%<latexrelease>\let\labelformat\@undefined
++%<latexrelease>\let\Ref\@undefined
++%<latexrelease>
++%<latexrelease>\EndIncludeInRelease
++%<*2ekernel>
++%    \end{macrocode}
++%    
++%    
++%    
++%    
++%    
++%
++%
  %  \begin{macro}{\@currentlabel}
  %    Default for |\label| commands that come before any environment.
  %    \begin{macrocode}
diff --cc required/tools/changes.txt
index a702ac74,6c4a386e..e1697077
--- a/required/tools/changes.txt
+++ b/required/tools/changes.txt
@@@ -5,11 -5,28 +5,34 @@@ completeness or accuracy and it contain
  are not part of the distribution.
  =======================================================================
  
++
+ 2019-09-09  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
+ 
+ 	* varioref.dtx (subsection{Options}:
+ 	Option arabic added
+ 
 +2019-08-31  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
 +
 +	* array.dtx: Add a necessary \expandafter so that redefinitions
 +	of primitive specifiers	give a warning (github/148)
 +
+ 2019-08-25  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
+ 
+ 	* varioref.dtx: \labelformat and \Ref now available in the kernel
+         so removed from this package but only if running on new kernel
+ 
+ 	(subsection{Options}):
+ 	Provide options space and nospace
+ 
+ 	(subsection{Defining the main macros}):
+ 	Don't drop a preceding space completely but reinsert it later
+ 	after setting a label;
+ 	Command \vp at gerefstar, \vref at star and \Vref at star added to support
+ 	hyperref better
+ 
+ 	(subsubsection{Supporting ranges}):
+ 	Added \vpagerefcompare, \vpagrefnearby and \vpagerefcomparenearby
+ 
  2019-03-01  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
  
  	* multicol.dtx (subsection{The output routines}):