xr-hyper and xr fixes, tex4ht r230, http://puszcza.gnu.org.ua/bugs/?349

git-svn-id: svn://tug.org/texlive/trunk@42768 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 56 insertions, 68 deletions

diff --git a/Master/texmf-dist/tex/generic/tex4ht/xr-hyper.4ht b/Master/texmf-dist/tex/generic/tex4ht/xr-hyper.4ht
index 536c2e562cd..9b55d050be6 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/xr-hyper.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/xr-hyper.4ht
@@ -1,30 +1,23 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% xr-hyper.4ht                          2009-05-21-09:32 %
-% Copyright (C) 2003--2009       Eitan M. Gurari         %
-%                                                        %
-% This work may be distributed and/or modified under the %
-% conditions of the LaTeX Project Public License, either %
-% version 1.3c of this license or (at your option) any   %
-% later version. 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.                  %
-%                                                        %
-% This work has the LPPL maintenance status "maintained".%
-%                                                        %
-% This Current Maintainer of this work                   %
-% is Eitan M. Gurari.                                    %
-%                                                        %
-% If you modify this program your changing its signature %
-% with a directive of the following form will be         %
-% appreciated.                                           %
-%            \message{signature}                         %
-%                                                        %
-%                             gurari@cse.ohio-state.edu  %
-%                 http://www.cse.ohio-state.edu/~gurari  %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\immediate\write-1{version 2009-05-21-09:32}
+% xr-hyper.4ht (2016-12-21-15:03), generated from tex4ht-4ht.tex
+% Copyright 2003-2009 Eitan M. Gurari
+% Copyright 2009-2016 TeX Users Group
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either
+% version 1.3c of this license or (at your option) any
+% later version. 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.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% The Current Maintainer of this work
+% is the TeX4ht Project <http://tug.org/tex4ht>.
+%
+% If you modify this program, changing the
+% version identification would be appreciated.
+\immediate\write-1{version 2016-12-21-15:03}
 
    \let\XR:loop=\XR@loop
 \def\XR@loop#1{%
@@ -49,13 +42,6 @@
    \catcode`\:=12
    \XR:loop{#1}%
 }
-\def\XRrEfLiNK[#1]#2#3{\a:xr[#1]{#2}{}%
-   \ifx\hyperrefLabel\:UnDef #3\else \hyperrefLabel\fi \b:xr}
-\NewConfigure{xr}{2}
-\Configure{xr}{\Link}{\EndLink}
-\def\XR:rEfLiNK#1#2{{\xr:rEfLiNK#1}{\xr:rEfLiNK#2}}
-\def\xr:rEfLiNK#1#2{\noexpand\XRrEfLiNK[\Get:HFile#2-]{#2}}
-\def\Get:HFile#1-#2-{\:LikeRef{)F\:gobble #1F-}}
 \long\def\XR@test#1#2#3#4\XR@{%
   \ifx#1\newlabel
      \expandafter\xdef\csname r@\XR@prefix#2\endcsname{\XR:rEfLiNK #3}%
@@ -66,6 +52,14 @@
   \ifeof\@inputcheck\expandafter\XR@aux
   \else\expandafter\XR@read\fi}
 
+   \def\XRrEfLiNK[#1]#2#3{\a:xr[#1]{#2}{}%
+   \ifx\hyperrefLabel\:UnDef #3\else \hyperrefLabel\fi \b:xr}
+\NewConfigure{xr}{2}
+\Configure{xr}{\Link}{\EndLink}
+\def\XR:rEfLiNK#1#2#3#4#5{{\xr:rEfLiNK#1}{\xr:rEfLiNK#2}{\xr:rEfLiNK#3}}
+\def\xr:rEfLiNK#1#2{\noexpand\XRrEfLiNK[\Get:HFile#2-]{#2}}
+\def\Get:HFile#1-#2-{\:LikeRef{)F\:gobble #1F-}}
+
 \Hinput{xr}
 \endinput
 
diff --git a/Master/texmf-dist/tex/generic/tex4ht/xr.4ht b/Master/texmf-dist/tex/generic/tex4ht/xr.4ht
index 7a6810f0d3a..3e6ddac571c 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/xr.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/xr.4ht
@@ -1,30 +1,23 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% xr.4ht                                2009-05-21-09:32 %
-% Copyright (C) 1997--2009       Eitan M. Gurari         %
-%                                                        %
-% This work may be distributed and/or modified under the %
-% conditions of the LaTeX Project Public License, either %
-% version 1.3c of this license or (at your option) any   %
-% later version. 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.                  %
-%                                                        %
-% This work has the LPPL maintenance status "maintained".%
-%                                                        %
-% This Current Maintainer of this work                   %
-% is Eitan M. Gurari.                                    %
-%                                                        %
-% If you modify this program your changing its signature %
-% with a directive of the following form will be         %
-% appreciated.                                           %
-%            \message{signature}                         %
-%                                                        %
-%                             gurari@cse.ohio-state.edu  %
-%                 http://www.cse.ohio-state.edu/~gurari  %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\immediate\write-1{version 2009-05-21-09:32}
+% xr.4ht (2016-12-21-15:03), generated from tex4ht-4ht.tex
+% Copyright 1997-2009 Eitan M. Gurari
+% Copyright 2009-2016 TeX Users Group
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either
+% version 1.3c of this license or (at your option) any
+% later version. 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.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% The Current Maintainer of this work
+% is the TeX4ht Project <http://tug.org/tex4ht>.
+%
+% If you modify this program, changing the
+% version identification would be appreciated.
+\immediate\write-1{version 2016-12-21-15:03}
 
    \let\XR:loop=\XR@loop
 \def\XR@loop#1{%
@@ -49,13 +42,6 @@
    \catcode`\:=12
    \XR:loop{#1}%
 }
-\def\XRrEfLiNK[#1]#2#3{\a:xr[#1]{#2}{}%
-   \ifx\hyperrefLabel\:UnDef #3\else \hyperrefLabel\fi \b:xr}
-\NewConfigure{xr}{2}
-\Configure{xr}{\Link}{\EndLink}
-\def\XR:rEfLiNK#1#2{{\xr:rEfLiNK#1}{\xr:rEfLiNK#2}}
-\def\xr:rEfLiNK#1#2{\noexpand\XRrEfLiNK[\Get:HFile#2-]{#2}}
-\def\Get:HFile#1-#2-{\:LikeRef{)F\:gobble #1F-}}
 \long\def\XR@test#1#2#3#4\XR@{%
   \ifx#1\newlabel
      \expandafter\xdef\csname r@\XR@prefix#2\endcsname{\XR:rEfLiNK #3}%
@@ -66,6 +52,14 @@
   \ifeof\@inputcheck\expandafter\XR@aux
   \else\expandafter\XR@read\fi}
 
+   \def\XRrEfLiNK[#1]#2#3{\a:xr[#1]{#2}{}%
+   \ifx\hyperrefLabel\:UnDef #3\else \hyperrefLabel\fi \b:xr}
+\NewConfigure{xr}{2}
+\Configure{xr}{\Link}{\EndLink}
+\def\XR:rEfLiNK#1#2{{\xr:rEfLiNK#1}{\xr:rEfLiNK#2}}
+\def\xr:rEfLiNK#1#2{\noexpand\XRrEfLiNK[\Get:HFile#2-]{#2}}
+\def\Get:HFile#1-#2-{\:LikeRef{)F\:gobble #1F-}}
+
 \Hinput{xr}
 \endinput