[tex4ht-commits] [SCM] tex4ht updated: r467 - trunk/lit
michal_h21 at gnu.org.ua
michal_h21 at gnu.org.ua
Thu Dec 27 21:00:00 CET 2018
Author: michal_h21
Date: 2018-12-27 21:59:59 +0200 (Thu, 27 Dec 2018)
New Revision: 467
Modified:
trunk/lit/ChangeLog
trunk/lit/tex4ht-options.tex
trunk/lit/tex4ht-svg.tex
Log:
Renamed file svg.4ht to svg-option.4ht to prevent conflicts with svg.sty
Modified: trunk/lit/ChangeLog
===================================================================
--- trunk/lit/ChangeLog 2018-12-20 23:39:51 UTC (rev 466)
+++ trunk/lit/ChangeLog 2018-12-27 19:59:59 UTC (rev 467)
@@ -1,3 +1,9 @@
+2018-12-27 Michal Hoftich <michal.h21 at gmail.com>
+
+ * tex4ht-svg.tex (svg-option.4ht, html4-svg.4ht): renamed svg.4ht to
+ svg-option.4ht due to name conflict with svg.sty.
+ * tex4ht-options.tex (tex4ht.4ht): use svg-option.4ht instead of svg.4ht.
+
2018-12-20 Michal Hoftich <michal.h21 at gmail.com>
* tex4ht-4ht.tex (usepackage.4ht): load dvips driver for graphicx and xcolor
Modified: trunk/lit/tex4ht-options.tex
===================================================================
--- trunk/lit/tex4ht-options.tex 2018-12-20 23:39:51 UTC (rev 466)
+++ trunk/lit/tex4ht-options.tex 2018-12-27 19:59:59 UTC (rev 467)
@@ -133,7 +133,7 @@
\if:Option \else\:CheckOption{svg-obj}\fi
\if:Option \else\:CheckOption{svg-inline}\fi
\if:Option
- \Hinclude[*]{svg.4ht}%
+ \Hinclude[*]{svg-option.4ht}%
\Hinclude[*]{html4-svg.4ht}%
\:CheckOption{info}\if:Option \Hinclude[*]{infosvg.4ht}\fi
\fi
@@ -149,7 +149,7 @@
\if:Option \else\:CheckOption{svg-}\fi
\if:Option \else\:CheckOption{svg-obj}\fi
\if:Option \else\:CheckOption{svg-inline}\fi
- \if:Option \Hinclude[*]{svg.4ht}%
+ \if:Option \Hinclude[*]{svg-option.4ht}%
\:CheckOption{info}\if:Option \Hinclude[*]{infosvg.4ht}\fi
\fi
}
@@ -167,7 +167,7 @@
\if:Option \else\:CheckOption{svg-}\fi
\if:Option \else\:CheckOption{svg-obj}\fi
\if:Option \else\:CheckOption{svg-inline}\fi
- \if:Option \Hinclude[*]{svg.4ht}%
+ \if:Option \Hinclude[*]{svg-option.4ht}%
\:CheckOption{info}\if:Option \Hinclude[*]{infosvg.4ht}\fi
\fi
\:CheckOption{mathplayer}\if:Option
@@ -193,7 +193,7 @@
\if:Option \else\:CheckOption{svg-}\fi
\if:Option \else\:CheckOption{svg-obj}\fi
\if:Option \else\:CheckOption{svg-inline}\fi
- \if:Option \Hinclude[*]{svg.4ht}%
+ \if:Option \Hinclude[*]{svg-option.4ht}%
\:CheckOption{info}\if:Option \Hinclude[*]{infosvg.4ht}\fi
\fi
}
@@ -249,7 +249,7 @@
\if:Option \else\:CheckOption{svg-}\fi
\if:Option \else\:CheckOption{svg-obj}\fi
\if:Option \else\:CheckOption{svg-inline}\fi
- \if:Option \Hinclude[*]{svg.4ht}%
+ \if:Option \Hinclude[*]{svg-option.4ht}%
\:CheckOption{info}\if:Option \Hinclude[*]{infosvg.4ht}\fi
\fi
\:CheckOption{mathplayer}\if:Option
@@ -282,7 +282,7 @@
\if:Option \else\:CheckOption{svg-}\fi
\if:Option \else\:CheckOption{svg-obj}\fi
\if:Option \else\:CheckOption{svg-inline}\fi
- \if:Option \Hinclude[*]{svg.4ht}%
+ \if:Option \Hinclude[*]{svg-option.4ht}%
\:CheckOption{info}\if:Option \Hinclude[*]{infosvg.4ht}\fi
\fi
\Hinclude[*]{html5.4ht}%
@@ -305,7 +305,7 @@
\if:Option \else\:CheckOption{svg-}\fi
\if:Option \else\:CheckOption{svg-obj}\fi
\if:Option \else\:CheckOption{svg-inline}\fi
- \if:Option \Hinclude[*]{svg.4ht}%
+ \if:Option \Hinclude[*]{svg-option.4ht}%
\:CheckOption{info}\if:Option \Hinclude[*]{infosvg.4ht}\fi
\fi
}
@@ -320,7 +320,7 @@
\if:Option \else\:CheckOption{svg-}\fi
\if:Option \else\:CheckOption{svg-obj}\fi
\if:Option \else\:CheckOption{svg-inline}\fi
- \if:Option \Hinclude[*]{svg.4ht}%
+ \if:Option \Hinclude[*]{svg-option.4ht}%
\:CheckOption{info}\if:Option \Hinclude[*]{infosvg.4ht}\fi
\fi
}
@@ -343,7 +343,7 @@
\if:Option \else\:CheckOption{svg-}\fi
\if:Option \else\:CheckOption{svg-obj}\fi
\if:Option \else\:CheckOption{svg-inline}\fi
- \if:Option \Hinclude[*]{svg.4ht}%
+ \if:Option \Hinclude[*]{svg-option.4ht}%
\:CheckOption{info}\if:Option \Hinclude[*]{infosvg.4ht}\fi
\fi
}
@@ -358,7 +358,7 @@
\if:Option \else\:CheckOption{svg-}\fi
\if:Option \else\:CheckOption{svg-obj}\fi
\if:Option \else\:CheckOption{svg-inline}\fi
- \if:Option \Hinclude[*]{svg.4ht}%
+ \if:Option \Hinclude[*]{svg-option.4ht}%
\:CheckOption{info}\if:Option \Hinclude[*]{infosvg.4ht}\fi
\fi
}
Modified: trunk/lit/tex4ht-svg.tex
===================================================================
--- trunk/lit/tex4ht-svg.tex 2018-12-20 23:39:51 UTC (rev 466)
+++ trunk/lit/tex4ht-svg.tex 2018-12-27 19:59:59 UTC (rev 467)
@@ -10,7 +10,7 @@
%%%%%%%%%%%%%%%%%% load style files %%%%%%%%%%%%%%%%%%%%%%%%%%
\ifx \HTML\UnDef
- \def\HTML{svg,html4-svg}
+ \def\HTML{svg-option,html4-svg}
\def\CONFIG{\jobname}
\def\MAKETITLE{\author{Eitan M. Gurari}}
\def\next{\input mktex4ht.4ht \endinput}
@@ -24,8 +24,8 @@
\chapter{Preamble}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\<svg\><<<
-% svg.4ht (|version), generated from |jobname.tex
+\<svg-option\><<<
+% svg-option.4ht (|version), generated from |jobname.tex
% Copyright 2009-2017 TeX Users Group
% Copyright |CopyYear.2001. Eitan M. Gurari
|<TeX4ht copywrite|>
@@ -34,7 +34,7 @@
% 2017-05-05 Michal
% Change DTD and other stuff only for svg-inline
% this is legacy option which will hold the original `svg` option behaviour
-\<configure svg tex4ht\><<<
+\<configure svg-option tex4ht\><<<
\:CheckOption{svg-inline}\if:Option
\Configure{VERSION}
{\IgnorePar\HCode{<?xml version="1.0" |<xml encoding|> ?> \Hnewline}}
@@ -52,7 +52,7 @@
\else \expandafter\:encoding\a:charset\fi"
>>>
-\<configure svg tex4ht\><<<
+\<configure svg-option tex4ht\><<<
\Configure{@DOCTYPE}
{<!ENTITY \% svg.dtd PUBLIC "-//W3C//DTD SVG 20010719//|<dtd lang|>"\Hnewline
"http://www.w3.org/TR/2001/PR-SVG-20010719/DTD/svg10.dtd">\Hnewline
@@ -77,7 +77,7 @@
\fi
>>>
-\<configure svg tex4ht\><<<
+\<configure svg-option tex4ht\><<<
\Configure{@HTML}
{\Hnewline xmlns:svg="http://www.w3.org/2000/svg"\Hnewline }
\fi
@@ -97,7 +97,7 @@
-\<configure svg tex4ht\><<<
+\<configure svg-option tex4ht\><<<
\Configure{Picture}{.svg}
\:CheckOption{svg-obj} \if:Option
|<object svg-obj|>
@@ -157,7 +157,7 @@
\section{Include graphics}
%%%%%%%%%%%%%%%%%%
-\<configure svg graphics\><<<
+\<configure svg-option graphics\><<<
\Configure{graphics*}
{svg}
{{\Configure{Needs}{File: \csname Gin at base\endcsname.svg}\Needs{}}%
@@ -178,7 +178,7 @@
-\<configure svg th4\><<<
+\<configure svg-option th4\><<<
\:CheckOption{draw} \if:Option \:CheckOption{th4} \if:Option
\Configure{Fig}
{\Svg}
More information about the tex4ht-commits
mailing list