diff options
| author | Karl Berry <karl@freefriends.org> | 2017-08-29 21:02:07 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2017-08-29 21:02:07 +0000 |
| commit | 3de87825b7a5cd47065c0c4522b0d355fd6607d8 (patch) | |
| tree | 876c8433bf1213d869b72b0f36016fa2ee2ec14d | |
| parent | 9be802636efdf9737227f59f80216b3cd1b2cd82 (diff) | |
jlreq (29aug17)
git-svn-id: svn://tug.org/texlive/trunk@45162 c570f23f-e606-0410-a88d-b1316a301751
22 files changed, 126 insertions, 135 deletions
diff --git a/Master/texmf-dist/doc/latex/jlreq/README-ja.md b/Master/texmf-dist/doc/latex/jlreq/README-ja.md index bab36c2d67f..647ccadee06 100644 --- a/Master/texmf-dist/doc/latex/jlreq/README-ja.md +++ b/Master/texmf-dist/doc/latex/jlreq/README-ja.md @@ -280,6 +280,8 @@ - 傍注の長さのデフォルトを0とした．
- 傍注の長さが0の時には`\sidenote`を定義しないようにした．
- 和文間隔を挿入する命令を追加．
+* 2017-08-29
+ - 縦書きでも著者名が横書きで出てしまうバグを修正．
--------------
Noriyuki Abe
diff --git a/Master/texmf-dist/doc/latex/jlreq/README.md b/Master/texmf-dist/doc/latex/jlreq/README.md index 43cde89cb40..7ae4488300e 100644 --- a/Master/texmf-dist/doc/latex/jlreq/README.md +++ b/Master/texmf-dist/doc/latex/jlreq/README.md @@ -55,7 +55,9 @@ This package is distributed under the BSD 2-Clause License. See [LICENSE](LICENS - Sidenotes are a part of the main text now.
- Changed the default length of sidenotes to 0.
- jlreq does not define `\sidenote` if the length for sidenotes is zero.
- - Added a command for full-width ideographic space.
+ - Added a command for the full-width ideographic space.
+* 2017-08-29
+ - Fixed a bug.
--------------
Noriyuki Abe
diff --git a/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html b/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html index 1e36edb5b7d..2712839f8ec 100644 --- a/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html +++ b/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html @@ -357,6 +357,10 @@ <li>傍注の長さが0の時には<code>\sidenote</code>を定義しないようにした．</li>
<li>和文間隔を挿入する命令を追加．</li>
</ul></li>
+<li>2017-08-29
+<ul>
+<li>縦書きでも著者名が横書きで出てしまうバグを修正．</li>
+</ul></li>
</ul>
<hr />
<p>Noriyuki Abe<br />
diff --git a/Master/texmf-dist/doc/latex/jlreq/jlreq.html b/Master/texmf-dist/doc/latex/jlreq/jlreq.html index 001df0595a5..558a7971516 100644 --- a/Master/texmf-dist/doc/latex/jlreq/jlreq.html +++ b/Master/texmf-dist/doc/latex/jlreq/jlreq.html @@ -124,7 +124,11 @@ <li>Sidenotes are a part of the main text now.</li>
<li>Changed the default length of sidenotes to 0.</li>
<li>jlreq does not define <code>\sidenote</code> if the length for sidenotes is zero.</li>
-<li>Added a command for full-width ideographic space.</li>
+<li>Added a command for the full-width ideographic space.</li>
+</ul></li>
+<li>2017-08-29
+<ul>
+<li>Fixed a bug.</li>
</ul></li>
</ul>
<hr />
diff --git a/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreq-v.vf b/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreq-v.vf Binary files differindex 1ba50ef4e56..3eccfa41d2d 100644 --- a/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreq-v.vf +++ b/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreq-v.vf diff --git a/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreq.vf b/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreq.vf Binary files differindex 6da1c14f4e3..2a747d15f16 100644 --- a/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreq.vf +++ b/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreq.vf diff --git a/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreqg-v.vf b/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreqg-v.vf Binary files differindex 1c30b0f4d7c..fcf5e3f7161 100644 --- a/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreqg-v.vf +++ b/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreqg-v.vf diff --git a/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreqg.vf b/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreqg.vf Binary files differindex 0bcba4a1586..866a8d86227 100644 --- a/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreqg.vf +++ b/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreqg.vf diff --git a/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreq-v.vf b/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreq-v.vf Binary files differindex 9a2cf9efbb4..4833bb40eb8 100644 --- a/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreq-v.vf +++ b/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreq-v.vf diff --git a/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreq.vf b/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreq.vf Binary files differindex 72c4f43e6b0..9711e902154 100644 --- a/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreq.vf +++ b/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreq.vf diff --git a/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreqg-v.vf b/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreqg-v.vf Binary files differindex ea7f8ee47fc..17a7b6fa0f1 100644 --- a/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreqg-v.vf +++ b/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreqg-v.vf diff --git a/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreqg.vf b/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreqg.vf Binary files differindex 3ed6ab66f67..e560a12ac58 100644 --- a/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreqg.vf +++ b/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreqg.vf diff --git a/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq-v.vf b/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq-v.vf Binary files differindex 1605cd28330..ed7dfa7882b 100644 --- a/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq-v.vf +++ b/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq-v.vf diff --git a/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq.vf b/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq.vf Binary files differindex 2a5299981a6..79cc5d76977 100644 --- a/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq.vf +++ b/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq.vf diff --git a/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg-v.vf b/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg-v.vf Binary files differindex 48817e4351e..f67da783314 100644 --- a/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg-v.vf +++ b/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg-v.vf diff --git a/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg.vf b/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg.vf Binary files differindex 9fae2863913..07d1296e530 100644 --- a/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg.vf +++ b/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg.vf diff --git a/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreq-v.vf b/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreq-v.vf Binary files differindex c7fcfa97b39..e4c78fe6bc7 100644 --- a/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreq-v.vf +++ b/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreq-v.vf diff --git a/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreq.vf b/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreq.vf Binary files differindex a5affae98e3..b6bd76bb5d7 100644 --- a/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreq.vf +++ b/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreq.vf diff --git a/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreqg-v.vf b/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreqg-v.vf Binary files differindex 8814fc7b212..15f6e6181a5 100644 --- a/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreqg-v.vf +++ b/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreqg-v.vf diff --git a/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreqg.vf b/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreqg.vf Binary files differindex 4f0eb9e67fc..260a0d805a9 100644 --- a/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreqg.vf +++ b/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreqg.vf diff --git a/Master/texmf-dist/tex/latex/jlreq/jlreq.cls b/Master/texmf-dist/tex/latex/jlreq/jlreq.cls index 5a62b68228e..9ea6a9bf3ec 100644 --- a/Master/texmf-dist/tex/latex/jlreq/jlreq.cls +++ b/Master/texmf-dist/tex/latex/jlreq/jlreq.cls @@ -5,7 +5,7 @@ %%
% (based on JLReq 20120403 https://www.w3.org/TR/2012/NOTE-jlreq-20120403/ja/)
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{jlreq}[2017/08/13 jlreq]
+\ProvidesClass{jlreq}[2017/08/29 jlreq]
\RequirePackage{xkeyval,everyhook,filehook,etoolbox,ifthen}
%. helper1
@@ -31,9 +31,7 @@ \newif\ifjlreq@result
\newcommand*{\jlreq@undefcs}[1]{%
- \expandafter\ifx\csname\expandafter\@gobble\string #1\endcsname\relax\expandafter\@firstofone\else\expandafter\@gobble\fi
- {\ClassError{jlreq}{Trying to delete \string#1\space even though it is not defined, maybe a bug}{\@ehc}}%
- \let#1=\@undefined
+ \ifundef{#1}{\ClassError{jlreq}{Trying to delete \string#1\space even though it is not defined, maybe a bug}{\@ehc}}{\undef{#1}}%
}
% クラスファイル内でしか使わないマクロをクラスファイル終了時に未定義にする
@@ -54,7 +52,7 @@ \AtEndOfClass{%
\jlreq@aftercls@deletecslist
\jlreq@undefcs{\jlreq@aftercls@deletecslist}%
- \let\jlreq@undefcs=\@undefined
+ \undef{\jlreq@undefcs}%
}
\def\jlreq@uniqtoken{\jlreq@uniqtoken}
@@ -747,7 +745,7 @@ }
\fi
\newcount\jlreq@lastnodechar
-% \futurelet\jlreq@nextchar\jlreq@fixjfm の形で使う．
+% \jlreq@fixjfm<次の文字>の形で使う．
% jlreq@lastnodecharに入っている値と次のトークン（\futureletで得る）の間に入るJFMグルー等を挿入する
\newcommand*{\jlreq@fixjfm}{%
\ifnum\jlreq@lastnodechar>-1
@@ -1207,17 +1205,8 @@ % \item後の行頭括弧のために仕込み．
\jlreq@saveoriginalcs{list}
\jlreq@saveoriginalcs{endlist}
- \edef\jlreq@do{
- \unexpanded{\def\list#1#2}{%
- \unexpanded{\jlreq@pushhook@postpar{\directlua{luatexja.jfmglue.create_beginpar_node()}}}%
- \expandonce{\list{#1}{#2}}%
- }
- \unexpanded{\def\endlist}{%
- \expandonce{\endlist}%
- \noexpand\jlreq@pophook@postpar
- }
- }
- \jlreq@do
+ \pretocmd{\list}{\jlreq@pushhook@postpar{\directlua{luatexja.jfmglue.create_beginpar_node()}}}{}{}%
+ \apptocmd{\endlist}{\jlreq@pophook@postpar}
\else
% 非LuaTeXの場合はJFMの入れ替えと\everyparでの処理で対処．
% 行頭括弧に対して\inhibitglueを入れたりする命令を作る
@@ -1362,6 +1351,7 @@ \AtBeginDocument{\catcode` =\active}
\fi
+% \jaspace
\DeclareRobustCommand*{\jaspace}[1]{%
\expandafter\ifx\csname jlreq@jaspace@#1\endcsname\relax\ClassError{jlreq}{unknown jaspace: #1}{\@ehc}%
\else\csname jlreq@jaspace@#1\endcsname\fi
@@ -1422,13 +1412,7 @@ %.. 文字サイズ変更
\def\jlreq@setfontsizehook{}% set@fontsizeの最後に実行される．
\jlreq@saveoriginalcs{set@fontsize}
-\edef\jlreq@do{
- \unexpanded{\def\set@fontsize#1#2#3}{%
- \expandonce{\set@fontsize{#1}{#2}{#3}}%
- \noexpand\jlreq@setfontsizehook
- }
-}
-\jlreq@do
+\apptocmd{\set@fontsize}{\jlreq@setfontsizehook}{}{}
\appto\jlreq@setfontsizehook{\ifdim\parindent>0pt\setlength{\parindent}{1\zw}\fi}
\ifx l\jlreq@engine
\@tempskipa=\ltjgetparameter{kanjiskip}
@@ -1493,10 +1477,11 @@ \belowdisplayskip \abovedisplayskip}
% tsize10.cloの引数を，そのまま\jlreq@fontsize/\jlreq@baselineskipでスケーリングしているだけ．
\newcommand{\small}{%
- \@setfontsize\small{.9\jlreq@fontsize}{\dimexpr 11\jlreq@baselineskip/17\relax}%
- \abovedisplayskip .85\jlreq@fontsize \@plus.3\jlreq@fontsize \@minus.4\jlreq@fontsize
- \abovedisplayshortskip \z@ \@plus.2\jlreq@fontsize
- \belowdisplayshortskip .4\jlreq@fontsize \@plus.2\jlreq@fontsize \@minus.2\jlreq@fontsize
+ % jsarticleのもの
+ \@setfontsize\small{.9\jlreq@fontsize}{\dimexpr 13\jlreq@baselineskip/17\relax}%
+ \abovedisplayskip .9\jlreq@fontsize \@plus.3\jlreq@fontsize \@minus.4\jlreq@fontsize
+ \abovedisplayshortskip \z@ \@plus.3\jlreq@fontsize
+ \belowdisplayshortskip \abovedisplayshortskip
\belowdisplayskip \abovedisplayskip}
\newcommand{\scriptsize}{\@setfontsize\scriptsize{\dimexpr 7\jlreq@fontsize/10\relax}{\dimexpr 8\jlreq@baselineskip/17\relax}}
\newcommand{\tiny}{\@setfontsize\tiny{\dimexpr 5\jlreq@fontsize/10\relax}{\dimexpr 6\jlreq@baselineskip/17\relax}}
@@ -1922,6 +1907,7 @@ \expandafter\jlreq@tempa\expandafter{\jlreq@tempb}%
}%
\expandafter\jlreq@do\expandafter{\jlreq@startBlockHeading@totalformat}%
+ \ignorespaces
}
\def\jlreq@startBlockHeading@removecolumn#1:{#1}
@@ -2822,10 +2808,7 @@ % \theendnoteの出力を仕込む
\PushPostHook{par}{\jlreq@endnote@parhook}
-\edef\jlreq@do{
- \unexpanded{\def\jlreq@hook@beforeheadings#1}{\expandonce{\jlreq@hook@beforeheadings{#1}}\unexpanded{\jlreq@endnote@hook@beforeheadings{#1}}}
-}
-\jlreq@do
+\apptocmd{\jlreq@hook@beforeheadings}{\jlreq@endnote@hook@beforeheadings{#1}}{}{}
\jlreq@jlreqsetup@add{endnote_position}{
\def\jlreq@endnote@parhook{}
@@ -2861,12 +2844,7 @@ }
\ifjlreq@tempa
- \edef\jlreq@do{%
- \unexpanded{\def\jlreq@endnote@hook@beforeheadings##1}{\expandonce{\jlreq@endnote@hook@beforeheadings{##1}}%
- \noexpand\theendnotes
- }
- }
- \jlreq@do
+ \apptocmd{\jlreq@endnote@hook@beforeheadings}{\theendnotes}{}{}
\else
\@for\@tempa:=\jlreq@tempc\do{
\ifx\@tempa\@empty\else
@@ -2946,9 +2924,9 @@ \fi
\def\@makesidemark{\@makefnmark}
}{% sidenote_type = symbol
- \def\sidenote{\jlreq@sidenote}
- \def\sidenotemark{\jlreq@sidenotemark}
- \def\sidenotetext{\jlreq@sidenotetext}
+ \long\def\sidenote#1#2{\jlreq@sidenote{#1}{#2}}
+ \def\sidenotemark#1{\jlreq@sidenotemark{#1}}
+ \long\def\sidenotetext#1#2{\jlreq@sidenotetext{#1}{#2}}
\long\def\jlreq@sidenote#1#2{\jlreq@sidenotemark{#1}\jlreq@sidenotetext{#1}{#2}}
\edef\jlreq@sidenotemark#1{%
{\unexpanded{\reset@font\jlreq@sidenote@keywordfont}#1}%
@@ -2966,18 +2944,8 @@ \long\def\@makesidetext#1{{\sffamily\bfseries\csname\jlreq@sidenotemarkname\endcsname}\hspace*{1\jlreq@mol}#1}
\def\@makesidemark{\@makefnmark}
- \edef\jlreq@do{
- % \jlreq@lastnodecharの仕込みはすんでいる
- \unexpanded{\long\def\sidenote#1#2}{%
- \expandonce{\sidenote{#1}{#2}}%
- \noexpand\jlreq@hook@postnote
- }
- \unexpanded{\long\def\sidenotemark#1}{%
- \expandonce{\sidenotemark{#1}}%
- \noexpand\jlreq@hook@postnote
- }
- }
- \jlreq@do
+ \apptocmd{\sidenote}{\jlreq@hook@postnote}{}{}
+ \apptocmd{\sidenotemark}{\jlreq@hook@postnote}{}{}
}
}
\jlreq@jlreqsetup@add{sidenote_symbol}{\def\jlreq@sidenote@defaultmark{#1}}
@@ -3759,6 +3727,11 @@ \vskip\baselineskip%
{\Large
\lineskip .75em%
+ % 縦書き時には表組み内でも縦書きにするようにする
+ \if@tate
+ \let\jlreq@temporary@original@ialign=\ialign
+ \pretocmd{\ialign}{\unexpanded{\tate\let\ialign=\jlreq@temporary@original@ialign}}{}{}%
+ \fi
\begin{tabular}[t]{c}%
\@author
\end{tabular}\par}%
@@ -3823,6 +3796,11 @@ \vskip\baselineskip
{\jlreq@keepbaselineskip{\large}%
\lineskip .5\jlreq@gol
+ % 縦書き時には表組み内でも縦書きにするようにする
+ \if@tate
+ \let\jlreq@temporary@original@ialign=\ialign
+ \pretocmd{\ialign}{\unexpanded{\tate\let\ialign=\jlreq@temporary@original@ialign}}{}{}%
+ \fi
\begin{tabular}[t]{c}%
\@author
\end{tabular}%
@@ -4240,6 +4218,7 @@ }{%
\if@restonecol\onecolumn\else\clearpage\fi
\ifjlreq@resttate\tate\fi
+ \jlreq@oldfontcommand@disable
}
\newcommand{\@idxitem}{\par\hangindent 4\jlreq@mol}
\newcommand{\subitem}{\@idxitem \hspace*{2\jlreq@mol}}
diff --git a/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua b/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua index 94631f29ac6..38e22d00526 100644 --- a/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua +++ b/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua @@ -191,14 +191,14 @@ local jfm = { -- [0] = {0, 0, 0},
--[[
[20] = {0, 0, 0},
- [21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空けpriority = {0,-1}段階
+ [21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
[22] = {0, 0, 0},
[23] = {0, 0, 0},
- [24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空けpriority = {0,-1}段階
- [25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空けpriority = {0,-1}段階
+ [24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
+ [25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
[26] = {0, 0, 0},
]]
--- [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空けpriority = {0,-1}段階
+-- [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
--[[
[28] = {0, 0, 0},
[29] = {0, 0, 0},
@@ -407,14 +407,14 @@ local jfm = { -- [16] = {0, 0.25, 0, priority = {0,0}},
--[[
[20] = {0, 0, 0},
- [21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = {0,-1}段階
+ [21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
[22] = {0, 0.25, 0, priority = {0,0}},
[23] = {0, 0.25, 0, priority = {0,0}},
- [24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = {0,-1}段階
- [25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = {0,-1}段階
+ [24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
+ [25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
[26] = {0, 0, 0},
]]
- [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = {0,-1}段階
+ [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
--[[
[28] = {0, 0.25, 0, priority = {0,0}},
[29] = {0, 0, 0},
@@ -448,14 +448,14 @@ local jfm = { -- [16] = {0, 0.25, 0, priority = {0,0}},
--[[
[20] = {0, 0, 0},
- [21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = {0,-1}段階
+ [21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
[22] = {0, 0.25, 0, priority = {0,0}},
[23] = {0, 0.25, 0, priority = {0,0}},
- [24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = {0,-1}段階
- [25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = {0,-1}段階
+ [24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
+ [25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
[26] = {0, 0, 0},
]]
- [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = {0,-1}段階
+ [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
--[[
[28] = {0, 0.25, 0, priority = {0,0}},
[29] = {0, 0, 0},
@@ -656,14 +656,14 @@ local jfm = { -- [16] = {0, 0.25, 0, priority = {0,0}},
--[[
[20] = {0, 0, 0},
- [21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = {0,-1}段階
+ [21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
[22] = {0, 0.25, 0, priority = {0,0}},
[23] = {0, 0.25, 0, priority = {0,0}},
- [24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = {0,-1}段階
- [25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = {0,-1}段階
+ [24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
+ [25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
[26] = {0, 0, 0},
]]
- [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = {0,-1}段階
+ [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
--[[
[28] = {0, 0.25, 0, priority = {0,0}},
[29] = {0, 0, 0},
@@ -697,14 +697,14 @@ local jfm = { -- [16] = {0, 0.25, 0, priority = {0,0}},
--[[
[20] = {0, 0, 0},
- [21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = {0,-1}段階
+ [21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
[22] = {0, 0.25, 0, priority = {0,0}},
[23] = {0, 0.25, 0, priority = {0,0}},
- [24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = {0,-1}段階
- [25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = {0,-1}段階
+ [24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
+ [25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
[26] = {0, 0, 0},
]]
- [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = {0,-1}段階
+ [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
--[[
[28] = {0, 0.25, 0, priority = {0,0}},
[29] = {0, 0, 0},
@@ -748,14 +748,14 @@ local jfm = { [14] = {0, 0, 0},
--[[
[20] = {0, 0, 0},
- [21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = {0,-1}段階
+ [21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
[22] = {0, 0.25, 0, priority = {0,0}},
[23] = {0, 0.25, 0, priority = {0,0}},
- [24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = {0,-1}段階
- [25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = {0,-1}段階
+ [24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
+ [25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
[26] = {0, 0, 0},
]]
--- [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = {0,-1}段階
+-- [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
--[[
[28] = {0, 0.25, 0, priority = {0,0}},
[29] = {0, 0, 0},
@@ -813,26 +813,26 @@ local jfm = { [6] = {0, 0, 0},
[7] = {0, 0, 0},
[8] = {0, 0.25, 0, priority = {0,0}},
- [9] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, -- 空け priority = 二段階
- [10] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, -- 空け priority = 二段階
- [11] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, -- 空け priority = 二段階
+ [9] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
+ [10] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
+ [11] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
[12] = {0, 0.25, 0, priority = {0,0}},
[13] = {0, 0.25, 0, priority = {0,0}},
[14] = {0, 0, 0},
- [15] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, -- 空け priority = 二段階
- [16] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, -- 空け priority = 二段階
- [0] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, -- 空け priority = 二段階
+ [15] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
+ [16] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
+ [0] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
[20] = {0, 0, 0},
[21] = {0, 0, 0},-- 注9，空け注5
- [22] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, -- 空け priority = 二段階
- [23] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, -- 空け priority = 二段階
+ [22] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
+ [23] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
[24] = {0, 0.25, 0, priority = {0,0}},
[25] = {0, 0.25, 0, priority = {0,0}},
[26] = {0, 0, 0},
[27] = {0, 0.25, 0, priority = {0,0}},
- [28] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = 三段階，表6と表3が整合的でない
+ [28] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},表6と表3が整合的でない
[29] = {0, 0, 0},
- [30] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階
+ [30] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
},
},
@@ -858,13 +858,13 @@ local jfm = { [16] = {0, 0.25, 0, priority = {0,0}},
[0] = {0, 0.25, 0, priority = {0,0}},
[20] = {0, 0, 0},
- [21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = 二段階
+ [21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
[22] = {0, 0.25, 0, priority = {0,0}}, -- 空け注10
[23] = {0, 0.25, 0, priority = {0,0}},
- [24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = 二段階
- [25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = 二段階
+ [24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
+ [25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
[26] = {0, 0, 0},
- [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = 二段階
+ [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
[28] = {0, 0.25, 0, priority = {0,0}},
[29] = {0, 0, 0},
[30] = {0, 0.25, 0, priority = {0,0}},
@@ -893,13 +893,13 @@ local jfm = { [16] = {0, 0.25, 0, priority = {0,0}},
[0] = {0, 0.25, 0, priority = {0,0}},
[20] = {0, 0, 0},
- [21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = 二段階
+ [21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
[22] = {0, 0.25, 0, priority = {0,0}},
[23] = {0, 0.25, 0, priority = {0,0}},-- 空け注7
- [24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = 二段階
- [25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = 二段階
+ [24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
+ [25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
[26] = {0, 0, 0},
- [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = 二段階
+ [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
[28] = {0, 0.25, 0, priority = {0,0}},
[29] = {0, 0, 0},
[30] = {0, 0.25, 0, priority = {0,0}},
@@ -919,26 +919,26 @@ local jfm = { [6] = {0, 0, 0},
[7] = {0, 0, 0},
[8] = {0, 0.25, 0, priority = {0,0}},
- [9] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階
- [10] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階
- [11] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階
+ [9] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
+ [10] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
+ [11] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
[12] = {0, 0.25, 0, priority = {0,0}},
[13] = {0, 0, 0},-- 空け注8
[14] = {0, 0, 0},
- [15] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階
- [16] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階
- [0] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階
+ [15] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
+ [16] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
+ [0] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
[20] = {0, 0, 0},
[21] = {0, 0.25, 0, priority = {0,0}},
- [22] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階
- [23] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階
+ [22] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
+ [23] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
[24] = {0, 0, 0},
[25] = {0.25, 0, 0, ratio = 0},
[26] = {0, 0, 0},
[27] = {0, 0, 0},-- 空け注9
- [28] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = 二段階
+ [28] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
[29] = {0, 0, 0},
- [30] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階
+ [30] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
}
},
@@ -955,26 +955,26 @@ local jfm = { [6] = {0, 0, 0},
[7] = {0, 0, 0},
[8] = {0, 0.25, 0, priority = {0,0}},
- [9] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階
- [10] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階
- [11] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階
+ [9] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
+ [10] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
+ [11] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
[12] = {0, 0.25, 0, priority = {0,0}},
[13] = {0, 0.25, 0, priority = {0,0}},
[14] = {0, 0, 0},
- [15] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階
- [16] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階
- [0] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階
+ [15] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
+ [16] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
+ [0] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
[20] = {0, 0, 0},
[21] = {0, 0.25, 0, priority = {0,0}},
- [22] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階
- [23] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階
+ [22] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
+ [23] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
[24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
[25] = {0, 0, 0},
[26] = {0, 0, 0},
[27] = {0, 0, 0},
- [28] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = 二段階
+ [28] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
[29] = {0, 0, 0},
- [30] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階
+ [30] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
}
},
@@ -1024,26 +1024,26 @@ local jfm = { [6] = {0, 0, 0},
[7] = {0, 0, 0},
[8] = {0, 0.25, 0, priority = {0,0}},
- [9] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階
- [10] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階
- [11] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階
+ [9] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
+ [10] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
+ [11] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
[12] = {0, 0.25, 0, priority = {0,0}},
[13] = {0, 0.25, 0, priority = {0,0}},-- 空け注10
[14] = {0, 0, 0},
- [15] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階
- [16] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階
- [0] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階
+ [15] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
+ [16] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
+ [0] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
[20] = {0, 0, 0},
[21] = {0, 0.25, 0, priority = {0,0}},
- [22] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階
- [23] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階
+ [22] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
+ [23] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
[24] = {0, 0, 0},
[25] = {0.25, 0, 0.125, ratio = 0, priority = {0,-1}},
[26] = {0, 0, 0},
[27] = {0, 0, 0},
- [28] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = 二段階
+ [28] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
[29] = {0, 0, 0},
- [30] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = 二段階
+ [30] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
}
},
@@ -1102,13 +1102,13 @@ local jfm = { [16] = {0, 0.25, 0, priority = {0,0}},
[0] = {0, 0.25, 0, priority = {0,0}},
[20] = {0, 0, 0},
- [21] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階
+ [21] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
[22] = {0, 0.25, 0, priority = {0,0}},
[23] = {0, 0.25, 0, priority = {0,0}},
- [24] = {0.25, 0.25, 0.125, ratio = 1}, priority = {1,-3},-- 空け priority = 二段階
- [25] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階
+ [24] = {0.25, 0.25, 0.125, ratio = 1}, priority = {1,-3},
+ [25] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
[26] = {0, 0, 0},
- [27] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階
+ [27] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
[28] = {0, 0.25, 0, priority = {0,0}},
[29] = {0, 0, 0},
[30] = {0, 0.25, 0, priority = {0,0}},
@@ -1135,13 +1135,13 @@ local jfm = { [16] = {0, 0.25, 0, priority = {0,0}},
[0] = {0, 0.25, 0, priority = {0,0}},
[20] = {0, 0, 0},
- [21] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階
+ [21] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
[22] = {0, 0.25, 0, priority = {0,0}},
[23] = {0, 0.25, 0, priority = {0,0}},
- [24] = {0.25, 0.25, 0.125, ratio = 1}, priority = {1,-3},-- 空け priority = 二段階
- [25] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階
+ [24] = {0.25, 0.25, 0.125, ratio = 1}, priority = {1,-3},
+ [25] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
[26] = {0, 0, 0},
- [27] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},-- 空け priority = 二段階
+ [27] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
[28] = {0, 0.25, 0, priority = {0,0}},
[29] = {0, 0, 0},
[30] = {0, 0.25, 0, priority = {0,0}},
|