diff options
author | Karl Berry <karl@freefriends.org> | 2010-07-14 16:40:34 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-07-14 16:40:34 +0000 |
commit | 57e485197587d08aa2ca05ce2cc95e8063edd4cc (patch) | |
tree | b718954bc819b66d11005b7bcf266aae7ed63952 /Master/texmf-dist/tex/latex/mh/breqn.sty | |
parent | ff69d312a2c79a3d20d1084c44d579da6770a0a7 (diff) |
mh update (13jul10)
git-svn-id: svn://tug.org/texlive/trunk@19447 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/mh/breqn.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/mh/breqn.sty | 153 |
1 files changed, 97 insertions, 56 deletions
diff --git a/Master/texmf-dist/tex/latex/mh/breqn.sty b/Master/texmf-dist/tex/latex/mh/breqn.sty index 77b761ad0db..ef00e99ed98 100644 --- a/Master/texmf-dist/tex/latex/mh/breqn.sty +++ b/Master/texmf-dist/tex/latex/mh/breqn.sty @@ -28,7 +28,8 @@ %% breqn.sty, breqn.pdf, breqn.ins, breqn.drv. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{breqn}[2008/08/13 v0.98a] +\RequirePackage{expl3}[2009/08/05] +\ProvidesExplPackage{breqn}{2009/08/07}{0.98a}{Breaking equations} \edef\breqnpopcats{% \catcode\number`\"=\number\catcode`\" \relax} @@ -39,7 +40,7 @@ } \ProcessOptions\relax \@ifpackageloaded{flexisym}{}{% - \RequirePackage{flexisym}[2007/12/19] + \RequirePackage{flexisym}[2009/08/07] \edef\breqnpopcats{\breqnpopcats \catcode\number`\^=\number\catcode`\^ \catcode\number`\_=\number\catcode`\_ @@ -118,11 +119,18 @@ \long\gdef\&m#1#2{#1\csname \endcsname{#1}} \endgroup \@xp\let\csname\string &q\endcsname\@gobble +\ExplSyntaxOn \g@addto@macro\mathchars@reset{% - \let\@symRel\@secondoftwo \let\@symBin\@secondoftwo - \let\@symDeL\@secondoftwo \let\@symDeR\@secondoftwo - \let\@symDeB\@secondoftwo -} + %\let\@symRel\@secondoftwo \let\@symBin\@secondoftwo + %\let\@symDeL\@secondoftwo \let\@symDeR\@secondoftwo + %\let\@symDeB\@secondoftwo + \cs_set_eq:NN \math_csym_Rel:Nn \use_ii:nn + \cs_set_eq:NN \math_csym_Bin:Nn \use_ii:nn + \cs_set_eq:NN \math_csym_DeL:Nn \use_ii:nn + \cs_set_eq:NN \math_csym_DeR:Nn \use_ii:nn + \cs_set_eq:NN \math_csym_DeB:Nn \use_ii:nn +} +\ExplSyntaxOff \def\eq@cons#1#2{% \begingroup \let\@elt\relax \xdef#1{\@elt{#2}#1}\endgroup } @@ -291,8 +299,8 @@ \mskip\thickmuskip \@@vadjust{\penalty\tw@}\penalty-\@Mi\@@vadjust{}% } \newcommand\hiderel[1]{\mathrel{\advance\lr@level\@ne#1}} -\let\m@@Bin\m@Bin -\let\m@@Rel\m@Rel +%%%%\let\m@@Bin\m@Bin +%%%%%\let\m@@Rel\m@Rel \let\EQ@prebin@space\relax \def\EQ@prebin@space@a{\mskip-\eq@binoffset \keep@glue \mskip\eq@binoffset} \def\bin@break{\ifnum\lastpenalty=\z@\penalty\prebinoppenalty\fi @@ -302,22 +310,34 @@ \penalty\prerelpenalty \fi } -\def\d@@Bin{\bin@break \m@@Bin} -\def\d@@Rel{\mark@lhs \rel@break \m@@Rel} -\let\m@@symRel\@symRel \def\d@@symRel{\mark@lhs \rel@break \m@@symRel} -\let\m@@symBin\@symBin \def\d@@symBin{\bin@break \m@@symBin} -\let\m@@symDel\@symDel -\let\m@@symDeR\@symDeR -\let\m@@symDeB\@symDeB -\let\m@@symDeA\@symDeA +\ExplSyntaxOn +%%%\def\d@@Bin{\bin@break \m@@Bin} +%%%%\def\d@@Rel{\mark@lhs \rel@break \m@@Rel} +\cs_set:Npn \math_dsym_Bin:Nn {\bin@break\math_bsym_Bin:Nn} +\cs_set:Npn \math_dsym_Rel:Nn {\mark@lhs \rel@break \math_bsym_Rel:Nn } +\ExplSyntaxOff +\ExplSyntaxOn +%%\let\m@@symRel\@symRel +%%%\def\d@@symRel{\mark@lhs \rel@break \m@@symRel} + +\cs_set_protected:Npn \math_dcsym_Bin:Nn {\bin@break \math_bcsym_Bin:Nn} +\cs_set_protected:Npn \math_dcsym_Rel:Nn { \mark@lhs \rel@break \math_bcsym_Rel:Nn} + +%%\let\m@@symBin\@symBin \def\d@@symBin{\bin@break \m@@symBin} +%%\let\m@@symDel\@symDel +%%\let\m@@symDeR\@symDeR +%%\let\m@@symDeB\@symDeB +%%\let\m@@symDeA\@symDeA + \def\display@setup{% \medmuskip\Dmedmuskip \thickmuskip\Dthickmuskip - \let\m@Bin\d@@Bin \let\m@Rel\d@@Rel - \let\@symRel\d@@symRel \let\@symBin\d@@symBin - \let\m@DeL\d@@DeL \let\m@DeR\d@@DeR \let\m@DeB\d@@DeB - \let\m@DeA\d@@DeA - \let\@symDeL\d@@symDeL \let\@symDeR\d@@symDeR - \let\@symDeB\d@@symDeB \let\@symDeA\d@@symDeA + \math_setup_display_symbols: + %%\let\m@Bin\d@@Bin \let\m@Rel\d@@Rel + %%\let\@symRel\d@@symRel \let\@symBin\d@@symBin + %%\let\m@DeL\d@@DeL \let\m@DeR\d@@DeR \let\m@DeB\d@@DeB + %%\let\m@DeA\d@@DeA + %%\let\@symDeL\d@@symDeL \let\@symDeR\d@@symDeR + %%\let\@symDeB\d@@symDeB \let\@symDeA\d@@symDeA \let\left\eq@left \let\right\eq@right \global\lr@level\z@ \global\eq@wdCond\z@ %BRM: new \everyhbox{\everyhbox\@emptytoks @@ -329,12 +349,15 @@ } \def\dseries@display@setup{% \medmuskip\Dmedmuskip \thickmuskip\Dthickmuskip - \let\m@Bin\d@@Bin - \let\@symBin\d@@symBin - \let\m@DeL\d@@DeL \let\m@DeR\d@@DeR \let\m@DeB\d@@DeB - \let\m@DeA\d@@DeA - \let\@symDeL\d@@symDeL \let\@symDeR\d@@symDeR - \let\@symDeB\d@@symDeB \let\@symDeA\d@@symDeA + \math_setup_display_symbols: +%%%% \let\m@Bin\d@@Bin +%%%\let\m@Rel\d@@Rel +%%% \let\@symRel\d@@symRel +%%% \let\@symBin\d@@symBin +%%% \let\m@DeL\d@@DeL \let\m@DeR\d@@DeR \let\m@DeB\d@@DeB +%%% \let\m@DeA\d@@DeA +%%% \let\@symDeL\d@@symDeL \let\@symDeR\d@@symDeR +%%% \let\@symDeB\d@@symDeB \let\@symDeA\d@@symDeA \let\left\eq@left \let\right\eq@right \global\lr@level\z@ \everyhbox{\everyhbox\@emptytoks \let\display@setup\relax \textmath@setup \let\textmath@setup\relax @@ -345,14 +368,17 @@ \displaystyle } \def\textmath@setup{% - \let\m@Bin\m@@Bin \let\m@Rel\m@@Rel - \let\@symRel\m@@symRel \let\@symBin\m@@symBin - \let\m@DeL\m@@DeL \let\m@DeR\m@@DeR \let\m@DeB\m@@DeB - \let\m@DeA\m@@DeA - \let\@symDeL\m@@symDeL \let\@symDeR\m@@symDeR - \let\@symDeB\m@@symDeB \let\@symDeA\m@@symDeA + \math_setup_inline_symbols: +%%%% \let\m@Bin\m@@Bin \let\m@Rel\m@@Rel +%%%% \let\@symRel\m@@symRel \let\@symBin\m@@symBin +%%%% \let\m@DeL\m@@DeL \let\m@DeR\m@@DeR \let\m@DeB\m@@DeB +%%%% \let\m@DeA\m@@DeA +%%%% \let\@symDeL\m@@symDeL \let\@symDeR\m@@symDeR +%%%% \let\@symDeB\m@@symDeB \let\@symDeA\m@@symDeA \let\left\@@left \let\right\@@right } + +\ExplSyntaxOff \@ifundefined{@displaytrue}{% \@xp\newif\csname if@display\endcsname \everydisplay\@xp{\the\everydisplay \@displaytrue}% @@ -1453,19 +1479,21 @@ \@saveprimitive\left\@@left \@saveprimitive\right\@@right \newcount\lr@level +\ExplSyntaxOn \def\eq@left{% - \@ifnext .{\eq@nullleft}{\begingroup \let\delimiter\eq@left@a}% + \@ifnext .{\eq@nullleft}{\begingroup \let\math_delimiter:NNnNn \eq@left@a}% } \def\eq@right{% - \@ifnext .{\eq@nullright}{\begingroup \let\delimiter\eq@right@a}% + \@ifnext .{\eq@nullright}{\begingroup \let \math_delimiter:NNnNn \eq@right@a}% } -\def\eq@left@a#1 #2{\endgroup\@@left\delimiter#1 \after@open} -\def\eq@right@a#1 #2{\endgroup - \@@right\delimiter#1 \after@close \ss@scan{#1}% +\def\eq@left@a#1#2#3#4#5#6{\endgroup + \@@left \math_delimiter:NNnNn #1#2{#3}#4{#5}\after@open} +\def\eq@right@a#1#2#3#4#5#6{\endgroup + \@@right \math_delimiter:NNnNn #1#2{#3}#4{#5}\after@close \ss@scan{#1#2{#3}#4{#5}}% } +\ExplSyntaxOff \def\eq@nullleft#1{\@@left#1\after@open} \def\eq@nullright#1{\@@right#1\after@close} - % For paren matching: ) \def\delim@reset{% \let\after@open\relax \let\after@close\relax \let\left\@@left \let\right\@@right @@ -1504,18 +1532,24 @@ %%\def\Biggm{\mathrel\Bigg} %%\def\bigggm{\mathrel\biggg} %%\def\Bigggm{\mathrel\Biggg} -\let\m@@DeL\m@DeL \let\m@@DeR\m@DeR \let\m@@DeB\m@DeB -\def\d@@DeL#1#2#3{% - \delimiter"4\@xp\delim@a\csname sd@#1#2#3\endcsname #1#2#3 \after@open -} -\def\d@@DeR#1#2#3{% - \delimiter"5\@xp\delim@a\csname sd@#1#2#3\endcsname #1#2#3 \after@close -} -\def\d@@DeB#1#2#3{% - \delimiter"0\@xp\delim@a\csname sd@#1#2#3\endcsname #1#2#3 \after@bidir -} +\ExplSyntaxOn +\cs_set:Npn \math_dsym_DeL:Nn #1#2{\math_bsym_DeL:Nn #1{#2}\after@open} +\cs_set:Npn \math_dsym_DeR:Nn #1#2{\math_bsym_DeR:Nn #1{#2}\after@close} +\cs_set:Npn \math_dsym_DeB:Nn #1#2{\math_bsym_DeB:Nn #1{#2}\after@bidir} + +%%%%% +%%%%%\let\m@@DeL\m@DeL \let\m@@DeR\m@DeR \let\m@@DeB\m@DeB +%%%%%\def\d@@DeL#1#2#3{% +%%%%% \delimiter"4\@xp\delim@a\csname sd@#1#2#3\endcsname #1#2#3 \after@open +%%%%%} +%%%%%\def\d@@DeR#1#2#3{% +%%%%% \delimiter"5\@xp\delim@a\csname sd@#1#2#3\endcsname #1#2#3 \after@close +%%%%%} +%%%%%\def\d@@DeB#1#2#3{% +%%%%% \delimiter"0\@xp\delim@a\csname sd@#1#2#3\endcsname #1#2#3 \after@bidir +%%%%%} %%BRM: These weren't defined, but apparently should be. -\let\m@@DeA\m@DeA\let\d@@DeA\m@DeA% +%%%%%%\let\m@@DeA\m@DeA\let\d@@DeA\m@DeA% \let\after@bidir\@empty \mathchardef\zero@bop=888 \relax \mathchardef\bop@incr=4444 \relax @@ -1524,7 +1558,7 @@ \prebinoppenalty\bop@incr \multiply\prebinoppenalty\lr@level \advance\prebinoppenalty\zero@bop \ifnum\eqbreakdepth<\lr@level - \let\m@Bin\m@@Bin + \cs_set_eq:NN \math_sym_Bin:Nn \math_isym_Bin:Nn %%%%%%\let\m@Bin\m@@Bin \else \eq@binoffset=\eqbinoffset \advance\eq@binoffset\lr@level\eqdelimoffset plus1fill\relax @@ -1537,17 +1571,20 @@ \prebinoppenalty\bop@incr \multiply\prebinoppenalty\lr@level \advance\prebinoppenalty\zero@bop \ifnum\eqbreakdepth<\lr@level - \else \let\m@Bin\d@@Bin + \else \cs_set_eq:NN \math_sym_Bin:Nn \math_dsym_Bin:Nn %%%%%%\let\m@Bin\d@@Bin \fi \ifnum\lr@level<\@ne \eq@binoffset=\eqbinoffset\relax \fi } + +\ExplSyntaxOff + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \let\subsup@flag=\count@ -\def\ss@delim@a#1#2#3#4{\xdef\right@delim@code{\number"#2#3#4}} +\def\ss@delim@a@new#1#2#3#4#5{\xdef\right@delim@code{\number"#4#5}} \def\ss@scan#1{% \begingroup - \let\delim@a\ss@delim@a \@tempcnta#1\relax + \ss@delim@a@new #1% \endgroup \subsup@flag\@M \afterassignment\ss@scan@a \let\@let@token=} \def\ss@scan@a{% @@ -1563,9 +1600,13 @@ \fi\fi\fi\fi\fi\fi \breqn@next\@let@token } +\ExplSyntaxOn \def\ss@scan@b#1#2{#1{% - \let\m@Bin\m@@Bin \let\m@Rel\m@@Rel + %%%%%\let\m@Bin\m@@Bin \let\m@Rel\m@@Rel + \cs_set_eq:NN \math_sym_Bin:Nn \math_isym_Bin:Nn + \cs_set_eq:NN \math_sym_Rel:Nn \math_isym_Rel:Nn #2}\afterassignment\ss@scan@a \let\@let@token=}% +\ExplSyntaxOff \def\ss@finish{% \@@vadjust{\penalty\thr@@}% \penalty\right@delim@code \penalty-\subsup@flag \keep@glue |