texlive[61208] Master/texmf-dist: undo graphbox changes, tex4ht 1024;

commits+karl at tug.org commits+karl at tug.org
Thu Dec 2 23:25:21 CET 2021


Revision: 61208
          http://tug.org/svn/texlive?view=revision&revision=61208
Author:   karl
Date:     2021-12-02 23:25:21 +0100 (Thu, 02 Dec 2021)
Log Message:
-----------
undo graphbox changes, tex4ht 1024; search for \par\b, tex4ht r1023

Revision Links:
--------------
    http://tug.org/svn/texlive?view=revision&revision=1023

Modified Paths:
--------------
    trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
    trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
    trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathjax.tex
    trunk/Master/texmf-dist/tex/generic/tex4ht/mathjax-latex-4ht.4ht
    trunk/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht

Added Paths:
-----------
    trunk/Master/texmf-dist/tex/generic/tex4ht/graphbox-hooks.4ht

Modified: trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog	2021-12-02 21:56:38 UTC (rev 61207)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog	2021-12-02 22:25:21 UTC (rev 61208)
@@ -1,3 +1,12 @@
+2021-12-02  Michal Hoftich  <michal.h21 at 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 at setfile.
+	https://github.com/michal-h21/tex4ebook/issues/84
+	
 2021-12-01  Michal Hoftich  <michal.h21 at gmail.com>
 
 	* tex4ht-mathjax.tex (mathjax-latex-4ht.4ht): search for \par<space> in

Modified: trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex	2021-12-02 21:56:38 UTC (rev 61207)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex	2021-12-02 22:25:21 UTC (rev 61208)
@@ -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 @@
 
 
 %%%%%%%%%%%%%%%%%%%%%%%
+\SubSection{graphbox}
+
+Graphbox redefines \`'\Gin at 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 at setfile\old at box@Gin at setfile
+}
+>>> \AddFile{9}{graphbox-hooks}
+%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%
 \Section{svg}
 %%%%%%%%%%%%%%%%%%%%%%%
 

Modified: trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathjax.tex
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathjax.tex	2021-12-02 21:56:38 UTC (rev 61207)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathjax.tex	2021-12-02 22:25:21 UTC (rev 61208)
@@ -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 @@
   \regex_replace_all:nnN { \x{3C} } { < } \l_tmpa_tl 
   \regex_replace_all:nnN { \x{3E} } { > } \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}
 }

Added: trunk/Master/texmf-dist/tex/generic/tex4ht/graphbox-hooks.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/graphbox-hooks.4ht	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/graphbox-hooks.4ht	2021-12-02 22:25:21 UTC (rev 61208)
@@ -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 at setfile\old at box@Gin at setfile
+}
+


Property changes on: trunk/Master/texmf-dist/tex/generic/tex4ht/graphbox-hooks.4ht
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/mathjax-latex-4ht.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/mathjax-latex-4ht.4ht	2021-12-02 21:56:38 UTC (rev 61207)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/mathjax-latex-4ht.4ht	2021-12-02 22:25:21 UTC (rev 61208)
@@ -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} } { < } \l_tmpa_tl
   \regex_replace_all:nnN { \x{3E} } { > } \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}
 }

Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht	2021-12-02 21:56:38 UTC (rev 61207)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht	2021-12-02 22:25:21 UTC (rev 61208)
@@ -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}



More information about the tex-live-commits mailing list.