From 99fae766826af61fe77f2b404faa7752b39b0e47 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 12 Aug 2021 22:04:01 +0000 Subject: ooffice \Picture, svg support, tex4ht r970-971; .xbb in graphics, tex4ht r972 git-svn-id: svn://tug.org/texlive/trunk@60230 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/generic/tex4ht/graphics.4ht | 9 ++- Master/texmf-dist/tex/generic/tex4ht/graphicx.4ht | 11 +-- Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht | 83 +++++++++++++++-------- 3 files changed, 64 insertions(+), 39 deletions(-) (limited to 'Master/texmf-dist/tex/generic/tex4ht') diff --git a/Master/texmf-dist/tex/generic/tex4ht/graphics.4ht b/Master/texmf-dist/tex/generic/tex4ht/graphics.4ht index 48ec9543411..0322863308a 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/graphics.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/graphics.4ht @@ -1,4 +1,4 @@ -% graphics.4ht (2021-06-13-08:46), generated from tex4ht-4ht.tex +% graphics.4ht (2021-08-12-13:49), generated from tex4ht-4ht.tex % Copyright 1997-2009 Eitan M. Gurari % Copyright 2009-2021 TeX Users Group % @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2021-06-13-08:46} +\immediate\write-1{version 2021-08-12-13:49} \expandafter\let\csname includegraphics \endcsname\includegraphics @@ -54,6 +54,11 @@ \let\old:GreadEps\Gread@eps \def\Gread@eps#1{\old:GreadEps{"#1"}} \def\if:boundingbox#1#2{\ifdim\Gin@req@width=\Gin@nat@width\ifx\noBoundingBox\UnDefined#1\else#2\fi\else#1\fi} +\DeclareGraphicsRule{.png}{bmp}{.xbb}{} +\DeclareGraphicsRule{.jpg}{bmp}{.xbb}{} +\DeclareGraphicsRule{.gif}{bmp}{.xbb}{} +\DeclareGraphicsRule{.pdf}{bmp}{.xbb}{} +\DeclareGraphicsRule{.svg}{bmp}{.xbb}{} \Hinput{graphics} \endinput diff --git a/Master/texmf-dist/tex/generic/tex4ht/graphicx.4ht b/Master/texmf-dist/tex/generic/tex4ht/graphicx.4ht index e337fb5d1e8..d481b92b265 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/graphicx.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/graphicx.4ht @@ -1,6 +1,6 @@ -% graphicx.4ht (2018-10-01-14:24), generated from tex4ht-4ht.tex +% graphicx.4ht (2021-08-12-13:49), generated from tex4ht-4ht.tex % Copyright 2003-2009 Eitan M. Gurari -% Copyright 2009-2018 TeX Users Group +% Copyright 2009-2021 TeX Users Group % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2018-10-01-14:24} +\immediate\write-1{version 2021-08-12-13:49} \let\Gin:esetsize\Gin@esetsize \def\Gin@esetsize{% @@ -35,11 +35,6 @@ \fi \Gin:esetsize } -\DeclareGraphicsRule{.png}{bmp}{.xbb}{} -\DeclareGraphicsRule{.jpg}{bmp}{.xbb}{} -\DeclareGraphicsRule{.gif}{bmp}{.xbb}{} -\DeclareGraphicsRule{.pdf}{bmp}{.xbb}{} -\DeclareGraphicsRule{.svg}{bmp}{.xbb}{} \NewConfigure{rotatebox}{2} \pend:def\Grot@box{\a:rotatebox} diff --git a/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht b/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht index fd4a7a3d54c..7d1015d3090 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-04-16-13:27), generated from tex4ht-ooffice.tex +% ooffice.4ht (2021-08-12-13:49), 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-04-16-13:27} +\immediate\write-1{version 2021-08-12-13:49} \exit:ifnot{Preamble,% algorithmicx,% @@ -501,24 +501,32 @@ xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"\Hnew \def:image:mime:type{.svg}{image/svg+xml} \def\svg:width{0.0pt}\def\svg:height{0.0pt} \Configure{IMG} - {% \ht:special{t4ht>\PictureFile.4og}% -\ht:special{t4ht>\Gin@base\Gin@ext.4og}% + {% parse the image extension, will be used later +\expandafter\filename@parse\expandafter{\PictureFile}% +\ifx\Gin@base\@undefined +\let\graphics:filename\PictureFile +\else +\def\graphics:filename{\Gin@base\Gin@ext} +\fi +% \ht:special{t4ht>\PictureFile.4og}% +\ht:special{t4ht>\graphics:filename.4og}% \ht:special{t4ht*>}% % \ht:special{t4ht<\PictureFile.4og}% -\ht:special{t4ht<\Gin@base\Gin@ext.4og}% +\ht:special{t4ht<\graphics:filename.4og}% \OOmanifest{\Hnewline + manifest:full-path="Pictures/\PictureFile" manifest:media-type="\get:image:mime:type\filename@ext"/>\Hnewline }% % \ht:special{t4ht=0pt \string svg:width="\the\Gin@req@width" svg:height="\the\Gin@req@height" - % \fi + \fi\fi\fi draw:z-index="0" >% {\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"}{} }} +\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"}{} + }} -\DeclareGraphicsExtensions{.png,.jpg,.eps,.pdf} +\DeclareGraphicsExtensions{.png,.jpg,.eps,.pdf,.svg} \NewConfigure{Ghostscript}{1} @@ -8053,6 +8066,7 @@ style:display-name="Footnote anchor" style:family="text"> \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{amsproc} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -8070,7 +8084,6 @@ style:display-name="Footnote anchor" style:family="text"> - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{amsmath} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -8087,7 +8100,6 @@ style:display-name="Footnote anchor" style:family="text"> - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{babel} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -8310,7 +8322,6 @@ Y{0178}\i{00EF}% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{biblatex} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -8394,7 +8405,6 @@ Y{0178}\i{00EF}% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{url} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -12666,7 +12676,6 @@ Y{0178}\i{00EF}% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{csquotes} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -12684,6 +12693,7 @@ Y{0178}\i{00EF}% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{german} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -12706,6 +12716,7 @@ Y{0178}\i{00EF}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{fancyvrb} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -12864,6 +12875,7 @@ Y{0178}\i{00EF}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{xcolor} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -12924,6 +12936,8 @@ Y{0178}\i{00EF}% + + @@ -13047,7 +13061,6 @@ Y{0178}\i{00EF}% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{frenchb} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -13068,7 +13081,6 @@ Y{0178}\i{00EF}% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{apacite} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -13161,6 +13173,7 @@ Y{0178}\i{00EF}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -17243,6 +17256,7 @@ Y{0178}\i{00EF}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{elsart} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -17858,6 +17872,7 @@ Y{0178}\i{00EF}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -17966,6 +17981,7 @@ Y{0178}\i{00EF}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{foils} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -18145,7 +18161,6 @@ Y{0178}\i{00EF}% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{pstricks} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -18199,6 +18214,7 @@ Y{0178}\i{00EF}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{curve} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -18755,19 +18771,27 @@ Y{0178}\i{00EF}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{pst-jtree} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \Configure{jtree} {\bgroup \Configure{IMG} - {% \ht:special{t4ht>\PictureFile.4og}% -\ht:special{t4ht>\Gin@base\Gin@ext.4og}% + {% parse the image extension, will be used later +\expandafter\filename@parse\expandafter{\PictureFile}% +\ifx\Gin@base\@undefined +\let\graphics:filename\PictureFile +\else +\def\graphics:filename{\Gin@base\Gin@ext} +\fi +% \ht:special{t4ht>\PictureFile.4og}% +\ht:special{t4ht>\graphics:filename.4og}% \ht:special{t4ht*>}% % \ht:special{t4ht<\PictureFile.4og}% -\ht:special{t4ht<\Gin@base\Gin@ext.4og}% +\ht:special{t4ht<\graphics:filename.4og}% \OOmanifest{\Hnewline + manifest:full-path="Pictures/\PictureFile" manifest:media-type="\get:image:mime:type\filename@ext"/>\Hnewline }% % \ht:special{t4ht=