texlive[62839] Master/texmf-dist: only dvips graphics rules, tex4ht

[commits+karl at tug.org]

Revision: 62839
          http://tug.org/svn/texlive?view=revision&revision=62839
Author:   karl
Date:     2022-03-20 22:37:25 +0100 (Sun, 20 Mar 2022)
Log Message:
-----------
only dvips graphics rules, tex4ht r1094

Revision Links:
--------------
    http://tug.org/svn/texlive?view=revision&revision=1094

Modified Paths:
--------------
    trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
    trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
    trunk/Master/texmf-dist/tex/generic/tex4ht/graphics.4ht

Modified: trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog	2022-03-20 21:30:09 UTC (rev 62838)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog	2022-03-20 21:37:25 UTC (rev 62839)
@@ -1,3 +1,8 @@
+2021-03-20  Michal Hoftich  <michal.h21 at 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 at freefriends.org>
 
 	* update-htfonts: add installed files, not dev.

Modified: trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex	2022-03-20 21:30:09 UTC (rev 62838)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex	2022-03-20 21:37:25 UTC (rev 62839)
@@ -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 @@
 
 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 at 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 at drafttrue

Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/graphics.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/graphics.4ht	2022-03-20 21:30:09 UTC (rev 62838)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/graphics.4ht	2022-03-20 21:37:25 UTC (rev 62839)
@@ -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 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}
+\def\Gin:defaultdriver{dvips.def}
+\ifx\Gin at 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