summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-12-24 20:56:02 +0000
committerKarl Berry <karl@freefriends.org>2022-12-24 20:56:02 +0000
commitecd64e1faa5709e40f53f14af71c1100f713d9f9 (patch)
treea0e13853e136469930617ab4341da5e5986fd6ba
parent3fb3e3f63d55b2564b47a28b3ffee32bcc6023e2 (diff)
mps inclusion, tex4ht r1275; mdframed inside \Picture*, tex4ht r1276
git-svn-id: svn://tug.org/texlive/trunk@65350 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/ChangeLog10
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex16
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex4
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/html4.4ht6
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/mdframed.4ht18
5 files changed, 34 insertions, 20 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index eb851e0e667..b7ad95ba12b 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
@@ -1,3 +1,13 @@
+2022-12-24 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-4ht.tex (mdframed.4ht): fixed support for Mdframed used
+ inside of \Picture*.
+ https://tex.stackexchange.com/a/669526/2891
+
+ * tex4ht-html4.tex (html4.4ht): added support for the inclusion of
+ MPS images.
+ https://tex.stackexchange.com/a/669526/2891
+
2022-12-23 Michal Hoftich <michal.h21@gmail.com>
* tex4ht-html4.tex (html4.4ht): fixed paragraph handling in the
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
index 30a73224d34..2e301d2010a 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 1268 2022-12-16 15:18:27Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1276 2022-12-24 12:44:15Z michal_h21 $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2022 TeX Users Group
@@ -27997,7 +27997,7 @@ We need to use dvips driver with XeLaTeX
\<mdframed.4ht\><<<
% mdframed.4ht (|version), generated from |jobname.tex
-% Copyright 2017-2021 TeX Users Group
+% Copyright 2017-2022 TeX Users Group
|<TeX4ht license text|>
\NewConfigure{mdframed}{2}
@@ -28005,18 +28005,20 @@ We need to use dvips driver with XeLaTeX
\NewConfigure{mdframetitle}{2}
\newcount\mdf:env:cnt
\def\mdf:id{mdframed-\the\mdf:env:cnt}
-\def\mdf@trivlist#1{\global\advance\mdf:env:cnt by1\relax\a:mdframed\a:mdframedstyle%
+\def\:tempa#1{\global\advance\mdf:env:cnt by1\relax\a:mdframed\a:mdframedstyle%
\ifdefempty{\mdf@frametitle}{}{\mdfframedtitleenv{\mdf@frametitle}\a:mdframetitle\mdf@@frametitle@use\b:mdframetitle}\let\mdf@frametitle\@empty%
}
+\HLet\mdf@trivlist\:tempa
-\def\endmdf@trivlist{\b:mdframed}
+\def\:tempa{\b:mdframed}
+\HLet\endmdf@trivlist\:tempa
% disable frame drawing, it can be supported using CSS
-\def\detected@mdf@put@frame{}%
+\HLet\detected@mdf@put@frame\relax%
\append:def\mdf@@ignorelastdescenders{\let\orig:unskip\unskip\def\unskip{\let\unskip\orig:unskip}}%
-\def\mdf@lrbox#1{}
-\def\endmdf@lrbox{}
+\HLet\mdf@lrbox\:gobble
+\HLet\endmdf@lrbox\relax
\Hinput{mdframed}
\endinput
>>> \AddFile{9}{mdframed}
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex
index 4d341ee3ff5..4642e59faf1 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-html4.tex 1274 2022-12-23 13:35:49Z michal_h21 $
+% $Id: tex4ht-html4.tex 1275 2022-12-24 12:38:23Z michal_h21 $
% Compile 4 times: latex tex4ht-html4
% Copy html4.4ht into the work directory before all but the last compilation.
%
@@ -14029,7 +14029,7 @@ Declare default graphics extensions supported in HTML or converted to these
supported formats by tex4ht.
\<graphics default extensions\><<<
-\DeclareGraphicsExtensions{.png,.svg,.jpg,.eps,.pdf}
+\DeclareGraphicsExtensions{.png,.svg,.jpg,.eps,.pdf,.mps}
>>>
diff --git a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
index 4f4975cdb89..84bd311f850 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 (2022-12-23-13:16), generated from tex4ht-html4.tex
+% html4.4ht (2022-12-24-12:37), generated from tex4ht-html4.tex
% Copyright 2009-2022 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 2022-12-23-13:16}
+\immediate\write-1{version 2022-12-24-12:37}
\exit:ifnot{8859-6,%
CJK,%
@@ -11486,7 +11486,7 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}%
\Picture[\a:GraphicsAlt]{{\Gin@base\PictExt} \csname a:Gin-dim\endcsname
}}
-\DeclareGraphicsExtensions{.png,.svg,.jpg,.eps,.pdf}
+\DeclareGraphicsExtensions{.png,.svg,.jpg,.eps,.pdf,.mps}
\edef\svg:ext{.svg}
diff --git a/Master/texmf-dist/tex/generic/tex4ht/mdframed.4ht b/Master/texmf-dist/tex/generic/tex4ht/mdframed.4ht
index fa2e7d44520..f79b094f600 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/mdframed.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/mdframed.4ht
@@ -1,5 +1,5 @@
-% mdframed.4ht (2021-08-14-14:10), generated from tex4ht-4ht.tex
-% Copyright 2017-2021 TeX Users Group
+% mdframed.4ht (2022-12-24-12:36), generated from tex4ht-4ht.tex
+% Copyright 2017-2022 TeX Users Group
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -16,7 +16,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2021-08-14-14:10}
+\immediate\write-1{version 2022-12-24-12:36}
\NewConfigure{mdframed}{2}
@@ -24,18 +24,20 @@
\NewConfigure{mdframetitle}{2}
\newcount\mdf:env:cnt
\def\mdf:id{mdframed-\the\mdf:env:cnt}
-\def\mdf@trivlist#1{\global\advance\mdf:env:cnt by1\relax\a:mdframed\a:mdframedstyle%
+\def\:tempa#1{\global\advance\mdf:env:cnt by1\relax\a:mdframed\a:mdframedstyle%
\ifdefempty{\mdf@frametitle}{}{\mdfframedtitleenv{\mdf@frametitle}\a:mdframetitle\mdf@@frametitle@use\b:mdframetitle}\let\mdf@frametitle\@empty%
}
+\HLet\mdf@trivlist\:tempa
-\def\endmdf@trivlist{\b:mdframed}
+\def\:tempa{\b:mdframed}
+\HLet\endmdf@trivlist\:tempa
% disable frame drawing, it can be supported using CSS
-\def\detected@mdf@put@frame{}%
+\HLet\detected@mdf@put@frame\relax%
\append:def\mdf@@ignorelastdescenders{\let\orig:unskip\unskip\def\unskip{\let\unskip\orig:unskip}}%
-\def\mdf@lrbox#1{}
-\def\endmdf@lrbox{}
+\HLet\mdf@lrbox\:gobble
+\HLet\endmdf@lrbox\relax
\Hinput{mdframed}
\endinput