[tex4ht-commits] [SCM] tex4ht updated: r248 - trunk/lit

[michal_h21 at gnu.org.ua]

Author: michal_h21
Date: 2017-03-12 15:23:33 +0200 (Sun, 12 Mar 2017)
New Revision: 248

Modified:
   trunk/lit/ChangeLog
   trunk/lit/Makefile
   trunk/lit/tex4ht-4ht.tex
Log:
Fixed support for images with spaces in theirs filenames

Modified: trunk/lit/ChangeLog
===================================================================
--- trunk/lit/ChangeLog	2017-03-12 10:32:56 UTC (rev 247)
+++ trunk/lit/ChangeLog	2017-03-12 13:23:33 UTC (rev 248)
@@ -1,5 +1,10 @@
 2017-03-11  Michal Hoftich  <michal.h21 at gmail.com>
 
+	* tex4ht-4ht.tex (graphics.4ht): Fixed support for images with spaces
+	in their filenames
+
+2017-03-11  Michal Hoftich  <michal.h21 at gmail.com>
+
 	* tex4ht-4ht.tex (memoir.4ht): redefinition for \legend command
 	* tex4ht-html4.tex (html4.4ht): default configuration for \legend
 

Modified: trunk/lit/Makefile
===================================================================
--- trunk/lit/Makefile	2017-03-12 10:32:56 UTC (rev 247)
+++ trunk/lit/Makefile	2017-03-12 13:23:33 UTC (rev 248)
@@ -33,9 +33,9 @@
 tex4ht_4ht_derived = \
   algorithmic.4ht biblatex.4ht book.4ht color.4ht colortbl.4ht frenchb.4ht \
   fontspec.4ht fontspec-4ht.lua fontspec-luatex.4ht fontspec-xetex.4ht \
-  geometry.4ht graphicx.4ht hyperref.4ht latex.4ht lettrine.4ht listings.4ht \
-  memoir.4ht multicol.4ht multirow.4ht nameref.4ht quoting.4ht reading.4ht \
-  scrartcl.4ht scrbook.4ht scrreprt.4ht spanish.4ht subscript.4ht \
+	geometry.4ht graphics.4ht graphicx.4ht hyperref.4ht latex.4ht lettrine.4ht
+	listings.4ht \ memoir.4ht multicol.4ht multirow.4ht nameref.4ht quoting.4ht \
+	reading.4ht scrartcl.4ht scrbook.4ht scrreprt.4ht spanish.4ht subscript.4ht \
   titlesec.4ht tocloft.4ht tuenc-luatex.4ht tuenc-xetex.4ht \
   usepackage.4ht usepackage-fontspec.4ht wrapfig.4ht xcolor.4ht  xr.4ht \
 	xr-hyper.4ht 

Modified: trunk/lit/tex4ht-4ht.tex
===================================================================
--- trunk/lit/tex4ht-4ht.tex	2017-03-12 10:32:56 UTC (rev 247)
+++ trunk/lit/tex4ht-4ht.tex	2017-03-12 13:23:33 UTC (rev 248)
@@ -24376,6 +24376,10 @@
 \EndHPage{}]
 
 \<fix graphics\><<<
+\def\grf:removequote"#1"{#1}
+\def\grf:thrashname#1\relax{}
+\def\grf:fixquotes{%
+    \@ifnextchar"{\edef\Gin at base{\expandafter\grf:removequote\Gin at base}\grf:thrashname}{\grf:thrashname}}
 \def\grp:warning#1{\no:bound#1(no BoundingBox)//\:warning{#1}}
 \def\no:bound#1(no BoundingBox)#2//{\gdef\noBoundingBox{#2}\ifx
    \noBoundingBox\empty \global\let\noBoundingBox\:UnDef\fi}
@@ -24398,8 +24402,11 @@
    \fi }
 \NewConfigure{graphics}{2}
 \def\grf:gobble#1\leavevmode#2grf:gobble{%
-   \PictureOff#1\PictureOn \G:cnfg \let\G:cnfg|=\relax}
+   \PictureOff\expandafter\grf:fixquotes\Gin at base\relax#1\PictureOn \G:cnfg \let\G:cnfg|=\relax}
 \let\G:cnfg|=\relax
+
+\let\old:GreadEps\Gread at eps
+\def\Gread at eps#1{\old:GreadEps{"#1"}}
 >>>
 
 %\expandafter\def\csname c:graphics-file:\endcsname#1{\Gin at drafttrue