undo nameref's patching of \ifthenelse, tex4ht r1027; braces for image filenames in odt output, tex4ht r1028

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

6 files changed, 67 insertions, 47 deletions

diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index 207345d82c1..588c19d38d1 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
@@ -1,3 +1,12 @@
+2021-12-11  Michal Hoftich  <michal.h21@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@gmail.com>
 
 	* tex4ht-ooffice.tex (ooffice-mml.4ht): remove spurious space after inline
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
index 2482de95264..617f60e9fa7 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
@@ -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 @@ We can load nameref from the early hook file
 |<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,12 +13140,22 @@ The need to initialize   \''\@svsechd' arises in
 % Copyright (C) |CopyYear.1997.      Eitan M. Gurari         %
 |<TeX4ht copyright|>
 
+   |<fix nameref ifthen|>
    |<fix ifthen|>
    |<ifthen.sty shared config|>
 \Hinput{ifthen}
 \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@ifthenelse%
+}{}
+>>>
+
 \<fix ifthen\><<<
 \long\def\:tempc{% 
    \let\sv:begingroup\begingroup
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex
index 868747488cc..83076031b47 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex
@@ -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 @@ this case.
 
 \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 @@ this case.
 \<\><<<
 \Configure{graphics*}
    {eps}
-   {|<save image name|>\Picture[IMG]{\imgBase.eps  |<graphics dimensions|> }}
+   {|<save image name|>\Picture[IMG]{{\imgBase.eps}  |<graphics dimensions|> }}
 >>>
 
 
diff --git a/Master/texmf-dist/tex/generic/tex4ht/hyperref-hooks.4ht b/Master/texmf-dist/tex/generic/tex4ht/hyperref-hooks.4ht
index 1874200f438..64b67051c55 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/hyperref-hooks.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/hyperref-hooks.4ht
@@ -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
diff --git a/Master/texmf-dist/tex/generic/tex4ht/ifthen.4ht b/Master/texmf-dist/tex/generic/tex4ht/ifthen.4ht
index 66268aa0e4b..79c1f59e55f 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/ifthen.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/ifthen.4ht
@@ -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@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@ifthenelse%
+}{}
 
    \long\def\:tempc{%
    \let\sv:begingroup\begingroup
diff --git a/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht b/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht
index 9c7f93452a4..5e9da080259 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht
@@ -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 @@ style:display-name="Footnote anchor" style:family="text">
 \Configure{graphics*}
    {gif}
    {\expandafter\getImgFile\expandafter{\Gin@base}{\Gin@ext}
-\Picture[IMG]{\imgBase.gif \if:boundingbox{svg:width="\the\Gin@req@width" svg:height="\the\Gin@req@height"}{}
+\Picture[IMG]{{\imgBase.gif} \if:boundingbox{svg:width="\the\Gin@req@width" svg:height="\the\Gin@req@height"}{}
  }}
 \Configure{graphics*}
    {png}
    {\expandafter\getImgFile\expandafter{\Gin@base}{\Gin@ext}
-\Picture[IMG]{\imgBase.png \if:boundingbox{svg:width="\the\Gin@req@width" svg:height="\the\Gin@req@height"}{}
+\Picture[IMG]{{\imgBase.png} \if:boundingbox{svg:width="\the\Gin@req@width" svg:height="\the\Gin@req@height"}{}
  }}
 \Configure{graphics*}
    {jpg}
    {\expandafter\getImgFile\expandafter{\Gin@base}{\Gin@ext}
-\Picture[IMG]{\imgBase.jpg  \if:boundingbox{svg:width="\the\Gin@req@width" svg:height="\the\Gin@req@height"}{}
+\Picture[IMG]{{\imgBase.jpg}  \if:boundingbox{svg:width="\the\Gin@req@width" svg:height="\the\Gin@req@height"}{}
  }}
 \Configure{graphics*}
    {jpeg}
    {\expandafter\getImgFile\expandafter{\Gin@base}{\Gin@ext}
-\Picture[IMG]{\imgBase.jpeg \if:boundingbox{svg:width="\the\Gin@req@width" svg:height="\the\Gin@req@height"}{}
+\Picture[IMG]{{\imgBase.jpeg} \if:boundingbox{svg:width="\the\Gin@req@width" svg:height="\the\Gin@req@height"}{}
  }}
 \Configure{graphics*}
    {svg}
    {\expandafter\getImgFile\expandafter{\Gin@base}{\Gin@ext}
-\Picture[IMG]{\imgBase.svg \if:boundingbox{svg:width="\the\Gin@req@width" svg:height="\the\Gin@req@height"}{}
+\Picture[IMG]{{\imgBase.svg} \if:boundingbox{svg:width="\the\Gin@req@width" svg:height="\the\Gin@req@height"}{}
  }}