sync with platex (d7ac4d1) (texjporg/jsclasses#63)

texjporg · Jan 13, 2018 · 0d8d1c0 · 0d8d1c0
1 parent ff04e55
commit 0d8d1c0
Show file tree

Hide file tree

Showing 25 changed files with 56 additions and 28 deletions.
diff --git a/jt2gt.fd b/jt2gt.fd
@@ -15,7 +15,7 @@
 %% 
 %% File: uplfonts.dtx
 \ProvidesFile{jt2gt.fd}
-       [2011/05/07 v1.5-u00 KANJI font defines]
+       [2018/01/13 v1.6l-u02 KANJI font defines]
 \DeclareKanjiFamily{JT2}{gt}{}
 \DeclareRelationFont{JT2}{gt}{m}{}{T1}{cmr}{bx}{}
 \DeclareFontShape{JT2}{gt}{m}{n}{<->s*[0.962216]upjisg-v}{}

diff --git a/jt2mc.fd b/jt2mc.fd
@@ -15,7 +15,7 @@
 %% 
 %% File: uplfonts.dtx
 \ProvidesFile{jt2mc.fd}
-       [2011/05/07 v1.5-u00 KANJI font defines]
+       [2018/01/13 v1.6l-u02 KANJI font defines]
 \DeclareKanjiFamily{JT2}{mc}{}
 \DeclareRelationFont{JT2}{mc}{m}{}{T1}{cmr}{m}{}
 \DeclareRelationFont{JT2}{mc}{bx}{}{T1}{cmr}{bx}{}

diff --git a/jy2gt.fd b/jy2gt.fd
@@ -15,7 +15,7 @@
 %% 
 %% File: uplfonts.dtx
 \ProvidesFile{jy2gt.fd}
-       [2011/05/07 v1.5-u00 KANJI font defines]
+       [2018/01/13 v1.6l-u02 KANJI font defines]
 \DeclareKanjiFamily{JY2}{gt}{}
 \DeclareRelationFont{JY2}{gt}{m}{}{T1}{cmr}{bx}{}
 \DeclareFontShape{JY2}{gt}{m}{n}{<->s*[0.962216]upjisg-h}{}

diff --git a/jy2mc.fd b/jy2mc.fd
@@ -15,7 +15,7 @@
 %% 
 %% File: uplfonts.dtx
 \ProvidesFile{jy2mc.fd}
-       [2011/05/07 v1.5-u00 KANJI font defines]
+       [2018/01/13 v1.6l-u02 KANJI font defines]
 \DeclareKanjiFamily{JY2}{mc}{}
 \DeclareRelationFont{JY2}{mc}{m}{}{T1}{cmr}{m}{}
 \DeclareRelationFont{JY2}{mc}{bx}{}{T1}{cmr}{bx}{}

diff --git a/ujarticle.cls b/ujarticle.cls
@@ -16,7 +16,7 @@
 %% File: ujclasses.dtx
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesClass{ujarticle}
-  [2017/09/19 v1.7g-u00
+  [2018/01/13 v1.7h-u00
  Standard upLaTeX class]
 \newcounter{@paper}
 \newif\if@landscape \@landscapefalse
@@ -124,6 +124,7 @@
 \ExecuteOptions{a4paper,10pt,oneside,onecolumn,final}
 \ProcessOptions\relax
 \input{ujsize1\@ptsize.clo}
+\def\Cjascale{0.962216}
 \if@stysize
   \setlength\columnsep{2\Cwd}
 \else

diff --git a/ujbk10.clo b/ujbk10.clo
@@ -16,7 +16,7 @@
 %% File: ujclasses.dtx
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesFile{ujbk10.clo}
-  [2017/09/19 v1.7g-u00
+  [2018/01/13 v1.7h-u00
   Standard upLaTeX file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xpt{15}%

diff --git a/ujbk11.clo b/ujbk11.clo
@@ -16,7 +16,7 @@
 %% File: ujclasses.dtx
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesFile{ujbk11.clo}
-  [2017/09/19 v1.7g-u00
+  [2018/01/13 v1.7h-u00
   Standard upLaTeX file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xipt{15.5}%

diff --git a/ujbk12.clo b/ujbk12.clo
@@ -16,7 +16,7 @@
 %% File: ujclasses.dtx
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesFile{ujbk12.clo}
-  [2017/09/19 v1.7g-u00
+  [2018/01/13 v1.7h-u00
   Standard upLaTeX file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xiipt{16.5}%

diff --git a/ujbook.cls b/ujbook.cls
@@ -16,7 +16,7 @@
 %% File: ujclasses.dtx
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesClass{ujbook}
-  [2017/09/19 v1.7g-u00
+  [2018/01/13 v1.7h-u00
  Standard upLaTeX class]
 \newcounter{@paper}
 \newif\if@landscape \@landscapefalse
@@ -134,6 +134,7 @@
 \ExecuteOptions{a4paper,10pt,twoside,onecolumn,final,openright}
 \ProcessOptions\relax
 \input{ujbk1\@ptsize.clo}
+\def\Cjascale{0.962216}
 \if@stysize
   \setlength\columnsep{2\Cwd}
 \else

diff --git a/ujclasses.dtx b/ujclasses.dtx
@@ -103,6 +103,8 @@
 % \changes{v1.7f}{2017/08/31}{和文書体の基準を全角空白から「漢」に変更}
 % \changes{v1.7g}{2017/09/19}{内部処理で使ったボックス0を空にした}
 % \changes{v1.7g-u00}{2017/09/19}{p\LaTeX{}用に追随}
+% \changes{v1.7h}{2018/01/13}{和文スケール値\cs{Cjascale}を定義}
+% \changes{v1.7h-u00}{2018/01/13}{p\LaTeX{}用に追随}
 % \fi
 %
 % \iffalse
@@ -132,7 +134,7 @@
 %<11pt&bk>\ProvidesFile{utbk11.clo}
 %<12pt&bk>\ProvidesFile{utbk12.clo}
 %</tate>
-  [2017/09/19 v1.7g-u00
+  [2018/01/13 v1.7h-u00
 %<article|report|book> Standard upLaTeX class]
 %<10pt|11pt|12pt>  Standard upLaTeX file (size option)]
 %<*driver>
@@ -766,6 +768,21 @@
 % \end{macro}
 % \end{macro}
 %
+% \begin{macro}{\Cjascale}
+% 和文スケール値（$1\,\mathrm{zw} \div \textmc{要求サイズ}$）を
+% 表す実数値マクロ|\Cjascale|を定義します。
+% up\LaTeXe{}の標準クラスでは、フォーマット作成時に読み込まれた
+% フォント定義ファイル（\file{jy2mc.fd} / \file{jy2gt.fd} /
+% \file{jt2mc.fd} / \file{jt2gt.fd}）での和文スケール値がそのまま
+% 有効ですので、これは0.962216です。
+% \changes{v1.7h}{2018/01/13}{和文スケール値\cs{Cjascale}を定義}
+%    \begin{macrocode}
+%<*article|report|book>
+\def\Cjascale{0.962216}
+%</article|report|book>
+%    \end{macrocode}
+% \end{macro}
+%
 %
 %
 % \section{レイアウト}

diff --git a/ujreport.cls b/ujreport.cls
@@ -16,7 +16,7 @@
 %% File: ujclasses.dtx
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesClass{ujreport}
-  [2017/09/19 v1.7g-u00
+  [2018/01/13 v1.7h-u00
  Standard upLaTeX class]
 \newcounter{@paper}
 \newif\if@landscape \@landscapefalse
@@ -132,6 +132,7 @@
 \ExecuteOptions{a4paper,10pt,oneside,onecolumn,final,openany}
 \ProcessOptions\relax
 \input{ujsize1\@ptsize.clo}
+\def\Cjascale{0.962216}
 \if@stysize
   \setlength\columnsep{2\Cwd}
 \else

diff --git a/ujsize10.clo b/ujsize10.clo
@@ -16,7 +16,7 @@
 %% File: ujclasses.dtx
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesFile{ujsize10.clo}
-  [2017/09/19 v1.7g-u00
+  [2018/01/13 v1.7h-u00
   Standard upLaTeX file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xpt{15}%

diff --git a/ujsize11.clo b/ujsize11.clo
@@ -16,7 +16,7 @@
 %% File: ujclasses.dtx
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesFile{ujsize11.clo}
-  [2017/09/19 v1.7g-u00
+  [2018/01/13 v1.7h-u00
   Standard upLaTeX file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xipt{15.5}%

diff --git a/ujsize12.clo b/ujsize12.clo
@@ -16,7 +16,7 @@
 %% File: ujclasses.dtx
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesFile{ujsize12.clo}
-  [2017/09/19 v1.7g-u00
+  [2018/01/13 v1.7h-u00
   Standard upLaTeX file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xiipt{16.5}%

diff --git a/upldefs.ltx b/upldefs.ltx
@@ -15,7 +15,7 @@
 %% 
 %% File: uplfonts.dtx
 \ProvidesFile{upldefs.ltx}
-      [2017/11/06 v1.6j-u00 upLaTeX Kernel (Default settings)]
+      [2018/01/13 v1.6l-u02 upLaTeX Kernel (Default settings)]
 \DeclareKanjiEncodingDefaults{}{}
 \DeclareErrorKanjiFont{JY2}{mc}{m}{n}{10}
 \DeclareYokoKanjiEncoding{JY2}{}{}

diff --git a/uplfonts.dtx b/uplfonts.dtx
@@ -49,13 +49,15 @@
 %    ptraceパッケージを読み込むだけとした}
 % \changes{v1.6k-u02}{2017/12/10}{p\LaTeX{}との統合のため、
 %    up\LaTeX{}用の最小限の変更だけを定義するようにした}
+% \changes{v1.6l-u02}{2018/01/13}{p\LaTeX{}の変更に追随。
+%     (based on plfonts.dtx 2018/01/13 v1.6l)}
 % \fi
 %
 % \iffalse
 %<*driver>
 \NeedsTeXFormat{pLaTeX2e}
 % \fi
-\ProvidesFile{uplfonts.dtx}[2017/12/10 v1.6k-u02 upLaTeX New Font Selection Scheme]
+\ProvidesFile{uplfonts.dtx}[2018/01/13 v1.6l-u02 upLaTeX New Font Selection Scheme]
 % \iffalse
 \documentclass{jltxdoc}
 \GetFileInfo{uplfonts.dtx}
@@ -161,7 +163,7 @@
 %    \begin{macrocode}
 %<*pldefs>
 \ProvidesFile{upldefs.ltx}
-      [2017/11/06 v1.6j-u00 upLaTeX Kernel (Default settings)]
+      [2018/01/13 v1.6l-u02 upLaTeX Kernel (Default settings)]
 %</pldefs>
 %    \end{macrocode}
 %
@@ -214,7 +216,7 @@
 \input{jt2mc.fd}
 \input{jt2gt.fd}
 %    \end{macrocode}
-% フォントを有効にする
+% フォントを有効にします。
 %    \begin{macrocode}
 \fontencoding{JT2}\selectfont
 \fontencoding{JY2}\selectfont
@@ -403,7 +405,7 @@
 %<JY2gt>\ProvidesFile{jy2gt.fd}
 %<JT2mc>\ProvidesFile{jt2mc.fd}
 %<JT2gt>\ProvidesFile{jt2gt.fd}
-%<JY2mc,JY2gt,JT2mc,JT2gt>       [2011/05/07 v1.5-u00 KANJI font defines]
+%<JY2mc,JY2gt,JT2mc,JT2gt>       [2018/01/13 v1.6l-u02 KANJI font defines]
 %    \end{macrocode}
 % 横組用、縦組用ともに、
 % 明朝体のシリーズ|bx|がゴシック体となるように宣言しています。
@@ -413,6 +415,9 @@
 %
 % p\LaTeX{}では従属書体にOT1エンコーディングを指定していましたが、
 % up\LaTeX{}ではT1エンコーディングを用いるように変更しました。
+% また、和文スケール値（$1\,\mathrm{zw} \div \textmc{要求サイズ}$）は
+% 0.962216です。
+% \changes{v1.6l}{2018/01/13}{和文スケール値を明文化}
 %    \begin{macrocode}
 %<*JY2mc>
 \DeclareKanjiFamily{JY2}{mc}{}

diff --git a/utarticle.cls b/utarticle.cls
@@ -16,7 +16,7 @@
 %% File: ujclasses.dtx
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesClass{utarticle}
-  [2017/09/19 v1.7g-u00
+  [2018/01/13 v1.7h-u00
  Standard upLaTeX class]
 \newcounter{@paper}
 \newif\if@landscape \@landscapefalse
@@ -125,6 +125,7 @@
 \ProcessOptions\relax
 \input{utsize1\@ptsize.clo}
 \RequirePackage{plext}
+\def\Cjascale{0.962216}
 \if@stysize
   \setlength\columnsep{3\Cwd}
 \else

diff --git a/utbk10.clo b/utbk10.clo
@@ -16,7 +16,7 @@
 %% File: ujclasses.dtx
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesFile{utbk10.clo}
-  [2017/09/19 v1.7g-u00
+  [2018/01/13 v1.7h-u00
   Standard upLaTeX file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xpt{17}%

diff --git a/utbk11.clo b/utbk11.clo
@@ -16,7 +16,7 @@
 %% File: ujclasses.dtx
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesFile{utbk11.clo}
-  [2017/09/19 v1.7g-u00
+  [2018/01/13 v1.7h-u00
   Standard upLaTeX file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xipt{17}%

diff --git a/utbk12.clo b/utbk12.clo
@@ -16,7 +16,7 @@
 %% File: ujclasses.dtx
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesFile{utbk12.clo}
-  [2017/09/19 v1.7g-u00
+  [2018/01/13 v1.7h-u00
   Standard upLaTeX file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xiipt{18}%

diff --git a/utbook.cls b/utbook.cls
@@ -16,7 +16,7 @@
 %% File: ujclasses.dtx
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesClass{utbook}
-  [2017/09/19 v1.7g-u00
+  [2018/01/13 v1.7h-u00
  Standard upLaTeX class]
 \newcounter{@paper}
 \newif\if@landscape \@landscapefalse
@@ -135,6 +135,7 @@
 \ProcessOptions\relax
 \input{utbk1\@ptsize.clo}
 \RequirePackage{plext}
+\def\Cjascale{0.962216}
 \if@stysize
   \setlength\columnsep{3\Cwd}
 \else

diff --git a/utreport.cls b/utreport.cls
@@ -16,7 +16,7 @@
 %% File: ujclasses.dtx
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesClass{utreport}
-  [2017/09/19 v1.7g-u00
+  [2018/01/13 v1.7h-u00
  Standard upLaTeX class]
 \newcounter{@paper}
 \newif\if@landscape \@landscapefalse
@@ -133,6 +133,7 @@
 \ProcessOptions\relax
 \input{utsize1\@ptsize.clo}
 \RequirePackage{plext}
+\def\Cjascale{0.962216}
 \if@stysize
   \setlength\columnsep{3\Cwd}
 \else

diff --git a/utsize10.clo b/utsize10.clo
@@ -16,7 +16,7 @@
 %% File: ujclasses.dtx
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesFile{utsize10.clo}
-  [2017/09/19 v1.7g-u00
+  [2018/01/13 v1.7h-u00
   Standard upLaTeX file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xpt{17}%

diff --git a/utsize11.clo b/utsize11.clo
@@ -16,7 +16,7 @@
 %% File: ujclasses.dtx
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesFile{utsize11.clo}
-  [2017/09/19 v1.7g-u00
+  [2018/01/13 v1.7h-u00
   Standard upLaTeX file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xipt{17}%

diff --git a/utsize12.clo b/utsize12.clo
@@ -16,7 +16,7 @@
 %% File: ujclasses.dtx
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesFile{utsize12.clo}
-  [2017/09/19 v1.7g-u00
+  [2018/01/13 v1.7h-u00
   Standard upLaTeX file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xiipt{18}%