summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/generic/tex4ht
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-12-02 22:25:21 +0000
committerKarl Berry <karl@freefriends.org>2021-12-02 22:25:21 +0000
commit9466944e411e3f6165dfd80843304e319ed0f944 (patch)
tree4b73c506ab6768499edf2bd978b148ee781d7e6f /Master/texmf-dist/source/generic/tex4ht
parent97649e7d9e2120ae1cf2b221d7df6f93f80c6c37 (diff)
undo graphbox changes, tex4ht 1024; search for \par\b, tex4ht r1023
git-svn-id: svn://tug.org/texlive/trunk@61208 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/generic/tex4ht')
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/ChangeLog9
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex23
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-mathjax.tex4
3 files changed, 33 insertions, 3 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index ac56932a2ed..a24838473db 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
@@ -1,3 +1,12 @@
+2021-12-02 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-mathjax.tex (mathjax-latex-4ht.4ht): search for \par<word boundary> in
+ regex that replaces \par commands, as suggested by David Carlisle.
+ https://tex.stackexchange.com/q/624671/2891
+ * tex4ht-4ht.tex (usepackage.4ht, graphbox-hooks.4ht): revert changes made
+ by the Graphbox package to \Gin@setfile.
+ https://github.com/michal-h21/tex4ebook/issues/84
+
2021-12-01 Michal Hoftich <michal.h21@gmail.com>
* tex4ht-mathjax.tex (mathjax-latex-4ht.4ht): search for \par<space> in
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
index 8586f345d3b..ebd9ed01d91 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 1019 2021-11-26 21:54:00Z karl $
+% $Id: tex4ht-4ht.tex 1024 2021-12-02 16:32:57Z michal_h21 $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2021 TeX Users Group
@@ -26155,6 +26155,27 @@ use instructions like \`'\setlength\tmp:dim\Gin@ewidth' instead of
%%%%%%%%%%%%%%%%%%%%%%%
+\SubSection{graphbox}
+
+Graphbox redefines \`'\Gin@setfile' to make some manipulations with the
+graphics box. We want to revert it, because it fatally breaks TeX4ht, and
+it isn't useful in XML anyway.
+
+\<add to usepackage\><<<
+\Configure{PackageHooks}{graphbox.sty}{graphbox-hooks.4ht}
+>>>
+
+\<graphbox-hooks.4ht\><<<
+% graphbox-hooks.4ht (|version), generated from |jobname.tex
+% Copyright 2021 TeX Users Group
+|<TeX4ht license text|>
+\:AtEndOfPackage{%
+ \let\Gin@setfile\old@box@Gin@setfile
+}
+>>> \AddFile{9}{graphbox-hooks}
+%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%
\Section{svg}
%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathjax.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathjax.tex
index 70ad6ad4045..3c50d2cacf5 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathjax.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathjax.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-mathjax.tex 1021 2021-12-01 22:49:07Z michal_h21 $
+% $Id: tex4ht-mathjax.tex 1023 2021-12-02 09:42:42Z michal_h21 $
% compile: latex tex4ht-mathjax
%
% Copyright 2018-2021 TeX Users Group
@@ -63,7 +63,7 @@ We still use regula expressions to escape invalid XML characters to entities, so
\regex_replace_all:nnN { \x{3C} } { &lt; } \l_tmpa_tl
\regex_replace_all:nnN { \x{3E} } { &gt; } \l_tmpa_tl
% replace \par command with blank lines
- \regex_replace_all:nnN { \x{5C}par\s } {\x{A}\x{A}} \l_tmpa_tl
+ \regex_replace_all:nnN { \x{5C}par\b } {\x{A}\x{A}} \l_tmpa_tl
\tl_set:Nx \l_tmpb_tl{ \l_tmpa_tl }
\HCode{\l_tmpb_tl}
}