summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-05-09 16:52:26 +0000
committerKarl Berry <karl@freefriends.org>2017-05-09 16:52:26 +0000
commitcf3504f085bd26f08a2594440711743068edfe8d (patch)
tree183fe46aaffe04769285701161c2d9cc89133e0a /Master/texmf-dist/tex/generic
parent8aef53baeae3c166d4a9bec922fe8f515a269fe3 (diff)
xecjk, html dimens, skak, svg, tex4ht r299-303
git-svn-id: svn://tug.org/texlive/trunk@44266 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic')
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/html4.4ht17
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/infosvg.4ht149
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/skak.4ht30
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/svg.4ht116
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/tex4ht.4ht20
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht30
6 files changed, 298 insertions, 64 deletions
diff --git a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
index 275d16d804c..87bef88f018 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
@@ -1,4 +1,4 @@
-% html4.4ht (2017-04-28-15:02), generated from tex4ht-html4.tex
+% html4.4ht (2017-05-09-09:20), generated from tex4ht-html4.tex
% Copyright 2009-2017 TeX Users Group
% Copyright 1997-2009 Eitan M. Gurari
%
@@ -17,7 +17,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2017-04-28-15:02}
+\immediate\write-1{version 2017-05-09-09:20}
\exit:ifnot{8859-6,%
CJK,%
@@ -11288,10 +11288,10 @@ height="\expandafter\int:pt\the\Gin@req@height!*?: "
%
\else
\ifx \Gin:ewidth\Gin@exclamation \else
- width="\Gin:ewidth"
+ width="\expandafter\int:pt\Gin:ewidth!*?: "
\fi
\ifx \Gin:eheight\Gin@exclamation \else
- height="\Gin:eheight"
+ height="\expandafter\int:pt\Gin:eheight!*?: "
\fi
%
\fi
@@ -11307,12 +11307,12 @@ height="\expandafter\int:pt\the\Gin@req@height!*?: "
%
\fi
\else
- height="\Gin:eheight"
+ height="\expandafter\int:pt\Gin:eheight!*?: "
\fi
\else
- width="\Gin:ewidth"
+ width="\expandafter\int:pt\Gin:ewidth!*?: "
\ifx \Gin:eheight\Gin@exclamation \else
- height="\Gin:eheight"
+ height="\expandafter\int:pt\Gin:eheight!*?: "
\fi
\fi
class="includegraphics"
@@ -30507,7 +30507,7 @@ description">}%
{\ifvmode \IgnorePar\fi \EndP \HCode{</div>}}
\Css{.subfigcaption {margin-top:1em;
margin-left:1em; text-align:center;}}
-\Css{div.subfigure {text-align:center;}}
+\Css{div.subfigure {text-align:center;display:inline-block;}}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -39529,5 +39529,6 @@ y{\ht:special{t4ht@+\string&{35}x00FD{59}}y}%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
\endinput
diff --git a/Master/texmf-dist/tex/generic/tex4ht/infosvg.4ht b/Master/texmf-dist/tex/generic/tex4ht/infosvg.4ht
index 22ea85bb831..f68ec8ef3b4 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/infosvg.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/infosvg.4ht
@@ -1,26 +1,44 @@
-\ifx\infoIVht\UnDeF\def\infoIVht#1//{}\fi\infoIVht[vg]89...//
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% infosvg.4ht 2007-11-30-18:36 %
-% Copyright (C) 2000--2007 Eitan M. Gurari %
-% %
-% This program can redistributed and/or modified under %
-% the terms of the LaTeX Project Public License %
-% Distributed from CTAN archives in directory %
-% macros/latex/base/lppl.txt; either version 1 of the %
-% License, or (at your option) any later version. %
-% %
-% If you modify this program your changing its signature %
-% with a directive of the following form will be %
-% appreciated. %
-% \message{signature} %
-% %
-% gurari@cse.ohio-state.edu %
-% http://www.cse.ohio-state.edu/~gurari %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\immediate\write-1{version 2007-11-30-18:36}
+\ifx\infoIVht\UnDeF\def\infoIVht#1//{}\fi\infoIVht[10]28...//
+
+% infosvg.4ht (2017-05-09-09:46), generated from tex4ht-info-svg.tex
+% Copyright 2009-2017 TeX Users Group
+% Copyright 2000-2009 Eitan M. Gurari
+
+
+\ifx\infoIVht\UnDeF\def\infoIVht#1//{}\fi\infoIVht[10]20...//
+
+
+
+\ifx\infoIVht\UnDeF\def\infoIVht#1//{}\fi\infoIVht[1]1...//
+
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either
+% version 1.3c of this license or (at your option) any
+% later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3c or later is part of all distributions
+% of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% The Current Maintainer of this work
+% is the TeX4ht Project <http://tug.org/tex4ht>.
+%
+% If you modify this program, changing the
+% version identification would be appreciated.
+
+\ifx\infoIVht\UnDeF\def\infoIVht#1//{}\fi\infoIVht[1]1//
+
+
+\immediate\write-1{version 2017-05-09-09:46}
+
+
+\ifx\infoIVht\UnDeF\def\infoIVht#1//{}\fi\infoIVht[10]20//
+
+
{ \catcode`\@=0 \catcode`\\=11 @relax
@gdef@infoIVht[#1]#2//{%
@ifnum #1>1
@@ -53,20 +71,20 @@
}
-\ifx\infoIVht\UnDeF\def\infoIVht#1//{}\fi\infoIVht[vg]89//
+\ifx\infoIVht\UnDeF\def\infoIVht#1//{}\fi\infoIVht[10]28//
-\ifx\infoIVht\UnDeF\def\infoIVht#1//{}\fi\infoIVht[vg0]579...//
+\ifx\infoIVht\UnDeF\def\infoIVht#1//{}\fi\infoIVht[10]602...//
\exit:ifnot{tex4ht}
-\ifx\infoIVht\UnDeF\def\infoIVht#1//{}\fi\infoIVht[vg0]579//
+\ifx\infoIVht\UnDeF\def\infoIVht#1//{}\fi\infoIVht[10]602//
-\ifx\infoIVht\UnDeF\def\infoIVht#1//{}\fi\infoIVht[vg0]579...//
+\ifx\infoIVht\UnDeF\def\infoIVht#1//{}\fi\infoIVht[10]602...//
@@ -75,7 +93,39 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\ifx\infoIVht\UnDeF\def\infoIVht#1//{}\fi\infoIVht[vg0]151...//
+\ifx\infoIVht\UnDeF\def\infoIVht#1//{}\fi\infoIVht[10]68...//
+
+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.
+
+
+
+\ifx\infoIVht\UnDeF\def\infoIVht#1//{}\fi\infoIVht[10]68//
+
+
+
+\ifx\infoIVht\UnDeF\def\infoIVht#1//{}\fi\infoIVht[10]101...//
SVG
---
@@ -91,7 +141,7 @@ SVG
{\special{t4ht=></object>}}
-\ifx\infoIVht\UnDeF\def\infoIVht#1//{}\fi\infoIVht[vg0]151//
+\ifx\infoIVht\UnDeF\def\infoIVht#1//{}\fi\infoIVht[10]101//
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -466,9 +516,52 @@ SVG
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\endinput
-\ifx\infoIVht\UnDeF\def\infoIVht#1//{}\fi\infoIVht[vg0]579//
+\ifx\infoIVht\UnDeF\def\infoIVht#1//{}\fi\infoIVht[10]602//
diff --git a/Master/texmf-dist/tex/generic/tex4ht/skak.4ht b/Master/texmf-dist/tex/generic/tex4ht/skak.4ht
new file mode 100644
index 00000000000..ca461595113
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/tex4ht/skak.4ht
@@ -0,0 +1,30 @@
+% skak.4ht (2017-05-09-09:46), generated from tex4ht-4ht.tex
+% Copyright 2017 TeX Users Group
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either
+% version 1.3c of this license or (at your option) any
+% later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3c or later is part of all distributions
+% of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% The Current Maintainer of this work
+% is the TeX4ht Project <http://tug.org/tex4ht>.
+%
+% If you modify this program, changing the
+% version identification would be appreciated.
+\immediate\write-1{version 2017-05-09-09:46}
+
+
+\NewConfigure{SkakBoard}{2}
+
+\pend:def\showboard{\a:SkakBoard}
+\append:def\showboard{\b:SkakBoard}
+
+
+\Hinput{skak}
+\endinput
+
diff --git a/Master/texmf-dist/tex/generic/tex4ht/svg.4ht b/Master/texmf-dist/tex/generic/tex4ht/svg.4ht
index 11e4c73c2b3..ae6445a9ee2 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/svg.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/svg.4ht
@@ -1,26 +1,24 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% svg.4ht 2006-11-25-15:34 %
-% Copyright (C) 2001--2006 Eitan M. Gurari %
-% %
-% This program can redistributed and/or modified unde r %
-% the terms of the LaTeX Project Public License %
-% Distributed from CTAN archives in directory %
-% macros/latex/base/lppl.txt; either version 1 of the %
-% License, or (at your option) any later version. %
-% %
-% If you modify this program your changing its signature %
-% with a directive of the following form will be %
-% appreciated. %
-% \message{signature} %
-% %
-% gartside@maths.ox.ac.uk %
-% gurari@cis.ohio-state.edu %
-% http://www.maths.ox.ac.uk/~gartside %
-% http://www.cis.ohio-state.edu/~gurari %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
-\immediate\write-1{version 2006-11-25-15:34}
+% svg.4ht (2017-05-09-09:46), generated from tex4ht-svg.tex
+% Copyright 2009-2017 TeX Users Group
+% Copyright 2001-2009 Eitan M. Gurari
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either
+% version 1.3c of this license or (at your option) any
+% later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3c or later is part of all distributions
+% of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% The Current Maintainer of this work
+% is the TeX4ht Project <http://tug.org/tex4ht>.
+%
+% If you modify this program, changing the
+% version identification would be appreciated.
+\immediate\write-1{version 2017-05-09-09:46}
+
\exit:ifnot{graphics,%
tex4ht,%
th4}
@@ -29,7 +27,8 @@ th4}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{tex4ht}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- \Configure{VERSION}
+ \:CheckOption{svg-inline}\if:Option
+\Configure{VERSION}
{\IgnorePar\HCode{<?xml version="1.0" encoding="\expandafter\ifx \csname a:charset\endcsname\relax
\expandafter\:encoding\A:charset
\else \expandafter\:encoding\a:charset\fi"
@@ -54,6 +53,7 @@ th4}
\%svg.dtd; \Hnewline}
\Configure{@HTML}
{\Hnewline xmlns:svg="http://www.w3.org/2000/svg"\Hnewline }
+\fi
\Configure{Picture}{.svg}
\:CheckOption{svg-obj} \if:Option
\Configure{IMG}
@@ -74,6 +74,7 @@ th4}
\else
\Log:Note{for external SVG files
try the command line options `svg-obj' and 'svg-'}
+\:CheckOption{svg-inline}\if:Option
\Configure{IMG}
{\special{t4ht=<!-- src="}}
{\special{t4ht=" alt="}}
@@ -85,6 +86,7 @@ th4}
\else \closein15 \special{t4ht*<\PictureFile}\fi
}
+\fi
\fi\fi
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -391,6 +393,66 @@ th4}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{th4}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -490,5 +552,11 @@ th4}
+
+
+
+
+
+
\endinput
diff --git a/Master/texmf-dist/tex/generic/tex4ht/tex4ht.4ht b/Master/texmf-dist/tex/generic/tex4ht/tex4ht.4ht
index e56169f36b8..9c88d77f653 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/tex4ht.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/tex4ht.4ht
@@ -1,7 +1,7 @@
\ifnum\the\catcode`\%=14\else \expandafter\edef\csname
\string:RestoreCatcodes\endcsname{\catcode`\%\the
\catcode`\%}\catcode`\%14\fi
-% tex4ht.4ht (2017-04-11-16:02), generated from tex4ht-options.tex
+% tex4ht.4ht (2017-05-09-09:21), generated from tex4ht-options.tex
% Copyright 2009-2017 TeX Users Group
% Copyright 1997-2009 Eitan M. Gurari
%
@@ -20,7 +20,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2017-04-11-16:02}
+\immediate\write-1{version 2017-05-09-09:21}
\expandafter\edef\csname :RestoreCatcodes\endcsname{%
\expandafter\ifx \csname :RestoreCatcodes\endcsname\relax\else
@@ -68,6 +68,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}%
@@ -84,6 +85,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
@@ -101,6 +103,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
@@ -150,6 +153,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
@@ -176,6 +180,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}%
}
@@ -186,6 +197,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
@@ -200,6 +212,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
@@ -212,6 +225,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
@@ -226,6 +240,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
@@ -240,6 +255,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
diff --git a/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht b/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht
index 2743aeaf2fa..d0fc59be3a3 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht
@@ -1,4 +1,4 @@
-% usepackage.4ht (2017-01-31-15:40), generated from tex4ht-4ht.tex
+% usepackage.4ht (2017-05-09-09:46), generated from tex4ht-4ht.tex
% Copyright 2003-2009 Eitan M. Gurari
% Copyright 2009-2017 TeX Users Group
%
@@ -31,7 +31,7 @@
\fi
\fi
-\gdef\a:usepackage{\use:package xr,xr-hyper,savetrees,fontspec,,!*?: }
+\gdef\a:usepackage{\use:package xr,xr-hyper,savetrees,biblatex,xeCJK,fontspec,,!*?: }
\gdef\use:package#1,{%
\if :#1:\def\:temp##1!*?: {}\else
\def\:temp{#1}\ifx \@currname\:temp
@@ -56,6 +56,32 @@
\def\:temp{savetrees}\ifx \@currname\:temp
\:dontusepackage{savetrees}
\fi
+\def\:temp{biblatex}\ifx \@currname\:temp
+\AtEndOfPackage{%
+ \def\blx@mknoautolang{%
+ \blx@lbxinput{\blx@languagename}%
+ {}{}%
+ }%
+}
+\fi
+\def\:temp{xeCJK}\ifx \@currname\:temp
+\:dontusepackage{xeCJK}
+\AtEndOfPackage{%
+ \RequirePackage{fontspec}
+}
+\DeclareDocumentCommand\setCJKmainfont{o m o}{}
+\let\setCJKsansfont\setCJKmainfont
+\let\setCJKmonofont\setCJKmainfont
+
+\DeclareDocumentCommand\setCJKfamilyfont {m o m }{}
+\DeclareDocumentCommand\newCJKfontfamily {o m o m}{\expandafter\gdef\csname #2\endcsname{\relax}}
+
+\DeclareDocumentCommand\xeCJKsetup{m}{}
+% }
+\AtBeginDocument{%
+ \xeuniuseblock{CJK}
+}
+\fi
\def\:temp{fontspec}\ifx \@currname\:temp
\ifdefined\fontspec
\:dontusepackage{fontspec}