X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltjsclasses%2Fltjsarticle.cls;h=7d749c363aa79178095d7ebf09c7487a42846eab;hb=bbcc9c674d3626fe2c647661c7c0d8da1b2b5980;hp=21b8d292ce56198d4f857c071c4149441cef581c;hpb=f4197ea1895b7b3da501fa1fe60f7d80a11d2200;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltjsclasses/ltjsarticle.cls b/src/ltjsclasses/ltjsarticle.cls
index 21b8d29..7d749c3 100644
--- a/src/ltjsclasses/ltjsarticle.cls
+++ b/src/ltjsclasses/ltjsarticle.cls
@@ -179,22 +179,24 @@
       &\global\@eqcnt\thr@@ \hb@xt@\z@\bgroup\hss##\egroup
     \tabskip\z@skip\cr
     }}
-\DeclareOption{disablejfam}{\@enablejfamfalse}
+\DeclareOption{disablejfam}{%
+  \ClassWarningNoLine{\@currname}{The class option 'disablejfam' is obsolete}}
 \newif\ifdraft
 \DeclareOption{draft}{\drafttrue \setlength\overfullrule{5pt}}
 \DeclareOption{final}{\draftfalse \setlength\overfullrule{0pt}}
-\newif\ifwinjis
-\winjisfalse
 \newif\ifmingoth
 \mingothfalse
 \newif\ifjisfont
 \jisfontfalse
-\newif\if@jsc@uplatex
-\@jsc@uplatexfalse
+\newif\ifptexjis
+\ptexjisfalse
+\DeclareOption{winjis}{%
+  \ClassWarningNoLine{\@currname}{The class option 'winjis' is obsolete}}
+\DeclareOption{uplatex}{%
+  \ClassWarningNoLine{\@currname}{The class option 'uplatex' is obsolete}}
 \DeclareOption{mingoth}{\mingothtrue}
-\DeclareOption{winjis}{\winjistrue}
+\DeclareOption{ptexjis}{\ptexjistrue}
 \DeclareOption{jis}{\jisfonttrue}
-\DeclareOption{uplatex}{\@jsc@uplatextrue\winjisfalse}
 \newif\ifpapersize
 \papersizefalse
 \DeclareOption{papersize}{\papersizetrue}
@@ -211,14 +213,6 @@
   \setlength\paperheight{\paperwidth}
   \setlength\paperwidth {\@tempdima}
 \fi
-\setlength{\@tempdima}{\paperwidth}
-\setlength{\@tempdimb}{\paperheight}
-\iftombow
-  \advance \@tempdima 2in
-  \advance \@tempdimb 2in
-\fi
-\setlength{\pdfpagewidth}{\@tempdima}
-\setlength{\pdfpageheight}{\@tempdimb}
 \if@slide\def\n@baseline{13}\else\def\n@baseline{16}\fi
 \def\inv@mag{1}
 \ifnum\@ptsize=-2
@@ -281,6 +275,26 @@
 \fi
 \setlength\paperwidth{\inv@mag\paperwidth}%
 \setlength\paperheight{\inv@mag\paperheight}%
+\setlength{\@tempdima}{\paperwidth}
+\setlength{\@tempdimb}{\paperheight}
+\iftombow
+  \advance \@tempdima 2in
+  \advance \@tempdimb 2in
+\fi
+\setlength{\pdfpagewidth}{\@tempdima}
+\setlength{\pdfpageheight}{\@tempdimb}
+\ifmingoth
+  \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924872] psft:Ryumin-Light:jfm=min}{}
+  \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924872] psft:GothicBBB-Medium:jfm=min}{}
+\else
+  \ifptexjis
+    \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924872] psft:Ryumin-Light:jfm=jis}{}
+    \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924872] psft:GothicBBB-Medium:jfm=jis}{}
+  \else
+    \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924872] psft:Ryumin-Light:jfm=ujis}{}
+    \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924872] psft:GothicBBB-Medium:jfm=ujis}{}
+  \fi
+\fi
 \DeclareFontShape{JY3}{mc}{bx}{n}{<->ssub*gt/m/n}{}
 \DeclareFontShape{JY3}{gt}{bx}{n}{<->ssub*gt/m/n}{}
 \DeclareFontShape{JY3}{mc}{m}{it}{<->ssub*mc/m/n}{}
@@ -306,74 +320,73 @@
 \DeclareRobustCommand\ttfamily
         {\not@math@alphabet\ttfamily\mathtt
          \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}}
@@ -535,11 +548,7 @@
 \setlength{\oddsidemargin}{\paperwidth}
 \addtolength{\oddsidemargin}{-\fullwidth}
 \setlength{\oddsidemargin}{.5\oddsidemargin}
-\iftombow
-  \addtolength{\oddsidemargin}{-1in}
-\else
-  \addtolength{\oddsidemargin}{-\inv@mag in}
-\fi
+\addtolength{\oddsidemargin}{-1in}
 \setlength{\evensidemargin}{\oddsidemargin}
 \if@mparswitch
   \addtolength{\evensidemargin}{\fullwidth}
