texlive[63141] Master/texmf-dist: breqn support, tex4ht r1116;
commits+karl at tug.org
commits+karl at tug.org
Mon Apr 25 23:04:28 CEST 2022
Revision: 63141
http://tug.org/svn/texlive?view=revision&revision=63141
Author: karl
Date: 2022-04-25 23:04:28 +0200 (Mon, 25 Apr 2022)
Log Message:
-----------
breqn support, tex4ht r1116; external docs in subdirs, tex4ht r1117
Revision Links:
--------------
http://tug.org/svn/texlive?view=revision&revision=1116
http://tug.org/svn/texlive?view=revision&revision=1117
Modified Paths:
--------------
trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
trunk/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex
trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
trunk/Master/texmf-dist/tex/generic/tex4ht/xr-hyper.4ht
trunk/Master/texmf-dist/tex/generic/tex4ht/xrhyper-hooks.4ht
Added Paths:
-----------
trunk/Master/texmf-dist/tex/generic/tex4ht/breqn.4ht
Modified: trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog 2022-04-25 20:27:47 UTC (rev 63140)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog 2022-04-25 21:04:28 UTC (rev 63141)
@@ -1,3 +1,12 @@
+2022-04-25 Michal Hoftich <michal.h21 at gmail.com>
+
+ * tex4ht-4ht.tex (xr-hyper.4ht,
+ xrhyper-hooks.4ht): added support for external documents in
+ subdirectories.
+ https://puszcza.gnu.org.ua/bugs/?560
+ * tex4ht-4ht.tex (breqn.4ht): added support for the Breqn package.
+ https://tex.stackexchange.com/a/641918/2891
+
2022-04-24 Michal Hoftich <michal.h21 at gmail.com>
* tex4ht-4ht.tex (latex.4ht): fixed spurious space inserted after
Modified: trunk/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex 2022-04-25 20:27:47 UTC (rev 63140)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex 2022-04-25 21:04:28 UTC (rev 63141)
@@ -1,4 +1,4 @@
-% $Id: mktex4ht-cnf.tex 1103 2022-03-29 15:46:43Z michal_h21 $
+% $Id: mktex4ht-cnf.tex 1116 2022-04-25 08:10:08Z michal_h21 $
% Manually-maintained file, listing *.4ht files created by tex4ht-4ht.tex.
% Read by tex4ht-cond4ht.
%
@@ -292,6 +292,7 @@
\AddFile{9}{web}
\AddFile{9}{exerquiz}
\AddFile{9}{hyperxmp}
+\AddFile{9}{breqn}
\AddFile{9}{nicefrac}
\AddFile{9}{multicol}
\AddFile{2}{lettrine}
Modified: trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex 2022-04-25 20:27:47 UTC (rev 63140)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex 2022-04-25 21:04:28 UTC (rev 63141)
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 1115 2022-04-24 18:59:13Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1117 2022-04-25 13:31:56Z michal_h21 $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2022 TeX Users Group
@@ -3889,8 +3889,11 @@
Hyperref pasess five arguments to \`|\newlabel|, we must adapt \`|\XR:rEfLiNK| to that
\<fix xr-hyper\><<<
-\def\XRrEfLiNK[#1]#2#3{\a:xr[#1]{#2}{}%
- \ifx\hyperrefLabel\:UnDef #3\else \hyperrefLabel\fi \b:xr}
+\def\XRrEfLiNK[#1]#2#3{%
+ \filename at parse{#1}% Get basename of the linked html file,
+ % xr:dir\filename at base contains file's directory
+ \a:xr[\csname xr:dir:\filename at base\endcsname#1]{#2}{}%
+ \ifx\hyperrefLabel\:UnDef #3\else \hyperrefLabel\fi \b:xr}
\NewConfigure{xr}{2}
\Configure{xr}{\Link}{\EndLink}
\def\XR:rEfLiNK#1#2#3#4#5{{\xr:rEfLiNK#1}{\xr:rEfLiNK#2}{\xr:rEfLiNK#3}}
@@ -3917,6 +3920,10 @@
\<wait with xr-hyper\><<<
\:AtEndOfPackage{\let\XR:\XR@
\def\XR@[#1][#2]#3{%
+ % save directory for the linked file
+ \filename at parse{#3}
+ % \filename at base is filename, \filename at area directory
+ \expandafter\xdef\csname xr:dir:\filename at base\endcsname{\filename at area}
\AtBeginDocument{\XR:[#1][#2]{#3}}
}%
}
@@ -32405,7 +32412,85 @@
}
>>>\AddFile{9}{datetime2-hooks}
+%%%%%%%%%%%%%%%%%%%%%%%%%
+\Section{breqn.sty}
+%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\<breqn.4ht\><<<
+% breqn.4ht (|version), generated from |jobname.tex
+% Copyright 2021 TeX Users Group
+|<TeX4ht copywrite|>
+|<breqn environments|>
+|<breqn commands|>
+\Hinput{breqn}
+\endinput
+
+>>> \AddFile{9}{breqn}
+
+Breqn defines some environments, but their use ends with
+fatal errors with TeX4ht. We redefine them to use standard
+LaTeX math environments instead. We will lose some functionality,
+but fatal error is a worse possibility.
+
+\<breqn environments\><<<
+\renewenvironment{dmath*}[1][]{\[}{\]}
+\renewenvironment{dmath}[1][]{\begin{equation}}{\end{equation}}
+\renewenvironment{dsuspend}{}{\par}
+
+% enumerate equation for \begin{dseries}
+\def\@dseries[#1]{%
+ \if\eq at hasNumber%
+ \refstepcounter{equation}%
+ \fi
+ \begingroup%
+ \a:equation%
+ \ignorespaces%
+}
+
+
+% mimic the equatio environment
+\def\end at dseries{%
+ \b:equation
+ \if\eq at hasNumber%
+ (\arabic{equation})%
+ \fi%
+\c:equation%
+}
+
+% this macro prints spurious equation number to the document, so we just reset it
+\def\grp at finish{%
+ \setbox\GRP at wholebox\vbox{%
+ \let\breqn at elt\eqgrp at elt
+ \the\GRP at queue
+ }%
+ \unvbox\GRP at wholebox
+}
+
+% the \EQ at displayinfo is used by other commands, it isn't useful in the HTML conversion
+\def\eq at nulldisplay{%
+ \xdef\EQ at displayinfo{%
+ \relax}%
+}
+>>>
+
+\<breqn commands\><<<
+%% commands
+% fix wrong handling of fonts in \condition
+\newcommand\:condition at a[2][\conditionpunct]{%
+ \unpenalty\unskip\unpenalty\unskip % BRM Added
+ \mbox{#1}%
+ \hskip\conditionsep
+ \ \if at tempswa\mbox{#2}\else\mbox{$\textmath at setup #2$}\fi
+ \endgroup
+}
+
+\HLet\condition at a\:condition at a
+
+>>>
+
+%%%%%%%%%%%%%%%%%%%%%%%
\Section{nicefrac.sty}
+%%%%%%%%%%%%%%%%%%%%%%%
\<nicefrac.4ht\><<<
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Added: trunk/Master/texmf-dist/tex/generic/tex4ht/breqn.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/breqn.4ht (rev 0)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/breqn.4ht 2022-04-25 21:04:28 UTC (rev 63141)
@@ -0,0 +1,77 @@
+% breqn.4ht (2022-04-25-13:36), generated from tex4ht-4ht.tex
+% Copyright 2021 TeX Users Group
+% Copyright 2009-2022 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 2022-04-25-13:36}
+
+\renewenvironment{dmath*}[1][]{\[}{\]}
+\renewenvironment{dmath}[1][]{\begin{equation}}{\end{equation}}
+\renewenvironment{dsuspend}{}{\par}
+
+% enumerate equation for \begin{dseries}
+\def\@dseries[#1]{%
+ \if\eq at hasNumber%
+ \refstepcounter{equation}%
+ \fi
+ \begingroup%
+ \a:equation%
+ \ignorespaces%
+}
+
+
+% mimic the equatio environment
+\def\end at dseries{%
+ \b:equation
+ \if\eq at hasNumber%
+ (\arabic{equation})%
+ \fi%
+\c:equation%
+}
+
+% this macro prints spurious equation number to the document, so we just reset it
+\def\grp at finish{%
+ \setbox\GRP at wholebox\vbox{%
+ \let\breqn at elt\eqgrp at elt
+ \the\GRP at queue
+ }%
+ \unvbox\GRP at wholebox
+}
+
+% the \EQ at displayinfo is used by other commands, it isn't useful in the HTML conversion
+\def\eq at nulldisplay{%
+ \xdef\EQ at displayinfo{%
+ \relax}%
+}
+
+%% commands
+% fix wrong handling of fonts in \condition
+\newcommand\:condition at a[2][\conditionpunct]{%
+ \unpenalty\unskip\unpenalty\unskip % BRM Added
+ \mbox{#1}%
+ \hskip\conditionsep
+ \ \if at tempswa\mbox{#2}\else\mbox{$\textmath at setup #2$}\fi
+ \endgroup
+}
+
+\HLet\condition at a\:condition at a
+
+
+\Hinput{breqn}
+\endinput
+
+
Property changes on: trunk/Master/texmf-dist/tex/generic/tex4ht/breqn.4ht
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/xr-hyper.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/xr-hyper.4ht 2022-04-25 20:27:47 UTC (rev 63140)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/xr-hyper.4ht 2022-04-25 21:04:28 UTC (rev 63141)
@@ -1,6 +1,6 @@
-% xr-hyper.4ht (2016-12-21-15:03), generated from tex4ht-4ht.tex
+% xr-hyper.4ht (2022-04-25-13:36), generated from tex4ht-4ht.tex
% Copyright 2003-2009 Eitan M. Gurari
-% Copyright 2009-2016 TeX Users Group
+% Copyright 2009-2022 TeX Users Group
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -17,7 +17,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2016-12-21-15:03}
+\immediate\write-1{version 2022-04-25-13:36}
\let\XR:loop=\XR at loop
\def\XR at loop#1{%
@@ -52,8 +52,11 @@
\ifeof\@inputcheck\expandafter\XR at aux
\else\expandafter\XR at read\fi}
- \def\XRrEfLiNK[#1]#2#3{\a:xr[#1]{#2}{}%
- \ifx\hyperrefLabel\:UnDef #3\else \hyperrefLabel\fi \b:xr}
+ \def\XRrEfLiNK[#1]#2#3{%
+ \filename at parse{#1}% Get basename of the linked html file,
+ % xr:dir\filename at base contains file's directory
+ \a:xr[\csname xr:dir:\filename at base\endcsname#1]{#2}{}%
+ \ifx\hyperrefLabel\:UnDef #3\else \hyperrefLabel\fi \b:xr}
\NewConfigure{xr}{2}
\Configure{xr}{\Link}{\EndLink}
\def\XR:rEfLiNK#1#2#3#4#5{{\xr:rEfLiNK#1}{\xr:rEfLiNK#2}{\xr:rEfLiNK#3}}
Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/xrhyper-hooks.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/xrhyper-hooks.4ht 2022-04-25 20:27:47 UTC (rev 63140)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/xrhyper-hooks.4ht 2022-04-25 21:04:28 UTC (rev 63141)
@@ -1,4 +1,4 @@
-% xrhyper-hooks.4ht (2020-10-17-13:53), generated from tex4ht-4ht.tex
+% xrhyper-hooks.4ht (2022-04-25-13:36), generated from tex4ht-4ht.tex
% Copyright 2020 TeX Users Group
%
% This work may be distributed and/or modified under the
@@ -16,10 +16,14 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2020-10-17-13:53}
+\immediate\write-1{version 2022-04-25-13:36}
\:AtEndOfPackage{\let\XR:\XR@
\def\XR@[#1][#2]#3{%
+ % save directory for the linked file
+ \filename at parse{#3}
+ % \filename at base is filename, \filename at area directory
+ \expandafter\xdef\csname xr:dir:\filename at base\endcsname{\filename at area}
\AtBeginDocument{\XR:[#1][#2]{#3}}
}%
}
More information about the tex-live-commits
mailing list.