texlive[44563] Master/texmf-dist: jlreq (11jun17)
commits+karl at tug.org
commits+karl at tug.org
Sun Jun 11 23:48:10 CEST 2017
Revision: 44563
http://tug.org/svn/texlive?view=revision&revision=44563
Author: karl
Date: 2017-06-11 23:48:10 +0200 (Sun, 11 Jun 2017)
Log Message:
-----------
jlreq (11jun17)
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/tfm/public/jlreq/bjlreq-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/bjlreq.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/bjlreqg-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/bjlreqg.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/bzjlreq-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/bzjlreq.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/bzjlreqg-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/bzjlreqg.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/jlreq-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/jlreq.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/jlreqg-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/jlreqg.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ubjlreq-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ubjlreq.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ubjlreqg-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ubjlreqg.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ubzjlreq-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ubzjlreq.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ubzjlreqg-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ubzjlreqg.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreq-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreq.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreqg-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreqg.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/uzjlreq-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/uzjlreq.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/uzjlreqg-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/uzjlreqg.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/zjlreq-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/zjlreq.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/zjlreqg-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/zjlreqg.tfm
trunk/Master/texmf-dist/tex/latex/jlreq/jlreq.cls
trunk/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua
trunk/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreqv.lua
Modified: trunk/Master/texmf-dist/doc/latex/jlreq/README-ja.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/README-ja.md 2017-06-11 21:45:58 UTC (rev 44562)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/README-ja.md 2017-06-11 21:48:10 UTC (rev 44563)
@@ -31,6 +31,9 @@
標準的な文書クラスと同じように中身を書くことができますが，次のような命令が追加 / 拡張されています．
+### `\jlreqsetup`
+設定用命令です．プリアンブルでしか使えません．文書に対する設定は，クラスオプションとして行うか`\jlreqsetup`を通じて行うかします．どちらで設定するかは設定項目によります．
+
### `\section`
`\section*[running head]{見出し文字列}[副題]`というように，通常の書式に加えて副題を受け付けられるように拡張されています．その他，`\part`（articleのみ），`\chapter`（book/reportのみ），`\subsection`，`\subsubsection`も副題を受け付けます．
@@ -38,7 +41,7 @@
プリアンブルにもかけるようになっています．プリアンブルに書かれた場合は，`\maketitle`とともに出力されます．二段組の場合は，段組にならず概要を出力することができます．
### `\sidenote`
-傍注（縦組みの場合は脚注）を出力します．デフォルトでは`\footnote`と同様の書式となりますが，クラスオプションに`sidenote_type=symbol`が指定されている場合，その書式は`\sidenote{該当項目}{注}`となります．たとえば
+傍注（縦組みの場合は脚注）を出力します．デフォルトでは`\footnote`と同様の書式となりますが，`\jlreqsetup`で`sidenote_type=symbol`が指定されている場合，その書式は`\sidenote{該当項目}{注}`となります．たとえば
```latex
刊行できる\sidenote{原稿}{印刷などの方法により……}を入手する仕事である．
```
@@ -62,11 +65,8 @@
### `\jafontsize`
和文フォントサイズを指定する`\fontsize`です．クラスオプションで`jafontscale=0.9`とされている場合，`\fontsize{9pt}{15pt}`とすると和文フォントのサイズは`8.1pt`となりますが，`\jafontsize{9pt}{15pt}`とすると`9pt`となります．（欧文フォントサイズは`10pt`となる．）なお，第二引数は`\fontsize`の第二引数と全く同じです．
-### `\jlreqsetup`
-設定用命令です．プリアンブルでしか使えません．文書に対する設定は，クラスオプションとして行うか`\jlreqsetup`を通じて行うかします．どちらで設定するかは設定項目によります．
-
### その他
-* ルビは提供されません．[PXrubrica](https://github.com/zr-tex8r/PXrubrica)またはluatexja-ruby（LuaLaTeX，LuaTeX-jaパッケージに付属）を使うと良いかと思います．
+* ルビや圏点は提供されません．[PXrubrica](https://github.com/zr-tex8r/PXrubrica)またはluatexja-ruby（LuaLaTeX，LuaTeX-jaパッケージに付属）を使うと良いかと思います．
* 日本語組版処理の要件2.3.2.dによれば，二段組の最後のページの各段の行数は揃えることが望ましいとされていますが，この処理は行われません．`nidanfloat`パッケージを使い，
```latex
\usepackage[balance]{nidanfloat}
@@ -165,14 +165,15 @@
* `subtitle_format=<命令>`：副題のフォーマットを指定します．`subtitle_format={「#1」}`のようにします．`#1`が副題自身になります．
#### インデント関連
-* `indent=<寸法/center>` 見出し全体の字下げ量を指定します．`indent=center`とすると見出しを中央寄せします．
-* `end_indent=<寸法/center>`：見出し全体の字上げ量を指定します．`end_indent=center`とすると見出しを中央寄せします．
+* `align=[left/center/right]`：見出し位置の横方向の配置場所を指定します．
+* `indent=<寸法>`：見出し全体の字下げ量を指定します．
+* `end_indent=<寸法>`：見出し全体の字上げ量を指定します．
* `after_label_space=<寸法>`：ラベル後，見出し文字列までの空きを指定します．
-* `second_heading_text_indent=<寸法/{寸法,寸法}>`：見出し文字列の二行目以降のインデントを指定します．一行目の頭を起点として指定しますが，`second_heading_text_indent=*1\zw`のように先頭に`*`をつけるとラベルの頭を起点としての指定になります．（ラベルがない時は一行目の頭が起点．）また，`second_heading_text_indent={<ラベルがある時>,<ラベルがない時>}`という指定をすると，ラベルの有無に応じて値を変更することができます．`<ラベルがある時>`の指定ではやはり`*`を使うことができます．
+* `second_heading_text_indent=[<寸法>/{<寸法>,<寸法>}]`：見出し文字列の二行目以降のインデントを指定します．一行目の頭を起点として指定しますが，`second_heading_text_indent=*1\zw`のように先頭に`*`をつけるとラベルの頭を起点としての指定になります．（ラベルがない時は一行目の頭が起点．）また，`second_heading_text_indent={<ラベルがある時>,<ラベルがない時>}`という指定をすると，ラベルの有無に応じて値を変更することができます．`<ラベルがある時>`の指定ではやはり`*`を使うことができます．
* `subtitle_indent=<寸法>`：副題のインデント量を指定します．見出し文字列の一行目を起点として指定します．
#### その他
-* `subtitle_break=<true/false>`：見出し文字列と副題の間を改行するか指定します．
+* `subtitle_break=[true/false]`：見出し文字列と副題の間を改行するか指定します．
* `allowbreak_if_evenpage=[true/false]`：見出しが偶数ページにあった場合，その直後の改ページを許可します．
* `pagebreak=[clearpage/cleardoublepage/clearcolumn/nariyuki]`：見出し直前の改ページを指定します．それぞれ，改ページ，改丁，改段，なりゆきです．
* `afterindent=[true/false]`：見出し直後の段落の字下げを行うかを指定します．
@@ -265,6 +266,10 @@
- いくつかのクラスオプションを`\jlreqsetup`に移動．
- いくつかのオプションを`\jlreqsetup`に追加．
- クラスオプションの`paper={<縦>,<横>}`を`paper={<横>,<縦>}`に変更．
+* 2017-06-11
+ - `plext` / `lltjext`の読み込みを中止．
+ - `\DeclareBlockHeading`に`align`を追加．`indent=center`や`end_indent=center`を廃止．
+ - 一部の`\kcatcode` (upLaTeX時) を変更．
--------------
Noriyuki Abe
Modified: trunk/Master/texmf-dist/doc/latex/jlreq/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/README.md 2017-06-11 21:45:58 UTC (rev 44562)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/README.md 2017-06-11 21:48:10 UTC (rev 44563)
@@ -45,9 +45,12 @@
- `jlreq_warnings` -> `jlreq_notes` (class option).
- Move some class options to `\jlreqsetup`.
- Add some options to `\jlreqsetup`.
- - paper={<height>,<width>} -> paper={<width>,<height>}.
+ - `paper={<height>,<width>}` -> `paper={<width>,<height>}`.
+* 2017-06-11
+ - Stop to load `plext` and `lltjext`.
+ - Add `align` to `\DeclareBlockHeading` and delete `indent=center`, `end_indent=center`.
+ - Change `\kcatcode` for some characters (upLaTeX).
-
--------------
Noriyuki Abe
https://github.com/abenori/jlreq
Modified: trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html 2017-06-11 21:45:58 UTC (rev 44562)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html 2017-06-11 21:48:10 UTC (rev 44563)
@@ -108,12 +108,14 @@
<p>とします．</p>
<p>その他，<code>oneside / twoside / onecolumn / twocolumn / titlepage / notitlepage / draft / final / openright / openany / leqno / fleqn</code>というよくあるオプションを受け付けます．</p>
<p>標準的な文書クラスと同じように中身を書くことができますが，次のような命令が追加 / 拡張されています．</p>
+<h3 id="jlreqsetup"><code>\jlreqsetup</code></h3>
+<p>設定用命令です．プリアンブルでしか使えません．文書に対する設定は，クラスオプションとして行うか<code>\jlreqsetup</code>を通じて行うかします．どちらで設定するかは設定項目によります．</p>
<h3 id="section"><code>\section</code></h3>
<p><code>\section*[running head]{見出し文字列}[副題]</code>というように，通常の書式に加えて副題を受け付けられるように拡張されています．その他，<code>\part</code>（articleのみ），<code>\chapter</code>（book/reportのみ），<code>\subsection</code>，<code>\subsubsection</code>も副題を受け付けます．</p>
<h3 id="abstract"><code>abstract</code>環境</h3>
<p>プリアンブルにもかけるようになっています．プリアンブルに書かれた場合は，<code>\maketitle</code>とともに出力されます．二段組の場合は，段組にならず概要を出力することができます．</p>
<h3 id="sidenote"><code>\sidenote</code></h3>
-<p>傍注（縦組みの場合は脚注）を出力します．デフォルトでは<code>\footnote</code>と同様の書式となりますが，クラスオプションに<code>sidenote_type=symbol</code>が指定されている場合，その書式は<code>\sidenote{該当項目}{注}</code>となります．たとえば</p>
+<p>傍注（縦組みの場合は脚注）を出力します．デフォルトでは<code>\footnote</code>と同様の書式となりますが，<code>\jlreqsetup</code>で<code>sidenote_type=symbol</code>が指定されている場合，その書式は<code>\sidenote{該当項目}{注}</code>となります．たとえば</p>
<div class="sourceCode"><pre class="sourceCode latex"><code class="sourceCode latex">刊行できる<span class="fu">\sidenote</span>{原稿}{印刷などの方法により……}を入手する仕事である．</code></pre></div>
<p>とします．後の説明も参照してください．</p>
<p>デフォルトの基本版面では余白が少なく，実用にはならないかと思います．後の基本版面の設定を参考にしてください．</p>
@@ -127,11 +129,9 @@
<p>縦中横を出力します．<code>\tatechuyoko{<文字列>}</code>とします．縦書きでない場所で使うとエラーになります．</p>
<h3 id="jafontsize"><code>\jafontsize</code></h3>
<p>和文フォントサイズを指定する<code>\fontsize</code>です．クラスオプションで<code>jafontscale=0.9</code>とされている場合，<code>\fontsize{9pt}{15pt}</code>とすると和文フォントのサイズは<code>8.1pt</code>となりますが，<code>\jafontsize{9pt}{15pt}</code>とすると<code>9pt</code>となります．（欧文フォントサイズは<code>10pt</code>となる．）なお，第二引数は<code>\fontsize</code>の第二引数と全く同じです．</p>
-<h3 id="jlreqsetup"><code>\jlreqsetup</code></h3>
-<p>設定用命令です．プリアンブルでしか使えません．文書に対する設定は，クラスオプションとして行うか<code>\jlreqsetup</code>を通じて行うかします．どちらで設定するかは設定項目によります．</p>
<h3>その他</h3>
<ul>
-<li>ルビは提供されません．<a href="https://github.com/zr-tex8r/PXrubrica">PXrubrica</a>またはluatexja-ruby（LuaLaTeX，LuaTeX-jaパッケージに付属）を使うと良いかと思います．</li>
+<li>ルビや圏点は提供されません．<a href="https://github.com/zr-tex8r/PXrubrica">PXrubrica</a>またはluatexja-ruby（LuaLaTeX，LuaTeX-jaパッケージに付属）を使うと良いかと思います．</li>
<li><p>日本語組版処理の要件2.3.2.dによれば，二段組の最後のページの各段の行数は揃えることが望ましいとされていますが，この処理は行われません．<code>nidanfloat</code>パッケージを使い，</p>
<div class="sourceCode"><pre class="sourceCode latex"><code class="sourceCode latex"><span class="bu">\usepackage</span>[balance]{<span class="ex">nidanfloat</span>}</code></pre></div>
<p>とするとこの処理が行われます．ただし，最終ページでの<code>\newpage</code>や<code>\clearpage</code>が正しく動作しません．詳しくは<code>nidanfloat</code>パッケージのマニュアルをご覧ください．</p></li>
@@ -232,15 +232,16 @@
</ul>
<h4>インデント関連</h4>
<ul>
-<li><code>indent=<寸法/center></code> 見出し全体の字下げ量を指定します．<code>indent=center</code>とすると見出しを中央寄せします．</li>
-<li><code>end_indent=<寸法/center></code>：見出し全体の字上げ量を指定します．<code>end_indent=center</code>とすると見出しを中央寄せします．</li>
+<li><code>align=[left/center/right]</code>：見出し位置の横方向の配置場所を指定します．</li>
+<li><code>indent=<寸法></code>：見出し全体の字下げ量を指定します．</li>
+<li><code>end_indent=<寸法></code>：見出し全体の字上げ量を指定します．</li>
<li><code>after_label_space=<寸法></code>：ラベル後，見出し文字列までの空きを指定します．</li>
-<li><code>second_heading_text_indent=<寸法/{寸法,寸法}></code>：見出し文字列の二行目以降のインデントを指定します．一行目の頭を起点として指定しますが，<code>second_heading_text_indent=*1\zw</code>のように先頭に<code>*</code>をつけるとラベルの頭を起点としての指定になります．（ラベルがない時は一行目の頭が起点．）また，<code>second_heading_text_indent={<ラベルがある時>,<ラベルがない時>}</code>という指定をすると，ラベルの有無に応じて値を変更することができます．<code><ラベルがある時></code>の指定ではやはり<code>*</code>を使うことができます．</li>
+<li><code>second_heading_text_indent=[<寸法>/{<寸法>,<寸法>}]</code>：見出し文字列の二行目以降のインデントを指定します．一行目の頭を起点として指定しますが，<code>second_heading_text_indent=*1\zw</code>のように先頭に<code>*</code>をつけるとラベルの頭を起点としての指定になります．（ラベルがない時は一行目の頭が起点．）また，<code>second_heading_text_indent={<ラベルがある時>,<ラベルがない時>}</code>という指定をすると，ラベルの有無に応じて値を変更することができます．<code><ラベルがある時></code>の指定ではやはり<code>*</code>を使うことができます．</li>
<li><code>subtitle_indent=<寸法></code>：副題のインデント量を指定します．見出し文字列の一行目を起点として指定します．</li>
</ul>
<h4 id="-1">その他</h4>
<ul>
-<li><code>subtitle_break=<true/false></code>：見出し文字列と副題の間を改行するか指定します．</li>
+<li><code>subtitle_break=[true/false]</code>：見出し文字列と副題の間を改行するか指定します．</li>
<li><code>allowbreak_if_evenpage=[true/false]</code>：見出しが偶数ページにあった場合，その直後の改ページを許可します．</li>
<li><code>pagebreak=[clearpage/cleardoublepage/clearcolumn/nariyuki]</code>：見出し直前の改ページを指定します．それぞれ，改ページ，改丁，改段，なりゆきです．</li>
<li><code>afterindent=[true/false]</code>：見出し直後の段落の字下げを行うかを指定します．</li>
@@ -339,6 +340,12 @@
<li>いくつかのオプションを<code>\jlreqsetup</code>に追加．</li>
<li>クラスオプションの<code>paper={<縦>,<横>}</code>を<code>paper={<横>,<縦>}</code>に変更．</li>
</ul></li>
+<li>2017-06-11
+<ul>
+<li><code>plext</code> / <code>lltjext</code>の読み込みを中止．</li>
+<li><code>\DeclareBlockHeading</code>に<code>align</code>を追加．<code>indent=center</code>や<code>end_indent=center</code>を廃止．</li>
+<li>一部の<code>\kcatcode</code> (upLaTeX時) を変更．</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-06-11 21:45:58 UTC (rev 44562)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/jlreq.html 2017-06-11 21:48:10 UTC (rev 44563)
@@ -110,8 +110,14 @@
<li><code>jlreq_warnings</code> -> <code>jlreq_notes</code> (class option).</li>
<li>Move some class options to <code>\jlreqsetup</code>.</li>
<li>Add some options to <code>\jlreqsetup</code>.</li>
-<li>paper={<height>,<width>} -> paper={<width>,<height>}.</li>
+<li><code>paper={<height>,<width>}</code> -> <code>paper={<width>,<height>}</code>.</li>
</ul></li>
+<li>2017-06-11
+<ul>
+<li>Stop to load <code>plext</code> and <code>lltjext</code>.</li>
+<li>Add <code>align</code> to <code>\DeclareBlockHeading</code> and delete <code>indent=center</code>, <code>end_indent=center</code>.</li>
+<li>Change <code>\kcatcode</code> for some characters (upLaTeX).</li>
+</ul></li>
</ul>
<hr />
<p>Noriyuki Abe<br />
Modified: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/bjlreq-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/bjlreq.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/bjlreqg-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/bjlreqg.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/bzjlreq-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/bzjlreq.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/bzjlreqg-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/bzjlreqg.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/jlreq-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/jlreq.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/jlreqg-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/jlreqg.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ubjlreq-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ubjlreq.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ubjlreqg-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ubjlreqg.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ubzjlreq-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ubzjlreq.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ubzjlreqg-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ubzjlreqg.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreq-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreq.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreqg-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreqg.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/uzjlreq-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/uzjlreq.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/uzjlreqg-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/uzjlreqg.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/zjlreq-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/zjlreq.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/zjlreqg-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/zjlreqg.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/tex/latex/jlreq/jlreq.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/jlreq/jlreq.cls 2017-06-11 21:45:58 UTC (rev 44562)
+++ trunk/Master/texmf-dist/tex/latex/jlreq/jlreq.cls 2017-06-11 21:48:10 UTC (rev 44563)
@@ -5,7 +5,7 @@
%%
% (based on JLReq 20120403 https://www.w3.org/TR/2012/NOTE-jlreq-20120403/ja/)
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{jlreq}[2017/04/29 jlreq]
+\ProvidesClass{jlreq}[2017/06/11 jlreq]
\RequirePackage{xkeyval,everyhook,filehook,etoolbox,ifthen}
%. helper1
@@ -699,19 +699,49 @@
}
\ifx l\jlreq at engine
- \newcommand*{\lastnodechar}{\directlua{luatexja.pltx_composite_last_node_char()}}
+ \newcommand*{\lastnodechar}{\directlua{luatexja.pltx_composite_last_node_char()}}% undocumented
\fi
% #1と#2の間に入るjmglue（(x)kanjiskipも）を\jlreq at resultskipに入れる
-\newcommand*{\jlreq at calc@jfmglue}[2]{%
- \begingroup
- \setbox\jlreq at tempboxa=\hbox{\inhibitglue #1\inhibitglue\hbox{}\inhibitglue#2\inhibitglue}%
- \setbox\jlreq at tempboxb=\hbox{\inhibitglue #1#2\inhibitglue}%
- \edef\jlreq at do{\noexpand\jlreq at resultskip=\the\dimexpr\wd\jlreq at tempboxb - \wd\jlreq at tempboxa\relax\noexpand\relax}%
- \expandafter\endgroup
- \jlreq at do
-}
-
+\ifx l\jlreq at engine
+ \newcommand*{\jlreq at calc@jfmglue}[2]{%
+ \begingroup
+ \setbox\jlreq at tempboxa=\hbox{\inhibitglue #1\inhibitglue\hbox{}\inhibitglue#2\inhibitglue}%
+ \setbox\jlreq at tempboxb=\hbox{\inhibitglue #1#2\inhibitglue}%
+ \edef\jlreq at do{\noexpand\jlreq at resultskip=\the\dimexpr\wd\jlreq at tempboxb - \wd\jlreq at tempboxa\relax\noexpand\relax}%
+ \jlreq at do
+ \directlua{
+ local width = 0
+ local stretch = 0
+ local shrink = 0
+ local n = tex.box["jlreq at tempboxb"].head
+ while n do
+ if n.id == node.id("glue") then
+ width = width + n.width
+ stretch = stretch + n.stretch
+ shrink = shrink + n.shrink
+ end
+ n = n.next
+ end
+ tex.setglue("jlreq at tempskipa",width,stretch,shrink)
+ }%
+ % TeXで計測した物と一致していなければTeXでの方を信じる
+ \ifdim\jlreq at resultskip=\jlreq at tempskipa
+ \edef\jlreq at do{\noexpand\jlreq at resultskip=\the\jlreq at tempskipa\relax}%
+ \fi
+ \expandafter\endgroup
+ \jlreq at do
+ }
+\else
+ \newcommand*{\jlreq at calc@jfmglue}[2]{%
+ \begingroup
+ \setbox\jlreq at tempboxa=\hbox{\inhibitglue #1\inhibitglue\hbox{}\inhibitglue#2\inhibitglue}%
+ \setbox\jlreq at tempboxb=\hbox{\inhibitglue #1#2\inhibitglue}%
+ \edef\jlreq at do{\noexpand\jlreq at resultskip=\the\dimexpr\wd\jlreq at tempboxb - \wd\jlreq at tempboxa\relax\noexpand\relax}%
+ \expandafter\endgroup
+ \jlreq at do
+ }
+\fi
\newcount\jlreq at lastnodechar
% jlreq at lastnodecharに入っている値と次のトークン（\futureletで得る）の間に入るJFMグルー等を挿入する
\newcommand*{\jlreq at fixjfm}{%
@@ -768,14 +798,11 @@
\fi
%. 基本設定
-\def\jlreq at kanjiskip{0pt plus 0.25zw minus 0pt}
-\def\jlreq at xkanjiskip{0.25zw plus 0.25zw minus 0.125zw}
+\providecommand*{\jlreq at kanjiskip}{0pt plus 0.25\zw minus 0pt}
+\providecommand*{\jlreq at xkanjiskip}{0.25\zw plus 0.25\zw minus 0.125\zw}
\ifx l\jlreq at engine
- % 和文文字，欧文文字の設定（とりあえずLuaTeX-jaのデフォルトのまま）
- \ltjsetparameter{jacharrange={-1, +2, +3, -4, -5, +6, +7, -8}}
- % kanjiskip, xkanjiskipはjfmのものを使う
- \ltjsetparameter{kanjiskip=\maxdimen}
- \ltjsetparameter{xkanjiskip=\maxdimen}
+ \ltjsetparameter{kanjiskip=\jlreq at kanjiskip}
+ \ltjsetparameter{xkanjiskip=\jlreq at xkanjiskip}
\else
\kanjiskip=\jlreq at kanjiskip
\xkanjiskip=\jlreq at xkanjiskip
@@ -1059,6 +1086,36 @@
\jlreq at setprebreakpenalty{‥}{10000}
% ￥100とか70％とか……
+%.. 文字範囲
+\ifx l\jlreq at engine
+ % 和文文字，欧文文字の設定（とりあえずLuaTeX-jaのデフォルトのまま）
+ \ltjsetparameter{jacharrange={-1, +2, +3, -4, -5, +6, +7, -8}}
+\fi
+\ifx u\jlreq at engine
+ % \kcatcodeの設定
+ \def\jlreq at setkcatcode#1#2{\@for\@tempa:=#1\do{\kcatcode"\@tempa=#2\relax}}
+ \jlreq at aftercls@addtodeletecs{\jlreq at setkcatcode}
+ % とりあえずLuaTeX-jaのデフォルトのままに近い設定をする
+ % 範囲1＆8
+ \jlreq at setkcatcode{80,100,180,250,2B0,300,1E00}{15}
+ % 範囲2
+ \jlreq at setkcatcode{370,400,1F00}{18}
+ % 範囲3
+ \jlreq at setkcatcode{2000,2070,20A0,20D0,2100,2150,2190,2200,2300,2400,2500,2580,25A0,2600,2700,2900,2980,2B00}{18}
+ % 範囲4
+ \jlreq at setkcatcode{500,530,590,600,700,750,780,7C0,800,840,8A0,900,980,A00,A80,B00,B80,C00,C80,D00,D80,E00,E80,F00,1000,10A0,1200,1380,13A0,1400,1680,16A0,1700,1720,1740,1760,1780,1800,18B0,1900,1950,1980,19E0,1A00,1A20,1AB0,1B00,1B80,1BC0,1C00,1C50,1C80,1CC0,1CD0,1D00,1D80,1DC0,2400,2440,27C0,27F0,2800,2A00,2C00,4DC0,A4D0,A500,A640,A6A0,A700,A720,A800,A840,A880,A8E0,A900,A930,A960,A980,A9E0,AA00,AA60,AA80,AAE0,AB00,AB30,AB70,ABC0,FB00,FB50,FE00,FE20,FE70,10000,10080,10100,10140,10190,101D0,10280,102A0,102E0,10300,10330,10350,10380,103A0,10400,10450,10480,104B0,10500,10530,10600,10800,10840,10860,10880,108E0,10900,10920,10980,109A0,10A00,10A60,10A80,10AC0,10B00,10B40,10B60,10B80,10C00,10C80,10E60,11000,11080,110D0,11100,11150,11180,111E0,11200,11280,112B0,11300,11400,11480,11580,11600,11660,11680,11700,118A0,11AC0,11C00,11C70,12000,12400,12480,13000,14400,16800,16A40,16AD0,16B00,16F00,16FE0,17000,18800,1B000,1BC00,1BCA0,1D000,1D100,1D200,1D300,1D360,1D400,1D800,1E000,1E800,1E900,1EE00,1F000,1F030,1F0A0,1F100,1F200,1F300,1F600,1F650,1F680,1F700,1F780,1F800,1F900,E000}{15}
+ % 範囲5（Variation Selectors SupplementはLuaTeX-jaではE01F0--E01EFまで範囲5，他は範囲6）
+ \jlreq at setkcatcode{D800,DB80,DC00,E0000,F0000,100000}{15}
+ % 範囲6
+ \jlreq at setkcatcode{3040,30A0,31F0}{17} % Hiragana,Katakana,Katakana Phonetic Extensions
+ \jlreq at setkcatcode{2460,3000,3200,3300,FE10,FE30,FE50,E0100}{18} % Enclosed Alphanumerics,CJK Symbols and Punctuation,Enclosed CJK Letters and Months,CJK Compatibility,Vertical Forms,CJK Compatibility Forms,Small Form Variants,Variation Selectors Supplement
+ \jlreq at setkcatcode{2E80,3190,3400,4E00,F900,20000}{16}
+ % 範囲7
+ \jlreq at setkcatcode{A000,A490}{18} % Yi Syllables,Yi Radicals
+ \jlreq at setkcatcode{1100,3130,AC00,D7B0}{19} % Hangul Jamo,Hangul Compatibility Jamo,Hangul Syllables,Hangul Jamo Extended-B
+ \jlreq at setkcatcode{2F00,2FF0,3100,31A0,31C0,A830}{16}
+\fi
+
% フォントサイズを設定
\newdimen\jlreq at fontsize
\newdimen\jlreq at jafontsize
@@ -1132,32 +1189,41 @@
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
%.. 和文
-% 行頭括弧に対して\inhibitglueを入れたりする命令を作る
-\def\jlreq at openbreackets@list{（〔［｛〈《「『【‘“}
-\ifx p\jlreq at engine\else\edef\jlreq at openbreackets@list{\jlreq at openbreackets@list ｟〘〖«〝}\fi
-\jlreq at aftercls@addtodeletecs{\jlreq at openbreackets@list}
-% \jlreq at openbreackets@listの各括弧に対して，\ifx\jlreq at nextchar 「1\fiみたいなのが並んだのを作る
-\def\jlreq at tempa{}
-\def\jlreq at do#1{\jlreq at ifendmark{#1}{}{\appto\jlreq at tempa{\ifx\jlreq at nextchar#11\fi}\jlreq at do}}
-\expandafter\jlreq at do\jlreq at openbreackets@list\jlreq at endmark
-% JFM glueの伸び縮みで行頭括弧が揃わないのを防ぐために常に\inhibitglueを入れる．
-\ifthenelse{\equal{\jlreq at open@bracket at pos}{nibu_tentsuki}}{
- \edef\jlreq at openbracket@hook{\noexpand\ifnum0\expandonce{\jlreq at tempa}>0 \unexpanded{\hskip -.5\jlreq at mol\inhibitglue}\noexpand\fi}
-}{% zenkakunibu_nibu,zenkaku_tentsuki
- \edef\jlreq at openbracket@hook{\noexpand\ifnum0\expandonce{\jlreq at tempa}>0 \unexpanded{\inhibitglue}\noexpand\fi}
-}
% JFMに関連する設定
\ifx l\jlreq at engine
% この値は後でjfm-jlreq内で読む
\directlua{jlreq.open_bracket_pos = [[\jlreq at open@bracket at pos]]}
\ifjlreq at burasage\directlua{jlreq.burasage = true}\else\directlua{jlreq.burasage = false}\fi
- % 行頭括弧はJFMで対応できるが，\item後だけはどうしようもない．
+ % \item後の行頭括弧のために仕込み．
\jlreq at saveoriginalcs{list}
\jlreq at saveoriginalcs{endlist}
- \def\list{\jlreq at pushhook@postpar{\futurelet\jlreq at nextchar\jlreq at openbracket@hook}\jlreq at original@list}
- \def\endlist{\jlreq at pophook@postpar\jlreq at original@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
\else
% 非LuaTeXの場合はJFMの入れ替えと\everyparでの処理で対処．
+ % 行頭括弧に対して\inhibitglueを入れたりする命令を作る
+ \def\jlreq at openbreackets@list{（〔［｛〈《「『【‘“}
+ \ifx p\jlreq at engine\else\edef\jlreq at openbreackets@list{\jlreq at openbreackets@list ｟〘〖«〝}\fi
+ \jlreq at aftercls@addtodeletecs{\jlreq at openbreackets@list}
+ % \jlreq at openbreackets@listの各括弧に対して，\ifx\jlreq at nextchar 「1\fiみたいなのが並んだのを作る
+ \def\jlreq at tempa{}
+ \def\jlreq at do#1{\jlreq at ifendmark{#1}{}{\appto\jlreq at tempa{\ifx\jlreq at nextchar#11\fi}\jlreq at do}}
+ \expandafter\jlreq at do\jlreq at openbreackets@list\jlreq at endmark
+ % JFM glueの伸び縮みで行頭括弧が揃わないのを防ぐために常に\inhibitglueを入れる．
+ \ifthenelse{\equal{\jlreq at open@bracket at pos}{nibu_tentsuki}}{
+ \edef\jlreq at openbracket@hook{\noexpand\ifnum0\expandonce{\jlreq at tempa}>0 \unexpanded{\hskip -.5\jlreq at mol\inhibitglue}\noexpand\fi}
+ }{% zenkakunibu_nibu,zenkaku_tentsuki
+ \edef\jlreq at openbracket@hook{\noexpand\ifnum0\expandonce{\jlreq at tempa}>0 \unexpanded{\inhibitglue}\noexpand\fi}
+ }
% \jlreq at jfmnameにJFMの名前を入れる
\def\jlreq at jfmname@prefix{}
\jlreq at aftercls@addtodeletecs{\jlreq at jfmname@prefix}
@@ -1298,13 +1364,28 @@
% \set at fontsizeが実行されるたびに追随して値を変える
% その処理は\jlreq at setfontsizehookに入れる
\jlreq at saveoriginalcs{set at fontsize}
-\renewcommand*{\set at fontsize}[3]{%
- \jlreq at original@set at fontsize{#1}{#2}{#3}%
- \jlreq at setfontsizehook
+\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
\def\jlreq at setfontsizehook{}
-\appto\jlreq at setfontsizehook{\ifdim\parindent>0pt\setlength{\parindent}{1\jlreq at mol}\fi}
-\ifx l\jlreq at engine\else
+\appto\jlreq at setfontsizehook{\ifdim\parindent>0pt\setlength{\parindent}{1\zw}\fi}
+\ifx l\jlreq at engine
+ \@tempskipa=\ltjgetparameter{kanjiskip}
+ \ifdim\@tempskipa=\maxdimen\else
+ \appto\jlreq at setfontsizehook{%
+ \ltj at setpar@global
+ \ltjsetkanjiskip\jlreq at kanjiskip
+ \@tempskipa=\ltjgetparameter{xkanjiskip}%
+ \ifdim\@tempskipa>\z@
+ \ltjsetxkanjiskip\jlreq at xkanjiskip
+ \fi
+ }
+ \fi
+\else
\appto\jlreq at setfontsizehook{%
\kanjiskip=\jlreq at kanjiskip
\ifdim\xkanjiskip>0pt
@@ -1368,15 +1449,19 @@
\newcommand{\huge}{\@setfontsize\huge{2\jlreq at fontsize}{\dimexpr 28\jlreq at baselineskip/17\relax}}
\newcommand{\Huge}{\@setfontsize\Huge{\dimexpr 25\jlreq at fontsize/10\relax}{\dimexpr 33\jlreq at baselineskip/17\relax}}
-\if at tate
- \ifx l\jlreq at engine
- \RequirePackage{lltjext}
- \else
- \RequirePackage{plext}
- \fi
- \renewcommand*{\@Kanji}[1]{\expandafter\kansuji\number #1\relax} % \relax追加
- \rensujiskip=0\jlreq at mol plus 0.25\jlreq at mol minus 0\jlreq at mol
-\fi
+%. plextから一部拝借
+% オプションも*もない\rensuji（コピペ）
+\DeclareRobustCommand{\jlreq at rensuji}[1]{%
+ \ifvmode\leavevmode\fi
+ \jlreq at ifydir{\hbox{#1}}{%
+ \hskip 0pt plus 0.25\zw minus 0pt % \rensujiskipは固定値
+ \setbox\jlreq at tempboxa=\hbox{\yoko#1}%
+ \@tempdima\ht\jlreq at tempboxa \advance\@tempdima\dp\jlreq at tempboxa
+ \vrule\@width\z@ \@height.5\@tempdima \@depth.5\@tempdima
+ \hbox to 1\zw{\yoko\hss#1\hss}%
+ \hskip 0pt plus 0.25\zw minus 0pt
+}}
+\def\jlreq at Kanji#1{\expandafter\kansuji\csname c@#1\endcsname}
% このあたりはtarticleと同じ
\setlength\lineskip{.1\jlreq at gol}
@@ -1742,33 +1827,29 @@
}%
}
-% {1 = 字下げ}{2 = 字上げ}{3 = 前空き}{4 = 後ろ空き}{5 = トータル行数}{6 = afterindent}{7 = 偶数ページ改ページ}{8 = 出力}
-\long\def\jlreq at startBlockHeading@@@@#1#2#3#4#5#6#7#8{%
+% {1 = 配置(clr)}{2 = 字下げ}{3 = 字上げ}{4 = 前空き}{5 = 後ろ空き}{6 = トータル行数}{7 = afterindent}{8 = 偶数ページ改ページ}{9 = 出力}
+\long\def\jlreq at startBlockHeading@@@@#1#2#3#4#5#6#7#8#9{%
\if at noskipsec\leavevmode\fi
\par
- \jlreq at ifempty{#7}{}{\jlreq at setcurrentpage}%
+ \jlreq at ifempty{#8}{}{\jlreq at setcurrentpage}%
\setbox\jlreq at tempboxa=\vbox{\noindent
- \jlreq at tempafalse % 中央寄せするか
- \ifthenelse{\equal{#1}{center}}{\jlreq at tempatrue}{%
- \jlreq at ifempty{#1}{}{\hsize=\dimexpr\hsize - #1\relax}%
- }%
- \ifthenelse{\equal{#2}{center}}{\jlreq at tempatrue}{%
- \jlreq at ifempty{#2}{}{\hsize=\dimexpr\hsize - #2\relax}%
- }%
- \ifjlreq at tempa\hfil\fi
- #8}%
+ \ifx#1c\centering\fi
+ \ifx#1r\raggedleft\fi
+ \jlreq at ifempty{#2}{}{\hsize=\dimexpr\hsize - #2\relax}%
+ \jlreq at ifempty{#3}{}{\hsize=\dimexpr\hsize - #3\relax}%
+ #9}%
% \jlreq at tempskip(a/b)に前/後ろに入れるべき値を入れる
% #3がa:ならばその値は\jlreq at tempskipaには足さず\jlreq at tempskipcに入れておく
\jlreq at tempskipc=0pt
- \jlreq at startBlockHeading@analyzespace#3:\jlreq at endmark
+ \jlreq at startBlockHeading@analyzespace#4:\jlreq at endmark
\setbox\jlreq at tempboxb=\vbox{ }%
- \jlreq at ifempty{#5}{%
+ \jlreq at ifempty{#6}{%
\ifx\jlreq at startBlockHeading@space\@empty\else
\jlreq at tempskipa=\glueexpr\jlreq at startBlockHeading@space\relax
\fi
\jlreq at tempskipb=0pt\relax
}{%
- \jlreq at tempskipb=\glueexpr(\baselineskip*(#5 + 1) - \ht\jlreq at tempboxb - \dp\jlreq at tempboxb - \ht\jlreq at tempboxa - \dp\jlreq at tempboxa)/2\relax
+ \jlreq at tempskipb=\glueexpr(#6\baselineskip + \baselineskip - \ht\jlreq at tempboxb - \dp\jlreq at tempboxb - \ht\jlreq at tempboxa - \dp\jlreq at tempboxa)/2\relax
\ifx\jlreq at startBlockHeading@space\@empty
\jlreq at tempskipa=\jlreq at tempskipb
\else
@@ -1781,7 +1862,7 @@
\fi
\ifx r\jlreq at startBlockHeading@spacetype
\jlreq at tempskipa=\glueexpr\jlreq at startBlockHeading@space\relax%
- \jlreq at tempskipb=\glueexpr(\baselineskip*(#5 + 1) - \ht\jlreq at tempboxb - \dp\jlreq at tempboxb - \ht\jlreq at tempboxa - \dp\jlreq at tempboxa) - \jlreq at startBlockHeading@space\relax
+ \jlreq at tempskipb=\glueexpr(#6\baselineskip + \baselineskip - \ht\jlreq at tempboxb - \dp\jlreq at tempboxb - \ht\jlreq at tempboxa - \dp\jlreq at tempboxa) - \jlreq at startBlockHeading@space\relax
\fi
\fi
}%
@@ -1792,7 +1873,7 @@
\setbox\jlreq at tempboxa=\vbox{%
\ifdim\jlreq at tempskipa=0pt\else\vskip\jlreq at tempskipa\fi
\noindent
- \ifthenelse{\equal{#1}{center}}{}{\jlreq at ifempty{#1}{}{\hskip #1}}%
+ \jlreq at ifempty{#2}{}{\hskip #2}%
\box\jlreq at tempboxa}%
\dp\jlreq at tempboxa=\dimexpr\dp\jlreq at tempboxa + \ht\jlreq at tempboxa\relax
\ht\jlreq at tempboxa=0pt
@@ -1799,9 +1880,9 @@
% \showbox\jlreq at tempboxa
\box\jlreq at tempboxa
\par
- \jlreq at ifempty{#7}{\ifodd\jlreq at currentpage\nobreak\fi}{\nobreak}%
+ \jlreq at ifempty{#8}{\ifodd\jlreq at currentpage\nobreak\fi}{\nobreak}%
\prevdepth=0pt
- \jlreq at startBlockHeading@analyzespace#4:\jlreq at endmark
+ \jlreq at startBlockHeading@analyzespace#5:\jlreq at endmark
\jlreq at tempskipb=\glueexpr\jlreq at tempskipb + \ht\jlreq at tempboxb - \baselineskip\relax
\ifx\jlreq at startBlockHeading@space\@empty\else
\ifx a\jlreq at startBlockHeading@spacetype
@@ -1811,7 +1892,7 @@
\fi
\fi
\ifdim\jlreq at tempskipb=0pt\else\vspace{\jlreq at tempskipb}\fi
- #6%
+ #7%
\@afterheading
}
@@ -1843,6 +1924,7 @@
\def\jlreq at subtitle@font{}%
\def\jlreq at indent{0\jlreq at mol}%
\def\jlreq at end@indent{0\jlreq at mol}%
+ \def\jlreq at align{l}%
\edef\jlreq at format{\unexpanded{##1##2##3}}%
\edef\jlreq at heading@text at format{\unexpanded{##1}}%
\def\jlreq at pagebreak{}%
@@ -1899,6 +1981,14 @@
{subtitle_font}{\def\jlreq at subtitle@font{##1}}
{indent}{\def\jlreq at indent{##1}}
{end_indent}{\def\jlreq at end@indent{##1}}
+ {align}{%
+ \jlreq at switch{##1}{
+ {left}{\def\jlreq at align{l}}
+ {center}{\def\jlreq at align{c}}
+ {right}{\def\jlreq at align{r}}
+ {\ClassError{jlreq}{Unknown position `##1' in block heading #1}{\@ehc}}
+ }%
+ }
{format}{\edef\jlreq at format{\unexpanded{##1}}}
{after_label_space}{\def\jlreq at after@label at space{##1}}
{second_heading_text_indent}{%
@@ -2006,7 +2096,7 @@
\noexpand\jlreq at hook@beforeheadings{#1}%
\expandonce{\jlreq at pagebreak}%
\unexpanded{\jlreq at startBlockHeading{#1}{#2}}%
- {{\expandonce{\jlreq at indent}}{\expandonce{\jlreq at end@indent}}{\expandonce{\jlreq at before@space}}{\expandonce{\jlreq at after@space}}{\expandonce{\jlreq at lines}}{\expandonce{\jlreq at afterindent}}{\expandonce{\jlreq at allowbreak@evenpage}}}%
+ {{\expandonce{\jlreq at align}}{\expandonce{\jlreq at indent}}{\expandonce{\jlreq at end@indent}}{\expandonce{\jlreq at before@space}}{\expandonce{\jlreq at after@space}}{\expandonce{\jlreq at lines}}{\expandonce{\jlreq at afterindent}}{\expandonce{\jlreq at allowbreak@evenpage}}}%
{%
{\expandonce{\jlreq at label@format}}{\expandonce{\jlreq at label@format at modified}}%
{\expandonce{\jlreq at heading@text at format@wlabel}}{\expandonce{\jlreq at heading@text at format@wolabel}}%
@@ -2050,7 +2140,7 @@
{indent}{\def\jlreq at indent{##1}}
{mark}{\def\jlreq at mark{##1}}
{after_space}{%
- \ifdim##1<0pt\ClassWarning{jlreq}{after_space in Runin Heading #1 should be positive}\fi
+ \ifdim\dimexpr##1\relax<0pt\ClassWarning{jlreq}{after_space in Runin Heading #1 should be positive}\fi
\def\jlreq at after@space{##1}%
}
}{#3}%
@@ -2267,13 +2357,13 @@
\renewcommand*{\@seccntformat}[1]{\csname the#1\endcsname}
\if at tate
- \renewcommand{\thepart}{\Kanji{part}}
- \ifthenelse{\equal{\jlreq at article@type}{article}}{}{\renewcommand{\thechapter}{\Kanji{chapter}}}
- \renewcommand{\thesection}{\rensuji{\@arabic\c at section}}
- \renewcommand{\thesubsection}{\rensuji{\@alph\c at subsection}}
- \renewcommand{\thesubsubsection}{\rensuji{\@arabic\c at subsubsection}}
- \renewcommand{\theparagraph}{(\rensuji{\@arabic\c at paragraph})}
- \renewcommand{\thesubparagraph}{(\rensuji{\@arabic\c at subparagraph})}
+ \renewcommand{\thepart}{\jlreq at Kanji{part}}
+ \ifthenelse{\equal{\jlreq at article@type}{article}}{}{\renewcommand{\thechapter}{\jlreq at Kanji{chapter}}}
+ \renewcommand{\thesection}{\jlreq at rensuji{\@arabic\c at section}}
+ \renewcommand{\thesubsection}{\jlreq at rensuji{\@alph\c at subsection}}
+ \renewcommand{\thesubsubsection}{\jlreq at rensuji{\@arabic\c at subsubsection}}
+ \renewcommand{\theparagraph}{(\jlreq at rensuji{\@arabic\c at paragraph})}
+ \renewcommand{\thesubparagraph}{(\jlreq at rensuji{\@arabic\c at subparagraph})}
\ifthenelse{\equal{\jlreq at article@type}{article}}{
\NewBlockHeading{part}{0}{font={\jlreq at keepbaselineskip{\LARGE}},indent=4\jlreq at mol,lines=4,after_label_space=1\jlreq at mol,second_heading_text_indent={-1\jlreq at mol,1\jlreq at mol},subtitle_font={\jlreq at keepbaselineskip{\large}}}
@@ -2283,7 +2373,7 @@
\NewTobiraHeading{part}{-1}{label_format={第\thepart 部\hspace*{1\jlreq at mol}},format={\null\vfill {\Huge\hspace*{2\jlreq at mol}#1#2}\vspace*{2\jlreq at gol}}}
\NewBlockHeading{chapter}{0}{indent=2\jlreq at mol,lines=6,label_format={第\thechapter 章},font={\huge},after_label_space=1\jlreq at mol,second_heading_text_indent={-1\jlreq at mol,1\jlreq at mol},subtitle_font={\jlreq at keepbaselineskip{\Large}}}
\if at twoside\ModifyHeading{chapter}{allowbreak_if_evenpage=true}\fi
- \renewcommand{\thechapter}{\Kanji{chapter}}
+ \renewcommand{\thechapter}{\jlreq at Kanji{chapter}}
}
\NewBlockHeading{section}{1}{font={\jlreq at keepbaselineskip{\Large}},indent=6\jlreq at mol,lines=3,after_label_space=1\jlreq at mol,second_heading_text_indent={-1\jlreq at mol,1\jlreq at mol},subtitle_font={\jlreq at keepbaselineskip{\normalsize}}}
\if at twoside\ModifyHeading{section}{allowbreak_if_evenpage=true}\fi
@@ -2368,31 +2458,37 @@
% \footnoteと\footnotemarkの前後に\jlreq at hook@prenote/\jlreq at hook@postnoteを入れる
\jlreq at saveoriginalcs{footnote}%
+\edef\jlreq at do{
+ \unexpanded{\long\def\jlreq at fixjfm@footnote@[#1]#2}{%
+ \expandonce{\footnote[#1]{#2}}%
+ \noexpand\jlreq at hook@postnote
+ }
+ \unexpanded{\long\def\jlreq at fixjfm@footnote@@#1}{%
+ \expandonce{\footnote{#1}}%
+ \noexpand\jlreq at hook@postnote
+ }
+}
+\jlreq at do
\def\footnote{%
\jlreq at hook@prenote
\@ifnextchar[{\jlreq at fixjfm@footnote@}{\jlreq at fixjfm@footnote@@}%
}
-\long\def\jlreq at fixjfm@footnote@[#1]#2{%
- \jlreq at original@footnote[#1]{#2}%
- \jlreq at hook@postnote
+\edef\jlreq at do{
+ \unexpanded{\def\jlreq at fixjfm@footnotemark@[#1]}{%
+ \expandonce{\footnotemark[#1]}%
+ \noexpand\jlreq at hook@postnote
+ }
+ \unexpanded{\def\jlreq at fixjfm@footnotemark@@}{%
+ \expandonce{\footnotemark}%
+ \noexpand\jlreq at hook@postnote
+ }
}
-\long\def\jlreq at fixjfm@footnote@@#1{%
- \jlreq at original@footnote{#1}%
- \jlreq at hook@postnote
-}
+\jlreq at do
\jlreq at saveoriginalcs{footnotemark}%
\def\footnotemark{%
\jlreq at hook@prenote
\@ifnextchar[{\jlreq at fixjfm@footnotemark@}{\jlreq at fixjfm@footnotemark@@}%
}
-\def\jlreq at fixjfm@footnotemark@[#1]{%
- \jlreq at original@footnotemark[#1]%
- \jlreq at hook@postnote
-}
-\def\jlreq at fixjfm@footnotemark@@{%
- \jlreq at original@footnotemark
- \jlreq at hook@postnote
-}
\newcommand*\jlreq at referencemark@format[1]{#1}
\newif\ifjlreqadjustreferencemark
@@ -2498,7 +2594,7 @@
}
% 4.2.2注3
\if at tate
- \renewcommand*{\thefootnote}{\jlreq at open@bracket at before@space\inhibitglue（\rensuji{\@arabic\c at footnote}）\inhibitglue}
+ \renewcommand*{\thefootnote}{\jlreq at open@bracket at before@space\inhibitglue（\jlreq at rensuji{\@arabic\c at footnote}）\inhibitglue}
\else
\renewcommand*{\thefootnote}{\arabic{footnote}\hbox{}）\inhibitglue}
\fi
@@ -3463,39 +3559,6 @@
\setlength\abovecaptionskip{.5\jlreq at gol}
\setlength\belowcaptionskip{0pt}
-
-% \begin{figure}***\caption{???}\end{figure}を
-% \begin{figure}\layoutfloat{***}\pcaption{???}\end{figure}にする．
-%
-%\long\def\jlreq at replace@layoutfloat#1\caption{\layoutfloat{#1}\jlreq at caption}
-%\long\def\jlreq at caption#1{\jlreq at ifendmark{#1}{}{\pcaption{#1}\csname\jlreq at replace@layoutfloat@#1\endcsname}}
-%\def\jlreq at modify@float#1{%
-% \jlreq at saveoriginalcs{#1}
-% \@namedef{#1}{\@ifnextchar[{\@nameuse{jlreq at float@#1}}{\@nameuse{jlreq at float@@#1}}}
-% \expandafter\long\expandafter\gdef\csname jlreq at float@#1\endcsname[##1]{%
-% \csname jlreq at original@#1\endcsname[##1]%
-% \csname jlreq at process@insertlayoutfloat@#1\endcsname{}%
-% }
-% \expandafter\long\expandafter\gdef\csname jlreq at float@@#1\endcsname{%
-% \csname jlreq at original@#1\endcsname
-% \csname jlreq at process@insertlayoutfloat@#1\endcsname{}%
-% }
-% \expandafter\long\expandafter\gdef\csname jlreq at process@insertlayoutfloat@#1\endcsname ##1##2\end{%
-% \csname jlreq at checkenvname@#1\endcsname{##1##2}\end
-% }
-% \expandafter\long\expandafter\gdef\csname jlreq at checkenvname@#1\endcsname ##1\end##2{%
-% \def\@tempa{##2}%
-% \def\@tempb{#1}%
-% \ifx\@tempa\@tempb
-% \def\jlreq at next{\jlreq at replace@layoutfloat##1\caption{\jlreq at endmark}\end{##2}}%
-% \else
-% \def\jlreq at next{\csname jlreq at process@insertlayoutfloat@#1\endcsname{##1\end{##2}}}%
-% \fi
-% \jlreq at next
-% }
-%}
-%\jlreq at aftercls@addtodeletecs{\jlreq at modify@float}
-
%.. figure環境
\newcounter{figure}
\renewcommand*{\thefigure}{\arabic{figure}}
@@ -3507,11 +3570,6 @@
\newenvironment{figure*}{\@dblfloat{figure}}{\end at dblfloat}
\newcommand*{\listfigurename}{図目次}
\newcommand{\figurename}{図}
-\if at tate
- \DeclareLayoutCaption{figure}<y>(\floatwidth)[cr]
-\fi
-%\jlreq at modify@float{figure}
-%\jlreq at modify@float{figure*}
%.. table環境
\newcounter{table}
@@ -3524,11 +3582,6 @@
\newenvironment{table*}{\@dblfloat{table}}{\end at dblfloat}
\newcommand{\listtablename}{表目次}
\newcommand{\tablename}{表}
-\if at tate
- \DeclareLayoutCaption{table}<y>(\floatwidth)[cr]
-\fi
-%\jlreq at modify@float{table}
-%\jlreq at modify@float{table*}
%. タイトル周り
\newenvironment{titlepage}{%
@@ -3726,10 +3779,11 @@
%. 箇条書き．cf. JISX4051 8.4
% 用語定義型
\newenvironment{description}{\list{}{%
- \setlength{\leftmargin}{0\jlreq at mol}% 下げない
- \setlength{\labelwidth}{0\jlreq at mol}%
- \addtolength{\leftmargin}{\leftskip}%
- \addtolength{\leftmargin}{\labelsep}%
+ \setlength{\leftmargin}{0\zw}% 下げない
+ \setlength{\labelwidth}{0\zw}%
+ \setlength{\labelsep}{1\zw}
+% \addtolength{\leftmargin}{\leftskip}% たぶんこの二行いらない……
+% \addtolength{\leftmargin}{\labelsep}%
\let\makelabel=\descriptionlabel
% 同行じゃない場合はこんな感じ？
% \let\jlreq at original@@item=\@item
@@ -3792,10 +3846,10 @@
}
\if at tate
- \renewcommand{\theenumi}{\Kanji{enumi}}
- \renewcommand{\theenumii}{\rensuji{\@arabic\c at enumii}}
- \renewcommand{\theenumiii}{\rensuji{\@arabic\c at enumiii}}
- \renewcommand{\theenumiv}{\rensuji{\@arabic\c at enumiv}}
+ \renewcommand{\theenumi}{\jlreq at Kanji{enumi}}
+ \renewcommand{\theenumii}{\jlreq at rensuji{\@arabic\c at enumii}}
+ \renewcommand{\theenumiii}{\jlreq at rensuji{\@arabic\c at enumiii}}
+ \renewcommand{\theenumiv}{\jlreq at rensuji{\@arabic\c at enumiv}}
\fi
\newcommand{\labelenumi}{\theenumi}
\newcommand{\labelenumii}{\theenumii}
@@ -3883,10 +3937,6 @@
\setlength\tabcolsep{.5\jlreq at gol}
\setlength\arraycolsep{.5\jlreq at mol}
% 4.4.3.j
-%\RequirePackage{tabls} % plextと整合的でない
-%\setlength\extrarulesep{.25\jlreq at gol}
-%\setlength\tablinesep{.25\jlreq at gol}
-%\renewcommand{\arraystretch}{0}
\setlength\arrayrulewidth{\jlreq at omotekeiwidth} % 4.4.3.c
\setlength\doublerulesep{2pt}
\setlength\tabbingsep{\labelsep}
@@ -3910,7 +3960,7 @@
\protected at write\@auxout
{\let\label\@gobble \let\index\@gobble \let\glossary\@gobble
\if at tate
- \@temptokena{\rensuji{\thepage}}%
+ \@temptokena{\jlreq at rensuji{\thepage}}%
\else
\@temptokena{\thepage}%
\fi
@@ -4099,7 +4149,7 @@
\setcounter{subsection}{0}%
\gdef\thesection{\@Alph\c at section}%
\if at tate
- \def\thesection{\rensuji{\Alph{section}}}%
+ \def\thesection{\jlreq at rensuji{\Alph{section}}}%
\else
\def\thesection{\Alph{section}}%
\fi
@@ -4108,7 +4158,7 @@
\appto\appendix{%
\setcounter{chapter}{0}%
\if at tate
- \def\thechapter{\rensuji{\Alph{chapter}}}%
+ \def\thechapter{\jlreq at rensuji{\Alph{chapter}}}%
\else
\def\thechapter{\Alph{chapter}}%
\fi
@@ -4131,13 +4181,19 @@
\ifnum\jlreq at lastnodechar=-1\else
\inhibitglue
\jlreq at calc@jfmglue{\char\jlreq at lastnodechar}{阿}%
- \ifdim\jlreq at resultskip=0pt\else\hskip\jlreq at resultskip\fi
+ \edef\@tempa{\the\jlreq at resultskip}%
+ \edef\@tempb{\detokenize{0.0pt}}%
+ \ifx\@tempa\@tempb\else\hskip\jlreq at resultskip\fi
\fi
- \hbox{\yoko \vrule width 0pt height 0.88\zw depth 0.12\zw #1}%
+ \hbox{\yoko
+ \setbox\jlreq at tempboxa=\hbox{阿}%
+ \vrule width 0pt height \ht\jlreq at tempboxa depth \dp\jlreq at tempboxa #1}%
\def\jlreq at do{%
\jlreq at isletter{\jlreq at nextchar}{%
- \jlreq at calc@jfmglue{\jlreq at nextchar}{阿}%
- \ifdim\jlreq at resultskip=0pt\else\hskip\jlreq at resultskip\fi
+ \jlreq at calc@jfmglue{阿}{\jlreq at nextchar}%
+ \edef\@tempa{\the\jlreq at resultskip}%
+ \edef\@tempb{\detokenize{0.0pt}}%
+ \ifx\@tempa\@tempb\else\hskip\jlreq at resultskip\fi
\inhibitglue
}{}%
}%
@@ -4187,8 +4243,14 @@
\AtEndOfPackageFile*{amsthm}{%
\jlreq at saveoriginalcs{proof}%
\jlreq at saveoriginalcs{endproof}%
+ \edef\jlreq at do{
+ \unexpanded{\def\jlreq at proof[#1]}{%
+ \labelsep=1\jlreq at mol
+ \expandonce{\proof[{\normalfont\sffamily\bfseries #1\inhibitglue}\nopunct]}%
+ }
+ }
+ \jlreq at do
\def\proof{\@ifnextchar[{\jlreq at proof}{\jlreq at proof[\proofname]}}
- \def\jlreq at proof[#1]{\labelsep=1\jlreq at mol\jlreq at original@proof[{\normalfont\sffamily\bfseries #1\inhibitglue}\nopunct]}
\renewcommand{\proofname}{証明}
\jlreq at setupamsthm
\theoremstyle{jlreq}
Modified: trunk/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua 2017-06-11 21:45:58 UTC (rev 44562)
+++ trunk/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua 2017-06-11 21:48:10 UTC (rev 44563)
@@ -198,7 +198,7 @@
[25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空けpriority = {0,-1}段階
[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}},-- 空けpriority = {0,-1}段階
--[[
[28] = {0, 0, 0},
[29] = {0, 0, 0},
@@ -355,14 +355,14 @@
[6] = {0, 0, 0},
[7] = {0, 0, 0},
[8] = {0, 0, 0},
- [9] = {0, 0.25, 0, priority = {0,0}},
- [10] = {0, 0.25, 0, priority = {0,0}},
- [11] = {0, 0.25, 0, priority = {0,0}},
- [12] = {0, 0.25, 0, priority = {0,0}},
- [13] = {0, 0.25, 0, priority = {0,0}},
+-- [9] = {0, 0.25, 0, priority = {0,0}},
+-- [10] = {0, 0.25, 0, priority = {0,0}},
+-- [11] = {0, 0.25, 0, priority = {0,0}},
+-- [12] = {0, 0.25, 0, priority = {0,0}},
+-- [13] = {0, 0.25, 0, priority = {0,0}},
[14] = {0, 0, 0},
- [15] = {0, 0.25, 0, priority = {0,0}},
- [16] = {0, 0.25, 0, priority = {0,0}},
+-- [15] = {0, 0.25, 0, priority = {0,0}},
+-- [16] = {0, 0.25, 0, priority = {0,0}},
[0] = {0, 0.25, 0, priority = {0,0}},
--[[
[20] = {0, 0, 0},
@@ -397,15 +397,14 @@
[6] = {0, 0, 0},
[7] = {0, 0, 0},
[8] = {0, 0, 0},
- [9] = {0, 0.25, 0, priority = {0,0}},
- [10] = {0, 0.25, 0, priority = {0,0}},
- [11] = {0, 0.25, 0, priority = {0,0}},
- [12] = {0, 0.25, 0, priority = {0,0}},
- [13] = {0, 0.25, 0, priority = {0,0}},
+-- [9] = {0, 0.25, 0, priority = {0,0}},
+-- [10] = {0, 0.25, 0, priority = {0,0}},
+-- [11] = {0, 0.25, 0, priority = {0,0}},
+-- [12] = {0, 0.25, 0, priority = {0,0}},
+-- [13] = {0, 0.25, 0, priority = {0,0}},
[14] = {0, 0, 0},
- [15] = {0, 0.25, 0, priority = {0,0}},
- [16] = {0, 0.25, 0, priority = {0,0}},
--- [0] = {0, 0.25, 0, priority = {0,0}},
+-- [15] = {0, 0.25, 0, priority = {0,0}},
+-- [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}段階
@@ -439,15 +438,14 @@
[6] = {0, 0, 0},
[7] = {0, 0, 0},
[8] = {0, 0, 0},
- [9] = {0, 0.25, 0, priority = {0,0}},
- [10] = {0, 0.25, 0, priority = {0,0}},
- [11] = {0, 0.25, 0, priority = {0,0}},
- [12] = {0, 0.25, 0, priority = {0,0}},
- [13] = {0, 0.25, 0, priority = {0,0}},
+-- [9] = {0, 0.25, 0, priority = {0,0}},
+-- [10] = {0, 0.25, 0, priority = {0,0}},
+-- [11] = {0, 0.25, 0, priority = {0,0}},
+-- [12] = {0, 0.25, 0, priority = {0,0}},
+-- [13] = {0, 0.25, 0, priority = {0,0}},
[14] = {0, 0, 0},
- [15] = {0, 0.25, 0, priority = {0,0}},
- [16] = {0, 0.25, 0, priority = {0,0}},
--- [0] = {0, 0.25, 0, priority = {0,0}},
+-- [15] = {0, 0.25, 0, priority = {0,0}},
+-- [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}段階
@@ -481,15 +479,14 @@
[6] = {0, 0, 0},
[7] = {0, 0, 0},
[8] = {0, 0, 0},
- [9] = {0, 0.25, 0, priority = {0,0}},
- [10] = {0, 0.25, 0, priority = {0,0}},
- [11] = {0, 0.25, 0, priority = {0,0}},
- [12] = {0, 0.25, 0, priority = {0,0}},
- [13] = {0, 0.25, 0, priority = {0,0}},
+-- [9] = {0, 0.25, 0, priority = {0,0}},
+-- [10] = {0, 0.25, 0, priority = {0,0}},
+-- [11] = {0, 0.25, 0, priority = {0,0}},
+-- [12] = {0, 0.25, 0, priority = {0,0}},
+-- [13] = {0, 0.25, 0, priority = {0,0}},
[14] = {0, 0, 0},
- [15] = {0, 0.25, 0, priority = {0,0}},
- [16] = {0, 0.25, 0, priority = {0,0}},
--- [0] = {0, 0.25, 0, priority = {0,0}},
+-- [15] = {0, 0.25, 0, priority = {0,0}},
+-- [16] = {0, 0.25, 0, priority = {0,0}},
--[[
[20] = {0, 0, 0},
[21] = {0.25, 0, 0.125, ratio = 0, priority = {1,-3}},
@@ -522,16 +519,16 @@
[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}},
[6] = {0, 0, 0},
[7] = {0, 0, 0},
- [8] = {0, 0.25, 0, priority = {0,0}},
- [9] = {0, 0.25, 0, priority = {0,0}},
- [10] = {0, 0.25, 0, priority = {0,0}},
- [11] = {0, 0.25, 0, priority = {0,0}},
- [12] = {0, 0.25, 0, priority = {0,0}},
- [13] = {0, 0.25, 0, priority = {0,0}},
+-- [8] = {0, 0.25, 0, priority = {0,0}},
+-- [9] = {0, 0.25, 0, priority = {0,0}},
+-- [10] = {0, 0.25, 0, priority = {0,0}},
+-- [11] = {0, 0.25, 0, priority = {0,0}},
+-- [12] = {0, 0.25, 0, priority = {0,0}},
+-- [13] = {0, 0.25, 0, priority = {0,0}},
[14] = {0, 0, 0},
- [15] = {0, 0.25, 0, priority = {0,0}},
- [16] = {0, 0.25, 0, priority = {0,0}},
- [0] = {0, 0.25, 0, priority = {0,0}},
+-- [15] = {0, 0.25, 0, priority = {0,0}},
+-- [16] = {0, 0.25, 0, priority = {0,0}},
+-- [0] = {0, 0.25, 0, priority = {0,0}},
--[[
[20] = {0, 0, 0},
[21] = {0, 0.25, 0, priority = {0,0}},
@@ -564,15 +561,15 @@
[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}},
[6] = {0, 0, 0},
[7] = {0, 0, 0},
- [8] = {0, 0.25, 0, priority = {0,0}},
- [9] = {0, 0.25, 0, priority = {0,0}},
- [10] = {0, 0.25, 0, priority = {0,0}},
- [11] = {0, 0.25, 0, priority = {0,0}},
- [12] = {0, 0.25, 0, priority = {0,0}},
- [13] = {0, 0.25, 0, priority = {0,0}},
+-- [8] = {0, 0.25, 0, priority = {0,0}},
+-- [9] = {0, 0.25, 0, priority = {0,0}},
+-- [10] = {0, 0.25, 0, priority = {0,0}},
+-- [11] = {0, 0.25, 0, priority = {0,0}},
+-- [12] = {0, 0.25, 0, priority = {0,0}},
+-- [13] = {0, 0.25, 0, priority = {0,0}},
[14] = {0, 0, 0},
- [15] = {0, 0.25, 0, priority = {0,0}},
- [16] = {0, 0.25, 0, priority = {0,0}},
+-- [15] = {0, 0.25, 0, priority = {0,0}},
+-- [16] = {0, 0.25, 0, priority = {0,0}},
[0] = {0, 0.25, 0, priority = {0,0}},
--[[
[20] = {0, 0, 0},
@@ -648,16 +645,15 @@
[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}},
[6] = {0, 0, 0},
[7] = {0, 0, 0},
- [8] = {0, 0.25, 0, priority = {0,0}},
- [9] = {0, 0.25, 0, priority = {0,0}},
- [10] = {0, 0.25, 0, priority = {0,0}},
- [11] = {0, 0.25, 0, priority = {0,0}},
- [12] = {0, 0.25, 0, priority = {0,0}},
- [13] = {0, 0.25, 0, priority = {0,0}},
+-- [8] = {0, 0.25, 0, priority = {0,0}},
+-- [9] = {0, 0.25, 0, priority = {0,0}},
+-- [10] = {0, 0.25, 0, priority = {0,0}},
+-- [11] = {0, 0.25, 0, priority = {0,0}},
+-- [12] = {0, 0.25, 0, priority = {0,0}},
+-- [13] = {0, 0.25, 0, priority = {0,0}},
[14] = {0, 0, 0},
- [15] = {0, 0.25, 0, priority = {0,0}},
- [16] = {0, 0.25, 0, priority = {0,0}},
--- [0] = {0, 0.25, 0, priority = {0,0}},
+-- [15] = {0, 0.25, 0, priority = {0,0}},
+-- [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}段階
@@ -690,16 +686,15 @@
[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}},
[6] = {0, 0, 0},
[7] = {0, 0, 0},
- [8] = {0, 0.25, 0, priority = {0,0}},
- [9] = {0, 0.25, 0, priority = {0,0}},
- [10] = {0, 0.25, 0, priority = {0,0}},
- [11] = {0, 0.25, 0, priority = {0,0}},
- [12] = {0, 0.25, 0, priority = {0,0}},
- [13] = {0, 0.25, 0, priority = {0,0}},
+-- [8] = {0, 0.25, 0, priority = {0,0}},
+-- [9] = {0, 0.25, 0, priority = {0,0}},
+-- [10] = {0, 0.25, 0, priority = {0,0}},
+-- [11] = {0, 0.25, 0, priority = {0,0}},
+-- [12] = {0, 0.25, 0, priority = {0,0}},
+-- [13] = {0, 0.25, 0, priority = {0,0}},
[14] = {0, 0, 0},
- [15] = {0, 0.25, 0, priority = {0,0}},
- [16] = {0, 0.25, 0, priority = {0,0}},
--- [0] = {0, 0.25, 0, priority = {0,0}},
+-- [15] = {0, 0.25, 0, priority = {0,0}},
+-- [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}段階
@@ -748,15 +743,9 @@
[6] = {0, 0, 0},
[7] = {0, 0, 0},
[8] = {0, 0.25, 0, priority = {0,0}},
--- [9] = {0, 0.25, 0, priority = {0,0}},
--- [10] = {0, 0.25, 0, priority = {0,0}},
--- [11] = {0, 0.25, 0, priority = {0,0}},
[12] = {0, 0.25, 0, priority = {0,0}},
[13] = {0, 0.25, 0, priority = {0,0}},
[14] = {0, 0, 0},
--- [15] = {0, 0.25, 0, priority = {0,0}},
--- [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 = {0,-1}段階
@@ -766,7 +755,7 @@
[25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},-- 空け priority = {0,-1}段階
[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}},-- 空け priority = {0,-1}段階
--[[
[28] = {0, 0.25, 0, priority = {0,0}},
[29] = {0, 0, 0},
@@ -1168,15 +1157,6 @@
},
}
-for k,v in pairs(jfm) do
- if type(k) == "number" then
- for kk,vv in pairs(v.glue) do
- vv.kanjiskip_natural = 1
- vv.kanjiskip_stretch = 1
- end
- end
-end
-
local function add_space(before,after,glueorkern,space,ratio)
if jfm[before][glueorkern] == nil then jfm[before][glueorkern] = {} end
if jfm[before][glueorkern][after] == nil then jfm[before][glueorkern][after] = {0} end
Modified: trunk/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreqv.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreqv.lua 2017-06-11 21:45:58 UTC (rev 44562)
+++ trunk/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreqv.lua 2017-06-11 21:48:10 UTC (rev 44563)
@@ -7,54 +7,24 @@
0.5,
0,
0.5,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -2 },
["ratio"]=1,
},
- {
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [4]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
+ { 0, 0, 0 },
+ [4]={ 0, 0, 0 },
[5]={
0.25,
0,
0.25,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -1 },
["ratio"]=1,
},
- [6]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [7]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
+ [6]={ 0, 0, 0 },
+ [7]={ 0, 0, 0 },
[8]={
0,
0.25,
0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, 0 },
},
[12]={
@@ -61,8 +31,6 @@
0,
0.25,
0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, 0 },
},
[13]={
@@ -69,47 +37,12 @@
0,
0.25,
0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, 0 },
},
- [14]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [27]={
- 0.25,
- 0.25,
- 0.125,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 1, -3 },
- ["ratio"]=0,
- },
- [300]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [301]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [302]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
+ [14]={ 0, 0, 0 },
+ [300]={ 0, 0, 0 },
+ [301]={ 0, 0, 0 },
+ [302]={ 0, 0, 0 },
},
["height"]=0.5,
["left"]=0,
@@ -120,141 +53,31 @@
["chars"]={ "（", "〔", "［", "｛", "〈", "《", "「", "『", "【", "｟", "〘", "〖", "«", "〝", "‘", "“" },
["depth"]=0.5,
["glue"]={
- [0]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- {
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- {
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [4]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
+ [0]={ 0, 0, 0 },
+ { 0, 0, 0 },
+ { 0, 0, 0 },
+ [4]={ 0, 0, 0 },
[5]={
0.25,
0,
0.25,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -1 },
["ratio"]=1,
},
- [6]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [7]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [8]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [9]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [10]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [11]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [12]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [13]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [14]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [15]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [16]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [300]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [301]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [302]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
+ [6]={ 0, 0, 0 },
+ [7]={ 0, 0, 0 },
+ [8]={ 0, 0, 0 },
+ [9]={ 0, 0, 0 },
+ [10]={ 0, 0, 0 },
+ [11]={ 0, 0, 0 },
+ [12]={ 0, 0, 0 },
+ [13]={ 0, 0, 0 },
+ [14]={ 0, 0, 0 },
+ [15]={ 0, 0, 0 },
+ [16]={ 0, 0, 0 },
+ [300]={ 0, 0, 0 },
+ [301]={ 0, 0, 0 },
+ [302]={ 0, 0, 0 },
},
["height"]=0.5,
["width"]=0.5,
@@ -269,8 +92,6 @@
0.5,
0,
0.5,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -2 },
["ratio"]=0,
},
@@ -278,24 +99,14 @@
0.5,
0,
0.5,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -2 },
["ratio"]=0,
},
- {
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
+ { 0, 0, 0 },
[4]={
0.5,
0,
0.5,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -2 },
["ratio"]=0,
},
@@ -303,31 +114,15 @@
0.25,
0,
0.25,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -1 },
["ratio"]=1,
},
- [6]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [7]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
+ [6]={ 0, 0, 0 },
+ [7]={ 0, 0, 0 },
[8]={
0.5,
0,
0.5,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -2 },
["ratio"]=0,
},
@@ -335,8 +130,6 @@
0.5,
0,
0.5,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -2 },
["ratio"]=0,
},
@@ -344,8 +137,6 @@
0.5,
0,
0.5,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -2 },
["ratio"]=0,
},
@@ -353,8 +144,6 @@
0.5,
0,
0.5,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -2 },
["ratio"]=0,
},
@@ -362,8 +151,6 @@
0.5,
0,
0.5,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -2 },
["ratio"]=0,
},
@@ -371,24 +158,14 @@
0.5,
0,
0.5,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -2 },
["ratio"]=0,
},
- [14]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
+ [14]={ 0, 0, 0 },
[15]={
0.5,
0,
0.5,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -2 },
["ratio"]=0,
},
@@ -396,8 +173,6 @@
0.5,
0,
0.5,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -2 },
["ratio"]=0,
},
@@ -405,8 +180,6 @@
0.5,
0,
0.5,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -2 },
["ratio"]=0,
},
@@ -414,8 +187,6 @@
0.5,
0,
0.5,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -2 },
["ratio"]=0,
},
@@ -423,8 +194,6 @@
0.5,
0,
0.5,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -2 },
["ratio"]=0,
},
@@ -441,141 +210,32 @@
0.5,
0.5,
0.5,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -2 },
["ratio"]=1,
},
- {
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [4]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
+ { 0, 0, 0 },
+ [4]={ 0, 0, 0 },
[5]={
0.25,
0,
0.25,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -1 },
["ratio"]=1,
},
- [6]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [7]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [8]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [9]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [10]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [11]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [12]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [13]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [14]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [15]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [16]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [27]={
- 0.25,
- 0.25,
- 0.125,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 1, -3 },
- ["ratio"]=0,
- },
- [300]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [301]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [302]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
+ [6]={ 0, 0, 0 },
+ [7]={ 0, 0, 0 },
+ [8]={ 0, 0, 0 },
+ [9]={ 0, 0, 0 },
+ [10]={ 0, 0, 0 },
+ [11]={ 0, 0, 0 },
+ [12]={ 0, 0, 0 },
+ [13]={ 0, 0, 0 },
+ [14]={ 0, 0, 0 },
+ [15]={ 0, 0, 0 },
+ [16]={ 0, 0, 0 },
+ [300]={ 0, 0, 0 },
+ [301]={ 0, 0, 0 },
+ [302]={ 0, 0, 0 },
},
["height"]=0.5,
["width"]=1,
@@ -590,8 +250,6 @@
0.25,
0,
0.25,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -1 },
["ratio"]=0,
},
@@ -599,8 +257,6 @@
0.25,
0,
0.25,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -1 },
["ratio"]=0,
},
@@ -608,8 +264,6 @@
0.25,
0,
0.25,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -1 },
["ratio"]=0,
},
@@ -617,8 +271,6 @@
0.25,
0,
0.25,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -1 },
["ratio"]=0,
},
@@ -626,8 +278,6 @@
0.5,
0,
0.5,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -1 },
["ratio"]=0.5,
},
@@ -635,8 +285,6 @@
0.25,
0,
0.25,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -1 },
["ratio"]=0,
},
@@ -644,8 +292,6 @@
0.25,
0,
0.25,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -1 },
["ratio"]=0,
},
@@ -653,8 +299,6 @@
0.25,
0,
0.25,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -1 },
["ratio"]=0,
},
@@ -662,8 +306,6 @@
0.25,
0,
0.25,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -1 },
["ratio"]=0,
},
@@ -671,8 +313,6 @@
0.25,
0,
0.25,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -1 },
["ratio"]=0,
},
@@ -680,8 +320,6 @@
0.25,
0,
0.25,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -1 },
["ratio"]=0,
},
@@ -689,8 +327,6 @@
0.25,
0,
0.25,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -1 },
["ratio"]=0,
},
@@ -698,8 +334,6 @@
0.25,
0,
0.25,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -1 },
["ratio"]=0,
},
@@ -707,8 +341,6 @@
0.25,
0,
0.25,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -1 },
["ratio"]=0,
},
@@ -716,8 +348,6 @@
0.25,
0,
0.25,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -1 },
["ratio"]=0,
},
@@ -725,8 +355,6 @@
0.25,
0,
0.25,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -1 },
["ratio"]=0,
},
@@ -734,8 +362,6 @@
0.25,
0,
0.25,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -1 },
["ratio"]=0,
},
@@ -743,8 +369,6 @@
0.25,
0,
0.25,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -1 },
["ratio"]=0,
},
@@ -752,8 +376,6 @@
0.25,
0,
0.25,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -1 },
["ratio"]=0,
},
@@ -761,8 +383,6 @@
0.25,
0,
0.25,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -1 },
["ratio"]=0,
},
@@ -780,8 +400,6 @@
0.5,
0,
0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["ratio"]=0,
},
{
@@ -788,23 +406,13 @@
0.5,
0,
0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["ratio"]=0,
},
- {
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
+ { 0, 0, 0 },
[4]={
0.5,
0,
0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["ratio"]=0,
},
[5]={
@@ -811,31 +419,15 @@
0.75,
0,
0.25,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -1 },
["ratio"]=0.33333333,
},
- [6]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [7]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
+ [6]={ 0, 0, 0 },
+ [7]={ 0, 0, 0 },
[8]={
0.5,
0,
0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["ratio"]=0,
},
[9]={
@@ -842,8 +434,6 @@
0.5,
0,
0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["ratio"]=0,
},
[10]={
@@ -850,8 +440,6 @@
0.5,
0,
0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["ratio"]=0,
},
[11]={
@@ -858,8 +446,6 @@
0.5,
0,
0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["ratio"]=0,
},
[12]={
@@ -866,8 +452,6 @@
0.5,
0,
0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["ratio"]=0,
},
[13]={
@@ -874,8 +458,6 @@
0.5,
0,
0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["ratio"]=0,
},
[14]={
@@ -882,8 +464,6 @@
0.5,
0,
0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["ratio"]=0,
},
[15]={
@@ -890,8 +470,6 @@
0.5,
0,
0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["ratio"]=0,
},
[16]={
@@ -898,8 +476,6 @@
0.5,
0,
0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["ratio"]=0,
},
[27]={
@@ -906,8 +482,6 @@
0.5,
0,
0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["ratio"]=0,
},
[300]={
@@ -914,8 +488,6 @@
0.5,
0,
0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["ratio"]=0,
},
[301]={
@@ -922,8 +494,6 @@
0.5,
0,
0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["ratio"]=0,
},
[302]={
@@ -930,8 +500,6 @@
0.5,
0,
0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["ratio"]=0,
},
},
@@ -948,8 +516,6 @@
0.5,
0,
0.5,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -2 },
["ratio"]=0,
},
@@ -957,24 +523,14 @@
0.5,
0,
0.5,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -2 },
["ratio"]=0,
},
- {
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
+ { 0, 0, 0 },
[4]={
0.5,
0,
0.5,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -2 },
["ratio"]=0,
},
@@ -982,31 +538,15 @@
0.75,
0,
0.75,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -1 },
["ratio"]=0.33333333,
},
- [6]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [7]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
+ [6]={ 0, 0, 0 },
+ [7]={ 0, 0, 0 },
[8]={
0.5,
0,
0.5,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -2 },
["ratio"]=0,
},
@@ -1014,8 +554,6 @@
0.5,
0,
0.5,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -2 },
["ratio"]=0,
},
@@ -1023,8 +561,6 @@
0.5,
0,
0.5,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -2 },
["ratio"]=0,
},
@@ -1032,8 +568,6 @@
0.5,
0,
0.5,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -2 },
["ratio"]=0,
},
@@ -1041,8 +575,6 @@
0.5,
0,
0.5,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -2 },
["ratio"]=0,
},
@@ -1050,8 +582,6 @@
0.5,
0,
0.5,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -2 },
["ratio"]=0,
},
@@ -1059,8 +589,6 @@
0.5,
0,
0.5,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -2 },
["ratio"]=0,
},
@@ -1068,8 +596,6 @@
0.5,
0,
0.5,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -2 },
["ratio"]=0,
},
@@ -1077,8 +603,6 @@
0.5,
0,
0.5,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -2 },
["ratio"]=0,
},
@@ -1086,8 +610,6 @@
0.5,
0,
0.5,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -2 },
["ratio"]=0,
},
@@ -1095,8 +617,6 @@
0.5,
0,
0.5,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -2 },
["ratio"]=0,
},
@@ -1104,8 +624,6 @@
0.5,
0,
0.5,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -2 },
["ratio"]=0,
},
@@ -1113,8 +631,6 @@
0.5,
0,
0.5,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -2 },
["ratio"]=0,
},
@@ -1131,8 +647,6 @@
0,
0.25,
0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, 0 },
},
{
@@ -1139,147 +653,31 @@
0.5,
0,
0.5,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -2 },
["ratio"]=1,
},
- {
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [4]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
+ { 0, 0, 0 },
+ [4]={ 0, 0, 0 },
[5]={
0.25,
0,
0.25,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -1 },
["ratio"]=1,
},
- [6]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [7]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [8]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [9]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [10]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [11]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [12]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [13]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [14]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [15]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [16]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
+ [6]={ 0, 0, 0 },
+ [7]={ 0, 0, 0 },
+ [8]={ 0, 0, 0 },
+ [14]={ 0, 0, 0 },
[27]={
0,
0.25,
0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, 0 },
},
- [300]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [301]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [302]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
+ [300]={ 0, 0, 0 },
+ [301]={ 0, 0, 0 },
+ [302]={ 0, 0, 0 },
},
["height"]=0.5,
["width"]=1,
@@ -1293,148 +691,32 @@
0.5,
0,
0.5,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -2 },
["ratio"]=1,
},
- {
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [4]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
+ { 0, 0, 0 },
+ [4]={ 0, 0, 0 },
[5]={
0.25,
0,
0.25,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -1 },
["ratio"]=1,
},
- [6]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [7]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [8]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [9]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [10]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [11]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [12]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [13]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [14]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [15]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [16]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
+ [6]={ 0, 0, 0 },
+ [7]={ 0, 0, 0 },
+ [8]={ 0, 0, 0 },
+ [14]={ 0, 0, 0 },
[27]={
0.25,
0.25,
0.125,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 1, -3 },
["ratio"]=0,
},
- [300]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [301]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [302]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
+ [300]={ 0, 0, 0 },
+ [301]={ 0, 0, 0 },
+ [302]={ 0, 0, 0 },
},
["height"]=0.5,
},
@@ -1447,148 +729,32 @@
0.5,
0,
0.5,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -2 },
["ratio"]=1,
},
- {
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [4]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
+ { 0, 0, 0 },
+ [4]={ 0, 0, 0 },
[5]={
0.25,
0,
0.25,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -1 },
["ratio"]=1,
},
- [6]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [7]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [8]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [9]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [10]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [11]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [12]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [13]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [14]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [15]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [16]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
+ [6]={ 0, 0, 0 },
+ [7]={ 0, 0, 0 },
+ [8]={ 0, 0, 0 },
+ [14]={ 0, 0, 0 },
[27]={
0.25,
0.25,
0.125,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 1, -3 },
["ratio"]=0,
},
- [300]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [301]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [302]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
+ [300]={ 0, 0, 0 },
+ [301]={ 0, 0, 0 },
+ [302]={ 0, 0, 0 },
},
["height"]=0.5,
},
@@ -1601,148 +767,32 @@
0.5,
0,
0.5,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -2 },
["ratio"]=1,
},
- {
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [4]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
+ { 0, 0, 0 },
+ [4]={ 0, 0, 0 },
[5]={
0.25,
0,
0.25,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -1 },
["ratio"]=1,
},
- [6]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [7]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [8]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [9]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [10]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [11]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [12]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [13]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [14]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [15]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [16]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
+ [6]={ 0, 0, 0 },
+ [7]={ 0, 0, 0 },
+ [8]={ 0, 0, 0 },
+ [14]={ 0, 0, 0 },
[27]={
0.25,
0,
0.125,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 1, -3 },
["ratio"]=0,
},
- [300]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [301]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [302]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
+ [300]={ 0, 0, 0 },
+ [301]={ 0, 0, 0 },
+ [302]={ 0, 0, 0 },
},
["height"]=0.5,
},
@@ -1751,160 +801,34 @@
["chars"]={ "￥", "＄", "￡", "＃", "€", "№" },
["depth"]=0.5,
["glue"]={
- [0]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
{
0.5,
0,
0.5,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -2 },
["ratio"]=1,
},
- {
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [4]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
+ { 0, 0, 0 },
+ [4]={ 0, 0, 0 },
[5]={
0.25,
0,
0.25,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -1 },
["ratio"]=1,
},
- [6]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [7]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [8]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [9]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [10]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [11]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [12]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [13]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [14]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [15]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [16]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
+ [6]={ 0, 0, 0 },
+ [7]={ 0, 0, 0 },
+ [14]={ 0, 0, 0 },
[27]={
0,
0.25,
0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, 0 },
},
- [300]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [301]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [302]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
+ [300]={ 0, 0, 0 },
+ [301]={ 0, 0, 0 },
+ [302]={ 0, 0, 0 },
},
["height"]=0.5,
},
@@ -1917,8 +841,6 @@
0,
0.25,
0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, 0 },
},
{
@@ -1925,148 +847,30 @@
0.5,
0,
0.5,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -2 },
["ratio"]=1,
},
- {
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [4]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
+ { 0, 0, 0 },
+ [4]={ 0, 0, 0 },
[5]={
0.25,
0,
0.25,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -1 },
["ratio"]=1,
},
- [6]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [7]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [8]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [9]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [10]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [11]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [12]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [13]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [14]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [15]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [16]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
+ [6]={ 0, 0, 0 },
+ [7]={ 0, 0, 0 },
+ [14]={ 0, 0, 0 },
[27]={
0,
0.25,
0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, 0 },
},
- [300]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [301]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [302]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
+ [300]={ 0, 0, 0 },
+ [301]={ 0, 0, 0 },
+ [302]={ 0, 0, 0 },
},
["height"]=0.5,
},
@@ -2075,148 +879,32 @@
["chars"]={ " " },
["depth"]=0.5,
["glue"]={
- [0]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- {
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- {
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [4]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
+ [0]={ 0, 0, 0 },
+ { 0, 0, 0 },
+ { 0, 0, 0 },
+ [4]={ 0, 0, 0 },
[5]={
0.25,
0,
0.25,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -1 },
["ratio"]=1,
},
- [6]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [7]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [8]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [9]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [10]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [11]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [12]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [13]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [14]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [15]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [16]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [27]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [300]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [301]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [302]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
+ [6]={ 0, 0, 0 },
+ [7]={ 0, 0, 0 },
+ [8]={ 0, 0, 0 },
+ [9]={ 0, 0, 0 },
+ [10]={ 0, 0, 0 },
+ [11]={ 0, 0, 0 },
+ [12]={ 0, 0, 0 },
+ [13]={ 0, 0, 0 },
+ [14]={ 0, 0, 0 },
+ [15]={ 0, 0, 0 },
+ [16]={ 0, 0, 0 },
+ [27]={ 0, 0, 0 },
+ [300]={ 0, 0, 0 },
+ [301]={ 0, 0, 0 },
+ [302]={ 0, 0, 0 },
},
["height"]=0.5,
["width"]=1,
@@ -2230,149 +918,31 @@
0.5,
0,
0.5,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -2 },
["ratio"]=1,
},
- {
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [4]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
+ { 0, 0, 0 },
+ [4]={ 0, 0, 0 },
[5]={
0.25,
0,
0.25,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -1 },
["ratio"]=1,
},
- [6]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [7]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [8]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [9]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [10]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [11]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [12]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [13]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [14]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [15]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [16]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
+ [6]={ 0, 0, 0 },
+ [7]={ 0, 0, 0 },
+ [14]={ 0, 0, 0 },
[27]={
0.25,
0.25,
0.125,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 1, -3 },
["ratio"]=0,
},
- [300]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [301]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [302]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
+ [300]={ 0, 0, 0 },
+ [301]={ 0, 0, 0 },
+ [302]={ 0, 0, 0 },
},
["height"]=0.5,
},
@@ -2385,149 +955,31 @@
0.5,
0,
0.5,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -2 },
["ratio"]=1,
},
- {
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [4]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
+ { 0, 0, 0 },
+ [4]={ 0, 0, 0 },
[5]={
0.25,
0,
0.25,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -1 },
["ratio"]=1,
},
- [6]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [7]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [8]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [9]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [10]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [11]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [12]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [13]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [14]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [15]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
- [16]={
- 0,
- 0.25,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- ["priority"]={ 0, 0 },
- },
+ [6]={ 0, 0, 0 },
+ [7]={ 0, 0, 0 },
+ [14]={ 0, 0, 0 },
[27]={
0.25,
0.25,
0.125,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 1, -3 },
["ratio"]=0,
},
- [300]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [301]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [302]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
+ [300]={ 0, 0, 0 },
+ [301]={ 0, 0, 0 },
+ [302]={ 0, 0, 0 },
},
["height"]=0.5,
},
@@ -2535,13 +987,7 @@
["chars"]={ "parbdd", "boxbdd" },
["depth"]=0.5,
["glue"]={
- {
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
+ { 0, 0, 0 },
},
["height"]=0.5,
},
@@ -2550,143 +996,37 @@
["chars"]={ "‐" },
["depth"]=0.5,
["glue"]={
- [0]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
+ [0]={ 0, 0, 0 },
{
0.5,
0,
0.5,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -2 },
["ratio"]=1,
},
- {
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [4]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
+ { 0, 0, 0 },
+ [4]={ 0, 0, 0 },
[5]={
0.25,
0,
0.25,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -1 },
["ratio"]=1,
},
- [6]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [7]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [8]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [9]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [10]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [11]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [12]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [13]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [14]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [15]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [16]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [300]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [301]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [302]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
+ [6]={ 0, 0, 0 },
+ [7]={ 0, 0, 0 },
+ [8]={ 0, 0, 0 },
+ [9]={ 0, 0, 0 },
+ [10]={ 0, 0, 0 },
+ [11]={ 0, 0, 0 },
+ [12]={ 0, 0, 0 },
+ [13]={ 0, 0, 0 },
+ [14]={ 0, 0, 0 },
+ [15]={ 0, 0, 0 },
+ [16]={ 0, 0, 0 },
+ [300]={ 0, 0, 0 },
+ [301]={ 0, 0, 0 },
+ [302]={ 0, 0, 0 },
},
["height"]=0.5,
["width"]=0.25,
@@ -2696,143 +1036,37 @@
["chars"]={ "゠", "–" },
["depth"]=0.5,
["glue"]={
- [0]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
+ [0]={ 0, 0, 0 },
{
0.5,
0,
0.5,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -2 },
["ratio"]=1,
},
- {
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [4]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
+ { 0, 0, 0 },
+ [4]={ 0, 0, 0 },
[5]={
0.25,
0,
0.25,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -1 },
["ratio"]=1,
},
- [6]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [7]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [8]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [9]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [10]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [11]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [12]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [13]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [14]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [15]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [16]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [300]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [301]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [302]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
+ [6]={ 0, 0, 0 },
+ [7]={ 0, 0, 0 },
+ [8]={ 0, 0, 0 },
+ [9]={ 0, 0, 0 },
+ [10]={ 0, 0, 0 },
+ [11]={ 0, 0, 0 },
+ [12]={ 0, 0, 0 },
+ [13]={ 0, 0, 0 },
+ [14]={ 0, 0, 0 },
+ [15]={ 0, 0, 0 },
+ [16]={ 0, 0, 0 },
+ [300]={ 0, 0, 0 },
+ [301]={ 0, 0, 0 },
+ [302]={ 0, 0, 0 },
},
["height"]=0.5,
["width"]=0.5,
@@ -2842,143 +1076,37 @@
["chars"]={ "〜" },
["depth"]=0.5,
["glue"]={
- [0]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
+ [0]={ 0, 0, 0 },
{
0.5,
0,
0.5,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -2 },
["ratio"]=1,
},
- {
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [4]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
+ { 0, 0, 0 },
+ [4]={ 0, 0, 0 },
[5]={
0.25,
0,
0.25,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
["priority"]={ 0, -1 },
["ratio"]=1,
},
- [6]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [7]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [8]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [9]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [10]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [11]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [12]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [13]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [14]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [15]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [16]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [300]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [301]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
- [302]={
- 0,
- 0,
- 0,
- ["kanjiskip_natural"]=1,
- ["kanjiskip_stretch"]=1,
- },
+ [6]={ 0, 0, 0 },
+ [7]={ 0, 0, 0 },
+ [8]={ 0, 0, 0 },
+ [9]={ 0, 0, 0 },
+ [10]={ 0, 0, 0 },
+ [11]={ 0, 0, 0 },
+ [12]={ 0, 0, 0 },
+ [13]={ 0, 0, 0 },
+ [14]={ 0, 0, 0 },
+ [15]={ 0, 0, 0 },
+ [16]={ 0, 0, 0 },
+ [300]={ 0, 0, 0 },
+ [301]={ 0, 0, 0 },
+ [302]={ 0, 0, 0 },
},
["height"]=0.5,
["width"]=1,
More information about the tex-live-commits
mailing list