From: Kazuki Maeda Date: Sun, 2 Oct 2011 18:00:30 +0000 (+0900) Subject: Enable \reDeclareMathAlphabet{\mathrm}{\@mathrm}{\@mathmc}. X-Git-Tag: 20120419.0~63 X-Git-Url: http://git.osdn.jp/view?a=commitdiff_plain;h=930c25ffd5e0f1c60f94325d6dbacca8b91f7857;p=luatex-ja%2Fluatexja.git Enable \reDeclareMathAlphabet{\mathrm}{\@mathrm}{\@mathmc}. うまく動かないのは自分の環境のせいでした．．． --- diff --git a/src/ltjsclasses/ltjsarticle.cls b/src/ltjsclasses/ltjsarticle.cls index 21b8d29..33e2eda 100644 --- a/src/ltjsclasses/ltjsarticle.cls +++ b/src/ltjsclasses/ltjsarticle.cls @@ -308,72 +308,72 @@ \romanfamily\ttdefault\kanjifamily\gtdefault\selectfont} \def\textmc#1{\relax\ifmmode\hbox\fi{\mcfamily #1}} \def\textgt#1{\relax\ifmmode\hbox\fi{\gtfamily #1}} -%% \def\reDeclareMathAlphabet#1#2#3{% -%% \edef\@tempa{\expandafter\@gobble\string#2}% -%% \edef\@tempb{\expandafter\@gobble\string#3}% -%% \edef\@tempc{\string @\expandafter\@gobbletwo\string#2}% -%% \ifx\@tempc\@tempa% -%% \edef\@tempa{\expandafter\@gobbletwo\string#2}% -%% \edef\@tempb{\expandafter\@gobbletwo\string#3}% -%% \fi -%% \begingroup -%% \let\protect\noexpand -%% \def\@tempaa{\relax}% -%% \expandafter\ifx\csname RDMAorg@\@tempa\endcsname\relax -%% \edef\@tempaa{\expandafter\def\expandafter\noexpand% -%% \csname RDMAorg@\@tempa\endcsname{% -%% \expandafter\noexpand\csname\@tempa\endcsname}}% -%% \fi -%% \def\@tempbb{\relax}% -%% \expandafter\ifx\csname RDMAorg@\@tempb\endcsname\relax -%% \edef\@tempbb{\expandafter\def\expandafter\noexpand% -%% \csname RDMAorg@\@tempb\endcsname{% -%% \expandafter\noexpand\csname\@tempb\endcsname}}% -%% \fi -%% \edef\@tempc{\@tempaa\@tempbb}% -%% \expandafter\endgroup\@tempc% -%% \edef#1{\noexpand\protect\expandafter\noexpand\csname% -%% \expandafter\@gobble\string#1\space\space\endcsname}% -%% \expandafter\edef\csname\expandafter\@gobble\string#1\space\space\endcsname% -%% {\noexpand\DualLang@mathalph@bet% -%% {\expandafter\noexpand\csname RDMAorg@\@tempa\endcsname}% -%% {\expandafter\noexpand\csname RDMAorg@\@tempb\endcsname}% -%% }% -%% } -%% \@onlypreamble\reDeclareMathAlphabet -%% \def\DualLang@mathalph@bet#1#2{% -%% \relax\ifmmode -%% \ifx\math@bgroup\bgroup% 2e normal style (\mathrm{...}) -%% \bgroup\let\DualLang@Mfontsw\DLMfontsw@standard -%% \else -%% \ifx\math@bgroup\relax% 2e two letter style (\rm->\mathrm) -%% \let\DualLang@Mfontsw\DLMfontsw@oldstyle -%% \else -%% \ifx\math@bgroup\@empty% 2.09 oldlfont style ({\mathrm ...}) -%% \let\DualLang@Mfontsw\DLMfontsw@oldlfont -%% \else% panic! assume 2e normal style -%% \bgroup\let\DualLang@Mfontsw\DLMfontsw@standard -%% \fi -%% \fi -%% \fi -%% \else -%% \let\DualLang@Mfontsw\@firstoftwo -%% \fi -%% \DualLang@Mfontsw{#1}{#2}% -%% } -%% \def\DLMfontsw@standard#1#2#3{#1{#2{#3}}\egroup} -%% \def\DLMfontsw@oldstyle#1#2{#1\relax\@fontswitch\relax{#2}} -%% \def\DLMfontsw@oldlfont#1#2{#1\relax#2\relax} -%% \if@compatibility\else -%% \DeclareSymbolFont{mincho}{JY3}{mc}{m}{n} -%% \DeclareSymbolFontAlphabet{\mathmc}{mincho} -%% \SetSymbolFont{mincho}{bold}{JY3}{gt}{m}{n} -%% \jfam\symmincho -%% \DeclareMathAlphabet{\mathgt}{JY3}{gt}{m}{n} -%% \fi -%% \AtBeginDocument{% -%% \reDeclareMathAlphabet{\mathrm}{\@mathrm}{\@mathmc} -%% \reDeclareMathAlphabet{\mathbf}{\@mathbf}{\@mathgt}} +\def\reDeclareMathAlphabet#1#2#3{% + \edef\@tempa{\expandafter\@gobble\string#2}% + \edef\@tempb{\expandafter\@gobble\string#3}% + \edef\@tempc{\string @\expandafter\@gobbletwo\string#2}% + \ifx\@tempc\@tempa% + \edef\@tempa{\expandafter\@gobbletwo\string#2}% + \edef\@tempb{\expandafter\@gobbletwo\string#3}% + \fi + \begingroup + \let\protect\noexpand + \def\@tempaa{\relax}% + \expandafter\ifx\csname RDMAorg@\@tempa\endcsname\relax + \edef\@tempaa{\expandafter\def\expandafter\noexpand% + \csname RDMAorg@\@tempa\endcsname{% + \expandafter\noexpand\csname\@tempa\endcsname}}% + \fi + \def\@tempbb{\relax}% + \expandafter\ifx\csname RDMAorg@\@tempb\endcsname\relax + \edef\@tempbb{\expandafter\def\expandafter\noexpand% + \csname RDMAorg@\@tempb\endcsname{% + \expandafter\noexpand\csname\@tempb\endcsname}}% + \fi + \edef\@tempc{\@tempaa\@tempbb}% + \expandafter\endgroup\@tempc% + \edef#1{\noexpand\protect\expandafter\noexpand\csname% + \expandafter\@gobble\string#1\space\space\endcsname}% + \expandafter\edef\csname\expandafter\@gobble\string#1\space\space\endcsname% + {\noexpand\DualLang@mathalph@bet% + {\expandafter\noexpand\csname RDMAorg@\@tempa\endcsname}% + {\expandafter\noexpand\csname RDMAorg@\@tempb\endcsname}% + }% +} +\@onlypreamble\reDeclareMathAlphabet +\def\DualLang@mathalph@bet#1#2{% + \relax\ifmmode + \ifx\math@bgroup\bgroup% 2e normal style (\mathrm{...}) + \bgroup\let\DualLang@Mfontsw\DLMfontsw@standard + \else + \ifx\math@bgroup\relax% 2e two letter style (\rm->\mathrm) + \let\DualLang@Mfontsw\DLMfontsw@oldstyle + \else + \ifx\math@bgroup\@empty% 2.09 oldlfont style ({\mathrm ...}) + \let\DualLang@Mfontsw\DLMfontsw@oldlfont + \else% panic! assume 2e normal style + \bgroup\let\DualLang@Mfontsw\DLMfontsw@standard + \fi + \fi + \fi + \else + \let\DualLang@Mfontsw\@firstoftwo + \fi + \DualLang@Mfontsw{#1}{#2}% +} +\def\DLMfontsw@standard#1#2#3{#1{#2{#3}}\egroup} +\def\DLMfontsw@oldstyle#1#2{#1\relax\@fontswitch\relax{#2}} +\def\DLMfontsw@oldlfont#1#2{#1\relax#2\relax} +\if@compatibility\else + \DeclareSymbolFont{mincho}{JY3}{mc}{m}{n} + \DeclareSymbolFontAlphabet{\mathmc}{mincho} + \SetSymbolFont{mincho}{bold}{JY3}{gt}{m}{n} + \jfam\symmincho + \DeclareMathAlphabet{\mathgt}{JY3}{gt}{m}{n} +\fi +\AtBeginDocument{% + \reDeclareMathAlphabet{\mathrm}{\@mathrm}{\@mathmc} + \reDeclareMathAlphabet{\mathbf}{\@mathbf}{\@mathgt}} \ltjsetparameter{jaxspmode={`〒,2}} \ltjsetparameter{alxspmode={`+,3}} \ltjsetparameter{alxspmode={`\%,3}} diff --git a/src/ltjsclasses/ltjsbook.cls b/src/ltjsclasses/ltjsbook.cls index fea26e1..474b356 100644 --- a/src/ltjsclasses/ltjsbook.cls +++ b/src/ltjsclasses/ltjsbook.cls @@ -315,72 +315,72 @@ \romanfamily\ttdefault\kanjifamily\gtdefault\selectfont} \def\textmc#1{\relax\ifmmode\hbox\fi{\mcfamily #1}} \def\textgt#1{\relax\ifmmode\hbox\fi{\gtfamily #1}} -%% \def\reDeclareMathAlphabet#1#2#3{% -%% \edef\@tempa{\expandafter\@gobble\string#2}% -%% \edef\@tempb{\expandafter\@gobble\string#3}% -%% \edef\@tempc{\string @\expandafter\@gobbletwo\string#2}% -%% \ifx\@tempc\@tempa% -%% \edef\@tempa{\expandafter\@gobbletwo\string#2}% -%% \edef\@tempb{\expandafter\@gobbletwo\string#3}% -%% \fi -%% \begingroup -%% \let\protect\noexpand -%% \def\@tempaa{\relax}% -%% \expandafter\ifx\csname RDMAorg@\@tempa\endcsname\relax -%% \edef\@tempaa{\expandafter\def\expandafter\noexpand% -%% \csname RDMAorg@\@tempa\endcsname{% -%% \expandafter\noexpand\csname\@tempa\endcsname}}% -%% \fi -%% \def\@tempbb{\relax}% -%% \expandafter\ifx\csname RDMAorg@\@tempb\endcsname\relax -%% \edef\@tempbb{\expandafter\def\expandafter\noexpand% -%% \csname RDMAorg@\@tempb\endcsname{% -%% \expandafter\noexpand\csname\@tempb\endcsname}}% -%% \fi -%% \edef\@tempc{\@tempaa\@tempbb}% -%% \expandafter\endgroup\@tempc% -%% \edef#1{\noexpand\protect\expandafter\noexpand\csname% -%% \expandafter\@gobble\string#1\space\space\endcsname}% -%% \expandafter\edef\csname\expandafter\@gobble\string#1\space\space\endcsname% -%% {\noexpand\DualLang@mathalph@bet% -%% {\expandafter\noexpand\csname RDMAorg@\@tempa\endcsname}% -%% {\expandafter\noexpand\csname RDMAorg@\@tempb\endcsname}% -%% }% -%% } -%% \@onlypreamble\reDeclareMathAlphabet -%% \def\DualLang@mathalph@bet#1#2{% -%% \relax\ifmmode -%% \ifx\math@bgroup\bgroup% 2e normal style (\mathrm{...}) -%% \bgroup\let\DualLang@Mfontsw\DLMfontsw@standard -%% \else -%% \ifx\math@bgroup\relax% 2e two letter style (\rm->\mathrm) -%% \let\DualLang@Mfontsw\DLMfontsw@oldstyle -%% \else -%% \ifx\math@bgroup\@empty% 2.09 oldlfont style ({\mathrm ...}) -%% \let\DualLang@Mfontsw\DLMfontsw@oldlfont -%% \else% panic! assume 2e normal style -%% \bgroup\let\DualLang@Mfontsw\DLMfontsw@standard -%% \fi -%% \fi -%% \fi -%% \else -%% \let\DualLang@Mfontsw\@firstoftwo -%% \fi -%% \DualLang@Mfontsw{#1}{#2}% -%% } -%% \def\DLMfontsw@standard#1#2#3{#1{#2{#3}}\egroup} -%% \def\DLMfontsw@oldstyle#1#2{#1\relax\@fontswitch\relax{#2}} -%% \def\DLMfontsw@oldlfont#1#2{#1\relax#2\relax} -%% \if@compatibility\else -%% \DeclareSymbolFont{mincho}{JY3}{mc}{m}{n} -%% \DeclareSymbolFontAlphabet{\mathmc}{mincho} -%% \SetSymbolFont{mincho}{bold}{JY3}{gt}{m}{n} -%% \jfam\symmincho -%% \DeclareMathAlphabet{\mathgt}{JY3}{gt}{m}{n} -%% \fi -%% \AtBeginDocument{% -%% \reDeclareMathAlphabet{\mathrm}{\@mathrm}{\@mathmc} -%% \reDeclareMathAlphabet{\mathbf}{\@mathbf}{\@mathgt}} +\def\reDeclareMathAlphabet#1#2#3{% + \edef\@tempa{\expandafter\@gobble\string#2}% + \edef\@tempb{\expandafter\@gobble\string#3}% + \edef\@tempc{\string @\expandafter\@gobbletwo\string#2}% + \ifx\@tempc\@tempa% + \edef\@tempa{\expandafter\@gobbletwo\string#2}% + \edef\@tempb{\expandafter\@gobbletwo\string#3}% + \fi + \begingroup + \let\protect\noexpand + \def\@tempaa{\relax}% + \expandafter\ifx\csname RDMAorg@\@tempa\endcsname\relax + \edef\@tempaa{\expandafter\def\expandafter\noexpand% + \csname RDMAorg@\@tempa\endcsname{% + \expandafter\noexpand\csname\@tempa\endcsname}}% + \fi + \def\@tempbb{\relax}% + \expandafter\ifx\csname RDMAorg@\@tempb\endcsname\relax + \edef\@tempbb{\expandafter\def\expandafter\noexpand% + \csname RDMAorg@\@tempb\endcsname{% + \expandafter\noexpand\csname\@tempb\endcsname}}% + \fi + \edef\@tempc{\@tempaa\@tempbb}% + \expandafter\endgroup\@tempc% + \edef#1{\noexpand\protect\expandafter\noexpand\csname% + \expandafter\@gobble\string#1\space\space\endcsname}% + \expandafter\edef\csname\expandafter\@gobble\string#1\space\space\endcsname% + {\noexpand\DualLang@mathalph@bet% + {\expandafter\noexpand\csname RDMAorg@\@tempa\endcsname}% + {\expandafter\noexpand\csname RDMAorg@\@tempb\endcsname}% + }% +} +\@onlypreamble\reDeclareMathAlphabet +\def\DualLang@mathalph@bet#1#2{% + \relax\ifmmode + \ifx\math@bgroup\bgroup% 2e normal style (\mathrm{...}) + \bgroup\let\DualLang@Mfontsw\DLMfontsw@standard + \else + \ifx\math@bgroup\relax% 2e two letter style (\rm->\mathrm) + \let\DualLang@Mfontsw\DLMfontsw@oldstyle + \else + \ifx\math@bgroup\@empty% 2.09 oldlfont style ({\mathrm ...}) + \let\DualLang@Mfontsw\DLMfontsw@oldlfont + \else% panic! assume 2e normal style + \bgroup\let\DualLang@Mfontsw\DLMfontsw@standard + \fi + \fi + \fi + \else + \let\DualLang@Mfontsw\@firstoftwo + \fi + \DualLang@Mfontsw{#1}{#2}% +} +\def\DLMfontsw@standard#1#2#3{#1{#2{#3}}\egroup} +\def\DLMfontsw@oldstyle#1#2{#1\relax\@fontswitch\relax{#2}} +\def\DLMfontsw@oldlfont#1#2{#1\relax#2\relax} +\if@compatibility\else + \DeclareSymbolFont{mincho}{JY3}{mc}{m}{n} + \DeclareSymbolFontAlphabet{\mathmc}{mincho} + \SetSymbolFont{mincho}{bold}{JY3}{gt}{m}{n} + \jfam\symmincho + \DeclareMathAlphabet{\mathgt}{JY3}{gt}{m}{n} +\fi +\AtBeginDocument{% + \reDeclareMathAlphabet{\mathrm}{\@mathrm}{\@mathmc} + \reDeclareMathAlphabet{\mathbf}{\@mathbf}{\@mathgt}} \ltjsetparameter{jaxspmode={`〒,2}} \ltjsetparameter{alxspmode={`+,3}} \ltjsetparameter{alxspmode={`\%,3}} diff --git a/src/ltjsclasses/ltjsclasses.dtx b/src/ltjsclasses/ltjsclasses.dtx index 282c764..2dd9c06 100644 --- a/src/ltjsclasses/ltjsclasses.dtx +++ b/src/ltjsclasses/ltjsclasses.dtx @@ -754,78 +754,73 @@ % [2010-03-14] |http://oku.edu.mie-u.ac.jp/tex/mod/forum/discuss.php?d=411| % での山本さんのご指摘に従って修正しました。 % -% LuaTeX-ja ではなぜか以下のコードを入れると |\mathrm| 時に -% \begin{quote} -% |! TeX capacity exceeded, sorry [semantic nest size=500].| -% \end{quote} -% のエラーが出るので，一旦コメントアウトしました。 -% \begin{macrocode} -%% \def\reDeclareMathAlphabet#1#2#3{% -%% \edef\@tempa{\expandafter\@gobble\string#2}% -%% \edef\@tempb{\expandafter\@gobble\string#3}% -%% \edef\@tempc{\string @\expandafter\@gobbletwo\string#2}% -%% \ifx\@tempc\@tempa% -%% \edef\@tempa{\expandafter\@gobbletwo\string#2}% -%% \edef\@tempb{\expandafter\@gobbletwo\string#3}% -%% \fi -%% \begingroup -%% \let\protect\noexpand -%% \def\@tempaa{\relax}% -%% \expandafter\ifx\csname RDMAorg@\@tempa\endcsname\relax -%% \edef\@tempaa{\expandafter\def\expandafter\noexpand% -%% \csname RDMAorg@\@tempa\endcsname{% -%% \expandafter\noexpand\csname\@tempa\endcsname}}% -%% \fi -%% \def\@tempbb{\relax}% -%% \expandafter\ifx\csname RDMAorg@\@tempb\endcsname\relax -%% \edef\@tempbb{\expandafter\def\expandafter\noexpand% -%% \csname RDMAorg@\@tempb\endcsname{% -%% \expandafter\noexpand\csname\@tempb\endcsname}}% -%% \fi -%% \edef\@tempc{\@tempaa\@tempbb}% -%% \expandafter\endgroup\@tempc% -%% \edef#1{\noexpand\protect\expandafter\noexpand\csname% -%% \expandafter\@gobble\string#1\space\space\endcsname}% -%% \expandafter\edef\csname\expandafter\@gobble\string#1\space\space\endcsname% -%% {\noexpand\DualLang@mathalph@bet% -%% {\expandafter\noexpand\csname RDMAorg@\@tempa\endcsname}% -%% {\expandafter\noexpand\csname RDMAorg@\@tempb\endcsname}% -%% }% -%% } -%% \@onlypreamble\reDeclareMathAlphabet -%% \def\DualLang@mathalph@bet#1#2{% -%% \relax\ifmmode -%% \ifx\math@bgroup\bgroup% 2e normal style (\mathrm{...}) -%% \bgroup\let\DualLang@Mfontsw\DLMfontsw@standard -%% \else -%% \ifx\math@bgroup\relax% 2e two letter style (\rm->\mathrm) -%% \let\DualLang@Mfontsw\DLMfontsw@oldstyle -%% \else -%% \ifx\math@bgroup\@empty% 2.09 oldlfont style ({\mathrm ...}) -%% \let\DualLang@Mfontsw\DLMfontsw@oldlfont -%% \else% panic! assume 2e normal style -%% \bgroup\let\DualLang@Mfontsw\DLMfontsw@standard -%% \fi -%% \fi -%% \fi -%% \else -%% \let\DualLang@Mfontsw\@firstoftwo -%% \fi -%% \DualLang@Mfontsw{#1}{#2}% -%% } -%% \def\DLMfontsw@standard#1#2#3{#1{#2{#3}}\egroup} -%% \def\DLMfontsw@oldstyle#1#2{#1\relax\@fontswitch\relax{#2}} -%% \def\DLMfontsw@oldlfont#1#2{#1\relax#2\relax} -%% \if@compatibility\else -%% \DeclareSymbolFont{mincho}{JY3}{mc}{m}{n} -%% \DeclareSymbolFontAlphabet{\mathmc}{mincho} -%% \SetSymbolFont{mincho}{bold}{JY3}{gt}{m}{n} -%% \jfam\symmincho -%% \DeclareMathAlphabet{\mathgt}{JY3}{gt}{m}{n} -%% \fi -%% \AtBeginDocument{% -%% \reDeclareMathAlphabet{\mathrm}{\@mathrm}{\@mathmc} -%% \reDeclareMathAlphabet{\mathbf}{\@mathbf}{\@mathgt}} +% \begin{macrocode} +\def\reDeclareMathAlphabet#1#2#3{% + \edef\@tempa{\expandafter\@gobble\string#2}% + \edef\@tempb{\expandafter\@gobble\string#3}% + \edef\@tempc{\string @\expandafter\@gobbletwo\string#2}% + \ifx\@tempc\@tempa% + \edef\@tempa{\expandafter\@gobbletwo\string#2}% + \edef\@tempb{\expandafter\@gobbletwo\string#3}% + \fi + \begingroup + \let\protect\noexpand + \def\@tempaa{\relax}% + \expandafter\ifx\csname RDMAorg@\@tempa\endcsname\relax + \edef\@tempaa{\expandafter\def\expandafter\noexpand% + \csname RDMAorg@\@tempa\endcsname{% + \expandafter\noexpand\csname\@tempa\endcsname}}% + \fi + \def\@tempbb{\relax}% + \expandafter\ifx\csname RDMAorg@\@tempb\endcsname\relax + \edef\@tempbb{\expandafter\def\expandafter\noexpand% + \csname RDMAorg@\@tempb\endcsname{% + \expandafter\noexpand\csname\@tempb\endcsname}}% + \fi + \edef\@tempc{\@tempaa\@tempbb}% + \expandafter\endgroup\@tempc% + \edef#1{\noexpand\protect\expandafter\noexpand\csname% + \expandafter\@gobble\string#1\space\space\endcsname}% + \expandafter\edef\csname\expandafter\@gobble\string#1\space\space\endcsname% + {\noexpand\DualLang@mathalph@bet% + {\expandafter\noexpand\csname RDMAorg@\@tempa\endcsname}% + {\expandafter\noexpand\csname RDMAorg@\@tempb\endcsname}% + }% +} +\@onlypreamble\reDeclareMathAlphabet +\def\DualLang@mathalph@bet#1#2{% + \relax\ifmmode + \ifx\math@bgroup\bgroup% 2e normal style (\mathrm{...}) + \bgroup\let\DualLang@Mfontsw\DLMfontsw@standard + \else + \ifx\math@bgroup\relax% 2e two letter style (\rm->\mathrm) + \let\DualLang@Mfontsw\DLMfontsw@oldstyle + \else + \ifx\math@bgroup\@empty% 2.09 oldlfont style ({\mathrm ...}) + \let\DualLang@Mfontsw\DLMfontsw@oldlfont + \else% panic! assume 2e normal style + \bgroup\let\DualLang@Mfontsw\DLMfontsw@standard + \fi + \fi + \fi + \else + \let\DualLang@Mfontsw\@firstoftwo + \fi + \DualLang@Mfontsw{#1}{#2}% +} +\def\DLMfontsw@standard#1#2#3{#1{#2{#3}}\egroup} +\def\DLMfontsw@oldstyle#1#2{#1\relax\@fontswitch\relax{#2}} +\def\DLMfontsw@oldlfont#1#2{#1\relax#2\relax} +\if@compatibility\else + \DeclareSymbolFont{mincho}{JY3}{mc}{m}{n} + \DeclareSymbolFontAlphabet{\mathmc}{mincho} + \SetSymbolFont{mincho}{bold}{JY3}{gt}{m}{n} + \jfam\symmincho + \DeclareMathAlphabet{\mathgt}{JY3}{gt}{m}{n} +\fi +\AtBeginDocument{% + \reDeclareMathAlphabet{\mathrm}{\@mathrm}{\@mathmc} + \reDeclareMathAlphabet{\mathbf}{\@mathbf}{\@mathgt}} % \end{macrocode} % % \begin{macro}{\textsterling} diff --git a/src/ltjsclasses/ltjsclasses.pdf b/src/ltjsclasses/ltjsclasses.pdf index 1716b88..45e37d1 100644 Binary files a/src/ltjsclasses/ltjsclasses.pdf and b/src/ltjsclasses/ltjsclasses.pdf differ diff --git a/src/ltjsclasses/ltjskiyou.cls b/src/ltjsclasses/ltjskiyou.cls index ffd50b2..01ad7c5 100644 --- a/src/ltjsclasses/ltjskiyou.cls +++ b/src/ltjsclasses/ltjskiyou.cls @@ -310,72 +310,72 @@ \romanfamily\ttdefault\kanjifamily\gtdefault\selectfont} \def\textmc#1{\relax\ifmmode\hbox\fi{\mcfamily #1}} \def\textgt#1{\relax\ifmmode\hbox\fi{\gtfamily #1}} -%% \def\reDeclareMathAlphabet#1#2#3{% -%% \edef\@tempa{\expandafter\@gobble\string#2}% -%% \edef\@tempb{\expandafter\@gobble\string#3}% -%% \edef\@tempc{\string @\expandafter\@gobbletwo\string#2}% -%% \ifx\@tempc\@tempa% -%% \edef\@tempa{\expandafter\@gobbletwo\string#2}% -%% \edef\@tempb{\expandafter\@gobbletwo\string#3}% -%% \fi -%% \begingroup -%% \let\protect\noexpand -%% \def\@tempaa{\relax}% -%% \expandafter\ifx\csname RDMAorg@\@tempa\endcsname\relax -%% \edef\@tempaa{\expandafter\def\expandafter\noexpand% -%% \csname RDMAorg@\@tempa\endcsname{% -%% \expandafter\noexpand\csname\@tempa\endcsname}}% -%% \fi -%% \def\@tempbb{\relax}% -%% \expandafter\ifx\csname RDMAorg@\@tempb\endcsname\relax -%% \edef\@tempbb{\expandafter\def\expandafter\noexpand% -%% \csname RDMAorg@\@tempb\endcsname{% -%% \expandafter\noexpand\csname\@tempb\endcsname}}% -%% \fi -%% \edef\@tempc{\@tempaa\@tempbb}% -%% \expandafter\endgroup\@tempc% -%% \edef#1{\noexpand\protect\expandafter\noexpand\csname% -%% \expandafter\@gobble\string#1\space\space\endcsname}% -%% \expandafter\edef\csname\expandafter\@gobble\string#1\space\space\endcsname% -%% {\noexpand\DualLang@mathalph@bet% -%% {\expandafter\noexpand\csname RDMAorg@\@tempa\endcsname}% -%% {\expandafter\noexpand\csname RDMAorg@\@tempb\endcsname}% -%% }% -%% } -%% \@onlypreamble\reDeclareMathAlphabet -%% \def\DualLang@mathalph@bet#1#2{% -%% \relax\ifmmode -%% \ifx\math@bgroup\bgroup% 2e normal style (\mathrm{...}) -%% \bgroup\let\DualLang@Mfontsw\DLMfontsw@standard -%% \else -%% \ifx\math@bgroup\relax% 2e two letter style (\rm->\mathrm) -%% \let\DualLang@Mfontsw\DLMfontsw@oldstyle -%% \else -%% \ifx\math@bgroup\@empty% 2.09 oldlfont style ({\mathrm ...}) -%% \let\DualLang@Mfontsw\DLMfontsw@oldlfont -%% \else% panic! assume 2e normal style -%% \bgroup\let\DualLang@Mfontsw\DLMfontsw@standard -%% \fi -%% \fi -%% \fi -%% \else -%% \let\DualLang@Mfontsw\@firstoftwo -%% \fi -%% \DualLang@Mfontsw{#1}{#2}% -%% } -%% \def\DLMfontsw@standard#1#2#3{#1{#2{#3}}\egroup} -%% \def\DLMfontsw@oldstyle#1#2{#1\relax\@fontswitch\relax{#2}} -%% \def\DLMfontsw@oldlfont#1#2{#1\relax#2\relax} -%% \if@compatibility\else -%% \DeclareSymbolFont{mincho}{JY3}{mc}{m}{n} -%% \DeclareSymbolFontAlphabet{\mathmc}{mincho} -%% \SetSymbolFont{mincho}{bold}{JY3}{gt}{m}{n} -%% \jfam\symmincho -%% \DeclareMathAlphabet{\mathgt}{JY3}{gt}{m}{n} -%% \fi -%% \AtBeginDocument{% -%% \reDeclareMathAlphabet{\mathrm}{\@mathrm}{\@mathmc} -%% \reDeclareMathAlphabet{\mathbf}{\@mathbf}{\@mathgt}} +\def\reDeclareMathAlphabet#1#2#3{% + \edef\@tempa{\expandafter\@gobble\string#2}% + \edef\@tempb{\expandafter\@gobble\string#3}% + \edef\@tempc{\string @\expandafter\@gobbletwo\string#2}% + \ifx\@tempc\@tempa% + \edef\@tempa{\expandafter\@gobbletwo\string#2}% + \edef\@tempb{\expandafter\@gobbletwo\string#3}% + \fi + \begingroup + \let\protect\noexpand + \def\@tempaa{\relax}% + \expandafter\ifx\csname RDMAorg@\@tempa\endcsname\relax + \edef\@tempaa{\expandafter\def\expandafter\noexpand% + \csname RDMAorg@\@tempa\endcsname{% + \expandafter\noexpand\csname\@tempa\endcsname}}% + \fi + \def\@tempbb{\relax}% + \expandafter\ifx\csname RDMAorg@\@tempb\endcsname\relax + \edef\@tempbb{\expandafter\def\expandafter\noexpand% + \csname RDMAorg@\@tempb\endcsname{% + \expandafter\noexpand\csname\@tempb\endcsname}}% + \fi + \edef\@tempc{\@tempaa\@tempbb}% + \expandafter\endgroup\@tempc% + \edef#1{\noexpand\protect\expandafter\noexpand\csname% + \expandafter\@gobble\string#1\space\space\endcsname}% + \expandafter\edef\csname\expandafter\@gobble\string#1\space\space\endcsname% + {\noexpand\DualLang@mathalph@bet% + {\expandafter\noexpand\csname RDMAorg@\@tempa\endcsname}% + {\expandafter\noexpand\csname RDMAorg@\@tempb\endcsname}% + }% +} +\@onlypreamble\reDeclareMathAlphabet +\def\DualLang@mathalph@bet#1#2{% + \relax\ifmmode + \ifx\math@bgroup\bgroup% 2e normal style (\mathrm{...}) + \bgroup\let\DualLang@Mfontsw\DLMfontsw@standard + \else + \ifx\math@bgroup\relax% 2e two letter style (\rm->\mathrm) + \let\DualLang@Mfontsw\DLMfontsw@oldstyle + \else + \ifx\math@bgroup\@empty% 2.09 oldlfont style ({\mathrm ...}) + \let\DualLang@Mfontsw\DLMfontsw@oldlfont + \else% panic! assume 2e normal style + \bgroup\let\DualLang@Mfontsw\DLMfontsw@standard + \fi + \fi + \fi + \else + \let\DualLang@Mfontsw\@firstoftwo + \fi + \DualLang@Mfontsw{#1}{#2}% +} +\def\DLMfontsw@standard#1#2#3{#1{#2{#3}}\egroup} +\def\DLMfontsw@oldstyle#1#2{#1\relax\@fontswitch\relax{#2}} +\def\DLMfontsw@oldlfont#1#2{#1\relax#2\relax} +\if@compatibility\else + \DeclareSymbolFont{mincho}{JY3}{mc}{m}{n} + \DeclareSymbolFontAlphabet{\mathmc}{mincho} + \SetSymbolFont{mincho}{bold}{JY3}{gt}{m}{n} + \jfam\symmincho + \DeclareMathAlphabet{\mathgt}{JY3}{gt}{m}{n} +\fi +\AtBeginDocument{% + \reDeclareMathAlphabet{\mathrm}{\@mathrm}{\@mathmc} + \reDeclareMathAlphabet{\mathbf}{\@mathbf}{\@mathgt}} \ltjsetparameter{jaxspmode={`〒,2}} \ltjsetparameter{alxspmode={`+,3}} \ltjsetparameter{alxspmode={`\%,3}} diff --git a/src/ltjsclasses/ltjspf.cls b/src/ltjsclasses/ltjspf.cls index 7c4bde4..cd9e93b 100644 --- a/src/ltjsclasses/ltjspf.cls +++ b/src/ltjsclasses/ltjspf.cls @@ -308,72 +308,72 @@ \romanfamily\ttdefault\kanjifamily\gtdefault\selectfont} \def\textmc#1{\relax\ifmmode\hbox\fi{\mcfamily #1}} \def\textgt#1{\relax\ifmmode\hbox\fi{\gtfamily #1}} -%% \def\reDeclareMathAlphabet#1#2#3{% -%% \edef\@tempa{\expandafter\@gobble\string#2}% -%% \edef\@tempb{\expandafter\@gobble\string#3}% -%% \edef\@tempc{\string @\expandafter\@gobbletwo\string#2}% -%% \ifx\@tempc\@tempa% -%% \edef\@tempa{\expandafter\@gobbletwo\string#2}% -%% \edef\@tempb{\expandafter\@gobbletwo\string#3}% -%% \fi -%% \begingroup -%% \let\protect\noexpand -%% \def\@tempaa{\relax}% -%% \expandafter\ifx\csname RDMAorg@\@tempa\endcsname\relax -%% \edef\@tempaa{\expandafter\def\expandafter\noexpand% -%% \csname RDMAorg@\@tempa\endcsname{% -%% \expandafter\noexpand\csname\@tempa\endcsname}}% -%% \fi -%% \def\@tempbb{\relax}% -%% \expandafter\ifx\csname RDMAorg@\@tempb\endcsname\relax -%% \edef\@tempbb{\expandafter\def\expandafter\noexpand% -%% \csname RDMAorg@\@tempb\endcsname{% -%% \expandafter\noexpand\csname\@tempb\endcsname}}% -%% \fi -%% \edef\@tempc{\@tempaa\@tempbb}% -%% \expandafter\endgroup\@tempc% -%% \edef#1{\noexpand\protect\expandafter\noexpand\csname% -%% \expandafter\@gobble\string#1\space\space\endcsname}% -%% \expandafter\edef\csname\expandafter\@gobble\string#1\space\space\endcsname% -%% {\noexpand\DualLang@mathalph@bet% -%% {\expandafter\noexpand\csname RDMAorg@\@tempa\endcsname}% -%% {\expandafter\noexpand\csname RDMAorg@\@tempb\endcsname}% -%% }% -%% } -%% \@onlypreamble\reDeclareMathAlphabet -%% \def\DualLang@mathalph@bet#1#2{% -%% \relax\ifmmode -%% \ifx\math@bgroup\bgroup% 2e normal style (\mathrm{...}) -%% \bgroup\let\DualLang@Mfontsw\DLMfontsw@standard -%% \else -%% \ifx\math@bgroup\relax% 2e two letter style (\rm->\mathrm) -%% \let\DualLang@Mfontsw\DLMfontsw@oldstyle -%% \else -%% \ifx\math@bgroup\@empty% 2.09 oldlfont style ({\mathrm ...}) -%% \let\DualLang@Mfontsw\DLMfontsw@oldlfont -%% \else% panic! assume 2e normal style -%% \bgroup\let\DualLang@Mfontsw\DLMfontsw@standard -%% \fi -%% \fi -%% \fi -%% \else -%% \let\DualLang@Mfontsw\@firstoftwo -%% \fi -%% \DualLang@Mfontsw{#1}{#2}% -%% } -%% \def\DLMfontsw@standard#1#2#3{#1{#2{#3}}\egroup} -%% \def\DLMfontsw@oldstyle#1#2{#1\relax\@fontswitch\relax{#2}} -%% \def\DLMfontsw@oldlfont#1#2{#1\relax#2\relax} -%% \if@compatibility\else -%% \DeclareSymbolFont{mincho}{JY3}{mc}{m}{n} -%% \DeclareSymbolFontAlphabet{\mathmc}{mincho} -%% \SetSymbolFont{mincho}{bold}{JY3}{gt}{m}{n} -%% \jfam\symmincho -%% \DeclareMathAlphabet{\mathgt}{JY3}{gt}{m}{n} -%% \fi -%% \AtBeginDocument{% -%% \reDeclareMathAlphabet{\mathrm}{\@mathrm}{\@mathmc} -%% \reDeclareMathAlphabet{\mathbf}{\@mathbf}{\@mathgt}} +\def\reDeclareMathAlphabet#1#2#3{% + \edef\@tempa{\expandafter\@gobble\string#2}% + \edef\@tempb{\expandafter\@gobble\string#3}% + \edef\@tempc{\string @\expandafter\@gobbletwo\string#2}% + \ifx\@tempc\@tempa% + \edef\@tempa{\expandafter\@gobbletwo\string#2}% + \edef\@tempb{\expandafter\@gobbletwo\string#3}% + \fi + \begingroup + \let\protect\noexpand + \def\@tempaa{\relax}% + \expandafter\ifx\csname RDMAorg@\@tempa\endcsname\relax + \edef\@tempaa{\expandafter\def\expandafter\noexpand% + \csname RDMAorg@\@tempa\endcsname{% + \expandafter\noexpand\csname\@tempa\endcsname}}% + \fi + \def\@tempbb{\relax}% + \expandafter\ifx\csname RDMAorg@\@tempb\endcsname\relax + \edef\@tempbb{\expandafter\def\expandafter\noexpand% + \csname RDMAorg@\@tempb\endcsname{% + \expandafter\noexpand\csname\@tempb\endcsname}}% + \fi + \edef\@tempc{\@tempaa\@tempbb}% + \expandafter\endgroup\@tempc% + \edef#1{\noexpand\protect\expandafter\noexpand\csname% + \expandafter\@gobble\string#1\space\space\endcsname}% + \expandafter\edef\csname\expandafter\@gobble\string#1\space\space\endcsname% + {\noexpand\DualLang@mathalph@bet% + {\expandafter\noexpand\csname RDMAorg@\@tempa\endcsname}% + {\expandafter\noexpand\csname RDMAorg@\@tempb\endcsname}% + }% +} +\@onlypreamble\reDeclareMathAlphabet +\def\DualLang@mathalph@bet#1#2{% + \relax\ifmmode + \ifx\math@bgroup\bgroup% 2e normal style (\mathrm{...}) + \bgroup\let\DualLang@Mfontsw\DLMfontsw@standard + \else + \ifx\math@bgroup\relax% 2e two letter style (\rm->\mathrm) + \let\DualLang@Mfontsw\DLMfontsw@oldstyle + \else + \ifx\math@bgroup\@empty% 2.09 oldlfont style ({\mathrm ...}) + \let\DualLang@Mfontsw\DLMfontsw@oldlfont + \else% panic! assume 2e normal style + \bgroup\let\DualLang@Mfontsw\DLMfontsw@standard + \fi + \fi + \fi + \else + \let\DualLang@Mfontsw\@firstoftwo + \fi + \DualLang@Mfontsw{#1}{#2}% +} +\def\DLMfontsw@standard#1#2#3{#1{#2{#3}}\egroup} +\def\DLMfontsw@oldstyle#1#2{#1\relax\@fontswitch\relax{#2}} +\def\DLMfontsw@oldlfont#1#2{#1\relax#2\relax} +\if@compatibility\else + \DeclareSymbolFont{mincho}{JY3}{mc}{m}{n} + \DeclareSymbolFontAlphabet{\mathmc}{mincho} + \SetSymbolFont{mincho}{bold}{JY3}{gt}{m}{n} + \jfam\symmincho + \DeclareMathAlphabet{\mathgt}{JY3}{gt}{m}{n} +\fi +\AtBeginDocument{% + \reDeclareMathAlphabet{\mathrm}{\@mathrm}{\@mathmc} + \reDeclareMathAlphabet{\mathbf}{\@mathbf}{\@mathgt}} \ltjsetparameter{jaxspmode={`〒,2}} \ltjsetparameter{alxspmode={`+,3}} \ltjsetparameter{alxspmode={`\%,3}}