diff options
| -rw-r--r-- | Master/texmf-dist/tex/generic/tex4ht/graphics.4ht | 5 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/generic/tex4ht/html4.4ht | 13 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht | 36 |
3 files changed, 17 insertions, 37 deletions
diff --git a/Master/texmf-dist/tex/generic/tex4ht/graphics.4ht b/Master/texmf-dist/tex/generic/tex4ht/graphics.4ht index 73e667eed86..2f52448cfb4 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/graphics.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/graphics.4ht @@ -1,6 +1,6 @@ -% graphics.4ht (2017-03-13-16:10), generated from tex4ht-4ht.tex +% graphics.4ht (2019-09-12-14:02), generated from tex4ht-4ht.tex % Copyright 1997-2009 Eitan M. Gurari -% Copyright 2009-2017 TeX Users Group +% Copyright 2009-2019 TeX Users Group % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -51,6 +51,7 @@ \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} \Hinput{graphics} \endinput diff --git a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht index b1b1563c954..3680981fdcd 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht @@ -1,4 +1,4 @@ -% html4.4ht (2019-09-03-14:08), generated from tex4ht-html4.tex +% html4.4ht (2019-09-12-14:02), generated from tex4ht-html4.tex % Copyright 2009-2019 TeX Users Group % Copyright 1997-2009 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{8859-6,% CJK,% @@ -11367,7 +11367,7 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}% % it is better to use the following command. pdf2svg must be installed separately. \Configure{EpsConvert}{"epstopdf "\Gin@base.eps" && pdf2svg "\Gin@base.pdf" "\Gin@base.svg""} \else -\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 -dBATCH -dusecropbox -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{EpsConvert}{"\a:Ghostscript\space -dSAFER -dBATCH -dNOPAUSE -dEPSCrop -r120 -sDEVICE=pngalpha -sOutputFile="\Gin@base.png" "\Gin@base.eps" "} \fi \Configure{graphics*} @@ -11429,12 +11429,9 @@ height="\expandafter\int:pt\the\Gin@req@height!*?: " `Gin-dim'; for key dimensions when bounding box is unavailable try `Gin-dim+'; neither is recommended} \Configure{Gin-dim} - {\ifx\noBoundingBox\UnDefined - width="\expandafter\int:pt\the\Gin@req@width!*?: " + {\if:boundingbox{width="\expandafter\int:pt\the\Gin@req@width!*?: " height="\expandafter\int:pt\the\Gin@req@height!*?: " -% - \fi - } +}{}} \fi \fi 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"}{} }} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% |