From 0eab0002cb46920e63573ae6c192102c14ae967c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 11 Dec 2021 22:05:47 +0000 Subject: 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 --- .../tex/generic/tex4ht/hyperref-hooks.4ht | 5 ++- Master/texmf-dist/tex/generic/tex4ht/ifthen.4ht | 48 ++++++++++------------ Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht | 14 +++---- 3 files changed, 32 insertions(+), 35 deletions(-) (limited to 'Master/texmf-dist/tex/generic') 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 . +% +% 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"}{} }} -- cgit v1.2.3