summaryrefslogtreecommitdiff
path: root/macros/latex
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex')
-rw-r--r--macros/latex/contrib/breqn/CHANGES.md6
-rw-r--r--macros/latex/contrib/breqn/breqn.dtx69
-rw-r--r--macros/latex/contrib/breqn/breqn.pdfbin661840 -> 663299 bytes
-rw-r--r--macros/latex/contrib/breqn/flexisym.dtx6
-rw-r--r--macros/latex/contrib/breqn/flexisym.pdfbin285950 -> 286026 bytes
-rw-r--r--macros/latex/contrib/breqn/mathstyle.dtx6
-rw-r--r--macros/latex/contrib/breqn/mathstyle.pdfbin186678 -> 186681 bytes
-rw-r--r--macros/latex/contrib/easybook/easybook.dtx16
-rw-r--r--macros/latex/contrib/easybook/easybook.pdfbin584973 -> 584984 bytes
-rw-r--r--macros/latex/contrib/easybook/easybook.tex4
10 files changed, 75 insertions, 32 deletions
diff --git a/macros/latex/contrib/breqn/CHANGES.md b/macros/latex/contrib/breqn/CHANGES.md
index 26d5849594..db0f313bcc 100644
--- a/macros/latex/contrib/breqn/CHANGES.md
+++ b/macros/latex/contrib/breqn/CHANGES.md
@@ -1,5 +1,11 @@
# Release notes for the `breqn` packages
+
+## v0.98l (2021/10/28)
+
+ * Prevent new LaTeX paragraph hooks from running and interfering unnecessarily with breqn internals (thanks Frank)
+
+
## v0.98k (2020/09/24)
* Update patch code for new 2e kernel (thanks Ulrike)
diff --git a/macros/latex/contrib/breqn/breqn.dtx b/macros/latex/contrib/breqn/breqn.dtx
index ce68c555b6..bd33b11cfd 100644
--- a/macros/latex/contrib/breqn/breqn.dtx
+++ b/macros/latex/contrib/breqn/breqn.dtx
@@ -151,8 +151,8 @@
%
%
% \title{The \pkg{breqn} package}
-% \def\fileversion{0.98k}
-% \def\filedate{2020/09/24}
+% \def\fileversion{0.98l}
+% \def\filedate{2021/10/28}
% \date{\pkg{breqn} bundle: \filedate\space\fileversion}
% \author{Authors: Michael J. Downes, Morten H\o gholm\\ Maintained by Morten H\o gholm, Will Robertson\\ Feedback: \texttt{https://github.com/wspr/breqn/issues}}
%
@@ -1377,7 +1377,7 @@
% Declare package name and date.
% \begin{macrocode}
\RequirePackage{expl3}
-\ProvidesExplPackage{breqn}{2020/09/24}{0.98k}{Breaking equations}
+\ProvidesExplPackage{breqn}{2021/10/28}{0.98l}{Breaking equations}
% \end{macrocode}
% Regrettably, \pkg{breqn} is internally a mess, so we have to take
% some odd steps.
@@ -1458,6 +1458,30 @@
%
% \section{Some useful tools}
%
+%
+%
+% \begin{macro}{\MaybeRawNoindent}
+% Breqn does a lot of low-level paragraph stuff which iesn't
+% supposed to execute paragraph hooks, so with a newer \LaTeX{} it
+% needs to run the versions that prevent the hooks from executing.
+% \begin{macrocode}
+\providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\IfFormatAtLeastTF{2021/06/01}
+ {%
+ \def\MaybeRawNoindent{\ifvmode\expandafter\RawNoindent\fi}%
+ }%
+ {%
+ \let\MaybeRawNoindent\noindent
+ \let\RawParEnd\@@par
+ }
+% \end{macrocode}
+% \end{macro}
+%
+%
+%
% \begin{macro}{\@nx}
% \begin{macro}{\@xp}
% The comparative brevity of \cs{@nx} and \cs{@xp} is
@@ -3114,19 +3138,25 @@
\def\eq@typeset@L@single{%
\nobreak
\eq@params\eq@parshape
- \nointerlineskip\noindent
+ \nointerlineskip
+% \noindent
+ \MaybeRawNoindent
\add@grp@label
\rlap{\kern-\leftskip\box\EQ@numbox}%
\if F\eq@frame
\else
\rlap{\raise\eq@firstht\hbox to\z@{\eq@addframe\hss}}%
\fi
- \eq@dump@box\unhbox\EQ@box \@@par
+ \eq@dump@box\unhbox\EQ@box
+ %\@@par
+ \RawParEnd
}
\def\eq@typeset@R@single{%
\nobreak
\eq@params\eq@parshape
- \nointerlineskip\noindent
+ \nointerlineskip
+% \noindent
+ \MaybeRawNoindent
\add@grp@label
\if F\eq@frame
\else
@@ -3134,7 +3164,8 @@
\fi
\rlap{\kern-\leftskip\kern\linewidth\kern-\wd\EQ@numbox\copy\EQ@numbox}%
\eq@dump@box\unhbox\EQ@box
- \@@par
+ %\@@par
+ \RawParEnd
}
% \end{macrocode}
%
@@ -3535,7 +3566,9 @@
\def\eq@startup{%
\global\let\EQ@hasLHS\@False
\setbox\z@\vbox\bgroup
- \noindent \@@math \displaystyle
+% \noindent
+ \MaybeRawNoindent % no matching \RawParEnd (implicit at box end)
+ \@@math \displaystyle
\penalty-\@Mi
}
% \end{macrocode}
@@ -5332,7 +5365,9 @@
% \begin{macrocode}
\def\eq@dump@box#1#2{%
%\debug@box#1%
- \noindent #1#2\setbox\f@ur\lastbox \setbox\tw@\lastbox
+% \noindent
+ \MaybeRawNoindent % did not find the end yet
+ #1#2\setbox\f@ur\lastbox \setbox\tw@\lastbox
% \end{macrocode}
% If the LHS contains shrinkable glue, in an L layout the alignment
% could be thrown off if the first line is shrunk noticeably.
@@ -5609,9 +5644,13 @@
\def\eq@typeset@equation{%
\nobreak
\eq@params\eq@parshape
- \nointerlineskip\noindent
+ \nointerlineskip
+% \noindent
+ \MaybeRawNoindent
\add@grp@label
- \eq@dump@box\unhbox\EQ@box\@@par
+ \eq@dump@box\unhbox\EQ@box
+% \@@par
+ \RawParEnd
}
% \end{macrocode}
%
@@ -6007,7 +6046,9 @@
% 10000, it means a sub and/or superscript is present on the right
% delimiter and the box containing them must be taken off first.
% \begin{macrocode}
- \noindent\unhbox\z@ \unskip
+% \noindent
+ \MaybeRawNoindent
+ \unhbox\z@ \unskip
\subsup@flag-\lastpenalty \unpenalty
\xdef\right@delim@code{\number\lastpenalty}%
\unpenalty
@@ -6029,7 +6070,9 @@
% this complication. The penalty value $-10001$ is a no-op case
% in the case statement of \cs{eq@repacka}.
% \begin{macrocode}
- \penalty-\@Mi\z@rule\@@par
+ \penalty-\@Mi\z@rule
+% \@@par
+ \RawParEnd
\setbox\z@\lastbox \unskip\unpenalty
%%{\showboxbreadth\maxdimen\showboxdepth99\showlists}%
}
diff --git a/macros/latex/contrib/breqn/breqn.pdf b/macros/latex/contrib/breqn/breqn.pdf
index 5db6488b0b..2bb8adfda5 100644
--- a/macros/latex/contrib/breqn/breqn.pdf
+++ b/macros/latex/contrib/breqn/breqn.pdf
Binary files differ
diff --git a/macros/latex/contrib/breqn/flexisym.dtx b/macros/latex/contrib/breqn/flexisym.dtx
index b827447fc6..2973f3abc6 100644
--- a/macros/latex/contrib/breqn/flexisym.dtx
+++ b/macros/latex/contrib/breqn/flexisym.dtx
@@ -79,8 +79,8 @@
% \fi
%
% \title{The \textsf{flexisym} package}
-% \def\fileversion{0.98k}
-% \def\filedate{2020/09/24}
+% \def\fileversion{0.98l}
+% \def\filedate{2021/10/28}
% \date{\filedate\space\fileversion}
% \author{Authors: Michael J. Downes, Morten H\o gholm\\ Maintained by Morten H\o gholm, Will Robertson\\ Feedback: \texttt{https://github.com/wspr/breqn/issues}}
%
@@ -98,7 +98,7 @@
% \begin{macrocode}
%<*package>
\RequirePackage{expl3}[2009/08/05]
-\ProvidesExplPackage{flexisym}{2020/09/24}{0.98k}{Make math characters macros}
+\ProvidesExplPackage{flexisym}{2021/10/28}{0.98l}{Make math characters macros}
\edef\do{%
\noexpand\AtEndOfPackage{%
diff --git a/macros/latex/contrib/breqn/flexisym.pdf b/macros/latex/contrib/breqn/flexisym.pdf
index f48961bd2a..906adcb9c3 100644
--- a/macros/latex/contrib/breqn/flexisym.pdf
+++ b/macros/latex/contrib/breqn/flexisym.pdf
Binary files differ
diff --git a/macros/latex/contrib/breqn/mathstyle.dtx b/macros/latex/contrib/breqn/mathstyle.dtx
index 479b95b91d..b2c2e47271 100644
--- a/macros/latex/contrib/breqn/mathstyle.dtx
+++ b/macros/latex/contrib/breqn/mathstyle.dtx
@@ -58,8 +58,8 @@
% \fi
%
% \title{The \textsf{mathstyle} package}
-% \def\fileversion{0.98k}
-% \def\filedate{2020/09/24}
+% \def\fileversion{0.98l}
+% \def\filedate{2021/10/28}
% \date{\filedate\quad\fileversion}
% \author{Authors: Michael J. Downes, Morten H\o gholm\\ Maintained by Morten H\o gholm, Will Robertson\\ Feedback: \texttt{https://github.com/wspr/breqn/issues}}
%
@@ -152,7 +152,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\ProvidesExplPackage{mathstyle}{2020/09/24}{0.98k}{Tracking mathstyle implicitly}
+\ProvidesExplPackage{mathstyle}{2021/10/28}{0.98l}{Tracking mathstyle implicitly}
\ExplSyntaxOff
% \end{macrocode}
%
diff --git a/macros/latex/contrib/breqn/mathstyle.pdf b/macros/latex/contrib/breqn/mathstyle.pdf
index 62fe0c3bd7..fb55407759 100644
--- a/macros/latex/contrib/breqn/mathstyle.pdf
+++ b/macros/latex/contrib/breqn/mathstyle.pdf
Binary files differ
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx
index 73196e000b..429803c886 100644
--- a/macros/latex/contrib/easybook/easybook.dtx
+++ b/macros/latex/contrib/easybook/easybook.dtx
@@ -15,7 +15,7 @@
%<*class>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/10/25}{1.40E}
+\ProvidesExplClass{easybook}{2021/10/25}{1.40F}
{Typeset Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
@@ -325,7 +325,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/10/25}{1.40E}
+\ProvidesExplPackage{easybase}{2021/10/25}{1.40F}
{Typeset Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -1739,7 +1739,6 @@
unknown .code:n = \eb_msg_unknown_option:n { subfont }
}
-\fp_new:N \l__eb_spread_line_fp
\fp_new:N \l__eb_spread_table_fp
\fp_new:N \l__eb_spread_math_fp
\fp_new:N \l__eb_spread_caption_fp
@@ -1747,7 +1746,7 @@
\ctex_define:nn { spread }
{
- line .fp_set:N = \l__eb_spread_line_fp,
+ line .code:n = \AfterPreamble{\setspread{#1}},
line .initial:n = 1.3,
table .fp_set:N = \l__eb_spread_table_fp,
table .initial:n = 1.2,
@@ -1809,11 +1808,6 @@
\exp_args:Nx
\setspread { \fp_use:N \l__eb_spread_table_fp }
}
-\ctex_after_end_preamble:n
- {
- \exp_args:Nx
- \setspread { \fp_use:N \l__eb_spread_line_fp }
- }
\bool_if:NF \l__eb_float_page_bool
{
@@ -1964,7 +1958,7 @@
\cs_set_eq:NN \eb@declaretheorem@save \declaretheorem
\cs_set_eq:NN \eb@declaretheoremsyle@save \declaretheoremstyle
\RenewDocumentCommand{\declaretheorem}{O{}mO{}}
- {\AfterPreamble{\eb@declaretheorem@save[#1,#3]{#2}}}
+ {\AtBeginDocument{\eb@declaretheorem@save[#1,#3]{#2}}}
\RenewDocumentCommand{\declaretheoremstyle}{O{}mO{}}
{\eb@declaretheoremsyle@save[#1,#3]{#2}}
\cs_set_eq:NN \newtheorem \declaretheorem
@@ -2451,7 +2445,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/10/25}{1.40E}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/10/25}{1.40F}
{Customization of tcolorbox for easybook}
\tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip }
diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf
index 32b1dcb767..be07e63f1a 100644
--- a/macros/latex/contrib/easybook/easybook.pdf
+++ b/macros/latex/contrib/easybook/easybook.pdf
Binary files differ
diff --git a/macros/latex/contrib/easybook/easybook.tex b/macros/latex/contrib/easybook/easybook.tex
index ebde41673e..9544f2f830 100644
--- a/macros/latex/contrib/easybook/easybook.tex
+++ b/macros/latex/contrib/easybook/easybook.tex
@@ -20,8 +20,8 @@
name = easybook,
color-scheme = blue,
title = EASYBOOK 使用手册,
- version = v1.40E,
- date = 2021/10/25,
+ version = v1.40F,
+ date = 2021/10/28,
authors = 瞿毅,
info = 排版简体中文学位论文和书籍,
email = q1jx@foxmail.com,