summaryrefslogtreecommitdiff
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
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
-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
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/graphbox-hooks.4ht24
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/mathjax-latex-4ht.4ht6
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht5
6 files changed, 63 insertions, 8 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}
}
diff --git a/Master/texmf-dist/tex/generic/tex4ht/graphbox-hooks.4ht b/Master/texmf-dist/tex/generic/tex4ht/graphbox-hooks.4ht
new file mode 100644
index 00000000000..d04e07f4f3c
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/tex4ht/graphbox-hooks.4ht
@@ -0,0 +1,24 @@
+% graphbox-hooks.4ht (2021-12-02-14:01), generated from tex4ht-4ht.tex
+% Copyright 2021 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 2021-12-02-14:01}
+
+\:AtEndOfPackage{%
+ \let\Gin@setfile\old@box@Gin@setfile
+}
+
diff --git a/Master/texmf-dist/tex/generic/tex4ht/mathjax-latex-4ht.4ht b/Master/texmf-dist/tex/generic/tex4ht/mathjax-latex-4ht.4ht
index ce45fe150e6..7ad3ae7e3de 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/mathjax-latex-4ht.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/mathjax-latex-4ht.4ht
@@ -1,4 +1,4 @@
-% mathjax-latex-4ht.sty (2021-12-01-14:49), generated from tex4ht-mathjax.tex
+% mathjax-latex-4ht.sty (2021-12-02-14:01), generated from tex4ht-mathjax.tex
% Copyright 2018-2021 TeX Users Group
%
% This work may be distributed and/or modified under the
@@ -16,7 +16,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2021-12-01-14:49}
+\immediate\write-1{version 2021-12-02-14:01}
\ExplSyntaxOn
@@ -28,7 +28,7 @@
\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}
}
diff --git a/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht b/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht
index 3a073281863..4afc9fe3466 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 (2021-08-24-17:04), generated from tex4ht-4ht.tex
+% usepackage.4ht (2021-12-02-14:01), generated from tex4ht-4ht.tex
% Copyright 2003-2009 Eitan M. Gurari
% Copyright 2009-2021 TeX Users Group
%
@@ -17,7 +17,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2021-08-24-17:04}
+\immediate\write-1{version 2021-12-02-14:01}
\def\:temp{tex4ht}\ifx \:temp\@currname
\:warning{\string\usepackage{tex4ht} again?}
@@ -63,6 +63,7 @@
\Configure{PackageHooks}{caption.sty}{caption-hooks.4ht}
\Configure{PackageHooks}{minted.sty}{minted-sty-hooks.4ht}
\Configure{PackageHooks}{graphics.sty}{graphics-hooks.4ht}
+\Configure{PackageHooks}{graphbox.sty}{graphbox-hooks.4ht}
\Configure{PackageHooks}{xcolor.sty}{xcolor-hooks.4ht}
\Configure{PackageHooks}{imakeidx.sty}{imakeidx-hooks.4ht}
\Configure{PackageHooks}{fancyhdr.sty}{fancyhdr-hooks.4ht}