texlive[45162] Master/texmf-dist: jlreq (29aug17)
commits+karl at tug.org
commits+karl at tug.org
Tue Aug 29 23:02:08 CEST 2017
Revision: 45162
http://tug.org/svn/texlive?view=revision&revision=45162
Author: karl
Date: 2017-08-29 23:02:07 +0200 (Tue, 29 Aug 2017)
Log Message:
-----------
jlreq (29aug17)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/jlreq/README-ja.md
trunk/Master/texmf-dist/doc/latex/jlreq/README.md
trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html
trunk/Master/texmf-dist/doc/latex/jlreq/jlreq.html
trunk/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreq-v.vf
trunk/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreq.vf
trunk/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreqg-v.vf
trunk/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreqg.vf
trunk/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreq-v.vf
trunk/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreq.vf
trunk/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreqg-v.vf
trunk/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreqg.vf
trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq-v.vf
trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq.vf
trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg-v.vf
trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg.vf
trunk/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreq-v.vf
trunk/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreq.vf
trunk/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreqg-v.vf
trunk/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreqg.vf
trunk/Master/texmf-dist/tex/latex/jlreq/jlreq.cls
trunk/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua
Modified: trunk/Master/texmf-dist/doc/latex/jlreq/README-ja.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/README-ja.md 2017-08-29 13:19:57 UTC (rev 45161)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/README-ja.md 2017-08-29 21:02:07 UTC (rev 45162)
@@ -280,6 +280,8 @@
- 傍注の長さのデフォルトを0とした．
- 傍注の長さが0の時には`\sidenote`を定義しないようにした．
- 和文間隔を挿入する命令を追加．
+* 2017-08-29
+ - 縦書きでも著者名が横書きで出てしまうバグを修正．
--------------
Noriyuki Abe
Modified: trunk/Master/texmf-dist/doc/latex/jlreq/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/README.md 2017-08-29 13:19:57 UTC (rev 45161)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/README.md 2017-08-29 21:02:07 UTC (rev 45162)
@@ -55,7 +55,9 @@
- 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
Modified: trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html 2017-08-29 13:19:57 UTC (rev 45161)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html 2017-08-29 21:02:07 UTC (rev 45162)
@@ -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 />
Modified: trunk/Master/texmf-dist/doc/latex/jlreq/jlreq.html
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/jlreq.html 2017-08-29 13:19:57 UTC (rev 45161)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/jlreq.html 2017-08-29 21:02:07 UTC (rev 45162)
@@ -124,8 +124,12 @@
<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 />
<p>Noriyuki Abe<br />
Modified: trunk/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreq-v.vf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreq.vf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreqg-v.vf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreqg.vf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreq-v.vf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreq.vf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreqg-v.vf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreqg.vf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq-v.vf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq.vf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg-v.vf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg.vf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreq-v.vf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreq.vf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreqg-v.vf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreqg.vf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/tex/latex/jlreq/jlreq.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/jlreq/jlreq.cls 2017-08-29 13:19:57 UTC (rev 45161)
+++ trunk/Master/texmf-dist/tex/latex/jlreq/jlreq.cls 2017-08-29 21:02:07 UTC (rev 45162)
@@ -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 at result
\newcommand*{\jlreq at 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 at aftercls@deletecslist
\jlreq at undefcs{\jlreq at aftercls@deletecslist}%
- \let\jlreq at undefcs=\@undefined
+ \undef{\jlreq at undefcs}%
}
\def\jlreq at uniqtoken{\jlreq at uniqtoken}
@@ -747,7 +745,7 @@
}
\fi
\newcount\jlreq at lastnodechar
-% \futurelet\jlreq at nextchar\jlreq at fixjfm の形で使う．
+% \jlreq at fixjfm<次の文字>の形で使う．
% jlreq at lastnodecharに入っている値と次のトークン（\futureletで得る）の間に入るJFMグルー等を挿入する
\newcommand*{\jlreq at fixjfm}{%
\ifnum\jlreq at lastnodechar>-1
@@ -1207,17 +1205,8 @@
% \item後の行頭括弧のために仕込み．
\jlreq at saveoriginalcs{list}
\jlreq at saveoriginalcs{endlist}
- \edef\jlreq at do{
- \unexpanded{\def\list#1#2}{%
- \unexpanded{\jlreq at pushhook@postpar{\directlua{luatexja.jfmglue.create_beginpar_node()}}}%
- \expandonce{\list{#1}{#2}}%
- }
- \unexpanded{\def\endlist}{%
- \expandonce{\endlist}%
- \noexpand\jlreq at pophook@postpar
- }
- }
- \jlreq at do
+ \pretocmd{\list}{\jlreq at pushhook@postpar{\directlua{luatexja.jfmglue.create_beginpar_node()}}}{}{}%
+ \apptocmd{\endlist}{\jlreq at pophook@postpar}
\else
% 非LuaTeXの場合はJFMの入れ替えと\everyparでの処理で対処．
% 行頭括弧に対して\inhibitglueを入れたりする命令を作る
@@ -1362,6 +1351,7 @@
\AtBeginDocument{\catcode` =\active}
\fi
+% \jaspace
\DeclareRobustCommand*{\jaspace}[1]{%
\expandafter\ifx\csname jlreq at jaspace@#1\endcsname\relax\ClassError{jlreq}{unknown jaspace: #1}{\@ehc}%
\else\csname jlreq at jaspace@#1\endcsname\fi
@@ -1422,13 +1412,7 @@
%.. 文字サイズ変更
\def\jlreq at setfontsizehook{}% set at fontsizeの最後に実行される．
\jlreq at saveoriginalcs{set at fontsize}
-\edef\jlreq at do{
- \unexpanded{\def\set at fontsize#1#2#3}{%
- \expandonce{\set at fontsize{#1}{#2}{#3}}%
- \noexpand\jlreq at setfontsizehook
- }
-}
-\jlreq at do
+\apptocmd{\set at fontsize}{\jlreq at setfontsizehook}{}{}
\appto\jlreq at setfontsizehook{\ifdim\parindent>0pt\setlength{\parindent}{1\zw}\fi}
\ifx l\jlreq at engine
\@tempskipa=\ltjgetparameter{kanjiskip}
@@ -1493,10 +1477,11 @@
\belowdisplayskip \abovedisplayskip}
% tsize10.cloの引数を，そのまま\jlreq at fontsize/\jlreq at baselineskipでスケーリングしているだけ．
\newcommand{\small}{%
- \@setfontsize\small{.9\jlreq at fontsize}{\dimexpr 11\jlreq at baselineskip/17\relax}%
- \abovedisplayskip .85\jlreq at fontsize \@plus.3\jlreq at fontsize \@minus.4\jlreq at fontsize
- \abovedisplayshortskip \z@ \@plus.2\jlreq at fontsize
- \belowdisplayshortskip .4\jlreq at fontsize \@plus.2\jlreq at fontsize \@minus.2\jlreq at fontsize
+ % jsarticleのもの
+ \@setfontsize\small{.9\jlreq at fontsize}{\dimexpr 13\jlreq at baselineskip/17\relax}%
+ \abovedisplayskip .9\jlreq at fontsize \@plus.3\jlreq at fontsize \@minus.4\jlreq at fontsize
+ \abovedisplayshortskip \z@ \@plus.3\jlreq at fontsize
+ \belowdisplayshortskip \abovedisplayshortskip
\belowdisplayskip \abovedisplayskip}
\newcommand{\scriptsize}{\@setfontsize\scriptsize{\dimexpr 7\jlreq at fontsize/10\relax}{\dimexpr 8\jlreq at baselineskip/17\relax}}
\newcommand{\tiny}{\@setfontsize\tiny{\dimexpr 5\jlreq at fontsize/10\relax}{\dimexpr 6\jlreq at baselineskip/17\relax}}
@@ -1922,6 +1907,7 @@
\expandafter\jlreq at tempa\expandafter{\jlreq at tempb}%
}%
\expandafter\jlreq at do\expandafter{\jlreq at startBlockHeading@totalformat}%
+ \ignorespaces
}
\def\jlreq at startBlockHeading@removecolumn#1:{#1}
@@ -2822,10 +2808,7 @@
% \theendnoteの出力を仕込む
\PushPostHook{par}{\jlreq at endnote@parhook}
-\edef\jlreq at do{
- \unexpanded{\def\jlreq at hook@beforeheadings#1}{\expandonce{\jlreq at hook@beforeheadings{#1}}\unexpanded{\jlreq at endnote@hook at beforeheadings{#1}}}
-}
-\jlreq at do
+\apptocmd{\jlreq at hook@beforeheadings}{\jlreq at endnote@hook at beforeheadings{#1}}{}{}
\jlreq at jlreqsetup@add{endnote_position}{
\def\jlreq at endnote@parhook{}
@@ -2861,12 +2844,7 @@
}
\ifjlreq at tempa
- \edef\jlreq at do{%
- \unexpanded{\def\jlreq at endnote@hook at beforeheadings##1}{\expandonce{\jlreq at endnote@hook at beforeheadings{##1}}%
- \noexpand\theendnotes
- }
- }
- \jlreq at do
+ \apptocmd{\jlreq at endnote@hook at beforeheadings}{\theendnotes}{}{}
\else
\@for\@tempa:=\jlreq at tempc\do{
\ifx\@tempa\@empty\else
@@ -2946,9 +2924,9 @@
\fi
\def\@makesidemark{\@makefnmark}
}{% sidenote_type = symbol
- \def\sidenote{\jlreq at sidenote}
- \def\sidenotemark{\jlreq at sidenotemark}
- \def\sidenotetext{\jlreq at sidenotetext}
+ \long\def\sidenote#1#2{\jlreq at sidenote{#1}{#2}}
+ \def\sidenotemark#1{\jlreq at sidenotemark{#1}}
+ \long\def\sidenotetext#1#2{\jlreq at sidenotetext{#1}{#2}}
\long\def\jlreq at sidenote#1#2{\jlreq at sidenotemark{#1}\jlreq at sidenotetext{#1}{#2}}
\edef\jlreq at sidenotemark#1{%
{\unexpanded{\reset at font\jlreq at sidenote@keywordfont}#1}%
@@ -2966,18 +2944,8 @@
\long\def\@makesidetext#1{{\sffamily\bfseries\csname\jlreq at sidenotemarkname\endcsname}\hspace*{1\jlreq at mol}#1}
\def\@makesidemark{\@makefnmark}
- \edef\jlreq at do{
- % \jlreq at lastnodecharの仕込みはすんでいる
- \unexpanded{\long\def\sidenote#1#2}{%
- \expandonce{\sidenote{#1}{#2}}%
- \noexpand\jlreq at hook@postnote
- }
- \unexpanded{\long\def\sidenotemark#1}{%
- \expandonce{\sidenotemark{#1}}%
- \noexpand\jlreq at hook@postnote
- }
- }
- \jlreq at do
+ \apptocmd{\sidenote}{\jlreq at hook@postnote}{}{}
+ \apptocmd{\sidenotemark}{\jlreq at hook@postnote}{}{}
}
}
\jlreq at jlreqsetup@add{sidenote_symbol}{\def\jlreq at sidenote@defaultmark{#1}}
@@ -3759,6 +3727,11 @@
\vskip\baselineskip%
{\Large
\lineskip .75em%
+ % 縦書き時には表組み内でも縦書きにするようにする
+ \if at tate
+ \let\jlreq at temporary@original at ialign=\ialign
+ \pretocmd{\ialign}{\unexpanded{\tate\let\ialign=\jlreq at temporary@original at ialign}}{}{}%
+ \fi
\begin{tabular}[t]{c}%
\@author
\end{tabular}\par}%
@@ -3823,6 +3796,11 @@
\vskip\baselineskip
{\jlreq at keepbaselineskip{\large}%
\lineskip .5\jlreq at gol
+ % 縦書き時には表組み内でも縦書きにするようにする
+ \if at tate
+ \let\jlreq at temporary@original at ialign=\ialign
+ \pretocmd{\ialign}{\unexpanded{\tate\let\ialign=\jlreq at temporary@original at ialign}}{}{}%
+ \fi
\begin{tabular}[t]{c}%
\@author
\end{tabular}%
@@ -4240,6 +4218,7 @@
}{%
\if at restonecol\onecolumn\else\clearpage\fi
\ifjlreq at resttate\tate\fi
+ \jlreq at oldfontcommand@disable
}
\newcommand{\@idxitem}{\par\hangindent 4\jlreq at mol}
\newcommand{\subitem}{\@idxitem \hspace*{2\jlreq at mol}}
Modified: trunk/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua 2017-08-29 13:19:57 UTC (rev 45161)
+++ trunk/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua 2017-08-29 21:02:07 UTC (rev 45162)
@@ -191,14 +191,14 @@
-- [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 @@
-- [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 @@
-- [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 @@
-- [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 @@
-- [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 @@
[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 @@
[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 @@
[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 @@
[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 @@
[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 @@
[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 @@
[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 @@
[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 @@
[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}},
More information about the tex-live-commits
mailing list