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

michal_h21 at gnu.org.ua michal_h21 at gnu.org.ua
Fri May 5 15:27:14 CEST 2017


Author: michal_h21
Date: 2017-05-05 16:27:14 +0300 (Fri, 05 May 2017)
New Revision: 303

Modified:
   trunk/lit/ChangeLog
   trunk/lit/tex4ht-info-svg.tex
   trunk/lit/tex4ht-options.tex
   trunk/lit/tex4ht-svg.tex
Log:
Cleaned svg options

Modified: trunk/lit/ChangeLog
===================================================================
--- trunk/lit/ChangeLog	2017-05-05 10:26:03 UTC (rev 302)
+++ trunk/lit/ChangeLog	2017-05-05 13:27:14 UTC (rev 303)
@@ -6,7 +6,14 @@
 	* tex4ht-4ht.tex (skak.4ht),
 	* tex4ht-html (html4.4ht): added support for skak package 
 	chessboards.
+	* tex4ht-svg.tex (svg.4ht),
+	* tex4ht-options.tex (tex4ht.4ht): introduced new option,
+	`svg-inline`, which holds the original meaning of `svg` option.
+	`svg` option now doesn't include the image in the document text.
+	* tex4ht-info-svg.tex (infosvg.4ht): added information about 
+	various svg options.
 
+
 2017-05-04  Michal Hoftich  <michal.h21 at gmail.com>
 
 	* tex4ht-html4.tex (html4.4ht): round dimensions and remove 

Modified: trunk/lit/tex4ht-info-svg.tex
===================================================================
--- trunk/lit/tex4ht-info-svg.tex	2017-05-05 10:26:03 UTC (rev 302)
+++ trunk/lit/tex4ht-info-svg.tex	2017-05-05 13:27:14 UTC (rev 303)
@@ -63,11 +63,37 @@
 >>>
 
 
+\chapter{Options}
 
+\<configure infosvg tex4ht\><<<
+The output or pictures in SVG format can be requested using following command
+line options:
 
+svg
+---
 
+Include pictures as external images. Existing configuration for SVG images is 
+used. This is preffered way in modern documents.
 
+svg-object
+----------
 
+Include pictures using <object> elements.
+
+svg-
+----
+
+This configuration is simillar to the previous one
+
+svg-inline
+----------
+
+Include the pictures directly to the XML document.
+
+>>>
+
+
+
 \chapter{The Code}
 
 \section{tex4ht}

Modified: trunk/lit/tex4ht-options.tex
===================================================================
--- trunk/lit/tex4ht-options.tex	2017-05-05 10:26:03 UTC (rev 302)
+++ trunk/lit/tex4ht-options.tex	2017-05-05 13:27:14 UTC (rev 303)
@@ -131,6 +131,7 @@
             \:CheckOption{svg}%
              \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}%
                 \Hinclude[*]{html4-svg.4ht}%
@@ -147,6 +148,7 @@
    \:CheckOption{svg}%
              \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}%
                         \:CheckOption{info}\if:Option \Hinclude[*]{infosvg.4ht}\fi
              \fi
@@ -164,6 +166,7 @@
    \:CheckOption{svg}%
              \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}%
                         \:CheckOption{info}\if:Option \Hinclude[*]{infosvg.4ht}\fi
              \fi
@@ -189,6 +192,7 @@
    \:CheckOption{svg}%
              \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}%
                         \:CheckOption{info}\if:Option \Hinclude[*]{infosvg.4ht}\fi
              \fi
@@ -244,6 +248,7 @@
    \:CheckOption{svg}%
              \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}%
                         \:CheckOption{info}\if:Option \Hinclude[*]{infosvg.4ht}\fi
              \fi
@@ -273,6 +278,13 @@
    \else
       \Hinclude[*]{html4-math.4ht}%
    \fi
+   \:CheckOption{svg}%
+             \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}%
+                        \:CheckOption{info}\if:Option \Hinclude[*]{infosvg.4ht}\fi
+             \fi
    \Hinclude[*]{html5.4ht}%
 }
 >>>
@@ -285,6 +297,7 @@
    \:CheckOption{svg}%
              \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}%
                         \:CheckOption{info}\if:Option \Hinclude[*]{infosvg.4ht}\fi
              \fi
@@ -299,6 +312,7 @@
    \:CheckOption{svg}%
              \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}%
                         \:CheckOption{info}\if:Option \Hinclude[*]{infosvg.4ht}\fi
              \fi
@@ -314,6 +328,7 @@
    \:CheckOption{svg}%
              \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}%
                         \:CheckOption{info}\if:Option \Hinclude[*]{infosvg.4ht}\fi
              \fi
@@ -328,6 +343,7 @@
    \:CheckOption{svg}%
              \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}%
                         \:CheckOption{info}\if:Option \Hinclude[*]{infosvg.4ht}\fi
              \fi

Modified: trunk/lit/tex4ht-svg.tex
===================================================================
--- trunk/lit/tex4ht-svg.tex	2017-05-05 10:26:03 UTC (rev 302)
+++ trunk/lit/tex4ht-svg.tex	2017-05-05 13:27:14 UTC (rev 303)
@@ -31,7 +31,11 @@
 |<TeX4ht copywrite|>
 >>>
 
+% 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\><<<    
+\:CheckOption{svg-inline}\if:Option
 \Configure{VERSION}
   {\IgnorePar\HCode{<?xml version="1.0" |<xml encoding|> ?> \Hnewline}}
 \Configure{DOCTYPE}{\HCode
@@ -76,6 +80,7 @@
 \<configure svg tex4ht\><<<    
 \Configure{@HTML}
   {\Hnewline xmlns:svg="http://www.w3.org/2000/svg"\Hnewline }
+\fi
 >>>
 
 
@@ -101,7 +106,9 @@
 \else 
       \Log:Note{for external SVG files
              try the command line options `svg-obj' and 'svg-'}
+\:CheckOption{svg-inline}\if:Option
       |<internal svg|>
+\fi
 \fi\fi
 >>>
 



More information about the tex4ht-commits mailing list