summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-09-12 21:04:16 +0000
committerKarl Berry <karl@freefriends.org>2019-09-12 21:04:16 +0000
commit3af8a57de54296931665995bb516a091cb1e2ced (patch)
tree16af564e736fe1219e34823fdbf30900c62fe44a /Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht
parentc3b3441033e901c72e783ac44f01903bc772a589 (diff)
set image dimensions explicitly, use -dusecropbox with gs, tex4ht r602-603
git-svn-id: svn://tug.org/texlive/trunk@52086 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht')
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht36
1 files changed, 9 insertions, 27 deletions
diff --git a/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht b/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht
index e3fe0d55b81..022b22bfe18 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 (2019-09-03-14:08), generated from tex4ht-ooffice.tex
+% ooffice.4ht (2019-09-12-14:02), generated from tex4ht-ooffice.tex
% Copyright 2009-2019 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 2019-09-03-14:08}
+\immediate\write-1{version 2019-09-12-14:02}
\exit:ifnot{Preamble,%
algorithmicx,%
@@ -6911,34 +6911,22 @@ style:display-name="Footnote anchor" style:family="text">
\Configure{graphics*}
{gif}
{\expandafter\getImgFile\expandafter{\Gin@base}{\Gin@ext}
-\Picture[IMG]{\imgBase.gif \ifx\noBoundingBox\UnDefined
- svg:width="\the\Gin@req@width"
- svg:height="\the\Gin@req@height"
-\fi
+\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 \ifx\noBoundingBox\UnDefined
- svg:width="\the\Gin@req@width"
- svg:height="\the\Gin@req@height"
-\fi
+\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 \ifx\noBoundingBox\UnDefined
- svg:width="\the\Gin@req@width"
- svg:height="\the\Gin@req@height"
-\fi
+\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 \ifx\noBoundingBox\UnDefined
- svg:width="\the\Gin@req@width"
- svg:height="\the\Gin@req@height"
-\fi
+\Picture[IMG]{\imgBase.jpeg \if:boundingbox{svg:width="\the\Gin@req@width" svg:height="\the\Gin@req@height"}{}
}}
@@ -6960,14 +6948,11 @@ style:display-name="Footnote anchor" style:family="text">
\closein15%
\def\Gin@ext{\PictExt}% fix to get correct extension for the generated png file
\expandafter\getImgFile\expandafter{\Gin@base}{\PictExt}
- \Picture[IMG]{{\imgBase\PictExt} \ifx\noBoundingBox\UnDefined
- svg:width="\the\Gin@req@width"
- svg:height="\the\Gin@req@height"
-\fi
+ \Picture[IMG]{{\imgBase\PictExt} \if:boundingbox{svg:width="\the\Gin@req@width" svg:height="\the\Gin@req@height"}{}
}}
\NewConfigure{PdfConvert}{2}
-\Configure{PdfConvert}{png}{"\a:Ghostscript\space -q -dNOPAUSE -dBATCH -sDEVICE=pngalpha -r300 \ifx\Gin@page\@empty\else -dFirstPage="\Gin@page" -dLastPage="\Gin@page"\fi\space -sOutputFile="\Gin@base-\Gin@page.\a:PdfConvert" "\Gin@base.pdf""}
+\Configure{PdfConvert}{png}{"\a:Ghostscript\space -q -dNOPAUSE -dusecropbox -dBATCH -sDEVICE=pngalpha -r300 \ifx\Gin@page\@empty\else -dFirstPage="\Gin@page" -dLastPage="\Gin@page"\fi\space -sOutputFile="\Gin@base-\Gin@page.\a:PdfConvert" "\Gin@base.pdf""}
\Configure{graphics*}
{pdf}
@@ -6982,10 +6967,7 @@ style:display-name="Footnote anchor" style:family="text">
\def\Gin@ext{.\a:PdfConvert}% fix to get correct extension for the generated png file
\expandafter\getImgFile\expandafter{\Gin@base-\Gin@page}{\a:PdfConvert}%
\edef\Gin@base{\Gin@base-\Gin@page}% the generated file contains page number
- \Picture[IMG]{{\imgBase.\a:PdfConvert} \ifx\noBoundingBox\UnDefined
- svg:width="\the\Gin@req@width"
- svg:height="\the\Gin@req@height"
-\fi
+ \Picture[IMG]{{\imgBase.\a:PdfConvert} \if:boundingbox{svg:width="\the\Gin@req@width" svg:height="\the\Gin@req@height"}{}
}}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%