diff options
author | Karl Berry <karl@freefriends.org> | 2024-10-01 19:50:01 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2024-10-01 19:50:01 +0000 |
commit | 49a36fc0e7771c2cb24d0cc6815e8264963b24a4 (patch) | |
tree | 2ff86b9f7929d83f1817e321d2161b9c9598409b /Master | |
parent | 2adb0472442c7e3739938646bd1f2a69a9461d15 (diff) |
jlreq (1oct24)
git-svn-id: svn://tug.org/texlive/trunk@72439 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
44 files changed, 1011 insertions, 342 deletions
diff --git a/Master/texmf-dist/doc/latex/jlreq/README-ja.md b/Master/texmf-dist/doc/latex/jlreq/README-ja.md index 3d4f146f11c..7194c811335 100644 --- a/Master/texmf-dist/doc/latex/jlreq/README-ja.md +++ b/Master/texmf-dist/doc/latex/jlreq/README-ja.md @@ -596,6 +596,8 @@ JFMの名前は次の通りです.`[]`で囲まれている文字は設定に - 英語ドキュメントに使い方を書いた - `\DeclareKeys`などを使うようにした. - 行見出しの内部処理をちょっとだけ変更. +* 2024-09-26 + - Makefileでのパターンマッチングの使用をやめた -------------- Noriyuki Abe diff --git a/Master/texmf-dist/doc/latex/jlreq/README.md b/Master/texmf-dist/doc/latex/jlreq/README.md index 3c7ec380ee5..cac8ab91493 100644 --- a/Master/texmf-dist/doc/latex/jlreq/README.md +++ b/Master/texmf-dist/doc/latex/jlreq/README.md @@ -243,7 +243,10 @@ You can specify gyo-dori setting in one of the following ways. You can set the gyo-dori settings for block headings that are placed consecutively with `\SetBlockHeadingSpaces`. `\SetBlockHeadingSpaces` is used as follows: ```latex -\SetBlockHeadingSpaces { {_part{lines=3,before_lines=1},_section{lines=2},_subsection{lines=2}} [lines=5]{_section,23pt,_subsection,16pt} } +\SetBlockHeadingSpaces { + {_part{lines=3,before_lines=1},_section{lines=2},_subsection{lines=2}} + [lines=5]{_section,23pt,_subsection,16pt} +} ``` This means the following. @@ -579,6 +582,9 @@ This package is distributed under the BSD 2-Clause License. See [LICENSE](LICENS - Added the usage of this class to English document. - Use `\DeclareKeys` etc. - Changed the internal processing of block headings a little. +* 2024-09-26 + - Removed pattern matchings from Makefile. + -------------- Noriyuki Abe diff --git a/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html b/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html index 14cfa1efd3a..7c976e9b9f3 100644 --- a/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html +++ b/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html @@ -88,20 +88,28 @@ <article class="markdown-body"> <h1 id="jlreq">jlreq</h1> <h2 id="これは何">これは何?</h2> -<p><a href="https://www.w3.org/TR/jlreq/?lang=ja">日本語組版処理の要件</a>の実装を試みる<a href="https://osdn.jp/projects/luatex-ja/wiki/FrontPage">LuaTeX-ja</a> / pLaTeX / upLaTeX用のクラスファイルと,それに必要なJFMの組み合わせです.</p> +<p><a +href="https://www.w3.org/TR/jlreq/?lang=ja">日本語組版処理の要件</a>の実装を試みる<a +href="https://osdn.jp/projects/luatex-ja/wiki/FrontPage">LuaTeX-ja</a> / +pLaTeX / +upLaTeX用のクラスファイルと,それに必要なJFMの組み合わせです.</p> <h2 id="提供されるもの">提供されるもの</h2> -<p>クラスファイルjlreq.clsと,横書きLuaTeX-ja用のJFMであるjfm-jlreq.luaが用意されています.また,縦書きのJFMやpLaTeX / upLaTeX用のJFMを生成するいくつかのスクリプトがあります.</p> +<p>クラスファイルjlreq.clsと,横書きLuaTeX-ja用のJFMであるjfm-jlreq.luaが用意されています.また,縦書きのJFMやpLaTeX +/ upLaTeX用のJFMを生成するいくつかのスクリプトがあります.</p> <h2 id="インストール">インストール</h2> <p><code>make</code>で必要なJFMを生成してください.その後,</p> <ul> <li>*.tfm -> $TEXMF/fonts/tfm/public/jlreq</li> <li>*.vf -> $TEXMF/fonts/vf/public/jlreq</li> -<li>jfm-jlreq.lua, jfm-jlreqv.lua, jfm-jlreq-jidori.lua jfm-jlreqv-jidori.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> +<p>と配置します.<code>make install</code>とすると,<span +class="math inline"><em>T</em><em>E</em><em>X</em><em>M</em><em>F</em>=</span>TEXMFHOMEとしてこのコピーを行います.</p> <h2 id="動作環境">動作環境</h2> -<p>pLaTeX / upLaTeX / LuaLaTeX上で動きます.以下のパッケージを内部で読み込みます.</p> +<p>pLaTeX / upLaTeX / +LuaLaTeX上で動きます.以下のパッケージを内部で読み込みます.</p> <ul> <li>(常時):lmodern</li> <li>(LuaLaTeX非利用時):everyhook</li> @@ -110,12 +118,21 @@ <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" tabindex="-1"></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" tabindex="-1"></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</code> / <code>twoside</code> / <code>onecolumn</code> / <code>twocolumn</code> / <code>titlepage</code> / <code>notitlepage</code> / <code>draft</code> / <code>final</code> / <code>landscape</code> / <code>openright</code> / <code>openany</code> / <code>leqno</code> / <code>fleqn</code>というよくあるオプションを受け付けます.また<code>disablejfam</code>オプションを渡すと,和文フォントを数式用に登録しません.</p> -<p>標準的な文書クラスと同じように中身を書くことができますが,次のような命令が追加 / 拡張されています.なお,本ドキュメントでは<a href="https://www.w3.org/TR/jlreq/?lang=ja">日本語組版処理の要件</a>における用語を断りなく使います.</p> +<p>その他,<code>oneside</code> / <code>twoside</code> / +<code>onecolumn</code> / <code>twocolumn</code> / <code>titlepage</code> +/ <code>notitlepage</code> / <code>draft</code> / <code>final</code> / +<code>landscape</code> / <code>openright</code> / <code>openany</code> / +<code>leqno</code> / +<code>fleqn</code>というよくあるオプションを受け付けます.また<code>disablejfam</code>オプションを渡すと,和文フォントを数式用に登録しません.</p> +<p>標準的な文書クラスと同じように中身を書くことができますが,次のような命令が追加 +/ 拡張されています.なお,本ドキュメントでは<a +href="https://www.w3.org/TR/jlreq/?lang=ja">日本語組版処理の要件</a>における用語を断りなく使います.</p> <h3 id="jlreqsetup"><code>\jlreqsetup</code></h3> <p>設定用命令です.プリアンブルでしか使えません.文書に対する設定は,クラスオプションとして行うか<code>\jlreqsetup</code>を通じて行うかします.どちらで設定するかは設定項目によります.</p> <h3 id="section"><code>\section</code></h3> @@ -125,7 +142,8 @@ <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" tabindex="-1"></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> @@ -145,14 +163,19 @@ <p>全角空白(U+3000)一文字からなるマクロです.和字間隔を挿入します.LuaLaTeXでは<code> </code>のみでも和字間隔を入力できます.</p> <h3 id="その他">その他</h3> <ul> -<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>ルビや圏点は提供されません.<a +href="https://github.com/zr-tex8r/PXrubrica">PXrubrica</a>または<code>luatexja-ruby</code>(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" tabindex="-1"></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>フォントを設定する機能は有していません.和文フォントは,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" tabindex="-1"></a><span class="bu">\documentclass</span>{<span class="ex">jlreq</span>}</span> +<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> @@ -165,7 +188,9 @@ <p>以下では次の用法を使います.</p> <ul> <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>のように記述します. +<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>,<code>H</code>:0.25mmと解釈されます.</li> <li><code>zw</code>, <code>zh</code>:全角幅として解釈されます.</li> @@ -176,10 +201,14 @@ <h3 id="基本版面">基本版面</h3> <p>クラスオプションです.</p> <ul> -<li><code>paper=[<紙サイズ名>/{<寸法>,<寸法>}]</code>:紙サイズです.紙サイズ名は<code>a0paper</code>から<code>a10paper</code>,<code>b0paper</code>から<code>b10paper</code>,<code>c2paper</code>から<code>c8paper</code>を指定できます.B列はISO B列です.JIS B列を指定する場合は,<code>b0j</code>から<code>b10j</code>の対応するものを指定してください.また,<code>letterpaper</code>,<code>legalpaper</code>,<code>executivepaper</code>が指定できます.さらに,<code>{<横>,<縦>}</code>と直接寸法を指定することもできます.</li> +<li><code>paper=[<紙サイズ名>/{<寸法>,<寸法>}]</code>:紙サイズです.紙サイズ名は<code>a0paper</code>から<code>a10paper</code>,<code>b0paper</code>から<code>b10paper</code>,<code>c2paper</code>から<code>c8paper</code>を指定できます.B列はISO +B列です.JIS +B列を指定する場合は,<code>b0j</code>から<code>b10j</code>の対応するものを指定してください.また,<code>letterpaper</code>,<code>legalpaper</code>,<code>executivepaper</code>が指定できます.さらに,<code>{<横>,<縦>}</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>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> <li><code>gutter=<寸法;zw,zh></code>:のどの余白の大きさ. @@ -212,13 +241,16 @@ <p><code>\jlreqsetup</code>で指定します.</p> <ul> <li><code>reference_mark=[inline/interlinear]</code>:合印の配置方法を指定します.<code>inline</code>にすると該当項目の後ろの行中に配置します.<code>interlinear</code>を指定すると該当項目の上(横組)または右(縦組)に配置します.</li> -<li><code>footnote_second_indent=<寸法></code>: 脚注(横書き時)または傍注(縦書き時)の二行目以降の字下げ量を指定します.一行目からの相対字下げ量です.</li> +<li><code>footnote_second_indent=<寸法></code>: +脚注(横書き時)または傍注(縦書き時)の二行目以降の字下げ量を指定します.一行目からの相対字下げ量です.</li> <li><code>sidenote_type=[number/symbol]</code>:傍注と本文との対応の方法を指定します.<code>number</code>が規定で,注の位置に通し番号が入り,それにより対応が示されます.<code>symbol</code>とすると,注の位置に特定の記号が入り,また注がついている単語が強調されます.</li> <li><code>sidenote_symbol=<コード></code>:<code>sidenote_symbol=symbol</code>の時に,注の位置に入る記号.デフォルト*</li> <li><code>sidenote_keyword_font=<フォント設定コード></code>:<code>sidenote_symbol=symbol</code>の時に,注のついている単語のフォント指定.デフォルトは無し(強調しない)</li> -<li><code>endnote_second_indent=<寸法></code>: 後柱の二行目以降の字下げ量を指定します.一行目からの相対字下げ量です.</li> +<li><code>endnote_second_indent=<寸法></code>: +後柱の二行目以降の字下げ量を指定します.一行目からの相対字下げ量です.</li> <li><code>endnote_position=[headings/paragraph/{_<見出し名1>,_<見出し名2>,...}]</code>:後注の出力場所を指定します.<code>headings</code>は各見出しの直前(デフォルト),<code>paragraph</code>は改段落の際に出力します.また,<code>endnote_position={_chapter,_section}</code>とすると,<code>\chapter</code>と<code>\section</code>の直前に出力します.<code><_見出し名></code>を指定するためには,対象の見出しが本クラスファイルの機能を使って作られていなければいけません.</li> -<li><code>warichu_opening=<コード></code>, <code>warichu_closing=<コード></code>:それぞれ,割注の前と後ろに挿入されます.デフォルトは<code>(</code>と<code>)</code>です.</li> +<li><code>warichu_opening=<コード></code>, +<code>warichu_closing=<コード></code>:それぞれ,割注の前と後ろに挿入されます.デフォルトは<code>(</code>と<code>)</code>です.</li> </ul> <h3 id="キャプション">キャプション</h3> <p>図表のキャプションを<code>\jlreqsetup</code>で変更できます.全ての設定で,各環境ごとの設定をすることができます.例えば<code>caption_font=\normalsize,table=\Large</code>とすると,table環境内では<code>\Large</code>が適用され,そのほかの環境内では<code>\normalsize</code>が適用されます.他の設定も同様です.</p> @@ -244,7 +276,9 @@ <li><code>itemization_itemsep=<寸法></code>:項目同士の空きを指定します.</li> </ul> <h3 id="前付きなど">前付きなど</h3> -<p><code>\frontmatter</code> / <code>\mainmatter</code> / <code>\backmatter</code> / <code>\appendix</code>での処理を<code>\jlreqsetup</code>で指定できます.</p> +<p><code>\frontmatter</code> / <code>\mainmatter</code> / +<code>\backmatter</code> / +<code>\appendix</code>での処理を<code>\jlreqsetup</code>で指定できます.</p> <ul> <li><code>frontmatter_pagebreak=[cleardoublepage/clearpage/]</code>:<code>\frontmatter</code>実行時の改ページを実行する命令名を指定します.空にすると何もしません.</li> <li><code>frontmatter_counter={<カウンタ名>={value=<値>, the=<コード>, restore=[true/false]},...}</code>:<code>\frontmatter</code>時でのカウンタの操作を指定します.例えば<code>chapter={value=0,the={[\arabic{chapter]}}</code>とすると,<code>chapter</code>カウンタの値が<code>0</code>になり,<code>\thechapter</code>が<code>[\arabic{chapter}]</code>となります.デフォルトでは<code>\mainmatter</code>時に値と<code>\the<カウンタ名></code>の定義を戻しますが,<code>restore=false</code>とするとこの動きが抑制されます.</li> @@ -314,7 +348,8 @@ <li><code>pagebreak=[clearpage/cleardoublepage/clearcolumn/nariyuki/begin_with_odd_page/begin_with_even_page]</code>:見出し直前の改ページを指定します.それぞれ,改ページ,<code>\cleardoublepage</code>実行,改段,なりゆき,奇数ページ開始,偶数ページ開始,です.</li> <li><code>pagestyle=<ページスタイル名></code>:見出し箇所のページスタイルを指定します.</li> <li><code>afterindent=[true/false]</code>:見出し直後の段落の字下げを行うかを指定します.</li> -<li><code>column_spanning=[true/false]</code>: 段抜きの見出しにします.<code>pagebreak=nariyuki</code>または<code>pagebreak=clearcolumn</code>の時には無視されます.</li> +<li><code>column_spanning=[true/false]</code>: +段抜きの見出しにします.<code>pagebreak=nariyuki</code>または<code>pagebreak=clearcolumn</code>の時には無視されます.</li> <li><code>number=[true/false]</code>:採番を行うかを指定します.<code>\NewTobiraHeading</code>と同様の注意が必要です.</li> </ul> <h4 id="行取り">行取り</h4> @@ -326,7 +361,8 @@ </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" tabindex="-1"></a><span class="fu">\SetBlockHeadingSpaces</span>{</span> +<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> @@ -349,7 +385,8 @@ <p><code>\NewRuninHeading</code>で作成します.通常の文書クラスにおける<code>\section</code>と同様の,<code>\<命令名>*[running head]{見出し文字列}</code>という書式の命令が作成されます.設定は以下の通り.</p> <ul> <li><code>font=<フォント設定コード></code>:見出しのフォントを指定します.</li> -<li><code>indent=<寸法></code> 見出し文字列全体の字下げ量を指定します.</li> +<li><code>indent=<寸法></code> +見出し文字列全体の字下げ量を指定します.</li> <li><code>after_label_space=<寸法></code>:ラベル後,見出し文字列までの空きを指定します.</li> <li><code>label_format=<コード></code>:ラベルのフォーマットを指定します.<code>label_format={\theparagraph}</code>などのようにします.</li> <li><code>after_space=<寸法></code>:見出しと本文との間の空きを指定します.</li> @@ -361,15 +398,18 @@ <li><code>font=<フォント設定コード></code>:見出しのフォントを指定します.</li> <li><code>indent=<寸法></code>:見出し全体の字下げ量を指定します.</li> <li><code>after_space=<寸法></code>:見出しと本文との間の空きを指定します.</li> -<li><code>onelinemax=<寸法></code>, <code>twolinemax=<寸法></code>:見出し文字列の長さが<code>onelinemax</code>以下ならば一行で,<code>twolinemax</code>以下ならば二行で窓見出しを出力します.それ以上の場合は三行です.デフォルトはそれぞれ6文字,20文字の長さ.</li> +<li><code>onelinemax=<寸法></code>, +<code>twolinemax=<寸法></code>:見出し文字列の長さが<code>onelinemax</code>以下ならば一行で,<code>twolinemax</code>以下ならば二行で窓見出しを出力します.それ以上の場合は三行です.デフォルトはそれぞれ6文字,20文字の長さ.</li> </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" tabindex="-1"></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" tabindex="-1"></a><span class="fu">\SaveHeading</span>{section}{<span class="fu">\restoresection</span>} <span class="co">% \sectionの中身を\restoresectionに待避.</span></span> +<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> @@ -382,7 +422,8 @@ <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>のどちらが指定されているかで指定方法が変わります. +<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> @@ -391,7 +432,10 @@ <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> -<li><code>odd_head_format=<書式></code>, <code>odd_foot_format=<書式></code>, <code>even_head_format=<書式></code>, <code>even_foot_format=<書式></code>:ヘッダやフッタのフォーマットを指定します.<code>#1</code>がヘッダまたはフッタ全体に書き換えられます.ただし<code>#1</code>には位置調整用のコードが入っている場合もあるので,特に<code>\NewPageStyle</code>に<code>tate</code>を指定している場合には思うようにならないこともあります.例えば奇数ページのヘッダに罫線を引くためには<code>odd_head_format={\underline{\makebox[\jlreqyokoheadlength]{#1}}}</code>とするとよいでしょう.なお,ここで使った<code>\jlreqyokoheadlength</code>は本クラスファイル内で定義されているマクロで,ヘッダの横方向の長さを与えます.(フッタの長さも同じです.)縦方向の長さ,すなわち<code>\NewPageStyle</code>で<code>tate</code>が指定されている場合の長さは<code>\jlreqtateheadlength</code>で取得できます.</li> +<li><code>odd_head_format=<書式></code>, +<code>odd_foot_format=<書式></code>, +<code>even_head_format=<書式></code>, +<code>even_foot_format=<書式></code>:ヘッダやフッタのフォーマットを指定します.<code>#1</code>がヘッダまたはフッタ全体に書き換えられます.ただし<code>#1</code>には位置調整用のコードが入っている場合もあるので,特に<code>\NewPageStyle</code>に<code>tate</code>を指定している場合には思うようにならないこともあります.例えば奇数ページのヘッダに罫線を引くためには<code>odd_head_format={\underline{\makebox[\jlreqyokoheadlength]{#1}}}</code>とするとよいでしょう.なお,ここで使った<code>\jlreqyokoheadlength</code>は本クラスファイル内で定義されているマクロで,ヘッダの横方向の長さを与えます.(フッタの長さも同じです.)縦方向の長さ,すなわち<code>\NewPageStyle</code>で<code>tate</code>が指定されている場合の長さは<code>\jlreqtateheadlength</code>で取得できます.</li> </ul> <p><code>\RenewPageStyle</code>,<code>\ProvidePageStyle</code>,<code>\DeclarePageStyle</code>もあります.<code>\ModifyPageStyle</code>により既存のページスタイルを改変することが可能です.</p> <h2 id="jfm">JFM</h2> @@ -402,8 +446,10 @@ <p>それぞれの文字は以下の場合に入ります.</p> <ul> <li><code>u</code>: upLaTeX利用時</li> -<li><code>b</code>: ぶら下げ組み利用時.(クラスオプションに<code>hanging_punctuation</code>が指定された時.)</li> -<li><code>z</code>: 行頭における開き括弧類の前の空きが,段落開始時が全角二分,折り返し時が二分の時.(クラスオプションに<code>open_bracket_pos=zenkakunibu_nibu</code>が指定された時.)</li> +<li><code>b</code>: +ぶら下げ組み利用時.(クラスオプションに<code>hanging_punctuation</code>が指定された時.)</li> +<li><code>z</code>: +行頭における開き括弧類の前の空きが,段落開始時が全角二分,折り返し時が二分の時.(クラスオプションに<code>open_bracket_pos=zenkakunibu_nibu</code>が指定された時.)</li> <li><code>g</code>: ゴシック用フォント.</li> <li><code>-v</code>: 縦書き用.</li> </ul> @@ -421,7 +467,8 @@ <h2 id="jlreq-complements">jlreq-complements</h2> <p><code>jlreq-complements</code>パッケージはLaTeXのドキュメントクラスで標準的に提供される環境などをカスタマイズ可能なものに変更するパッケージです.以下のように使います.次のオプションを受け付けます.</p> <ul> -<li><code>platex</code>, <code>uplatex</code>, <code>lulalatex</code>:エンジンの指定です.</li> +<li><code>platex</code>, <code>uplatex</code>, +<code>lulalatex</code>:エンジンの指定です.</li> <li><code>setupname=<名前></code>:カスタマイズするための命令名を指定します.デフォルトでは<code>jlreqcomplementssetup</code>で,<code>jlreqcomplementssetup{<設定項目>}</code>とプリアンブルに書くことで設定できます.</li> </ul> <p><code>jlreq</code>内では<code>\usepackage[<jlreq内で認識しているエンジン>,setupname=jlreqsetup]{jlreq-complements}</code>相当で読み込みがされていますので,今までの<code>\jlreqsetup</code>で環境のカスタマイズをすることができます.なお,このように既存の名前を指定してうまく行くためにはもともとの命令と整合的である必要があります.通常は避けた方がよいでしょう.</p> @@ -453,7 +500,8 @@ </ul> <p><code>amsthm</code>パッケージが読み込まれると,新しい定理スタイル<code>jlreq</code>が定義され,現在のスタイルが<code>jlreq</code>へと変更されます.このとき,上記設定はこの<code>jlreq</code>スタイルへの設定として機能します.</p> <h2 id="ライセンス">ライセンス</h2> -<p>このパッケージは二条項BSDライセンスの元で配布されています.詳しくは<a href="LICENSE">LICENSE</a>をご覧ください.</p> +<p>このパッケージは二条項BSDライセンスの元で配布されています.詳しくは<a +href="LICENSE">LICENSE</a>をご覧ください.</p> <h2 id="履歴">履歴</h2> <ul> <li>2017-02-08 @@ -516,7 +564,8 @@ <ul> <li>バグ修正</li> <li><code>\SetBlockHeadingSpaces</code>を追加.</li> -<li><code>\contentsname</code> と <code>\indexname</code>に入っていたスペースを削除.</li> +<li><code>\contentsname</code> と +<code>\indexname</code>に入っていたスペースを削除.</li> </ul></li> <li>2017-12-02 <ul> @@ -722,9 +771,22 @@ <ul> <li>バグ修正</li> </ul></li> +<li>2024-08-23 +<ul> +<li>バグ修正</li> +<li>内部変数名の変更</li> +<li>英語ドキュメントに使い方を書いた</li> +<li><code>\DeclareKeys</code>などを使うようにした.</li> +<li>行見出しの内部処理をちょっとだけ変更.</li> +</ul></li> +<li>2024-09-26 +<ul> +<li>Makefileでのパターンマッチングの使用をやめた</li> +</ul></li> </ul> <hr /> -<p>Noriyuki Abe <a href="https://github.com/abenori/jlreq">https://github.com/abenori/jlreq</a></p> +<p>Noriyuki Abe <a +href="https://github.com/abenori/jlreq">https://github.com/abenori/jlreq</a></p> </article> </body> </html> diff --git a/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.pdf b/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.pdf Binary files differindex ed4fb07f5d0..9866c5f9f99 100644 --- a/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.pdf +++ b/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.pdf diff --git a/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.html b/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.html index 2a37503edec..29c9a1bf242 100644 --- a/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.html +++ b/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.html @@ -274,6 +274,10 @@ <ul> <li>ドキュメントの間違いを修正.</li> </ul></li> +<li>2024-08-23 +<ul> +<li><code>\DeclareKeys</code>などを使うようにした.</li> +</ul></li> </ul> <hr /> <p>Noriyuki Abe <a href="https://github.com/abenori/jlreq">https://github.com/abenori/jlreq</a></p> diff --git a/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.html b/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.html index a1d2f2b9302..d6c67393af9 100644 --- a/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.html +++ b/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.html @@ -263,10 +263,14 @@ <ul> <li>Fixed a bug: an error occurred when the package is loaded with tate mode.</li> </ul></li> -<li>2023-02-13 +<li>2024-02-13 <ul> <li>Fixed a bug in a document.</li> </ul></li> +<li>2024-08-23 +<ul> +<li>Use <code>\DeclareKeys</code> etc.</li> +</ul></li> </ul> <hr /> <p>Noriyuki Abe <a href="https://github.com/abenori/jlreq">https://github.com/abenori/jlreq</a></p> diff --git a/Master/texmf-dist/doc/latex/jlreq/jlreq.html b/Master/texmf-dist/doc/latex/jlreq/jlreq.html index 488787b9798..23949e47340 100644 --- a/Master/texmf-dist/doc/latex/jlreq/jlreq.html +++ b/Master/texmf-dist/doc/latex/jlreq/jlreq.html @@ -88,355 +88,885 @@ <article class="markdown-body"> <h1 id="jlreq">jlreq</h1> <h2 id="what-is-this">What is this?</h2> -<p>This package provides the class file and JFM (Japanese font metric) files for LuaTeX-ja / pLaTeX / upLaTeX. This aims to implement <a href="https://www.w3.org/TR/jlreq/?lang=en">Requirements for Japanese Text Layout</a>.</p> +<p>This package provides the class file and JFM (Japanese font metric) +files for LuaTeX-ja / pLaTeX / upLaTeX. This aims to implement <a +href="https://www.w3.org/TR/jlreq/?lang=en">Requirements for Japanese +Text Layout</a>.</p> <h2 id="installation">Installation</h2> -<p>Run <code>make</code> to generate JFM files. Move the files as follows:</p> +<p>Run <code>make</code> to generate JFM files. Move the files as +follows:</p> <ul> <li>*.tfm -> $TEXMF/fonts/tfm/public/jlreq</li> <li>*.vf -> $TEXMF/fonts/vf/public/jlreq</li> -<li>jfm-jlreq.lua, jfm-jlreqv.lua, jfm-jlreq-jidori.lua jfm-jlreqv-jidori.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> +<p>The other way to install is just to run <code>make install</code>. It +will install all files in <code>$TEXMFHOME</code>.</p> <h2 id="usage">Usage</h2> <p>To use, simply write</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" tabindex="-1"></a><span class="bu">\documentclass</span>{<span class="ex">jlreq</span>}</span></code></pre></div> -<p>This will set up a document class equivalent to an article in horizontal writing. The engine is automatically determined, but if you want to specify it, pass one of <code>platex/uplatex/lualatex</code> as a class option. To switch to vertical writing, pass the <code>tate</code> option. Additionally, to make the document class equivalent to report or book, pass the <code>report</code> or <code>book</code> option respectively. For example, to create a vertical book, write <code>\documentclass[tate,book]{jlreq}</code>.</p> -<p>Other common options accepted are <code>oneside/twoside/onecolumn/twocolumn/titlepage/notitlepage/draft/final/landscape/openright/openany/leqno/fleqn</code>. Also, passing the <code>disablejfam</code> option will not register Japanese fonts for use in mathematics.</p> -<p>You can write the content as you would in a standard document class, but the following commands have been added or extended. Note that this document uses terms from <a href="https://www.w3.org/TR/jlreq/?lang=en">Requirements for Japanese Text Layout</a> without explanation.</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" tabindex="-1"></a><span class="bu">\documentclass</span>{<span class="ex">jlreq</span>}</span></code></pre></div> +<p>This will set up a document class equivalent to an article in +horizontal writing. The engine is automatically determined, but if you +want to specify it, pass one of <code>platex/uplatex/lualatex</code> as +a class option. To switch to vertical writing, pass the +<code>tate</code> option. Additionally, to make the document class +equivalent to report or book, pass the <code>report</code> or +<code>book</code> option respectively. For example, to create a vertical +book, write <code>\documentclass[tate,book]{jlreq}</code>.</p> +<p>Other common options accepted are +<code>oneside/twoside/onecolumn/twocolumn/titlepage/notitlepage/draft/final/landscape/openright/openany/leqno/fleqn</code>. +Also, passing the <code>disablejfam</code> option will not register +Japanese fonts for use in mathematics.</p> +<p>You can write the content as you would in a standard document class, +but the following commands have been added or extended. Note that this +document uses terms from <a +href="https://www.w3.org/TR/jlreq/?lang=en">Requirements for Japanese +Text Layout</a> without explanation.</p> <h3 id="jlreqsetup"><code>\jlreqsetup</code></h3> -<p>This is a command for settings. It can only be used in the preamble. Settings for the document are made either as class options or through <code>\jlreqsetup</code>, depending on the setting item.</p> +<p>This is a command for settings. It can only be used in the preamble. +Settings for the document are made either as class options or through +<code>\jlreqsetup</code>, depending on the setting item.</p> <h3 id="section"><code>\section</code></h3> -<p>The <code>\section</code> command is extended to accept subtitles in addition to the usual format, as in <code>\section*[running head]{Heading}[Subtitle]</code>. Other commands such as <code>\part</code> (only in article), <code>\chapter</code> (only in book/report), <code>\subsection</code>, and <code>\subsubsection</code> also accept subtitles.</p> +<p>The <code>\section</code> command is extended to accept subtitles in +addition to the usual format, as in +<code>\section*[running head]{Heading}[Subtitle]</code>. Other commands +such as <code>\part</code> (only in article), <code>\chapter</code> +(only in book/report), <code>\subsection</code>, and +<code>\subsubsection</code> also accept subtitles.</p> <h3 id="abstract-environment"><code>abstract</code> environment</h3> -<p>You can place it in the preamble, and it will be output with <code>\maketitle</code>. In the case of two columns, it allows you to output the abstract without columnization. However, this method is now deprecated. By specifying <code>abstract_with_maketitle=true</code> in <code>\jlreqsetup</code> and writing it before <code>\maketitle</code>, you can achieve the same effect.</p> +<p>You can place it in the preamble, and it will be output with +<code>\maketitle</code>. In the case of two columns, it allows you to +output the abstract without columnization. However, this method is now +deprecated. By specifying <code>abstract_with_maketitle=true</code> in +<code>\jlreqsetup</code> and writing it before <code>\maketitle</code>, +you can achieve the same effect.</p> <h3 id="sidenote"><code>\sidenote</code></h3> -<p>This command is only defined when the width of the sidenote is positive. In the default basic layout, this width is set to 0. Therefore, <code>\sidenote</code> is not defined. Please refer to the later basic layout settings. <code>\sidenote</code> outputs a sidenote (or footnote in vertical writing). Internally, it uses <code>\marginpar</code>. By default, it has the same format as <code>\footnote</code>, but if <code>sidenote_type=symbol</code> is specified in <code>\jlreqsetup</code>, the format becomes <code>\sidenote{relevant item}{note}</code>. For example, you would write:</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" tabindex="-1"></a>capable of publishing <span class="fu">\sidenote</span>{manuscript}{by methods such as printing…}</span></code></pre></div> +<p>This command is only defined when the width of the sidenote is +positive. In the default basic layout, this width is set to 0. +Therefore, <code>\sidenote</code> is not defined. Please refer to the +later basic layout settings. <code>\sidenote</code> outputs a sidenote +(or footnote in vertical writing). Internally, it uses +<code>\marginpar</code>. By default, it has the same format as +<code>\footnote</code>, but if <code>sidenote_type=symbol</code> is +specified in <code>\jlreqsetup</code>, the format becomes +<code>\sidenote{relevant item}{note}</code>. For example, you would +write:</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" tabindex="-1"></a>capable of publishing <span class="fu">\sidenote</span>{manuscript}{by methods such as printing…}</span></code></pre></div> <p>Please refer to the later explanation as well.</p> <h3 id="endnote"><code>\endnote</code></h3> -<p>Specifies an endnote. It has the same format as <code>\footnote</code>. By default, the note itself is output just before the heading. This behavior can be controlled by passing <code>endnote_position</code> to <code>\jlreqsetup</code>. For more details, please see the later explanation of notes. Also, executing <code>\theendnotes</code> will output it on the spot.</p> +<p>Specifies an endnote. It has the same format as +<code>\footnote</code>. By default, the note itself is output just +before the heading. This behavior can be controlled by passing +<code>endnote_position</code> to <code>\jlreqsetup</code>. For more +details, please see the later explanation of notes. Also, executing +<code>\theendnotes</code> will output it on the spot.</p> <h3 id="warichu"><code>\warichu</code></h3> -<p>Outputs a warichu (split annotation). The line division positions are calculated automatically (multiple compilations are required). With <code>\warichu*</code>, you can manually specify these positions. The format is <code>\warichu*{(before first line) & (after first line)\\ (before second line) & (after second line)...}</code>. If <code>&</code> is omitted, it will be adjusted automatically.</p> +<p>Outputs a warichu (split annotation). The line division positions are +calculated automatically (multiple compilations are required). With +<code>\warichu*</code>, you can manually specify these positions. The +format is +<code>\warichu*{(before first line) & (after first line)\\ (before second line) & (after second line)...}</code>. +If <code>&</code> is omitted, it will be adjusted automatically.</p> <h3 id="tatechuyoko"><code>\tatechuyoko</code></h3> -<p>Outputs horizontal-in-vertical text. You use it as <code>\tatechuyoko{<content>}</code>. <code>\tatechuyoko</code> will result in an error if used in a non-vertical writing place, but <code>\tatechuyoko*</code> will be output as is in a non-vertical writing place.</p> +<p>Outputs horizontal-in-vertical text. You use it as +<code>\tatechuyoko{<content>}</code>. <code>\tatechuyoko</code> +will result in an error if used in a non-vertical writing place, but +<code>\tatechuyoko*</code> will be output as is in a non-vertical +writing place.</p> <h3 id="jidori"><code>\jidori</code></h3> -<p>By using <code>\jidori{<dimension>}{<content>}</code>, you can output the content justified to the length of the dimension.</p> +<p>By using <code>\jidori{<dimension>}{<content>}</code>, +you can output the content justified to the length of the dimension.</p> <h3 id="akigumi"><code>\akigumi</code></h3> -<p>By using <code>\akigumi{<dimension>}{<content>}</code>, you can output the result of spacing the characters of the content by the length of the dimension. However, the correct output result is not obtained except when using LuaLaTeX.</p> +<p>By using <code>\akigumi{<dimension>}{<content>}</code>, +you can output the result of spacing the characters of the content by +the length of the dimension. However, the correct output result is not +obtained except when using LuaLaTeX.</p> <h3 id="jafontsize"><code>\jafontsize</code></h3> -<p>Specifies the Japanese font size, similar to <code>\fontsize</code>. If <code>jafontscale=0.9</code> is specified as a class option, specifying <code>\fontsize{9pt}{15pt}</code> will result in a Japanese font size of 8.1pt, but <code>\jafontsize{9pt}{15pt}</code> will result in 9pt (with the European font size being 10pt). The second argument is exactly the same as the second argument of <code>\fontsize</code>.</p> +<p>Specifies the Japanese font size, similar to <code>\fontsize</code>. +If <code>jafontscale=0.9</code> is specified as a class option, +specifying <code>\fontsize{9pt}{15pt}</code> will result in a Japanese +font size of 8.1pt, but <code>\jafontsize{9pt}{15pt}</code> will result +in 9pt (with the European font size being 10pt). The second argument is +exactly the same as the second argument of <code>\fontsize</code>.</p> <h3 id="-"><code>\ </code></h3> -<p>A macro consisting of a single full-width space (U+3000). It inserts a Japanese character space. In LuaLaTeX, you can also input a Japanese character space with <code> </code> alone.</p> +<p>A macro consisting of a single full-width space (U+3000). It inserts +a Japanese character space. In LuaLaTeX, you can also input a Japanese +character space with <code> </code> alone.</p> <h3 id="others">Others</h3> <ul> -<li><p>Ruby and encircled points are not provided. It is recommended to use <a href="https://github.com/zr-tex8r/PXrubrica">PXrubrica</a> or <code>luatexja-ruby</code> (for LuaLaTeX, included in the LuaTeX-ja package).</p></li> -<li><p>When using pLaTeX / upLaTeX, macros <code>\zw</code> and <code>\zh</code> that expand to <code>zw</code> and <code>zh</code>, respectively, are defined. In LuaLaTeX, macros of the same name are defined within LuaTeX-ja.</p></li> -<li><p>Requirements for Japanese Text Layout 2.3.2.d state that it is desirable to align the number of lines in each column on the last page of horizontal two-column typesetting, but this process is not performed. You can perform this process by using the <code>nidanfloat</code> package and specifying</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" tabindex="-1"></a><span class="bu">\usepackage</span>[balance]{<span class="ex">nidanfloat</span>}</span></code></pre></div> -<p>However, <code>\newpage</code> and <code>\clearpage</code> on the last page will not work correctly. For more details, please see the manual of the <code>nidanfloat</code> package.</p></li> -<li><p>The functionality to set fonts is not provided. Japanese fonts can be set using <code>luatexja-fontspec</code> or <code>luatexja-preset</code> (both included in the LuaTeX-ja package) when using LuaLaTeX. If using dvipdfmx, you can set it with <a href="https://github.com/zr-tex8r/PXchfon">PXchfon</a>.</p></li> -<li><p>The space between Japanese characters (stored in <code>\kanjiskip</code> in (u)pTeX and in the <code>kanjiskip</code> parameter in LuateX-ja) by default allows for up to a quarter-character width of space, in accordance with the Requirements for Japanese Text Layout. However, due to limitations of TeX’s functionality, this may not always produce appropriate results. If you want to change this value, please redefine <code>\jlreqkanjiskip</code>. For 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" tabindex="-1"></a><span class="bu">\documentclass</span>{<span class="ex">jlreq</span>}</span> +<li><p>Ruby and encircled points are not provided. It is recommended to +use <a href="https://github.com/zr-tex8r/PXrubrica">PXrubrica</a> or +<code>luatexja-ruby</code> (for LuaLaTeX, included in the LuaTeX-ja +package).</p></li> +<li><p>When using pLaTeX / upLaTeX, macros <code>\zw</code> and +<code>\zh</code> that expand to <code>zw</code> and <code>zh</code>, +respectively, are defined. In LuaLaTeX, macros of the same name are +defined within LuaTeX-ja.</p></li> +<li><p>Requirements for Japanese Text Layout 2.3.2.d state that it is +desirable to align the number of lines in each column on the last page +of horizontal two-column typesetting, but this process is not performed. +You can perform this process by using the <code>nidanfloat</code> +package and specifying</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" tabindex="-1"></a><span class="bu">\usepackage</span>[balance]{<span class="ex">nidanfloat</span>}</span></code></pre></div> +<p>However, <code>\newpage</code> and <code>\clearpage</code> on the +last page will not work correctly. For more details, please see the +manual of the <code>nidanfloat</code> package.</p></li> +<li><p>The functionality to set fonts is not provided. Japanese fonts +can be set using <code>luatexja-fontspec</code> or +<code>luatexja-preset</code> (both included in the LuaTeX-ja package) +when using LuaLaTeX. If using dvipdfmx, you can set it with <a +href="https://github.com/zr-tex8r/PXchfon">PXchfon</a>.</p></li> +<li><p>The space between Japanese characters (stored in +<code>\kanjiskip</code> in (u)pTeX and in the <code>kanjiskip</code> +parameter in LuateX-ja) by default allows for up to a quarter-character +width of space, in accordance with the Requirements for Japanese Text +Layout. However, due to limitations of TeX’s functionality, this may not +always produce appropriate results. If you want to change this value, +please redefine <code>\jlreqkanjiskip</code>. For 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" tabindex="-1"></a><span class="bu">\documentclass</span>{<span class="ex">jlreq</span>}</span> <span id="cb4-2"><a href="#cb4-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="cb4-3"><a href="#cb4-3" aria-hidden="true" tabindex="-1"></a><span class="kw">\begin</span>{<span class="ex">document</span>}</span> <span id="cb4-4"><a href="#cb4-4" aria-hidden="true" tabindex="-1"></a>(Main text)</span> <span id="cb4-5"><a href="#cb4-5" aria-hidden="true" tabindex="-1"></a><span class="kw">\end</span>{<span class="ex">document</span>}</span></code></pre></div> -<p>The space between Japanese and European characters (stored in <code>\xkanjiskip</code> in (u)pTeX and in the <code>xkanjiskip</code> parameter in LuateX-ja) can also be changed by redefining <code>\jlreqxkanjiskip</code>.</p></li> -<li><p>When specifying <code>book</code>, even if you specify <code>openany</code> as a class option, a blank page may be inserted after <code>\mainmatter</code>. This is to match the behavior of the standard class file. By specifying <code>\jlreqsetup{mainmatter_pagebreak=clearpage}</code>, you can prevent the insertion of a blank page, but by default, <code>\mainmatter</code> resets the page number, so there may be inconsistencies in the parity of page numbers. Please consider changing to a continuous pagination by specifying something like <code>\jlreqsetup{frontmatter_pagination={arabic,continuous}}</code>. For more details, please refer to the following “Front Matter, etc.” section.</p></li> +<p>The space between Japanese and European characters (stored in +<code>\xkanjiskip</code> in (u)pTeX and in the <code>xkanjiskip</code> +parameter in LuateX-ja) can also be changed by redefining +<code>\jlreqxkanjiskip</code>.</p></li> +<li><p>When specifying <code>book</code>, even if you specify +<code>openany</code> as a class option, a blank page may be inserted +after <code>\mainmatter</code>. This is to match the behavior of the +standard class file. By specifying +<code>\jlreqsetup{mainmatter_pagebreak=clearpage}</code>, you can +prevent the insertion of a blank page, but by default, +<code>\mainmatter</code> resets the page number, so there may be +inconsistencies in the parity of page numbers. Please consider changing +to a continuous pagination by specifying something like +<code>\jlreqsetup{frontmatter_pagination={arabic,continuous}}</code>. +For more details, please refer to the following “Front Matter, etc.” +section.</p></li> </ul> <h2 id="design-options">Design options</h2> -<p>The design is specified in keyval format via class options or <code>\jlreqsetup</code>. However, due to LaTeX’s implementation, cases where input that should be possible is not accepted may occur with class options. In many cases, this can be resolved by removing spaces.</p> +<p>The design is specified in keyval format via class options or +<code>\jlreqsetup</code>. However, due to LaTeX’s implementation, cases +where input that should be possible is not accepted may occur with class +options. In many cases, this can be resolved by removing spaces.</p> <p>In the following, the following usage will be used:</p> <ul> -<li><code>[A/B]</code>: Either A or B. <code>[A/B/C]</code>, etc., are the same.</li> -<li><code><dimension></code>: A dimension recognized by TeX. You can also use simple expressions (like <code>10pt+10pt</code>). In class options, you may be able to use special values as follows (these are available in pLaTeX / upLaTeX by default, but are processed to be available in LuaLaTeX as well): In places like <code>\jlreqsetup</code>, you can always describe the full-width width with <code>\zw</code> or <code>\zh</code>. Below, for example, if <code>Q</code> and <code>H</code> are available, it will be described as <code><dimension;Q,H></code>. +<li><code>[A/B]</code>: Either A or B. <code>[A/B/C]</code>, etc., are +the same.</li> +<li><code><dimension></code>: A dimension recognized by TeX. You +can also use simple expressions (like <code>10pt+10pt</code>). In class +options, you may be able to use special values as follows (these are +available in pLaTeX / upLaTeX by default, but are processed to be +available in LuaLaTeX as well): In places like <code>\jlreqsetup</code>, +you can always describe the full-width width with <code>\zw</code> or +<code>\zh</code>. Below, for example, if <code>Q</code> and +<code>H</code> are available, it will be described as +<code><dimension;Q,H></code>. <ul> <li><code>Q</code>, <code>H</code>: Interpreted as 0.25mm.</li> -<li><code>zw</code>, <code>zh</code>: Interpreted as full-width width.</li> +<li><code>zw</code>, <code>zh</code>: Interpreted as full-width +width.</li> </ul></li> <li><code><code></code>: LaTeX code.</li> -<li><code><font setting code></code>: Commands for font settings, such as <code>\Large</code> or <code>\bfseries</code>. Multiple specifications like <code>\Large\bfseries</code> are also possible.</li> +<li><code><font setting code></code>: Commands for font settings, +such as <code>\Large</code> or <code>\bfseries</code>. Multiple +specifications like <code>\Large\bfseries</code> are also possible.</li> </ul> <h3 id="kihon-hanmen">Kihon-hanmen</h3> <p>Class option.</p> <ul> -<li><code>paper=[<paper size name>/{<dimension>,<dimension>}]</code>: Specifies the paper size. You can specify from <code>a0paper</code> to <code>a10paper</code>, <code>b0paper</code> to <code>b10paper</code> (ISO B series), or <code>b0j</code> to <code>b10j</code> for JIS B series. Also available are <code>letterpaper</code>, <code>legalpaper</code>, and <code>executivepaper</code>. Alternatively, you can directly specify dimensions with <code>{<width>,<height>}</code>.</li> -<li><code>fontsize=<dimension;Q,H></code>: Specifies the font size for Latin script. The default is 10pt.</li> -<li><code>jafontsize=<dimension;Q,H></code>: Specifies the font size for Japanese script.</li> -<li><code>jafontscale=<real number></code>: The ratio of Japanese font size to Latin font size (Japanese / Latin). Ignored if both <code>fontsize</code> and <code>jafontsize</code> are specified. The default is 1.</li> -<li><code>line_length=<dimension;zw,zh></code>: The length of a line. By default, it's 0.75 times the paper width in the direction of character progression. The actual value is adjusted to be a multiple of the length of one character.</li> -<li><code>number_of_lines=<natural number></code>: The number of lines per page. By default, it's a value that makes it 0.75 times the paper height in the direction of line progression.</li> -<li><code>gutter=<dimension;zw,zh></code>: The size of the gutter margin. -<ul> -<li>Without <code>tate</code>option: It's the margin on the left for odd pages and on the right for even pages.</li> +<li><code>paper=[<paper size name>/{<dimension>,<dimension>}]</code>: +Specifies the paper size. You can specify from <code>a0paper</code> to +<code>a10paper</code>, <code>b0paper</code> to <code>b10paper</code> +(ISO B series), or <code>b0j</code> to <code>b10j</code> for JIS B +series. Also available are <code>letterpaper</code>, +<code>legalpaper</code>, and <code>executivepaper</code>. Alternatively, +you can directly specify dimensions with +<code>{<width>,<height>}</code>.</li> +<li><code>fontsize=<dimension;Q,H></code>: Specifies the font size +for Latin script. The default is 10pt.</li> +<li><code>jafontsize=<dimension;Q,H></code>: Specifies the font +size for Japanese script.</li> +<li><code>jafontscale=<real number></code>: The ratio of Japanese +font size to Latin font size (Japanese / Latin). Ignored if both +<code>fontsize</code> and <code>jafontsize</code> are specified. The +default is 1.</li> +<li><code>line_length=<dimension;zw,zh></code>: The length of a +line. By default, it's 0.75 times the paper width in the direction of +character progression. The actual value is adjusted to be a multiple of +the length of one character.</li> +<li><code>number_of_lines=<natural number></code>: The number of +lines per page. By default, it's a value that makes it 0.75 times the +paper height in the direction of line progression.</li> +<li><code>gutter=<dimension;zw,zh></code>: The size of the gutter +margin. +<ul> +<li>Without <code>tate</code>option: It's the margin on the left for odd +pages and on the right for even pages.</li> </ul> <ul> <li>With <code>tate</code> option: It's the opposite.</li> -<li>If <code>twoside</code> is not specified in the class options, the margin is always set as for odd pages.</li> +<li>If <code>twoside</code> is not specified in the class options, the +margin is always set as for odd pages.</li> </ul></li> -<li><code>fore-edge=<dimension;zw,zh></code>: The size of the fore-edge margin (the side opposite the gutter). It's implemented for convenience, although it's not used when margins are specified according to "Requirements for Japanese Text Layout".</li> -<li><code>head_space=<dimension;zw,zh></code>: The amount of space at the top (head). The default value centers the text block vertically.</li> -<li><code>foot_space=<dimension;zw,zh></code>: The amount of space at the bottom (foot). The default value centers the text block vertically.</li> -<li><code>baselineskip=<dimension;Q,H,zw,zh></code>: The line feed. By default, it's 1.7 times the <code>jafontsize</code>.</li> +<li><code>fore-edge=<dimension;zw,zh></code>: The size of the +fore-edge margin (the side opposite the gutter). It's implemented for +convenience, although it's not used when margins are specified according +to "Requirements for Japanese Text Layout".</li> +<li><code>head_space=<dimension;zw,zh></code>: The amount of space +at the top (head). The default value centers the text block +vertically.</li> +<li><code>foot_space=<dimension;zw,zh></code>: The amount of space +at the bottom (foot). The default value centers the text block +vertically.</li> +<li><code>baselineskip=<dimension;Q,H,zw,zh></code>: The line +feed. By default, it's 1.7 times the <code>jafontsize</code>.</li> <li><code>linegap=<dimension;Q,H,zw,zh></code>: The line gap.</li> -<li><code>headfoot_sidemargin=<dimension;zw,zh></code>: The left and right margin for headers and footers.</li> -<li><code>column_gap=<dimension;zw,zh></code>: The gap between columns (only for <code>twocolumn</code>).</li> -<li><code>sidenote_length=<dimension;zw,zh></code>: Specifies the width of the sidenote.</li> +<li><code>headfoot_sidemargin=<dimension;zw,zh></code>: The left +and right margin for headers and footers.</li> +<li><code>column_gap=<dimension;zw,zh></code>: The gap between +columns (only for <code>twocolumn</code>).</li> +<li><code>sidenote_length=<dimension;zw,zh></code>: Specifies the +width of the sidenote.</li> </ul> <h3></h3> <p>class option</p> <ul> -<li><code>open_bracket_pos=[zenkaku_tentsuki/zenkakunibu_nibu/nibu_tentsuki]</code>: Specifies the positioning of opening brackets at the start of a line. Options are: +<li><code>open_bracket_pos=[zenkaku_tentsuki/zenkakunibu_nibu/nibu_tentsuki]</code>: +Specifies the positioning of opening brackets at the start of a line. +Options are: <ul> -<li><code>zenkaku_tentsuki</code>: Full-width characters are indented at the start of a paragraph.</li> -<li><code>zenkakunibu_nibu</code>: Full-width at the start of a paragraph, half-width at a line break.</li> -<li><code>nibu_tentsuki</code>: Half-width indentation at the start of a line.</li> +<li><code>zenkaku_tentsuki</code>: Full-width characters are indented at +the start of a paragraph.</li> +<li><code>zenkakunibu_nibu</code>: Full-width at the start of a +paragraph, half-width at a line break.</li> +<li><code>nibu_tentsuki</code>: Half-width indentation at the start of a +line.</li> </ul></li> <li><code>hanging_punctuation</code>: Enables hanging punctuation.</li> </ul> <h3 id="reverse-pagination">Reverse pagination</h3> <p>class option.</p> <ul> -<li><code>use_reverse_pagination</code>: Enables reverse pagination functionality. Defines a ‘read-only counter’ named <code>jlreqreversepage</code>. Commands like <code>\arabic</code> and <code>\value</code> can be applied to it, and <code>\thejlreqreversepage</code> is defined as <code>\arabic{jlreqreversepage}</code>.</li> +<li><code>use_reverse_pagination</code>: Enables reverse pagination +functionality. Defines a ‘read-only counter’ named +<code>jlreqreversepage</code>. Commands like <code>\arabic</code> and +<code>\value</code> can be applied to it, and +<code>\thejlreqreversepage</code> is defined as +<code>\arabic{jlreqreversepage}</code>.</li> </ul> <h3 id="note-related">Note related</h3> <p>Specified by <code>\jlreqsetup</code>.</p> <ul> -<li><code>reference_mark=[inline/interlinear]</code>: Specifies the placement of reference marks. Options are <code>inline</code> (in the line after the relevant item) or <code>interlinear</code> (above the line for horizontal writing, or to the right for vertical writing).</li> -<li><code>footnote_second_indent=<dimension></code>: Sets the indent for the second and subsequent lines of footnotes (horizontal writing) or sidenotes (vertical writing).</li> -<li><code>sidenote_type=[number/symbol]</code>: Determines the correspondence between the sidenote and the text. Options are <code>number</code> (default, with a serial number indicating the note) or <code>symbol</code> (with a specific symbol and the word with the note emphasized).</li> -<li><code>sidenote_symbol=<code></code>: When <code>sidenote_type=symbol</code> is specified, this sets the symbol to be used at the note's location. THe default is *</li> -<li><code>sidenote_keyword_font=<font setting code></code>: Specifies the font for the word with the sidenote when <code>sidenote_type=symbol</code> is used.</li> -<li><code>endnote_second_indent=<dimension></code>: Sets the indent for the second and subsequent lines of endnotes. <code> endnote_position=[headings/paragraph/{_<heading name 1>,_<heading name 2>,...}]</code>: The output location of the endnote can be specified. <code>headings</code> will output the note before each heading (default), <code>paragraph</code> will output it when a new paragraph starts, and specifying <code>endnote_position={_chapter,_section}</code> will output it before <code>\chapter</code> and <code>\section</code>. To specify <code><_heading name></code>, the target heading must be created using the functionality of this class file.</li> -<li><code>warichu_opening=<code></code>, <code>warichu_closing=<code></code>: These are inserted before and after the warichu (split annotation). The default is parentheses ().</li> +<li><code>reference_mark=[inline/interlinear]</code>: Specifies the +placement of reference marks. Options are <code>inline</code> (in the +line after the relevant item) or <code>interlinear</code> (above the +line for horizontal writing, or to the right for vertical writing).</li> +<li><code>footnote_second_indent=<dimension></code>: Sets the +indent for the second and subsequent lines of footnotes (horizontal +writing) or sidenotes (vertical writing).</li> +<li><code>sidenote_type=[number/symbol]</code>: Determines the +correspondence between the sidenote and the text. Options are +<code>number</code> (default, with a serial number indicating the note) +or <code>symbol</code> (with a specific symbol and the word with the +note emphasized).</li> +<li><code>sidenote_symbol=<code></code>: When +<code>sidenote_type=symbol</code> is specified, this sets the symbol to +be used at the note's location. THe default is *</li> +<li><code>sidenote_keyword_font=<font setting code></code>: +Specifies the font for the word with the sidenote when +<code>sidenote_type=symbol</code> is used.</li> +<li><code>endnote_second_indent=<dimension></code>: Sets the +indent for the second and subsequent lines of endnotes. +<code> endnote_position=[headings/paragraph/{_<heading name 1>,_<heading name 2>,...}]</code>: +The output location of the endnote can be specified. +<code>headings</code> will output the note before each heading +(default), <code>paragraph</code> will output it when a new paragraph +starts, and specifying <code>endnote_position={_chapter,_section}</code> +will output it before <code>\chapter</code> and <code>\section</code>. +To specify <code><_heading name></code>, the target heading must +be created using the functionality of this class file.</li> +<li><code>warichu_opening=<code></code>, +<code>warichu_closing=<code></code>: These are inserted before and +after the warichu (split annotation). The default is parentheses +().</li> </ul> <h3 id="caption">Caption</h3> -<p>You can change the captions for figures and tables using <code>\jlreqsetup</code>. All settings allow for environment-specific customization. For example, <code>caption_font=\normalsize,table=\Large</code> means that within the table environment, <code>\Large</code> will be applied, while <code>\normalsize</code> will be applied in other environments. Other settings follow the same pattern.</p> -<ul> -<li><code>caption_font=<font setting code></code>: Specifies the font for the caption itself.</li> -<li><code>caption_label_font=<font setting code></code>: Specifies the font for the caption label.</li> -<li><code>caption_after_label_space=<dimension></code>: Specifies the space between the label and the caption text.</li> -<li><code>caption_label_format=<code></code>: Specifies the format of the label. For example, <code>caption_label_format={#1:}</code> where <code>#1</code> is replaced with something like “Figure 1”.</li> -<li><code>caption_align=[left/right/center/bottom/top]</code>: Specifies the position of the caption. For instance, <code>{center,*left}</code> means it’s usually centered, but aligned left when the caption is large.</li> +<p>You can change the captions for figures and tables using +<code>\jlreqsetup</code>. All settings allow for environment-specific +customization. For example, +<code>caption_font=\normalsize,table=\Large</code> means that within the +table environment, <code>\Large</code> will be applied, while +<code>\normalsize</code> will be applied in other environments. Other +settings follow the same pattern.</p> +<ul> +<li><code>caption_font=<font setting code></code>: Specifies the +font for the caption itself.</li> +<li><code>caption_label_font=<font setting code></code>: Specifies +the font for the caption label.</li> +<li><code>caption_after_label_space=<dimension></code>: Specifies +the space between the label and the caption text.</li> +<li><code>caption_label_format=<code></code>: Specifies the format +of the label. For example, <code>caption_label_format={#1:}</code> where +<code>#1</code> is replaced with something like “Figure 1”.</li> +<li><code>caption_align=[left/right/center/bottom/top]</code>: Specifies +the position of the caption. For instance, <code>{center,*left}</code> +means it’s usually centered, but aligned left when the caption is +large.</li> </ul> <h3 id="quotation">Quotation</h3> <ul> -<li><code>quote_indent=<dimension></code>: Specifies the indentation for quotes. The default is <code>2\zw</code>. The length of a line is adjusted to be an integer multiple of the character size.</li> -<li><code>quote_end_indent=<dimension></code>: Specifies the indentation for the end of quotes. The default is <code>0\zw</code>.</li> -<li><code>quote_beforeafter_space=<dimension></code>: Specifies the space before and after quotes. Setting <code>quote_beforeafter_space=1\baselineskip</code> will result in a one-line space.</li> -<li><code>quote_fontsize=[normalsize/small/footnotesize/scriptsize/tiny]</code>: Specifies the font size for quotes.</li> +<li><code>quote_indent=<dimension></code>: Specifies the +indentation for quotes. The default is <code>2\zw</code>. The length of +a line is adjusted to be an integer multiple of the character size.</li> +<li><code>quote_end_indent=<dimension></code>: Specifies the +indentation for the end of quotes. The default is +<code>0\zw</code>.</li> +<li><code>quote_beforeafter_space=<dimension></code>: Specifies +the space before and after quotes. Setting +<code>quote_beforeafter_space=1\baselineskip</code> will result in a +one-line space.</li> +<li><code>quote_fontsize=[normalsize/small/footnotesize/scriptsize/tiny]</code>: +Specifies the font size for quotes.</li> </ul> <h3 id="itemization">Itemization</h3> <ul> -<li><code>itemization_beforeafter_space=<dimension></code>: Specifies the space before and after the itemization. For example, <code>itemization_beforeafter_space={i=<dimension>}</code> sets the space for the top level only. <code>itemization_beforeafter_space={0pt,i=10pt,ii=5pt}</code> sets 10pt for level 1 itemization, 5pt for level 2, and 0pt for others. Levels are indicated by lowercase Roman numerals.</li> -<li><code>itemization_itemsep=<dimension></code>: Specifies the space between items.</li> +<li><code>itemization_beforeafter_space=<dimension></code>: +Specifies the space before and after the itemization. For example, +<code>itemization_beforeafter_space={i=<dimension>}</code> sets +the space for the top level only. +<code>itemization_beforeafter_space={0pt,i=10pt,ii=5pt}</code> sets 10pt +for level 1 itemization, 5pt for level 2, and 0pt for others. Levels are +indicated by lowercase Roman numerals.</li> +<li><code>itemization_itemsep=<dimension></code>: Specifies the +space between items.</li> </ul> <h3 id="front-matter-etc">Front matter etc.</h3> -<p>You can specify the behavior of <code>\frontmatter</code> / <code>\mainmatter</code> / <code>\backmatter</code> / <code>\appendix</code> with <code>\jlreqsetup</code>.</p> -<ul> -<li><code>frontmatter_pagebreak=[cleardoublepage/clearpage]</code>: Specifies the command name to execute the page break at <code>\frontmatter</code>. If it is empty, nothing is done.</li> -<li><code>frontmatter_counter={<counter name>={value=<value>, the=<code>, restore=[true/false]},…}</code>: Specifies the operation of the counter at <code>\frontmatter</code>. For example, <code>chapter={value=0,the={[\arabic{chapter]}}</code> sets the value of the chapter counter to 0 and <code>\thechapter</code> to <code>[\arabic{chapter}]</code>. By default, the value and <code>\the<counter name></code> definition are restored at <code>\mainmatter</code>, but this behavior is suppressed by specifying Prestore=false`.</li> -<li><code>frontmatter_heading={<heading command name>={<setting>},…}</code>: Changes the behavior of the heading command. In addition to the items that can be specified by <code>\Delare***Heading</code>, the following are accepted. -<ul> -<li><code>heading_type=[Tobira/Block/Runin/Cutin/Modify]</code>: The type of heading1. If Modify is specified, it will be changed by <code>\ModifyHeading</code>.</li> -<li><code>heading_level=<number></code>: Specifies the level of the heading command. If not specified, the value at <code>\frontmatter</code> is used. This is ignored when <code>heading_type=Modify</code>.</li> -<li><code>restore=[true/false]</code>: If true is specified, the original definition is restored at <code>\mainmatter</code>. The default is true.</li> +<p>You can specify the behavior of <code>\frontmatter</code> / +<code>\mainmatter</code> / <code>\backmatter</code> / +<code>\appendix</code> with <code>\jlreqsetup</code>.</p> +<ul> +<li><code>frontmatter_pagebreak=[cleardoublepage/clearpage]</code>: +Specifies the command name to execute the page break at +<code>\frontmatter</code>. If it is empty, nothing is done.</li> +<li><code>frontmatter_counter={<counter name>={value=<value>, the=<code>, restore=[true/false]},…}</code>: +Specifies the operation of the counter at <code>\frontmatter</code>. For +example, <code>chapter={value=0,the={[\arabic{chapter]}}</code> sets the +value of the chapter counter to 0 and <code>\thechapter</code> to +<code>[\arabic{chapter}]</code>. By default, the value and +<code>\the<counter name></code> definition are restored at +<code>\mainmatter</code>, but this behavior is suppressed by specifying +Prestore=false`.</li> +<li><code>frontmatter_heading={<heading command name>={<setting>},…}</code>: +Changes the behavior of the heading command. In addition to the items +that can be specified by <code>\Delare***Heading</code>, the following +are accepted. +<ul> +<li><code>heading_type=[Tobira/Block/Runin/Cutin/Modify]</code>: The +type of heading1. If Modify is specified, it will be changed by +<code>\ModifyHeading</code>.</li> +<li><code>heading_level=<number></code>: Specifies the level of +the heading command. If not specified, the value at +<code>\frontmatter</code> is used. This is ignored when +<code>heading_type=Modify</code>.</li> +<li><code>restore=[true/false]</code>: If true is specified, the +original definition is restored at <code>\mainmatter</code>. The default +is true.</li> </ul></li> -<li><code>frontmatter_pagestyle={<page style name>[,restore=[true/false]]}</code>: Switches to the specified page style at <code>\frontmatter</code>. By default, it returns to the original page style at <code>\mainmatter</code>, but this can be prevented by specifying <code>restore=false</code>.</li> -<li><code>frontmatter_pagination={<page number specification>[,continuous,independent]}</code>: Specifies the output format of the page number, such as <code>frontmatter_pagination=roman</code>, with the LaTeX command name. In addition, continuous makes it a continuous number, and independent makes it a separate number.</li> -<li><code>frontmatter_precode=<code></code>: The code that is executed first at <code>\frontmatter</code>.</li> -<li><code>frontmatter_postcode=<code></code>: The code that is executed last at <code>\frontmatter</code>.</li> +<li><code>frontmatter_pagestyle={<page style name>[,restore=[true/false]]}</code>: +Switches to the specified page style at <code>\frontmatter</code>. By +default, it returns to the original page style at +<code>\mainmatter</code>, but this can be prevented by specifying +<code>restore=false</code>.</li> +<li><code>frontmatter_pagination={<page number specification>[,continuous,independent]}</code>: +Specifies the output format of the page number, such as +<code>frontmatter_pagination=roman</code>, with the LaTeX command name. +In addition, continuous makes it a continuous number, and independent +makes it a separate number.</li> +<li><code>frontmatter_precode=<code></code>: The code that is +executed first at <code>\frontmatter</code>.</li> +<li><code>frontmatter_postcode=<code></code>: The code that is +executed last at <code>\frontmatter</code>.</li> </ul> -<p>There are also settings that change <code>frontmatter</code> to <code>mainmatter</code>, <code>backmatter</code>, or <code>appendix</code>. However, there are some differences as follows.</p> +<p>There are also settings that change <code>frontmatter</code> to +<code>mainmatter</code>, <code>backmatter</code>, or +<code>appendix</code>. However, there are some differences as +follows.</p> <ul> <li><code>restore=[true/false]</code> is an invalid setting.</li> -<li>Pmainmatter_pagination` cannot specify continuous or independent.</li> -<li><code>appendix_pagebreak</code>, <code>appendix_pagestyle</code>, <code>appendix_pagination</code> do not exist.</li> +<li>Pmainmatter_pagination` cannot specify continuous or +independent.</li> +<li><code>appendix_pagebreak</code>, <code>appendix_pagestyle</code>, +<code>appendix_pagination</code> do not exist.</li> </ul> <h4 id="abstract">Abstract</h4> <ul> -<li><code>abstract_with_maketitle=[true/false]</code>: If the abstract environment is written before <code>\maketitle</code>, it delays its content and outputs it with <code>\maketitle</code>. Even in the case of two columns, it is output in one column. The default is false. This option is available only when <code>article</code> and <code>report</code> are specified.</li> +<li><code>abstract_with_maketitle=[true/false]</code>: If the abstract +environment is written before <code>\maketitle</code>, it delays its +content and outputs it with <code>\maketitle</code>. Even in the case of +two columns, it is output in one column. The default is false. This +option is available only when <code>article</code> and +<code>report</code> are specified.</li> </ul> <h2 id="headings">Headings</h2> -<p>You can create new headings with commands like <code>\New***Heading</code> ( is a string that corresponds to the type of heading). The format is always <code>\New***Heading{<command name>}{<level>}{<settings>}</code>. Also, <code>\Renew***Heading</code>, <code>\Provide***Heading</code>, and <code>\Declare***Heading</code> are available at the same time. They are respectively</p> -<ul> -<li><code>\Renew***Heading</code>: If the command with the specified name is not defined, it causes an error.</li> -<li><code>\Provide***Heading</code>: If the command with the specified name is not defined, it defines a new heading command.</li> -<li><code>\Declare***Heading</code>: It defines a new heading command regardless of whether the command with the specified name is defined or not.</li> +<p>You can create new headings with commands like +<code>\New***Heading</code> ( is a string that corresponds to the type +of heading). The format is always +<code>\New***Heading{<command name>}{<level>}{<settings>}</code>. +Also, <code>\Renew***Heading</code>, <code>\Provide***Heading</code>, +and <code>\Declare***Heading</code> are available at the same time. They +are respectively</p> +<ul> +<li><code>\Renew***Heading</code>: If the command with the specified +name is not defined, it causes an error.</li> +<li><code>\Provide***Heading</code>: If the command with the specified +name is not defined, it defines a new heading command.</li> +<li><code>\Declare***Heading</code>: It defines a new heading command +regardless of whether the command with the specified name is defined or +not.</li> </ul> <h3 id="tobira-headings">Tobira headings</h3> -<p>You can create it with \NewTobiraHeading. It creates a command with the same format as the usual class file’s \section and so on. The settings are as follows. .</p> -<ul> -<li><code>type=[han/naka]</code>: It creates a half-title heading if <code>han</code> is specified, and a middle-title heading if <code>naka</code> is specified.</li> -<li><code>pagestyle=<page style name></code>: It specifies the page style of the heading area.</li> -<li><code>label_format=<code></code>: It specifies the command to output the label. For example, specify it as <code>label_format={Chapter \thechapter}</code>.</li> -<li><code>format=<code></code>: It specifies the format to actually output. <code>#1</code> is replaced with the label, <code>#2</code> with the heading text. In this case, the commands <code>\jlreqHeadingLabel</code> and <code>\jlreqHeadingText</code> are available internally. They are commands that take one argument each, and output the given argument itself if the label and heading text are not empty, respectively, and output nothing otherwise. For example, if you specify it as <code>format={[\jlreqHeadingLabel{Label=#1}]}</code>, it outputs <code>[Label=<label>]</code> if the label is not empty, and <code>[]</code> otherwise. Note that <code>#1</code> is replaced not with the label itself, but with the code that has the adjustment of the space and so on. Therefore, you may get an unexpected result. <code>#2</code> is the same.</li> -<li><code>number=[true/false]</code>: It specifies whether to number or not. However, even if <code>number=false</code> is specified, the corresponding counter is defined. Also, the definition of <code>\the<counter name></code> is not changed, so you need to redefine it if necessary.</li> +<p>You can create it with \NewTobiraHeading. It creates a command with +the same format as the usual class file’s \section and so on. The +settings are as follows. .</p> +<ul> +<li><code>type=[han/naka]</code>: It creates a half-title heading if +<code>han</code> is specified, and a middle-title heading if +<code>naka</code> is specified.</li> +<li><code>pagestyle=<page style name></code>: It specifies the +page style of the heading area.</li> +<li><code>label_format=<code></code>: It specifies the command to +output the label. For example, specify it as +<code>label_format={Chapter \thechapter}</code>.</li> +<li><code>format=<code></code>: It specifies the format to +actually output. <code>#1</code> is replaced with the label, +<code>#2</code> with the heading text. In this case, the commands +<code>\jlreqHeadingLabel</code> and <code>\jlreqHeadingText</code> are +available internally. They are commands that take one argument each, and +output the given argument itself if the label and heading text are not +empty, respectively, and output nothing otherwise. For example, if you +specify it as <code>format={[\jlreqHeadingLabel{Label=#1}]}</code>, it +outputs <code>[Label=<label>]</code> if the label is not empty, +and <code>[]</code> otherwise. Note that <code>#1</code> is replaced not +with the label itself, but with the code that has the adjustment of the +space and so on. Therefore, you may get an unexpected result. +<code>#2</code> is the same.</li> +<li><code>number=[true/false]</code>: It specifies whether to number or +not. However, even if <code>number=false</code> is specified, the +corresponding counter is defined. Also, the definition of +<code>\the<counter name></code> is not changed, so you need to +redefine it if necessary.</li> </ul> <h3 id="block-headings">Block headings</h3> -<p>You can create it with <code>\NewBlockHeading</code>. It creates a command with the format <code>\<command name>*[running head]{heading text}[subtitle]</code>. The settings are as follows.</p> +<p>You can create it with <code>\NewBlockHeading</code>. It creates a +command with the format +<code>\<command name>*[running head]{heading text}[subtitle]</code>. +The settings are as follows.</p> <h4 id="format-related">Format related</h4> <ul> -<li><code>font=<font setting code></code>: It specifies the font of the heading.</li> -<li><code>subtitle_font=<font setting code></code>: It specifies the font of the subtitle.</li> -<li><code>label_format=<code></code>: It specifies the format of the label. Specify it as <code>label_format={Chapter \thechapter}</code>, for example.</li> -<li><code>subtitle_format=<code></code>: It specifies the format of the subtitle. Specify it as <code>subtitle_format={“#1”}</code>, for example. <code>#1</code> is replaced with the subtitle itself.</li> -<li><code>format=<code></code>: It specifies the format of the entire heading. <code>#1</code> is replaced with the label, <code>#2</code> with the heading text, <code>#3</code> with the subtitle. Internally, the commands <code>\jlreqHeadingLabel</code>, <code>\jlreqHeadingText</code>, and <code>\jlreqHeadingSubtitle</code> are available. They are commands that take one argument each, and output the given argument itself if the label, heading text, and subtitle are not empty, respectively, and output nothing otherwise. For example, if you specify it as <code>format={[\jlreqHeadingLabel{Label=#1}]}</code>, it outputs <code>[Label=<label>]</code> if the label is not empty, and <code>[]</code> otherwise. Note that <code>#1</code> is replaced not with the label itself, but with the code that has the adjustment of the space and so on. Therefore, you may get an unexpected result. <code>#2</code> and <code>#3</code> are the same.</li> +<li><code>font=<font setting code></code>: It specifies the font +of the heading.</li> +<li><code>subtitle_font=<font setting code></code>: It specifies +the font of the subtitle.</li> +<li><code>label_format=<code></code>: It specifies the format of +the label. Specify it as +<code>label_format={Chapter \thechapter}</code>, for example.</li> +<li><code>subtitle_format=<code></code>: It specifies the format +of the subtitle. Specify it as <code>subtitle_format={“#1”}</code>, for +example. <code>#1</code> is replaced with the subtitle itself.</li> +<li><code>format=<code></code>: It specifies the format of the +entire heading. <code>#1</code> is replaced with the label, +<code>#2</code> with the heading text, <code>#3</code> with the +subtitle. Internally, the commands <code>\jlreqHeadingLabel</code>, +<code>\jlreqHeadingText</code>, and <code>\jlreqHeadingSubtitle</code> +are available. They are commands that take one argument each, and output +the given argument itself if the label, heading text, and subtitle are +not empty, respectively, and output nothing otherwise. For example, if +you specify it as <code>format={[\jlreqHeadingLabel{Label=#1}]}</code>, +it outputs <code>[Label=<label>]</code> if the label is not empty, +and <code>[]</code> otherwise. Note that <code>#1</code> is replaced not +with the label itself, but with the code that has the adjustment of the +space and so on. Therefore, you may get an unexpected result. +<code>#2</code> and <code>#3</code> are the same.</li> </ul> <h4 id="indent-related">Indent related</h4> <ul> -<li><code>align=[left/center/right]</code>: It specifies the horizontal alignment of the heading position.</li> -<li><code>indent=<dimension></code>: It specifies the amount of indentation of the entire heading.</li> -<li><code>end_indent=<dimension></code>: It specifies the amount of back indentation of the entire heading.</li> -<li><code>after_label_space=<dimension></code>: It specifies the amount of space between the label and the heading text.</li> -<li><code>second_heading_text_indent=[<dimension>/{<dimension>,<dimension>}]</code>: It specifies the indent of the second and subsequent lines of the heading text. It specifies from the beginning of the first line of the heading text, but if you put <code>*</code> at the beginning like <code>second_heading_text_indent=*1\zw</code>, it specifies from the beginning of the label. Also, if you specify it as <code>second_heading_text_indent={<when there is a label>,<when there is no label>}</code>, you can change the value depending on the presence or absence of the label. You can also use * in the specification of <code><when there is a label></code>.</li> -<li><code>subtitle_indent=<dimension></code>: It specifies the amount of indentation of the subtitle. It specifies from the beginning of the first line of the heading text. However, if you put <code>*</code> at the beginning like <code>subtitle_indent=*1\zw</code>, it specifies from the beginning of the label. It is valid only when <code>subtitle_break=true</code>.</li> +<li><code>align=[left/center/right]</code>: It specifies the horizontal +alignment of the heading position.</li> +<li><code>indent=<dimension></code>: It specifies the amount of +indentation of the entire heading.</li> +<li><code>end_indent=<dimension></code>: It specifies the amount +of back indentation of the entire heading.</li> +<li><code>after_label_space=<dimension></code>: It specifies the +amount of space between the label and the heading text.</li> +<li><code>second_heading_text_indent=[<dimension>/{<dimension>,<dimension>}]</code>: +It specifies the indent of the second and subsequent lines of the +heading text. It specifies from the beginning of the first line of the +heading text, but if you put <code>*</code> at the beginning like +<code>second_heading_text_indent=*1\zw</code>, it specifies from the +beginning of the label. Also, if you specify it as +<code>second_heading_text_indent={<when there is a label>,<when there is no label>}</code>, +you can change the value depending on the presence or absence of the +label. You can also use * in the specification of +<code><when there is a label></code>.</li> +<li><code>subtitle_indent=<dimension></code>: It specifies the +amount of indentation of the subtitle. It specifies from the beginning +of the first line of the heading text. However, if you put +<code>*</code> at the beginning like <code>subtitle_indent=*1\zw</code>, +it specifies from the beginning of the label. It is valid only when +<code>subtitle_break=true</code>.</li> </ul> <h4 id="others-1">Others</h4> <ul> -<li><code>subtitle_break=[true/false]</code>: It specifies whether to break the line between the heading text and the subtitle.</li> -<li><code>allowbreak_if_evenpage=[true/false]</code>: It allows a page break immediately after the heading if it is on an even page.</li> -<li><code>pagebreak=[clearpage/cleardoublepage/clearcolumn/nariyuki/begin_with_odd_page/begin_with_even_page]</code>: It specifies the page break before the heading2. They are respectively, page break, <code>\cleardoublepage</code> execution, column break, as it is, start with odd page, start with even page.</li> -<li><code>pagestyle=<page style name></code>: It specifies the page style of the heading area.</li> -<li><code>afterindent=[true/false]</code>: It specifies whether to indent the paragraph immediately after the heading.</li> -<li><code>column_spanning=[true/false]</code>: It makes the heading span columns. It is ignored when <code>pagebreak=nariyuki</code> or <code>pagebreak=clearcolumn</code>.</li> -<li><code>number=[true/false]</code>: It specifies whether to number or not. The same caution as <code>\NewTobiraHeading</code> is required.</li> +<li><code>subtitle_break=[true/false]</code>: It specifies whether to +break the line between the heading text and the subtitle.</li> +<li><code>allowbreak_if_evenpage=[true/false]</code>: It allows a page +break immediately after the heading if it is on an even page.</li> +<li><code>pagebreak=[clearpage/cleardoublepage/clearcolumn/nariyuki/begin_with_odd_page/begin_with_even_page]</code>: +It specifies the page break before the heading2. They are respectively, +page break, <code>\cleardoublepage</code> execution, column break, as it +is, start with odd page, start with even page.</li> +<li><code>pagestyle=<page style name></code>: It specifies the +page style of the heading area.</li> +<li><code>afterindent=[true/false]</code>: It specifies whether to +indent the paragraph immediately after the heading.</li> +<li><code>column_spanning=[true/false]</code>: It makes the heading span +columns. It is ignored when <code>pagebreak=nariyuki</code> or +<code>pagebreak=clearcolumn</code>.</li> +<li><code>number=[true/false]</code>: It specifies whether to number or +not. The same caution as <code>\NewTobiraHeading</code> is +required.</li> </ul> <h4 id="gyo-dori">Gyo-dori</h4> <p>You can specify gyo-dori setting in one of the following ways.</p> <ul> -<li>Specify the number of lines and place it in the center. Specify the number of lines with <code>lines=<natural number></code>. You can also specify the number of lines to add before and after with <code>before_lines=<natural number></code> and <code>after_lines=<natural number></code>. For example, if you specify <code>lines=3,after_lines=1</code>, it will be placed in four lines, and the space after will be one line larger than the space before. The space specified by <code>before_lines</code> does not enter at the top of the page, but if you put <code>*</code> at the beginning like <code>before_lines=*1</code>, it always enters.</li> -<li>Specify the number of lines and either the space before or after. Specify the number of lines with <code>lines=<natural number></code>, and the space before or after with either <code>before_space=<dimension></code> or <code>after_space=<dimension></code>.</li> -<li>Specify the space before and after. Specify it with <code>before_space=<dimension></code> and <code>after_space=<dimension></code>.</li> +<li>Specify the number of lines and place it in the center. Specify the +number of lines with <code>lines=<natural number></code>. You can +also specify the number of lines to add before and after with +<code>before_lines=<natural number></code> and +<code>after_lines=<natural number></code>. For example, if you +specify <code>lines=3,after_lines=1</code>, it will be placed in four +lines, and the space after will be one line larger than the space +before. The space specified by <code>before_lines</code> does not enter +at the top of the page, but if you put <code>*</code> at the beginning +like <code>before_lines=*1</code>, it always enters.</li> +<li>Specify the number of lines and either the space before or after. +Specify the number of lines with +<code>lines=<natural number></code>, and the space before or after +with either <code>before_space=<dimension></code> or +<code>after_space=<dimension></code>.</li> +<li>Specify the space before and after. Specify it with +<code>before_space=<dimension></code> and +<code>after_space=<dimension></code>.</li> </ul> -<h3 id="gyo-dori-for-consecutive-headings">Gyo-dori for consecutive headings</h3> -<p>You can set the gyo-dori settings for block headings that are placed consecutively with <code>\SetBlockHeadingSpaces</code>. <code>\SetBlockHeadingSpaces</code> is used as follows:</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" tabindex="-1"></a><span class="fu">\SetBlockHeadingSpaces</span> { {_part{lines=3,before_lines=1},_section{lines=2},_subsection{lines=2}} [lines=5]{_section,23pt,_subsection,16pt} }</span></code></pre></div> +<h3 id="gyo-dori-for-consecutive-headings">Gyo-dori for consecutive +headings</h3> +<p>You can set the gyo-dori settings for block headings that are placed +consecutively with <code>\SetBlockHeadingSpaces</code>. +<code>\SetBlockHeadingSpaces</code> is used as follows:</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" tabindex="-1"></a><span class="fu">\SetBlockHeadingSpaces</span> {</span> +<span id="cb5-2"><a href="#cb5-2" aria-hidden="true" tabindex="-1"></a> {_part{lines=3,before_lines=1},_section{lines=2},_subsection{lines=2}}</span> +<span id="cb5-3"><a href="#cb5-3" aria-hidden="true" tabindex="-1"></a> [lines=5]{_section,23pt,_subsection,16pt}</span> +<span id="cb5-4"><a href="#cb5-4" aria-hidden="true" tabindex="-1"></a>}</span></code></pre></div> <p>This means the following.</p> <ul> -<li>If the headings are placed in the order of <code>\part</code>, <code>\section</code>, <code>\subsection</code>, and the front and back are not headings, then <code>\part</code> is three-line spacing + one line space before, and <code>\section</code> and <code>\subsection</code> are two-line spacing.</li> -<li>If the headings are placed in the order of <code>\section</code>, <code>\subsection</code>, and the front and back are not headings, then the whole is five-line spacing, and there is <code>23pt</code> space between <code>\section</code> and <code>\subsection</code>, and <code>16pt</code> space after <code>\subsection</code>.</li> +<li>If the headings are placed in the order of <code>\part</code>, +<code>\section</code>, <code>\subsection</code>, and the front and back +are not headings, then <code>\part</code> is three-line spacing + one +line space before, and <code>\section</code> and +<code>\subsection</code> are two-line spacing.</li> +<li>If the headings are placed in the order of <code>\section</code>, +<code>\subsection</code>, and the front and back are not headings, then +the whole is five-line spacing, and there is <code>23pt</code> space +between <code>\section</code> and <code>\subsection</code>, and +<code>16pt</code> space after <code>\subsection</code>.</li> </ul> <p>The individual settings are as follows.</p> <ul> -<li>Each <code>{}</code> contains <code>_<heading command name></code> or <code><dimension></code> separated by commas.</li> -<li>You can add settings enclosed in <code>[]</code> at the beginning. This is a setting for the entire heading that is placed consecutively. <code>lines / before_lines / after_lines / before_space / after_space</code> are available. Each meaning is the same as the line spacing specification described above.</li> +<li>Each <code>{}</code> contains +<code>_<heading command name></code> or +<code><dimension></code> separated by commas.</li> +<li>You can add settings enclosed in <code>[]</code> at the beginning. +This is a setting for the entire heading that is placed consecutively. +<code>lines / before_lines / after_lines / before_space / after_space</code> +are available. Each meaning is the same as the line spacing +specification described above.</li> <li>The dimension is the amount of space as it is.</li> -<li>You can add settings enclosed in <code>{}</code> after <code>_<heading command name></code> to set the amount of space for that heading. If not set, there is no space before and after.</li> -<li>In the settings enclosed in <code>{}</code> for the heading, <code>lines / before_lines / after_lines / before_space / after_space</code> are available. Each meaning is the same as the line spacing specification described above.</li> -<li>If you make the part enclosed in <code>{}</code> only <code>*</code>, (for example, <code>_section{*}</code>), it uses the same setting as when it is placed alone.</li> +<li>You can add settings enclosed in <code>{}</code> after +<code>_<heading command name></code> to set the amount of space +for that heading. If not set, there is no space before and after.</li> +<li>In the settings enclosed in <code>{}</code> for the heading, +<code>lines / before_lines / after_lines / before_space / after_space</code> +are available. Each meaning is the same as the line spacing +specification described above.</li> +<li>If you make the part enclosed in <code>{}</code> only +<code>*</code>, (for example, <code>_section{*}</code>), it uses the +same setting as when it is placed alone.</li> </ul> -<p>Note that whether the headings are consecutive or not is determined simply by whether the block heading commands are written in succession. Therefore, even if there are commands that are not related to the output between the heading commands, they are not considered to be consecutive headings. However, if only spaces, line breaks, or <code>\label[<option>]{<argument>}…{<argument>}</code> are inserted between the heading commands, they are considered to be consecutive headings.</p> +<p>Note that whether the headings are consecutive or not is determined +simply by whether the block heading commands are written in succession. +Therefore, even if there are commands that are not related to the output +between the heading commands, they are not considered to be consecutive +headings. However, if only spaces, line breaks, or +<code>\label[<option>]{<argument>}…{<argument>}</code> +are inserted between the heading commands, they are considered to be +consecutive headings.</p> <h3 id="run-in-headings">Run-in headings</h3> -<p>Run-in headings are created with <code>\NewRuninHeading</code>. The command creates a heading with the same format as the standard document class's <code>\section</code>, i.e. <code>\<command name>*[running head]{heading text}</code>. The settings are as follows:</p> -<ul> -<li><code>font=<font setting command></code>: Specifies the font of the heading.</li> -<li><code>indent=<dimension></code>: Specifies the indentation of the entire heading text.</li> -<li><code>after_label_space=<dimension></code>: Specifies the space between the label and the heading text.</li> -<li><code>label_format=<code></code>: Specifies the format of the label. For example, <code>label_format={\theparagraph}</code>.</li> -<li><code>after_space=<dimension></code>: Specifies the space between the heading and the main text.</li> -<li><code>number=[true/false]</code>: Specifies whether to number the heading or not. The same caution as <code>\NewTobiraHeading</code> applies.</li> +<p>Run-in headings are created with <code>\NewRuninHeading</code>. The +command creates a heading with the same format as the standard document +class's <code>\section</code>, i.e. +<code>\<command name>*[running head]{heading text}</code>. The +settings are as follows:</p> +<ul> +<li><code>font=<font setting command></code>: Specifies the font +of the heading.</li> +<li><code>indent=<dimension></code>: Specifies the indentation of +the entire heading text.</li> +<li><code>after_label_space=<dimension></code>: Specifies the +space between the label and the heading text.</li> +<li><code>label_format=<code></code>: Specifies the format of the +label. For example, <code>label_format={\theparagraph}</code>.</li> +<li><code>after_space=<dimension></code>: Specifies the space +between the heading and the main text.</li> +<li><code>number=[true/false]</code>: Specifies whether to number the +heading or not. The same caution as <code>\NewTobiraHeading</code> +applies.</li> </ul> <h3 id="cut-in-headings">Cut-in headings</h3> -<p>You can create cut-in headings with <code>\NewCutinHeading</code>. The command has the format <code>\<command name>{heading text}</code>. The settings are as follows:</p> -<ul> -<li><code>font=<font setting command></code>: Specifies the font of the heading.</li> -<li><code>indent=<dimension></code>: Specifies the indentation of the entire heading.</li> -<li><code>after_space=<dimension></code>: Specifies the space between the heading and the text.</li> -<li><code>onelinemax=<dimension></code>, <code>twolinemax=<dimension></code>: If the length of the heading text is less than or equal to <code>onelinemax</code>, the window heading is output in one line. If it is less than or equal to <code>twolinemax</code>, it is output in two lines. Otherwise, it is output in three lines. The default values are 6 characters and 20 characters, respectively.</li> +<p>You can create cut-in headings with <code>\NewCutinHeading</code>. +The command has the format +<code>\<command name>{heading text}</code>. The settings are as +follows:</p> +<ul> +<li><code>font=<font setting command></code>: Specifies the font +of the heading.</li> +<li><code>indent=<dimension></code>: Specifies the indentation of +the entire heading.</li> +<li><code>after_space=<dimension></code>: Specifies the space +between the heading and the text.</li> +<li><code>onelinemax=<dimension></code>, +<code>twolinemax=<dimension></code>: If the length of the heading +text is less than or equal to <code>onelinemax</code>, the window +heading is output in one line. If it is less than or equal to +<code>twolinemax</code>, it is output in two lines. Otherwise, it is +output in three lines. The default values are 6 characters and 20 +characters, respectively.</li> </ul> <h3 id="modifyheading"><code>\ModifyHeading</code></h3> -<p><code>\ModifyHeading</code> is a command that changes the settings of a heading command that has already been defined (using one of the above commands). For example,</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" tabindex="-1"></a><span class="fu">\ModifyHeading</span>{section}{lines=10}</span></code></pre></div> -<p>changes only the line spacing of <code>\section</code> to 10 lines, while keeping the font and other settings the same. You cannot change the type of heading with this command.</p> +<p><code>\ModifyHeading</code> is a command that changes the settings of +a heading command that has already been defined (using one of the above +commands). For example,</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" tabindex="-1"></a><span class="fu">\ModifyHeading</span>{section}{lines=10}</span></code></pre></div> +<p>changes only the line spacing of <code>\section</code> to 10 lines, +while keeping the font and other settings the same. You cannot change +the type of heading with this command.</p> <h3 id="saveheading"><code>\SaveHeading</code></h3> -<p><code>\SaveHeading</code> saves the definition of a heading command. For example, you can use it like this:</p> -<div class="sourceCode" id="cb7"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb7-1"><a href="#cb7-1" aria-hidden="true" tabindex="-1"></a><span class="fu">\SaveHeading</span>{section}{<span class="fu">\restoresection</span>} <span class="co">% Save the contents of \section to \restoresection.</span></span> +<p><code>\SaveHeading</code> saves the definition of a heading command. +For example, you can use it like this:</p> +<div class="sourceCode" id="cb7"><pre +class="sourceCode latex"><code class="sourceCode latex"><span id="cb7-1"><a href="#cb7-1" aria-hidden="true" tabindex="-1"></a><span class="fu">\SaveHeading</span>{section}{<span class="fu">\restoresection</span>} <span class="co">% Save the contents of \section to \restoresection.</span></span> <span id="cb7-2"><a href="#cb7-2" aria-hidden="true" tabindex="-1"></a><span class="fu">\RenewBlockHeading</span>{section}{1}{font=…} <span class="co">% Redefine \section with a new font.</span></span> <span id="cb7-3"><a href="#cb7-3" aria-hidden="true" tabindex="-1"></a>…</span> <span id="cb7-4"><a href="#cb7-4" aria-hidden="true" tabindex="-1"></a><span class="fu">\restoresection</span> <span class="co">% Restore the contents of \section.</span></span></code></pre></div> <h2 id="page-style">Page Style</h2> <p>You can define a page style using</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" tabindex="-1"></a><span class="fu">\NewPageStyle</span>{<page style name>}{<settings>}</span></code></pre></div> -<p><code><settings></code> is in keyval format. You can apply the defined page style with <code>\pagestyle</code>. The settings are as follows:</p> -<ul> -<li><code>yoko</code>: Prints horizontally at the top and bottom. Default.</li> +<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">\NewPageStyle</span>{<page style name>}{<settings>}</span></code></pre></div> +<p><code><settings></code> is in keyval format. You can apply the +defined page style with <code>\pagestyle</code>. The settings are as +follows:</p> +<ul> +<li><code>yoko</code>: Prints horizontally at the top and bottom. +Default.</li> <li><code>tate</code>: Prints vertically on the fore-edge side.</li> -<li><code>running_head_font=<font setting command></code>: Specifies the font for the running head.</li> -<li><code>nombre_font=<font setting command></code>: Specifies the font for the page number.</li> -<li><code>running_head_position</code>, <code>nombre_position</code>: Specifies the position of the running head and the page number. The specification method changes depending on whether <code>yoko</code> or <code>tate</code> is specified. -<ul> -<li><code>yoko</code> specified: You can specify it like top-left. You can use <code>top / bottom / center / left / right / gutter / fore-edge</code>. <code>left</code> and <code>right</code> are for odd pages. If <code>twoside</code> is specified, even pages are the opposite.</li> -<li><code>tate</code> specified: You can specify <code><dimension></code>. <code>running_head_position</code> specifies the drop amount from the top of the running head, and <code>nombre_position</code> specifies the raise amount from the bottom of the page number.</li> -</ul></li> -<li><code>nombre=<format></code>: Specifies the page number to output. The default is <code>\thepage</code>.</li> -<li><code>odd_running_head=<format></code>, <code>even_running_head=<format></code>: Specifies the running head for odd and even pages, respectively. If you specify a name starting with _ like <code>_section</code>, it outputs the corresponding heading. (<code>_section</code> outputs the current <code>\section</code>.)</li> -<li><code>mark_format={[odd=<format>/even=<format>/_<heading command name>=<format>],…}</code>: Specifies the format for outputting headings to the running head. Specify it like <code>mark_format={_section={Section \thesection: #1},_chapter={Chapter \thechapter \quad #1}}</code>. You can also specify odd or even instead of the heading command name, which will be the format for the running head on odd/even pages. It is implemented by defining <code>\sectionmark</code> etc. when executing <code>\pagestyle</code>.</li> -<li><code>nombre_ii=<format></code>: Specifies the second page number. You can also specify the location with <code>nombre_ii_position</code> and the font with <code>nombre_ii_font</code>. The specification method is the same as <code>nombre</code> and <code>nombre_position</code>.</li> -<li><code>odd_running_head_ii</code>, <code>even_running_head_ii</code>, <code>running_head_ii_position</code>, <code>running_head_ii_font</code> are also available. If <code>nombre_ii_position</code> or <code>running_head_ii_position</code> is not specified, it will be set to the same position as <code>nombre_position</code> or <code>running_head_position</code> when <code>yoko</code> is specified. When <code>tate</code> is specified, it will be displayed in the place following the first page number or running head.</li> -<li><code>odd_head_format=<format></code>, <code>odd_foot_format=<format></code>, <code>even_head_format=<format></code>, <code>even_foot_format=<format>P: Specifies the format for the header and footer. </code>#1<code>will be replaced with the entire header or footer. However,</code>#1<code>may contain code for position adjustment, so it may not work as expected, especially when</code>tate<code>is specified in</code>\NewPageStyle<code>. For example, to draw a rule under the header on odd pages, you can do </code>odd_head_format={\underline{\makebox[\jlreqyokoheadlength]{#1}}}<code>. </code>\jlreqyokoheadlength<code>is a macro defined in this class file and gives the horizontal length of the header. (The footer length is the same.) The vertical length, i.e., the length when</code>tate<code>is specified in</code>\NewPageStyle<code>, can be obtained with </code>\jlreqtateheadlength`.</li> -</ul> -<p><code>\RenewPageStyle</code>, <code>\ProvidePageStyle</code>, <code>\DeclarePageStyle</code> are also available1.</p> -<p>You can modify an existing page style with <code>\ModifyPageStyle</code>.</p> +<li><code>running_head_font=<font setting command></code>: +Specifies the font for the running head.</li> +<li><code>nombre_font=<font setting command></code>: Specifies the +font for the page number.</li> +<li><code>running_head_position</code>, <code>nombre_position</code>: +Specifies the position of the running head and the page number. The +specification method changes depending on whether <code>yoko</code> or +<code>tate</code> is specified. +<ul> +<li><code>yoko</code> specified: You can specify it like top-left. You +can use +<code>top / bottom / center / left / right / gutter / fore-edge</code>. +<code>left</code> and <code>right</code> are for odd pages. If +<code>twoside</code> is specified, even pages are the opposite.</li> +<li><code>tate</code> specified: You can specify +<code><dimension></code>. <code>running_head_position</code> +specifies the drop amount from the top of the running head, and +<code>nombre_position</code> specifies the raise amount from the bottom +of the page number.</li> +</ul></li> +<li><code>nombre=<format></code>: Specifies the page number to +output. The default is <code>\thepage</code>.</li> +<li><code>odd_running_head=<format></code>, +<code>even_running_head=<format></code>: Specifies the running +head for odd and even pages, respectively. If you specify a name +starting with _ like <code>_section</code>, it outputs the corresponding +heading. (<code>_section</code> outputs the current +<code>\section</code>.)</li> +<li><code>mark_format={[odd=<format>/even=<format>/_<heading command name>=<format>],…}</code>: +Specifies the format for outputting headings to the running head. +Specify it like +<code>mark_format={_section={Section \thesection: #1},_chapter={Chapter \thechapter \quad #1}}</code>. +You can also specify odd or even instead of the heading command name, +which will be the format for the running head on odd/even pages. It is +implemented by defining <code>\sectionmark</code> etc. when executing +<code>\pagestyle</code>.</li> +<li><code>nombre_ii=<format></code>: Specifies the second page +number. You can also specify the location with +<code>nombre_ii_position</code> and the font with +<code>nombre_ii_font</code>. The specification method is the same as +<code>nombre</code> and <code>nombre_position</code>.</li> +<li><code>odd_running_head_ii</code>, <code>even_running_head_ii</code>, +<code>running_head_ii_position</code>, <code>running_head_ii_font</code> +are also available. If <code>nombre_ii_position</code> or +<code>running_head_ii_position</code> is not specified, it will be set +to the same position as <code>nombre_position</code> or +<code>running_head_position</code> when <code>yoko</code> is specified. +When <code>tate</code> is specified, it will be displayed in the place +following the first page number or running head.</li> +<li><code>odd_head_format=<format></code>, +<code>odd_foot_format=<format></code>, +<code>even_head_format=<format></code>, +<code>even_foot_format=<format>P: Specifies the format for the header and footer. </code>#1<code>will be replaced with the entire header or footer. However,</code>#1<code>may contain code for position adjustment, so it may not work as expected, especially when</code>tate<code>is specified in</code>\NewPageStyle<code>. For example, to draw a rule under the header on odd pages, you can do </code>odd_head_format={\underline{\makebox[\jlreqyokoheadlength]{#1}}}<code>. </code>\jlreqyokoheadlength<code>is a macro defined in this class file and gives the horizontal length of the header. (The footer length is the same.) The vertical length, i.e., the length when</code>tate<code>is specified in</code>\NewPageStyle<code>, can be obtained with </code>\jlreqtateheadlength`.</li> +</ul> +<p><code>\RenewPageStyle</code>, <code>\ProvidePageStyle</code>, +<code>\DeclarePageStyle</code> are also available1.</p> +<p>You can modify an existing page style with +<code>\ModifyPageStyle</code>.</p> <h2 id="jfm">JFM</h2> -<p>We use the following custom JFMs. Some packages may reset the settings to use their own JFMs or the standard JFMs. In that case, you need to set the appropriate package options to use the JFMs of this class file.</p> +<p>We use the following custom JFMs. Some packages may reset the +settings to use their own JFMs or the standard JFMs. In that case, you +need to set the appropriate package options to use the JFMs of this +class file.</p> <h3 id="for-platexuplatex">For pLaTeX/upLaTeX</h3> -<p>The names of the JFMs are as follows. The characters enclosed in <code>[]</code> may or may not be included depending on the settings.</p> +<p>The names of the JFMs are as follows. The characters enclosed in +<code>[]</code> may or may not be included depending on the +settings.</p> <pre><code>[u][b][z]jlreq[g][-v]</code></pre> <p>Each character is included in the following cases.</p> <ul> <li><code>u</code>: When using upLaTeX</li> -<li><code>b</code>: When using hanging punctuation. (When the class option hanging_punctuation is specified.)</li> -<li><code>z</code>: When the space before the opening brackets at the beginning of a line is two-bun for the beginning of a paragraph and one-bun for the line break. (When the class option <code>open_bracket_pos=zenkakunibu_nibu</code> is specified.)</li> +<li><code>b</code>: When using hanging punctuation. (When the class +option hanging_punctuation is specified.)</li> +<li><code>z</code>: When the space before the opening brackets at the +beginning of a line is two-bun for the beginning of a paragraph and +one-bun for the line break. (When the class option +<code>open_bracket_pos=zenkakunibu_nibu</code> is specified.)</li> <li><code>g</code>: For gothic fonts.</li> <li><code>-v</code>: For vertical writing.</li> </ul> -<p>For example, if you process a source without using hanging punctuation and specifying <code>open_bracket_pos=zenkakunibu_nibu</code> as a class option with pLaTeX, the JFM named zjlreq will be used for horizontal writing mincho font.</p> +<p>For example, if you process a source without using hanging +punctuation and specifying +<code>open_bracket_pos=zenkakunibu_nibu</code> as a class option with +pLaTeX, the JFM named zjlreq will be used for horizontal writing mincho +font.</p> <p>For LuaLaTeX</p> <ul> <li>The JFM for horizontal writing is jlreq</li> <li>The JFM for vertical writing is jlreqv</li> </ul> -<p>The same JFM is used for gothic fonts. This class file changes the JFM of LuaTeX-ja standard to these.</p> +<p>The same JFM is used for gothic fonts. This class file changes the +JFM of LuaTeX-ja standard to these.</p> <h2 id="others-2">Others</h2> -<p>If the class option <code>jlreq_notes</code> is passed, a notification will be given when a setting that contradicts the description of Japanese typesetting processing is made.</p> +<p>If the class option <code>jlreq_notes</code> is passed, a +notification will be given when a setting that contradicts the +description of Japanese typesetting processing is made.</p> <h2 id="jlreq-complements">jlreq-complements</h2> -<p><code>jlreq-complements</code> is a package that customizes the environments that are typically provided by LaTeX document classes. You can use it as follows. It accepts the following options:</p> -<ul> -<li><code>platex</code>, <code>uplatex</code>, <code>lulalatex</code>: Specify the engine.</li> -<li><code>setupname=<name></code>: Specify the name of the command for customization. The default is <code>jlreqcomplementssetup</code>, and you can set it by writing <code>\jlreqcomplementssetup{<settings>}</code> in the preamble.</li> +<p><code>jlreq-complements</code> is a package that customizes the +environments that are typically provided by LaTeX document classes. You +can use it as follows. It accepts the following options:</p> +<ul> +<li><code>platex</code>, <code>uplatex</code>, <code>lulalatex</code>: +Specify the engine.</li> +<li><code>setupname=<name></code>: Specify the name of the command +for customization. The default is <code>jlreqcomplementssetup</code>, +and you can set it by writing +<code>\jlreqcomplementssetup{<settings>}</code> in the +preamble.</li> </ul> -<p>In <code>jlreq</code>, it is loaded as <code>\usepackage[<engine recognized in jlreq>,setupname=jlreqsetup]{jlreq-complements}</code>, so you can customize the environments with the usual <code>\jlreqsetup</code>. To make this work well with an existing name, the original command and the new one need to be compatible. It is usually better to avoid this.</p> -<h3 id="thebibliography-environment"><code>thebibliography</code> environment</h3> -<ul> -<li><code>thebibliography_heading=<code></code>: Specify the command to output the heading of the <code>thebibliography</code> environment. Use it like <code>thebibliography_heading={\section*{\refname}}</code>.</li> -<li><code>thebibliography_after_label_space=<dimension></code>: Specify the space after the label of each item in the <code>thebibliography</code> environment.</li> -<li><code>thebibliography_indent=<dimension></code>: Specify the indentation of the entire <code>thebibliography</code> environment.</li> -<li><code>thebibliography_mark=<code></code>: Specify the code to register the heading of the <code>thebibliography</code> environment in the column.</li> -<li><code>thebibliography_precode=<code></code>, <code>thebibliography_postcode=<code></code>: Specify the code that is executed before and after the <code>thebibliography</code> environment, respectively.</li> +<p>In <code>jlreq</code>, it is loaded as +<code>\usepackage[<engine recognized in jlreq>,setupname=jlreqsetup]{jlreq-complements}</code>, +so you can customize the environments with the usual +<code>\jlreqsetup</code>. To make this work well with an existing name, +the original command and the new one need to be compatible. It is +usually better to avoid this.</p> +<h3 id="thebibliography-environment"><code>thebibliography</code> +environment</h3> +<ul> +<li><code>thebibliography_heading=<code></code>: Specify the +command to output the heading of the <code>thebibliography</code> +environment. Use it like +<code>thebibliography_heading={\section*{\refname}}</code>.</li> +<li><code>thebibliography_after_label_space=<dimension></code>: +Specify the space after the label of each item in the +<code>thebibliography</code> environment.</li> +<li><code>thebibliography_indent=<dimension></code>: Specify the +indentation of the entire <code>thebibliography</code> environment.</li> +<li><code>thebibliography_mark=<code></code>: Specify the code to +register the heading of the <code>thebibliography</code> environment in +the column.</li> +<li><code>thebibliography_precode=<code></code>, +<code>thebibliography_postcode=<code></code>: Specify the code +that is executed before and after the <code>thebibliography</code> +environment, respectively.</li> </ul> <h3 id="theindex-environment"><code>theindex</code> environment</h3> <ul> -<li><code>theindex_heading=<code></code>: Specify the command to output the heading of the <code>theindex</code> environment.</li> -<li><code>theindex_mark=<code></code>: Specify the code to register the heading of the <code>theindex</code> environment in the column.</li> -<li><code>theindex_twocolumn=[true/false]</code>: Specify whether to output the <code>theindex</code> environment in two columns.</li> -<li><code>theindex_column_gap=<dimension></code>: Specify the column gap in the <code>theindex</code> environment when <code>theindex_twocolumn=true</code>.</li> -<li><code>theindex_column_rule_width=<dimension></code>: Specify the value of <code>\columnseprule</code> in the <code>theindex</code> environment when <code>theindex_twocolumn=true</code>.</li> -<li><code>theindex_pagestyle=<page style name></code>: Specify the page style for the <code>theindex</code> environment.</li> -<li><code>theindex_postcode=<code></code>, <code>theindex_precode=<code></code>: Specify the code that is executed before and after the <code>theindex</code> environment, respectively.</li> +<li><code>theindex_heading=<code></code>: Specify the command to +output the heading of the <code>theindex</code> environment.</li> +<li><code>theindex_mark=<code></code>: Specify the code to +register the heading of the <code>theindex</code> environment in the +column.</li> +<li><code>theindex_twocolumn=[true/false]</code>: Specify whether to +output the <code>theindex</code> environment in two columns.</li> +<li><code>theindex_column_gap=<dimension></code>: Specify the +column gap in the <code>theindex</code> environment when +<code>theindex_twocolumn=true</code>.</li> +<li><code>theindex_column_rule_width=<dimension></code>: Specify +the value of <code>\columnseprule</code> in the <code>theindex</code> +environment when <code>theindex_twocolumn=true</code>.</li> +<li><code>theindex_pagestyle=<page style name></code>: Specify the +page style for the <code>theindex</code> environment.</li> +<li><code>theindex_postcode=<code></code>, +<code>theindex_precode=<code></code>: Specify the code that is +executed before and after the <code>theindex</code> environment, +respectively.</li> </ul> <h3 id="theorem-environment">Theorem environment</h3> <ul> -<li><code> theorem_beforeafter_space=<dimension></code>: Specify the space before and after the theorem environment.</li> -<li><code>theorem_label_font=<font setting code></code>: Specify the font for the label part of the theorem environment.</li> -<li><code>theorem_font=<font setting code></code>: Specify the font for the body of the theorem environment.</li> -<li><code>theorem_indent=<dimension></code>: Specify the indentation of the body of the theorem environment.</li> -<li><code>proof_label_font=<font setting code></code>: This setting is only valid when the <code>amsthm</code> package is loaded. Specify the font for the label of the <code>proof</code> environment.</li> +<li><code> theorem_beforeafter_space=<dimension></code>: Specify +the space before and after the theorem environment.</li> +<li><code>theorem_label_font=<font setting code></code>: Specify +the font for the label part of the theorem environment.</li> +<li><code>theorem_font=<font setting code></code>: Specify the +font for the body of the theorem environment.</li> +<li><code>theorem_indent=<dimension></code>: Specify the +indentation of the body of the theorem environment.</li> +<li><code>proof_label_font=<font setting code></code>: This +setting is only valid when the <code>amsthm</code> package is loaded. +Specify the font for the label of the <code>proof</code> +environment.</li> </ul> -<p>When the <code>amsthm</code> package is loaded, a new theorem style <code>jlreq</code> is defined and the current style is changed to <code>jlreq</code>. In this case, the above settings function as settings for this <code>jlreq</code> style.</p> +<p>When the <code>amsthm</code> package is loaded, a new theorem style +<code>jlreq</code> is defined and the current style is changed to +<code>jlreq</code>. In this case, the above settings function as +settings for this <code>jlreq</code> style.</p> <h2 id="license">LICENSE</h2> -<p>This package is distributed under the BSD 2-Clause License. See <a href="LICENSE">LICENSE</a>.</p> +<p>This package is distributed under the BSD 2-Clause License. See <a +href="LICENSE">LICENSE</a>.</p> <h2 id="changelog">CHANGELOG</h2> <ul> <li>2017-02-08 @@ -447,48 +977,59 @@ <ul> <li>Fixed bugs.</li> <li>Implement <code>abstract</code> environment.</li> -<li>Changed/Added some keys to class option/<code>\jlreqsetup</code></li> -<li>Stopped to load <code>pxrubirica</code>, <code>luatexja-ruby</code> and <code>nidanfloat</code>.</li> +<li>Changed/Added some keys to class +option/<code>\jlreqsetup</code></li> +<li>Stopped to load <code>pxrubirica</code>, <code>luatexja-ruby</code> +and <code>nidanfloat</code>.</li> </ul></li> <li>2017-03-14 <ul> <li>Fixed bugs.</li> -<li><code>\sffamily</code> etc. also change the Japanese font family.</li> +<li><code>\sffamily</code> etc. also change the Japanese font +family.</li> <li>Added many options to <code>\DeclareBlockHeading</code>.</li> <li>Some options related to <code>quote</code> environment etc.</li> </ul></li> <li>2017-03-20 <ul> <li>Fixed bugs.</li> -<li>Insert some spaces around <code>\footnote / \sidenote / \endnote</code>.</li> +<li>Insert some spaces around +<code>\footnote / \sidenote / \endnote</code>.</li> </ul></li> <li>2017-04-04 <ul> <li>Fixed a bug.</li> -<li>Added options <code>tate</code> and <code>font</code> to <code>\DeclarePageStyle</code>.</li> +<li>Added options <code>tate</code> and <code>font</code> to +<code>\DeclarePageStyle</code>.</li> </ul></li> <li>2017-04-29 <ul> <li>Fixed bugs.</li> -<li>Added <code>jafontsize</code> and <code>jafontscale</code> options and <code>\jafontsize</code>.</li> +<li>Added <code>jafontsize</code> and <code>jafontscale</code> options +and <code>\jafontsize</code>.</li> <li>Added <code>\tatechuyoko</code>.</li> -<li><code>jlreq_warnings</code> -> <code>jlreq_notes</code> (class option).</li> +<li><code>jlreq_warnings</code> -> <code>jlreq_notes</code> (class +option).</li> <li>Moved some class options to <code>\jlreqsetup</code>.</li> <li>Added some options to <code>\jlreqsetup</code>.</li> -<li><code>paper={<height>,<width>}</code> -> <code>paper={<width>,<height>}</code>.</li> +<li><code>paper={<height>,<width>}</code> -> +<code>paper={<width>,<height>}</code>.</li> </ul></li> <li>2017-06-11 <ul> <li>Stopped to load <code>plext</code> and <code>lltjext</code>.</li> -<li>Added <code>align</code> to <code>\DeclareBlockHeading</code> and delete <code>indent=center</code>, <code>end_indent=center</code>.</li> +<li>Added <code>align</code> to <code>\DeclareBlockHeading</code> and +delete <code>indent=center</code>, <code>end_indent=center</code>.</li> <li>Changed <code>\kcatcode</code> for some characters (upLaTeX).</li> </ul></li> <li>2017-08-13 <ul> -<li>Added <code>column_spanning</code> to <code>\DeclareBlockHeading</code>.</li> +<li>Added <code>column_spanning</code> to +<code>\DeclareBlockHeading</code>.</li> <li>Sidenotes are a part of the main text now.</li> <li>Changed the default length of sidenotes to 0.</li> -<li>jlreq does not define <code>\sidenote</code> if the length for sidenotes is zero.</li> +<li>jlreq does not define <code>\sidenote</code> if the length for +sidenotes is zero.</li> <li>Added a command for the full-width ideographic space.</li> </ul></li> <li>2017-08-29 @@ -499,7 +1040,8 @@ <ul> <li>Fixed bugs.</li> <li>Added <code>\SetBlockHeadingSpaces</code>.</li> -<li>Removed a space from <code>\contentsname</code> and <code>\indexname</code>.</li> +<li>Removed a space from <code>\contentsname</code> and +<code>\indexname</code>.</li> </ul></li> <li>2017-12-02 <ul> @@ -508,8 +1050,10 @@ <li>2017-12-22 <ul> <li>Improved JFM.</li> -<li>Change the way to detect <code>\label</code> between block headings.</li> -<li>Added chapter number to <code>\theequation</code>,<code>\thefigure</code>,<code>\thetable</code>.</li> +<li>Change the way to detect <code>\label</code> between block +headings.</li> +<li>Added chapter number to +<code>\theequation</code>,<code>\thefigure</code>,<code>\thetable</code>.</li> </ul></li> <li>2018-02-01 <ul> @@ -521,11 +1065,15 @@ </ul></li> <li>2018-04-11 <ul> -<li>Sidenotes (<code>\footnote</code>) appears in the second column in <code>tate</code> mode.</li> -<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>Sidenotes (<code>\footnote</code>) appears in the second column in +<code>tate</code> mode.</li> +<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> +<li>Added <code>mark_format</code> to +<code>\DeclarePageStyle</code>.</li> </ul></li> <li>2018-05-19 <ul> @@ -540,9 +1088,11 @@ </ul></li> <li>2018-08-08 <ul> -<li>Added <code>nombre_ii</code> etc. to <code>\DeclarePageStyle</code>.</li> +<li>Added <code>nombre_ii</code> etc. to +<code>\DeclarePageStyle</code>.</li> <li>Fixed bugs.</li> -<li>Added <code>footnote_second_indent</code> and <code>endnote_second_indent</code> to <code>\jlreqsetup</code>.</li> +<li>Added <code>footnote_second_indent</code> and +<code>endnote_second_indent</code> to <code>\jlreqsetup</code>.</li> </ul></li> <li>2018-08-15 <ul> @@ -555,16 +1105,23 @@ </ul></li> <li>2018-12-10 <ul> -<li>Added <code>number=[true/false]</code> to <code>\New***Heading</code>.</li> -<li>Added options for <code>\frontmatter</code> etc in <code>\jlreqsetup</code>.</li> -<li>Made <code>\jlreqHeadingLabel</code> etc available in <code>format</code> in <code>\NewTobiraHeading</code> and <code>\NewBlockHeading</code>.</li> +<li>Added <code>number=[true/false]</code> to +<code>\New***Heading</code>.</li> +<li>Added options for <code>\frontmatter</code> etc in +<code>\jlreqsetup</code>.</li> +<li>Made <code>\jlreqHeadingLabel</code> etc available in +<code>format</code> in <code>\NewTobiraHeading</code> and +<code>\NewBlockHeading</code>.</li> <li>Fixed bugs.</li> </ul></li> <li>2019-01-15 <ul> -<li>Added <code>nombre_font</code> etc to <code>\NewPageStyle</code>. <code>font</code> is deprecated.</li> -<li><code>format</code> without <code>#1</code> is allowed in <code>\NewBlockHeading</code>.</li> -<li>Extended <code>caption_label_format</code> etc. in <code>\jlreqsetup</code>.</li> +<li>Added <code>nombre_font</code> etc to <code>\NewPageStyle</code>. +<code>font</code> is deprecated.</li> +<li><code>format</code> without <code>#1</code> is allowed in +<code>\NewBlockHeading</code>.</li> +<li>Extended <code>caption_label_format</code> etc. in +<code>\jlreqsetup</code>.</li> <li>Fixed bugs.</li> </ul></li> <li>2019-04-01 @@ -576,26 +1133,32 @@ </ul></li> <li>2019-05-07 <ul> -<li>Added a small length to <code>\textwidth</code> and <code>\textheight</code>.</li> -<li>Changed the implementation of <code>running_head_ii</code> etc. in <code>\DeclarePageStyle</code>.</li> +<li>Added a small length to <code>\textwidth</code> and +<code>\textheight</code>.</li> +<li>Changed the implementation of <code>running_head_ii</code> etc. in +<code>\DeclarePageStyle</code>.</li> <li>Fixed bugs.</li> </ul></li> <li>2019-09-24 <ul> -<li>Deleted the (re-)definitions of <code>\@cite</code> and <code>\@biblabel</code>.</li> +<li>Deleted the (re-)definitions of <code>\@cite</code> and +<code>\@biblabel</code>.</li> <li>Added <code>\allowbreak</code> before block headings.</li> <li>Fixed bugs.</li> </ul></li> <li>2020-02-07 <ul> -<li>Changed the default value of <code>itemization_label_length</code> to <code>\leftmargini</code> etc.</li> -<li>Removed the redefinitions <code>\rmfamily</code> etc and added a code to <code>\@rmfamilyhook</code>.</li> +<li>Changed the default value of <code>itemization_label_length</code> +to <code>\leftmargini</code> etc.</li> +<li>Removed the redefinitions <code>\rmfamily</code> etc and added a +code to <code>\@rmfamilyhook</code>.</li> <li>Changed <code>\parskip</code> to <code>0pt</code>.</li> <li>Fixed bugs.</li> </ul></li> <li>2020-05-01 <ul> -<li>Added <code>theorem_label_font</code> and <code>theorem_font</code> to <code>\jlreqsetup</code>.</li> +<li>Added <code>theorem_label_font</code> and <code>theorem_font</code> +to <code>\jlreqsetup</code>.</li> <li>Fixed bugs.</li> </ul></li> <li>2020-09-27 @@ -611,28 +1174,33 @@ </ul></li> <li>2021-03-17 <ul> -<li>Use the pagestyle <code>plain</code> at <code>\maketitle</code> if the current one is not <code>empty</code></li> +<li>Use the pagestyle <code>plain</code> at <code>\maketitle</code> if +the current one is not <code>empty</code></li> <li>Removed JFM glue after <code>\item</code>.</li> <li>Removed JFM glue after block headings.</li> <li>Fixed bugs.</li> </ul></li> <li>2021-05-28 <ul> -<li>Extended <code>caption_align</code> in <code>\jlreqsetup</code>.</li> +<li>Extended <code>caption_align</code> in +<code>\jlreqsetup</code>.</li> <li>Removed some <code>\ifthenelse</code>.</li> </ul></li> <li>2021-07-22 <ul> <li>Stopped to use <code>\IfHookExistsTF</code>.</li> <li>Added <code>\akigumi</code>.</li> -<li>Stopped to load packages <code>xkeyval</code> and <code>ifthen</code>.</li> +<li>Stopped to load packages <code>xkeyval</code> and +<code>ifthen</code>.</li> <li>It has more compatibility with expl3.</li> -<li>Added <code>pagestyle</code> to <code>\DeclareBlockHeading</code>.</li> +<li>Added <code>pagestyle</code> to +<code>\DeclareBlockHeading</code>.</li> <li>Fixed bugs.</li> </ul></li> <li>2021-07-25 <ul> -<li>Load <code>ifthen</code> again. (Only for Re:VIEW, will be removed in future.)</li> +<li>Load <code>ifthen</code> again. (Only for Re:VIEW, will be removed +in future.)</li> <li>Fixed bugs.</li> </ul></li> <li>2021-08-12 @@ -647,19 +1215,23 @@ <li>2021-11-05 <ul> <li><code>paper=b*</code> is regarded as a ISO series.</li> -<li>Removed many codes relating with LaTeX hooks mechanism (because it seems not stable.)</li> +<li>Removed many codes relating with LaTeX hooks mechanism (because it +seems not stable.)</li> <li>Removed <code>\RequirePackage{ifthen}</code>.</li> <li>Removed <code>\kcatcode</code>settings with upLaTeX.</li> </ul></li> <li>2022-04-05 <ul> -<li>Added <code>warichu_opening</code> and <code>warichu_closing</code> to <code>\jlreqsetup</code>.</li> +<li>Added <code>warichu_opening</code> and <code>warichu_closing</code> +to <code>\jlreqsetup</code>.</li> <li>Change a little bit penalties around block heading.</li> -<li>Fixed a bug: <code>\selectfont</code> after <code>\DeclareFontShape</code> raised an error.</li> +<li>Fixed a bug: <code>\selectfont</code> after +<code>\DeclareFontShape</code> raised an error.</li> <li>Fixed a bug: <code>use_reverse_pagination</code> did not work.</li> <li>Fixed a bug: A second running head disappeared sometimes.</li> <li>Rewrote <code>\DeclarePageStyle</code>.</li> -<li>Deleted <code>\@makefntext</code>, define <code>\@makefntext</code> directly.</li> +<li>Deleted <code>\@makefntext</code>, define <code>\@makefntext</code> +directly.</li> <li>Fixed other bugs.</li> </ul></li> <li>2022-04-11 @@ -672,7 +1244,8 @@ </ul></li> <li>2022-11-28 <ul> -<li>Fixed a bug: did not register to running head when <code>\SetBlockHeadingSpaces</code> is used.</li> +<li>Fixed a bug: did not register to running head when +<code>\SetBlockHeadingSpaces</code> is used.</li> <li>Fixed a bug: wrong papersize for ISO C4.</li> <li>Added a package <code>jlreq-complements</code></li> <li>Fixed some other bugs and adjust with some other packages.</li> @@ -683,14 +1256,17 @@ </ul></li> <li>2023-06-19 <ul> -<li>Stopped to load `everyhook' package LuaLaTeX (it was not compatible with the document).</li> -<li>Fixed a bug: a space before `enumerate' environment was not inserted sometimes.</li> +<li>Stopped to load `everyhook' package LuaLaTeX (it was not compatible +with the document).</li> +<li>Fixed a bug: a space before `enumerate' environment was not inserted +sometimes.</li> <li>Fixed a bug on <code>use_reverse_pagination</code>.</li> </ul></li> <li>2024-02-13 <ul> <li>Added some <code>\par</code> (for hook system in LaTeX kernel)</li> -<li>Added <code>tableofcontents_twocolumn</code> and <code>abstract_with_maketitle</code> to <code>\jlreqsetup</code>.</li> +<li>Added <code>tableofcontents_twocolumn</code> and +<code>abstract_with_maketitle</code> to <code>\jlreqsetup</code>.</li> <li>Deleted <code>\PushPostHook</code>.</li> <li>Some modifications of jfm.</li> <li>Fixed a bug: heading command may have an infinite loop.</li> @@ -702,9 +1278,22 @@ <ul> <li>Fixed a bug.</li> </ul></li> +<li>2024-08-23 +<ul> +<li>Fixed bugs.</li> +<li>Changed the name of some internal variables.</li> +<li>Added the usage of this class to English document.</li> +<li>Use <code>\DeclareKeys</code> etc.</li> +<li>Changed the internal processing of block headings a little.</li> +</ul></li> +<li>2024-09-26 +<ul> +<li>Removed pattern matchings from Makefile.</li> +</ul></li> </ul> <hr /> -<p>Noriyuki Abe <a href="https://github.com/abenori/jlreq">https://github.com/abenori/jlreq</a></p> +<p>Noriyuki Abe <a +href="https://github.com/abenori/jlreq">https://github.com/abenori/jlreq</a></p> </article> </body> </html> diff --git a/Master/texmf-dist/doc/latex/jlreq/jlreq.pdf b/Master/texmf-dist/doc/latex/jlreq/jlreq.pdf Binary files differindex fe98bc8adc5..175765edf14 100644 --- a/Master/texmf-dist/doc/latex/jlreq/jlreq.pdf +++ b/Master/texmf-dist/doc/latex/jlreq/jlreq.pdf diff --git a/Master/texmf-dist/fonts/tfm/public/jlreq/ubjlreq-q.tfm b/Master/texmf-dist/fonts/tfm/public/jlreq/ubjlreq-q.tfm Binary files differindex b427dfbece4..8dbf787b3ec 100644 --- a/Master/texmf-dist/fonts/tfm/public/jlreq/ubjlreq-q.tfm +++ b/Master/texmf-dist/fonts/tfm/public/jlreq/ubjlreq-q.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/jlreq/ubjlreqg-q.tfm b/Master/texmf-dist/fonts/tfm/public/jlreq/ubjlreqg-q.tfm Binary files differindex b427dfbece4..8dbf787b3ec 100644 --- a/Master/texmf-dist/fonts/tfm/public/jlreq/ubjlreqg-q.tfm +++ b/Master/texmf-dist/fonts/tfm/public/jlreq/ubjlreqg-q.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/jlreq/ubzjlreq-q.tfm b/Master/texmf-dist/fonts/tfm/public/jlreq/ubzjlreq-q.tfm Binary files differindex 63d47906f77..8dbf787b3ec 100644 --- a/Master/texmf-dist/fonts/tfm/public/jlreq/ubzjlreq-q.tfm +++ b/Master/texmf-dist/fonts/tfm/public/jlreq/ubzjlreq-q.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/jlreq/ubzjlreqg-q.tfm b/Master/texmf-dist/fonts/tfm/public/jlreq/ubzjlreqg-q.tfm Binary files differindex 63d47906f77..8dbf787b3ec 100644 --- a/Master/texmf-dist/fonts/tfm/public/jlreq/ubzjlreqg-q.tfm +++ b/Master/texmf-dist/fonts/tfm/public/jlreq/ubzjlreqg-q.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreq-q.tfm b/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreq-q.tfm Binary files differindex 14f35e9d31a..8dbf787b3ec 100644 --- a/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreq-q.tfm +++ b/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreq-q.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreqg-q.tfm b/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreqg-q.tfm Binary files differindex 14f35e9d31a..8dbf787b3ec 100644 --- a/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreqg-q.tfm +++ b/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreqg-q.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/jlreq/uzjlreq-q.tfm b/Master/texmf-dist/fonts/tfm/public/jlreq/uzjlreq-q.tfm Binary files differindex f89c65ac623..8dbf787b3ec 100644 --- a/Master/texmf-dist/fonts/tfm/public/jlreq/uzjlreq-q.tfm +++ b/Master/texmf-dist/fonts/tfm/public/jlreq/uzjlreq-q.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/jlreq/uzjlreqg-q.tfm b/Master/texmf-dist/fonts/tfm/public/jlreq/uzjlreqg-q.tfm Binary files differindex f89c65ac623..8dbf787b3ec 100644 --- a/Master/texmf-dist/fonts/tfm/public/jlreq/uzjlreqg-q.tfm +++ b/Master/texmf-dist/fonts/tfm/public/jlreq/uzjlreqg-q.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/jlreq/jlreq-jidori.tfm b/Master/texmf-dist/fonts/vf/public/jlreq/jlreq-jidori.tfm Binary files differindex c714f9f84b2..c714f9f84b2 100644 --- a/Master/texmf-dist/fonts/tfm/public/jlreq/jlreq-jidori.tfm +++ b/Master/texmf-dist/fonts/vf/public/jlreq/jlreq-jidori.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/jlreq/jlreq-v-jidori.tfm b/Master/texmf-dist/fonts/vf/public/jlreq/jlreq-v-jidori.tfm Binary files differindex b2d4a22a206..b2d4a22a206 100644 --- a/Master/texmf-dist/fonts/tfm/public/jlreq/jlreq-v-jidori.tfm +++ b/Master/texmf-dist/fonts/vf/public/jlreq/jlreq-v-jidori.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/jlreq/jlreqg-jidori.tfm b/Master/texmf-dist/fonts/vf/public/jlreq/jlreqg-jidori.tfm Binary files differindex c714f9f84b2..c714f9f84b2 100644 --- a/Master/texmf-dist/fonts/tfm/public/jlreq/jlreqg-jidori.tfm +++ b/Master/texmf-dist/fonts/vf/public/jlreq/jlreqg-jidori.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/jlreq/jlreqg-v-jidori.tfm b/Master/texmf-dist/fonts/vf/public/jlreq/jlreqg-v-jidori.tfm Binary files differindex b2d4a22a206..b2d4a22a206 100644 --- a/Master/texmf-dist/fonts/tfm/public/jlreq/jlreqg-v-jidori.tfm +++ b/Master/texmf-dist/fonts/vf/public/jlreq/jlreqg-v-jidori.tfm diff --git a/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreq-q.vf b/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreq-q.vf Binary files differindex e362c486035..e432a42272c 100644 --- a/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreq-q.vf +++ b/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreq-q.vf diff --git a/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreq.vf b/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreq.vf Binary files differindex 357893d10d3..a2abe01087f 100644 --- a/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreq.vf +++ b/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreq.vf diff --git a/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreqg-q.vf b/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreqg-q.vf Binary files differindex 6dfb6ac550d..406061f76f2 100644 --- a/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreqg-q.vf +++ b/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreqg-q.vf diff --git a/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreqg.vf b/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreqg.vf Binary files differindex 3c5154e3111..6c6c487cefa 100644 --- a/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreqg.vf +++ b/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreqg.vf diff --git a/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreq-q.vf b/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreq-q.vf Binary files differindex 0ca3dabf455..e432a42272c 100644 --- a/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreq-q.vf +++ b/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreq-q.vf diff --git a/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreq.vf b/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreq.vf Binary files differindex 357893d10d3..4f036646b15 100644 --- a/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreq.vf +++ b/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreq.vf diff --git a/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreqg-q.vf b/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreqg-q.vf Binary files differindex 4471173b5bc..406061f76f2 100644 --- a/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreqg-q.vf +++ b/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreqg-q.vf diff --git a/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreqg.vf b/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreqg.vf Binary files differindex 3c5154e3111..d180e33b37e 100644 --- a/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreqg.vf +++ b/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreqg.vf diff --git a/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreq-jidori-q.tfm b/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq-jidori-q.tfm Binary files differindex 8dbf787b3ec..8dbf787b3ec 100644 --- a/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreq-jidori-q.tfm +++ b/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq-jidori-q.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreq-jidori.tfm b/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq-jidori.tfm Binary files differindex 306f090689e..306f090689e 100644 --- a/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreq-jidori.tfm +++ b/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq-jidori.tfm diff --git a/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq-q.vf b/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq-q.vf Binary files differindex e362c486035..e432a42272c 100644 --- a/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq-q.vf +++ b/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq-q.vf diff --git a/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreq-v-jidori.tfm b/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq-v-jidori.tfm Binary files differindex ce210dad264..ce210dad264 100644 --- a/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreq-v-jidori.tfm +++ b/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq-v-jidori.tfm diff --git a/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq.vf b/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq.vf Binary files differindex 357893d10d3..acf859a2133 100644 --- a/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq.vf +++ b/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq.vf diff --git a/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreqg-jidori-q.tfm b/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg-jidori-q.tfm Binary files differindex 8dbf787b3ec..8dbf787b3ec 100644 --- a/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreqg-jidori-q.tfm +++ b/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg-jidori-q.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreqg-jidori.tfm b/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg-jidori.tfm Binary files differindex 306f090689e..306f090689e 100644 --- a/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreqg-jidori.tfm +++ b/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg-jidori.tfm diff --git a/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg-q.vf b/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg-q.vf Binary files differindex 6dfb6ac550d..406061f76f2 100644 --- a/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg-q.vf +++ b/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg-q.vf diff --git a/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreqg-v-jidori.tfm b/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg-v-jidori.tfm Binary files differindex ce210dad264..ce210dad264 100644 --- a/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreqg-v-jidori.tfm +++ b/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg-v-jidori.tfm diff --git a/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg.vf b/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg.vf Binary files differindex 3c5154e3111..86985b99f40 100644 --- a/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg.vf +++ b/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg.vf diff --git a/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreq-q.vf b/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreq-q.vf Binary files differindex 0ca3dabf455..e432a42272c 100644 --- a/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreq-q.vf +++ b/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreq-q.vf diff --git a/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreq.vf b/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreq.vf Binary files differindex 357893d10d3..88e94fb2b75 100644 --- a/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreq.vf +++ b/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreq.vf diff --git a/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreqg-q.vf b/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreqg-q.vf Binary files differindex 4471173b5bc..406061f76f2 100644 --- a/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreqg-q.vf +++ b/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreqg-q.vf diff --git a/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreqg.vf b/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreqg.vf Binary files differindex 3c5154e3111..4765af4e798 100644 --- a/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreqg.vf +++ b/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreqg.vf diff --git a/Master/texmf-dist/source/latex/jlreq/Makefile b/Master/texmf-dist/source/latex/jlreq/Makefile index ed84b713364..9a615ebc0a8 100644 --- a/Master/texmf-dist/source/latex/jlreq/Makefile +++ b/Master/texmf-dist/source/latex/jlreq/Makefile @@ -1,51 +1,53 @@ TEXMF:=$(shell kpsewhich -var-value=TEXMFHOME) MAKEJVFCNF:=$(shell ls -R $(shell kpsewhich --var-value=TEXMFDIST)/fonts/source | awk '/:$$/{sub(/:$$/,"");f=$$0} tolower($$0) ~ /makejvf-upjpn\.cnf$$/{print f"/"$$0}' | head -n 1) -.PHONY: all jfm doc latexdoc pdfdoc htmldoc jfm-install cls-install sty-install install tds uninstall jfmclean docclean clean - -all: jfm - -jfm: \ - 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 \ +VFS = jlreq.vf bjlreq.vf zjlreq.vf bzjlreq.vf \ ujlreq.vf ubjlreq.vf uzjlreq.vf ubzjlreq.vf \ - ujlreq-q.tfm ubjlreq-q.tfm uzjlreq-q.tfm ubzjlreq-q.tfm \ ujlreq-q.vf ubjlreq-q.vf uzjlreq-q.vf ubzjlreq-q.vf \ - jlreqg.tfm bjlreqg.tfm zjlreqg.tfm bzjlreqg.tfm \ jlreqg.vf bjlreqg.vf zjlreqg.vf bzjlreqg.vf \ - ujlreqg.tfm ubjlreqg.tfm uzjlreqg.tfm ubzjlreqg.tfm \ ujlreqg.vf ubjlreqg.vf uzjlreqg.vf ubzjlreqg.vf \ - ujlreqg-q.tfm ubjlreqg-q.tfm uzjlreqg-q.tfm ubzjlreqg-q.tfm \ ujlreqg-q.vf ubjlreqg-q.vf uzjlreqg-q.vf ubzjlreqg-q.vf \ - jlreq-v.tfm bjlreq-v.tfm zjlreq-v.tfm bzjlreq-v.tfm \ jlreq-v.vf bjlreq-v.vf zjlreq-v.vf bzjlreq-v.vf \ - ujlreq-v.tfm ubjlreq-v.tfm uzjlreq-v.tfm ubzjlreq-v.tfm \ ujlreq-v.vf ubjlreq-v.vf uzjlreq-v.vf ubzjlreq-v.vf \ - jlreqg-v.tfm bjlreqg-v.tfm zjlreqg-v.tfm bzjlreqg-v.tfm \ 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 + +TFMS = jlreq.tfm bjlreq.tfm zjlreq.tfm bzjlreq.tfm \ + ujlreq.tfm ubjlreq.tfm uzjlreq.tfm ubzjlreq.tfm \ + ujlreq-q.tfm ubjlreq-q.tfm uzjlreq-q.tfm ubzjlreq-q.tfm \ + jlreqg.tfm bjlreqg.tfm zjlreqg.tfm bzjlreqg.tfm \ + ujlreqg.tfm ubjlreqg.tfm uzjlreqg.tfm ubzjlreqg.tfm \ + ujlreqg-q.tfm ubjlreqg-q.tfm uzjlreqg-q.tfm ubzjlreqg-q.tfm \ + jlreq-v.tfm bjlreq-v.tfm zjlreq-v.tfm bzjlreq-v.tfm \ + ujlreq-v.tfm ubjlreq-v.tfm uzjlreq-v.tfm ubzjlreq-v.tfm \ + jlreqg-v.tfm bjlreqg-v.tfm zjlreqg-v.tfm bzjlreqg-v.tfm \ + ujlreqg-v.tfm ubjlreqg-v.tfm uzjlreqg-v.tfm ubzjlreqg-v.tfm + + +.PHONY: all jfm doc latexdoc pdfdoc htmldoc jfm-install cls-install sty-install install tds uninstall jfmclean docclean clean + +all: jfm + +jfm: jfm-jlreqv.lua jfm-jlreqv-jidori.lua $(VFS) $(TFMS) 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 # .pl -u%-v.pl: jfm-%v-pl.lua luajfm2pl.lua +ujlreq-v.pl ubjlreq-v.pl uzjlreq-v.pl ubzjlreq-v.pl: u%-v.pl: jfm-%v-pl.lua luajfm2pl.lua texlua luajfm2pl.lua $*v-pl $@ -%-v.pl: jfm-%v-pl.lua luajfm2pl.lua +jlreq-v.pl bjlreq-v.pl zjlreq-v.pl bzjlreq-v.pl: %-v.pl: jfm-%v-pl.lua luajfm2pl.lua texlua luajfm2pl.lua --noutf $*v-pl $@ -u%.pl: jfm-%-pl.lua luajfm2pl.lua +ujlreq.pl ubjlreq.pl uzjlreq.pl ubzjlreq.pl: u%.pl: jfm-%-pl.lua luajfm2pl.lua texlua luajfm2pl.lua $*-pl $@ -%.pl: jfm-%-pl.lua luajfm2pl.lua +jlreq.pl bjlreq.pl zjlreq.pl bzjlreq.pl: %.pl: jfm-%-pl.lua luajfm2pl.lua texlua luajfm2pl.lua --noutf $*-pl $@ jlreq-jidori.pl: jfm-jlreq-jidori-pl.lua @@ -62,34 +64,34 @@ ujlreq-v-jidori.pl: jfm-jlreqv-jidori-pl.lua # .vf -u%g-q.vf: u%g-q.tfm +ujlreqg-q.vf ubjlreqg-q.vf uzjlreqg-q.vf ubzjlreqg-q.vf: %.vf: %.tfm makejvf -i -u jisq $< upgbm-hq.tfm -u%-q.vf: u%-q.tfm +ujlreq-q.vf ubjlreq-q.vf uzjlreq-q.vf ubzjlreq-q.vf: %.vf: %.tfm makejvf -i -u jisq $< uprml-hq.tfm -u%g-v.vf: u%g-v.tfm +ujlreqg-v.vf ubjlreqg-v.vf uzjlreqg-v.vf ubzjlreqg-v.vf: %.vf: %.tfm makejvf -i -u custom -t ${MAKEJVFCNF} $< upgbm-v.tfm -u%g.vf: u%g.tfm u%g-q.tfm - makejvf -i -u custom -t ${MAKEJVFCNF} -H -U u$*g-q $< upgbm-h.tfm +ujlreqg.vf ubjlreqg.vf uzjlreqg.vf ubzjlreqg.vf: %.vf: %.tfm %-q.tfm + makejvf -i -u custom -t ${MAKEJVFCNF} -H -U $*-q $< upgbm-h.tfm -%g-v.vf: %g-v.tfm +jlreqg-v.vf bjlreqg-v.vf zjlreqg-v.vf bzjlreqg-v.vf: %.vf: %.tfm makejvf -i $< gbmv.tfm -%g.vf: %g.tfm +jlreqg.vf bjlreqg.vf zjlreqg.vf bzjlreqg.vf: %.vf: %.tfm makejvf -i $< gbm.tfm -u%-v.vf: u%-v.tfm +ujlreq-v.vf ubjlreq-v.vf uzjlreq-v.vf ubzjlreq-v.vf: %.vf: %.tfm makejvf -i -u custom -t ${MAKEJVFCNF} $< uprml-v.tfm -%-v.vf: %-v.tfm +jlreq-v.vf bjlreq-v.vf zjlreq-v.vf bzjlreq-v.vf: %.vf: %.tfm makejvf -i $< rmlv.tfm -u%.vf: u%.tfm u%-q.tfm - makejvf -i -u custom -t ${MAKEJVFCNF} -H -U u$*-q $< uprml-h.tfm +ujlreq.vf ubjlreq.vf uzjlreq.vf ubzjlreq.vf: %.vf: %.tfm %-q.tfm + makejvf -i -u custom -t ${MAKEJVFCNF} -H -U $*-q $< uprml-h.tfm -%.vf: %.tfm +jlreq.vf bjlreq.vf zjlreq.vf bzjlreq.vf: %.vf: %.tfm makejvf -i $< rml.tfm jlreq-jidori.vf: jlreq-jidori.tfm @@ -124,28 +126,28 @@ ujlreqg-v-jidori.vf: ujlreqg-v-jidori.tfm # .tfm -u%-q.tfm: u%.pl +ujlreq-q.tfm ubjlreq-q.tfm uzjlreq-q.tfm ubzjlreq-q.tfm: %-q.tfm: %.pl uppltotf -kanji=uptex $< $@ -u%g-q.tfm: u%-q.tfm +ujlreqg-q.tfm ubjlreqg-q.tfm uzjlreqg-q.tfm ubzjlreqg-q.tfm: %g-q.tfm: %-q.tfm cp $< $@ -%g-v.tfm: %-v.tfm +jlreqg-v.tfm bjlreqg-v.tfm zjlreqg-v.tfm bzjlreqg-v.tfm ujlreqg-v.tfm ubjlreqg-v.tfm uzjlreqg-v.tfm ubzjlreqg-v.tfm: %g-v.tfm: %-v.tfm cp $< $@ -%g.tfm: %.tfm +jlreqg.tfm bjlreqg.tfm zjlreqg.tfm bzjlreqg.tfm ujlreqg.tfm ubjlreqg.tfm uzjlreqg.tfm ubzjlreqg.tfm: %g.tfm: %.tfm cp $< $@ -u%.tfm: u%.pl +ujlreq.tfm ubjlreq.tfm uzjlreq.tfm ubzjlreq.tfm ujlreq-v.tfm ubjlreq-v.tfm uzjlreq-v.tfm ubzjlreq-v.tfm: %.tfm: %.pl uppltotf -kanji=uptex $< $@ -%.tfm: %.pl +jlreq.tfm bjlreq.tfm zjlreq.tfm bzjlreq.tfm jlreq-v.tfm bjlreq-v.tfm zjlreq-v.tfm bzjlreq-v.tfm: %.tfm: %.pl ppltotf -kanji=utf8 $< $@ -ujlreq%-jidori.tfm: ujlreq%-jidori.pl +ujlreq-jidori.tfm ujlreq-v-jidori.tfm: %.tfm: %.pl uppltotf -kanji=uptex $< $@ -jlreq%-jidori.tfm: jlreq%-jidori.pl +jlreq-jidori.tfm jlreq-v-jidori.tfm: %.tfm: %.pl ppltotf -kanji=utf8 $< $@ ujlreqg-jidori.tfm: ujlreq-jidori.tfm @@ -202,9 +204,9 @@ jlreq-trimmarks.html: jlreq-trimmarks.md README-template.html jfm-install: jfm mkdir -p ${TEXMF}/fonts/tfm/public/jlreq - install *.tfm ${TEXMF}/fonts/tfm/public/jlreq + install ${TFMS} ${TEXMF}/fonts/tfm/public/jlreq mkdir -p ${TEXMF}/fonts/vf/public/jlreq - install *.vf ${TEXMF}/fonts/vf/public/jlreq + install ${VFS} ${TEXMF}/fonts/vf/public/jlreq mkdir -p ${TEXMF}/tex/luatex/jlreq install jfm-jlreqv.lua jfm-jlreq.lua jfm-jlreq-jidori.lua jfm-jlreqv-jidori.lua ${TEXMF}/tex/luatex/jlreq @@ -222,9 +224,9 @@ install: jfm-install cls-install sty-install tds: jfm jlreq.cls README.md README-ja.md LICENSE jlreq.html jlreq-ja.html jlreq-trimmarks.html jlreq-trimmarks-ja.html jlreq.pdf jlreq-ja.pdf mkdir -p ./tds/fonts/tfm/public/jlreq - cp -f *.tfm ./tds/fonts/tfm/public/jlreq + cp -f ${TFMS} ./tds/fonts/tfm/public/jlreq mkdir -p ./tds/fonts/vf/public/jlreq - cp -f *.vf ./tds/fonts/vf/public/jlreq + cp -f ${VFS} ./tds/fonts/vf/public/jlreq mkdir -p ./tds/tex/luatex/jlreq cp jfm-jlreq.lua ./tds/tex/luatex/jlreq cp jfm-jlreqv.lua ./tds/tex/luatex/jlreq @@ -261,7 +263,7 @@ uninstall: rm -rf ${TEXMF}/tex/latex/jlreq jfmclean: - rm -f *jlreq*.tfm *jlreq*.pl *jlreq*.vf + rm -f *jlreq*.pl ${VFS} ${TFMS} rm -f jfm-jlreqv.lua rm -f jfm-*jlreq*-pl.lua rm -f jfm-jlreqv-jidori.lua diff --git a/Master/texmf-dist/tex/latex/jlreq/jlreq.cls b/Master/texmf-dist/tex/latex/jlreq/jlreq.cls index 8f14372b389..8ad7d8c9f7f 100644 --- a/Master/texmf-dist/tex/latex/jlreq/jlreq.cls +++ b/Master/texmf-dist/tex/latex/jlreq/jlreq.cls @@ -5,7 +5,7 @@ %% % (based on JLReq 20200811 https://www.w3.org/TR/2020/NOTE-jlreq-20200811/) \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{jlreq}[2024/08/23 jlreq] +\ProvidesClass{jlreq}[2024/09/26 jlreq] \RequirePackage{etoolbox} \RequirePackage{jlreq-helpers}[2024/02/13] |