only dvips graphics rules, tex4ht r1094

git-svn-id: svn://tug.org/texlive/trunk@62839 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 18 insertions, 5 deletions

diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index 78c55c6b7e8..295e80887e5 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
@@ -1,3 +1,8 @@
+2021-03-20  Michal Hoftich  <michal.h21@gmail.com>
+
+	* tex4ht-4ht.tex (graphics.4ht): don't execute graphics rules when
+	user selected other driver than dvips.
+
 2022-03-20  Karl Berry  <karl@freefriends.org>
 
 	* update-htfonts: add installed files, not dev.
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
index c949a120c64..7786213f1d6 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 1090 2022-03-16 14:38:50Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1094 2022-03-20 20:29:43Z michal_h21 $
 % tex tex4ht-4ht   or   ht tex tex4ht-4ht
 %
 % Copyright 2009-2022 TeX Users Group    
@@ -26334,14 +26334,19 @@ Show dimensions only for pictures that have dimensions specified explicitly or u
 
 We need to find bounding boxes of images. Graphics support the .xbb file that contain this information.
 It is necessary to provide the DeclareGraphicsRule commands for supported image formats so 
-the .xbb file works.
+the .xbb file works. We execute these rules only with the default dvips driver. If user selects explicitly
+other drivers, it would result in a compilation error. 
+
 
 \<fix graphics\><<<
+\def\Gin:defaultdriver{dvips.def}
+\ifx\Gin@driver\Gin:defaultdriver%
 \DeclareGraphicsRule{.png}{bmp}{.xbb}{}
 \DeclareGraphicsRule{.jpg}{bmp}{.xbb}{}
 \DeclareGraphicsRule{.gif}{bmp}{.xbb}{}
 \DeclareGraphicsRule{.pdf}{bmp}{.xbb}{}
 \DeclareGraphicsRule{.svg}{bmp}{.xbb}{}
+\fi
 >>>
 
 %\expandafter\def\csname c:graphics-file:\endcsname#1{\Gin@drafttrue
diff --git a/Master/texmf-dist/tex/generic/tex4ht/graphics.4ht b/Master/texmf-dist/tex/generic/tex4ht/graphics.4ht
index 0322863308a..ebdbf411bf2 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 (2021-08-12-13:49), generated from tex4ht-4ht.tex
+% graphics.4ht (2022-03-20-14:29), generated from tex4ht-4ht.tex
 % Copyright 1997-2009 Eitan M. Gurari
-% Copyright 2009-2021 TeX Users Group
+% Copyright 2009-2022 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 2021-08-12-13:49}
+\immediate\write-1{version 2022-03-20-14:29}
 
 
    \expandafter\let\csname includegraphics \endcsname\includegraphics
@@ -54,11 +54,14 @@
 \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}
+\def\Gin:defaultdriver{dvips.def}
+\ifx\Gin@driver\Gin:defaultdriver%
 \DeclareGraphicsRule{.png}{bmp}{.xbb}{}
 \DeclareGraphicsRule{.jpg}{bmp}{.xbb}{}
 \DeclareGraphicsRule{.gif}{bmp}{.xbb}{}
 \DeclareGraphicsRule{.pdf}{bmp}{.xbb}{}
 \DeclareGraphicsRule{.svg}{bmp}{.xbb}{}
+\fi
 
 \Hinput{graphics}
 \endinput