@@ -547,7 +556,7 @@
 \fi
 \setlength\marginparwidth{\paperwidth}
 \addtolength\marginparwidth{-\oddsidemargin}
-\addtolength\marginparwidth{-\inv@mag in}
+\addtolength\marginparwidth{-1in}
 \addtolength\marginparwidth{-\textwidth}
 \addtolength\marginparwidth{-1cm}
 \addtolength\marginparwidth{-\marginparsep}
@@ -564,11 +573,7 @@
 \addtolength\topmargin{-\headsep}
 \addtolength\topmargin{-\footskip}
 \setlength\topmargin{0.5\topmargin}
-\iftombow
-  \addtolength\topmargin{-1in}
-\else
-  \addtolength\topmargin{-\inv@mag in}
-\fi
+\addtolength\topmargin{-1in}
 {\footnotesize\global\setlength\footnotesep{\baselineskip}}
 \setlength\footnotesep{0.7\footnotesep}
 \setlength{\skip\footins}{16\p@ \@plus 5\p@ \@minus 2\p@}
@@ -835,8 +840,8 @@
         \hskip -\@tempskipa
       \else
         \clubpenalty \@clubpenalty
-        \everypar{\everyparhook}%
-      \fi\everyparhook}%
+        \everypar{}%
+      \fi}%
   \else
     \par \nobreak
     \vskip \@tempskipa
@@ -1348,113 +1353,6 @@
   \parindent 1\zw
   \noindent
   \llap{\@makefnmark\hskip0.3\zw}#1}
-\def\@inhibitglue{%
-  \futurelet\@let@token\@@inhibitglue}
-\def\@@inhibitglue{%
-  \ifx\@let@token「
-    \inhibitglue
-  \else
-    \ifx\@let@token（
-      \inhibitglue
-    \else
-      \ifx\@let@token『
-        \inhibitglue
-      \else
-        \ifx\@let@tokenï¼»
-          \inhibitglue
-        \fi
-      \fi
-    \fi
-  \fi}
-\let\everyparhook=\@inhibitglue
-\AtBeginDocument{\everypar{\everyparhook}}
-\def\@doendpe{%
-  \@endpetrue
-  \def\par{%
-    \@restorepar\everypar{\everyparhook}\par\@endpefalse}%
-  \everypar{{\setbox\z@\lastbox}\everypar{\everyparhook}\@endpefalse\everyparhook}}
-\def\@item[#1]{%
-  \if@noparitem
-    \@donoparitem
-  \else
-    \if@inlabel
-      \indent \par
-    \fi
-    \ifhmode
-      \unskip\unskip \par
-    \fi
-    \if@newlist
-      \if@nobreak
-        \@nbitem
-      \else
-        \addpenalty\@beginparpenalty
-        \addvspace\@topsep
-        \addvspace{-\parskip}%
-      \fi
-    \else
-      \addpenalty\@itempenalty
-      \addvspace\itemsep
-    \fi
-    \global\@inlabeltrue
-  \fi
-  \everypar{%
-    \@minipagefalse
-    \global\@newlistfalse
-    \if@inlabel
-      \global\@inlabelfalse
-      {\setbox\z@\lastbox
-       \ifvoid\z@
-         \kern-\itemindent
-       \fi}%
-      \box\@labels
-      \penalty\z@
-    \fi
-    \if@nobreak
-      \@nobreakfalse
-      \clubpenalty \@M
-    \else
-      \clubpenalty \@clubpenalty
-      \everypar{\everyparhook}%
-    \fi\everyparhook}%
-  \if@noitemarg
-    \@noitemargfalse
-    \if@nmbrlist
-      \refstepcounter\@listctr
-    \fi
-  \fi
-  \sbox\@tempboxa{\makelabel{#1}}%
-  \global\setbox\@labels\hbox{%
-    \unhbox\@labels
-    \hskip \itemindent
-    \hskip -\labelwidth
-    \hskip -\labelsep
-    \ifdim \wd\@tempboxa >\labelwidth
-      \box\@tempboxa
-    \else
-      \hbox to\labelwidth {\unhbox\@tempboxa}%
-    \fi
-    \hskip \labelsep}%
-  \ignorespaces}
-\def\@afterheading{%
-  \@nobreaktrue
-  \everypar{%
-    \if@nobreak
-      \@nobreakfalse
-      \clubpenalty \@M
-      \if@afterindent \else
-        {\setbox\z@\lastbox}%
-      \fi
-    \else
-      \clubpenalty \@clubpenalty
-      \everypar{\everyparhook}%
-    \fi\everyparhook}}
-\def\@gnewline #1{%
-  \ifvmode
-    \@nolnerr
-  \else
-    \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null
-    \inhibitglue \ignorespaces
-  \fi}
 \def\Shou#1{\hbox{$\m@th$%
   \csname S@\f@size\endcsname
   \fontsize\sf@size\z@