summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-04-01 20:57:19 +0000
committerKarl Berry <karl@freefriends.org>2017-04-01 20:57:19 +0000
commit5112bfa157654c21370044635eb59293b8c8d895 (patch)
tree960858fa8628c8ee694df6df251b1450b0303687 /Master/texmf-dist/tex/luatex
parent39403faccf07a097c5a3fd691d81c23ff24c2e2f (diff)
luatexja (1apr17)
git-svn-id: svn://tug.org/texlive/trunk@43671 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex')
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty110
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/lltjext.sty123
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty10
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-math.lua4
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls6
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls12
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls6
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls24
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls70
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls4
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls4
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls54
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls6
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls12
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls6
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty9
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty32
29 files changed, 342 insertions, 174 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
index d6354dd5326..41ba2361467 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
@@ -1,5 +1,5 @@
% luatexja-preset.sty
-\ProvidesPackage{luatexja-preset}[2017/01/24 Japanese font presets]
+\ProvidesPackage{luatexja-preset}[2017/03/21 Japanese font presets]
\RequirePackage{expl3,l3keys2e}
\RequirePackage{luatexja}
@@ -11,7 +11,7 @@
\fp_gset:Nn \l_ltjpreset_scale_fp {\zw / 10}
\group_end:
-\keys_define:nn { luatexja-preset }{
+\keys_define:nn { luatexja-preset }{
unknown .code:n = \PassOptionsToPackage { \l_keys_key_tl } { luatexja-fontspec },
scale .fp_gset:N = \l_ltjpreset_scale_fp,
match .code: n =
@@ -43,11 +43,12 @@
\ltjpreset_declare_bool_option:nn { deluxe }{ nodeluxe }
% JFM
-\cs_set:Npn \ltjpreset_use_jfm: {ujis} % 使用する JFM
-%%% \ltjpreset_declare_option:nn{min}{\cs_set:Npn \ltjpreset_use_jfm: {min}} % min
-%%% ↑jfm-min.lua が横組み・縦組み専用仮名に追いついていないので使用禁止
-\ltjpreset_declare_option:nn{jis}{\cs_set:Npn \ltjpreset_use_jfm: {jis}} % jis
-\ltjpreset_declare_option:nn{ujis}{\cs_set:Npn \ltjpreset_use_jfm: {ujis}} % ujis
+\tl_new:N \ltjpreset_use_jfm_yoko_tl % 使用する JFM(横)
+\tl_set:Nn \ltjpreset_use_jfm_yoko_tl {ujis}
+\tl_new:N \ltjpreset_use_jfm_tate_tl % 使用する JFM(縦)
+\tl_set:Nn \ltjpreset_use_jfm_tate_tl {ujisv}
+\ltjpreset_declare_option:nn{jis}{\tl_set:Nn \ltjpreset_use_jfm_yoko_tl {jis}} % jis
+\ltjpreset_declare_option:nn{ujis}{\tl_set:Nn \ltjpreset_use_jfm_yoko_tl {ujis}} % ujis
% 漢字字形
\tl_new:N \l_ltjpreset_kanji_shape_tl
@@ -83,7 +84,9 @@
% カスタム指定
\keys_define:nn { luatexja-preset }{
custom .code:n = \ltjpreset_set_multi:n { #1 },
- custom .value_required:n = true
+ custom .value_required:n = true,
+ jfm_yoko .tl_set:N = \ltjpreset_use_jfm_yoko_tl,
+ jfm_tate .tl_set:N = \ltjpreset_use_jfm_tate_tl,
}
% 小塚 (Adobe)
@@ -127,24 +130,24 @@
% ヒラギノ (OSX)
\ltjpreset_declare_option:nn{hiragino-pro}{
\ltjpreset_set_multi:n {
- HiraMinPro-W3 ,
- HiraMinPro-W6 ,
+ HiraMinPro-W3 ,
+ HiraMinPro-W6 ,
HiraKakuPro-W3 , % gt/m (multi)
- HiraKakuPro-W6 ,
+ HiraKakuPro-W6 ,
HiraKakuPro-W6 , % gt/m (uni)
- HiraKakuStd-W8 ,
- HiraMaruPro-W4 ,
+ HiraKakuStd-W8 ,
+ HiraMaruPro-W4 ,
}
}
\ltjpreset_declare_option:nn{hiragino-pron}{
\ltjpreset_set_multi:n {
- HiraMinProN-W3 ,
- HiraMinProN-W6 ,
+ HiraMinProN-W3 ,
+ HiraMinProN-W6 ,
HiraKakuProN-W3 , % gt/m (multi)
- HiraKakuProN-W6 ,
+ HiraKakuProN-W6 ,
HiraKakuProN-W6 , % gt/m (uni)
- HiraKakuStdN-W8 ,
- HiraMaruProN-W4 ,
+ HiraKakuStdN-W8 ,
+ HiraMaruProN-W4 ,
}
}
@@ -278,13 +281,13 @@
\clist_if_in:NnT \l_ltjpreset_font_list { HiraMinProN-W3 }
{ \bool_set_true:N \l_ltjpreset_shape_nlck_bool }
\clist_if_in:NnT \l_ltjpreset_font_list { Moga90Mincho }
- {
- \tl_remove_all:Nn \l_ltjpreset_font_list {90}
+ {
+ \tl_remove_all:Nn \l_ltjpreset_font_list {90}
\tl_clear:N \l_ltjpreset_kanji_shape_tl
}
\clist_if_in:NnT \l_ltjpreset_font_list { MogaEx90Mincho }
- {
- \tl_remove_all:Nn \l_ltjpreset_font_list {90}
+ {
+ \tl_remove_all:Nn \l_ltjpreset_font_list {90}
\tl_clear:N \l_ltjpreset_kanji_shape_tl
}
}{
@@ -327,7 +330,7 @@
%% HG 系フォント + JIS2004/90JIS のときはフォント名を置換
\bool_if:NT \l_ltjpreset_office_bool {
\tl_set:Nn \l_tmpa_tl {, CJKShape=JIS2004 }
- \tl_if_eq:NNT \l_ltjpreset_kanji_shape_tl \l_tmpa_tl {
+ \tl_if_eq:NNT \l_ltjpreset_kanji_shape_tl \l_tmpa_tl {
\cs_set:Nx \ltjpreset_font_mc_bx: { hgrme04.ttc }
\cs_set:Nx \ltjpreset_font_gt_bx: { hgrge04.ttc }
\cs_set:Nx \ltjpreset_font_gt_eb: { hgrsgu04.ttc }
@@ -336,7 +339,7 @@
% HG ゴシックM のときはそうはいかないので 1 ウェイト時のゴシック体を使う
}
\tl_set:Nn \l_tmpa_tl {, CJKShape=JIS1990 }
- \tl_if_eq:NNT \l_ltjpreset_kanji_shape_tl \l_tmpa_tl {
+ \tl_if_eq:NNT \l_ltjpreset_kanji_shape_tl \l_tmpa_tl {
\cs_set:Nx \ltjpreset_font_mc_bx: { hgrme.ttc }
\cs_set:Nx \ltjpreset_font_gt_bx: { hgrge.ttc }
\cs_set:Nx \ltjpreset_font_gt_eb: { hgrsgu.ttc }
@@ -352,14 +355,14 @@
}
\tl_set:Nn \l_tmpa_tl {, CJKShape=JIS2004 }
\tl_if_eq:NNT \l_ltjpreset_kanji_shape_tl \l_tmpa_tl {
- \bool_if:NTF \l_ltjpreset_shape_nlck_bool
+ \bool_if:NTF \l_ltjpreset_shape_nlck_bool
{ \tl_set:Nn \l_ltjpreset_kanji_shape_tl { +nlck } }
{ \tl_set:Nn \l_ltjpreset_kanji_shape_tl { +jp04 } }
}
} {
\tl_set:Nn \l_tmpa_tl {, CJKShape=JIS2004 }
\tl_if_eq:NNT \l_ltjpreset_kanji_shape_tl \l_tmpa_tl {
- \bool_if:NT \l_ltjpreset_shape_nlck_bool
+ \bool_if:NT \l_ltjpreset_shape_nlck_bool
{ \tl_set:Nn \l_ltjpreset_kanji_shape_tl { , CJKShape=NLC } }
}
}
@@ -373,25 +376,25 @@
\msg_warning:nn { luatexja-preset }{ scale }
\cs_new:Nn \ltj_preset_define_family:nnn {
- \DeclareFontShape{JY3}{#1}{#2}{n}{ <-> s*[\fp_use:N \l_ltjpreset_scale_fp]
+ \DeclareFontShape{JY3}{#1}{#2}{n}{ <-> s*[\fp_use:N \l_ltjpreset_scale_fp]
{\bool_if:NT \l_ltjpreset_noembed_bool {psft:} "#3"
- : jfm=\ltjpreset_use_jfm: ;-kern;\tl_use:N \l_ltjpreset_kanji_shape_tl
+ : jfm=\tl_use:N \ltjpreset_use_jfm_yoko_tl ;-kern;\tl_use:N \l_ltjpreset_kanji_shape_tl
; script=latn \bool_if:NT \l_ltjpreset_expert_bool { ;+hkna }}
} {}
- \DeclareFontShape{JT3}{#1}{#2}{n}{ <-> s*[\fp_use:N \l_ltjpreset_scale_fp]
+ \DeclareFontShape{JT3}{#1}{#2}{n}{ <-> s*[\fp_use:N \l_ltjpreset_scale_fp]
{\bool_if:NT \l_ltjpreset_noembed_bool {psft:} "#3"
- : jfm=ujisv ;-kern;\tl_use:N \l_ltjpreset_kanji_shape_tl;
+ : jfm=\tl_use:N \ltjpreset_use_jfm_tate_tl ;-kern;\tl_use:N \l_ltjpreset_kanji_shape_tl;
; script=latn \bool_if:NT \l_ltjpreset_expert_bool { ;+vkna }}
} {}
- \bool_if:NT \l_ltjpreset_expert_bool {
- \DeclareFontShape{JY3}{#1}{#2}{rb}{ <-> s*[\fp_use:N \l_ltjpreset_scale_fp]
+ \bool_if:NT \l_ltjpreset_expert_bool {
+ \DeclareFontShape{JY3}{#1}{#2}{rb}{ <-> s*[\fp_use:N \l_ltjpreset_scale_fp]
{\bool_if:NT \l_ltjpreset_noembed_bool {psft:} "#3"
- : jfm=\ltjpreset_use_jfm: ;-kern;\tl_use:N \l_ltjpreset_kanji_shape_tl ;+ruby
+ : jfm=\tl_use:N \ltjpreset_use_jfm_yoko_tl ;-kern;\tl_use:N \l_ltjpreset_kanji_shape_tl ;+ruby
; script=kana}
} {}
- \DeclareFontShape{JT3}{#1}{#2}{rb}{ <-> s*[\fp_use:N \l_ltjpreset_scale_fp]
+ \DeclareFontShape{JT3}{#1}{#2}{rb}{ <-> s*[\fp_use:N \l_ltjpreset_scale_fp]
{\bool_if:NT \l_ltjpreset_noembed_bool {psft:} "#3"
- : jfm=ujisv ;-kern;\tl_use:N \l_ltjpreset_kanji_shape_tl ;+ruby
+ : jfm=\tl_use:N \ltjpreset_use_jfm_tate_tl ;-kern;\tl_use:N \l_ltjpreset_kanji_shape_tl ;+ruby
; script=kana}
} {}
}
@@ -414,9 +417,9 @@
\cs_set_eq:NN \ltjpreset_font_mc_bx: \ltjpreset_font_gt_m:
}
-\ltj_preset_define_family:nnn {ltjpm} {m} {\ltjpreset_font_mc_m:}
+\ltj_preset_define_family:nnn {ltjpm} {m} {\ltjpreset_font_mc_m:}
\ltj_preset_define_family:nnn {ltjpm} {bx} {\ltjpreset_font_mc_bx:}
-\ltj_preset_define_family:nnn {ltjpg} {m} {\ltjpreset_font_gt_m:}
+\ltj_preset_define_family:nnn {ltjpg} {m} {\ltjpreset_font_gt_m:}
\ltj_preset_define_family:nnn {ltjpg} {bx} {\ltjpreset_font_gt_bx:}
\def\mcdefault{ltjpm}\def\gtdefault{ltjpg}
@@ -426,13 +429,13 @@
\SetSymbolFont{mincho}{bold}{JY3}{ltjpm}{bx}{n}
\DeclareMathAlphabet{\mathgt}{JY3}{ltjpg}{m}{n}
-\bool_if:NT \l_ltjpreset_expert_bool {
+\bool_if:NT \l_ltjpreset_expert_bool {
\DeclareRobustCommand\rubyfamily { \kanjishape{rb}\selectfont }
}
\bool_if:NTF \l_ltjpreset_deluxe_bool {
\DeclareKanjiFamily{JY3}{ltjpmg}{}\DeclareKanjiFamily{JT3}{ltjpmg}{}
- \ltj_preset_define_family:nnn {ltjpmg} {m} {\ltjpreset_font_mg:}
+ \ltj_preset_define_family:nnn {ltjpmg} {m} {\ltjpreset_font_mg:}
\ltj_preset_define_family:nnn {ltjpg} {eb} {\ltjpreset_font_gt_eb:}
\def\ebdefault{eb}
\DeclareRobustCommand\ebseries { \not@math@alphabet\ebseries\relaxfontseries\ebdefault\selectfont }
@@ -458,16 +461,17 @@
\tl_set:Nx \l_ltjpreset_add_features_tl {
\tl_use:N \l_ltjpreset_kanji_shape_tl,
- YokoFeatures = { JFM = \ltjpreset_use_jfm: },
+ YokoFeatures = { JFM = \tl_use:N \ltjpreset_use_jfm_yoko_tl },
+ TateFeatures = { JFM = \tl_use:N \ltjpreset_use_jfm_tate_tl },
}
\bool_if:NT \l_ltjpreset_expert_bool {
- \cs_set:Npn \rubyfamily { \addjfontfeatures {
+ \cs_set:Npn \rubyfamily { \addjfontfeatures {
Style=Ruby , YokoFeatures={RawFeature=-hkna} , TateFeatures={RawFeature=-vkna}
} }
- \tl_put_left:Nn \l_ltjpreset_add_features_tl {
- YokoFeatures = {Style = HorizontalKana},
- TateFeatures = {Style = VerticalKana},
+ \tl_put_left:Nn \l_ltjpreset_add_features_tl {
+ YokoFeatures = {Style = HorizontalKana},
+ TateFeatures = {Style = VerticalKana},
}
}
@@ -477,7 +481,7 @@
\newjfontfamily \mgfamily [
BoldFont = \ltjpreset_font_mg:,
\bool_if:NT \l_ltjpreset_noembed_bool { NoEmbed, }
- \tl_use:N \l_ltjpreset_add_features_tl
+ \tl_use:N \l_ltjpreset_add_features_tl
] { \ltjpreset_font_mg: }
\DeclareTextFontCommand{\textmg}{\mgfamily}
%% gt/eb
@@ -486,7 +490,7 @@
\newjfontfamily \gtebfamily [
BoldFont = \ltjpreset_font_gt_eb:,
\bool_if:NT \l_ltjpreset_noembed_bool { NoEmbed, }
- \tl_use:N \l_ltjpreset_add_features_tl
+ \tl_use:N \l_ltjpreset_add_features_tl
] { \ltjpreset_font_gt_eb: }
\DeclareTextFontCommand{\textgteb}{\gtebfamily}
\bool_if:NT \l_ltjpreset_bold_bool {
@@ -507,15 +511,15 @@
\addjfontfeature{ Kerning=Off }
-\setmainjfont [
+\setmainjfont [
BoldFont = \ltjpreset_font_mc_bx:
- \bool_if:NT \l_ltjpreset_noembed_bool { , NoEmbed },
- \tl_use:N \l_ltjpreset_add_features_tl
+ \bool_if:NT \l_ltjpreset_noembed_bool { , NoEmbed },
+ \tl_use:N \l_ltjpreset_add_features_tl
] { \ltjpreset_font_mc_m: }
-\setsansjfont [
- BoldFont = \ltjpreset_font_gt_bx:
- \bool_if:NT \l_ltjpreset_noembed_bool { , NoEmbed },
- \tl_use:N \l_ltjpreset_add_features_tl
+\setsansjfont [
+ BoldFont = \ltjpreset_font_gt_bx:
+ \bool_if:NT \l_ltjpreset_noembed_bool { , NoEmbed },
+ \tl_use:N \l_ltjpreset_add_features_tl
] { \ltjpreset_font_gt_m: }
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty b/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty
index 7a445f5d7d5..2e48f319973 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjext}[2016/12/16 v1.2c-ltj-5 Macros for vertical writing]
+\ProvidesPackage{lltjext}[2017/03/28 v1.2f-ltj-5 Macros for vertical writing]
\RequirePackage{luatexja}
{\catcode`\*=11
@@ -41,7 +41,7 @@
\fi
\else
\if #1y\relax
- \let\box@dir\yoko\@tempcnta=\strutbox
+ \let\box@dir\yoko\@tempcnta=\ystrutbox
\else\if #1t\relax
\let\box@dir\tate\@tempcnta=\tstrutbox
\else\if #1d\relax
@@ -54,7 +54,7 @@
\ifcase\count@
\or \let\box@dir\dtou\@tempcnta=\dstrutbox% dtou
\or\or\let\box@dir\tate\@tempcnta=\tstrutbox% tate
- \or \let\box@dir\yoko\@tempcnta=\strutbox% yoko
+ \or \let\box@dir\yoko\@tempcnta=\ystrutbox% yoko
\else \let\box@dir\utod\@tempcnta=\zstrutbox% utod
\fi
\fi
@@ -73,6 +73,41 @@
\def\endarray{\crcr\egroup\egroup\@end@alignbox}
\def\endtabular{\endarray$\egroup}
\expandafter \let \csname endtabular*\endcsname = \endtabular
+% コミュニティ版では、アスキー版で不自然だった表組(array環境およびtabular環境)と
+% 周囲の本文との揃え位置を修正し、以下のように設計しました。
+% \begin{itemize}
+% \item 周囲の組方向が横組かつ組方向が|<y>|, |<z>|指定の場合
+% \begin{itemize}
+% \item |[t]|指定のとき、\\一行目のベースラインが周囲のそれと一致(罫線の場合は和文ベースラインの位置)
+% \item |[c]|指定のとき、\\表組の中心が周囲の数式軸を通る(欧文ベースラインシフトの影響下)
+% \item |[b]|指定のとき、\\最終行のベースラインが周囲のそれと一致(罫線の場合は和文ベースラインの位置)
+% \end{itemize}
+% \item 周囲の組方向が横組かつ組方向が|<t>|指定の場合
+% \begin{itemize}
+% \item |[t]|指定のとき、\\表組の上端が周囲の和文ベースラインと一致
+% \item |[c]|指定のとき、\\表組の中心が周囲の数式軸を通る(欧文ベースラインシフトの影響下)
+% \item |[b]|指定のとき、\\表組の下端が周囲の和文ベースラインと一致
+% \end{itemize}
+% \item 周囲の組方向が縦組かつ組方向が|<y>|指定の場合
+% \begin{itemize}
+% \item |[t]|指定のとき、\\表組の上端が周囲の和文ベースラインと一致
+% \item |[c]|指定のとき、\\表組の中心が周囲の数式軸を通る(欧文ベースラインシフトの影響下)
+% \item |[b]|指定のとき、\\表組の下端が周囲の和文ベースラインと一致
+% \end{itemize}
+% \item 周囲の組方向が縦組かつ組方向が|<t>|指定の場合
+% \begin{itemize}
+% \item |[t]|指定のとき、\\一行目のベースラインが周囲のそれと一致(罫線の場合は和文ベースラインの位置)
+% \item |[c]|指定のとき、\\表組の中心が周囲の数式軸を通る(欧文ベースラインシフトの影響下)
+% \item |[b]|指定のとき、\\最終行のベースラインが周囲のそれと一致(罫線の場合は和文ベースラインの位置)
+% \end{itemize}
+% \item 周囲の組方向が縦組かつ組方向が|<z>|指定の場合
+% [TODO] 未定!
+%^^A \begin{itemize}
+%^^A \item |[t]|指定のとき、\\表組の上端が周囲の和文ベースラインと一致
+%^^A \item |[c]|指定のとき、\\表組の中心が周囲の数式軸を通る(欧文ベースラインシフトの影響下)
+%^^A \item |[b]|指定のとき、\\表組の下端が周囲の和文ベースラインと一致
+%^^A \end{itemize}
+% \end{itemize}
\def\fork@array@option<#1>[#2]{%
\ifnum\ltjgetparameter{direction}=4 % yoko
\ifx\box@dir\yoko
@@ -89,7 +124,7 @@
\else
\if #2t\relax
\def\@begin@alignbox{\vtop\bgroup\kern\z@\vbox}%
- \def\@end@alignbox{\egroup}%
+ \let\@end@alignbox\egroup%
\else\if #2b\relax
\let\@begin@alignbox\vbox
\let\@end@alignbox\relax
@@ -262,7 +297,7 @@
\csname \@captype @layoutcaption\endcsname
\fi
\@tempswafalse
- % tempswa\hline 基本組の組方向とキャプションの組方向が直交するか?
+ % \@tempswa: 基本組の組方向とキャプションの組方向が直交するか?
\if y\caption@dir \let\captiondir\yoko
\ifodd\ltjgetparameter{direction}\relax\@tempswatrue\fi
\else\if z\caption@dir \let\captiondir\relax
@@ -358,7 +393,7 @@
\color@endgroup
\egroup
\expandafter\@iiiparbox\@mpargs{\unvbox\@tempboxa}\egroup}
-\def\parbox{\@ifnextchar<%>
+\DeclareRobustCommand\parbox{\@ifnextchar<%>
{\X@parbox}{\X@parbox<Z>}}
\def\X@parbox<#1>{\@ifnextchar[%]
{\@iparbox<#1>}{\@iiiparbox<#1>{c}\relax[s]}}
@@ -367,19 +402,19 @@
\def\@iiparbox<#1>#2[#3]{\@ifnextchar[%]%
{\@iiiparbox<#1>{#2}{#3}}{\@iiiparbox<#1>{#2}{#3}[#2]}}
\long\def\@iiiparbox<#1>#2#3[#4]#5#6{%
- \leavevmode\bgroup
+ \leavevmode
\setlength\@tempdima{#5}%
\fork@parbox@option<#1>[#2]%
\@begin@tempboxa\vbox{\box@dir
\hsize\@tempdima\@parboxrestore\adjustbaseline#6\@@par}%
- \ifx\relax#3\relax\else
+ \ifx\relax#3\else
\setlength\@tempdimb{#3}%
\edef\@parboxto{to\the\@tempdimb}%
\fi
\@begin@parbox\@parboxto{\box@dir\adjustbaseline
\let\hss\vss\let\unhbox\unvbox
\csname bm@#4\endcsname}\@end@parbox
- \@end@tempboxa\egroup}
+ \@end@tempboxa}
\def\fork@parbox@option<#1>[#2]{%
\let\box@dir\relax
\if #1z\relax
@@ -411,8 +446,12 @@
\let\@begin@parbox\vbox
\let\@end@parbox\relax
\else
- \def\@begin@parbox{$\vcenter}%
- \def\@end@parbox{\m@th$}%
+ \ifmmode
+ \let\@begin@parbox\vcenter\let\@end@parbox\relax
+ \else
+ \def\@begin@parbox{\null$\vcenter}%
+ \def\@end@parbox{\m@th$\null}%
+ \fi
\fi\fi
\else
\if #2t\relax
@@ -422,8 +461,12 @@
\let\@begin@parbox\vbox
\let\@end@parbox\relax
\else
- \def\@begin@parbox{$\vcenter}%
- \def\@end@parbox{\m@th$}%
+ \ifmmode
+ \let\@begin@parbox\vcenter\let\@end@parbox\relax
+ \else
+ \def\@begin@parbox{\null$\vcenter}%
+ \def\@end@parbox{\m@th$\null}%
+ \fi
\fi\fi
\fi
\else\ifnum\ltjgetparameter{direction}=1 % dtou
@@ -435,8 +478,12 @@
\let\@begin@parbox\vbox
\let\@end@parbox\relax
\else
- \def\@begin@parbox{$\vcenter}%
- \def\@end@parbox{\m@th$}%
+ \ifmmode
+ \let\@begin@parbox\vcenter\let\@end@parbox\relax
+ \else
+ \def\@begin@parbox{\null$\vcenter}%
+ \def\@end@parbox{\m@th$\null}%
+ \fi
\fi\fi
\else\ifx\box@dir\dtou
\if #2t\relax
@@ -446,8 +493,12 @@
\let\@begin@parbox\vbox
\let\@end@parbox\relax
\else
- \def\@begin@parbox{$\vcenter}%
- \def\@end@parbox{\m@th$}%
+ \ifmmode
+ \let\@begin@parbox\vcenter\let\@end@parbox\relax
+ \else
+ \def\@begin@parbox{\null$\vcenter}%
+ \def\@end@parbox{\m@th$\null}%
+ \fi
\fi\fi
\else % 180 度回転→vtop, vbox を入れ替える
\if #2t\relax
@@ -457,8 +508,12 @@
\let\@begin@parbox\vtop %%% !!!
\let\@end@parbox\relax
\else
- \def\@begin@parbox{$\vcenter}%
- \def\@end@parbox{\m@th$}%
+ \ifmmode
+ \let\@begin@parbox\vcenter\let\@end@parbox\relax
+ \else
+ \def\@begin@parbox{\null$\vcenter}%
+ \def\@end@parbox{\m@th$\null}%
+ \fi
\fi\fi
\fi\fi
\else % tate, utod
@@ -470,8 +525,12 @@
\def\@begin@parbox{\vbox\bgroup\vbox}%
\def\@end@parbox{\kern\z@\egroup}%
\else
- \def\@begin@parbox{$\vcenter}%
- \def\@end@parbox{\m@th$}%
+ \ifmmode
+ \let\@begin@parbox\vcenter\let\@end@parbox\relax
+ \else
+ \def\@begin@parbox{\null$\vcenter}%
+ \def\@end@parbox{\m@th$\null}%
+ \fi
\fi\fi
\else\ifx\box@dir\dtou % 180 度回転→vtop, vbox を入れ替える
\if #2t\relax
@@ -481,8 +540,12 @@
\let\@begin@parbox\vtop %%% !!!
\let\@end@parbox\relax
\else
- \def\@begin@parbox{$\vcenter}%
- \def\@end@parbox{\m@th$}%
+ \ifmmode
+ \let\@begin@parbox\vcenter\let\@end@parbox\relax
+ \else
+ \def\@begin@parbox{\null$\vcenter}%
+ \def\@end@parbox{\m@th$\null}%
+ \fi
\fi\fi
\else
\if #2t\relax
@@ -492,8 +555,12 @@
\let\@begin@parbox\vbox
\let\@end@parbox\relax
\else
- \def\@begin@parbox{$\vcenter}%
- \def\@end@parbox{\m@th$}%
+ \ifmmode
+ \let\@begin@parbox\vcenter\let\@end@parbox\relax
+ \else
+ \def\@begin@parbox{\null$\vcenter}%
+ \def\@end@parbox{\m@th$\null}%
+ \fi
\fi\fi
\fi\fi
\fi\fi%
@@ -714,7 +781,7 @@
\fi
\else
\if ##1y\relax
- \let\box@dir\yoko\@tempcnta=\strutbox
+ \let\box@dir\yoko\@tempcnta=\ystrutbox
\else\if ##1t\relax
\let\box@dir\tate\@tempcnta=\tstrutbox
\else\if ##1d\relax
@@ -725,9 +792,9 @@
\fi
\ifx\box@dir\relax
\ifcase\count@
- \or \let\box@dir\dtou\@tempcnta=\tabskip \z@\tabskip \z@\dstrutbox% dtou
+ \or \let\box@dir\dtou\@tempcnta=\dstrutbox% dtou
\or\or\let\box@dir\tate\@tempcnta=\tstrutbox% tate
- \or \let\box@dir\yoko\@tempcnta=\strutbox% yoko
+ \or \let\box@dir\yoko\@tempcnta=\ystrutbox% yoko
\else \let\box@dir\utod\@tempcnta=\zstrutbox% utod
\fi
\fi
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty b/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty
index 1a3c54a0553..c66c208a036 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty
@@ -12,7 +12,15 @@
\def\luatexjalatexLoaded{\endinput}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ltj-latex}[2017/01/28 LaTeX support of LuaTeX-ja]
+\ProvidesPackage{ltj-latex}[2017/03/12 LaTeX support of LuaTeX-ja]
+
+% LaTeX2e 2017/05/01 で行われる対策
+\ifx\document@default@language \@undefined
+ \let\document@default@language\m@ne
+\fi
+\ifx\l@nohyphenation \@undefined
+ \newlanguage\l@nohyphenation
+\fi
% cleanup at end of the document
%\let\ltj@@orig@end=\@@end
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-math.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-math.lua
index abb50ece53b..e85e5f79d53 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-math.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-math.lua
@@ -64,6 +64,7 @@ local ltjd_make_dir_whatsit = ltjd.make_dir_whatsit
local is_math_letters = {}
local list_dir
+-- vcenter noad は軸に揃えるため,欧文ベースライン補正がかかる
local function conv_vcenter(sb)
local h = getfield(sb, 'head');local hd = getlist(h)
if getid(hd)==id_whatsit and
@@ -71,10 +72,9 @@ local function conv_vcenter(sb)
local d = node_next(hd)
if getid(d)==id_vlist and has_attr(d, attr_dir)>=dir_node_auto then
node_free(hd); setfield(h, 'head', nil); node_free(h)
- setfield(sb, 'head', d); h = d
+ setfield(sb, 'head', d); set_attr(d, attr_icflag, 0)
end
end
- set_attr(h, attr_icflag, PROCESSED)
return sb
end
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls
index 3e1f0d53350..5e6744c4d38 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjarticle}
- [2017/02/20 v1.7d-ltj-14
+ [2017/03/06 v1.7e-ltj-14
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@ -88,8 +88,8 @@
\tombowtrue \tombowdatetrue
\setlength{\@tombowwidth}{.1\p@}%
\@bannertoken{%
- \jobname\space:\space\number\year/\number\month/\number\day
- (\number\hour:\number\minute)}
+ \jobname\space(\number\year-\two@digits\month-\two@digits\day
+ \space\two@digits\hour:\two@digits\minute)}%
\maketombowbox}
\DeclareOption{tombo}{%
\tombowtrue \tombowdatefalse
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo
index 5e8258bc0ab..8f28fec28a7 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjbk10.clo}
- [2017/02/20 v1.7d-ltj-14
+ [2017/03/06 v1.7e-ltj-14
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{15}%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo
index adb5c1a7876..a3398b6f882 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjbk11.clo}
- [2017/02/20 v1.7d-ltj-14
+ [2017/03/06 v1.7e-ltj-14
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{15.5}%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo
index 73424e5faf7..4f2185cb459 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjbk12.clo}
- [2017/02/20 v1.7d-ltj-14
+ [2017/03/06 v1.7e-ltj-14
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{16.5}%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls
index 52c5b2ca9f9..9d162aa0a70 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjbook}
- [2017/02/20 v1.7d-ltj-14
+ [2017/03/06 v1.7e-ltj-14
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@ -91,8 +91,8 @@
\tombowtrue \tombowdatetrue
\setlength{\@tombowwidth}{.1\p@}%
\@bannertoken{%
- \jobname\space:\space\number\year/\number\month/\number\day
- (\number\hour:\number\minute)}
+ \jobname\space(\number\year-\two@digits\month-\two@digits\day
+ \space\two@digits\hour:\two@digits\minute)}%
\maketombowbox}
\DeclareOption{tombo}{%
\tombowtrue \tombowdatefalse
@@ -447,12 +447,10 @@
\newcommand{\@chapapp}{\prechaptername}
\newcommand{\@chappos}{\postchaptername}
\newcommand{\frontmatter}{%
- \if@openleft \cleardoublepage \else
- \if@openright \cleardoublepage \else \clearpage \fi \fi
+ \pltx@cleartooddpage
\@mainmatterfalse\pagenumbering{roman}}
\newcommand{\mainmatter}{%
- \if@openleft \cleardoublepage \else
- \if@openright \cleardoublepage \else \clearpage \fi \fi
+ \pltx@cleartooddpage
\@mainmattertrue\pagenumbering{arabic}}
\newcommand{\backmatter}{%
\if@openleft \cleardoublepage \else
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls
index f2ec93da18b..ccd3155ebe8 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjreport}
- [2017/02/20 v1.7d-ltj-14
+ [2017/03/06 v1.7e-ltj-14
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@ -90,8 +90,8 @@
\tombowtrue \tombowdatetrue
\setlength{\@tombowwidth}{.1\p@}%
\@bannertoken{%
- \jobname\space:\space\number\year/\number\month/\number\day
- (\number\hour:\number\minute)}
+ \jobname\space(\number\year-\two@digits\month-\two@digits\day
+ \space\two@digits\hour:\two@digits\minute)}%
\maketombowbox}
\DeclareOption{tombo}{%
\tombowtrue \tombowdatefalse
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls
index bf867d9bdc9..6238240d23e 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsarticle}
- [2017/02/19 ltjsclasses ]
+ [2017/03/06 ltjsclasses ]
\def\jsc@clsname{ltjsarticle}
\RequirePackage{luatexja}
\newif\if@restonecol
@@ -578,6 +578,26 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\setlength\@dblfptop{0\jsc@mpt \@plus 1fil}
\setlength\@dblfpsep{8\jsc@mpt \@plus 2fil}
\setlength\@dblfpbot{0\jsc@mpt \@plus 1fil}
+\def\pltx@cleartorightpage{\clearpage\if@twoside
+ \unless\ifodd\numexpr\c@page+\ltjgetparameter{direction}\relax
+ \hbox{}\thispagestyle{empty}\newpage
+ \if@twocolumn\hbox{}\newpage\fi
+ \fi\fi}
+\def\pltx@cleartoleftpage{\clearpage\if@twoside
+ \ifodd\numexpr\c@page+\ltjgetparameter{direction}\relax
+ \hbox{}\thispagestyle{empty}\newpage
+ \if@twocolumn\hbox{}\newpage\fi
+ \fi\fi}
+\def\pltx@cleartooddpage{\clearpage\if@twoside
+ \ifodd\c@page\else
+ \hbox{}\thispagestyle{empty}\newpage
+ \if@twocolumn\hbox{}\newpage\fi
+ \fi\fi}
+\def\pltx@cleartoevenpage{\clearpage\if@twoside
+ \ifodd\c@page
+ \hbox{}\thispagestyle{empty}\newpage
+ \if@twocolumn\hbox{}\newpage\fi
+ \fi\fi}
\def\ps@plainfoot{%
\let\@mkboth\@gobbletwo
\let\@oddhead\@empty
@@ -1105,7 +1125,7 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\@restonecolfalse\newpage
\fi
\thispagestyle{empty}%
- \setcounter{page}\@ne
+ \ifodd\c@page\setcounter{page}\@ne\else\setcounter{page}\z@\fi
}%
{\if@restonecol\twocolumn \else \newpage \fi
\if@twoside\else
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls
index e48ebfa2637..35222362cf2 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls
@@ -38,12 +38,13 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsbook}
- [2017/02/19 ltjsclasses ]
+ [2017/03/06 ltjsclasses ]
\def\jsc@clsname{ltjsbook}
\RequirePackage{luatexja}
\newif\if@restonecol
\newif\if@titlepage
\newif\if@openright
+\newif\if@openleft
\newif\if@mainmatter \@mainmattertrue
\newif\if@enablejfam \@enablejfamtrue
\DeclareOption{a3paper}{%
@@ -164,8 +165,9 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\DeclareOption{twocolumn}{\@twocolumntrue}
\DeclareOption{titlepage}{\@titlepagetrue}
\DeclareOption{notitlepage}{\@titlepagefalse}
-\DeclareOption{openright}{\@openrighttrue}
-\DeclareOption{openany}{\@openrightfalse}
+\DeclareOption{openright}{\@openrighttrue\@openleftfalse}
+\DeclareOption{openleft}{\@openlefttrue\@openrightfalse}
+\DeclareOption{openany}{\@openrightfalse\@openleftfalse}
\def\eqnarray{%
\stepcounter{equation}%
\def\@currentlabel{\p@equation\theequation}%
@@ -592,6 +594,31 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\setlength\@dblfptop{0\jsc@mpt \@plus 1fil}
\setlength\@dblfpsep{8\jsc@mpt \@plus 2fil}
\setlength\@dblfpbot{0\jsc@mpt \@plus 1fil}
+\def\pltx@cleartorightpage{\clearpage\if@twoside
+ \unless\ifodd\numexpr\c@page+\ltjgetparameter{direction}\relax
+ \hbox{}\thispagestyle{empty}\newpage
+ \if@twocolumn\hbox{}\newpage\fi
+ \fi\fi}
+\def\pltx@cleartoleftpage{\clearpage\if@twoside
+ \ifodd\numexpr\c@page+\ltjgetparameter{direction}\relax
+ \hbox{}\thispagestyle{empty}\newpage
+ \if@twocolumn\hbox{}\newpage\fi
+ \fi\fi}
+\def\pltx@cleartooddpage{\clearpage\if@twoside
+ \ifodd\c@page\else
+ \hbox{}\thispagestyle{empty}\newpage
+ \if@twocolumn\hbox{}\newpage\fi
+ \fi\fi}
+\def\pltx@cleartoevenpage{\clearpage\if@twoside
+ \ifodd\c@page
+ \hbox{}\thispagestyle{empty}\newpage
+ \if@twocolumn\hbox{}\newpage\fi
+ \fi\fi}
+\if@openleft
+ \let\cleardoublepage\pltx@cleartoleftpage
+\else\if@openright
+ \let\cleardoublepage\pltx@cleartorightpage
+\fi\fi
\def\ps@plainfoot{%
\let\@mkboth\@gobbletwo
\let\@oddhead\@empty
@@ -876,30 +903,30 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\newcommand{\@chapapp}{\prechaptername}
\newcommand{\@chappos}{\postchaptername}
\newcommand\frontmatter{%
- \if@openright
- \cleardoublepage
- \else
- \clearpage
- \fi
+ \pltx@cleartooddpage
\@mainmatterfalse
\pagenumbering{roman}}
\newcommand\mainmatter{%
- \cleardoublepage
+ \pltx@cleartooddpage
\@mainmattertrue
\pagenumbering{arabic}}
\newcommand\backmatter{%
- \if@openright
+ \if@openleft
+\cleardoublepage
+ \else\if@openright
\cleardoublepage
\else
\clearpage
- \fi
+ \fi\fi
\@mainmatterfalse}
\newcommand\part{%
- \if@openright
+ \if@openleft
+\cleardoublepage
+ \else\if@openright
\cleardoublepage
\else
\clearpage
- \fi
+ \fi\fi
\thispagestyle{empty}% 欧文用標準スタイルでは plain
\if@twocolumn
\onecolumn
@@ -935,17 +962,18 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\@endpart}
\def\@endpart{\vfil\newpage
\if@twoside
- \if@openright %% added (2016/12/13)
- \null
- \thispagestyle{empty}%
- \newpage
- \fi %% added (2016/12/13)
+ \if@openleft %% added (2017/02/24)
+ \null\thispagestyle{empty}\newpage
+ \else\if@openright %% added (2016/12/13)
+ \null\thispagestyle{empty}\newpage
+ \fi\fi %% added (2016/12/13, 2017/02/24)
\fi
\if@restonecol
\twocolumn
\fi}
\newcommand{\chapter}{%
- \if@openright\cleardoublepage\else\clearpage\fi
+ \if@openleft\cleardoublepage\else
+ \if@openright\cleardoublepage\else\clearpage\fi\fi
\plainifnotempty % 元: \thispagestyle{plain}
\global\@topnum\z@
\if@english \@afterindentfalse \else \@afterindenttrue \fi
@@ -1159,14 +1187,14 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\def\@opargbegintheorem#1#2#3{\trivlist\labelsep=1\zw
\item[\hskip \labelsep{\headfont #1\ #2(#3)}]}
\newenvironment{titlepage}{%
- \cleardoublepage
+ \pltx@cleartooddpage %% 2017-02-24
\if@twocolumn
\@restonecoltrue\onecolumn
\else
\@restonecolfalse\newpage
\fi
\thispagestyle{empty}%
- \setcounter{page}\@ne
+ \ifodd\c@page\setcounter{page}\@ne\else\setcounter{page}\z@\fi
}%
{\if@restonecol\twocolumn \else \newpage \fi
\if@twoside\else
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo
index dc09458301a..fdaf668bf26 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjsize10.clo}
- [2017/02/20 v1.7d-ltj-14
+ [2017/03/06 v1.7e-ltj-14
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{15}%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo
index 71ba0bd9513..f029a1b081a 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjsize11.clo}
- [2017/02/20 v1.7d-ltj-14
+ [2017/03/06 v1.7e-ltj-14
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{15.5}%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo
index 08febe4afec..2e4c45892bb 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjsize12.clo}
- [2017/02/20 v1.7d-ltj-14
+ [2017/03/06 v1.7e-ltj-14
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{16.5}%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls
index 4063966c3fa..a05f882104d 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjskiyou}
- [2017/02/19 ltjsclasses ]
+ [2017/03/06 ltjsclasses ]
\def\jsc@clsname{ltjskiyou}
\RequirePackage{luatexja}
\newif\if@restonecol
@@ -1087,7 +1087,7 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\@restonecolfalse\newpage
\fi
\thispagestyle{empty}%
- \setcounter{page}\@ne
+ \ifodd\c@page\setcounter{page}\@ne\else\setcounter{page}\z@\fi
}%
{\if@restonecol\twocolumn \else \newpage \fi
\if@twoside\else
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls
index 42e05eafe43..37a1c4dfd11 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjspf}
- [2017/02/19 ltjsclasses ]
+ [2017/03/06 ltjsclasses ]
\def\jsc@clsname{ltjspf}
\RequirePackage{luatexja}
\newif\if@restonecol
@@ -974,7 +974,7 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\@restonecolfalse\newpage
\fi
\thispagestyle{empty}%
- \setcounter{page}\@ne
+ \ifodd\c@page\setcounter{page}\@ne\else\setcounter{page}\z@\fi
}%
{\if@restonecol\twocolumn \else \newpage \fi
\if@twoside\else
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls
index 2e96771707e..1ab34dd5d6c 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls
@@ -38,12 +38,13 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsreport}
- [2017/02/19 ltjsclasses ]
+ [2017/03/06 ltjsclasses ]
\def\jsc@clsname{ltjsreport}
\RequirePackage{luatexja}
\newif\if@restonecol
\newif\if@titlepage
\newif\if@openright
+\newif\if@openleft
\newif\if@enablejfam \@enablejfamtrue
\DeclareOption{a3paper}{%
\setlength\paperheight {420mm}%
@@ -163,8 +164,9 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\DeclareOption{twocolumn}{\@twocolumntrue}
\DeclareOption{titlepage}{\@titlepagetrue}
\DeclareOption{notitlepage}{\@titlepagefalse}
-\DeclareOption{openright}{\@openrighttrue}
-\DeclareOption{openany}{\@openrightfalse}
+\DeclareOption{openright}{\@openrighttrue\@openleftfalse}
+\DeclareOption{openleft}{\@openlefttrue\@openrightfalse}
+\DeclareOption{openany}{\@openrightfalse\@openleftfalse}
\def\eqnarray{%
\stepcounter{equation}%
\def\@currentlabel{\p@equation\theequation}%
@@ -566,6 +568,31 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\setlength\@dblfptop{0\jsc@mpt \@plus 1fil}
\setlength\@dblfpsep{8\jsc@mpt \@plus 2fil}
\setlength\@dblfpbot{0\jsc@mpt \@plus 1fil}
+\def\pltx@cleartorightpage{\clearpage\if@twoside
+ \unless\ifodd\numexpr\c@page+\ltjgetparameter{direction}\relax
+ \hbox{}\thispagestyle{empty}\newpage
+ \if@twocolumn\hbox{}\newpage\fi
+ \fi\fi}
+\def\pltx@cleartoleftpage{\clearpage\if@twoside
+ \ifodd\numexpr\c@page+\ltjgetparameter{direction}\relax
+ \hbox{}\thispagestyle{empty}\newpage
+ \if@twocolumn\hbox{}\newpage\fi
+ \fi\fi}
+\def\pltx@cleartooddpage{\clearpage\if@twoside
+ \ifodd\c@page\else
+ \hbox{}\thispagestyle{empty}\newpage
+ \if@twocolumn\hbox{}\newpage\fi
+ \fi\fi}
+\def\pltx@cleartoevenpage{\clearpage\if@twoside
+ \ifodd\c@page
+ \hbox{}\thispagestyle{empty}\newpage
+ \if@twocolumn\hbox{}\newpage\fi
+ \fi\fi}
+\if@openleft
+ \let\cleardoublepage\pltx@cleartoleftpage
+\else\if@openright
+ \let\cleardoublepage\pltx@cleartorightpage
+\fi\fi
\def\ps@plainfoot{%
\let\@mkboth\@gobbletwo
\let\@oddhead\@empty
@@ -849,11 +876,13 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\newcommand{\@chapapp}{\prechaptername}
\newcommand{\@chappos}{\postchaptername}
\newcommand\part{%
- \if@openright
+ \if@openleft
+\cleardoublepage
+ \else\if@openright
\cleardoublepage
\else
\clearpage
- \fi
+ \fi\fi
\thispagestyle{empty}% 欧文用標準スタイルでは plain
\if@twocolumn
\onecolumn
@@ -889,17 +918,18 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\@endpart}
\def\@endpart{\vfil\newpage
\if@twoside
- \if@openright %% added (2016/12/13)
- \null
- \thispagestyle{empty}%
- \newpage
- \fi %% added (2016/12/13)
+ \if@openleft %% added (2017/02/24)
+ \null\thispagestyle{empty}\newpage
+ \else\if@openright %% added (2016/12/13)
+ \null\thispagestyle{empty}\newpage
+ \fi\fi %% added (2016/12/13, 2017/02/24)
\fi
\if@restonecol
\twocolumn
\fi}
\newcommand{\chapter}{%
- \if@openright\cleardoublepage\else\clearpage\fi
+ \if@openleft\cleardoublepage\else
+ \if@openright\cleardoublepage\else\clearpage\fi\fi
\plainifnotempty % 元: \thispagestyle{plain}
\global\@topnum\z@
\if@english \@afterindentfalse \else \@afterindenttrue \fi
@@ -1157,7 +1187,7 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\@restonecolfalse\newpage
\fi
\thispagestyle{empty}%
- \setcounter{page}\@ne
+ \ifodd\c@page\setcounter{page}\@ne\else\setcounter{page}\z@\fi
}%
{\if@restonecol\twocolumn \else \newpage \fi
\if@twoside\else
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls
index 9fcf3df716e..2d1fe3159f3 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjtarticle}
- [2017/02/20 v1.7d-ltj-14
+ [2017/03/06 v1.7e-ltj-14
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@ -88,8 +88,8 @@
\tombowtrue \tombowdatetrue
\setlength{\@tombowwidth}{.1\p@}%
\@bannertoken{%
- \jobname\space:\space\number\year/\number\month/\number\day
- (\number\hour:\number\minute)}
+ \jobname\space(\number\year-\two@digits\month-\two@digits\day
+ \space\two@digits\hour:\two@digits\minute)}%
\maketombowbox}
\DeclareOption{tombo}{%
\tombowtrue \tombowdatefalse
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo
index 89ed288cd45..f49f8ee78c8 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtbk10.clo}
- [2017/02/20 v1.7d-ltj-14
+ [2017/03/06 v1.7e-ltj-14
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{17}%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo
index 8d72f842018..429d43b38f4 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtbk11.clo}
- [2017/02/20 v1.7d-ltj-14
+ [2017/03/06 v1.7e-ltj-14
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{17}%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo
index 9543641fbe6..e13784b1f99 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtbk12.clo}
- [2017/02/20 v1.7d-ltj-14
+ [2017/03/06 v1.7e-ltj-14
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{18}%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls
index 7ae6e197202..390f9fef63f 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjtbook}
- [2017/02/20 v1.7d-ltj-14
+ [2017/03/06 v1.7e-ltj-14
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@ -91,8 +91,8 @@
\tombowtrue \tombowdatetrue
\setlength{\@tombowwidth}{.1\p@}%
\@bannertoken{%
- \jobname\space:\space\number\year/\number\month/\number\day
- (\number\hour:\number\minute)}
+ \jobname\space(\number\year-\two@digits\month-\two@digits\day
+ \space\two@digits\hour:\two@digits\minute)}%
\maketombowbox}
\DeclareOption{tombo}{%
\tombowtrue \tombowdatefalse
@@ -462,12 +462,10 @@
\newcommand{\@chapapp}{\prechaptername}
\newcommand{\@chappos}{\postchaptername}
\newcommand{\frontmatter}{%
- \if@openleft \cleardoublepage \else
- \if@openright \cleardoublepage \else \clearpage \fi \fi
+ \pltx@cleartooddpage
\@mainmatterfalse\pagenumbering{roman}}
\newcommand{\mainmatter}{%
- \if@openleft \cleardoublepage \else
- \if@openright \cleardoublepage \else \clearpage \fi \fi
+ \pltx@cleartooddpage
\@mainmattertrue\pagenumbering{arabic}}
\newcommand{\backmatter}{%
\if@openleft \cleardoublepage \else
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls
index 2aaab6cd1a3..9feffd39538 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjtreport}
- [2017/02/20 v1.7d-ltj-14
+ [2017/03/06 v1.7e-ltj-14
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@ -90,8 +90,8 @@
\tombowtrue \tombowdatetrue
\setlength{\@tombowwidth}{.1\p@}%
\@bannertoken{%
- \jobname\space:\space\number\year/\number\month/\number\day
- (\number\hour:\number\minute)}
+ \jobname\space(\number\year-\two@digits\month-\two@digits\day
+ \space\two@digits\hour:\two@digits\minute)}%
\maketombowbox}
\DeclareOption{tombo}{%
\tombowtrue \tombowdatefalse
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo
index 41c2c73b550..353e8ef571d 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtsize10.clo}
- [2017/02/20 v1.7d-ltj-14
+ [2017/03/06 v1.7e-ltj-14
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{17}%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo
index fd34a3176c7..7adf09fb5b6 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtsize11.clo}
- [2017/02/20 v1.7d-ltj-14
+ [2017/03/06 v1.7e-ltj-14
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{17}%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo
index 0cbabf39348..d066298ca65 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtsize12.clo}
- [2017/02/20 v1.7d-ltj-14
+ [2017/03/06 v1.7e-ltj-14
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{18}%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty
index 9c49367fede..4b9a9c967db 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty
@@ -1,10 +1,9 @@
%
% lltjcore.sty: derived from plcore.dtx in pLaTeX.
-% This file does not include the code relating to "tategaki".
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjcore}[2017/02/19 Patch to LaTeX2e Kernel for LuaTeX-ja]
+\ProvidesPackage{lltjcore}[2017/03/12 Patch to LaTeX2e Kernel for LuaTeX-ja]
\def\cleardoublepage{\clearpage\if@twoside
\ifodd\c@page
@@ -105,6 +104,7 @@
\dimen\z@\textwidth \textwidth\textheight \textheight\dimen\z@
\fi
\let \protect \noexpand
+ \language\document@default@language %LaTeX2e 2017/05/01
\@resetactivechars
\global\let\@@if@newlist\if@newlist
\global\@newlistfalse
@@ -182,7 +182,7 @@
\@latex@warning{Reference `#3' on page \thepage \space
undefined}%
\else
- \expandafter#2#1\relax% change \null to \relax
+ \expandafter#2#1\relax{}% change \null to \relax
\fi}
\endgroup
\if@compatibility\else
@@ -190,12 +190,13 @@
\bgroup
\verb@eol@error \let\do\@makeother \dospecials
\verbatim@font\@noligs
+ \language\l@nohyphenation
\@ifstar\@sverb\@verb}
\fi
\gdef\@stopfield{\null\color@endgroup\egroup}
\newcount\hour
\newcount\minute
-%%% etoolbox is loaded by everyhook
+\RequirePackage{etoolbox}
\ifltj@everyhook@avail
\pretocmd{\footnote}{\inhibitglue}{}{}
\pretocmd{\footnotemark}{\inhibitglue}{}{}
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty
index 1fdef28c623..f55a93f0d52 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty
@@ -3,9 +3,10 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjfont}[2016/04/01 Patch to NFSS2 for LuaTeX-ja]
+\ProvidesPackage{lltjfont}[2017/04/01 Patch to NFSS2 for LuaTeX-ja]
\def\ltj@chardef@text@cmd#1{%
+ \let\@ifdefinable\@@ifdefinable%
\edef\ltj@chardef@text@cmd@name{\expandafter\@gobble\string#1}%
\afterassignment\ltj@chardef@text@cmd@\ltj@tempcnta
}
@@ -23,7 +24,11 @@
}
\ifdefined\UnicodeEncodingName
+ \let\ltj@temp@DeclareTextComposite=\DeclareTextComposite
+ \def\DeclareTextComposite#1#2#3#4{}%
\input{tuenc.def}
+ \let\DeclareTextComposite=\ltj@temp@DeclareTextComposite
+ \expandafter\patchcmd\csname TU\string\textasteriskcentered\endcsname{\char}{\ltjalchar}{}{}
\fi
@@ -50,21 +55,33 @@
\ifdefined\cHT\else\newdimen\cHT\fi
%\let\afont\font
+\let\ystrutbox\strutbox
\newbox\dstrutbox
\newbox\tstrutbox
\newbox\zstrutbox
+\def\strutbox{%
+ \ifnum\ltjgetparameter{direction}=1 \dstrutbox % dtou
+ \else\ifnum\ltjgetparameter{direction}=4 \ystrutbox % yoko
+ \else\tstrutbox % tate and utod
+ \fi\fi
+}
\def\strut{\relax
\ifnum\ltjgetparameter{direction}=1 % dtou
\ifmmode\copy\dstrutbox\else\unhcopy\dstrutbox\fi
\else\ifnum\ltjgetparameter{direction}=4 % yoko
- \ifmmode\copy\strutbox\else\unhcopy\strutbox\fi
+ \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi
\else % tate and utod
\ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi
\fi\fi
}
+
+\def\ystrut{\relax\hbox{\yoko
+ \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi}}
\def\tstrut{\relax\hbox{\tate
\ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi}}
-\def\zstrut{\relax\hbox{\tate
+\def\dstrut{\relax\hbox{\dtou
+ \ifmmode\copy\dstrutbox\else\unhcopy\dstrutbox\fi}}
+\def\zstrut{\relax\hbox{\utod
\ifmmode\copy\zstrutbox\else\unhcopy\zstrutbox\fi}}
{%
@@ -374,7 +391,7 @@
\baselineskip\f@linespread\baselineskip
\normalbaselineskip\baselineskip
\adjustbaseline
- \setbox\strutbox\hbox{\yoko
+ \setbox\ystrutbox\hbox{\yoko
\vrule\@width\z@
\@height.7\baselineskip \@depth.3\baselineskip}%
\setbox\dstrutbox\hbox{\dtou
@@ -383,7 +400,7 @@
\setbox\tstrutbox\hbox{\tate
\vrule\@width\z@
\@height.5\baselineskip \@depth.5\baselineskip}%
- \setbox\zstrutbox\hbox{\tate
+ \setbox\zstrutbox\hbox{\utod
\vrule\@width\z@
\@height.7\baselineskip \@depth.3\baselineskip}%
\let\size@update\relax}}
@@ -480,7 +497,7 @@
\csname D@\k@encoding\endcsname
\let\kenc@update\relax
\let\ck@encoding\k@encoding
- \edef\tmp@enc{'\luatexluaescapestring{\k@encoding}'}
+ \edef\tmp@enc{'\luatexluaescapestring{\k@encoding}'}%
\directlua{luatexja.jfont.is_kyenc(\tmp@enc)}\ifin@%
\let\cy@encoding\k@encoding
\else
@@ -595,9 +612,6 @@
}
\@onlypreamble\romanprocess@table
\@onlypreamble\kanjiprocess@table
-\DeclareTextCommandDefault{\textunderscore}{%
- \leavevmode\kern.06em
- \vbox{\hrule\@width.3em}}
%%%%%% LuaTeX-ja specific