texlive[57255] Master/texmf-dist: jlreq (29dec20)
commits+karl at tug.org
commits+karl at tug.org
Tue Dec 29 23:00:12 CET 2020
Revision: 57255
http://tug.org/svn/texlive?view=revision&revision=57255
Author: karl
Date: 2020-12-29 23:00:12 +0100 (Tue, 29 Dec 2020)
Log Message:
-----------
jlreq (29dec20)
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-ja.pdf
trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.html
trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.html
trunk/Master/texmf-dist/doc/latex/jlreq/jlreq.html
trunk/Master/texmf-dist/doc/latex/jlreq/jlreq.pdf
trunk/Master/texmf-dist/source/latex/jlreq/Makefile
trunk/Master/texmf-dist/source/latex/jlreq/make_variant_jfm.lua
trunk/Master/texmf-dist/tex/latex/jlreq/jlreq.cls
Added Paths:
-----------
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/jlreq-jidori.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/jlreq-v-jidori.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/jlreqg-jidori.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/jlreqg-v-jidori.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreq-jidori-q.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreq-jidori.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreq-v-jidori.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreqg-jidori-q.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreqg-jidori.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreqg-v-jidori.tfm
trunk/Master/texmf-dist/fonts/vf/public/jlreq/jlreq-jidori.vf
trunk/Master/texmf-dist/fonts/vf/public/jlreq/jlreq-v-jidori.vf
trunk/Master/texmf-dist/fonts/vf/public/jlreq/jlreqg-jidori.vf
trunk/Master/texmf-dist/fonts/vf/public/jlreq/jlreqg-v-jidori.vf
trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq-jidori-q.vf
trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq-jidori.vf
trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq-v-jidori.vf
trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg-jidori-q.vf
trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg-jidori.vf
trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg-v-jidori.vf
trunk/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq-jidori.lua
trunk/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreqv-jidori.lua
Modified: trunk/Master/texmf-dist/doc/latex/jlreq/README-ja.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/README-ja.md 2020-12-29 21:59:35 UTC (rev 57254)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/README-ja.md 2020-12-29 22:00:12 UTC (rev 57255)
@@ -11,7 +11,7 @@
* *.tfm -> $TEXMF/fonts/tfm/public/jlreq
* *.vf -> $TEXMF/fonts/vf/public/jlreq
-* jfm-jlreq.lua, jfm-jlreqv.lua -> $TEXMF/tex/luatex/jlreq
+* jfm-jlreq.lua, jfm-jlreqv.lua, jfm-jlreq-jidori.lua jfm-jlreqv-jidori.lua -> $TEXMF/tex/luatex/jlreq
* jlreq.cls, jlreq-helpers.sty -> $TEXMF/tex/latex/jlreq
と配置します．`make install`とすると，$TEXMF=$TEXMFHOMEとしてこのコピーを行います．
@@ -19,7 +19,7 @@
## 動作環境
pLaTeX / upLaTeX / LuaLaTeX上で動きます．以下のパッケージを内部で読み込みます．
-* （常時）：xkeyval,everyhook,filehook,etoolbox,ifthen,lmodern
+* （常時）：xkeyval,everyhook,etoolbox,ifthen,lmodern
* （LuaLaTeX利用時）：luatexja,luatexja-adjust
リリース時点での最新版での動作を確認しています．
@@ -72,6 +72,9 @@
### `\tatechuyoko`
縦中横を出力します．`\tatechuyoko{<中身>}`とします．`\tatechuyoko`は縦書きでない場所で使うとエラーになりますが，`\tatechuyoko*`は縦書きでない場所ではそのまま出力されます．
+### `\jidori`
+`\jidori{<寸法>}{<中身>}`により，中身を寸法の長さに字取りしたものを出力することができます．
+
### `\jafontsize`
和文フォントサイズを指定する`\fontsize`です．クラスオプションで`jafontscale=0.9`とされている場合，`\fontsize{9pt}{15pt}`とすると和文フォントのサイズは`8.1pt`となりますが，`\jafontsize{9pt}{15pt}`とすると`9pt`となります．（欧文フォントサイズは`10pt`となる．）なお，第二引数は`\fontsize`の第二引数と全く同じです．
@@ -107,8 +110,8 @@
以下では次の用法を使います．
* `[A/B]`：AまたはBです．`[A/B/C]`等も同様．
-* `<寸法>`：TeXが認識する寸法です．簡単な式（`10pt+10pt`のような）を使うこともできます．また，クラスオプションでは，場合によっては次のような特殊な値を使うこともできます．（これらはpLaTeX / upLaTeXではもとから利用可能ですが，LuaLaTeXでも利用可能なように処理されています．）`\jlreqsetup`内のような場所では，常に`\zw`や`\zh`により全角幅が記述できます．以下，たとえば`Q`が利用可能な場合は`<寸法;Q>`のように記述します．
- - `Q`：0.25mmと解釈されます．
+* `<寸法>`：TeXが認識する寸法です．簡単な式（`10pt+10pt`のような）を使うこともできます．また，クラスオプションでは，場合によっては次のような特殊な値を使うこともできます．（これらはpLaTeX / upLaTeXではもとから利用可能ですが，LuaLaTeXでも利用可能なように処理されています．）`\jlreqsetup`内のような場所では，常に`\zw`や`\zh`により全角幅が記述できます．以下，たとえば`Q`，`H`が利用可能な場合は`<寸法;Q,H>`のように記述します．
+ - `Q`，`H`：0.25mmと解釈されます．
- `zw`, `zh`：全角幅として解釈されます．
* `<コード>`：LaTeXのコードです．
* `<フォント設定コード>`：`\Large`や`\bfseries`のようなフォント設定の命令です．`\Large\bfseries`のように複数指定することもできます．
@@ -118,8 +121,8 @@
クラスオプションです．
* `paper=[<紙サイズ名>/{<寸法>,<寸法>}]`：紙サイズです．紙サイズ名はa0からa10，b0からb10，c2からc8を指定できます．B列はJIS B列です．また，`{<横>,<縦>}`と直接寸法を指定することもできます．
-* `fontsize=<寸法;Q>`：欧文フォントサイズ．デフォルトは10pt．
-* `jafontsize=<寸法;Q>`：和文フォントサイズ．
+* `fontsize=<寸法;Q,H>`：欧文フォントサイズ．デフォルトは10pt．
+* `jafontsize=<寸法;Q,H>`：和文フォントサイズ．
* `jafontscale=<実数値>`：欧文フォントと和文フォントの比（和文 / 欧文）．`fontsize`と`jafontsize`が両方指定されている場合は無視される．デフォルトは1．
* `line_length=<寸法;zw,zh>`：一行の長さ．デフォルトは字送り方向の紙幅の0.75倍．実際の値は一文字の長さの整数倍になるように補正されます．
* `number_of_lines=<自然数値>`：一ページの行数．デフォルトは行送り方向の紙幅の0.75倍になるような値．
@@ -129,8 +132,8 @@
- `twoside`が指定されていない時は，常に奇数ページ扱いで余白が設定される
* `head_space=<寸法;zw,zh>`：天の空き量．デフォルトは中央寄せになるような値．
* `foot_space=<寸法;zw,zh>`：地の空き量．デフォルトは中央寄せになるような値．
-* `baselineskip=<寸法;Q,zw,zh>`：行送り．デフォルトは`jafontsize`の1.7倍．
-* `linegap=<寸法;Q,zw,zh>`：行間．
+* `baselineskip=<寸法;Q,H,zw,zh>`：行送り．デフォルトは`jafontsize`の1.7倍．
+* `linegap=<寸法;Q,H,zw,zh>`：行間．
* `headfoot_sidemargin=<寸法;zw,zh>`：柱やノンブルの左右の空き．
* `column_gap=<寸法;zw,zh>`：段間（`twocolumn`指定時のみ）．
* `sidenote_length=<寸法;zw,zh>`：傍注の幅を指定します．
@@ -482,6 +485,10 @@
* 2020-09-27
- `\tatechuyoko`の`*`版を追加．
- バグ修正
+* 2020-12-29
+ - クラスオプションの`fontsize`などで，LuaLaTeXでも`H`を使えるようにした．
+ - `\jidori`を追加．
+ - バグ修正．
--------------
Modified: trunk/Master/texmf-dist/doc/latex/jlreq/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/README.md 2020-12-29 21:59:35 UTC (rev 57254)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/README.md 2020-12-29 22:00:12 UTC (rev 57255)
@@ -8,7 +8,7 @@
* *.tfm -> $TEXMF/fonts/tfm/public/jlreq
* *.vf -> $TEXMF/fonts/vf/public/jlreq
-* jfm-jlreq.lua, jfm-jlreqv.lua -> $TEXMF/tex/luatex/jlreq
+* jfm-jlreq.lua, jfm-jlreqv.lua, jfm-jlreq-jidori.lua jfm-jlreqv-jidori.lua -> $TEXMF/tex/luatex/jlreq
* jlreq.cls, jlreq-helpers.sty -> $TEXMF/tex/latex/jlreq
The other way to install is just to run `make install`. It will install all files in `$TEXMFHOME`.
@@ -130,6 +130,10 @@
* 2020-09-27
- Added `*`-version of `\tatechuyoko`.
- Fixed bugs.
+* 2020-12-29
+ - `fontsize` etc. with LuaLaTeX accept `H`.
+ - Added `\jidori`.
+ - Fixed bugs.
--------------
Modified: trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html 2020-12-29 21:59:35 UTC (rev 57254)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html 2020-12-29 22:00:12 UTC (rev 57255)
@@ -96,7 +96,7 @@
<ul>
<li>*.tfm -> $TEXMF/fonts/tfm/public/jlreq</li>
<li>*.vf -> $TEXMF/fonts/vf/public/jlreq</li>
-<li>jfm-jlreq.lua, jfm-jlreqv.lua -> $TEXMF/tex/luatex/jlreq</li>
+<li>jfm-jlreq.lua, jfm-jlreqv.lua, jfm-jlreq-jidori.lua jfm-jlreqv-jidori.lua -> $TEXMF/tex/luatex/jlreq</li>
<li>jlreq.cls, jlreq-helpers.sty -> $TEXMF/tex/latex/jlreq</li>
</ul>
<p>と配置します．<code>make install</code>とすると，$TEXMF=$TEXMFHOMEとしてこのコピーを行います．</p>
@@ -103,15 +103,15 @@
<h2 id="動作環境">動作環境</h2>
<p>pLaTeX / upLaTeX / LuaLaTeX上で動きます．以下のパッケージを内部で読み込みます．</p>
<ul>
-<li>（常時）：xkeyval,everyhook,filehook,etoolbox,ifthen,lmodern</li>
+<li>（常時）：xkeyval,everyhook,etoolbox,ifthen,lmodern</li>
<li>（LuaLaTeX利用時）：luatexja,luatexja-adjust</li>
</ul>
<p>リリース時点での最新版での動作を確認しています．</p>
<h2 id="使い方">使い方</h2>
<p>通常通り</p>
-<div class="sourceCode" id="cb1"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb1-1"><a href="#cb1-1" aria-hidden="true"></a><span class="bu">\documentclass</span>{<span class="ex">jlreq</span>}</span></code></pre></div>
+<div class="sourceCode" id="cb1"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb1-1"><a href="#cb1-1" aria-hidden="true" tabindex="-1"></a><span class="bu">\documentclass</span>{<span class="ex">jlreq</span>}</span></code></pre></div>
<p>とします．これで横書きのarticle相当の文書クラスとなります．エンジンは自動判定されますが，指定する場合はクラスオプションに<code>platex/uplatex/lualatex</code>のいずれかを渡してください．縦書きにするには<code>tate</code>オプションを渡します．また，reportやbook相当の文書クラスとするには，それぞれ<code>report</code>や<code>book</code>オプションを渡します．たとえば，縦書きの本を作成するには</p>
-<div class="sourceCode" id="cb2"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb2-1"><a href="#cb2-1" aria-hidden="true"></a><span class="bu">\documentclass</span>[tate,book]{<span class="ex">jlreq</span>}</span></code></pre></div>
+<div class="sourceCode" id="cb2"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb2-1"><a href="#cb2-1" aria-hidden="true" tabindex="-1"></a><span class="bu">\documentclass</span>[tate,book]{<span class="ex">jlreq</span>}</span></code></pre></div>
<p>とします．</p>
<p>その他，<code>oneside / twoside / onecolumn / twocolumn / titlepage / notitlepage / draft / final / openright / openany / leqno / fleqn</code>というよくあるオプションを受け付けます．</p>
<p>標準的な文書クラスと同じように中身を書くことができますが，次のような命令が追加 / 拡張されています．なお，本ドキュメントでは<a href="https://www.w3.org/TR/jlreq/?lang=ja">日本語組版処理の要件</a>における用語を断りなく使います．</p>
@@ -124,7 +124,7 @@
<h3 id="sidenote"><code>\sidenote</code></h3>
<p>この命令は傍注の幅が正の時にのみ定義されます．デフォルトの基本版面ではこの幅は0に設定されています．従って<code>\sidenote</code>は定義されません．後の基本版面の設定を参考にしてください．</p>
<p><code>\sidenote</code>は傍注（縦組みの場合は脚注）を出力します．内部では<code>\marginpar</code>を使っています．デフォルトでは<code>\footnote</code>と同様の書式となりますが，<code>\jlreqsetup</code>で<code>sidenote_type=symbol</code>が指定されている場合，その書式は<code>\sidenote{該当項目}{注}</code>となります．たとえば</p>
-<div class="sourceCode" id="cb3"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb3-1"><a href="#cb3-1" aria-hidden="true"></a>刊行できる<span class="fu">\sidenote</span>{原稿}{印刷などの方法により……}を入手する仕事である．</span></code></pre></div>
+<div class="sourceCode" id="cb3"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb3-1"><a href="#cb3-1" aria-hidden="true" tabindex="-1"></a>刊行できる<span class="fu">\sidenote</span>{原稿}{印刷などの方法により……}を入手する仕事である．</span></code></pre></div>
<p>とします．後の説明も参照してください．</p>
<h3 id="endnote"><code>\endnote</code></h3>
<p>後注を指定します．<code>\footnote</code>と同様の書式です．デフォルトでは，注自身の出力は見出し直前に行われます．この動作は<code>\jlreqsetup</code>に<code>endnote_position</code>を渡すことで制御できます．詳しくは後の注関係の説明をご覧ください．また<code>\theendnotes</code>を実行するとその場に出力をします．</p>
@@ -134,6 +134,8 @@
<p>です．<code>&</code>が省略されている場合は自動で調整されます．</p>
<h3 id="tatechuyoko"><code>\tatechuyoko</code></h3>
<p>縦中横を出力します．<code>\tatechuyoko{<中身>}</code>とします．<code>\tatechuyoko</code>は縦書きでない場所で使うとエラーになりますが，<code>\tatechuyoko*</code>は縦書きでない場所ではそのまま出力されます．</p>
+<h3 id="jidori"><code>\jidori</code></h3>
+<p><code>\jidori{<寸法>}{<中身>}</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="-"><code>\ </code></h3>
@@ -143,15 +145,15 @@
<li><p>ルビや圏点は提供されません．<a href="https://github.com/zr-tex8r/PXrubrica">PXrubrica</a>または`luatexja-ruby`（LuaLaTeX，LuaTeX-jaパッケージに付属）を使うと良いかと思います．</p></li>
<li><p>pLaTeX / upLaTeX利用時はそれぞれ<code>zw</code>および<code>zh</code>に展開されるマクロ<code>\zw</code>と<code>\zh</code>が定義されます．LuaLaTeX利用時はLuaTeX-ja内で同名のマクロが定義されます．</p></li>
<li><p>日本語組版処理の要件2.3.2.dによれば，横組みにおける二段組の最後のページの各段の行数は揃えることが望ましいとされていますが，この処理は行われません．<code>nidanfloat</code>パッケージを使い，</p>
-<div class="sourceCode" id="cb5"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb5-1"><a href="#cb5-1" aria-hidden="true"></a><span class="bu">\usepackage</span>[balance]{<span class="ex">nidanfloat</span>}</span></code></pre></div>
+<div class="sourceCode" id="cb5"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb5-1"><a href="#cb5-1" aria-hidden="true" tabindex="-1"></a><span class="bu">\usepackage</span>[balance]{<span class="ex">nidanfloat</span>}</span></code></pre></div>
<p>とするとこの処理が行われます．ただし，最終ページでの<code>\newpage</code>や<code>\clearpage</code>が正しく動作しません．詳しくは<code>nidanfloat</code>パッケージのマニュアルをご覧ください．</p></li>
<li><p>フォントを設定する機能は有していません．和文フォントは，LuaLaTeX利用時は<code>luatexja-fontspec</code>や<code>luatexja-preset</code>（いずれもLuaTeX-jaパッケージに付属）により設定することができます．dvipdfmxを使う場合は，<a href="https://github.com/zr-tex8r/PXchfon">PXchfon</a>での設定が可能です．</p></li>
<li><p>和文間の空白（(u)pTeXでは<code>\kanjiskip</code>に，LuateX-jaでは<code>kanjiskip</code>パラメータに格納されているもの）は，デフォルトでは1/4文字分までの空きを許容した設定になっています．これは日本語組版処理の要件に従ったものですが，TeXでの機能の制限などもあり，場合によってはあまり適切ではない結果を生じることがあります．この値を変更する場合は，<code>\jlreqkanjiskip</code>を再定義してください．例えば，</p>
-<div class="sourceCode" id="cb6"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb6-1"><a href="#cb6-1" aria-hidden="true"></a><span class="bu">\documentclass</span>{<span class="ex">jlreq</span>}</span>
-<span id="cb6-2"><a href="#cb6-2" aria-hidden="true"></a><span class="fu">\renewcommand</span>{<span class="ex">\jlreqkanjiskip</span>}{0pt plus .1<span class="fu">\zw</span> minus .01<span class="fu">\zw</span>}</span>
-<span id="cb6-3"><a href="#cb6-3" aria-hidden="true"></a><span class="kw">\begin</span>{<span class="ex">document</span>}</span>
-<span id="cb6-4"><a href="#cb6-4" aria-hidden="true"></a>（本文）</span>
-<span id="cb6-5"><a href="#cb6-5" aria-hidden="true"></a><span class="kw">\begin</span>{<span class="ex">document</span>}</span></code></pre></div>
+<div class="sourceCode" id="cb6"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb6-1"><a href="#cb6-1" aria-hidden="true" tabindex="-1"></a><span class="bu">\documentclass</span>{<span class="ex">jlreq</span>}</span>
+<span id="cb6-2"><a href="#cb6-2" aria-hidden="true" tabindex="-1"></a><span class="fu">\renewcommand</span>{<span class="ex">\jlreqkanjiskip</span>}{0pt plus .1<span class="fu">\zw</span> minus .01<span class="fu">\zw</span>}</span>
+<span id="cb6-3"><a href="#cb6-3" aria-hidden="true" tabindex="-1"></a><span class="kw">\begin</span>{<span class="ex">document</span>}</span>
+<span id="cb6-4"><a href="#cb6-4" aria-hidden="true" tabindex="-1"></a>（本文）</span>
+<span id="cb6-5"><a href="#cb6-5" aria-hidden="true" tabindex="-1"></a><span class="kw">\begin</span>{<span class="ex">document</span>}</span></code></pre></div>
<p>のようにします．</p></li>
</ul>
<h2 id="各種設計">各種設計</h2>
@@ -158,21 +160,21 @@
<p>設計はクラスオプションまたは<code>\jlreqsetup</code>によりkeyval形式で行います．ただし，クラスオプションではLaTeXの実装により，本来可能な入力が受け付けられないケースがあります．多くの場合は空白を除くことにより解決します．</p>
<p>以下では次の用法を使います．</p>
<ul>
-<li><p><code>[A/B]</code>：AまたはBです．<code>[A/B/C]</code>等も同様．</p></li>
-<li><p><code><寸法></code>：TeXが認識する寸法です．簡単な式（<code>10pt+10pt</code>のような）を使うこともできます．また，クラスオプションでは，場合によっては次のような特殊な値を使うこともできます．（これらはpLaTeX / upLaTeXではもとから利用可能ですが，LuaLaTeXでも利用可能なように処理されています．）<code>\jlreqsetup</code>内のような場所では，常に<code>\zw</code>や<code>\zh</code>により全角幅が記述できます．以下，たとえば<code>Q</code>が利用可能な場合は<code><寸法;Q></code>のように記述します．</p>
+<li><code>[A/B]</code>：AまたはBです．<code>[A/B/C]</code>等も同様．</li>
+<li><code><寸法></code>：TeXが認識する寸法です．簡単な式（<code>10pt+10pt</code>のような）を使うこともできます．また，クラスオプションでは，場合によっては次のような特殊な値を使うこともできます．（これらはpLaTeX / upLaTeXではもとから利用可能ですが，LuaLaTeXでも利用可能なように処理されています．）<code>\jlreqsetup</code>内のような場所では，常に<code>\zw</code>や<code>\zh</code>により全角幅が記述できます．以下，たとえば<code>Q</code>，<code>H</code>が利用可能な場合は<code><寸法;Q,H></code>のように記述します．
<ul>
-<li><code>Q</code>：0.25mmと解釈されます．</li>
+<li><code>Q</code>，<code>H</code>：0.25mmと解釈されます．</li>
<li><code>zw</code>, <code>zh</code>：全角幅として解釈されます．</li>
</ul></li>
-<li><p><code><コード></code>：LaTeXのコードです．</p></li>
-<li><p><code><フォント設定コード></code>：<code>\Large</code>や<code>\bfseries</code>のようなフォント設定の命令です．<code>\Large\bfseries</code>のように複数指定することもできます．</p></li>
+<li><code><コード></code>：LaTeXのコードです．</li>
+<li><code><フォント設定コード></code>：<code>\Large</code>や<code>\bfseries</code>のようなフォント設定の命令です．<code>\Large\bfseries</code>のように複数指定することもできます．</li>
</ul>
<h3 id="基本版面">基本版面</h3>
<p>クラスオプションです．</p>
<ul>
<li><code>paper=[<紙サイズ名>/{<寸法>,<寸法>}]</code>：紙サイズです．紙サイズ名はa0からa10，b0からb10，c2からc8を指定できます．B列はJIS B列です．また，<code>{<横>,<縦>}</code>と直接寸法を指定することもできます．</li>
-<li><code>fontsize=<寸法;Q></code>：欧文フォントサイズ．デフォルトは10pt．</li>
-<li><code>jafontsize=<寸法;Q></code>：和文フォントサイズ．</li>
+<li><code>fontsize=<寸法;Q,H></code>：欧文フォントサイズ．デフォルトは10pt．</li>
+<li><code>jafontsize=<寸法;Q,H></code>：和文フォントサイズ．</li>
<li><code>jafontscale=<実数値></code>：欧文フォントと和文フォントの比（和文 / 欧文）．<code>fontsize</code>と<code>jafontsize</code>が両方指定されている場合は無視される．デフォルトは1．</li>
<li><code>line_length=<寸法;zw,zh></code>：一行の長さ．デフォルトは字送り方向の紙幅の0.75倍．実際の値は一文字の長さの整数倍になるように補正されます．</li>
<li><code>number_of_lines=<自然数値></code>：一ページの行数．デフォルトは行送り方向の紙幅の0.75倍になるような値．</li>
@@ -184,8 +186,8 @@
</ul></li>
<li><code>head_space=<寸法;zw,zh></code>：天の空き量．デフォルトは中央寄せになるような値．</li>
<li><code>foot_space=<寸法;zw,zh></code>：地の空き量．デフォルトは中央寄せになるような値．</li>
-<li><code>baselineskip=<寸法;Q,zw,zh></code>：行送り．デフォルトは<code>jafontsize</code>の1.7倍．</li>
-<li><code>linegap=<寸法;Q,zw,zh></code>：行間．</li>
+<li><code>baselineskip=<寸法;Q,H,zw,zh></code>：行送り．デフォルトは<code>jafontsize</code>の1.7倍．</li>
+<li><code>linegap=<寸法;Q,H,zw,zh></code>：行間．</li>
<li><code>headfoot_sidemargin=<寸法;zw,zh></code>：柱やノンブルの左右の空き．</li>
<li><code>column_gap=<寸法;zw,zh></code>：段間（<code>twocolumn</code>指定時のみ）．</li>
<li><code>sidenote_length=<寸法;zw,zh></code>：傍注の幅を指定します．</li>
@@ -261,9 +263,9 @@
</ul>
<p><code>frontmatter</code>を<code>mainmatter</code>や<code>backmatter</code>，<code>appendix</code>へと変えた設定も存在します．ただし，以下のような違いがあります．</p>
<ul>
-<li><p><code>restore=[true/false]</code>は無効な設定です．</p></li>
-<li><p><code>mainmatter_pagination</code>に<code>continuous</code>と<code>independent</code>は指定できません．</p></li>
-<li><p><code>appendix_pagebreak</code>，<code>appendix_pagestyle</code>，<code>appendix_pagination</code>はありません．</p></li>
+<li><code>restore=[true/false]</code>は無効な設定です．</li>
+<li><code>mainmatter_pagination</code>に<code>continuous</code>と<code>independent</code>は指定できません．</li>
+<li><code>appendix_pagebreak</code>，<code>appendix_pagestyle</code>，<code>appendix_pagination</code>はありません．</li>
</ul>
<h2 id="見出し">見出し</h2>
<p>新しい見出しを<code>\New***Heading</code>という命令で作ることができます（***には見出しの種類に応じた文字列が入る）．書式はすべて</p>
@@ -321,10 +323,10 @@
</ul>
<h4 id="連続して掲げる見出しの行取り">連続して掲げる見出しの行取り</h4>
<p><code>\SetBlockHeadingSpaces</code>により，見出しが連続して掲げられたときの行取りを設定することができます．<code>\SetBlockHeadingSpaces</code>は</p>
-<div class="sourceCode" id="cb8"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb8-1"><a href="#cb8-1" aria-hidden="true"></a><span class="fu">\SetBlockHeadingSpaces</span>{</span>
-<span id="cb8-2"><a href="#cb8-2" aria-hidden="true"></a> {_part{lines=3,before_lines=1},_section{lines=2},_subsection{lines=2}}</span>
-<span id="cb8-3"><a href="#cb8-3" aria-hidden="true"></a> [lines=5]{_section,23pt,_subsection,16pt}</span>
-<span id="cb8-4"><a href="#cb8-4" aria-hidden="true"></a>}</span></code></pre></div>
+<div class="sourceCode" id="cb8"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb8-1"><a href="#cb8-1" aria-hidden="true" tabindex="-1"></a><span class="fu">\SetBlockHeadingSpaces</span>{</span>
+<span id="cb8-2"><a href="#cb8-2" aria-hidden="true" tabindex="-1"></a> {_part{lines=3,before_lines=1},_section{lines=2},_subsection{lines=2}}</span>
+<span id="cb8-3"><a href="#cb8-3" aria-hidden="true" tabindex="-1"></a> [lines=5]{_section,23pt,_subsection,16pt}</span>
+<span id="cb8-4"><a href="#cb8-4" aria-hidden="true" tabindex="-1"></a>}</span></code></pre></div>
<p>のように使います．この意味は次の通りです．</p>
<ul>
<li><code>\part</code>，<code>\section</code>，<code>\subsection</code>という順番で見出しが掲げられていて，その前後が見出しでない場合は，<code>\part</code>は三行取り＋前に一行空き，<code>\section</code>と<code>\subsection</code>は二行取りとなります．</li>
@@ -359,32 +361,32 @@
</ul>
<h3 id="modifyheading"><code>\ModifyHeading</code></h3>
<p>既に（上のどれかを使い）定義された見出し命令の設定を変更します．たとえば</p>
-<div class="sourceCode" id="cb9"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb9-1"><a href="#cb9-1" aria-hidden="true"></a><span class="fu">\ModifyHeading</span>{section}{lines=10}</span></code></pre></div>
+<div class="sourceCode" id="cb9"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb9-1"><a href="#cb9-1" aria-hidden="true" tabindex="-1"></a><span class="fu">\ModifyHeading</span>{section}{lines=10}</span></code></pre></div>
<p>とすると，<code>\section</code>のフォントなどの設定はそのままに，行取りのみが10行に変更されます．見出しの種類を変更することはできません．</p>
<h3 id="saveheading"><code>\SaveHeading</code></h3>
<p>見出し命令の定義を待避します．</p>
-<div class="sourceCode" id="cb10"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb10-1"><a href="#cb10-1" aria-hidden="true"></a><span class="fu">\SaveHeading</span>{section}{<span class="fu">\restoresection</span>} <span class="co">% \sectionの中身を\restoresectionに待避．</span></span>
-<span id="cb10-2"><a href="#cb10-2" aria-hidden="true"></a><span class="fu">\RenewBlockHeading</span>{section}{1}{font=……} <span class="co">% \sectionを新しく定義する．</span></span>
-<span id="cb10-3"><a href="#cb10-3" aria-hidden="true"></a>……</span>
-<span id="cb10-4"><a href="#cb10-4" aria-hidden="true"></a><span class="fu">\restoresection</span> <span class="co">% \sectionの中身を元に戻す．</span></span></code></pre></div>
+<div class="sourceCode" id="cb10"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb10-1"><a href="#cb10-1" aria-hidden="true" tabindex="-1"></a><span class="fu">\SaveHeading</span>{section}{<span class="fu">\restoresection</span>} <span class="co">% \sectionの中身を\restoresectionに待避．</span></span>
+<span id="cb10-2"><a href="#cb10-2" aria-hidden="true" tabindex="-1"></a><span class="fu">\RenewBlockHeading</span>{section}{1}{font=……} <span class="co">% \sectionを新しく定義する．</span></span>
+<span id="cb10-3"><a href="#cb10-3" aria-hidden="true" tabindex="-1"></a>……</span>
+<span id="cb10-4"><a href="#cb10-4" aria-hidden="true" tabindex="-1"></a><span class="fu">\restoresection</span> <span class="co">% \sectionの中身を元に戻す．</span></span></code></pre></div>
<p>のように使います．</p>
<h2 id="ページスタイル">ページスタイル</h2>
<pre><code>\NewPageStyle{<ページスタイル名>}{<設定>}</code></pre>
<p>によりページスタイルを定義することができます．<code><設定></code>はkeyval形式です．定義したページスタイルは<code>\pagestyle</code>で適用できます．設定は以下の通り．</p>
<ul>
-<li><p><code>yoko</code>：横書きで上下に出力します．デフォルト．</p></li>
-<li><p><code>tate</code>：縦書きで小口側に出力します．</p></li>
-<li><p><code>running_head_font=<フォント設定命令></code>：柱のフォントを指定します．</p></li>
-<li><p><code>nombre_font=<フォント設定命令></code>：ノンブルのフォントを指定します．</p></li>
-<li><p><code>running_head_position</code>, <code>nombre_position</code>：柱とノンブルの位置を指定します．<code>yoko</code>か<code>tate</code>のどちらが指定されているかで指定方法が変わります．</p>
+<li><code>yoko</code>：横書きで上下に出力します．デフォルト．</li>
+<li><code>tate</code>：縦書きで小口側に出力します．</li>
+<li><code>running_head_font=<フォント設定命令></code>：柱のフォントを指定します．</li>
+<li><code>nombre_font=<フォント設定命令></code>：ノンブルのフォントを指定します．</li>
+<li><code>running_head_position</code>, <code>nombre_position</code>：柱とノンブルの位置を指定します．<code>yoko</code>か<code>tate</code>のどちらが指定されているかで指定方法が変わります．
<ul>
<li><code>yoko</code>指定時：<code>top-left</code>のように指定できます．<code>top / bottom / center / left / right / gutter / fore-edge</code>が使えます．<code>gutter</code>はのど，<code>fore-edge</code>は小口です．<code>left</code>，<code>right</code>の指定は奇数ページに対するものです．<code>twoside</code>が指定されている場合，偶数ページはその逆になります．</li>
<li><code>tate</code>指定時：<code><寸法></code>が指定できます．<code>running_head_position</code>は柱の天からの下げ量を，<code>nombre_position</code>はノンブルの地からの上げ量を指定します．</li>
</ul></li>
-<li><p><code>nombre=<書式></code>：出力するノンブルを指定します．デフォルトは<code>\thepage</code>．</p></li>
-<li><p><code>odd_running_head=<書式></code>，<code>even_running_head=<書式></code>：それぞれ奇数ページ，偶数ページの柱を指定します．<code>_section</code>のように<code>_</code>から始まる名前を指定すると，対応する見出しを出力します．（<code>_section</code>だと現在の<code>\section</code>を出力する．）</p></li>
-<li><p><code>mark_format={[odd=<書式>/even=<書式>/_<見出し命令名>=<書式>],...}</code>：見出しを柱に出力する際のフォーマットを指定します．<code>mark_format={_section={節\thesection：#1},_chapter={第\thechapter 章\quad #1}}</code>のように指定します．見出し命令名の代わりに<code>odd</code>や<code>even</code>も指定でき，それぞれ奇数ページ/偶数ページの柱の書式になります．<code>\pagestyle</code>実行時に<code>\sectionmark</code>等を定義することで実現しています．</p></li>
-<li><p><code>nombre_ii=<書式></code>: 二つ目のノンブルを指定します．<code>nombre_ii_position</code>で場所指定，<code>nombre_ii_font</code>でフォント設定もできます．指定方法は<code>nombre</code>や<code>nombre_position</code>と同じです．<code>odd_running_head_ii</code>，<code>even_running_head_ii</code>，<code>running_head_ii_position</code>，<code>running_head_ii_font</code>もあります．<code>nombre_ii_position</code>や<code>running_head_ii_position</code>が指定されなかった場合，<code>yoko</code>指定時にはそれぞれ<code>nombre_position</code>および<code>running_head_position</code>と同じ位置に設定されます．<code>tate</code>指定時は一つ目のノンブルや柱に続く場所に表示されます．</p></li>
+<li><code>nombre=<書式></code>：出力するノンブルを指定します．デフォルトは<code>\thepage</code>．</li>
+<li><code>odd_running_head=<書式></code>，<code>even_running_head=<書式></code>：それぞれ奇数ページ，偶数ページの柱を指定します．<code>_section</code>のように<code>_</code>から始まる名前を指定すると，対応する見出しを出力します．（<code>_section</code>だと現在の<code>\section</code>を出力する．）</li>
+<li><code>mark_format={[odd=<書式>/even=<書式>/_<見出し命令名>=<書式>],...}</code>：見出しを柱に出力する際のフォーマットを指定します．<code>mark_format={_section={節\thesection：#1},_chapter={第\thechapter 章\quad #1}}</code>のように指定します．見出し命令名の代わりに<code>odd</code>や<code>even</code>も指定でき，それぞれ奇数ページ/偶数ページの柱の書式になります．<code>\pagestyle</code>実行時に<code>\sectionmark</code>等を定義することで実現しています．</li>
+<li><code>nombre_ii=<書式></code>: 二つ目のノンブルを指定します．<code>nombre_ii_position</code>で場所指定，<code>nombre_ii_font</code>でフォント設定もできます．指定方法は<code>nombre</code>や<code>nombre_position</code>と同じです．<code>odd_running_head_ii</code>，<code>even_running_head_ii</code>，<code>running_head_ii_position</code>，<code>running_head_ii_font</code>もあります．<code>nombre_ii_position</code>や<code>running_head_ii_position</code>が指定されなかった場合，<code>yoko</code>指定時にはそれぞれ<code>nombre_position</code>および<code>running_head_position</code>と同じ位置に設定されます．<code>tate</code>指定時は一つ目のノンブルや柱に続く場所に表示されます．</li>
</ul>
<p><code>\RenewPageStyle</code>，<code>\ProvidePageStyle</code>，<code>\DeclarePageStyle</code>もあります．<code>\ModifyPageStyle</code>により既存のページスタイルを改変することが可能です．</p>
<h2 id="jfm">JFM</h2>
@@ -498,15 +500,11 @@
<li>2018-04-11
<ul>
<li>縦書き二段組みの傍注を下段に出すようにした．</li>
-</ul>
-- <code>begin_width_(odd|even)_page</code>を<code>\DeclareBlockHeading</code>に追加．
-<ul>
-<li><code>\labelenumi</code>らをjarticleなどにあわせた．
-<ul>
+<li><code>begin_width_(odd|even)_page</code>を<code>\DeclareBlockHeading</code>に追加．</li>
+<li><code>\labelenumi</code>らをjarticleなどにあわせた．</li>
<li><code>column_gap</code>クラスオプションを使うとコンパイルできなかったバグ修正．</li>
<li><code>mark_format</code>を<code>\DeclarePageStyle</code>に追加．</li>
</ul></li>
-</ul></li>
<li>2018-05-19
<ul>
<li>目次内のラベルの長さを今までよりも長くした．</li>
@@ -580,9 +578,15 @@
</ul></li>
<li>2020-09-27
<ul>
-<li><p><code>\tatechuyoko</code>の<code>*</code>版を追加．</p></li>
-<li><p>バグ修正</p></li>
+<li><code>\tatechuyoko</code>の<code>*</code>版を追加．</li>
+<li>バグ修正</li>
</ul></li>
+<li>2020-12-29
+<ul>
+<li>クラスオプションの<code>fontsize</code>などで，LuaLaTeXでも<code>H</code>を使えるようにした．</li>
+<li><code>\jidori</code>を追加．</li>
+<li>バグ修正．</li>
+</ul></li>
</ul>
<hr />
<p>Noriyuki Abe <a href="https://github.com/abenori/jlreq">https://github.com/abenori/jlreq</a></p>
Modified: trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.html
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.html 2020-12-29 21:59:35 UTC (rev 57254)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.html 2020-12-29 22:00:12 UTC (rev 57255)
@@ -102,7 +102,7 @@
<pre><code>\usepackage[dvipdfmx,platex]{jlreq-trimmarks}</code></pre>
<p>なお，クラスファイルの<code>tombow</code>オプションは使わないでください．</p>
<h2 id="ノート">ノート</h2>
-<p>jlreq-trimmarksは紙サイズを設定しますが，その他のパッケージとの兼ね合いで正しく機能しないことがあります．その際は<a href="https://github.com/zr-tex8r/BXpapersize">bxpapersize</a></p>
+<p>jlreq-trimmarksは紙サイズを設定しますが，その他のパッケージとの兼ね合いで正しく機能しないことがあります．その際は<a href="https://github.com/zr-tex8r/BXpapersize">bxpapersize</a>のようなより強力なパッケージを試してみてください．</p>
<h2 id="オプション">オプション</h2>
<p>以下のパッケージオプションを受け付けます．keyval形式です．</p>
<h3 id="platex-uplatex-lulatex"><code>platex</code>, <code>uplatex</code>, <code>lulatex</code></h3>
@@ -135,57 +135,57 @@
</ul>
<h3 id="bleed_margin"><code>bleed_margin</code></h3>
<p>仕上がりと裁ち落としの間（ドブ）の長さを指定します．次のようにすると，上下左右を独立に変更できます．</p>
-<div class="sourceCode" id="cb2"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb2-1"><a href="#cb2-1" aria-hidden="true"></a><span class="bu">\usepackage</span>[bleed_margin={top=3mm,bottom=5mm,gutter=0mm,fore-edge=2mm}]{<span class="ex">jlreq-trimmarks</span>}</span></code></pre></div>
+<div class="sourceCode" id="cb2"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb2-1"><a href="#cb2-1" aria-hidden="true" tabindex="-1"></a><span class="bu">\usepackage</span>[bleed_margin={top=3mm,bottom=5mm,gutter=0mm,fore-edge=2mm}]{<span class="ex">jlreq-trimmarks</span>}</span></code></pre></div>
<h2 id="jlreqtrimmarkssetup"><code>\jlreqtrimmarkssetup</code></h2>
<p>パッケージオプションで指定できない設定を行えます．keyval形式です．</p>
<h3 id="banner"><code>banner</code></h3>
<p><code>show=banner</code>時に出力される文字列．通常は左上に出力されますが，四つ角および上下左右の中心に出力することもできます．指定は</p>
-<div class="sourceCode" id="cb3"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb3-1"><a href="#cb3-1" aria-hidden="true"></a><span class="fu">\jlreqtrimmarkssetup</span>{</span>
-<span id="cb3-2"><a href="#cb3-2" aria-hidden="true"></a> banner={</span>
-<span id="cb3-3"><a href="#cb3-3" aria-hidden="true"></a> <場所（上下，左右中央）>={</span>
-<span id="cb3-4"><a href="#cb3-4" aria-hidden="true"></a> <細かな位置>={</span>
-<span id="cb3-5"><a href="#cb3-5" aria-hidden="true"></a> <ページ数の偶奇に応じて>={</span>
-<span id="cb3-6"><a href="#cb3-6" aria-hidden="true"></a> <表示項目></span>
-<span id="cb3-7"><a href="#cb3-7" aria-hidden="true"></a> }</span>
-<span id="cb3-8"><a href="#cb3-8" aria-hidden="true"></a> }</span>
-<span id="cb3-9"><a href="#cb3-9" aria-hidden="true"></a> }</span>
-<span id="cb3-10"><a href="#cb3-10" aria-hidden="true"></a> }</span>
-<span id="cb3-11"><a href="#cb3-11" aria-hidden="true"></a>}</span></code></pre></div>
+<div class="sourceCode" id="cb3"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb3-1"><a href="#cb3-1" aria-hidden="true" tabindex="-1"></a><span class="fu">\jlreqtrimmarkssetup</span>{</span>
+<span id="cb3-2"><a href="#cb3-2" aria-hidden="true" tabindex="-1"></a> banner={</span>
+<span id="cb3-3"><a href="#cb3-3" aria-hidden="true" tabindex="-1"></a> <場所（上下，左右中央）>={</span>
+<span id="cb3-4"><a href="#cb3-4" aria-hidden="true" tabindex="-1"></a> <細かな位置>={</span>
+<span id="cb3-5"><a href="#cb3-5" aria-hidden="true" tabindex="-1"></a> <ページ数の偶奇に応じて>={</span>
+<span id="cb3-6"><a href="#cb3-6" aria-hidden="true" tabindex="-1"></a> <表示項目></span>
+<span id="cb3-7"><a href="#cb3-7" aria-hidden="true" tabindex="-1"></a> }</span>
+<span id="cb3-8"><a href="#cb3-8" aria-hidden="true" tabindex="-1"></a> }</span>
+<span id="cb3-9"><a href="#cb3-9" aria-hidden="true" tabindex="-1"></a> }</span>
+<span id="cb3-10"><a href="#cb3-10" aria-hidden="true" tabindex="-1"></a> }</span>
+<span id="cb3-11"><a href="#cb3-11" aria-hidden="true" tabindex="-1"></a>}</span></code></pre></div>
<p>のようになります．キー名は省略することもできます．例えば次のように指定します．</p>
-<div class="sourceCode" id="cb4"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb4-1"><a href="#cb4-1" aria-hidden="true"></a><span class="fu">\jlreqtrimmarkssetup</span>{</span>
-<span id="cb4-2"><a href="#cb4-2" aria-hidden="true"></a> banner={</span>
-<span id="cb4-3"><a href="#cb4-3" aria-hidden="true"></a> top-right={</span>
-<span id="cb4-4"><a href="#cb4-4" aria-hidden="true"></a> tate={</span>
-<span id="cb4-5"><a href="#cb4-5" aria-hidden="true"></a> odd={奇数ページの右上に縦書きで表示},</span>
-<span id="cb4-6"><a href="#cb4-6" aria-hidden="true"></a> even={偶数ページの右上に縦書きで表示},</span>
-<span id="cb4-7"><a href="#cb4-7" aria-hidden="true"></a> },</span>
-<span id="cb4-8"><a href="#cb4-8" aria-hidden="true"></a> yoko={右上に横書きで表示}, <span class="co">% ページの偶奇によらず共通</span></span>
-<span id="cb4-9"><a href="#cb4-9" aria-hidden="true"></a> corner={右上角に横書きで表示},</span>
-<span id="cb4-10"><a href="#cb4-10" aria-hidden="true"></a> in-yoko={右上版面内に横書きで表示},</span>
-<span id="cb4-11"><a href="#cb4-11" aria-hidden="true"></a> in-tate={右上版面内に縦書きで表示},</span>
-<span id="cb4-12"><a href="#cb4-12" aria-hidden="true"></a> },</span>
-<span id="cb4-13"><a href="#cb4-13" aria-hidden="true"></a> bottom-center={</span>
-<span id="cb4-14"><a href="#cb4-14" aria-hidden="true"></a> left={中央下の左に表示}, <span class="co">% odd=, even=も使用可能</span></span>
-<span id="cb4-15"><a href="#cb4-15" aria-hidden="true"></a> right={中央下の右に表示},</span>
-<span id="cb4-16"><a href="#cb4-16" aria-hidden="true"></a> in={中央下の版面内に表示},</span>
-<span id="cb4-17"><a href="#cb4-17" aria-hidden="true"></a> },</span>
-<span id="cb4-18"><a href="#cb4-18" aria-hidden="true"></a> center-gutter={</span>
-<span id="cb4-19"><a href="#cb4-19" aria-hidden="true"></a> above={ノド側中央の上側に表示},</span>
-<span id="cb4-20"><a href="#cb4-20" aria-hidden="true"></a> below={ノド側中央の下側に表示},</span>
-<span id="cb4-21"><a href="#cb4-21" aria-hidden="true"></a> },</span>
-<span id="cb4-22"><a href="#cb4-22" aria-hidden="true"></a> }</span>
-<span id="cb4-23"><a href="#cb4-23" aria-hidden="true"></a>}</span></code></pre></div>
+<div class="sourceCode" id="cb4"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb4-1"><a href="#cb4-1" aria-hidden="true" tabindex="-1"></a><span class="fu">\jlreqtrimmarkssetup</span>{</span>
+<span id="cb4-2"><a href="#cb4-2" aria-hidden="true" tabindex="-1"></a> banner={</span>
+<span id="cb4-3"><a href="#cb4-3" aria-hidden="true" tabindex="-1"></a> top-right={</span>
+<span id="cb4-4"><a href="#cb4-4" aria-hidden="true" tabindex="-1"></a> tate={</span>
+<span id="cb4-5"><a href="#cb4-5" aria-hidden="true" tabindex="-1"></a> odd={奇数ページの右上に縦書きで表示},</span>
+<span id="cb4-6"><a href="#cb4-6" aria-hidden="true" tabindex="-1"></a> even={偶数ページの右上に縦書きで表示},</span>
+<span id="cb4-7"><a href="#cb4-7" aria-hidden="true" tabindex="-1"></a> },</span>
+<span id="cb4-8"><a href="#cb4-8" aria-hidden="true" tabindex="-1"></a> yoko={右上に横書きで表示}, <span class="co">% ページの偶奇によらず共通</span></span>
+<span id="cb4-9"><a href="#cb4-9" aria-hidden="true" tabindex="-1"></a> corner={右上角に横書きで表示},</span>
+<span id="cb4-10"><a href="#cb4-10" aria-hidden="true" tabindex="-1"></a> in-yoko={右上版面内に横書きで表示},</span>
+<span id="cb4-11"><a href="#cb4-11" aria-hidden="true" tabindex="-1"></a> in-tate={右上版面内に縦書きで表示},</span>
+<span id="cb4-12"><a href="#cb4-12" aria-hidden="true" tabindex="-1"></a> },</span>
+<span id="cb4-13"><a href="#cb4-13" aria-hidden="true" tabindex="-1"></a> bottom-center={</span>
+<span id="cb4-14"><a href="#cb4-14" aria-hidden="true" tabindex="-1"></a> left={中央下の左に表示}, <span class="co">% odd=, even=も使用可能</span></span>
+<span id="cb4-15"><a href="#cb4-15" aria-hidden="true" tabindex="-1"></a> right={中央下の右に表示},</span>
+<span id="cb4-16"><a href="#cb4-16" aria-hidden="true" tabindex="-1"></a> in={中央下の版面内に表示},</span>
+<span id="cb4-17"><a href="#cb4-17" aria-hidden="true" tabindex="-1"></a> },</span>
+<span id="cb4-18"><a href="#cb4-18" aria-hidden="true" tabindex="-1"></a> center-gutter={</span>
+<span id="cb4-19"><a href="#cb4-19" aria-hidden="true" tabindex="-1"></a> above={ノド側中央の上側に表示},</span>
+<span id="cb4-20"><a href="#cb4-20" aria-hidden="true" tabindex="-1"></a> below={ノド側中央の下側に表示},</span>
+<span id="cb4-21"><a href="#cb4-21" aria-hidden="true" tabindex="-1"></a> },</span>
+<span id="cb4-22"><a href="#cb4-22" aria-hidden="true" tabindex="-1"></a> }</span>
+<span id="cb4-23"><a href="#cb4-23" aria-hidden="true" tabindex="-1"></a>}</span></code></pre></div>
<p>場所は<code>top/bottom/center</code>と<code>left/right/center/gutter/fore-edge</code>の可能な組み合わせが指定可能です．各項目に<code>\thepage</code>を指定するとページ数を出力できます．</p>
<p>次のような指定も可能です．</p>
-<div class="sourceCode" id="cb5"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb5-1"><a href="#cb5-1" aria-hidden="true"></a><span class="fu">\jlreqtrimmarkssetup</span>{</span>
-<span id="cb5-2"><a href="#cb5-2" aria-hidden="true"></a> banner={</span>
-<span id="cb5-3"><a href="#cb5-3" aria-hidden="true"></a> tate={左上に縦書き}, <span class="co">% 場所が省略されるとtop-leftと見なされる．</span></span>
-<span id="cb5-4"><a href="#cb5-4" aria-hidden="true"></a> odd={左上奇数ページ}, <span class="co">% 省略されたのでyokoと見なされる．</span></span>
-<span id="cb5-5"><a href="#cb5-5" aria-hidden="true"></a> top-right={</span>
-<span id="cb5-6"><a href="#cb5-6" aria-hidden="true"></a> odd={右上奇数ページ} <span class="co">% ここもyokoが省略されている．</span></span>
-<span id="cb5-7"><a href="#cb5-7" aria-hidden="true"></a> }</span>
-<span id="cb5-8"><a href="#cb5-8" aria-hidden="true"></a> }</span>
-<span id="cb5-9"><a href="#cb5-9" aria-hidden="true"></a>}</span></code></pre></div>
+<div class="sourceCode" id="cb5"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb5-1"><a href="#cb5-1" aria-hidden="true" tabindex="-1"></a><span class="fu">\jlreqtrimmarkssetup</span>{</span>
+<span id="cb5-2"><a href="#cb5-2" aria-hidden="true" tabindex="-1"></a> banner={</span>
+<span id="cb5-3"><a href="#cb5-3" aria-hidden="true" tabindex="-1"></a> tate={左上に縦書き}, <span class="co">% 場所が省略されるとtop-leftと見なされる．</span></span>
+<span id="cb5-4"><a href="#cb5-4" aria-hidden="true" tabindex="-1"></a> odd={左上奇数ページ}, <span class="co">% 省略されたのでyokoと見なされる．</span></span>
+<span id="cb5-5"><a href="#cb5-5" aria-hidden="true" tabindex="-1"></a> top-right={</span>
+<span id="cb5-6"><a href="#cb5-6" aria-hidden="true" tabindex="-1"></a> odd={右上奇数ページ} <span class="co">% ここもyokoが省略されている．</span></span>
+<span id="cb5-7"><a href="#cb5-7" aria-hidden="true" tabindex="-1"></a> }</span>
+<span id="cb5-8"><a href="#cb5-8" aria-hidden="true" tabindex="-1"></a> }</span>
+<span id="cb5-9"><a href="#cb5-9" aria-hidden="true" tabindex="-1"></a>}</span></code></pre></div>
<h3 id="trimmarks_width"><code>trimmarks_width</code></h3>
<p>トンボ自身の太さを指定します．</p>
<h3 id="-color"><code> color</code></h3>
Modified: trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.html
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.html 2020-12-29 21:59:35 UTC (rev 57254)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.html 2020-12-29 22:00:12 UTC (rev 57255)
@@ -134,53 +134,53 @@
</ul>
<h3 id="bleed_margin"><code>bleed_margin</code></h3>
<p>Set the bleed margin. You can also specify as follows.</p>
-<div class="sourceCode" id="cb2"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb2-1"><a href="#cb2-1" aria-hidden="true"></a><span class="bu">\usepackage</span>[bleed_margin={top=3mm,bottom=5mm,gutter=0mm,fore-edge=2mm}]{<span class="ex">jlreq-trimmarks</span>}</span></code></pre></div>
+<div class="sourceCode" id="cb2"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb2-1"><a href="#cb2-1" aria-hidden="true" tabindex="-1"></a><span class="bu">\usepackage</span>[bleed_margin={top=3mm,bottom=5mm,gutter=0mm,fore-edge=2mm}]{<span class="ex">jlreq-trimmarks</span>}</span></code></pre></div>
<h2 id="jlreqtrimmarkssetup"><code>\jlreqtrimmarkssetup</code></h2>
<p>Set the additional settings with the keyval style.</p>
<h3 id="banner"><code>banner</code></h3>
<p>The things which the package outputs when <code>show=banner</code> is specified in the package option. Normally it is showed in the left of the top. You can also put them in many places with</p>
-<div class="sourceCode" id="cb3"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb3-1"><a href="#cb3-1" aria-hidden="true"></a><span class="fu">\jlreqtrimmarkssetup</span>{</span>
-<span id="cb3-2"><a href="#cb3-2" aria-hidden="true"></a> banner={</span>
-<span id="cb3-3"><a href="#cb3-3" aria-hidden="true"></a> <Position (top/bottom, left/right, center)>={</span>
-<span id="cb3-4"><a href="#cb3-4" aria-hidden="true"></a> <more precise position>={</span>
-<span id="cb3-5"><a href="#cb3-5" aria-hidden="true"></a> <odd/even>={</span>
-<span id="cb3-6"><a href="#cb3-6" aria-hidden="true"></a> <content></span>
-<span id="cb3-7"><a href="#cb3-7" aria-hidden="true"></a> }</span>
-<span id="cb3-8"><a href="#cb3-8" aria-hidden="true"></a> }</span>
-<span id="cb3-9"><a href="#cb3-9" aria-hidden="true"></a> }</span>
-<span id="cb3-10"><a href="#cb3-10" aria-hidden="true"></a> }</span>
-<span id="cb3-11"><a href="#cb3-11" aria-hidden="true"></a>}</span></code></pre></div>
+<div class="sourceCode" id="cb3"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb3-1"><a href="#cb3-1" aria-hidden="true" tabindex="-1"></a><span class="fu">\jlreqtrimmarkssetup</span>{</span>
+<span id="cb3-2"><a href="#cb3-2" aria-hidden="true" tabindex="-1"></a> banner={</span>
+<span id="cb3-3"><a href="#cb3-3" aria-hidden="true" tabindex="-1"></a> <Position (top/bottom, left/right, center)>={</span>
+<span id="cb3-4"><a href="#cb3-4" aria-hidden="true" tabindex="-1"></a> <more precise position>={</span>
+<span id="cb3-5"><a href="#cb3-5" aria-hidden="true" tabindex="-1"></a> <odd/even>={</span>
+<span id="cb3-6"><a href="#cb3-6" aria-hidden="true" tabindex="-1"></a> <content></span>
+<span id="cb3-7"><a href="#cb3-7" aria-hidden="true" tabindex="-1"></a> }</span>
+<span id="cb3-8"><a href="#cb3-8" aria-hidden="true" tabindex="-1"></a> }</span>
+<span id="cb3-9"><a href="#cb3-9" aria-hidden="true" tabindex="-1"></a> }</span>
+<span id="cb3-10"><a href="#cb3-10" aria-hidden="true" tabindex="-1"></a> }</span>
+<span id="cb3-11"><a href="#cb3-11" aria-hidden="true" tabindex="-1"></a>}</span></code></pre></div>
<p>Here is an example.</p>
-<div class="sourceCode" id="cb4"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb4-1"><a href="#cb4-1" aria-hidden="true"></a><span class="fu">\jlreqtrimmarkssetup</span>{</span>
-<span id="cb4-2"><a href="#cb4-2" aria-hidden="true"></a> banner={</span>
-<span id="cb4-3"><a href="#cb4-3" aria-hidden="true"></a> top-right={</span>
-<span id="cb4-4"><a href="#cb4-4" aria-hidden="true"></a> vertical={</span>
-<span id="cb4-5"><a href="#cb4-5" aria-hidden="true"></a> odd={In the right of the top, only in odd pages, vertical mode.},</span>
-<span id="cb4-6"><a href="#cb4-6" aria-hidden="true"></a> even={In the right of the top, only in even pages, vertical mode.},</span>
-<span id="cb4-7"><a href="#cb4-7" aria-hidden="true"></a> },</span>
-<span id="cb4-8"><a href="#cb4-8" aria-hidden="true"></a> horizontal={In the right of the top, horizontal mode.}, <span class="co">% does not depend on the parity of the page number</span></span>
-<span id="cb4-9"><a href="#cb4-9" aria-hidden="true"></a> corner={In the corner of the right of the top, horizontal mode.},</span>
-<span id="cb4-10"><a href="#cb4-10" aria-hidden="true"></a> in-horizontal={In the right of the top, horizontal mode, in the trim area.},</span>
-<span id="cb4-11"><a href="#cb4-11" aria-hidden="true"></a> in-vertical={In the right of the top, vertical mode, in the trim area.},</span>
-<span id="cb4-12"><a href="#cb4-12" aria-hidden="true"></a> },</span>
-<span id="cb4-13"><a href="#cb4-13" aria-hidden="true"></a> bottom-center={</span>
-<span id="cb4-14"><a href="#cb4-14" aria-hidden="true"></a> left={In the left in the center of the bottom}, <span class="co">% odd=, even= is also available</span></span>
-<span id="cb4-15"><a href="#cb4-15" aria-hidden="true"></a> right={In the right in the center of the bottom},</span>
-<span id="cb4-16"><a href="#cb4-16" aria-hidden="true"></a> in={In the trim area in the center of the bottom.},</span>
-<span id="cb4-17"><a href="#cb4-17" aria-hidden="true"></a> }</span>
-<span id="cb4-18"><a href="#cb4-18" aria-hidden="true"></a> }</span>
-<span id="cb4-19"><a href="#cb4-19" aria-hidden="true"></a>}</span></code></pre></div>
+<div class="sourceCode" id="cb4"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb4-1"><a href="#cb4-1" aria-hidden="true" tabindex="-1"></a><span class="fu">\jlreqtrimmarkssetup</span>{</span>
+<span id="cb4-2"><a href="#cb4-2" aria-hidden="true" tabindex="-1"></a> banner={</span>
+<span id="cb4-3"><a href="#cb4-3" aria-hidden="true" tabindex="-1"></a> top-right={</span>
+<span id="cb4-4"><a href="#cb4-4" aria-hidden="true" tabindex="-1"></a> vertical={</span>
+<span id="cb4-5"><a href="#cb4-5" aria-hidden="true" tabindex="-1"></a> odd={In the right of the top, only in odd pages, vertical mode.},</span>
+<span id="cb4-6"><a href="#cb4-6" aria-hidden="true" tabindex="-1"></a> even={In the right of the top, only in even pages, vertical mode.},</span>
+<span id="cb4-7"><a href="#cb4-7" aria-hidden="true" tabindex="-1"></a> },</span>
+<span id="cb4-8"><a href="#cb4-8" aria-hidden="true" tabindex="-1"></a> horizontal={In the right of the top, horizontal mode.}, <span class="co">% does not depend on the parity of the page number</span></span>
+<span id="cb4-9"><a href="#cb4-9" aria-hidden="true" tabindex="-1"></a> corner={In the corner of the right of the top, horizontal mode.},</span>
+<span id="cb4-10"><a href="#cb4-10" aria-hidden="true" tabindex="-1"></a> in-horizontal={In the right of the top, horizontal mode, in the trim area.},</span>
+<span id="cb4-11"><a href="#cb4-11" aria-hidden="true" tabindex="-1"></a> in-vertical={In the right of the top, vertical mode, in the trim area.},</span>
+<span id="cb4-12"><a href="#cb4-12" aria-hidden="true" tabindex="-1"></a> },</span>
+<span id="cb4-13"><a href="#cb4-13" aria-hidden="true" tabindex="-1"></a> bottom-center={</span>
+<span id="cb4-14"><a href="#cb4-14" aria-hidden="true" tabindex="-1"></a> left={In the left in the center of the bottom}, <span class="co">% odd=, even= is also available</span></span>
+<span id="cb4-15"><a href="#cb4-15" aria-hidden="true" tabindex="-1"></a> right={In the right in the center of the bottom},</span>
+<span id="cb4-16"><a href="#cb4-16" aria-hidden="true" tabindex="-1"></a> in={In the trim area in the center of the bottom.},</span>
+<span id="cb4-17"><a href="#cb4-17" aria-hidden="true" tabindex="-1"></a> }</span>
+<span id="cb4-18"><a href="#cb4-18" aria-hidden="true" tabindex="-1"></a> }</span>
+<span id="cb4-19"><a href="#cb4-19" aria-hidden="true" tabindex="-1"></a>}</span></code></pre></div>
<p>A possible combination of <code>top/bottom/center</code> and <code>left/right/center/gutter/fore-edge</code> can be used for the position. You can use <code>\thepage</code> to output the number of the page.</p>
<p>The keys can be ommited. For example:</p>
-<div class="sourceCode" id="cb5"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb5-1"><a href="#cb5-1" aria-hidden="true"></a><span class="fu">\jlreqtrimmarkssetup</span>{</span>
-<span id="cb5-2"><a href="#cb5-2" aria-hidden="true"></a> banner={</span>
-<span id="cb5-3"><a href="#cb5-3" aria-hidden="true"></a> vertical={Vertical mode, in the top of the left},</span>
-<span id="cb5-4"><a href="#cb5-4" aria-hidden="true"></a> odd={In the top of the left, only in odd pages.}, <span class="co">% regarded as `horizontal`</span></span>
-<span id="cb5-5"><a href="#cb5-5" aria-hidden="true"></a> top-right={</span>
-<span id="cb5-6"><a href="#cb5-6" aria-hidden="true"></a> odd={In the top of the right, only in odd pages, horizontal mode.}</span>
-<span id="cb5-7"><a href="#cb5-7" aria-hidden="true"></a> }</span>
-<span id="cb5-8"><a href="#cb5-8" aria-hidden="true"></a> }</span>
-<span id="cb5-9"><a href="#cb5-9" aria-hidden="true"></a>}</span></code></pre></div>
+<div class="sourceCode" id="cb5"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb5-1"><a href="#cb5-1" aria-hidden="true" tabindex="-1"></a><span class="fu">\jlreqtrimmarkssetup</span>{</span>
+<span id="cb5-2"><a href="#cb5-2" aria-hidden="true" tabindex="-1"></a> banner={</span>
+<span id="cb5-3"><a href="#cb5-3" aria-hidden="true" tabindex="-1"></a> vertical={Vertical mode, in the top of the left},</span>
+<span id="cb5-4"><a href="#cb5-4" aria-hidden="true" tabindex="-1"></a> odd={In the top of the left, only in odd pages.}, <span class="co">% regarded as `horizontal`</span></span>
+<span id="cb5-5"><a href="#cb5-5" aria-hidden="true" tabindex="-1"></a> top-right={</span>
+<span id="cb5-6"><a href="#cb5-6" aria-hidden="true" tabindex="-1"></a> odd={In the top of the right, only in odd pages, horizontal mode.}</span>
+<span id="cb5-7"><a href="#cb5-7" aria-hidden="true" tabindex="-1"></a> }</span>
+<span id="cb5-8"><a href="#cb5-8" aria-hidden="true" tabindex="-1"></a> }</span>
+<span id="cb5-9"><a href="#cb5-9" aria-hidden="true" tabindex="-1"></a>}</span></code></pre></div>
<h3 id="trimmarks_width"><code>trimmarks_width</code></h3>
<p>Set the width of trim marks.</p>
<h3 id="-color"><code> color</code></h3>
Modified: trunk/Master/texmf-dist/doc/latex/jlreq/jlreq.html
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/jlreq.html 2020-12-29 21:59:35 UTC (rev 57254)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/jlreq.html 2020-12-29 22:00:12 UTC (rev 57255)
@@ -64,7 +64,7 @@
<ul>
<li>*.tfm -> $TEXMF/fonts/tfm/public/jlreq</li>
<li>*.vf -> $TEXMF/fonts/vf/public/jlreq</li>
-<li>jfm-jlreq.lua, jfm-jlreqv.lua -> $TEXMF/tex/luatex/jlreq</li>
+<li>jfm-jlreq.lua, jfm-jlreqv.lua, jfm-jlreq-jidori.lua jfm-jlreqv-jidori.lua -> $TEXMF/tex/luatex/jlreq</li>
<li>jlreq.cls, jlreq-helpers.sty -> $TEXMF/tex/latex/jlreq</li>
</ul>
<p>The other way to install is just to run <code>make install</code>. It will install all files in <code>$TEXMFHOME</code>.</p>
@@ -157,15 +157,11 @@
<li>2018-04-11
<ul>
<li>Sidenotes (<code>\footnote</code>) appears in the second column in <code>tate</code> mode.</li>
-</ul>
-- Added options <code>begin_widh_(odd|even)_page</code> to <code>\DeclareBlockHeading</code>.
-<ul>
-<li>Changed <code>\labelenumi</code> as in <code>jarticle</code> etc.
-<ul>
+<li>Added options <code>begin_widh_(odd|even)_page</code> to <code>\DeclareBlockHeading</code>.</li>
+<li>Changed <code>\labelenumi</code> as in <code>jarticle</code> etc.</li>
<li>Fix a bug on <code>column_gap</code> class option.</li>
<li>Added <code>mark_format</code> to <code>\DeclarePageStyle</code>.</li>
</ul></li>
-</ul></li>
<li>2018-05-19
<ul>
<li>Made the width of the label in the table of contents longer.</li>
@@ -239,9 +235,15 @@
</ul></li>
<li>2020-09-27
<ul>
-<li><p>Added <code>*</code>-version of <code>\tatechuyoko</code>.</p></li>
-<li><p>Fixed bugs.</p></li>
+<li>Added <code>*</code>-version of <code>\tatechuyoko</code>.</li>
+<li>Fixed bugs.</li>
</ul></li>
+<li>2020-12-29
+<ul>
+<li><code>fontsize</code> etc. with LuaLaTeX accept <code>H</code>.</li>
+<li>Added <code>\jidori</code>.</li>
+<li>Fixed bugs.</li>
+</ul></li>
</ul>
<hr />
<p>Noriyuki Abe <a href="https://github.com/abenori/jlreq">https://github.com/abenori/jlreq</a></p>
Modified: trunk/Master/texmf-dist/doc/latex/jlreq/jlreq.pdf
===================================================================
(Binary files differ)
Added: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/jlreq-jidori.tfm
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/jlreq-jidori.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/jlreq/jlreq-jidori.tfm 2020-12-29 21:59:35 UTC (rev 57254)
+++ trunk/Master/texmf-dist/fonts/tfm/public/jlreq/jlreq-jidori.tfm 2020-12-29 22:00:12 UTC (rev 57255)
Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/jlreq-jidori.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/jlreq-v-jidori.tfm
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/jlreq-v-jidori.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/jlreq/jlreq-v-jidori.tfm 2020-12-29 21:59:35 UTC (rev 57254)
+++ trunk/Master/texmf-dist/fonts/tfm/public/jlreq/jlreq-v-jidori.tfm 2020-12-29 22:00:12 UTC (rev 57255)
Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/jlreq-v-jidori.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/jlreqg-jidori.tfm
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/jlreqg-jidori.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/jlreq/jlreqg-jidori.tfm 2020-12-29 21:59:35 UTC (rev 57254)
+++ trunk/Master/texmf-dist/fonts/tfm/public/jlreq/jlreqg-jidori.tfm 2020-12-29 22:00:12 UTC (rev 57255)
Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/jlreqg-jidori.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/jlreqg-v-jidori.tfm
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/jlreqg-v-jidori.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/jlreq/jlreqg-v-jidori.tfm 2020-12-29 21:59:35 UTC (rev 57254)
+++ trunk/Master/texmf-dist/fonts/tfm/public/jlreq/jlreqg-v-jidori.tfm 2020-12-29 22:00:12 UTC (rev 57255)
Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/jlreqg-v-jidori.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreq-jidori-q.tfm
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreq-jidori-q.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreq-jidori-q.tfm 2020-12-29 21:59:35 UTC (rev 57254)
+++ trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreq-jidori-q.tfm 2020-12-29 22:00:12 UTC (rev 57255)
Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreq-jidori-q.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreq-jidori.tfm
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreq-jidori.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreq-jidori.tfm 2020-12-29 21:59:35 UTC (rev 57254)
+++ trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreq-jidori.tfm 2020-12-29 22:00:12 UTC (rev 57255)
Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreq-jidori.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreq-v-jidori.tfm
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreq-v-jidori.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreq-v-jidori.tfm 2020-12-29 21:59:35 UTC (rev 57254)
+++ trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreq-v-jidori.tfm 2020-12-29 22:00:12 UTC (rev 57255)
Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreq-v-jidori.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreqg-jidori-q.tfm
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreqg-jidori-q.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreqg-jidori-q.tfm 2020-12-29 21:59:35 UTC (rev 57254)
+++ trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreqg-jidori-q.tfm 2020-12-29 22:00:12 UTC (rev 57255)
Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreqg-jidori-q.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreqg-jidori.tfm
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreqg-jidori.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreqg-jidori.tfm 2020-12-29 21:59:35 UTC (rev 57254)
+++ trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreqg-jidori.tfm 2020-12-29 22:00:12 UTC (rev 57255)
Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreqg-jidori.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreqg-v-jidori.tfm
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreqg-v-jidori.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreqg-v-jidori.tfm 2020-12-29 21:59:35 UTC (rev 57254)
+++ trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreqg-v-jidori.tfm 2020-12-29 22:00:12 UTC (rev 57255)
Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreqg-v-jidori.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/vf/public/jlreq/jlreq-jidori.vf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/fonts/vf/public/jlreq/jlreq-jidori.vf
===================================================================
--- trunk/Master/texmf-dist/fonts/vf/public/jlreq/jlreq-jidori.vf 2020-12-29 21:59:35 UTC (rev 57254)
+++ trunk/Master/texmf-dist/fonts/vf/public/jlreq/jlreq-jidori.vf 2020-12-29 22:00:12 UTC (rev 57255)
Property changes on: trunk/Master/texmf-dist/fonts/vf/public/jlreq/jlreq-jidori.vf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/vf/public/jlreq/jlreq-v-jidori.vf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/fonts/vf/public/jlreq/jlreq-v-jidori.vf
===================================================================
--- trunk/Master/texmf-dist/fonts/vf/public/jlreq/jlreq-v-jidori.vf 2020-12-29 21:59:35 UTC (rev 57254)
+++ trunk/Master/texmf-dist/fonts/vf/public/jlreq/jlreq-v-jidori.vf 2020-12-29 22:00:12 UTC (rev 57255)
Property changes on: trunk/Master/texmf-dist/fonts/vf/public/jlreq/jlreq-v-jidori.vf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/vf/public/jlreq/jlreqg-jidori.vf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/fonts/vf/public/jlreq/jlreqg-jidori.vf
===================================================================
--- trunk/Master/texmf-dist/fonts/vf/public/jlreq/jlreqg-jidori.vf 2020-12-29 21:59:35 UTC (rev 57254)
+++ trunk/Master/texmf-dist/fonts/vf/public/jlreq/jlreqg-jidori.vf 2020-12-29 22:00:12 UTC (rev 57255)
Property changes on: trunk/Master/texmf-dist/fonts/vf/public/jlreq/jlreqg-jidori.vf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/vf/public/jlreq/jlreqg-v-jidori.vf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/fonts/vf/public/jlreq/jlreqg-v-jidori.vf
===================================================================
--- trunk/Master/texmf-dist/fonts/vf/public/jlreq/jlreqg-v-jidori.vf 2020-12-29 21:59:35 UTC (rev 57254)
+++ trunk/Master/texmf-dist/fonts/vf/public/jlreq/jlreqg-v-jidori.vf 2020-12-29 22:00:12 UTC (rev 57255)
Property changes on: trunk/Master/texmf-dist/fonts/vf/public/jlreq/jlreqg-v-jidori.vf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq-jidori-q.vf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq-jidori-q.vf
===================================================================
--- trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq-jidori-q.vf 2020-12-29 21:59:35 UTC (rev 57254)
+++ trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq-jidori-q.vf 2020-12-29 22:00:12 UTC (rev 57255)
Property changes on: trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq-jidori-q.vf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq-jidori.vf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq-jidori.vf
===================================================================
--- trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq-jidori.vf 2020-12-29 21:59:35 UTC (rev 57254)
+++ trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq-jidori.vf 2020-12-29 22:00:12 UTC (rev 57255)
Property changes on: trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq-jidori.vf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq-v-jidori.vf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq-v-jidori.vf
===================================================================
--- trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq-v-jidori.vf 2020-12-29 21:59:35 UTC (rev 57254)
+++ trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq-v-jidori.vf 2020-12-29 22:00:12 UTC (rev 57255)
Property changes on: trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq-v-jidori.vf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg-jidori-q.vf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg-jidori-q.vf
===================================================================
--- trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg-jidori-q.vf 2020-12-29 21:59:35 UTC (rev 57254)
+++ trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg-jidori-q.vf 2020-12-29 22:00:12 UTC (rev 57255)
Property changes on: trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg-jidori-q.vf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg-jidori.vf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg-jidori.vf
===================================================================
--- trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg-jidori.vf 2020-12-29 21:59:35 UTC (rev 57254)
+++ trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg-jidori.vf 2020-12-29 22:00:12 UTC (rev 57255)
Property changes on: trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg-jidori.vf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg-v-jidori.vf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg-v-jidori.vf
===================================================================
--- trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg-v-jidori.vf 2020-12-29 21:59:35 UTC (rev 57254)
+++ trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg-v-jidori.vf 2020-12-29 22:00:12 UTC (rev 57255)
Property changes on: trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg-v-jidori.vf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/Master/texmf-dist/source/latex/jlreq/Makefile
===================================================================
--- trunk/Master/texmf-dist/source/latex/jlreq/Makefile 2020-12-29 21:59:35 UTC (rev 57254)
+++ trunk/Master/texmf-dist/source/latex/jlreq/Makefile 2020-12-29 22:00:12 UTC (rev 57255)
@@ -6,7 +6,7 @@
all: jfm
jfm: \
- jfm-jlreqv.lua \
+ jfm-jlreqv.lua jfm-jlreqv-jidori.lua \
jlreq.tfm bjlreq.tfm zjlreq.tfm bzjlreq.tfm \
jlreq.vf bjlreq.vf zjlreq.vf bzjlreq.vf \
ujlreq.tfm ubjlreq.tfm uzjlreq.tfm ubzjlreq.tfm \
@@ -27,6 +27,11 @@
jlreqg-v.vf bjlreqg-v.vf zjlreqg-v.vf bzjlreqg-v.vf \
ujlreqg-v.tfm ubjlreqg-v.tfm uzjlreqg-v.tfm ubzjlreqg-v.tfm \
ujlreqg-v.vf ubjlreqg-v.vf uzjlreqg-v.vf ubzjlreqg-v.vf \
+ jlreq-jidori.tfm jlreq-jidori.vf jlreqg-jidori.tfm jlreqg-jidori.vf \
+ jlreq-v-jidori.tfm jlreq-v-jidori.vf jlreqg-v-jidori.tfm jlreqg-v-jidori.vf \
+ ujlreq-jidori.tfm ujlreq-jidori.vf ujlreqg-jidori.tfm ujlreqg-jidori.vf \
+ ujlreq-jidori-q.tfm ujlreq-jidori-q.vf ujlreqg-jidori-q.tfm ujlreqg-jidori-q.vf \
+ ujlreq-v-jidori.tfm ujlreq-v-jidori.vf ujlreqg-v-jidori.tfm ujlreqg-v-jidori.vf
rm -f rml.tfm rmlv.tfm gbm.tfm gbmv.tfm uprml-h.tfm uprml-hq.tfm upgbm-h.tfm upgbm-hq.tfm uprml-v.tfm uprml-vq.tfm upgbm-v.tfm upgbm-vq.tfm
@@ -43,6 +48,19 @@
%.pl: jfm-%-pl.lua luajfm2pl.lua
texlua luajfm2pl.lua --noutf $*-pl $@
+jlreq-jidori.pl: jfm-jlreq-jidori-pl.lua
+ texlua luajfm2pl.lua --noutf jlreq-jidori-pl $@
+
+jlreq-v-jidori.pl: jfm-jlreqv-jidori-pl.lua
+ texlua luajfm2pl.lua --noutf jlreqv-jidori-pl $@
+
+ujlreq-jidori.pl: jfm-jlreq-jidori-pl.lua
+ texlua luajfm2pl.lua jlreq-jidori-pl $@
+
+ujlreq-v-jidori.pl: jfm-jlreqv-jidori-pl.lua
+ texlua luajfm2pl.lua jlreqv-jidori-pl $@
+
+
# .vf
u%g-q.vf: u%g-q.tfm
makejvf -i -u jisq $< upgbm-hq.tfm
@@ -74,6 +92,37 @@
%.vf: %.tfm
makejvf -i $< rml.tfm
+jlreq-jidori.vf: jlreq-jidori.tfm
+ makejvf -i $< rml.tfm
+
+jlreq-v-jidori.vf: jlreq-v-jidori.tfm
+ makejvf -i $< rmlv.tfm
+
+jlreqg-jidori.vf: jlreqg-jidori.tfm
+ makejvf -i $< gbm.tfm
+
+jlreqg-v-jidori.vf: jlreqg-v-jidori.tfm
+ makejvf -i $< gbmv.tfm
+
+ujlreq-jidori-q.vf: ujlreq-jidori-q.tfm
+ makejvf -i -u jisq $< uprml-hq.tfm
+
+ujlreqg-jidori-q.vf: ujlreqg-jidori-q.tfm
+ makejvf -i -u jisq $< upgbm-hq.tfm
+
+ujlreq-jidori.vf: ujlreq-jidori.tfm ujlreq-jidori-q.tfm
+ makejvf -i -u custom -t ${MAKEJVFCNF} -H -U ujlreq-jidori-q $< uprml-h.tfm
+
+ujlreq-v-jidori.vf: ujlreq-v-jidori.tfm
+ makejvf -i -u custom -t ${MAKEJVFCNF} -H $< uprml-v.tfm
+
+ujlreqg-jidori.vf: ujlreqg-jidori.tfm ujlreqg-jidori-q.tfm
+ makejvf -i -u custom -t ${MAKEJVFCNF} -H -U ujlreqg-jidori-q $< upgbm-h.tfm
+
+ujlreqg-v-jidori.vf: ujlreqg-v-jidori.tfm
+ makejvf -i -u custom -t ${MAKEJVFCNF} -H $< upgbm-v.tfm
+
+
# .tfm
u%-q.tfm: u%.pl
uppltotf -kanji=uptex $< $@
@@ -93,7 +142,32 @@
%.tfm: %.pl
ppltotf -kanji=utf8 $< $@
-jfm-jlreqv.lua jfm-jlreq-pl.lua jfm-bjlreq-pl.lua jfm-zjlreq-pl.lua jfm-bzjlreq-pl.lua jfm-jlreqv-pl.lua jfm-bjlreqv-pl.lua jfm-zjlreqv-pl.lua jfm-bzjlreqv-pl.lua: make_variant_jfm.lua jfm-jlreq.lua
+ujlreq%-jidori.tfm: ujlreq%-jidori.pl
+ uppltotf -kanji=uptex $< $@
+
+jlreq%-jidori.tfm: jlreq%-jidori.pl
+ ppltotf -kanji=utf8 $< $@
+
+ujlreqg-jidori.tfm: ujlreq-jidori.tfm
+ cp $< $@
+
+ujlreqg-v-jidori.tfm: ujlreq-v-jidori.tfm
+ cp $< $@
+
+jlreqg-jidori.tfm: jlreq-jidori.tfm
+ cp $< $@
+
+jlreqg-v-jidori.tfm: jlreq-v-jidori.tfm
+ cp $< $@
+
+ujlreq-jidori-q.tfm: ujlreq-jidori.pl
+ uppltotf -kanji=uptex $< $@
+
+ujlreqg-jidori-q.tfm: ujlreq-jidori-q.tfm
+ cp $< $@
+
+
+jfm-jlreqv.lua jfm-jlreq-pl.lua jfm-bjlreq-pl.lua jfm-zjlreq-pl.lua jfm-bzjlreq-pl.lua jfm-jlreqv-pl.lua jfm-bjlreqv-pl.lua jfm-zjlreqv-pl.lua jfm-bzjlreqv-pl.lua jfm-jlreqv-jidori.lua jfm-jlreq-jidori-pl.lua jfm-jlreqv-jidori-pl.lua: make_variant_jfm.lua jfm-jlreq.lua jfm-jlreq-jidori.lua
texlua make_variant_jfm.lua
doc: pdfdoc htmldoc
@@ -132,7 +206,7 @@
mkdir -p ${TEXMF}/fonts/vf/public/jlreq
install *.vf ${TEXMF}/fonts/vf/public/jlreq
mkdir -p ${TEXMF}/tex/luatex/jlreq
- install jfm-jlreqv.lua jfm-jlreq.lua ${TEXMF}/tex/luatex/jlreq
+ install jfm-jlreqv.lua jfm-jlreq.lua jfm-jlreq-jidori.lua jfm-jlreqv-jidori.lua ${TEXMF}/tex/luatex/jlreq
cls-install:
mkdir -p ${TEXMF}/tex/latex/jlreq
@@ -153,6 +227,8 @@
mkdir -p ./tds/tex/luatex/jlreq
cp jfm-jlreq.lua ./tds/tex/luatex/jlreq
cp jfm-jlreqv.lua ./tds/tex/luatex/jlreq
+ cp jfm-jlreq-jidori.lua ./tds/tex/luatex/jlreq
+ cp jfm-jlreqv-jidori.lua ./tds/tex/luatex/jlreq
mkdir -p ./tds/tex/latex/jlreq
cp jlreq.cls ./tds/tex/latex/jlreq
cp jlreq-helpers.sty ./tds/tex/latex/jlreq
@@ -186,6 +262,7 @@
rm -f *jlreq*.tfm *jlreq*.pl *jlreq*.vf
rm -f jfm-jlreqv.lua
rm -f jfm-*jlreq*-pl.lua
+ rm -f jfm-jlreqv-jidori.lua
docclean:
rm -f jlreq.tex jlreq.pdf jlreq.html jlreq-ja.tex jlreq-ja.pdf jlreq-ja.html jlreq-trimmarks.html jlreq-trimmarks-ja.html
Modified: trunk/Master/texmf-dist/source/latex/jlreq/make_variant_jfm.lua
===================================================================
--- trunk/Master/texmf-dist/source/latex/jlreq/make_variant_jfm.lua 2020-12-29 21:59:35 UTC (rev 57254)
+++ trunk/Master/texmf-dist/source/latex/jlreq/make_variant_jfm.lua 2020-12-29 22:00:12 UTC (rev 57255)
@@ -97,6 +97,7 @@
end
local originaljfm = "jlreq"
+local originaljfm_jidori = "jlreq-jidori"
local jfmfile = kpse.find_file("jfm-" .. originaljfm .. ".lua")
if jfmfile == nil then
@@ -175,3 +176,35 @@
tolf(file);
+
+jfmfile = kpse.find_file("jfm-" .. originaljfm_jidori .. ".lua")
+if jfmfile == nil then
+ print("JFM " .. originaljfm_jidori .. " is not found")
+ os.exit(1)
+end
+
+jfm = nil
+function luatexja.jfont.define_jfm(j)
+ jfm = j
+end
+dofile(jfmfile)
+
+function to_jidori_pl(t)
+ t = table.fastcopy(t)
+ -- kanjiskipに任せているところを15zwに変更
+ for cl1,val in pairs(t) do
+ if type(cl1) == "number" then
+ for cl2,glue in pairs(val.glue) do
+ if glue.kanjiskip_stretch == 1 then
+ t[cl1].glue[cl2][2] = 15
+ end
+ end
+ end
+ end
+ return t
+end
+
+
+make_jfmfile(to_jidori_pl(jfm),"jfm-jlreq-jidori-pl.lua")
+make_jfmfile(to_jidori_pl(tate(jfm)),"jfm-jlreqv-jidori-pl.lua")
+make_jfmfile(tate(jfm),"jfm-jlreqv-jidori.lua")
Modified: trunk/Master/texmf-dist/tex/latex/jlreq/jlreq.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/jlreq/jlreq.cls 2020-12-29 21:59:35 UTC (rev 57254)
+++ trunk/Master/texmf-dist/tex/latex/jlreq/jlreq.cls 2020-12-29 22:00:12 UTC (rev 57255)
@@ -3,12 +3,20 @@
%% The package is distributed under the BSD 2-Clause License
%%
%%
-% (based on JLReq 20120403 https://www.w3.org/TR/2012/NOTE-jlreq-20120403/ja/)
+% (based on JLReq 20200811 https://www.w3.org/TR/2020/NOTE-jlreq-20200811/)
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{jlreq}[2020/09/27 jlreq]
-\RequirePackage{xkeyval,everyhook,etoolbox,ifthen,filehook}
+\ProvidesClass{jlreq}[2020/12/29 jlreq]
+\RequirePackage{xkeyval,everyhook,etoolbox,ifthen}
\RequirePackage{jlreq-helpers}
+
+\ExplSyntaxOn
+\tl_new:N \l_jlreq_tmpa_tl
+\cs_new:Nn \l_jlreq_do: {}
+\str_new:N \l_jlreq_tmpa_str
+\str_new:N \l_jlreq_tmpb_str
+\ExplSyntaxOff
+
\newcommand*{\jlreq at undeferr}[1]{\ClassError{jlreq}{Trying to delete \string#1 even though it is not defined, may be a bug}{\@ehc}}
% クラスファイル内でしか使わないマクロをクラスファイル終了時に未定義にする
\newcommand*{\jlreq at aftercls@addtodeletecs}[1]{%
@@ -31,17 +39,20 @@
\AtBeginDocument{\jlreq at preamblefalse}
\def\jlreq at saveoriginalcs#1{%
- \ifx#1\relax
- \ClassError{jlreq}{Trying to save \string#1 but it's not defined, may be a bug}{\@ehc}%
- \fi
- \expandafter\ifx\csname jlreq at original@\expandafter\@gobble\string#1\endcsname\relax\else
- \ClassError{jlreq}{Trying to save \string#1 twice, may be a bug}{\@ehc}%
- \fi
- \expandafter\let\csname jlreq at original@\expandafter\@gobble\string#1\endcsname=#1
+ \@ifundefined{#1}{
+ \ClassError{jlreq}{Trying to save #1 but it's not defined, may be a bug}{\@ehc}%
+ }{}
+ \@ifundefined{jlreq at original@#1}{}{
+ \ClassError{jlreq}{Trying to save #1 twice, may be a bug}{\@ehc}%
+ }
+ \begingroup
+ \edef\jlreq at do{\noexpand\let\expandonce{\csname jlreq at original@#1\endcsname}=\expandonce{\csname #1\endcsname}}
+ \expandafter\endgroup
+ \jlreq at do
}
\def\jlreq at useoriginalcs#1{%
- \jlreq at if{\ifcsname jlreq at original@\expandafter\@gobble\string#1\endcsname\fi}%
- {\csname jlreq at original@\expandafter\@gobble\string#1\endcsname}%
+ \jlreq at if{\ifcsname jlreq at original@#1\endcsname\fi}%
+ {\csname jlreq at original@#1\endcsname}%
{#1}%
}
\def\jlreq at restoreoriginalcs#1{%
@@ -633,11 +644,13 @@
\providecommand*{\jlreqkanjiskip}{0pt plus 0.25\jlreq at zw minus 0pt}
\fi
\providecommand*{\jlreqxkanjiskip}{0.25\jlreq at zw plus 0.25\jlreq at zw minus 0.125\jlreq at zw}
-\AtBeginDocument{
- \jlreq at if{\ifx l\jlreq at engine\fi}{
- \ltjsetparameter{kanjiskip=\jlreqkanjiskip}
- \ltjsetparameter{xkanjiskip=\jlreqxkanjiskip}
- }{
+\jlreq at if{\ifx l\jlreq at engine\fi}{
+ \AtBeginDocument{%
+ \ltjsetparameter{kanjiskip=\jlreqkanjiskip}%
+ \ltjsetparameter{xkanjiskip=\jlreqxkanjiskip}%
+ }
+}{
+ \AtBeginDocument{%
\kanjiskip=\jlreqkanjiskip
\xkanjiskip=\jlreqxkanjiskip
}
@@ -652,7 +665,7 @@
\dimexpr\directlua{
local act = string.char(92)
local s = [[#1]]
- s = s:gsub("Q",act .. "dimexpr 0.25mm" .. act .. "relax")
+ s = s:gsub("[QH]",act .. "dimexpr 0.25mm" .. act .. "relax")
tex.print(s)
}\relax
}%
@@ -702,6 +715,29 @@
\edef\jlreq at jafontscale{\strip at pt\jlreq at resultdimen}
\jlreq at aftercls@addtodeletecs{\jlreq at jafontscale}
\ifx l\jlreq at engine
+ \jlreq at saveoriginalcs{DeclareFontShape}
+ \ExplSyntaxOn
+ \def\DeclareFontShape#1#2#3#4#5#6{
+ \group_begin:
+ \bool_if:nT{\str_if_eq_p:nn{#1}{JY3} || \str_if_eq_p:nn{#1}{JT3}}{
+ \tl_set:Nx \l_jlreq_tmpa_tl {#5}
+ \tl_if_in:NnTF \l_jlreq_tmpa_tl {jfm=jlreq}{
+ \tl_if_in:NnTF \l_jlreq_tmpa_tl {jfm=jlreqv}{
+ \tl_replace_all:Nnn \l_jlreq_tmpa_tl {jfm=jlreqv}{jfm=jlreqv-jidori}
+ }{
+ \tl_replace_all:Nnn \l_jlreq_tmpa_tl {jfm=jlreq}{jfm=jlreq-jidori}
+ }
+ \cs_set:Nx \l_jlreq_do: {\exp_not:n{\jlreq at useoriginalcs{DeclareFontShape}{#1}{#2}{#3}{#4-jidori}}{\tl_use:N \l_jlreq_tmpa_tl}{#6}}
+ }{
+ \tl_if_in:NnT \l_jlreq_tmpa_tl {<->ssub}{
+ \cs_set:Nn \l_jlreq_do: {\jlreq at useoriginalcs{DeclareFontShape}{#1}{#2}{#3}{#4-jidori}{#5}{#6}}
+ }
+ }
+ }
+ \exp_after:wN \group_end: \l_jlreq_do:
+ \jlreq at useoriginalcs{DeclareFontShape}{#1}{#2}{#3}{#4}{#5}{#6}
+ }
+ \ExplSyntaxOff
\DeclareFontShape{JY3}{mc}{m}{n}{<->s*[\jlreq at jafontscale]\ltj at stdmcfont:jfm=jlreq;script=latn;-kern}{}
\DeclareFontShape{JY3}{gt}{m}{n}{<->s*[\jlreq at jafontscale]\ltj at stdgtfont:jfm=jlreq;script=latn;-kern}{}
\DeclareFontShape{JT3}{mc}{m}{n}{<->s*[\jlreq at jafontscale]\ltj at stdmcfont:jfm=jlreqv;script=latn;-kern}{}
@@ -711,6 +747,11 @@
\DeclareFontShape{\jlreq at yokokanjiencoding}{gt}{m}{n}{<->s*[\jlreq at jafontscale]\jlreq at jfmnameg}{}
\DeclareFontShape{\jlreq at tatekanjiencoding}{mc}{m}{n}{<->s*[\jlreq at jafontscale]\jlreq at jfmname-v}{}
\DeclareFontShape{\jlreq at tatekanjiencoding}{gt}{m}{n}{<->s*[\jlreq at jafontscale]\jlreq at jfmnameg-v}{}
+ \edef\jlreq at tempa{\ifx u\jlreq at engine u\fi}
+ \DeclareFontShape{\jlreq at yokokanjiencoding}{mc}{m}{n-jidori}{<->s*[\jlreq at jafontscale]\jlreq at tempa jlreq-jidori}{}
+ \DeclareFontShape{\jlreq at yokokanjiencoding}{gt}{m}{n-jidori}{<->s*[\jlreq at jafontscale]\jlreq at tempa jlreqg-jidori}{}
+ \DeclareFontShape{\jlreq at tatekanjiencoding}{mc}{m}{n-jidori}{<->s*[\jlreq at jafontscale]\jlreq at tempa jlreq-v-jidori}{}
+ \DeclareFontShape{\jlreq at tatekanjiencoding}{gt}{m}{n-jidori}{<->s*[\jlreq at jafontscale]\jlreq at tempa jlreqg-v-jidori}{}
\fi
\@for\jlreq at encoding:=\jlreq at yokokanjiencoding,\jlreq at tatekanjiencoding\do{
\@for\jlreq at shape:=n,it,sl,sc\do{
@@ -761,10 +802,10 @@
\edef\jlreq at charlist@katakana{アイウエオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂツヅテデトドナニヌネノハバパヒビピフブプヘベペホボポマミムメモヤユヨラリルレロワヰヱヲンヴ\ifx p\jlreq at engine\else ヷヸヹヺ\fi}% カ゚キ゚ク゚ケ゚コ゚セ゚ツ゚ト゚
%.. 行頭括弧調整
-\ifx l\jlreq at endgine
+\ifx l\jlreq at engine
% \item後の行頭括弧のために仕込み．
- \jlreq at saveoriginalcs{\list}
- \jlreq at saveoriginalcs{\endlist}
+ \jlreq at saveoriginalcs{list}
+ \jlreq at saveoriginalcs{endlist}
\PushPostHook{par}{\jlreq at parhook@atbeginlist}
\pretocmd{\list}{\def\jlreq at parhook@atbeginlist{\ltjfakeparbegin}}{}{}
\apptocmd{\endlist}{\def\jlreq at parhook@atbeginlist{}}{}{}
@@ -992,11 +1033,10 @@
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
% 和文ファミリと欧文ファミリの連動
-\@ifundefined{@rmfamilyhook}{}{\g at addto@macro\@rmfamilyhook{\prepare at family@series at update@kanji{mc}\mcdefault}}
-\@ifundefined{@sffamilyhook}{}{\g at addto@macro\@sffamilyhook{\prepare at family@series at update@kanji{gt}\gtdefault}}
-\@ifundefined{@ttfamilyhook}{}{\g at addto@macro\@ttfamilyhook{\prepare at family@series at update@kanji{gt}\gtdefault}}
+\AddToHook{rmfamily}{\prepare at family@series at update@kanji{mc}\mcdefault}
+\AddToHook{sffamily}{\prepare at family@series at update@kanji{gt}\gtdefault}
+\AddToHook{ttfamily}{\prepare at family@series at update@kanji{gt}\gtdefault}
-
% 数式フォント設定
\ifjlreq at option@enablejfam
\ifx l\jlreq at engine\else
@@ -1077,7 +1117,7 @@
\dimexpr\directlua{
local act = string.char(92)
local s = [[\jlreq at option@baselineskip]]
- s = s:gsub("Q",act .. "dimexpr 0.25mm" .. act .. "relax"):gsub("zh",act .. "zh"):gsub("zw",act .. "zw")
+ s = s:gsub("[QH]",act .. "dimexpr 0.25mm" .. act .. "relax"):gsub("zh",act .. "zh"):gsub("zw",act .. "zw")
tex.print(s)
}\relax
}%
@@ -1094,7 +1134,7 @@
\emergencystretch 3\jlreq at gol
\setlength{\parindent}{1\zw}
\def\jlreq at setfontsizehook{}
-\jlreq at saveoriginalcs{\set at fontsize}
+\jlreq at saveoriginalcs{set at fontsize}
\apptocmd{\set at fontsize}{\expandafter\def\expandafter\size at update\expandafter{\size at update\jlreq at setfontsizehook}}{}{}
\appto\jlreq at setfontsizehook{\ifdim\parindent>0pt \setlength{\parindent}{1\jlreq at zw}\fi}
\ifx l\jlreq at engine
@@ -1553,10 +1593,9 @@
% デフォルトでは\<命令名>markと\addcontentslineが必要ならば呼ばれる．
% 見出しの直前に実行される
-\newcommand*{\jlreq at hook@beforeheadings}[1]{}
+\NewHook{./heading/before}
% 見出し名一覧を格納する
\def\jlreq at heading@allheadings{}
-
% 目次を出力する命令\l@<命令名>を作る命令を作る．{1 = 命令名}{2 = レベル}{3 = ラベルのフォーマット}
% 結果は\jlreq at resultに入る．
\def\jlreq at heading@make at l@#1#2#3{%
@@ -1609,6 +1648,7 @@
%.. 中/半扉見出し
% addcontentslineに渡すやつ：番号出すのと出さないの
\newcommand{\DeclareTobiraHeading}[3]{%
+ \IfHookExistsTF{jlreq/heading/before/#1}{}{\NewHook{./heading/before/#1}}%
\def\jlreq at do{\@removeelement{#1}}%
\expandafter\jlreq at do\expandafter{\jlreq at heading@allheadings}{\jlreq at heading@allheadings}%
\appto{\jlreq at heading@allheadings}{,#1}%
@@ -1690,7 +1730,11 @@
\unexpanded{\if at twocolumn\onecolumn\@restonecoltrue\else\@restonecolfalse\fi\cleartooddpage[empty]}%
\ifx\jlreq at pagestyle\@empty\else\noexpand\thispagestyle{\expandonce{\jlreq at pagestyle}}\fi
\noexpand\secdef{\expandonce{\csname jlreq at TobiraHeading@start@#1\endcsname}}{\expandonce{\csname jlreq at TobiraHeading@start at s@#1\endcsname}}}%
- \noexpand\def\expandonce{\csname #1\endcsname}{\expandonce{\csname jlreq at headingcs@#1\endcsname}}%
+ \noexpand\def\expandonce{\csname #1\endcsname}{%
+ \noexpand\UseHook{jlreq/heading/before}%
+ \noexpand\UseHook{jlreq/heading/before/#1}%
+ \expandonce{\csname jlreq at headingcs@#1\endcsname}%
+ }%
}%
\expandafter\endgroup
\jlreq at do
@@ -2118,6 +2162,7 @@
% \DeclareBlockHeading{命令名}{レベル}{設定}
\def\jlreq at BlockHeading@allheadings{}% 別行見出し一覧
\newcommand{\DeclareBlockHeading}[3]{%
+ \IfHookExistsTF{jlreq/heading/before/#1}{}{\NewHook{jlreq/heading/before/#1}}%
\def\jlreq at do{\@removeelement{#1}}%
\expandafter\jlreq at do\expandafter{\jlreq at heading@allheadings}{\jlreq at heading@allheadings}%
\appto\jlreq at heading@allheadings{,#1}%
@@ -2360,7 +2405,8 @@
\edef\jlreq at do{%
\expandonce{\jlreq at do}%
\noexpand\edef\expandonce{\csname jlreq at headingcs@#1\endcsname}{\noexpand\unexpanded{%
- \noexpand\jlreq at hook@beforeheadings{#1}%
+ \noexpand\UseHook{jlreq/heading/before}%
+ \noexpand\UseHook{jlreq/heading/before/#1}%
\expandonce{\jlreq at pagebreak}%
\unexpanded{\jlreq at BlockHeading@start{#1}{#2}}%
{{\expandonce{\jlreq at align}}{\expandonce{\jlreq at indent}}{\expandonce{\jlreq at end@indent}}\expandonce{\jlreq at spaceset}{\expandonce{\jlreq at allowbreak@evenpage}}}%
@@ -2729,6 +2775,7 @@
% \DeclareRuninHeading{命令名}{レベル}{設定}
\newcommand*{\DeclareRuninHeading}[3]{%
+ \IfHookExistsTF{jlreq/heading/before/#1}{}{\NewHook{jlreq/heading/before/#1}}%
\def\jlreq at do{\@removeelement{#1}}%
\expandafter\jlreq at do\expandafter{\jlreq at heading@allheadings}{\jlreq at heading@allheadings}%
\appto\jlreq at heading@allheadings{,#1}%
@@ -2787,7 +2834,8 @@
% パラメータトークンを含むので，\edefして\unexpandedで包む
\noexpand\edef\expandonce{\csname #1\endcsname}{%
\noexpand\unexpanded{%
- \unexpanded{\jlreq at hook@beforeheadings{#1}}%
+ \noexpand\UseHook{jlreq/heading/before}%
+ \noexpand\UseHook{jlreq/heading/before/#1}%
\unexpanded{\jlreq at RuninHeading@start{#1}{#2}}{\ifjlreq at number\else -\fi}{\expandonce{\jlreq at label@format}}{\expandonce{\jlreq at format@wlabel}}{\expandonce{\jlreq at format@wolabel}}%
}%
}%
@@ -2876,6 +2924,7 @@
}
\newcommand*{\DeclareCutinHeading}[3]{%
+ \IfHookExistsTF{jlreq/heading/before/#1}{}{\NewHook{jlreq/heading/before/#1}}%
\expandafter\def\csname jlreq at heading@level@#1\endcsname{#2}%
\expandafter\def\csname jlreq at heading@setting@#1\endcsname{#3}%
\expandafter\def\csname jlreq at heading@type@#1\endcsname{\RenewCutinHeading}%
@@ -2897,6 +2946,8 @@
}{}%
\edef\jlreq at do{%
\noexpand\def\expandonce{\csname #1\endcsname}{%
+ \noexpand\UseHook{jlreq/heading/before}%
+ \noexpand\UseHook{jlreq/heading/before/#1}%
\noexpand\jlreq at CutinHeading@start{#1}{\expandonce{\jlreq at fontcommand}}{\expandonce{\jlreq at indent}}{\expandonce{\jlreq at after@space}}{\expandonce{\jlreq at onelinemax}}{\expandonce{\jlreq at twolinemax}}%
}%
}%
@@ -3130,8 +3181,8 @@
\fi
% \footnoteと\footnotemarkの前後に\jlreq at hook@prenote/\jlreq at hook@postnoteを入れる
-\jlreq at saveoriginalcs{\footnote}
-\jlreq at saveoriginalcs{\footnotemark}
+\jlreq at saveoriginalcs{footnote}
+\jlreq at saveoriginalcs{footnotemark}
\long\def\jlreq at footnotetext@for at footnote[#1]#2{%
\def\jlreq at result{\footnotetext[#1]{#2}}%
}
@@ -3147,11 +3198,11 @@
\@ifnextchar[{\jlreq at footnotemark@impl at woption}{\jlreq at footnotemark@impl at wooption}%
}
\long\def\jlreq at footnotemark@impl at woption[#1]{%
- \jlreq at useoriginalcs{\footnotemark}[#1]%
+ \jlreq at useoriginalcs{footnotemark}[#1]%
\jlreq at hook@postnote
}
\long\def\jlreq at footnotemark@impl at wooption{%
- \jlreq at useoriginalcs{\footnotemark}%
+ \jlreq at useoriginalcs{footnotemark}%
\jlreq at hook@postnote
}
\def\jlreq at restore@original at footnotes{%
@@ -3403,10 +3454,9 @@
\let\@makeendmark=\@makefnmark
% \theendnoteの出力を仕込む
-\apptocmd{\jlreq at hook@beforeheadings}{\jlreq at endnote@hook at beforeheadings{#1}}{}{}
-
\jlreq at jlreqsetup@add{endnote_position}{
- \def\jlreq at endnote@hook at beforeheadings##1{}
+ \AddToHook{jlreq/heading/before}[jlreq/endnote]{}
+ \RemoveFromHook{jlreq/heading/before}[jlreq/endnote]
\jlreq at tempafalse % headingsが指定された
\jlreq at tempbfalse % paragraphが指定された
% \jlreq at tempcにセクション名たちを入れていく
@@ -3436,17 +3486,13 @@
\fi
\ifjlreq at tempa
- \apptocmd{\jlreq at endnote@hook at beforeheadings}{\theendnotes}{}{}
+ \AddToHook{jlreq/heading/before}[jlreq/endnote]{\theendnotes}
\else
\@for\@tempa:=\jlreq at tempc\do{
\ifx\@tempa\@empty\else
- \edef\jlreq at do{%
- \unexpanded{\def\jlreq at endnote@hook at beforeheadings##1}{\expandonce{\jlreq at endnote@hook at beforeheadings{##1}}%
- \unexpanded{\def\@tempa}{\@tempa}\unexpanded{\def\@tempb{##1}}%
- \unexpanded{\ifx\@tempa\@tempb\theendnotes\fi}%
- }
- }
- \jlreq at do
+ \AddToHook{jlreq/heading/before/\@tempa}[jlreq/endnote]{}
+ \RemoveFromHook{jlreq/heading/before/\@tempa}[jlreq/endnote]
+ \AddToHook{jlreq/heading/before/\@tempa}[jlreq/endnote]{\theendnotes}
\fi
}
\fi
@@ -4962,11 +5008,8 @@
%. 箇条書き． cf. JISX4051 8.4
% 用語定義型
\newenvironment{description}{\list{}{%
- \setlength{\leftmargin}{0pt}% 下げない
- \setlength{\labelwidth}{0pt}%
- \setlength{\labelsep}{1\jlreq at zw}
-% \addtolength{\leftmargin}{\leftskip}% たぶんこの二行いらない……
-% \addtolength{\leftmargin}{\labelsep}%
+ \setlength{\labelsep}{1\jlreq at zw}%
+ \setlength{\labelwidth}{\dimexpr\leftmargin - \labelsep\relax}%
\let\makelabel=\descriptionlabel
% 同行じゃない場合はこんな感じ？
% \let\jlreq at original@@item=\@item
@@ -5069,27 +5112,33 @@
\newenvironment{verse}
{\let\\\@centercr
- \list{}{\itemsep\z@ \itemindent -2\jlreq at mol
+ \list{}{\itemsep\z@ \itemindent -2\jlreq at zw
\listparindent\itemindent
\labelwidth\z@
\labelsep\z@
\leftmargin=\dimexpr\jlreq at quote@indent\relax
- \addtolength{\leftmargin}{2\jlreq at mol}%
+ \addtolength{\leftmargin}{2\jlreq at zw}%
\rightmargin=\dimexpr\jlreq at quote@end at indent\relax
- \jlreq at quote@fontsize
- \@tempdima=1\jlreq at zw
+ \begingroup
+ \jlreq at quote@fontsize
+ \edef\jlreq at do{\noexpand\@tempdima=\the\dimexpr1\jlreq at zw\relax\relax}%
+ \expandafter\endgroup
+ \jlreq at do
\@tempdimb=\dimexpr\linewidth - \@totalleftmargin - \leftmargin - \rightmargin\relax
\@tempdimc=\@tempdimb
\divide\@tempdimb by \@tempdima\multiply\@tempdimb by \@tempdima
\topsep=\dimexpr\jlreq at quote@beforeafter at space\relax
\leftmargin=\dimexpr\leftmargin + \@tempdimc - \@tempdimb\relax}%
- \item\relax}{\endlist}
+ \item\relax\jlreq at quote@fontsize}{\endlist}
\newenvironment{quotation}
{\list{}{%
\leftmargin=\dimexpr\jlreq at quote@indent\relax
\rightmargin=\dimexpr\jlreq at quote@end at indent\relax
- \jlreq at quote@fontsize
- \@tempdima=1\jlreq at zw
+ \begingroup
+ \jlreq at quote@fontsize
+ \edef\jlreq at do{\noexpand\@tempdima=\the\dimexpr1\jlreq at zw\relax\relax}%
+ \expandafter\endgroup
+ \jlreq at do
\@tempdimb=\dimexpr\linewidth - \@totalleftmargin - \leftmargin - \rightmargin\relax
\@tempdimc=\@tempdimb
\divide\@tempdimb by \@tempdima\multiply\@tempdimb by \@tempdima
@@ -5100,13 +5149,16 @@
\labelsep\z@
\topsep=\dimexpr\jlreq at quote@beforeafter at space\relax
\parsep\z@ \@plus.1\jlreq at gol}%
- \item\relax}{\endlist}
+ \item\relax\jlreq at quote@fontsize}{\endlist}
\newenvironment{quote}
{\list{}{%
\leftmargin=\dimexpr\jlreq at quote@indent\relax
\rightmargin=\dimexpr\jlreq at quote@end at indent\relax
- \jlreq at quote@fontsize
- \@tempdima=1\jlreq at zw
+ \begingroup
+ \jlreq at quote@fontsize
+ \edef\jlreq at do{\noexpand\@tempdima=\the\dimexpr 1\jlreq at zw\relax\relax}%
+ \expandafter\endgroup
+ \jlreq at do
\@tempdimb=\dimexpr\linewidth - \@totalleftmargin - \leftmargin - \rightmargin\relax
\@tempdimc=\@tempdimb
\divide\@tempdimb by \@tempdima\multiply\@tempdimb by \@tempdima
@@ -5115,12 +5167,12 @@
\itemindent\z@
\topsep=\jlreq at speciallength{\jlreq at quote@beforeafter at space}%
\listparindent\z@}%
- \item\relax}{\endlist}
+ \item\relax\jlreq at quote@fontsize}{\endlist}
%. 表関係 4.4
% 表内の行間を0にする（4.4.3.f）
-\jlreq at saveoriginalcs{\tabular}
-\jlreq at saveoriginalcs{\endtabular}
+\jlreq at saveoriginalcs{tabular}
+\jlreq at saveoriginalcs{endtabular}
\preto\tabular{\begingroup\appto\@arrayparboxrestore{\baselineskip=0pt\lineskip=0pt}}
\appto\endtabular{\endgroup}
% 4.4.3.e
@@ -5608,6 +5660,49 @@
\jlreq at do
}
+\ExplSyntaxOn
+\jlreq at saveoriginalcs{kanjishape}
+\ifx l\jlreq at engine
+ \cs_set:Nn \l_jlreq_tmpa:n {
+ \NewDocumentCommand{\jidori}{m m}{
+ \mode_if_vertical:TF{\leavevmode}{}
+ \group_begin:
+ \ltj at setpar@global
+ \ltjsetkanjiskip 0pt~plus~1fil~minus~0pt
+ \ltjsetxkanjiskip 0pt~plus~1fil~minus~0pt
+ \renewcommand*{\jlreqkanjiskip}{0pt~plus~1fil~minus~0pt}
+ \renewcommand*{\jlreqxkanjiskip}{0pt~plus~1fil~minus~0pt}
+ \hbox_to_wd:nn {##1}{
+ \def#1{ }
+ \kanjishape{n-jidori}\selectfont
+ \def\kanjishape####1{\jlreq at useoriginalcs{kanjishape}{####1-jidori}}
+ ##2
+ \hskip\glueexpr 0pt~minus~1fil\relax
+ }
+ \group_end:
+ }
+ }
+ \catcode` =\active
+ \l_jlreq_tmpa:n{ }
+ \catcode` =12
+\else
+ \NewDocumentCommand{\jidori}{m m}{
+ \mode_if_vertical:TF{\leavevmode}{}
+ \group_begin:
+ \setlength{\kanjiskip}{0pt~plus~15zw~minus~0pt}
+ \setlength{\xkanjiskip}{0pt~plus~15zw~minus~0pt}
+ \renewcommand*{\jlreqkanjiskip}{0pt~plus~15zw~minus~0pt}
+ \renewcommand*{\jlreqxkanjiskip}{0pt~plus~15zw~minus~0pt}
+ \hbox_to_wd:nn {#1}{
+ \kanjishape{n-jidori}\selectfont
+ \inhibitglue #2
+ \hskip\glueexpr 0pt~minus~1fil\relax
+ }
+ \group_end:
+ }
+\fi
+\ExplSyntaxOff
+
% 日にち
\newif\if西暦
\def\西暦{\西暦true}
@@ -5660,8 +5755,8 @@
\minute=\numexpr\time - 60*\hour\relax
%.. 定理環境
-\jlreq at saveoriginalcs{\@begintheorem}
-\jlreq at saveoriginalcs{\@opargbegintheorem}
+\jlreq at saveoriginalcs{@begintheorem}
+\jlreq at saveoriginalcs{@opargbegintheorem}
\def\@begintheorem#1#2{\topsep=\dimexpr\jlreq at theorem@beforeafter at space\relax
\trivlist\labelsep=1\jlreq at zw
\itemindent=\dimexpr\jlreq at theorem@indent\relax
@@ -5672,9 +5767,9 @@
\itemindent=\dimexpr\jlreq at theorem@indent\relax
\jlreq at theorem@font
\item[\hskip \labelsep{\reset at font\jlreq at theorem@label at font #1\ #2（#3）}]}
-\AtEndOfPackageFile*{amsthm}{%
- \jlreq at saveoriginalcs{\proof}%
- \jlreq at saveoriginalcs{\endproof}%
+\AddToHook{package/after/amsthm}{
+ \jlreq at saveoriginalcs{proof}%
+ \jlreq at saveoriginalcs{endproof}%
\edef\jlreq at do{
\unexpanded{\def\jlreq at proof[#1]}{%
\unexpanded{\labelsep=1\jlreq at zw}%
@@ -5739,8 +5834,8 @@
\if at twoside\ModifyHeading{subsection}{allowbreak_if_evenpage=true}\fi
\NewBlockHeading{subsubsection}{3}{font={\jlreq at keepbaselineskip{\normalsize}},indent=10\jlreq at zw,lines=1,before_lines=1,subtitle_break=false,after_label_space=1\jlreq at zw,second_heading_text_indent={-1\jlreq at zw,1\jlreq at zw},,subtitle_font={\jlreq at keepbaselineskip{\scriptsize}}}
\if at twoside\ModifyHeading{subsubsection}{allowbreak_if_evenpage=true}\fi
- \NewRuninHeading{paragraph}{4}{font={\jlreq at keepbaselineskip{\normalsize}}}
- \NewRuninHeading{subparagraph}{5}{font={\jlreq at keepbaselineskip{\normalsize}},indent=1\jlreq at zw}
+ \NewRuninHeading{paragraph}{4}{font={\jlreq at keepbaselineskip{\normalsize}\sffamily\gtfamily\bfseries}}
+ \NewRuninHeading{subparagraph}{5}{font={\jlreq at keepbaselineskip{\normalsize}\sffamily\gtfamily\bfseries},indent=1\jlreq at zw}
\else% yoko
\renewcommand{\thepart}{\Roman{part}}
\renewcommand{\thesubsection}{\thesection .\arabic{subsection}}
Added: trunk/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq-jidori.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq-jidori.lua (rev 0)
+++ trunk/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq-jidori.lua 2020-12-29 22:00:12 UTC (rev 57255)
@@ -0,0 +1,190 @@
+local jfm = {
+ dir = 'yoko',
+ zw = 1.0,
+ zh = 1.0,
+ -- 使わない
+ kanjiskip = {0, 0, 0},
+ xkanjiskip = {0, 0, 0},
+ version = 3,
+ [0] = {
+ left = 0,
+ align = 'middle',
+ width = 1,height = 0.88,depth = 0.12,
+ glue = {
+ [1] = {0.5, 0, 0, kanjiskip_stretch = 1},
+ [2] = {0, 0, 0},
+ [5] = {0.25, 0, 0.25, kanjiskip_stretch = 1},
+ }
+ },
+ [1] = { -- 始め括弧類
+ chars = {'（', '〔', '［', '｛', '〈', '《', '「', '『', '【', '｟', '〘', '〖', '«', '〝',
+ '‘', '“'},
+ width = 0.5,height = 0.88,depth = 0.12,
+ align = 'right',
+ glue = {
+ [0] = {0, 0, 0},
+ [1] = {0, 0, 0},
+ [2] = {0, 0, 0},
+ [300] = {0, 0, 0},
+ [301] = {0, 0, 0},
+ [302] = {0, 0, 0},
+ [5] = {0.25, 0, 0.25, ratio = 1},
+ [7] = {0, 0, 0},
+ [8] = {0, 0, 0},
+ [14] = {0, 0, 0},
+ [27] = {0, 0, 0},
+ }
+ },
+ [2] = { -- 終わり括弧類
+ chars = { '）', '〕', '］', '｝', '〉', '》', '」', '』', '】', '｠', '〙', '〗', '»', '〟',
+ '’', '”'},
+ width = 0.5,height = 0.88,depth = 0.12,
+ align = 'left',
+ glue = {
+ [0] = {0.5, 0, 0.5, ratio = 0, kanjiskip_stretch = 1},
+ [1] = {0.5, 0, 0.5, ratio = 0, kanjiskip_stretch = 1},
+ [2] = {0, 0, 0},
+ [300] = {0.5, 0, 0.5, ratio = 0, kanjiskip_stretch = 1},
+ [301] = {0.5, 0, 0.5, ratio = 0, kanjiskip_stretch = 1},
+ [302] = {0.5, 0, 0.5, ratio = 0, kanjiskip_stretch = 1},
+ [5] = {0.25, 0, 0.25, ratio = 1, kanjiskip_stretch = 1},
+ [8] = {0.5, 0, 0.5, ratio = 0, kanjiskip_stretch = 1},
+ [27] = {0.5, 0, 0.5, ratio = 0, kanjiskip_stretch = 1},
+ }
+ },
+ [300] = {
+ chars = {'‐'},
+ width = 0.25,height = 0.88,depth = 0.12,
+ align = 'middle',
+ glue = {
+ [1] = {0.5, 0, 0.5, ratio = 1, kanjiskip_stretch = 1},
+ [2] = {0, 0, 0},
+ [5] = {0.25, 0, 0.25, ratio = 0, kanjiskip_stretch = 1},
+ }
+ },
+
+ [301] = {
+ chars = {'゠', '–'},
+ width = 0.5,height = 0.88,depth = 0.12,
+ align = 'middle',
+ glue = {
+ [1] = {0.5, 0, 0.5, ratio = 1, kanjiskip_stretch = 1},
+ [2] = {0, 0, 0},
+ [5] = {0.25, 0, 0.25, ratio = 0, kanjiskip_stretch = 1},
+ }
+ },
+
+ [302] = {
+ chars = {'〜'},
+ width = 1,height = 0.88,depth = 0.12,
+ align = 'middle',
+ glue = {
+ [1] = {0.5, 0, 0.5, ratio = 1, kanjiskip_stretch = 1},
+ [2] = {0, 0, 0},
+ [5] = {0.25, 0, 0.25, ratio = 0, kanjiskip_stretch = 1},
+ }
+ },
+ [5] = { -- 中点類
+ chars = {'・', '：',
+ '；'
+ },
+ width = 0.5,height = 0.88,depth = 0.12,
+ align = 'middle',
+ glue = {
+ [0] = {0.25, 0, 0.25, ratio = 0, kanjiskip_stretch = 1},
+ [1] = {0.25, 0, 0.25, ratio = 0, kanjiskip_stretch = 1},
+ [2] = {0.25, 0, 0.25, ratio = 0},
+ [300] = {0.25, 0, 0.25, ratio = 0, kanjiskip_stretch = 1},
+ [301] = {0.25, 0, 0.25, ratio = 0, kanjiskip_stretch = 1},
+ [302] = {0.25, 0, 0.25, ratio = 0, kanjiskip_stretch = 1},
+ [5] = {0.25, 0, 0.25, ratio = 0.5, kanjiskip_stretch = 1},
+ [6] = {0.25, 0, 0.25, ratio = 0, kanjiskip_stretch = 1},
+ [7] = {0.25, 0, 0.25, ratio = 0, kanjiskip_stretch = 1},
+ [8] = {0.25, 0, 0.25, ratio = 0, kanjiskip_stretch = 1},
+ [14] = {0.25, 0, 0.25, ratio = 0, kanjiskip_stretch = 1},
+ [27] = {0.25, 0, 0.25, ratio = 0, kanjiskip_stretch = 1},
+ }
+ },
+ [6] = { -- 句点類
+ chars = {'。',
+ '．'}, -- 縦書きでは使わない
+ width = 0.5,height = 0.88,depth = 0.12,
+ align = 'left',
+ glue = {
+ [0] = {0.5, 0, 0, ratio = 0, kanjiskip_stretch = 1},
+ [1] = {0.5, 0, 0, ratio = 0, kanjiskip_stretch = 1},
+ [2] = {0, 0, 0},
+ [300] = {0.5, 0, 0, ratio = 0, kanjiskip_stretch = 1},
+ [301] = {0.5, 0, 0, ratio = 0, kanjiskip_stretch = 1},
+ [302] = {0.5, 0, 0, ratio = 0, kanjiskip_stretch = 1},
+ [5] = {0.75, 0, 0.25, ratio = 0.33333333, kanjiskip_stretch = 1},
+ [8] = {0.5, 0, 0, ratio = 0, kanjiskip_stretch = 1},
+ [14] = {0.5, 0, 0, ratio = 0, kanjiskip_stretch = 1},
+ [27] = {0.5, 0, 0, ratio = 0, kanjiskip_stretch = 1},
+ }
+ },
+ [7] = { -- 読点類
+ chars = {'、',
+ '，'}, -- 縦書きでは使わない
+ width = 0.5,height = 0.88,depth = 0.12,
+ align = 'left',
+ glue = {
+ [0] = {0.5, 0, 0.5, ratio = 0, kanjiskip_stretch = 1},
+ [1] = {0.5, 0, 0.5, ratio = 0, kanjiskip_stretch = 1},
+ [2] = {0, 0, 0},
+ [300] = {0.5, 0, 0.5, ratio = 0, kanjiskip_stretch = 1},
+ [301] = {0.5, 0, 0.5, ratio = 0, kanjiskip_stretch = 1},
+ [302] = {0.5, 0, 0.5, ratio = 0, kanjiskip_stretch = 1},
+ [5] = {0.75, 0, 0.75, ratio = 0.33333333, kanjiskip_stretch = 1},
+ [8] = {0.5, 0, 0.5, ratio = 0, kanjiskip_stretch = 1},
+ [14] = {0.5, 0, 0.5, ratio = 0, kanjiskip_stretch = 1},
+ [27] = {0.5, 0, 0.5, ratio = 0, kanjiskip_stretch = 1},
+ }
+ },
+ [8] = { -- 分離禁止文字
+ chars = {'—', '…', '‥', '〳', '〴', '〵'},
+ width = 1,height = 0.88,depth = 0.12,
+ align = 'middle',
+ glue = {
+ [1] = {0.5, 0, 0.5, ratio = 1, kanjiskip_stretch = 1},
+ [2] = {0, 0, 0},
+ [5] = {0.25, 0, 0.25, ratio = 1, kanjiskip_stretch = 1},
+ [8] = {0, 0, 0},
+ }
+ },
+ [14] = { -- 和字間隔，前には空きが入り後ろには入らないようにする．
+ chars = {' '},
+ align = 'middle',
+ width= 1,height = 0.88,depth = 0.12,
+ glue = {
+ [0] = {0, 0, 0},
+ [1] = {0, 0, 0},
+ [2] = {0, 0, 0},
+ [300] = {0, 0, 0},
+ [301] = {0, 0, 0},
+ [302] = {0, 0, 0},
+ [5] = {0.25, 0, 0.25, ratio = 1},
+ [6] = {0, 0, 0},
+ [8] = {0, 0, 0},
+ [27] = {0, 0, 0},
+ },
+ },
+ [27] = {-- 欧文
+ chars = {'alchar'},
+ glue = {
+ [1] = {0.5, 0, 0, kanjiskip_stretch = 1},
+ [2] = {0, 0, 0},
+ [5] = {0.25, 0, 0.25, ratio = 1, kanjiskip_stretch = 1},
+ [27] = {0, 0, 0},
+ }
+ },
+ [90] = { -- 行頭
+ chars = {'parbdd','boxbdd'},
+ glue = {
+ [1] = {0, 0, 0},
+ },
+ },
+}
+
+luatexja.jfont.define_jfm(jfm)
+
Property changes on: trunk/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq-jidori.lua
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreqv-jidori.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreqv-jidori.lua (rev 0)
+++ trunk/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreqv-jidori.lua 2020-12-29 22:00:12 UTC (rev 57255)
@@ -0,0 +1,511 @@
+local jfm={
+ [0]={
+ ["align"]="middle",
+ ["depth"]=0.5,
+ ["glue"]={
+ {
+ 0.5,
+ 0,
+ 0,
+ ["kanjiskip_stretch"]=1,
+ },
+ { 0, 0, 0 },
+ [5]={
+ 0.25,
+ 0,
+ 0.25,
+ ["kanjiskip_stretch"]=1,
+ },
+ },
+ ["height"]=0.5,
+ ["left"]=0,
+ ["width"]=1,
+ },
+ {
+ ["align"]="right",
+ ["chars"]={ "（", "〔", "［", "｛", "〈", "《", "「", "『", "【", "｟", "〘", "〖", "«", "〝", "‘", "“" },
+ ["depth"]=0.5,
+ ["glue"]={
+ [0]={ 0, 0, 0 },
+ { 0, 0, 0 },
+ { 0, 0, 0 },
+ [5]={
+ 0.25,
+ 0,
+ 0.25,
+ ["ratio"]=1,
+ },
+ [7]={ 0, 0, 0 },
+ [8]={ 0, 0, 0 },
+ [14]={ 0, 0, 0 },
+ [27]={ 0, 0, 0 },
+ [300]={ 0, 0, 0 },
+ [301]={ 0, 0, 0 },
+ [302]={ 0, 0, 0 },
+ },
+ ["height"]=0.5,
+ ["width"]=0.5,
+ },
+ {
+ ["align"]="left",
+ ["chars"]={ "）", "〕", "］", "｝", "〉", "》", "」", "』", "】", "｠", "〙", "〗", "»", "〟", "’", "”" },
+ ["depth"]=0.5,
+ ["glue"]={
+ [0]={
+ 0.5,
+ 0,
+ 0.5,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=0,
+ },
+ {
+ 0.5,
+ 0,
+ 0.5,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=0,
+ },
+ { 0, 0, 0 },
+ [5]={
+ 0.25,
+ 0,
+ 0.25,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=1,
+ },
+ [8]={
+ 0.5,
+ 0,
+ 0.5,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=0,
+ },
+ [27]={
+ 0.5,
+ 0,
+ 0.5,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=0,
+ },
+ [300]={
+ 0.5,
+ 0,
+ 0.5,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=0,
+ },
+ [301]={
+ 0.5,
+ 0,
+ 0.5,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=0,
+ },
+ [302]={
+ 0.5,
+ 0,
+ 0.5,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=0,
+ },
+ },
+ ["height"]=0.5,
+ ["width"]=0.5,
+ },
+ [5]={
+ ["align"]="middle",
+ ["chars"]={ "・", "：", "；" },
+ ["depth"]=0.5,
+ ["glue"]={
+ [0]={
+ 0.25,
+ 0,
+ 0.25,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=0,
+ },
+ {
+ 0.25,
+ 0,
+ 0.25,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=0,
+ },
+ {
+ 0.25,
+ 0,
+ 0.25,
+ ["ratio"]=0,
+ },
+ [5]={
+ 0.25,
+ 0,
+ 0.25,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=0.5,
+ },
+ [6]={
+ 0.25,
+ 0,
+ 0.25,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=0,
+ },
+ [7]={
+ 0.25,
+ 0,
+ 0.25,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=0,
+ },
+ [8]={
+ 0.25,
+ 0,
+ 0.25,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=0,
+ },
+ [14]={
+ 0.25,
+ 0,
+ 0.25,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=0,
+ },
+ [27]={
+ 0.25,
+ 0,
+ 0.25,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=0,
+ },
+ [300]={
+ 0.25,
+ 0,
+ 0.25,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=0,
+ },
+ [301]={
+ 0.25,
+ 0,
+ 0.25,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=0,
+ },
+ [302]={
+ 0.25,
+ 0,
+ 0.25,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=0,
+ },
+ },
+ ["height"]=0.5,
+ ["width"]=0.5,
+ },
+ [6]={
+ ["align"]="left",
+ ["chars"]={ "。", "．" },
+ ["depth"]=0.5,
+ ["glue"]={
+ [0]={
+ 0.5,
+ 0,
+ 0,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=0,
+ },
+ {
+ 0.5,
+ 0,
+ 0,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=0,
+ },
+ { 0, 0, 0 },
+ [5]={
+ 0.75,
+ 0,
+ 0.25,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=0.33333333,
+ },
+ [8]={
+ 0.5,
+ 0,
+ 0,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=0,
+ },
+ [14]={
+ 0.5,
+ 0,
+ 0,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=0,
+ },
+ [27]={
+ 0.5,
+ 0,
+ 0,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=0,
+ },
+ [300]={
+ 0.5,
+ 0,
+ 0,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=0,
+ },
+ [301]={
+ 0.5,
+ 0,
+ 0,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=0,
+ },
+ [302]={
+ 0.5,
+ 0,
+ 0,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=0,
+ },
+ },
+ ["height"]=0.5,
+ ["width"]=0.5,
+ },
+ [7]={
+ ["align"]="left",
+ ["chars"]={ "、", "，" },
+ ["depth"]=0.5,
+ ["glue"]={
+ [0]={
+ 0.5,
+ 0,
+ 0.5,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=0,
+ },
+ {
+ 0.5,
+ 0,
+ 0.5,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=0,
+ },
+ { 0, 0, 0 },
+ [5]={
+ 0.75,
+ 0,
+ 0.75,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=0.33333333,
+ },
+ [8]={
+ 0.5,
+ 0,
+ 0.5,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=0,
+ },
+ [14]={
+ 0.5,
+ 0,
+ 0.5,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=0,
+ },
+ [27]={
+ 0.5,
+ 0,
+ 0.5,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=0,
+ },
+ [300]={
+ 0.5,
+ 0,
+ 0.5,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=0,
+ },
+ [301]={
+ 0.5,
+ 0,
+ 0.5,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=0,
+ },
+ [302]={
+ 0.5,
+ 0,
+ 0.5,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=0,
+ },
+ },
+ ["height"]=0.5,
+ ["width"]=0.5,
+ },
+ [8]={
+ ["align"]="middle",
+ ["chars"]={ "—", "…", "‥", "〳", "〴", "〵" },
+ ["depth"]=0.5,
+ ["glue"]={
+ {
+ 0.5,
+ 0,
+ 0.5,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=1,
+ },
+ { 0, 0, 0 },
+ [5]={
+ 0.25,
+ 0,
+ 0.25,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=1,
+ },
+ [8]={ 0, 0, 0 },
+ },
+ ["height"]=0.5,
+ ["width"]=1,
+ },
+ [14]={
+ ["align"]="middle",
+ ["chars"]={ " " },
+ ["depth"]=0.5,
+ ["glue"]={
+ [0]={ 0, 0, 0 },
+ { 0, 0, 0 },
+ { 0, 0, 0 },
+ [5]={
+ 0.25,
+ 0,
+ 0.25,
+ ["ratio"]=1,
+ },
+ [6]={ 0, 0, 0 },
+ [8]={ 0, 0, 0 },
+ [27]={ 0, 0, 0 },
+ [300]={ 0, 0, 0 },
+ [301]={ 0, 0, 0 },
+ [302]={ 0, 0, 0 },
+ },
+ ["height"]=0.5,
+ ["width"]=1,
+ },
+ [27]={
+ ["chars"]={ "alchar" },
+ ["depth"]=0.5,
+ ["glue"]={
+ {
+ 0.5,
+ 0,
+ 0,
+ ["kanjiskip_stretch"]=1,
+ },
+ { 0, 0, 0 },
+ [5]={
+ 0.25,
+ 0,
+ 0.25,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=1,
+ },
+ [27]={ 0, 0, 0 },
+ },
+ ["height"]=0.5,
+ },
+ [90]={
+ ["chars"]={ "parbdd", "boxbdd" },
+ ["depth"]=0.5,
+ ["glue"]={
+ { 0, 0, 0 },
+ },
+ ["height"]=0.5,
+ },
+ [300]={
+ ["align"]="middle",
+ ["chars"]={ "‐" },
+ ["depth"]=0.5,
+ ["glue"]={
+ {
+ 0.5,
+ 0,
+ 0.5,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=1,
+ },
+ { 0, 0, 0 },
+ [5]={
+ 0.25,
+ 0,
+ 0.25,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=0,
+ },
+ },
+ ["height"]=0.5,
+ ["width"]=0.25,
+ },
+ [301]={
+ ["align"]="middle",
+ ["chars"]={ "゠", "–" },
+ ["depth"]=0.5,
+ ["glue"]={
+ {
+ 0.5,
+ 0,
+ 0.5,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=1,
+ },
+ { 0, 0, 0 },
+ [5]={
+ 0.25,
+ 0,
+ 0.25,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=0,
+ },
+ },
+ ["height"]=0.5,
+ ["width"]=0.5,
+ },
+ [302]={
+ ["align"]="middle",
+ ["chars"]={ "〜" },
+ ["depth"]=0.5,
+ ["glue"]={
+ {
+ 0.5,
+ 0,
+ 0.5,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=1,
+ },
+ { 0, 0, 0 },
+ [5]={
+ 0.25,
+ 0,
+ 0.25,
+ ["kanjiskip_stretch"]=1,
+ ["ratio"]=0,
+ },
+ },
+ ["height"]=0.5,
+ ["width"]=1,
+ },
+ ["dir"]="tate",
+ ["kanjiskip"]={ 0, 0, 0 },
+ ["version"]=3,
+ ["xkanjiskip"]={ 0, 0, 0 },
+ ["zh"]=1.0,
+ ["zw"]=1.0,
+}
+luatexja.jfont.define_jfm(jfm)
Property changes on: trunk/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreqv-jidori.lua
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
More information about the tex-live-commits
mailing list.