texlive[61278] Master/texmf-dist: undo nameref's patching of
commits+karl at tug.org
commits+karl at tug.org
Sat Dec 11 23:05:47 CET 2021
Revision: 61278
http://tug.org/svn/texlive?view=revision&revision=61278
Author: karl
Date: 2021-12-11 23:05:47 +0100 (Sat, 11 Dec 2021)
Log Message:
-----------
undo nameref's patching of \ifthenelse, tex4ht r1027; braces for image filenames in odt output, tex4ht r1028
Revision Links:
--------------
http://tug.org/svn/texlive?view=revision&revision=1027
http://tug.org/svn/texlive?view=revision&revision=1028
Modified Paths:
--------------
trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex
trunk/Master/texmf-dist/tex/generic/tex4ht/hyperref-hooks.4ht
trunk/Master/texmf-dist/tex/generic/tex4ht/ifthen.4ht
trunk/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht
Modified: trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog 2021-12-11 21:19:31 UTC (rev 61277)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog 2021-12-11 22:05:47 UTC (rev 61278)
@@ -1,3 +1,12 @@
+2021-12-11 Michal Hoftich <michal.h21 at gmail.com>
+
+ * tex4ht-ooffice.tex (ooffice.4ht): enclose image file names in braces, in
+ order to support spaces in filenames.
+
+ * tex4ht-4ht.tex (ifthen.4ht, hyperref-hooks.4ht): disable Nameref from
+ patching of the \ifthenelse command.
+ https://puszcza.gnu.org.ua/bugs/?534
+
2021-12-09 Michal Hoftich <michal.h21 at gmail.com>
* tex4ht-ooffice.tex (ooffice-mml.4ht): remove spurious space after inline
Modified: trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex 2021-12-11 21:19:31 UTC (rev 61277)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex 2021-12-11 22:05:47 UTC (rev 61278)
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 1025 2021-12-08 13:40:02Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1027 2021-12-10 23:22:54Z michal_h21 $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2021 TeX Users Group
@@ -5004,15 +5004,19 @@
|<load nameref in hyperref hooks|>
>>> \AddFile{9}{hyperref-hooks}
-This code introduces various issues with BibLaTeX. I've tried
-to remove it, which fixed BibLaTeX issues, but broke Nameref.
-So I reintroduce it, and will try to resolve BibLaTeX issues
-in a different way.
+We need to load Nameref here, otherwise lot of documents
+that use Hyperref fails. This caused issues with BibLaTeX,
+as both Nameref, BibLaTeX and TeX4ht redefine ifthenelse command.
+So we load explicitly the Ifthen package, let Nameref redefine it,
+and then revert to it's original definition before applying of
+TeX4ht hooks.
+
\<load nameref in hyperref hooks\><<<
\:AtEndOfPackage{%
\@ifpackageloaded{nameref}{}
{%
+ \RequirePackage{ifthen}%
\let\sv:label\label
\RequirePackage{nameref}%
\let\label\sv:label
@@ -13136,6 +13140,7 @@
% Copyright (C) |CopyYear.1997. Eitan M. Gurari %
|<TeX4ht copyright|>
+ |<fix nameref ifthen|>
|<fix ifthen|>
|<ifthen.sty shared config|>
\Hinput{ifthen}
@@ -13142,6 +13147,15 @@
\endinput
>>> \AddFile{7}{ifthen}
+Nameref redefines ifthenelse command, but it clashes with BibLaTeX,
+so we revert back to the original version.
+
+\<fix nameref ifthen\><<<
+\@ifpackageloaded{nameref}{%
+\let\ifthenelse\NROrg at ifthenelse%
+}{}
+>>>
+
\<fix ifthen\><<<
\long\def\:tempc{%
\let\sv:begingroup\begingroup
Modified: trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex 2021-12-11 21:19:31 UTC (rev 61277)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex 2021-12-11 22:05:47 UTC (rev 61278)
@@ -1,4 +1,4 @@
-% $Id: tex4ht-ooffice.tex 1026 2021-12-09 14:22:08Z michal_h21 $
+% $Id: tex4ht-ooffice.tex 1028 2021-12-11 17:51:14Z michal_h21 $
% compile 3 times: latex tex4ht-ooffice
% htlatex tex4ht-ooffice "xhtml,4,sections+"
%
@@ -1084,19 +1084,19 @@
\Configure{graphics*}
{gif}
- {|<save image name|>\Picture[IMG]{\imgBase.gif |<graphics dimensions|> }}
+ {|<save image name|>\Picture[IMG]{{\imgBase.gif} |<graphics dimensions|> }}
\Configure{graphics*}
{png}
- {|<save image name|>\Picture[IMG]{\imgBase.png |<graphics dimensions|> }}
+ {|<save image name|>\Picture[IMG]{{\imgBase.png} |<graphics dimensions|> }}
\Configure{graphics*}
{jpg}
- {|<save image name|>\Picture[IMG]{\imgBase.jpg |<graphics dimensions|> }}
+ {|<save image name|>\Picture[IMG]{{\imgBase.jpg} |<graphics dimensions|> }}
\Configure{graphics*}
{jpeg}
- {|<save image name|>\Picture[IMG]{\imgBase.jpeg |<graphics dimensions|> }}
+ {|<save image name|>\Picture[IMG]{{\imgBase.jpeg} |<graphics dimensions|> }}
\Configure{graphics*}
{svg}
- {|<save image name|>\Picture[IMG]{\imgBase.svg |<graphics dimensions|> }}
+ {|<save image name|>\Picture[IMG]{{\imgBase.svg} |<graphics dimensions|> }}
|<graphics default extensions|>
@@ -1140,7 +1140,7 @@
\<\><<<
\Configure{graphics*}
{eps}
- {|<save image name|>\Picture[IMG]{\imgBase.eps |<graphics dimensions|> }}
+ {|<save image name|>\Picture[IMG]{{\imgBase.eps} |<graphics dimensions|> }}
>>>
Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/hyperref-hooks.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/hyperref-hooks.4ht 2021-12-11 21:19:31 UTC (rev 61277)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/hyperref-hooks.4ht 2021-12-11 22:05:47 UTC (rev 61278)
@@ -1,4 +1,4 @@
-% hyperref-hooks.4ht (2021-12-08-13:19), generated from tex4ht-4ht.tex
+% hyperref-hooks.4ht (2021-12-11-13:37), generated from tex4ht-4ht.tex
% Copyright 2021 TeX Users Group
%
% This work may be distributed and/or modified under the
@@ -16,12 +16,13 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2021-12-08-13:19}
+\immediate\write-1{version 2021-12-11-13:37}
% we don't have any code here for now
\:AtEndOfPackage{%
\@ifpackageloaded{nameref}{}
{%
+ \RequirePackage{ifthen}%
\let\sv:label\label
\RequirePackage{nameref}%
\let\label\sv:label
Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/ifthen.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/ifthen.4ht 2021-12-11 21:19:31 UTC (rev 61277)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/ifthen.4ht 2021-12-11 22:05:47 UTC (rev 61278)
@@ -1,31 +1,27 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% ifthen.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 at cse.ohio-state.edu %
-% http://www.cse.ohio-state.edu/~gurari %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\immediate\write-1{version 2009-05-21-09:32}
+% ifthen.4ht 2021-12-11-13:37 %
+% Copyright (C) 1997-2009 Eitan M. Gurari %
+% Copyright 2009-2021 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.
+ \@ifpackageloaded{nameref}{%
+\let\ifthenelse\NROrg at ifthenelse%
+}{}
\long\def\:tempc{%
\let\sv:begingroup\begingroup
Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht 2021-12-11 21:19:31 UTC (rev 61277)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht 2021-12-11 22:05:47 UTC (rev 61278)
@@ -1,4 +1,4 @@
-% ooffice.4ht (2021-10-20-14:28), generated from tex4ht-ooffice.tex
+% ooffice.4ht (2021-12-11-13:37), generated from tex4ht-ooffice.tex
% Copyright 2009-2021 TeX Users Group
% Copyright 2001-2009 Maarten Wisse, James Naughton, Eitan M. Gurari
%
@@ -17,7 +17,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2021-10-20-14:28}
+\immediate\write-1{version 2021-12-11-13:37}
\exit:ifnot{Preamble,%
algorithmicx,%
@@ -6991,27 +6991,27 @@
\Configure{graphics*}
{gif}
{\expandafter\getImgFile\expandafter{\Gin at base}{\Gin at ext}
-\Picture[IMG]{\imgBase.gif \if:boundingbox{svg:width="\the\Gin at req@width" svg:height="\the\Gin at req@height"}{}
+\Picture[IMG]{{\imgBase.gif} \if:boundingbox{svg:width="\the\Gin at req@width" svg:height="\the\Gin at req@height"}{}
}}
\Configure{graphics*}
{png}
{\expandafter\getImgFile\expandafter{\Gin at base}{\Gin at ext}
-\Picture[IMG]{\imgBase.png \if:boundingbox{svg:width="\the\Gin at req@width" svg:height="\the\Gin at req@height"}{}
+\Picture[IMG]{{\imgBase.png} \if:boundingbox{svg:width="\the\Gin at req@width" svg:height="\the\Gin at req@height"}{}
}}
\Configure{graphics*}
{jpg}
{\expandafter\getImgFile\expandafter{\Gin at base}{\Gin at ext}
-\Picture[IMG]{\imgBase.jpg \if:boundingbox{svg:width="\the\Gin at req@width" svg:height="\the\Gin at req@height"}{}
+\Picture[IMG]{{\imgBase.jpg} \if:boundingbox{svg:width="\the\Gin at req@width" svg:height="\the\Gin at req@height"}{}
}}
\Configure{graphics*}
{jpeg}
{\expandafter\getImgFile\expandafter{\Gin at base}{\Gin at ext}
-\Picture[IMG]{\imgBase.jpeg \if:boundingbox{svg:width="\the\Gin at req@width" svg:height="\the\Gin at req@height"}{}
+\Picture[IMG]{{\imgBase.jpeg} \if:boundingbox{svg:width="\the\Gin at req@width" svg:height="\the\Gin at req@height"}{}
}}
\Configure{graphics*}
{svg}
{\expandafter\getImgFile\expandafter{\Gin at base}{\Gin at ext}
-\Picture[IMG]{\imgBase.svg \if:boundingbox{svg:width="\the\Gin at req@width" svg:height="\the\Gin at req@height"}{}
+\Picture[IMG]{{\imgBase.svg} \if:boundingbox{svg:width="\the\Gin at req@width" svg:height="\the\Gin at req@height"}{}
}}
More information about the tex-live-commits
mailing list.