OSDN Git Service

Resolved conflicts between 3a2e3a7 and 7c7fe5e.
[luatex-ja/luatexja.git] / src / ltjsclasses / ltjskiyou.cls
index ffd50b2..01251b8 100644 (file)
 \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}{}\DeclareOption{uplatex}{} % These 2 options are ignored.
 \DeclareOption{mingoth}{\mingothtrue}
-\DeclareOption{winjis}{\winjistrue}
+\DeclareOption{ptexjis}{\ptexjistrue}
 \DeclareOption{jis}{\jisfonttrue}
-\DeclareOption{uplatex}{\@jsc@uplatextrue\winjisfalse}
 \newif\ifpapersize
 \papersizefalse
 \DeclareOption{papersize}{\papersizetrue}
   \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}
 \def\n@baseline{14.897}
 \def\inv@mag{1}
 \ifnum\@ptsize=-2
 \def\inv@mag{1.02354}
 \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}{}
 \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}}
 \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}
 \fi
 \setlength\marginparwidth{\paperwidth}
 \addtolength\marginparwidth{-\oddsidemargin}
-\addtolength\marginparwidth{-\inv@mag in}
+\addtolength\marginparwidth{-1in}
 \addtolength\marginparwidth{-\textwidth}
 \addtolength\marginparwidth{-1cm}
 \addtolength\marginparwidth{-\marginparsep}
 \addtolength\topmargin{-\footskip}
 \setlength\topmargin{0.5\topmargin}
 \setlength\topmargin{81truebp}
-\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@}