summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-12-19 00:48:42 +0000
committerKarl Berry <karl@freefriends.org>2016-12-19 00:48:42 +0000
commit57425075d3ba053d57833a451c6be2928d99dd33 (patch)
tree66f2f555a523c4f1048286ec34566bea47b3e51b
parent6ee5064ea5567ae335e848923c0a40fc5ff9bec8 (diff)
svg+nameref fixes, tex4ht r226 and r227, http://puszcza.gnu.org.ua/bugs/?348
git-svn-id: svn://tug.org/texlive/trunk@42747 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/html4.4ht9
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/nameref.4ht78
2 files changed, 56 insertions, 31 deletions
diff --git a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
index 0677504715d..3152b20cc97 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-08-16:40), generated from tex4ht-html4.tex
+% html4.4ht (2016-12-18-16:45), 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-08-16:40}
+\immediate\write-1{version 2016-12-18-16:45}
\exit:ifnot{8859-6,%
CJK,%
@@ -11240,6 +11240,11 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}%
{{\Configure{Needs}{File: \Gin@base.jpeg}\Needs{}}%
\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
+}}
\NewConfigure{GraphicsAlt}{1}
\Configure{GraphicsAlt}{PIC}
\NewConfigure{Gin-dim}{1}
diff --git a/Master/texmf-dist/tex/generic/tex4ht/nameref.4ht b/Master/texmf-dist/tex/generic/tex4ht/nameref.4ht
index 87a7682d14d..60b0ec2f426 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/nameref.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/nameref.4ht
@@ -1,36 +1,28 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% nameref.4ht 2013-06-28-15:01 %
-% Copyright (C) 2005--2009 Eitan M. Gurari %
-% 2009--2013 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".%
-% %
-% This Current Maintainer of this work %
-% is the TeX4ht Project <tex4ht@tug.org>. %
-% %
-% If you modify this program your changing its signature %
-% with a directive of the following form will be %
-% appreciated. %
-% \message{signature} %
-% %
-% tex4ht@tug.org %
-% http://www.tug.org/tex4ht %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\immediate\write-1{version 2013-06-28-15:01}
+% nameref.4ht (2016-12-18-16:47), generated from tex4ht-4ht.tex
+% Copyright 2005-2009 Eitan M. Gurari
+% Copyright 2009-2016 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 2016-12-18-16:47}
\let\NR:Type\relax
\let\ltx@label\label
\def\prf:label{{\ifx \NR:Title\:UnDef \else \NR:Title\fi}%
- {\ifx \NR:Type\:UnDef \else \NR:Type .1\fi}{}}%
+ {\ifx \NR:Type\relax \else \NR:Type .1\fi}{}}%
\let\NR:StartSec\:StartSec
\let\NR:no@sect\no@sect
\def\no@sect#1#2#3#4#5#6[#7]#8{\gdef\NR:Title{\a:newlabel{#7}}%
@@ -120,6 +112,34 @@
\gdef\@currentlabelname{listing}}
\HLet\NROrg@lst@MakeCaption\:tempc
}{}%
+ % bug [348]
+ \@ifpackageloaded{amsmath}{%
+ \def\:tempc{%
+ \gdef\NR:Title{\a:newlabel{equation}}%
+ \gdef\NR:Type{equation}%
+ \gdef\@currentlabelname{equation}%
+ }
+ \Configure{@begin}{multline}{\:tempc}
+ \Configure{@begin}{equation}{\:tempc}
+ \Configure{@begin}{boxed}{\:tempc}
+ \Configure{@begin}{equations}{\:tempc}
+ \Configure{@begin}{equation}{\:tempc}
+ \Configure{@begin}{gather*}{\:tempc}
+ \Configure{@begin}{gather}{\:tempc}
+ \Configure{@begin}{genfrac}{\:tempc}
+ \Configure{@begin}{measure@}{\:tempc}
+ \Configure{@begin}{multline*}{\:tempc}
+ \Configure{@begin}{multline}{\:tempc}
+ \Configure{@begin}{overset}{\:tempc}
+ \Configure{@begin}{smallmatrix}{\:tempc}
+ \Configure{@begin}{split}{\:tempc}
+ \Configure{@begin}{subarray}{\:tempc}
+ \Configure{@begin}{substack}{\:tempc}
+ \Configure{@begin}{underset}{\:tempc}
+ \Configure{@begin}{xleftarrow}{\:tempc}
+ \Configure{@begin}{xrightarrow}{\:tempc}
+ }{}
+
}
\let\T:ref=\::ref
\def\::ref{\protect\T@ref}