From 840649a78579969bf711273c212c7b2be215d80c Mon Sep 17 00:00:00 2001 From: Hironori Kitagawa Date: Sun, 23 Sep 2018 04:49:39 +0900 Subject: [PATCH] lltjdefs.sty: use \Cjascale if defined --- src/ltjsarticle.cls | 9 ++------- src/ltjsbook.cls | 9 ++------- src/ltjsclasses.dtx | 24 +++++++++++------------- src/ltjskiyou.cls | 9 ++------- src/ltjspf.cls | 9 ++------- src/ltjsreport.cls | 9 ++------- src/patches/lltjdefs.sty | 8 ++++---- 7 files changed, 25 insertions(+), 52 deletions(-) diff --git a/src/ltjsarticle.cls b/src/ltjsarticle.cls index d844d12..56cd0c7 100644 --- a/src/ltjsarticle.cls +++ b/src/ltjsarticle.cls @@ -38,8 +38,9 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjsarticle} - [2018/07/30 ltjsclasses ] + [2018/09/23 ltjsclasses ] \def\jsc@clsname{ltjsarticle} +\def\Cjascale{0.924715} \RequirePackage{luatexja} \newif\if@restonecol \newif\if@titlepage @@ -307,7 +308,6 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% \setlength{\pageheight}{\paperheight} \fi \fi - \def\Cjascale{0.924715} \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax \ifmingoth \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=min}{} @@ -316,13 +316,8 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% \ifptexjis \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=jis}{} \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=jis}{} - \else - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=ujis}{} - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=ujis}{} \fi \fi -\DeclareFontShape{JT3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=ujisv}{} -\DeclareFontShape{JT3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=ujisv}{} \DeclareFontShape{JY3}{mc}{bx}{n}{<->ssub*gt/m/n}{} \DeclareFontShape{JY3}{gt}{bx}{n}{<->ssub*gt/m/n}{} \DeclareFontShape{JY3}{mc}{b}{n}{<->ssub*gt/m/n}{} diff --git a/src/ltjsbook.cls b/src/ltjsbook.cls index 6011280..4032c34 100644 --- a/src/ltjsbook.cls +++ b/src/ltjsbook.cls @@ -38,8 +38,9 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjsbook} - [2018/07/30 ltjsclasses ] + [2018/09/23 ltjsclasses ] \def\jsc@clsname{ltjsbook} +\def\Cjascale{0.924715} \RequirePackage{luatexja} \newif\if@restonecol \newif\if@titlepage @@ -315,7 +316,6 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% \setlength{\pageheight}{\paperheight} \fi \fi - \def\Cjascale{0.924715} \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax \ifmingoth \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=min}{} @@ -324,13 +324,8 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% \ifptexjis \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=jis}{} \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=jis}{} - \else - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=ujis}{} - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=ujis}{} \fi \fi -\DeclareFontShape{JT3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=ujisv}{} -\DeclareFontShape{JT3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=ujisv}{} \DeclareFontShape{JY3}{mc}{bx}{n}{<->ssub*gt/m/n}{} \DeclareFontShape{JY3}{gt}{bx}{n}{<->ssub*gt/m/n}{} \DeclareFontShape{JY3}{mc}{b}{n}{<->ssub*gt/m/n}{} diff --git a/src/ltjsclasses.dtx b/src/ltjsclasses.dtx index 8709f41..ebe2c0c 100644 --- a/src/ltjsclasses.dtx +++ b/src/ltjsclasses.dtx @@ -44,7 +44,7 @@ %<*driver> \ProvidesFile{ltjsclasses.dtx} % - [2018/07/30 ltjsclasses ] + [2018/09/23 ltjsclasses ] %<*driver> \IfFileExists{luatex85.sty}{\RequirePackage{luatex85}}{} \documentclass{ltjsarticle} @@ -188,8 +188,10 @@ % % \section{Lua\TeX-jaの読み込み} % -% まず，Lua\TeX-jaを読み込みます。 +% 和文スケール値を設定した後に，Lua\TeX-jaを読み込みます。 % \begin{macrocode} +%\def\Cjascale{0.924715} +%\def\Cjascale{0.903375} \RequirePackage{luatexja} % \end{macrocode} % @@ -954,9 +956,6 @@ % [2017-12-31] 和文スケール（$1\,\mathrm{zw} \div \hbox{要求サイズ}$）を % 表す実数値マクロ |\Cjascale| を定義しました。 % -% \begin{macrocode} -% \def\Cjascale{0.924715} -% \end{macrocode} % % これにより，公称10ポイントの和文フォントを0.924715倍したことにより， % 約9.25ポイント， @@ -967,12 +966,16 @@ % 和文フォントをPostScriptの9ポイントにするために， % $0.9*72.27/72 \simeq 0.903375$ 倍します。 % -% \begin{macrocode} -% \def\Cjascale{0.903375} -% \end{macrocode} +% [2018-09-23 LTJ] 実際の|\Cjascale|の定義はLua\TeX-jaの読み込み前に移動しました． +% こうすることによって「0.962216倍された和文フォント」という実際には使われない和文フォントを +% 読み込む必要がなくなります． +% % % 実際にフォントの再定義を行う部分です． % +% [2018-09-23 LTJ] |\Cjascale|の設定を前倒ししたことに伴い，実際の再定義は +% \texttt{mingoth}, \texttt{ptexjis}のときしか必要なくなりました． +% % \begin{macrocode} \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax \ifmingoth @@ -982,13 +985,8 @@ \ifptexjis \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=jis}{} \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=jis}{} - \else - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=ujis}{} - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=ujis}{} \fi \fi -\DeclareFontShape{JT3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=ujisv}{} -\DeclareFontShape{JT3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=ujisv}{} % \end{macrocode} % % 和文でイタリック体，斜体，サンセリフ体， diff --git a/src/ltjskiyou.cls b/src/ltjskiyou.cls index e3ca08f..7557180 100644 --- a/src/ltjskiyou.cls +++ b/src/ltjskiyou.cls @@ -38,8 +38,9 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjskiyou} - [2018/07/30 ltjsclasses ] + [2018/09/23 ltjsclasses ] \def\jsc@clsname{ltjskiyou} +\def\Cjascale{0.924715} \RequirePackage{luatexja} \newif\if@restonecol \newif\if@titlepage @@ -307,7 +308,6 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% \setlength{\pageheight}{\paperheight} \fi \fi - \def\Cjascale{0.924715} \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax \ifmingoth \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=min}{} @@ -316,13 +316,8 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% \ifptexjis \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=jis}{} \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=jis}{} - \else - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=ujis}{} - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=ujis}{} \fi \fi -\DeclareFontShape{JT3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=ujisv}{} -\DeclareFontShape{JT3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=ujisv}{} \DeclareFontShape{JY3}{mc}{bx}{n}{<->ssub*gt/m/n}{} \DeclareFontShape{JY3}{gt}{bx}{n}{<->ssub*gt/m/n}{} \DeclareFontShape{JY3}{mc}{b}{n}{<->ssub*gt/m/n}{} diff --git a/src/ltjspf.cls b/src/ltjspf.cls index 1e5210a..a380ba9 100644 --- a/src/ltjspf.cls +++ b/src/ltjspf.cls @@ -38,8 +38,9 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjspf} - [2018/07/30 ltjsclasses ] + [2018/09/23 ltjsclasses ] \def\jsc@clsname{ltjspf} +\def\Cjascale{0.903375} \RequirePackage{luatexja} \newif\if@restonecol \newif\if@titlepage @@ -306,7 +307,6 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% \setlength{\pageheight}{\paperheight} \fi \fi - \def\Cjascale{0.903375} \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax \ifmingoth \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=min}{} @@ -315,13 +315,8 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% \ifptexjis \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=jis}{} \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=jis}{} - \else - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=ujis}{} - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=ujis}{} \fi \fi -\DeclareFontShape{JT3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=ujisv}{} -\DeclareFontShape{JT3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=ujisv}{} \DeclareFontShape{JY3}{mc}{bx}{n}{<->ssub*gt/m/n}{} \DeclareFontShape{JY3}{gt}{bx}{n}{<->ssub*gt/m/n}{} \DeclareFontShape{JY3}{mc}{b}{n}{<->ssub*gt/m/n}{} diff --git a/src/ltjsreport.cls b/src/ltjsreport.cls index 70f8dd0..ec151b4 100644 --- a/src/ltjsreport.cls +++ b/src/ltjsreport.cls @@ -38,8 +38,9 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjsreport} - [2018/07/30 ltjsclasses ] + [2018/09/23 ltjsclasses ] \def\jsc@clsname{ltjsreport} +\def\Cjascale{0.924715} \RequirePackage{luatexja} \newif\if@restonecol \newif\if@titlepage @@ -311,7 +312,6 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% \setlength{\pageheight}{\paperheight} \fi \fi - \def\Cjascale{0.924715} \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax \ifmingoth \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=min}{} @@ -320,13 +320,8 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% \ifptexjis \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=jis}{} \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=jis}{} - \else - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=ujis}{} - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=ujis}{} \fi \fi -\DeclareFontShape{JT3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=ujisv}{} -\DeclareFontShape{JT3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=ujisv}{} \DeclareFontShape{JY3}{mc}{bx}{n}{<->ssub*gt/m/n}{} \DeclareFontShape{JY3}{gt}{bx}{n}{<->ssub*gt/m/n}{} \DeclareFontShape{JY3}{mc}{b}{n}{<->ssub*gt/m/n}{} diff --git a/src/patches/lltjdefs.sty b/src/patches/lltjdefs.sty index 09c54ea..c497f21 100644 --- a/src/patches/lltjdefs.sty +++ b/src/patches/lltjdefs.sty @@ -29,18 +29,18 @@ \newcommand\kanjishapedefault{\updefault} \DeclareKanjiFamily{JY3}{mc}{} -\DeclareFontShape{JY3}{mc}{m}{n}{<-> s*[0.962216] \ltj@stdmcfont:jfm=ujis}{} +\DeclareFontShape{JY3}{mc}{m}{n}{<-> s*[\ifdefined\Cjascale\Cjascale\else 0.962216\fi] \ltj@stdmcfont:jfm=ujis}{} \DeclareKanjiFamily{JY3}{gt}{} -\DeclareFontShape{JY3}{gt}{m}{n}{<-> s*[0.962216] \ltj@stdgtfont:jfm=ujis}{} +\DeclareFontShape{JY3}{gt}{m}{n}{<-> s*[\ifdefined\Cjascale\Cjascale\else 0.962216\fi] \ltj@stdgtfont:jfm=ujis}{} \DeclareFontShape{JY3}{mc}{bx}{n}{<-> ssub*gt/m/n}{} \DeclareFontShape{JY3}{gt}{bx}{n}{<-> ssub*gt/m/n}{} \DeclareFontShape{JY3}{mc}{b}{n}{<-> ssub*mc/bx/n}{} \DeclareFontShape{JY3}{gt}{b}{n}{<-> ssub*gt/bx/n}{} \DeclareKanjiFamily{JT3}{mc}{} -\DeclareFontShape{JT3}{mc}{m}{n}{<-> s*[0.962216] \ltj@stdmcfont:jfm=ujisv}{} +\DeclareFontShape{JT3}{mc}{m}{n}{<-> s*[\ifdefined\Cjascale\Cjascale\else 0.962216\fi] \ltj@stdmcfont:jfm=ujisv}{} \DeclareKanjiFamily{JT3}{gt}{} -\DeclareFontShape{JT3}{gt}{m}{n}{<-> s*[0.962216] \ltj@stdgtfont:jfm=ujisv}{} +\DeclareFontShape{JT3}{gt}{m}{n}{<-> s*[\ifdefined\Cjascale\Cjascale\else 0.962216\fi] \ltj@stdgtfont:jfm=ujisv}{} \DeclareFontShape{JT3}{mc}{bx}{n}{<-> ssub*gt/m/n}{} \DeclareFontShape{JT3}{gt}{bx}{n}{<-> ssub*gt/m/n}{} \DeclareFontShape{JT3}{mc}{b}{n}{<-> ssub*mc/bx/n}{} -- 2.11.0