diff --git a/platex/platexrelease.sty b/platex/platexrelease.sty index ffd149c..4c4abf1 100644 --- a/platex/platexrelease.sty +++ b/platex/platexrelease.sty @@ -2028,6 +2028,21 @@ of this package available from CTAN} \else $\@@underline{\hbox{#1}}\m@th$\relax\fi} \expandafter \let \csname underline \endcsname \@undefined \plEndIncludeInRelease +\plIncludeInRelease{2019/10/01}% + {\e@alloc@chardef}{Extended Allocation (FAM256)}% +\ifx\widowpenalties\@undefined + \mathchardef\e@alloc@top=255 + \let\e@alloc@chardef\chardef +\else + \ifx\omathchar\@undefined + \mathchardef\e@alloc@top=32767 + \let\e@alloc@chardef\mathchardef + \else + \omathchardef\e@alloc@top=65535 + \let\e@alloc@chardef\omathchardef + \fi +\fi +\plEndIncludeInRelease \plIncludeInRelease{2018/03/09}% {\e@alloc@chardef}{Extended Allocation (FAM256)}% \ifx\omathchar\@undefined @@ -2078,6 +2093,7 @@ of this package available from CTAN} \let\e@alloc@top\@undefined \let\e@alloc@chardef\@undefined \plEndIncludeInRelease +\let\float@count\e@alloc@top \plIncludeInRelease{2016/11/29}% {\e@mathgroup@top}{Extended Allocation (FAM256)}% \ifx\omathchar\@undefined diff --git a/platex/plcore.dtx b/platex/plcore.dtx index 745722b..2e2c507 100644 --- a/platex/plcore.dtx +++ b/platex/plcore.dtx @@ -120,13 +120,16 @@ % (sync with ltoutput.dtx 2019/08/27 v1.4e)} % \changes{v1.3c}{2019/09/16}{Make \cs{underline} robust % (sync with ltboxes.dtx 2019/08/27 v1.3b)} +% \changes{v1.3d}{2019/10/19}{判定順序を修正;extended modeかつ +% FAM256拡張ありの場合に限りレジスタ数が65536個のため。} +% \changes{v1.3d}{2019/10/19}{コピー忘れ} % \fi % % \iffalse %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{plcore.dtx}[2019/09/16 v1.3c pLaTeX core file] +\ProvidesFile{plcore.dtx}[2019/10/19 v1.3d pLaTeX core file] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plcore.dtx} @@ -2329,20 +2332,22 @@ % \LaTeXe\ 2015/01/01以降、拡張レジスタがあれば利用するようになっています % ので、e-p\TeX{}の拡張レジスタを利用できるように設定します。 % \changes{v1.2j}{2016/11/09}{FAM256パッチ適用e-p\TeX{}に対応} +% \changes{v1.3d}{2019/10/19}{判定順序を修正;extended modeかつ +% FAM256拡張ありの場合に限りレジスタ数が65536個のため。} % \begin{macrocode} -%\plIncludeInRelease{2018/03/09}% +%\plIncludeInRelease{2019/10/01}% % {\e@alloc@chardef}{Extended Allocation (FAM256)}% %<*plcore|platexrelease> % \end{macrocode} % \begin{macrocode} -\ifx\omathchar\@undefined - \ifx\widowpenalties\@undefined +\ifx\widowpenalties\@undefined % \end{macrocode} % オリジナルの\TeX{}の場合(拡張なしのアスキーp\TeX{}の場合)。 % \begin{macrocode} \mathchardef\e@alloc@top=255 \let\e@alloc@chardef\chardef - \else +\else + \ifx\omathchar\@undefined % \end{macrocode} % e-\TeX{}拡張で$2^{15}$個のレジスタが利用できます。 % ^^A 備忘録:「FAM256なしのe-(u)p\TeX{}」は事実上存在しないはず。 @@ -2359,8 +2364,7 @@ % \begin{macrocode} \mathchardef\e@alloc@top=32767 \let\e@alloc@chardef\mathchardef - \fi -\else + \else % \end{macrocode} % FAM256パッチが適用されたe-p\TeX{}の場合は、$2^{16}$個のレジスタが利用できます。 % \changes{v1.2w}{2018/02/24}{e-up\TeX{}でも\cs{omathchardef}を使用} @@ -2371,11 +2375,27 @@ % \begin{macrocode} \omathchardef\e@alloc@top=65535 \let\e@alloc@chardef\omathchardef + \fi \fi % \end{macrocode} % \begin{macrocode} % %\plEndIncludeInRelease +%\plIncludeInRelease{2018/03/09}% +% {\e@alloc@chardef}{Extended Allocation (FAM256)}% +%\ifx\omathchar\@undefined +% \ifx\widowpenalties\@undefined +% \mathchardef\e@alloc@top=255 +% \let\e@alloc@chardef\chardef +% \else +% \mathchardef\e@alloc@top=32767 +% \let\e@alloc@chardef\mathchardef +% \fi +%\else +% \omathchardef\e@alloc@top=65535 +% \let\e@alloc@chardef\omathchardef +%\fi +%\plEndIncludeInRelease %\plIncludeInRelease{2016/11/29}% % {\e@alloc@chardef}{Extended Allocation (FAM256)}% %\ifx\omathchar\@undefined @@ -2415,6 +2435,16 @@ % \end{macro} % \end{macro} % +% \begin{macro}{\float@count} +% |\newcount|や|\newdimen|で使われます。 +% \changes{v1.3d}{2019/10/19}{コピー忘れ} +% \begin{macrocode} +%<*plcore|platexrelease> +\let\float@count\e@alloc@top +% +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\e@mathgroup@top} % 2015/01/01以降の\LaTeXe{}カーネルは、Xe\TeX{}とLua\TeX{}に対して数式famの % 上限を16から256に増やしています(|\Umathcode| で判定)。 diff --git a/platex/plcore.ltx b/platex/plcore.ltx index 3dcc6d0..170c8e5 100644 --- a/platex/plcore.ltx +++ b/platex/plcore.ltx @@ -34,7 +34,7 @@ \def\pfmtname{pLaTeX2e} \def\pfmtversion {2019-10-01} -\def\ppatch@level{0} +\def\ppatch@level{1} \edef\platexBANNER{\noexpand\platexNILa \the\everyjob % LaTeX banner and delayed codes \noexpand\platexNILb} @@ -1306,18 +1306,19 @@ \relax \ifmmode\@@underline{#1}% \else \leavevmode\null$\@@underline{\hbox{#1}}\m@th$\null\relax\fi} -\ifx\omathchar\@undefined - \ifx\widowpenalties\@undefined +\ifx\widowpenalties\@undefined \mathchardef\e@alloc@top=255 \let\e@alloc@chardef\chardef - \else +\else + \ifx\omathchar\@undefined \mathchardef\e@alloc@top=32767 \let\e@alloc@chardef\mathchardef - \fi -\else + \else \omathchardef\e@alloc@top=65535 \let\e@alloc@chardef\omathchardef + \fi \fi +\let\float@count\e@alloc@top \ifx\omathchar\@undefined \chardef\e@mathgroup@top=16 % LaTeX2e kernel standard \else diff --git a/platex/plvers.dtx b/platex/plvers.dtx index 99ac623..51139a8 100644 --- a/platex/plvers.dtx +++ b/platex/plvers.dtx @@ -193,7 +193,7 @@ {2019-10-01} % %<*plcore> -\def\ppatch@level{0} +\def\ppatch@level{1} % % \end{macrocode} % \end{macro}