texlive[60230] Master/texmf-dist/tex/generic/tex4ht: ooffice
commits+karl at tug.org
commits+karl at tug.org
Fri Aug 13 00:04:01 CEST 2021
Revision: 60230
http://tug.org/svn/texlive?view=revision&revision=60230
Author: karl
Date: 2021-08-13 00:04:01 +0200 (Fri, 13 Aug 2021)
Log Message:
-----------
ooffice \Picture, svg support, tex4ht r970-971; .xbb in graphics, tex4ht r972
Revision Links:
--------------
http://tug.org/svn/texlive?view=revision&revision=970
http://tug.org/svn/texlive?view=revision&revision=972
Modified Paths:
--------------
trunk/Master/texmf-dist/tex/generic/tex4ht/graphics.4ht
trunk/Master/texmf-dist/tex/generic/tex4ht/graphicx.4ht
trunk/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht
Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/graphics.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/graphics.4ht 2021-08-12 20:34:12 UTC (rev 60229)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/graphics.4ht 2021-08-12 22:04:01 UTC (rev 60230)
@@ -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 at eps
\def\Gread at eps#1{\old:GreadEps{"#1"}}
\def\if:boundingbox#1#2{\ifdim\Gin at req@width=\Gin at 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
Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/graphicx.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/graphicx.4ht 2021-08-12 20:34:12 UTC (rev 60229)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/graphicx.4ht 2021-08-12 22:04:01 UTC (rev 60230)
@@ -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 at esetsize
\def\Gin at 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 at box{\a:rotatebox}
Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht 2021-08-12 20:34:12 UTC (rev 60229)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht 2021-08-12 22:04:01 UTC (rev 60230)
@@ -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 @@
\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 at base\Gin at ext.4og}%
+ {% parse the image extension, will be used later
+\expandafter\filename at parse\expandafter{\PictureFile}%
+\ifx\Gin at base\@undefined
+\let\graphics:filename\PictureFile
+\else
+\def\graphics:filename{\Gin at base\Gin at 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 at base\Gin at ext.4og}%
+\ht:special{t4ht<\graphics:filename.4og}%
\OOmanifest{<manifest:file-entry
- manifest:full-path="Pictures/\PictureFile" manifest:media-type="\get:image:mime:type\Gin at ext"/>\Hnewline
+ manifest:full-path="Pictures/\PictureFile" manifest:media-type="\get:image:mime:type\filename at ext"/>\Hnewline
}%
%
\ht:special{t4ht=<draw:frame
draw:name="\PictureFile"
text:anchor-type="as-char" % "paragraph"
-% svg:width="...pt"
-% svg:height="...pt"
- % \ifx\noBoundingBox\UnDefined
+ % insert image dimension only if they really exist
+ \ifx\noBoundingBox\UnDefined
+ \ifx\Gin at req@width\undefined\else
+ \ifdim\Gin at req@width>0pt
\string svg:width="\the\Gin at req@width"
svg:height="\the\Gin at req@height"
- % \fi
+ \fi\fi\fi
draw:z-index="0"
>%
<draw:image\Hnewline
@@ -6994,9 +7002,14 @@
{\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"}{}
}}
+\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"}{}
+ }}
-\DeclareGraphicsExtensions{.png,.jpg,.eps,.pdf}
+\DeclareGraphicsExtensions{.png,.jpg,.eps,.pdf,.svg}
\NewConfigure{Ghostscript}{1}
@@ -8053,6 +8066,7 @@
\endinput\empty\empty\empty\empty\empty\empty
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{amsproc}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -8070,7 +8084,6 @@
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{amsmath}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -8087,7 +8100,6 @@
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{babel}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -8310,7 +8322,6 @@
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{biblatex}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -8394,7 +8405,6 @@
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{url}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -12666,7 +12676,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{csquotes}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -12684,6 +12693,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{german}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -12706,6 +12716,7 @@
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{fancyvrb}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -12864,6 +12875,7 @@
\endinput\empty\empty\empty\empty\empty\empty
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{xcolor}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -12927,6 +12939,8 @@
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{verse}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -13047,7 +13061,6 @@
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{frenchb}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -13068,7 +13081,6 @@
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{apacite}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -13163,6 +13175,7 @@
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{scrbook}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -17243,6 +17256,7 @@
\endinput\empty\empty\empty\empty\empty\empty
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{elsart}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -17860,6 +17874,7 @@
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{slides}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -17966,6 +17981,7 @@
\endinput\empty\empty\empty\empty\empty\empty
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{foils}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -18145,7 +18161,6 @@
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{pstricks}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -18199,6 +18214,7 @@
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{curve}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -18755,6 +18771,7 @@
\endinput\empty\empty\empty\empty\empty\empty
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{pst-jtree}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -18761,13 +18778,20 @@
\Configure{jtree}
{\bgroup
\Configure{IMG}
- {% \ht:special{t4ht>\PictureFile.4og}%
-\ht:special{t4ht>\Gin at base\Gin at ext.4og}%
+ {% parse the image extension, will be used later
+\expandafter\filename at parse\expandafter{\PictureFile}%
+\ifx\Gin at base\@undefined
+\let\graphics:filename\PictureFile
+\else
+\def\graphics:filename{\Gin at base\Gin at 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 at base\Gin at ext.4og}%
+\ht:special{t4ht<\graphics:filename.4og}%
\OOmanifest{<manifest:file-entry
- manifest:full-path="Pictures/\PictureFile" manifest:media-type="\get:image:mime:type\Gin at ext"/>\Hnewline
+ manifest:full-path="Pictures/\PictureFile" manifest:media-type="\get:image:mime:type\filename at ext"/>\Hnewline
}%
%
\ht:special{t4ht=<draw:frame
@@ -18834,7 +18858,6 @@
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{algorithmicx}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -18917,7 +18940,6 @@
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{ulem}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -18984,7 +19006,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{paralist}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -19279,6 +19300,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{listings}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -19323,7 +19345,6 @@
\endinput\empty\empty\empty\empty\empty\empty
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{alphanum}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -19439,7 +19460,6 @@
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{footmisc}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -19480,6 +19500,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{mdwlist}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -19538,7 +19559,6 @@
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{soul}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -19675,6 +19695,11 @@
+
+
+
+
+
More information about the tex-live-commits
mailing list.