diff options
author | Karl Berry <karl@freefriends.org> | 2017-03-13 23:16:45 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-03-13 23:16:45 +0000 |
commit | 2edb5793943361b66fc27160a8f06ce24bdc0e0e (patch) | |
tree | ee6ea080bd38c4f53c8e3953d095ec2b839dec8a /Master/texmf-dist/tex | |
parent | 85b91d251e0eddca277254765e11b51dcc979b3a (diff) |
spaces in graphics filenames (tex4ht r248,r249), memoir \legend support (r247), http://puszcza.gnu.org.ua/bugs/?357
git-svn-id: svn://tug.org/texlive/trunk@43490 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/generic/tex4ht/graphics.4ht | 56 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/tex4ht/html4.4ht | 19 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/tex4ht/memoir.4ht | 6 |
3 files changed, 43 insertions, 38 deletions
diff --git a/Master/texmf-dist/tex/generic/tex4ht/graphics.4ht b/Master/texmf-dist/tex/generic/tex4ht/graphics.4ht index b4f082d4c3d..73e667eed86 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/graphics.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/graphics.4ht @@ -1,34 +1,29 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% graphics.4ht 2009-05-21-09:32 % -% Copyright (C) 1997--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".% -% % -% This Current Maintainer of this work % -% is Eitan M. Gurari. % -% % -% 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 2009-05-21-09:32} - +% graphics.4ht (2017-03-13-16:10), generated from tex4ht-4ht.tex +% Copyright 1997-2009 Eitan M. Gurari +% Copyright 2009-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. \expandafter\let\csname includegraphics \endcsname\includegraphics \def\includegraphics{\expandafter\protect\csname includegraphics \endcsname} +\def\grf:removequote"#1"{#1} +\def\grf:thrashname#1\relax{} +\def\grf:fixquotes{% + \@ifnextchar"{\edef\Gin@base{\expandafter\grf:removequote\Gin@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} @@ -51,9 +46,12 @@ \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@base\relax#1\PictureOn \G:cnfg \let\G:cnfg\relax} \let\G:cnfg\relax +\let\old:GreadEps\Gread@eps +\def\Gread@eps#1{\old:GreadEps{"#1"}} + \Hinput{graphics} \endinput diff --git a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht index 3152b20cc97..9ec5dcab94d 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 (2016-12-18-16:45), generated from tex4ht-html4.tex +% html4.4ht (2017-03-13-15:52), generated from tex4ht-html4.tex % Copyright 2009-2016 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 2016-12-18-16:45} +\immediate\write-1{version 2017-03-13-15:52} \exit:ifnot{8859-6,% CJK,% @@ -11223,27 +11223,27 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}% \Configure{graphics*} {gif} {{\Configure{Needs}{File: \Gin@base.gif}\Needs{}}% - \Picture[\a:GraphicsAlt]{\Gin@base.gif \csname a:Gin-dim\endcsname + \Picture[\a:GraphicsAlt]{{\Gin@base.gif} \csname a:Gin-dim\endcsname }} \Configure{graphics*} {png} {{\Configure{Needs}{File: \Gin@base.png}\Needs{}}% - \Picture[\a:GraphicsAlt]{\Gin@base.png \csname a:Gin-dim\endcsname + \Picture[\a:GraphicsAlt]{{\Gin@base.png} \csname a:Gin-dim\endcsname }} \Configure{graphics*} {jpg} {{\Configure{Needs}{File: \Gin@base.jpg}\Needs{}}% - \Picture[\a:GraphicsAlt]{\Gin@base.jpg \csname a:Gin-dim\endcsname + \Picture[\a:GraphicsAlt]{{\Gin@base.jpg} \csname a:Gin-dim\endcsname }} \Configure{graphics*} {jpeg} {{\Configure{Needs}{File: \Gin@base.jpeg}\Needs{}}% - \Picture[\a:GraphicsAlt]{\Gin@base.jpeg \csname a:Gin-dim\endcsname + \Picture[\a:GraphicsAlt]{{\Gin@base.jpeg} \csname a:Gin-dim\endcsname }} \Configure{graphics*} {svg} {{\Configure{Needs}{File: \Gin@base.svg}\Needs{}}% - \Picture[\a:GraphicsAlt]{\Gin@base.svg \csname a:Gin-dim\endcsname + \Picture[\a:GraphicsAlt]{{\Gin@base.svg} \csname a:Gin-dim\endcsname }} \NewConfigure{GraphicsAlt}{1} \Configure{GraphicsAlt}{PIC} @@ -29828,6 +29828,8 @@ Y{0178}\i{00EF}% {\HCode{<span class="poemline">}} {\HCode{</span>}} \Css{.poemline {text-align:right; width:6em;}} +\Configure{legend}{\ifvmode\IgnorePar\fi\EndP\HCode{<div class="legend">}}{\HCode{</div>}} + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \endinput\empty\empty\empty\empty\empty\empty @@ -39397,5 +39399,8 @@ y{\ht:special{t4ht@+\string&{35}x00FD{59}}y}% + + + \endinput diff --git a/Master/texmf-dist/tex/generic/tex4ht/memoir.4ht b/Master/texmf-dist/tex/generic/tex4ht/memoir.4ht index 6cb7a67f602..001b1933478 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/memoir.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/memoir.4ht @@ -1,6 +1,6 @@ -% memoir.4ht (2015-04-19-10:27), generated from tex4ht-4ht.tex +% memoir.4ht (2017-03-13-16:10), generated from tex4ht-4ht.tex % Copyright 2003-2009 Eitan M. Gurari -% Copyright 2009-2015 TeX Users Group +% Copyright 2009-2017 TeX Users Group % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -41,6 +41,8 @@ \global\let\f@rhdr\f@rhdr }% \HtmlEnv \Toc:Title{#1}\:chapter{#2}} \NewConfigure{poemline}{2} +\NewConfigure{legend}{2} +\renewcommand\legend[1]{\a:legend #1\b:legend} \ifx \memgobble\:UnDef \pend:defI\getthelinenumber{% |