texlive[72091] Master/texmf-dist: jlreq (23aug24)
commits+karl at tug.org
commits+karl at tug.org
Fri Aug 23 22:58:43 CEST 2024
Revision: 72091
https://tug.org/svn/texlive?view=revision&revision=72091
Author: karl
Date: 2024-08-23 22:58:43 +0200 (Fri, 23 Aug 2024)
Log Message:
-----------
jlreq (23aug24)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/jlreq/README-ja.md
trunk/Master/texmf-dist/doc/latex/jlreq/README.md
trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html
trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.pdf
trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.md
trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.md
trunk/Master/texmf-dist/doc/latex/jlreq/jlreq.html
trunk/Master/texmf-dist/doc/latex/jlreq/jlreq.pdf
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ubjlreq-q.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ubjlreqg-q.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ubzjlreq-q.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ubzjlreqg-q.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreq-q.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreqg-q.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/uzjlreq-q.tfm
trunk/Master/texmf-dist/fonts/tfm/public/jlreq/uzjlreqg-q.tfm
trunk/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreq-q.vf
trunk/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreq.vf
trunk/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreqg-q.vf
trunk/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreqg.vf
trunk/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreq-q.vf
trunk/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreq.vf
trunk/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreqg-q.vf
trunk/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreqg.vf
trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq-q.vf
trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq.vf
trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg-q.vf
trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg.vf
trunk/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreq-q.vf
trunk/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreq.vf
trunk/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreqg-q.vf
trunk/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreqg.vf
trunk/Master/texmf-dist/tex/latex/jlreq/jlreq-complements.sty
trunk/Master/texmf-dist/tex/latex/jlreq/jlreq-trimmarks.sty
trunk/Master/texmf-dist/tex/latex/jlreq/jlreq.cls
Modified: trunk/Master/texmf-dist/doc/latex/jlreq/README-ja.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/README-ja.md 2024-08-23 20:58:28 UTC (rev 72090)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/README-ja.md 2024-08-23 20:58:43 UTC (rev 72091)
@@ -19,7 +19,7 @@
## 動作環境
pLaTeX / upLaTeX / LuaLaTeX上で動きます．以下のパッケージを内部で読み込みます．
-* （常時）：l3keys2e,lmodern
+* （常時）：lmodern
* （LuaLaTeX非利用時）：everyhook
* （LuaLaTeX利用時）：luatexja,luatexja-adjust
@@ -343,7 +343,7 @@
* `odd_running_head=<書式>`，`even_running_head=<書式>`：それぞれ奇数ページ，偶数ページの柱を指定します．`_section`のように`_`から始まる名前を指定すると，対応する見出しを出力します．（`_section`だと現在の`\section`を出力する．）
* `mark_format={[odd=<書式>/even=<書式>/_<見出し命令名>=<書式>],...}`：見出しを柱に出力する際のフォーマットを指定します．`mark_format={_section={節\thesection：#1},_chapter={第\thechapter 章\quad #1}}`のように指定します．見出し命令名の代わりに`odd`や`even`も指定でき，それぞれ奇数ページ/偶数ページの柱の書式になります．`\pagestyle`実行時に`\sectionmark`等を定義することで実現しています．
* `nombre_ii=<書式>`：二つ目のノンブルを指定します．`nombre_ii_position`で場所指定，`nombre_ii_font`でフォント設定もできます．指定方法は`nombre`や`nombre_position`と同じです．`odd_running_head_ii`，`even_running_head_ii`，`running_head_ii_position`，`running_head_ii_font`もあります．`nombre_ii_position`や`running_head_ii_position`が指定されなかった場合，`yoko`指定時にはそれぞれ`nombre_position`および`running_head_position`と同じ位置に設定されます．`tate`指定時は一つ目のノンブルや柱に続く場所に表示されます．
-* `odd_head_format=<書式>`, `odd_foot_format=<書式>`, `even_head_format=<書式>`, `even_foot_format=<書式>`：ヘッダやフッタのフォーマットを指定します．`#1`がヘッダまたはフッタ全体に書き換えられます．ただし`#1`には位置調整用のコードが入っている場合もあるので，特に`\NewPageStyle`に`tate`を指定している場合には思うようにならないこともあります．例えば奇数ページのヘッダに罫線を引くためには`odd_head_format={\underline{\makebox[\jlreqyokoheadlength]{#1}}}`とするとよいでしょう．なお，ここで使った`\jlreqyokoheadlength`は本クラスファイル内で定義されているマクロで，ヘッダの横方向の長さを与えます．（フッタの長さも同じです．）縦方向の長さ，すなわち`\DeclarePageStyle`で`tate`が指定されている場合の長さは`\jlreqtateheadlength`で取得できます．
+* `odd_head_format=<書式>`, `odd_foot_format=<書式>`, `even_head_format=<書式>`, `even_foot_format=<書式>`：ヘッダやフッタのフォーマットを指定します．`#1`がヘッダまたはフッタ全体に書き換えられます．ただし`#1`には位置調整用のコードが入っている場合もあるので，特に`\NewPageStyle`に`tate`を指定している場合には思うようにならないこともあります．例えば奇数ページのヘッダに罫線を引くためには`odd_head_format={\underline{\makebox[\jlreqyokoheadlength]{#1}}}`とするとよいでしょう．なお，ここで使った`\jlreqyokoheadlength`は本クラスファイル内で定義されているマクロで，ヘッダの横方向の長さを与えます．（フッタの長さも同じです．）縦方向の長さ，すなわち`\NewPageStyle`で`tate`が指定されている場合の長さは`\jlreqtateheadlength`で取得できます．
`\RenewPageStyle`，`\ProvidePageStyle`，`\DeclarePageStyle`もあります．`\ModifyPageStyle`により既存のページスタイルを改変することが可能です．
@@ -590,6 +590,12 @@
- そのほかいくつか改善など．
* 2024-02-16
- バグ修正
+* 2024-08-23
+ - バグ修正
+ - 内部変数名の変更
+ - 英語ドキュメントに使い方を書いた
+ - `\DeclareKeys`などを使うようにした．
+ - 行見出しの内部処理をちょっとだけ変更．
--------------
Noriyuki Abe
Modified: trunk/Master/texmf-dist/doc/latex/jlreq/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/README.md 2024-08-23 20:58:28 UTC (rev 72090)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/README.md 2024-08-23 20:58:43 UTC (rev 72091)
@@ -14,8 +14,384 @@
The other way to install is just to run `make install`. It will install all files in `$TEXMFHOME`.
## Usage
-See [README-ja.md](README-ja.md) (in Japanese).
+To use, simply write
+```latex
+\documentclass{jlreq}
+```
+ 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 `platex/uplatex/lualatex` as a class option. To switch to vertical writing, pass the `tate` option. Additionally, to make the document class equivalent to report or book, pass the `report` or `book` option respectively. For example, to create a vertical book, write `\documentclass[tate,book]{jlreq}`.
+Other common options accepted are `oneside/twoside/onecolumn/twocolumn/titlepage/notitlepage/draft/final/landscape/openright/openany/leqno/fleqn`. Also, passing the `disablejfam` option will not register Japanese fonts for use in mathematics.
+
+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 [Requirements for Japanese Text Layout](https://www.w3.org/TR/jlreq/?lang=en) without explanation.
+
+### `\jlreqsetup`
+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 `\jlreqsetup`, depending on the setting item.
+
+### `\section`
+The `\section` command is extended to accept subtitles in addition to the usual format, as in `\section*[running head]{Heading}[Subtitle]`. Other commands such as `\part` (only in article), `\chapter` (only in book/report), `\subsection`, and `\subsubsection` also accept subtitles.
+
+### `abstract` environment
+You can place it in the preamble, and it will be output with `\maketitle`. In the case of two columns, it allows you to output the abstract without columnization. However, this method is now deprecated. By specifying `abstract_with_maketitle=true` in `\jlreqsetup` and writing it before `\maketitle`, you can achieve the same effect.
+
+### `\sidenote`
+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, `\sidenote` is not defined. Please refer to the later basic layout settings. `\sidenote` outputs a sidenote (or footnote in vertical writing). Internally, it uses `\marginpar`. By default, it has the same format as `\footnote`, but if `sidenote_type=symbol` is specified in `\jlreqsetup`, the format becomes `\sidenote{relevant item}{note}`. For example, you would write:
+
+```latex
+capable of publishing \sidenote{manuscript}{by methods such as printing…}
+```
+Please refer to the later explanation as well.
+
+### `\endnote`
+Specifies an endnote. It has the same format as `\footnote`. By default, the note itself is output just before the heading. This behavior can be controlled by passing `endnote_position` to `\jlreqsetup`. For more details, please see the later explanation of notes. Also, executing `\theendnotes` will output it on the spot.
+
+### `\warichu`
+Outputs a warichu (split annotation). The line division positions are calculated automatically (multiple compilations are required). With `\warichu*`, you can manually specify these positions. The format is `\warichu*{(before first line) & (after first line)\\ (before second line) & (after second line)...}`. If `&` is omitted, it will be adjusted automatically.
+
+### `\tatechuyoko`
+Outputs horizontal-in-vertical text. You use it as `\tatechuyoko{<content>}`. `\tatechuyoko` will result in an error if used in a non-vertical writing place, but `\tatechuyoko*` will be output as is in a non-vertical writing place.
+
+### `\jidori`
+By using `\jidori{<dimension>}{<content>}`, you can output the content justified to the length of the dimension.
+
+### `\akigumi`
+By using `\akigumi{<dimension>}{<content>}`, 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.
+
+### `\jafontsize`
+Specifies the Japanese font size, similar to `\fontsize`. If `jafontscale=0.9` is specified as a class option, specifying `\fontsize{9pt}{15pt}` will result in a Japanese font size of 8.1pt, but `\jafontsize{9pt}{15pt}` will result in 9pt (with the European font size being 10pt). The second argument is exactly the same as the second argument of `\fontsize`.
+
+### `\ `
+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 ` ` alone.
+
+### Others
+* Ruby and encircled points are not provided. It is recommended to use [PXrubrica](https://github.com/zr-tex8r/PXrubrica) or `luatexja-ruby` (for LuaLaTeX, included in the LuaTeX-ja package).
+
+* When using pLaTeX / upLaTeX, macros `\zw` and `\zh` that expand to `zw` and `zh`, respectively, are defined. In LuaLaTeX, macros of the same name are defined within LuaTeX-ja.
+
+* 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 `nidanfloat` package and specifying
+
+ ````latex
+ \usepackage[balance]{nidanfloat}
+ ````
+
+ However, `\newpage` and `\clearpage` on the last page will not work correctly. For more details, please see the manual of the `nidanfloat` package.
+
+* The functionality to set fonts is not provided. Japanese fonts can be set using `luatexja-fontspec` or `luatexja-preset` (both included in the LuaTeX-ja package) when using LuaLaTeX. If using dvipdfmx, you can set it with [PXchfon](https://github.com/zr-tex8r/PXchfon).
+
+* The space between Japanese characters (stored in `\kanjiskip` in (u)pTeX and in the `kanjiskip` 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 `\jlreqkanjiskip`. For example:
+
+ ```latex
+ \documentclass{jlreq}
+ \renewcommand{\jlreqkanjiskip}{0pt plus .1\zw minus .01\zw}
+ \begin{document}
+ (Main text)
+ \end{document}
+ ````
+
+ The space between Japanese and European characters (stored in `\xkanjiskip` in (u)pTeX and in the `xkanjiskip` parameter in LuateX-ja) can also be changed by redefining `\jlreqxkanjiskip`.
+
+* When specifying `book`, even if you specify `openany` as a class option, a blank page may be inserted after `\mainmatter`. This is to match the behavior of the standard class file. By specifying `\jlreqsetup{mainmatter_pagebreak=clearpage}`, you can prevent the insertion of a blank page, but by default, `\mainmatter` 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 `\jlreqsetup{frontmatter_pagination={arabic,continuous}}`. For more details, please refer to the following “Front Matter, etc.” section.
+
+## Design options
+The design is specified in keyval format via class options or `\jlreqsetup`. 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.
+
+In the following, the following usage will be used:
+* `[A/B]`: Either A or B. `[A/B/C]`, etc., are the same.
+* `<dimension>`: A dimension recognized by TeX. You can also use simple expressions (like `10pt+10pt`). 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 `\jlreqsetup`, you can always describe the full-width width with `\zw` or `\zh`. Below, for example, if `Q` and `H` are available, it will be described as `<dimension;Q,H>`.
+ - `Q`, `H`: Interpreted as 0.25mm.
+ - `zw`, `zh`: Interpreted as full-width width.
+* `<code>`: LaTeX code.
+* `<font setting code>`: Commands for font settings, such as `\Large` or `\bfseries`. Multiple specifications like `\Large\bfseries` are also possible.
+
+### Kihon-hanmen
+Class option.
+
+* `paper=[<paper size name>/{<dimension>,<dimension>}]`: Specifies the paper size. You can specify from `a0paper` to `a10paper`, `b0paper` to `b10paper` (ISO B series), or `b0j` to `b10j` for JIS B series. Also available are `letterpaper`, `legalpaper`, and `executivepaper`. Alternatively, you can directly specify dimensions with `{<width>,<height>}`.
+* `fontsize=<dimension;Q,H>`: Specifies the font size for Latin script. The default is 10pt.
+* `jafontsize=<dimension;Q,H>`: Specifies the font size for Japanese script.
+* `jafontscale=<real number>`: The ratio of Japanese font size to Latin font size (Japanese / Latin). Ignored if both `fontsize` and `jafontsize` are specified. The default is 1.
+* `line_length=<dimension;zw,zh>`: 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.
+* `number_of_lines=<natural number>`: 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.
+* `gutter=<dimension;zw,zh>`: The size of the gutter margin.
+ - Without `tate`option: It's the margin on the left for odd pages and on the right for even pages.
+ * With `tate` option: It's the opposite.
+ * If `twoside` is not specified in the class options, the margin is always set as for odd pages.
+* `fore-edge=<dimension;zw,zh>`: 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".
+* `head_space=<dimension;zw,zh>`: The amount of space at the top (head). The default value centers the text block vertically.
+* `foot_space=<dimension;zw,zh>`: The amount of space at the bottom (foot). The default value centers the text block vertically.
+* `baselineskip=<dimension;Q,H,zw,zh>`: The line feed. By default, it's 1.7 times the `jafontsize`.
+* `linegap=<dimension;Q,H,zw,zh>`: The line gap.
+* `headfoot_sidemargin=<dimension;zw,zh>`: The left and right margin for headers and footers.
+* `column_gap=<dimension;zw,zh>`: The gap between columns (only for `twocolumn`).
+* `sidenote_length=<dimension;zw,zh>`: Specifies the width of the sidenote.
+
+###
+class option
+* `open_bracket_pos=[zenkaku_tentsuki/zenkakunibu_nibu/nibu_tentsuki]`: Specifies the positioning of opening brackets at the start of a line. Options are:
+ - `zenkaku_tentsuki`: Full-width characters are indented at the start of a paragraph.
+ - `zenkakunibu_nibu`: Full-width at the start of a paragraph, half-width at a line break.
+ - `nibu_tentsuki`: Half-width indentation at the start of a line.
+* `hanging_punctuation`: Enables hanging punctuation.
+
+### Reverse pagination
+class option.
+* `use_reverse_pagination`: Enables reverse pagination functionality. Defines a ‘read-only counter’ named `jlreqreversepage`. Commands like `\arabic` and `\value` can be applied to it, and `\thejlreqreversepage` is defined as `\arabic{jlreqreversepage}`.
+
+### Note related
+Specified by `\jlreqsetup`.
+
+* `reference_mark=[inline/interlinear]`: Specifies the placement of reference marks. Options are `inline` (in the line after the relevant item) or `interlinear` (above the line for horizontal writing, or to the right for vertical writing).
+* `footnote_second_indent=<dimension>`: Sets the indent for the second and subsequent lines of footnotes (horizontal writing) or sidenotes (vertical writing).
+* `sidenote_type=[number/symbol]`: Determines the correspondence between the sidenote and the text. Options are `number` (default, with a serial number indicating the note) or `symbol` (with a specific symbol and the word with the note emphasized).
+* `sidenote_symbol=<code>`: When `sidenote_type=symbol` is specified, this sets the symbol to be used at the note's location. THe default is *
+* `sidenote_keyword_font=<font setting code>`: Specifies the font for the word with the sidenote when `sidenote_type=symbol` is used.
+* `endnote_second_indent=<dimension>`: Sets the indent for the second and subsequent lines of endnotes.
+` endnote_position=[headings/paragraph/{_<heading name 1>,_<heading name 2>,...}]`: The output location of the endnote can be specified. `headings` will output the note before each heading (default), `paragraph` will output it when a new paragraph starts, and specifying `endnote_position={_chapter,_section}` will output it before `\chapter` and `\section`. To specify `<_heading name>`, the target heading must be created using the functionality of this class file.
+* `warichu_opening=<code>`, `warichu_closing=<code>`: These are inserted before and after the warichu (split annotation). The default is parentheses ().
+
+### Caption
+You can change the captions for figures and tables using `\jlreqsetup`. All settings allow for environment-specific customization. For example, `caption_font=\normalsize,table=\Large` means that within the table environment, `\Large` will be applied, while `\normalsize` will be applied in other environments. Other settings follow the same pattern.
+* `caption_font=<font setting code>`: Specifies the font for the caption itself.
+* `caption_label_font=<font setting code>`: Specifies the font for the caption label.
+* `caption_after_label_space=<dimension>`: Specifies the space between the label and the caption text.
+* `caption_label_format=<code>`: Specifies the format of the label. For example, `caption_label_format={#1:}` where `#1` is replaced with something like “Figure 1”.
+* `caption_align=[left/right/center/bottom/top]`: Specifies the position of the caption. For instance, `{center,*left}` means it’s usually centered, but aligned left when the caption is large.
+
+### Quotation
+* `quote_indent=<dimension>`: Specifies the indentation for quotes. The default is `2\zw`. The length of a line is adjusted to be an integer multiple of the character size.
+* `quote_end_indent=<dimension>`: Specifies the indentation for the end of quotes. The default is `0\zw`.
+* `quote_beforeafter_space=<dimension>`: Specifies the space before and after quotes. Setting `quote_beforeafter_space=1\baselineskip` will result in a one-line space.
+* `quote_fontsize=[normalsize/small/footnotesize/scriptsize/tiny]`: Specifies the font size for quotes.
+
+### Itemization
+* `itemization_beforeafter_space=<dimension>`: Specifies the space before and after the itemization. For example, `itemization_beforeafter_space={i=<dimension>}` sets the space for the top level only. `itemization_beforeafter_space={0pt,i=10pt,ii=5pt}` sets 10pt for level 1 itemization, 5pt for level 2, and 0pt for others. Levels are indicated by lowercase Roman numerals.
+* `itemization_itemsep=<dimension>`: Specifies the space between items.
+
+### Front matter etc.
+You can specify the behavior of `\frontmatter` / `\mainmatter` / `\backmatter` / `\appendix` with `\jlreqsetup`.
+
+* `frontmatter_pagebreak=[cleardoublepage/clearpage]`: Specifies the command name to execute the page break at `\frontmatter`. If it is empty, nothing is done.
+* `frontmatter_counter={<counter name>={value=<value>, the=<code>, restore=[true/false]},…}`: Specifies the operation of the counter at `\frontmatter`. For example, `chapter={value=0,the={[\arabic{chapter]}}` sets the value of the chapter counter to 0 and `\thechapter` to `[\arabic{chapter}]`. By default, the value and `\the<counter name>` definition are restored at `\mainmatter`, but this behavior is suppressed by specifying Prestore=false`.
+* `frontmatter_heading={<heading command name>={<setting>},…}`: Changes the behavior of the heading command. In addition to the items that can be specified by `\Delare***Heading`, the following are accepted.
+ - `heading_type=[Tobira/Block/Runin/Cutin/Modify]`: The type of heading1. If Modify is specified, it will be changed by `\ModifyHeading`.
+ - `heading_level=<number>`: Specifies the level of the heading command. If not specified, the value at `\frontmatter` is used. This is ignored when `heading_type=Modify`.
+ - `restore=[true/false]`: If true is specified, the original definition is restored at `\mainmatter`. The default is true.
+* `frontmatter_pagestyle={<page style name>[,restore=[true/false]]}`: Switches to the specified page style at `\frontmatter`. By default, it returns to the original page style at `\mainmatter`, but this can be prevented by specifying `restore=false`.
+* `frontmatter_pagination={<page number specification>[,continuous,independent]}`: Specifies the output format of the page number, such as `frontmatter_pagination=roman`, with the LaTeX command name. In addition, continuous makes it a continuous number, and independent makes it a separate number.
+* `frontmatter_precode=<code>`: The code that is executed first at `\frontmatter`.
+* `frontmatter_postcode=<code>`: The code that is executed last at `\frontmatter`.
+
+There are also settings that change `frontmatter` to `mainmatter`, `backmatter`, or `appendix`. However, there are some differences as follows.
+* `restore=[true/false]` is an invalid setting.
+* Pmainmatter_pagination` cannot specify continuous or independent.
+* `appendix_pagebreak`, `appendix_pagestyle`, `appendix_pagination` do not exist.
+
+#### Abstract
+* `abstract_with_maketitle=[true/false]`: If the abstract environment is written before `\maketitle`, it delays its content and outputs it with `\maketitle`. Even in the case of two columns, it is output in one column. The default is false. This option is available only when `article` and `report` are specified.
+
+## Headings
+You can create new headings with commands like `\New***Heading` ( is a string that corresponds to the type of heading). The format is always `\New***Heading{<command name>}{<level>}{<settings>}`. Also, `\Renew***Heading`, `\Provide***Heading`, and `\Declare***Heading` are available at the same time. They are respectively
+
+* `\Renew***Heading`: If the command with the specified name is not defined, it causes an error.
+* `\Provide***Heading`: If the command with the specified name is not defined, it defines a new heading command.
+* `\Declare***Heading`: It defines a new heading command regardless of whether the command with the specified name is defined or not.
+
+### Tobira headings
+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.
+.
+* `type=[han/naka]`: It creates a half-title heading if `han` is specified, and a middle-title heading if `naka` is specified.
+* `pagestyle=<page style name>`: It specifies the page style of the heading area.
+* `label_format=<code>`: It specifies the command to output the label. For example, specify it as `label_format={Chapter \thechapter}`.
+* `format=<code>`: It specifies the format to actually output. `#1` is replaced with the label, `#2` with the heading text. In this case, the commands `\jlreqHeadingLabel` and `\jlreqHeadingText` 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 `format={[\jlreqHeadingLabel{Label=#1}]}`, it outputs `[Label=<label>]` if the label is not empty, and `[]` otherwise. Note that `#1` 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. `#2` is the same.
+* `number=[true/false]`: It specifies whether to number or not. However, even if `number=false` is specified, the corresponding counter is defined. Also, the definition of `\the<counter name>` is not changed, so you need to redefine it if necessary.
+
+### Block headings
+You can create it with `\NewBlockHeading`. It creates a command with the format `\<command name>*[running head]{heading text}[subtitle]`. The settings are as follows.
+
+#### Format related
+* `font=<font setting code>`: It specifies the font of the heading.
+* `subtitle_font=<font setting code>`: It specifies the font of the subtitle.
+* `label_format=<code>`: It specifies the format of the label. Specify it as `label_format={Chapter \thechapter}`, for example.
+* `subtitle_format=<code>`: It specifies the format of the subtitle. Specify it as `subtitle_format={“#1”}`, for example. `#1` is replaced with the subtitle itself.
+* `format=<code>`: It specifies the format of the entire heading. `#1` is replaced with the label, `#2` with the heading text, `#3` with the subtitle. Internally, the commands `\jlreqHeadingLabel`, `\jlreqHeadingText`, and `\jlreqHeadingSubtitle` 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 `format={[\jlreqHeadingLabel{Label=#1}]}`, it outputs `[Label=<label>]` if the label is not empty, and `[]` otherwise. Note that `#1` 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. `#2` and `#3` are the same.
+
+#### Indent related
+* `align=[left/center/right]`: It specifies the horizontal alignment of the heading position.
+* `indent=<dimension>`: It specifies the amount of indentation of the entire heading.
+* `end_indent=<dimension>`: It specifies the amount of back indentation of the entire heading.
+* `after_label_space=<dimension>`: It specifies the amount of space between the label and the heading text.
+* `second_heading_text_indent=[<dimension>/{<dimension>,<dimension>}]`: 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 `*` at the beginning like `second_heading_text_indent=*1\zw`, it specifies from the beginning of the label. Also, if you specify it as `second_heading_text_indent={<when there is a label>,<when there is no label>}`, you can change the value depending on the presence or absence of the label. You can also use * in the specification of `<when there is a label>`.
+* `subtitle_indent=<dimension>`: 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 `*` at the beginning like `subtitle_indent=*1\zw`, it specifies from the beginning of the label. It is valid only when `subtitle_break=true`.
+
+#### Others
+* `subtitle_break=[true/false]`: It specifies whether to break the line between the heading text and the subtitle.
+* `allowbreak_if_evenpage=[true/false]`: It allows a page break immediately after the heading if it is on an even page.
+* `pagebreak=[clearpage/cleardoublepage/clearcolumn/nariyuki/begin_with_odd_page/begin_with_even_page]`: It specifies the page break before the heading2. They are respectively, page break, `\cleardoublepage` execution, column break, as it is, start with odd page, start with even page.
+* `pagestyle=<page style name>`: It specifies the page style of the heading area.
+* `afterindent=[true/false]`: It specifies whether to indent the paragraph immediately after the heading.
+* `column_spanning=[true/false]`: It makes the heading span columns. It is ignored when `pagebreak=nariyuki` or `pagebreak=clearcolumn`.
+* `number=[true/false]`: It specifies whether to number or not. The same caution as `\NewTobiraHeading` is required.
+
+#### Gyo-dori
+You can specify gyo-dori setting in one of the following ways.
+
+* Specify the number of lines and place it in the center. Specify the number of lines with `lines=<natural number>`. You can also specify the number of lines to add before and after with `before_lines=<natural number>` and `after_lines=<natural number>`. For example, if you specify `lines=3,after_lines=1`, it will be placed in four lines, and the space after will be one line larger than the space before. The space specified by `before_lines` does not enter at the top of the page, but if you put `*` at the beginning like `before_lines=*1`, it always enters.
+* Specify the number of lines and either the space before or after. Specify the number of lines with `lines=<natural number>`, and the space before or after with either `before_space=<dimension>` or `after_space=<dimension>`.
+* Specify the space before and after. Specify it with `before_space=<dimension>` and `after_space=<dimension>`.
+
+
+### Gyo-dori for consecutive headings
+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} }
+```
+
+This means the following.
+
+* If the headings are placed in the order of `\part`, `\section`, `\subsection`, and the front and back are not headings, then `\part` is three-line spacing + one line space before, and `\section` and `\subsection` are two-line spacing.
+* If the headings are placed in the order of `\section`, `\subsection`, and the front and back are not headings, then the whole is five-line spacing, and there is `23pt` space between `\section` and `\subsection`, and `16pt` space after `\subsection`.
+
+The individual settings are as follows.
+
+* Each `{}` contains `_<heading command name>` or `<dimension>` separated by commas.
+* You can add settings enclosed in `[]` at the beginning. This is a setting for the entire heading that is placed consecutively. `lines / before_lines / after_lines / before_space / after_space` are available. Each meaning is the same as the line spacing specification described above.
+* The dimension is the amount of space as it is.
+* You can add settings enclosed in `{}` after `_<heading command name>` to set the amount of space for that heading. If not set, there is no space before and after.
+* In the settings enclosed in `{}` for the heading, `lines / before_lines / after_lines / before_space / after_space` are available. Each meaning is the same as the line spacing specification described above.
+* If you make the part enclosed in `{}` only `*`, (for example, `_section{*}`), it uses the same setting as when it is placed alone.
+
+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 `\label[<option>]{<argument>}…{<argument>}` are inserted between the heading commands, they are considered to be consecutive headings.
+
+### Run-in headings
+
+Run-in headings are created with `\NewRuninHeading`. The command creates a heading with the same format as the standard document class's `\section`, i.e. `\<command name>*[running head]{heading text}`. The settings are as follows:
+
+* `font=<font setting command>`: Specifies the font of the heading.
+* `indent=<dimension>`: Specifies the indentation of the entire heading text.
+* `after_label_space=<dimension>`: Specifies the space between the label and the heading text.
+* `label_format=<code>`: Specifies the format of the label. For example, `label_format={\theparagraph}`.
+* `after_space=<dimension>`: Specifies the space between the heading and the main text.
+* `number=[true/false]`: Specifies whether to number the heading or not. The same caution as `\NewTobiraHeading` applies.
+
+### Cut-in headings
+You can create cut-in headings with `\NewCutinHeading`. The command has the format `\<command name>{heading text}`. The settings are as follows:
+* `font=<font setting command>`: Specifies the font of the heading.
+* `indent=<dimension>`: Specifies the indentation of the entire heading.
+* `after_space=<dimension>`: Specifies the space between the heading and the text.
+* `onelinemax=<dimension>`, `twolinemax=<dimension>`: If the length of the heading text is less than or equal to `onelinemax`, the window heading is output in one line. If it is less than or equal to `twolinemax`, it is output in two lines. Otherwise, it is output in three lines. The default values are 6 characters and 20 characters, respectively.
+
+### `\ModifyHeading`
+`\ModifyHeading` is a command that changes the settings of a heading command that has already been defined (using one of the above commands). For example,
+
+```latex
+\ModifyHeading{section}{lines=10}
+```
+
+changes only the line spacing of `\section` to 10 lines, while keeping the font and other settings the same. You cannot change the type of heading with this command.
+
+### `\SaveHeading`
+
+`\SaveHeading` saves the definition of a heading command. For example, you can use it like this:
+
+```latex
+\SaveHeading{section}{\restoresection} % Save the contents of \section to \restoresection.
+\RenewBlockHeading{section}{1}{font=…} % Redefine \section with a new font.
+…
+\restoresection % Restore the contents of \section.
+```
+
+## Page Style
+You can define a page style using
+```latex
+\NewPageStyle{<page style name>}{<settings>}
+```
+
+`<settings>` is in keyval format. You can apply the defined page style with `\pagestyle`. The settings are as follows:
+
+* `yoko`: Prints horizontally at the top and bottom. Default.
+* `tate`: Prints vertically on the fore-edge side.
+* `running_head_font=<font setting command>`: Specifies the font for the running head.
+* `nombre_font=<font setting command>`: Specifies the font for the page number.
+* `running_head_position`, `nombre_position`: Specifies the position of the running head and the page number. The specification method changes depending on whether `yoko` or `tate` is specified.
+ - `yoko` specified: You can specify it like top-left. You can use `top / bottom / center / left / right / gutter / fore-edge`. `left` and `right` are for odd pages. If `twoside` is specified, even pages are the opposite.
+ - `tate` specified: You can specify `<dimension>`. `running_head_position` specifies the drop amount from the top of the running head, and `nombre_position` specifies the raise amount from the bottom of the page number.
+* `nombre=<format>`: Specifies the page number to output. The default is `\thepage`.
+* `odd_running_head=<format>`, `even_running_head=<format>`: Specifies the running head for odd and even pages, respectively. If you specify a name starting with _ like `_section`, it outputs the corresponding heading. (`_section` outputs the current `\section`.)
+* `mark_format={[odd=<format>/even=<format>/_<heading command name>=<format>],…}`: Specifies the format for outputting headings to the running head. Specify it like `mark_format={_section={Section \thesection: #1},_chapter={Chapter \thechapter \quad #1}}`. 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 `\sectionmark` etc. when executing `\pagestyle`.
+* `nombre_ii=<format>`: Specifies the second page number. You can also specify the location with `nombre_ii_position` and the font with `nombre_ii_font`. The specification method is the same as `nombre` and `nombre_position`.
+* `odd_running_head_ii`, `even_running_head_ii`, `running_head_ii_position`, `running_head_ii_font` are also available. If `nombre_ii_position` or `running_head_ii_position` is not specified, it will be set to the same position as `nombre_position` or `running_head_position` when `yoko` is specified. When `tate` is specified, it will be displayed in the place following the first page number or running head.
+* `odd_head_format=<format>`, `odd_foot_format=<format>`, `even_head_format=<format>`, `even_foot_format=<format>P: Specifies the format for the header and footer. `#1` will be replaced with the entire header or footer. However, `#1` may contain code for position adjustment, so it may not work as expected, especially when `tate` is specified in `\NewPageStyle`. For example, to draw a rule under the header on odd pages, you can do `odd_head_format={\underline{\makebox[\jlreqyokoheadlength]{#1}}}`. `\jlreqyokoheadlength` 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 `tate` is specified in `\NewPageStyle`, can be obtained with `\jlreqtateheadlength`.
+
+`\RenewPageStyle`, `\ProvidePageStyle`, `\DeclarePageStyle` are also available1.
+
+You can modify an existing page style with `\ModifyPageStyle`.
+
+## JFM
+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.
+
+### For pLaTeX/upLaTeX
+
+The names of the JFMs are as follows. The characters enclosed in `[]` may or may not be included depending on the settings.
+
+```
+[u][b][z]jlreq[g][-v]
+```
+
+Each character is included in the following cases.
+
+* `u`: When using upLaTeX
+* `b`: When using hanging punctuation. (When the class option hanging_punctuation is specified.)
+* `z`: 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 `open_bracket_pos=zenkakunibu_nibu` is specified.)
+* `g`: For gothic fonts.
+* `-v`: For vertical writing.
+
+For example, if you process a source without using hanging punctuation and specifying `open_bracket_pos=zenkakunibu_nibu` as a class option with pLaTeX, the JFM named zjlreq will be used for horizontal writing mincho font.
+
+For LuaLaTeX
+
+* The JFM for horizontal writing is jlreq
+* The JFM for vertical writing is jlreqv
+
+The same JFM is used for gothic fonts. This class file changes the JFM of LuaTeX-ja standard to these.
+
+## Others
+
+If the class option `jlreq_notes` is passed, a notification will be given when a setting that contradicts the description of Japanese typesetting processing is made.
+## jlreq-complements
+`jlreq-complements` 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:
+
+* `platex`, `uplatex`, `lulalatex`: Specify the engine.
+* `setupname=<name>`: Specify the name of the command for customization. The default is `jlreqcomplementssetup`, and you can set it by writing `\jlreqcomplementssetup{<settings>}` in the preamble.
+
+
+In `jlreq`, it is loaded as `\usepackage[<engine recognized in jlreq>,setupname=jlreqsetup]{jlreq-complements}`, so you can customize the environments with the usual `\jlreqsetup`. 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.
+
+### `thebibliography` environment
+
+* `thebibliography_heading=<code>`: Specify the command to output the heading of the `thebibliography` environment. Use it like `thebibliography_heading={\section*{\refname}}`.
+* `thebibliography_after_label_space=<dimension>`: Specify the space after the label of each item in the `thebibliography` environment.
+* `thebibliography_indent=<dimension>`: Specify the indentation of the entire `thebibliography` environment.
+* `thebibliography_mark=<code>`: Specify the code to register the heading of the `thebibliography` environment in the column.
+* `thebibliography_precode=<code>`, `thebibliography_postcode=<code>`: Specify the code that is executed before and after the `thebibliography` environment, respectively.
+
+### `theindex` environment
+* `theindex_heading=<code>`: Specify the command to output the heading of the `theindex` environment.
+* `theindex_mark=<code>`: Specify the code to register the heading of the `theindex` environment in the column.
+* `theindex_twocolumn=[true/false]`: Specify whether to output the `theindex` environment in two columns.
+* `theindex_column_gap=<dimension>`: Specify the column gap in the `theindex` environment when `theindex_twocolumn=true`.
+* `theindex_column_rule_width=<dimension>`: Specify the value of `\columnseprule` in the `theindex` environment when `theindex_twocolumn=true`.
+* `theindex_pagestyle=<page style name>`: Specify the page style for the `theindex` environment.
+* `theindex_postcode=<code>`, `theindex_precode=<code>`: Specify the code that is executed before and after the `theindex` environment, respectively.
+
+### Theorem environment
+* ` theorem_beforeafter_space=<dimension>`: Specify the space before and after the theorem environment.
+* `theorem_label_font=<font setting code>`: Specify the font for the label part of the theorem environment.
+* `theorem_font=<font setting code>`: Specify the font for the body of the theorem environment.
+* `theorem_indent=<dimension>`: Specify the indentation of the body of the theorem environment.
+* `proof_label_font=<font setting code>`: This setting is only valid when the `amsthm` package is loaded. Specify the font for the label of the `proof` environment.
+
+When the `amsthm` package is loaded, a new theorem style `jlreq` is defined and the current style is changed to `jlreq`. In this case, the above settings function as settings for this `jlreq` style.
+
## LICENSE
This package is distributed under the BSD 2-Clause License. See [LICENSE](LICENSE).
@@ -197,6 +573,13 @@
- Some other improvements etc.
* 2024-02-16
- Fixed a bug.
+* 2024-08-23
+ - Fixed bugs.
+ - Changed the name of some internal variables.
+ - Added the usage of this class to English document.
+ - Use `\DeclareKeys` etc.
+ - Changed the internal processing of block headings a little.
+
--------------
Noriyuki Abe
https://github.com/abenori/jlreq
Modified: trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html 2024-08-23 20:58:28 UTC (rev 72090)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html 2024-08-23 20:58:43 UTC (rev 72091)
@@ -103,7 +103,7 @@
<h2 id="動作環境">動作環境</h2>
<p>pLaTeX / upLaTeX / LuaLaTeX上で動きます．以下のパッケージを内部で読み込みます．</p>
<ul>
-<li>（常時）：l3keys2e,lmodern</li>
+<li>（常時）：lmodern</li>
<li>（LuaLaTeX非利用時）：everyhook</li>
<li>（LuaLaTeX利用時）：luatexja,luatexja-adjust</li>
</ul>
@@ -391,7 +391,7 @@
<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>\DeclarePageStyle</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>
Modified: trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.md 2024-08-23 20:58:28 UTC (rev 72090)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.md 2024-08-23 20:58:43 UTC (rev 72091)
@@ -191,6 +191,8 @@
- 縦書きで読み込み時にエラーが出るバグ修正．
* 2024-02-13
- ドキュメントの間違いを修正．
+* 2024-08-23
+ - `\DeclareKeys`などを使うようにした．
--------------
Noriyuki Abe
Modified: trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.md 2024-08-23 20:58:28 UTC (rev 72090)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.md 2024-08-23 20:58:43 UTC (rev 72091)
@@ -183,8 +183,10 @@
- Added `trimmarks_pattern` to `\jlreqtrimmarkssetup`.
* 2023-06-19
- Fixed a bug: an error occurred when the package is loaded with tate mode.
-* 2023-02-13
+* 2024-02-13
- Fixed a bug in a document.
+* 2024-08-23
+ - Use `\DeclareKeys` etc.
--------------
Noriyuki Abe
Modified: trunk/Master/texmf-dist/doc/latex/jlreq/jlreq.html
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/jlreq.html 2024-08-23 20:58:28 UTC (rev 72090)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/jlreq.html 2024-08-23 20:58:43 UTC (rev 72091)
@@ -52,6 +52,36 @@
background-color: #F8F8F8;
border-style: none;
}
+ div.sourceCode { overflow-x: auto; text-indent: 0em;}
+ code span.kw { color: #007020; font-weight: bold; } /* Keyword */
+ code span.dt { color: #902000; } /* DataType */
+ code span.dv { color: #40a070; } /* DecVal */
+ code span.bn { color: #40a070; } /* BaseN */
+ code span.fl { color: #40a070; } /* Float */
+ code span.ch { color: #4070a0; } /* Char */
+ code span.st { color: #4070a0; } /* String */
+ code span.co { color: #008000; } /* Comment */
+ code span.ot { color: #007020; } /* Other */
+ code span.al { color: #ff0000; font-weight: bold; } /* Alert */
+ code span.fu { color: #0040FF; } /* Function */
+ code span.er { color: #ff0000; font-weight: bold; } /* Error */
+ code span.wa { color: #60a0b0; font-weight: bold; font-style: italic; } /* Warning */
+ code span.cn { color: #880000; } /* Constant */
+ code span.sc { color: #4070a0; } /* SpecialChar */
+ code span.vs { color: #4070a0; } /* VerbatimString */
+ code span.ss { color: #bb6688; } /* SpecialString */
+ code span.im { } /* Import */
+ code span.va { color: #19177c; } /* Variable */
+ code span.cf { color: #007020; font-weight: bold; } /* ControlFlow */
+ code span.op { color: #666666; } /* Operator */
+ code span.bu { color: #0040FF; } /* BuiltIn */
+ code span.ex { } /* Extension */
+ code span.pp { color: #bc7a00; } /* Preprocessor */
+ code span.at { color: #7d9029; } /* Attribute */
+ code span.do { color: #ba2121; font-style: italic; } /* Documentation */
+ code span.an { color: #60a0b0; font-weight: bold; font-style: italic; } /* Annotation */
+ code span.cv { color: #60a0b0; font-weight: bold; font-style: italic; } /* CommentVar */
+ code span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Information */
</style>
</head>
<body>
@@ -69,7 +99,342 @@
</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>
<h2 id="usage">Usage</h2>
-<p>See <a href="jlreq-ja.html">jlreq-ja.html</a> (in Japanese).</p>
+<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>
+<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>
+<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>
+<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>
+<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>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>
+<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>
+<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>
+<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>
+<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>
+<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>
+<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>
+<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>
+<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>
+</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>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>.
+<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>
+</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>
+</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>
+</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>
+</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>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>
+</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:
+<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>
+</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>
+</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>
+</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>
+</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>
+</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>
+</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>
+</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>
+</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>
+<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>
+</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>
+</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>
+</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>
+</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>
+<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>
+</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>
+</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>
+</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>
+</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>
+<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>
+</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>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>
+</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>
+<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>
+</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>
+</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>
+<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>
+<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>
+<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>
+<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>
+<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>
+<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>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 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>
+<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>
+<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>
+</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>
+</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>
+</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>
+</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>
<h2 id="license">LICENSE</h2>
<p>This package is distributed under the BSD 2-Clause License. See <a href="LICENSE">LICENSE</a>.</p>
<h2 id="changelog">CHANGELOG</h2>
Modified: trunk/Master/texmf-dist/doc/latex/jlreq/jlreq.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ubjlreq-q.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ubjlreqg-q.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ubzjlreq-q.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ubzjlreqg-q.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreq-q.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/ujlreqg-q.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/uzjlreq-q.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/jlreq/uzjlreqg-q.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreq-q.vf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreq.vf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreqg-q.vf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/vf/public/jlreq/ubjlreqg.vf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreq-q.vf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreq.vf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreqg-q.vf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/vf/public/jlreq/ubzjlreqg.vf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq-q.vf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreq.vf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg-q.vf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/vf/public/jlreq/ujlreqg.vf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreq-q.vf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreq.vf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreqg-q.vf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/vf/public/jlreq/uzjlreqg.vf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/tex/latex/jlreq/jlreq-complements.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/jlreq/jlreq-complements.sty 2024-08-23 20:58:28 UTC (rev 72090)
+++ trunk/Master/texmf-dist/tex/latex/jlreq/jlreq-complements.sty 2024-08-23 20:58:43 UTC (rev 72091)
@@ -1,7 +1,6 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{jlreq-complements}[2022/11/28 jlreq-complements]
-\RequirePackage{jlreq-helpers}[2022/11/28]
-\RequirePackage{l3keys2e}
+\ProvidesPackage{jlreq-complements}[2024/08/23 jlreq-complements]
+\RequirePackage{jlreq-helpers}[2024/02/13]
\ExplSyntaxOn
@@ -9,7 +8,7 @@
\str_new:N \g__jlreq_complements_engine_str
\tl_new:N \g__jlreq_complements_finally
-\keys_define:nn { jlreq-complements } {
+\DeclareKeys [jlreq-complements] {
setupname .code:n = {
\str_set:Nn \g__jlreq_complements_setupname_str {#1}
},
@@ -20,8 +19,8 @@
lualatex .code:n = { \str_set:Nn \g__jlreq_complements_engine_str { lualatex } },
lualatex .value_forbidden:n = true,
}
-\keys_set:nn { jlreq-complements } { setupname = jlreqcomplementssetup }
-\ProcessKeysOptions { jlreq-complements }
+\SetKeys [jlreq-complements] { setupname = jlreqcomplementssetup }
+\ProcessKeyOptions [jlreq-complements]
\str_if_empty:NT \g__jlreq_complements_engine_str {
\jlreq at helper@guessengine
@@ -37,7 +36,8 @@
\str_if_eq:VnTF \g__jlreq_complements_engine_str { lualatex } {
\prg_new_conditional:Nnn \__jlreq_complements_iftdir: { T, F, TF} {
- \int_compare_p:n { (\ltjgetparameter{direction}-(\ltjgetparameter{direction}/8)*8) == 3 }
+ \int_compare:nTF { (\ltjgetparameter{direction}-(\ltjgetparameter{direction}/8)*8) == 3 }
+ { \prg_return_true: } { \prg_return_false: }
}
}{
\prg_new_conditional:Nnn \__jlreq_complements_iftdir: { T, F, TF} { \iftdir \prg_return_true: \else \prg_return_false: \fi }
Modified: trunk/Master/texmf-dist/tex/latex/jlreq/jlreq-trimmarks.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/jlreq/jlreq-trimmarks.sty 2024-08-23 20:58:28 UTC (rev 72090)
+++ trunk/Master/texmf-dist/tex/latex/jlreq/jlreq-trimmarks.sty 2024-08-23 20:58:43 UTC (rev 72091)
@@ -1,6 +1,5 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{jlreq-trimmarks}[2024/02/13 jlreq-trimmarks]
-\RequirePackage{l3keys2e}
+\ProvidesPackage{jlreq-trimmarks}[2024/08/23 jlreq-trimmarks]
\RequirePackage{jlreq-helpers}[2024/02/13]
\ExplSyntaxOn
@@ -42,13 +41,13 @@
}
% dvipdfmx=f，dvips=s，dviout = o, lualatex = l
-\keys_define:nn { jlreq-trimmarks } {
+\DeclareKeys [jlreq-trimmarks] {
dvipdfmx .code:n = {\let\jlreq at trimmarks@driver=f}, .value_forbidden:n = true,
dvips .code:n = {\let\jlreq at trimmarks@driver=s}, .value_forbidden:n = true,
dviout .code:n = {\let\jlreq at trimmarks@driver=o}, .value_forbidden:n = true
}
\let\jlreq at trimmarks@engine=\jlreq at engine
-\keys_define:nn { jlreq-trimmarks } {
+\DeclareKeys [jlreq-trimmarks] {
lualatex .code:n = {\let\jlreq at trimmarks@engine=l}, .value_forbidden:n = true,
uplatex .code:n = {\let\jlreq at trimmarks@engine=u}, .value_forbidden:n = true,
platex .code:n = {\let\jlreq at trimmarks@engine=p}, .value_forbidden:n = true
@@ -156,7 +155,7 @@
}
\__jlreq_trimmarks_afterpkg_addtodeletecs:N \jlreq at trimmarks@analyzepapersize
-\keys_define:nn { jlreq-trimmarks } { trimmarks_paper .tl_set:N = \jlreq at trimmarks@option at papersize }
+\DeclareKeys [jlreq-trimmarks] { trimmarks_paper .tl_set:N = \jlreq at trimmarks@option at papersize }
\__jlreq_trimmarks_afterpkg_addtodeletecs:N \jlreq at trimmarks@option at papersize
\newif\ifjlreq at trimmarks@digital \jlreq at trimmarks@digitaltrue
@@ -166,7 +165,7 @@
% flag: `show` is specified or not
\newif\ifjlreq at trimmarks@option at show \jlreq at trimmarks@option at showfalse
-\keys_define:nn { jlreq-trimmarks } {
+\DeclareKeys [jlreq-trimmarks] {
show .code:n = {
\jlreq at trimmarks@option at showtrue
\jlreq at ifempty{#1}{
@@ -214,14 +213,14 @@
}
\newif\ifjlreq at trimmarks@landscape \jlreq at trimmarks@landscapefalse
-\keys_define:nn { jlreq-trimmarks } { landscape .code:n = {\jlreq at trimmarks@landscapetrue}, .value_forbidden:n = true }
+\DeclareKeys [jlreq-trimmarks] { landscape .code:n = {\jlreq at trimmarks@landscapetrue}, .value_forbidden:n = true }
\__jlreq_trimmarks_afterpkg_addtodeleteif:N \ifjlreq at trimmarks@landscape
-\keys_set:nn { jlreq-trimmarks } {
+\SetKeys [jlreq-trimmarks] {
trimmarks_paper = {+2in},
bleed_margin = { top = 3mm, bottom = 3mm, gutter = 3mm, fore-edge = 3mm },
}
-\ProcessKeysOptions { jlreq-trimmarks }
+\ProcessKeyOptions [jlreq-trimmarks]
\ifjlreq at trimmarks@option at show\else
\ifx o\jlreq at trimmarks@driver
Modified: trunk/Master/texmf-dist/tex/latex/jlreq/jlreq.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/jlreq/jlreq.cls 2024-08-23 20:58:28 UTC (rev 72090)
+++ trunk/Master/texmf-dist/tex/latex/jlreq/jlreq.cls 2024-08-23 20:58:43 UTC (rev 72091)
@@ -5,28 +5,39 @@
%%
% (based on JLReq 20200811 https://www.w3.org/TR/2020/NOTE-jlreq-20200811/)
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{jlreq}[2024/02/16 jlreq]
-\RequirePackage{l3keys2e}
+\ProvidesClass{jlreq}[2024/08/23 jlreq]
\RequirePackage{etoolbox}
\RequirePackage{jlreq-helpers}[2024/02/13]
\ExplSyntaxOn
+\cs_new:Nn \l_jlreq_do: {}
\int_new:N \l__jlreq_tmpa_int
+\int_new:N \l__jlreq_tmpb_int
+\int_new:N \l__jlreq_tmpc_int
\tl_new:N \l__jlreq_tmpa_tl
\tl_new:N \l__jlreq_tmpb_tl
\tl_new:N \l__jlreq_tmpc_tl
-\cs_new:Nn \l_jlreq_do: {}
\str_new:N \l__jlreq_tmpa_str
\str_new:N \l__jlreq_tmpb_str
\str_new:N \l__jlreq_tmpc_str
-\bool_new:N \l_jlreq_tmpa_bool
-\clist_new:N \l_jlreq_tmpa_clist
+\bool_new:N \l__jlreq_tmpa_bool
+\bool_new:N \l__jlreq_tmpb_bool
+\bool_new:N \l__jlreq_tmpc_bool
+\clist_new:N \l__jlreq_tmpa_clist
+\clist_new:N \l__jlreq_tmpb_clist
+\clist_new:N \l__jlreq_tmpc_clist
\seq_new:N \l__jlreq_tmpa_seq
+\seq_new:N \l__jlreq_tmpb_seq
+\seq_new:N \l__jlreq_tmpc_seq
\dim_new:N \l__jlreq_tmpa_dim
-\skip_new:N \l_jlreq_tmpa_skip
-\box_new:N \l_jlreq_tmpa_box
-\box_new:N \l_jlreq_tmpb_box
-\box_new:N \l_jlreq_tmpc_box
+\dim_new:N \l__jlreq_tmpb_dim
+\dim_new:N \l__jlreq_tmpc_dim
+\skip_new:N \l__jlreq_tmpa_skip
+\skip_new:N \l__jlreq_tmpb_skip
+\skip_new:N \l__jlreq_tmpc_skip
+\box_new:N \l__jlreq_tmpa_box
+\box_new:N \l__jlreq_tmpb_box
+\box_new:N \l__jlreq_tmpc_box
\prop_new:N \l__jlreq_tmpa_prop
\prop_new:N \l__jlreq_tmpb_prop
\prop_new:N \l__jlreq_tmpc_prop
@@ -91,7 +102,8 @@
% ものは\jlreq at option@<key>に格納する．
% _とかは@に変換する．
% エンジン類
-\keys_define:nn { jlreq } {
+\DeclareKeys [jlreq] {
+ name.usage = load,
uplatex .code:n = { \let\jlreq at engine=u }, uplatex .value_forbidden:n = true,
platex .code:n = { \let\jlreq at engine=p }, platex .value_forbidden:n = true,
lualatex .code:n = { \let\jlreq at engine=l }, lualatex .value_forbidden:n = true,
@@ -115,13 +127,13 @@
\tl_gput_right:Nn \g__jlreq_papersizelist_tl { { ##1 } { \setlength{\paperwidth}{#3} \setlength{\paperheight}{#4} } }
}
\clist_map_inline:nn {#2} {
- \keys_define:nn { jlreq } {
+ \DeclareKeys [jlreq] {
##1 .code:n = { \setlength{\paperwidth}{#3} \setlength{\paperheight}{#4} },
##1 .value_forbidden:n = true
}
}
}
-\keys_define:nn { jlreq } {
+\DeclareKeys [jlreq] {
paper .code:n = {
\str_case:nVF {#1} \g__jlreq_papersizelist_tl {
\jlreq at helper@dividebycomma{#1}%
@@ -153,7 +165,7 @@
}
\clist_map_inline:nn {#2} {
\cs_set:Nx \l__jlreq_do: {
- \exp_not:N \keys_define:nn { jlreq } {
+ \exp_not:N \DeclareKeys [jlreq] {
##1 .code:n = {
\exp_not:o { \l__jlreq_tmpa:n {##1} }
\exp_not:n { \setlength{\paperwidth}{#3} \setlength{\paperheight}{#4} }
@@ -276,7 +288,7 @@
%.. フォントサイズ，行長，1ページあたりの行数で基本版面のサイズを決める（2.4.1.a）
\__jlreq_aftercls_addtodeletecs:N \jlreq at option@fontsize
-\keys_define:nn { jlreq } {
+\DeclareKeys [jlreq] {
fontsize .tl_set:N = \jlreq at option@fontsize,
10pt .code:n = {\def\jlreq at option@fontsize{10pt}}, 10pt .value_forbidden:n = true,
11pt .code:n = {\def\jlreq at option@fontsize{11pt}}, 11pt .value_forbidden:n = true,
@@ -287,25 +299,25 @@
\__jlreq_aftercls_addtodeletecs:N \jlreq at option@jafontsize
\__jlreq_aftercls_addtodeletecs:N \jlreq at option@jafontscale
%.. 行の長さ
-\keys_define:nn { jlreq } { line_length .tl_set:N = \jlreq at option@line at length }
+\DeclareKeys [jlreq] { line_length .tl_set:N = \jlreq at option@line at length }
\__jlreq_aftercls_addtodeletecs:N \jlreq at option@line at length
%.. 1ページあたりの行数
-\keys_define:nn { jlreq } { number_of_lines .tl_set:N = \jlreq at option@number at of@lines }
+\DeclareKeys [jlreq] { number_of_lines .tl_set:N = \jlreq at option@number at of@lines }
\__jlreq_aftercls_addtodeletecs:N \jlreq at option@number at of@lines
% 地の空き量，のどの空き量で配置位置を決める（2.4.1.b）省略されたら中央配置．
%.. 天
-\keys_define:nn { jlreq } { head_space .tl_set:N = \jlreq at option@head at space }
+\DeclareKeys [jlreq] { head_space .tl_set:N = \jlreq at option@head at space }
\__jlreq_aftercls_addtodeletecs:N \jlreq at option@head at space
%.. 地
-\keys_define:nn { jlreq } { foot_space .tl_set:N = \jlreq at option@foot at space }
+\DeclareKeys [jlreq] { foot_space .tl_set:N = \jlreq at option@foot at space }
\__jlreq_aftercls_addtodeletecs:N \jlreq at option@foot at space
%.. のど
-\keys_define:nn { jlreq } { gutter .tl_set:N = \jlreq at option@gutter }
+\DeclareKeys [jlreq] { gutter .tl_set:N = \jlreq at option@gutter }
\__jlreq_aftercls_addtodeletecs:N \jlreq at option@gutter
%.. 小口
\__jlreq_aftercls_addtodeletecs:N \jlreq at option@fore at edge
-\keys_define:nn { jlreq } {
+\DeclareKeys [jlreq] {
fore_edge .tl_set:N = \jlreq at option@fore at edge,
fore-edge .tl_set:N = \jlreq at option@fore at edge
}
@@ -312,37 +324,36 @@
%.. 柱とノンブル
% 本文とヘッダ/フッタの間の空き
-\keys_define:nn { jlreq } { headfoot_verticalposition .tl_set:N = \jlreq at option@headfoot at verticalpos }
+\DeclareKeys [jlreq] { headfoot_verticalposition .tl_set:N = \jlreq at option@headfoot at verticalpos }
\__jlreq_aftercls_addtodeletecs:N \jlreq at option@headfoot at verticalpos
% 柱やノンブルの左右の空き
-\keys_define:nn { jlreq } { headfoot_sidemargin .tl_set:N = \jlreq at headfoot@sidemargin }
+\DeclareKeys [jlreq] { headfoot_sidemargin .tl_set:N = \jlreq at headfoot@sidemargin }
%.. 段間
-\keys_define:nn { jlreq } { column_gap .tl_set:N = \jlreq at option@column at gap }
+\DeclareKeys [jlreq] { column_gap .tl_set:N = \jlreq at option@column at gap }
\__jlreq_aftercls_addtodeletecs:N \jlreq at option@column at gap
%.. 行送り，指定無しの場合は文字サイズの1.7倍とする．（1.5から2倍が好ましい：2.4.2.d 注3）
-\keys_define:nn { jlreq } {
- baselineskip .tl_set:N = \jlreq at option@baselineskip,
- linegap .code:n = { \def\jlreq at option@baselineskip{1zw + #1} }
+\DeclareKeys [jlreq] {
+ baselineskip .tl_set:N = \jlreqbaselineskip,
+ linegap .code:n = { \def\jlreqbaselineskip{1zw + #1} }
}
-\__jlreq_aftercls_addtodeletecs:N \jlreq at option@baselineskip
%.. 組み方系
% 行頭に括弧が来たときの配置：3.1.5
% 段落頭指定_折り返し行頭指定 で与える．
-\keys_define:nn { jlreq } { open_bracket_pos .choices:nn = {zenkaku_tentsuki,zenkakunibu_nibu,nibu_tentsuki}{\def\jlreq at open@bracket at pos{#1}} }
+\DeclareKeys [jlreq] { open_bracket_pos .choices:nn = {zenkaku_tentsuki,zenkakunibu_nibu,nibu_tentsuki}{\def\jlreq at open@bracket at pos{#1}} }
% ぶら下げ組みをするか：3.8.2 注1
\newif\ifjlreq at burasage\jlreq at burasagefalse
-\keys_define:nn { jlreq } { hanging_punctuation .code:n = {\jlreq at burasagetrue}, hanging_punctuation .value_forbidden:n = true}
+\DeclareKeys [jlreq] { hanging_punctuation .code:n = {\jlreq at burasagetrue}, hanging_punctuation .value_forbidden:n = true}
% jsarticleと同じkanjiskipを使う
\newif\ifjlreq at narrow@kanjiskip\jlreq at narrow@kanjiskipfalse
-\keys_define:nn { jlreq } { narrow_kanjiskip .code:n = {\jlreq at narrow@kanjiskiptrue}, narrow_kanjiskip .value_forbidden:n = true}
+\DeclareKeys [jlreq] { narrow_kanjiskip .code:n = {\jlreq at narrow@kanjiskiptrue}, narrow_kanjiskip .value_forbidden:n = true}
\__jlreq_aftercls_addtodeleteif:N \ifjlreq at narrow@kanjiskip
%.. 注
% 傍注のタイプ
-\keys_define:nn { jlreq } { sidenote_length .tl_set:N = \jlreq at option@sidenote at length }
+\DeclareKeys [jlreq] { sidenote_length .tl_set:N = \jlreq at option@sidenote at length }
\__jlreq_aftercls_addtodeletecs:N \jlreq at option@sidenote at length
%.. 逆ノンブル
@@ -349,7 +360,7 @@
\newif\ifjlreq at option@use at reverse@pagination
\__jlreq_aftercls_addtodeleteif:N \ifjlreq at option@use at reverse@pagination
\jlreq at option@use at reverse@paginationfalse
-\keys_define:nn { jlreq } { use_reverse_pagination .code:n = {\jlreq at option@use at reverse@paginationtrue}, use_reverse_pagination .value_forbidden:n = true }
+\DeclareKeys [jlreq] { use_reverse_pagination .code:n = {\jlreq at option@use at reverse@paginationtrue}, use_reverse_pagination .value_forbidden:n = true }
%.. もろもろ
\newif\if at restonecol\@restonecolfalse
@@ -358,7 +369,7 @@
\newif\if at tate \@tatefalse
\newif\ifjlreq at option@titlepage \jlreq at option@titlepagefalse % titlepageかnotitlepageかが指定された
\__jlreq_aftercls_addtodeleteif:N \ifjlreq at option@titlepage
-\keys_define:nn { jlreq } {
+\DeclareKeys [jlreq] {
landscape .code:n = {\@landscapetrue}, landscape .value_forbidden:n = true,
tombo .code:n = {\ClassWarningNoLine{jlreq}{The~option~`tombo'~is~not~supported~by~jlreq~class.~Please~use~the~jlreq-trimmarks~package}},
tombow .code:n = {\ClassWarningNoLine{jlreq}{The~option~`tombow'~is~not~supported~by~jlreq~class.~Please~use~the~jlreq-trimmarks~package}},
@@ -368,7 +379,7 @@
\newif\ifjlreq at option@twoside\jlreq at option@twosidefalse % onesideかtwosideが指定された
\__jlreq_aftercls_addtodeleteif:N \ifjlreq at option@twoside
-\keys_define:nn { jlreq } {
+\DeclareKeys [jlreq] {
oneside .code:n = { \@twosidefalse\@mparswitchfalse\jlreq at option@twosidetrue }, oneside .value_forbidden:n = true,
twoside .code:n = { \@twosidetrue\@mparswitchtrue\jlreq at option@twosidetrue }, twoside .value_forbidden:n = true,
onecolumn .code:n = { \@twocolumnfalse }, onecolumn .value_forbidden:n = true,
@@ -381,7 +392,7 @@
\newif\if at openright
\newif\ifjlreq at option@open \jlreq at option@openfalse % openrightかopenanyが指定された
\__jlreq_aftercls_addtodeleteif:N \ifjlreq at option@open
-\keys_define:nn { jlreq } {
+\DeclareKeys [jlreq] {
openright .code:n = { \@openrighttrue\jlreq at option@opentrue }, openright .value_forbidden:n = true,
openany .code:n = { \@openrightfalse\jlreq at option@opentrue }, openany .value_forbidden:n = true,
leqno .code:n = { \input{leqno.clo } }, leqno .value_forbidden:n = true,
@@ -389,12 +400,12 @@
}
\newif\ifjlreq at option@enablejfam \jlreq at option@enablejfamtrue
\__jlreq_aftercls_addtodeleteif:N \ifjlreq at option@enablejfam
-\keys_define:nn { jlreq } { disablejfam .code:n = { \jlreq at option@enablejfamfalse }, disablejfam .value_forbidden:n = true}
+\DeclareKeys [jlreq] { disablejfam .code:n = { \jlreq at option@enablejfamfalse }, disablejfam .value_forbidden:n = true}
\def\jlreq at note#1{}
-\keys_define:nn { jlreq } { jlreq_notes .code:n = { \def\jlreq at note##1{\message{^^JJLReq note: ##1^^J}}}, jlreq_notes .value_forbidden:n = true}
+\DeclareKeys [jlreq] { jlreq_notes .code:n = { \def\jlreq at note##1{\message{^^JJLReq note: ##1^^J}}}, jlreq_notes .value_forbidden:n = true}
-\keys_set:nn { jlreq } {
+\SetKeys [jlreq] {
article_type=article,paper=a4,
number_of_lines={},line_length = {},
head_space={},foot_space={},gutter={},fore_edge={},
@@ -402,8 +413,9 @@
sidenote_length=0pt,column_gap={2zw},
headfoot_verticalposition = {},headfoot_sidemargin={0pt},
open_bracket_pos=zenkaku_tentsuki,
- onecolumn,final }
-\ProcessKeysOptions { jlreq }
+ onecolumn,final
+}
+\ProcessKeyOptions [jlreq]
\legacy_if:nF { jlreq at option@titlepage } {
\str_if_eq:VnTF \jlreq at article@type { article } { \@titlepagefalse } { \@titlepagetrue }
@@ -1189,23 +1201,22 @@
% \baselineskipの計算
% いったん文字サイズを変更（(u)platexの際にzh/zwをきちんとするため）
\@setfontsize\normalsize{\jlreq at fontsize}{\jlreq at fontsize}%
-\newdimen\jlreq at baselineskip
+% 現在の\baselineskipを計算し#1に入れる
\ifx l\jlreq at engine
- \setlength{\jlreq at baselineskip}{%
- \dimexpr\directlua{
+ \edef\jlreqbaselineskip{
+ \directlua{
local~act = string.char(92)~
- local~s = [[\jlreq at option@baselineskip]]~
+ local~s = [[\jlreqbaselineskip]]~
s = s:gsub("[QH]",act .. "dimexpr 0.25mm" .. act .. "relax"):gsub("zh",act .. "zh"):gsub("zw",act .. "zw")~
- tex.print(s)~
- }\relax
- }%
-\else
- \setlength{\jlreq at baselineskip}{\dimexpr\jlreq at option@baselineskip\relax}
+ tex.print(act .. "unexpanded{" .. s .. "}")~
+ }
+ }
\fi
-\ifdim\jlreq at fontsize>\jlreq at baselineskip
+\dim_set:Nn \l__jlreq_tmpa_dim {\jlreqbaselineskip}
+\ifdim\jlreq at fontsize>\l__jlreq_tmpa_dim
\ClassError{jlreq}{The~baselineskip~is~less~than~fontsize}{\@ehc}%
\fi
-\bool_if:nT { \dim_compare_p:n { \jlreq at baselineskip < 1.5\zw } || \dim_compare_p:n { \jlreq at baselineskip > 2\zw } } {
+\bool_if:nT { \dim_compare_p:n { \l__jlreq_tmpa_dim < 1.5\zw } || \dim_compare_p:n { \l__jlreq_tmpa_dim > 2\zw } } {
\jlreq at note { 行間は二分以上全角以下が望ましい (2.4.2.d~注3)．}
}
@@ -1266,7 +1277,7 @@
\fi
\renewcommand{\normalsize}{%
- \@setfontsize\normalsize{\jlreq at fontsize}{\jlreq at baselineskip}%
+ \@setfontsize\normalsize{\jlreq at fontsize}{\dimexpr\jlreqbaselineskip\relax}%
\abovedisplayskip 1.1\jlreq at fontsize \@plus .3\jlreq at fontsize \@minus .4\jlreq at fontsize
\abovedisplayshortskip \z@ \@plus .3\jlreq at fontsize
\belowdisplayskip .9\jlreq at fontsize \@plus.3\jlreq at fontsize \@minus.4\jlreq at fontsize
@@ -1286,26 +1297,49 @@
% 2.5.2 \baselineskipは一定の方がよい？
% \@listiは再定義しないようにした．（\normalsizeと共用でJLReq通りだと思う．）
\newcommand{\footnotesize}{%
- \@setfontsize\footnotesize{.8\jlreq at fontsize}{\dimexpr 115\jlreq at baselineskip/170\relax}% 脚注文字サイズの二分より少し小さい値を行間に: 4.2.5.e
+ \setlength{\jlreq at tempdima}{\dimexpr\jlreqbaselineskip\relax}
+ \@setfontsize\footnotesize{.8\jlreq at fontsize}{\dimexpr 115\jlreq at tempdima/170\relax}% 脚注文字サイズの二分より少し小さい値を行間に: 4.2.5.e
\abovedisplayskip .6\jlreq at fontsize \@plus.2\jlreq at fontsize \@minus.4\jlreq at fontsize
\abovedisplayshortskip \z@ \@plus.1\jlreq at fontsize
\belowdisplayshortskip .3\jlreq at fontsize \@plus.1\jlreq at fontsize \@minus.2\jlreq at fontsize
\belowdisplayskip \abovedisplayskip}
-% tsize10.cloの引数を，そのまま\jlreq at fontsize/\jlreq at baselineskipでスケーリングしているだけ．
+% tsize10.cloの引数を，そのまま\jlreq at fontsize/\jlreqbaselineskipでスケーリングしているだけ．
\newcommand{\small}{%
% jsarticleのもの
- \@setfontsize\small{.9\jlreq at fontsize}{\dimexpr 13\jlreq at baselineskip/17\relax}%
+ \setlength{\jlreq at tempdima}{\dimexpr\jlreqbaselineskip\relax}
+ \@setfontsize\small{.9\jlreq at fontsize}{\dimexpr 13\jlreq at tempdima/17\relax}%
\abovedisplayskip .9\jlreq at fontsize \@plus.3\jlreq at fontsize \@minus.4\jlreq at fontsize
\abovedisplayshortskip \z@ \@plus.3\jlreq at fontsize
\belowdisplayshortskip \abovedisplayshortskip
\belowdisplayskip \abovedisplayskip}
-\newcommand{\scriptsize}{\@setfontsize\scriptsize{\dimexpr 7\jlreq at fontsize/10\relax}{\dimexpr 8\jlreq at baselineskip/17\relax}}
-\newcommand{\tiny}{\@setfontsize\tiny{\dimexpr 5\jlreq at fontsize/10\relax}{\dimexpr 6\jlreq at baselineskip/17\relax}}
-\newcommand{\large}{\@setfontsize\large{\dimexpr12\jlreq at fontsize/10\relax}{\jlreq at baselineskip}}
-\newcommand{\Large}{\@setfontsize\Large{\dimexpr14\jlreq at fontsize/10\relax}{\dimexpr 21\jlreq at baselineskip/17\relax}}
-\newcommand{\LARGE}{\@setfontsize\LARGE{\dimexpr17\jlreq at fontsize/10\relax}{\dimexpr 25\jlreq at baselineskip/17\relax}}
-\newcommand{\huge}{\@setfontsize\huge{2\jlreq at fontsize}{\dimexpr 28\jlreq at baselineskip/17\relax}}
-\newcommand{\Huge}{\@setfontsize\Huge{\dimexpr 25\jlreq at fontsize/10\relax}{\dimexpr 33\jlreq at baselineskip/17\relax}}
+\newcommand{\scriptsize}{
+ \setlength{\jlreq at tempdima}{\dimexpr\jlreqbaselineskip\relax}
+ \@setfontsize\scriptsize{\dimexpr 7\jlreq at fontsize/10\relax}{\dimexpr 8\jlreq at tempdima/17\relax}
+}
+\newcommand{\tiny}{
+ \setlength{\jlreq at tempdima}{\dimexpr\jlreqbaselineskip\relax}
+ \@setfontsize\tiny{\dimexpr 5\jlreq at fontsize/10\relax}{\dimexpr 6\jlreq at tempdima/17\relax}
+}
+\newcommand{\large}{
+ \setlength{\jlreq at tempdima}{\dimexpr\jlreqbaselineskip\relax}
+ \@setfontsize\large{\dimexpr12\jlreq at fontsize/10\relax}{\jlreq at tempdima}
+}
+\newcommand{\Large}{
+ \setlength{\jlreq at tempdima}{\dimexpr\jlreqbaselineskip\relax}
+ \@setfontsize\Large{\dimexpr14\jlreq at fontsize/10\relax}{\dimexpr 21\jlreq at tempdima/17\relax}
+}
+\newcommand{\LARGE}{
+ \setlength{\jlreq at tempdima}{\dimexpr\jlreqbaselineskip\relax}
+ \@setfontsize\LARGE{\dimexpr17\jlreq at fontsize/10\relax}{\dimexpr 25\jlreq at tempdima/17\relax}
+}
+\newcommand{\huge}{
+ \setlength{\jlreq at tempdima}{\dimexpr\jlreqbaselineskip\relax}
+ \@setfontsize\huge{2\jlreq at fontsize}{\dimexpr 28\jlreq at tempdima/17\relax}
+}
+\newcommand{\Huge}{
+ \setlength{\jlreq at tempdima}{\dimexpr\jlreqbaselineskip\relax}
+ \@setfontsize\Huge{\dimexpr 25\jlreq at fontsize/10\relax}{\dimexpr 33\jlreq at tempdima/17\relax}
+}
%. plextから拝借
\def\jlreq at Kanji#1{\expandafter\kansuji\csname c@#1\endcsname}
@@ -1833,42 +1867,32 @@
%.. 別行見出し
% \jlreq at BlockHeading@start：別行見出しを出力する命令．
-% \jlreq at BlockHeading@start{1 = 命令名}{2 = レベル}{3 = スペース関連}{4 = カウンタ関連}{5 = フォーマット関連}{6 = 全体フォーマット}*{見出し}[副題]
+% \jlreq at BlockHeading@start{1 = 命令名}{2 = レベル}{3 = スペース関連}{4 = カウンタ関連}*[running head]{見出し}[副題]
% カウンタ関連=-,*,無し：-はカウンタ関連を処理しない．*はさらに目次に追加しない（星付き命令と同様）．星付きで呼び出された時は常に*同等．
% スペース関連={配置:lcr（左中央右）}{字下げ（寸法）}{字上げ（寸法）}{前空き}{後空き}{行取りの行数}{空か*か，偶数ページでも改ページを許可するならば空}
% 前/後空きはprefixにa:/s:/r:が入る．r:は空きがその値そのものになる．a:/s:は行取りに加えて入る．a:で指定された空きはページ行頭では入らない
% 後空きの時はs:は指定できない．
-% フォーマット関連：
-% フォーマット関連={{ラベルのみのフォーマット}{ラベルフォーマット}{見出し文字列フォーマット}{見出し文字列フォーマット（ラベル無し）}{副題フォーマット}{副題フォーマット（ラベル無し）}}{{前フォーマットラベルあり}{前フォーマットラベルなし}{見出し全体のフォーマット}{後ろフォーマットラベルあり}{後ろフォーマットラベルなし}}
+% フォーマット関連：あらかじめマクロに入れておく
+% \jlreq at BlockHeading@start at eachformat: {ラベルのみのフォーマット}{ラベルフォーマット}{見出し文字列フォーマット}{見出し文字列フォーマット（ラベル無し）}{副題フォーマット}{副題フォーマット（ラベル無し）}
+% \jlreq at BlockHeading@start at format: {前フォーマットラベルあり}{前フォーマットラベルなし}{見出し全体のフォーマット}{後ろフォーマットラベルあり}{後ろフォーマットラベルなし}
+% \jlreq at BlockHeading@start at totalformat: 全体フォーマット
% 見出しそのものは「全体フォーマット」に従い出力される．パラメータトークン#1を含み，#1=見出し本体：スペース関連と上の「見出し全体のフォーマット」に基づいて整形される．
% 見出し全体のフォーマット内では#1=ラベル，#2=見出し文字列，#3=副題，それぞれ各々のフォーマットに基づき整形される．
% ラベルフォーマットでは#1=カウンタ名，見出し文字列フォーマットでは#1=見出し文字列，副題フォーマットでは#1=副題
% ラベルのみのフォーマットは目次に使われる．
-\long\def\jlreq at BlockHeading@start#1#2#3#4#5#6{%
- \if at noskipsec\leavevmode\fi
- % #5と#6は\parを含むかもしれないので引数渡しはしない（後の\@ifstarで詰まる）
- \edef\jlreq at BlockHeading@start at eachformat{\exp_not:o {\@firstoftwo#5}}%
- \edef\jlreq at BlockHeading@start at format{\exp_not:o {\@secondoftwo#5}}%
- \edef\jlreq at BlockHeading@start at totalformat{\unexpanded{#6}}%
- \jlreq at BlockHeading@start@{#1}{#2}{#3}{#4}%
-}
-% {1 = 命令}{2 = レベル}{3 = スペース関連}
-\long\def\jlreq at BlockHeading@start@#1#2#3#4{%
- \@ifstar{\@dblarg{\jlreq at BlockHeading@start@@{#1}{#2}{#3}{*}}}{\@dblarg{\jlreq at BlockHeading@start@@{#1}{#2}{#3}{#4}}}%
-}
% {1 = 命令}{2 = レベル}{3 = スペース関連}{4 = *}[5 = running head]{6 = 見出し}
-\long\def\jlreq at BlockHeading@start@@#1#2#3#4[#5]#6{%
- \@ifnextchar[{\jlreq at BlockHeading@start@@@{#1}{#2}{#3}{#4}{#5}{#6}}{\jlreq at BlockHeading@start@@@{#1}{#2}{#3}{#4}{#5}{#6}[]}%
+\long\def\jlreq at BlockHeading@start#1#2#3#4[#5]#6{%
+ \@ifnextchar[{\jlreq at BlockHeading@start at i{#1}{#2}{#3}{#4}{#5}{#6}}{\jlreq at BlockHeading@start at i{#1}{#2}{#3}{#4}{#5}{#6}[]}%
}
% {1 = 命令}{2 = レベル}{3 = スペース関連}{4 = *}{5 = running head}{6 = 見出し}[7 = 副題]
-\long\def\jlreq at BlockHeading@start@@@#1#2#3#4#5#6[#7]{%
- \edef\jlreq at do{\unexpanded{\jlreq at BlockHeading@start@@@@{#1}{#2}{#3}}{\exp_not:o {\jlreq at BlockHeading@start at totalformat}}}%
+\long\def\jlreq at BlockHeading@start at i#1#2#3#4#5#6[#7]{%
+ \edef\jlreq at do{\unexpanded{\jlreq at BlockHeading@start at ii{#1}{#2}{#3}}{\exp_not:o {\jlreq at BlockHeading@start at totalformat}}}%
\jlreq at do{#4}{#5}{#6}{#7}%
}
% {1 = 命令}{2 = レベル}{3 = スペース関連}{4 = 全フォーマット}{5 = *}{6 = running head}{7 = 見出し}{8 = 副題}
-\long\def\jlreq at BlockHeading@start@@@@#1#2#3#4#5#6#7#8{%
+\long\def\jlreq at BlockHeading@start at ii#1#2#3#4#5#6#7#8{%
\global\advance\jlreq at BlockHeading@spaces at current@count by 1
\tl_gput_right:Nn \jlreq at BlockHeading@spaces at current@sequence {_#1}%
\edef\jlreq at tempa##1##2##3##4##5##6##7{%
@@ -2200,10 +2224,6 @@
\jlreq at ifgluezero\jlreq at tempskipb{}{\vskip\jlreq at tempskipb}%
\edef\jlreq at do{%
\dim_compare:nF { \parskip=0pt } {
-% \exp_not:N \cs_set:Nn \exp_not:N \g__jlreq_gyodori_hook_par: {
-% \noexpand\parskip=\the\parskip\noexpand\relax
-% \exp_not:n { \cs_set:Nn \g__jlreq_gyodori_hook_par: {} }
-% }
\exp_not:N \AddToHook { para/before } { \noexpand\parskip=\the\parskip\noexpand\relax }
\noexpand\parskip=0pt
}
@@ -2210,8 +2230,6 @@
}%
\expandafter}\jlreq at do
}
-%\cs_set:Nn \g__jlreq_gyodori_hook_par: {}
-%\PushPostHook{par}{\g__jlreq_gyodori_hook_par:}
% 行取り情報をゲットだぜ
@@ -2498,6 +2516,31 @@
\def\jlreq at totalformat@after{}%
}%
\fi
+ % フォーマットを指定のマクロに入れる命令群
+ \tl_set:Nx \l__jlreq_tmpa_tl {
+ \exp_not:n {\edef\jlreq at BlockHeading@start at eachformat}{\exp_not:N \unexpanded{%
+ {\exp_not:o {\jlreq at label@format}}{\exp_not:o {\jlreq at label@format at modified}}%
+ {\exp_not:o {\jlreq at heading@text at format@wlabel}}{\exp_not:o {\jlreq at heading@text at format@wolabel}}%
+ {\exp_not:o {\jlreq at subtitle@format at wlabel}}{\exp_not:o {\jlreq at subtitle@format at wolabel}}%
+ }}%
+ \exp_not:n {\edef\jlreq at BlockHeading@start at format}{\exp_not:N \unexpanded{%
+ {\exp_not:o {\jlreq at pre@format at wlabel}}{\exp_not:o {\jlreq at pre@format at wolabel}}%
+ {\exp_not:o {\jlreq at format}}%
+ {}{}%
+ }}%
+ \exp_not:n {\edef\jlreq at BlockHeading@start at totalformat}{\exp_not:N \unexpanded{%
+ {\exp_not:n {
+ \par
+ \addpenalty\@secpenalty
+ \addvspace{0pt}\relax % 改ページ関係（#54,#100），よくわかっていない
+ }}
+ {\exp_not:o {\jlreq at totalformat}}{\exp_not:o {\jlreq at totalformat@after}}%
+ }}%
+ }
+ % \jlreq at BlockHeading@startの第四引数
+ \tl_set:Nx \l__jlreq_tmpb_tl {
+ {\exp_not:o {\jlreq at align}}{\exp_not:o {\jlreq at indent}}{\exp_not:o {\jlreq at end@indent}}\exp_not:o {\jlreq at spaceset}{\exp_not:o {\jlreq at allowbreak@evenpage}}
+ }
\edef\jlreq at do{%
\exp_not:o {\jlreq at do}%
\noexpand\edef\exp_not:c {jlreq at headingcs@#1}{\noexpand\unexpanded{%
@@ -2504,28 +2547,15 @@
\exp_not:N \g__jlreq_hook_beforeheading:n {#1}
\exp_not:o {\jlreq at pagebreak}%
\tl_if_empty:NF \l__jlreq_pagestyle_tl { \exp_not:N \thispagestyle {\exp_not:o { \l__jlreq_pagestyle_tl } } }
- \unexpanded{\jlreq at BlockHeading@start{#1}{#2}}%
- {{\exp_not:o {\jlreq at align}}{\exp_not:o {\jlreq at indent}}{\exp_not:o {\jlreq at end@indent}}\exp_not:o {\jlreq at spaceset}{\exp_not:o {\jlreq at allowbreak@evenpage}}}%
- {\ifjlreq at number\else -\fi}%
- {%
- {%
- {\exp_not:o {\jlreq at label@format}}{\exp_not:o {\jlreq at label@format at modified}}%
- {\exp_not:o {\jlreq at heading@text at format@wlabel}}{\exp_not:o {\jlreq at heading@text at format@wolabel}}%
- {\exp_not:o {\jlreq at subtitle@format at wlabel}}{\exp_not:o {\jlreq at subtitle@format at wolabel}}%
- }%
- {%
- {\exp_not:o {\jlreq at pre@format at wlabel}}{\exp_not:o {\jlreq at pre@format at wolabel}}%
- {\exp_not:o {\jlreq at format}}%
- {}{}%
- }%
- }%
- {{\exp_not:n {
- \par
- \addpenalty\@secpenalty
- \addvspace{0pt}\relax % 改ページ関係（#54,#100），よくわかっていない
- }}{\exp_not:o {\jlreq at totalformat}}{\exp_not:o {\jlreq at totalformat@after}}}%
- }}%
- \noexpand\def\exp_not:c {#1}{\exp_not:c {jlreq at headingcs@#1}}%
+ \exp_not:o \l__jlreq_tmpa_tl
+ \exp_not:N \@ifstar
+ {\exp_not:N \@dblarg{\exp_not:N \jlreq at BlockHeading@start{\exp_not:n {#1}}{\exp_not:n {#2}}{\exp_not:o {\l__jlreq_tmpb_tl}}{*}}}%
+ {\exp_not:N \@dblarg{\exp_not:N \jlreq at BlockHeading@start{\exp_not:n {#1}}{\exp_not:n {#2}}{\exp_not:o {\l__jlreq_tmpb_tl}}{\ifjlreq at number\else -\fi}}}%
+ }
+ }%
+ \noexpand\def\exp_not:c {#1}{
+ \exp_not:c {jlreq at headingcs@#1}
+ }%
}%
\expandafter\endgroup
\jlreq at do
@@ -3027,8 +3057,8 @@
\cs_set:Nn \__jlreq_CutinHeading_start_aux:nnnnnn{%
% 一行で処理したときの見出し長さを計測
\group_begin:
- \hbox_set:Nn \l_jlreq_tmpa_box {#1#6}
- \dim_set:Nn \l__jlreq_tmpa_dim { \box_wd:N \l_jlreq_tmpa_box}
+ \hbox_set:Nn \l__jlreq_tmpa_box {#1#6}
+ \dim_set:Nn \l__jlreq_tmpa_dim { \box_wd:N \l__jlreq_tmpa_box}
% 何行必要かを\l__jlreq_cutinheading_linecount_tlに入れる
\dim_compare:nTF { \l__jlreq_tmpa_dim > #5} {
\tl_set:Nn \l__jlreq_cutinheading_linecount_tl {3}
@@ -3038,31 +3068,31 @@
} { \tl_set:Nn \l__jlreq_cutinheading_linecount_tl {1} } }
% \l__jlreq_tmpa_dimが実際の一行の長さに近い
\dim_set:Nn \l__jlreq_tmpa_dim { \l__jlreq_tmpa_dim / \l__jlreq_cutinheading_linecount_tl }
- % \l_jlreq_tmpb_boxに見出し部分を，\l__jlreq_cutinheading_linecount_tlに見出し自身に何行使うかを入れる
+ % \l__jlreq_tmpb_boxに見出し部分を，\l__jlreq_cutinheading_linecount_tlに見出し自身に何行使うかを入れる
\int_compare:nTF { \l__jlreq_cutinheading_linecount_tl = 1 }{
- \vbox_set:Nn \l_jlreq_tmpb_box {\parindent=0pt\rightskip=0pt\leftskip=0pt\box_use_drop:N \l_jlreq_tmpa_box}
+ \vbox_set:Nn \l__jlreq_tmpb_box {\parindent=0pt\rightskip=0pt\leftskip=0pt\box_use_drop:N \l__jlreq_tmpa_box}
\tl_set:Nn \l__jlreq_cutinheading_linecount_tl {2}
}{
\jlreq at inlinenote@determinelength{#6}{#1}{}{\l__jlreq_cutinheading_linecount_tl}{\l__jlreq_cutinheading_linecount_tl}{\l__jlreq_tmpa_dim}{\linewidth}%
- \box_set_eq:NN \l_jlreq_tmpb_box \jlreq at resultbox
+ \box_set_eq:NN \l__jlreq_tmpb_box \jlreq at resultbox
\tl_set:Nn \l__jlreq_cutinheading_linecount_tl {3}
}
% 普通の一行の高さ/深さに合わせて見出しのボックスを作る
- \setbox\l_jlreq_tmpa_box =\vtop to \dimexpr\numexpr\l__jlreq_cutinheading_linecount_tl - 1\relax\baselineskip + 1\jlreq at zh\relax{\skip_vertical:n {0pt~plus~1fill~minus~1fill} \box_use_drop:N \l_jlreq_tmpb_box \skip_vertical:n {0pt~plus~1fill~minus~1fill}}%
+ \setbox\l__jlreq_tmpa_box =\vtop to \dimexpr\numexpr\l__jlreq_cutinheading_linecount_tl - 1\relax\baselineskip + 1\jlreq at zh\relax{\skip_vertical:n {0pt~plus~1fill~minus~1fill} \box_use_drop:N \l__jlreq_tmpb_box \skip_vertical:n {0pt~plus~1fill~minus~1fill}}%
% 高さを通常の一行のそれにする
- \hbox_set:Nn \l_jlreq_tmpc_box {阿}
- \box_set_dp:Nn \l_jlreq_tmpa_box { \box_ht:N \l_jlreq_tmpa_box + \box_dp:N \l_jlreq_tmpa_box - \box_ht:N \l_jlreq_tmpc_box }
- \box_set_ht:Nn \l_jlreq_tmpa_box { \box_ht:N \l_jlreq_tmpc_box }
+ \hbox_set:Nn \l__jlreq_tmpc_box {阿}
+ \box_set_dp:Nn \l__jlreq_tmpa_box { \box_ht:N \l__jlreq_tmpa_box + \box_dp:N \l__jlreq_tmpa_box - \box_ht:N \l__jlreq_tmpc_box }
+ \box_set_ht:Nn \l__jlreq_tmpa_box { \box_ht:N \l__jlreq_tmpc_box }
\noindent
\hspace*{#2}%
- \box_use:N \l_jlreq_tmpa_box
+ \box_use:N \l__jlreq_tmpa_box
\hspace*{#3}%
% でかい見出しボックスの分をキャンセルする空きを入れる
- % \baselineskip - box_ht:N \l_jlreq_tmpc_boxはTeXが挿入するスキップの分
+ % \baselineskip - box_ht:N \l__jlreq_tmpc_boxはTeXが挿入するスキップの分
\cs_set:Nx \l__jlreq_do:{
\exp_not:N \par
- \exp_not:N \skip_vertical:n {\dim_eval:n {-\box_ht:N \l_jlreq_tmpa_box - \box_dp:N \l_jlreq_tmpa_box - \baselineskip + \box_ht:N \l_jlreq_tmpc_box}}
- \exp_not:N\hangindent= \dim_eval:n {#2 + \box_wd:N \l_jlreq_tmpa_box + #3} \exp_not:N \relax
+ \exp_not:N \skip_vertical:n {\dim_eval:n {-\box_ht:N \l__jlreq_tmpa_box - \box_dp:N \l__jlreq_tmpa_box - \baselineskip + \box_ht:N \l__jlreq_tmpc_box}}
+ \exp_not:N\hangindent= \dim_eval:n {#2 + \box_wd:N \l__jlreq_tmpa_box + #3} \exp_not:N \relax
\exp_not:N\hangafter=-\l__jlreq_cutinheading_linecount_tl\relax
}%
\exp_after:wN \group_end:
@@ -3136,14 +3166,14 @@
\str_set:Nn \l__jlreq_tmpa_str {#2}
\str_case_e:nn { \jlreq at HeadingType {#1} } {
{ BlockHeading } {
- \bool_set_false:N \l_jlreq_tmpa_bool
- \str_if_in:NnT \l__jlreq_tmpa_str { before_space= } { \bool_set_true:N \l_jlreq_tmpa_bool }
- \str_if_in:NnT \l__jlreq_tmpa_str { before_space~= } { \bool_set_true:N \l_jlreq_tmpa_bool }
- \bool_if:NT \l_jlreq_tmpa_bool {\tl_put_left:Nn \l__jlreq_tmpa_tl {before_lines={},} }
- \bool_set_false:N \l_jlreq_tmpa_bool
- \str_if_in:NnT \l__jlreq_tmpa_str { after_space= } { \bool_set_true:N \l_jlreq_tmpa_bool }
- \str_if_in:NnT \l__jlreq_tmpa_str { after_space~= } { \bool_set_true:N \l_jlreq_tmpa_bool }
- \bool_if:NT \l_jlreq_tmpa_bool {\tl_put_left:Nn \l__jlreq_tmpa_tl {after_lines={},}}
+ \bool_set_false:N \l__jlreq_tmpa_bool
+ \str_if_in:NnT \l__jlreq_tmpa_str { before_space= } { \bool_set_true:N \l__jlreq_tmpa_bool }
+ \str_if_in:NnT \l__jlreq_tmpa_str { before_space~= } { \bool_set_true:N \l__jlreq_tmpa_bool }
+ \bool_if:NT \l__jlreq_tmpa_bool {\tl_put_left:Nn \l__jlreq_tmpa_tl {before_lines={},} }
+ \bool_set_false:N \l__jlreq_tmpa_bool
+ \str_if_in:NnT \l__jlreq_tmpa_str { after_space= } { \bool_set_true:N \l__jlreq_tmpa_bool }
+ \str_if_in:NnT \l__jlreq_tmpa_str { after_space~= } { \bool_set_true:N \l__jlreq_tmpa_bool }
+ \bool_if:NT \l__jlreq_tmpa_bool {\tl_put_left:Nn \l__jlreq_tmpa_tl {after_lines={},}}
}
}
\cs_set:Nx \l_jlreq_do: {
@@ -3998,7 +4028,7 @@
% \jlreq at resultboxに整形結果を返す（垂直ボックス）．見つからなかったらvoid．\globalに設定する．
\long\def\jlreq at inlinenote@determinelength#1#2#3#4#5#6#7{%
\begingroup
- % \message{#1 の試行開始，行数 = #5, \the\dimexpr#6\relax から \the\dimexpr#7\relaxまで}%
+% \message{#1 の試行開始，行数 = #5, \the\dimexpr#6\relax から \the\dimexpr#7\relax まで（長さ\the\dimexpr #7 - #6\relax ）}%
\@tempcnta=1\relax
\def\@tempa{}%
% 調整に使う行の\parshape指定を\@tempaに入れる．長さは\jlreq at tempdima．
@@ -4019,12 +4049,12 @@
\parindent=0pt\leftskip=0pt\rightskip=0pt
\parshape #5~#3~\@tempa 0pt~\the\maxdimen
#1\par\global\@tempcntb=\prevgraf}%
- % \message{\string\jlreq at tempdima = \the\jlreq at tempdima で試行，行数は\the\@tempcntb , 書式 #5 #3 \@tempa 0pt \the\maxdimen}%
+% \message{\string\jlreq at tempdima = \the\jlreq at tempdima で試行，行数は\the\@tempcntb , 書式~#5~#3~\@tempa~0pt~\the\maxdimen}%
\fi
\jlreq at getlastbox{\@tempboxa}%
\setbox\jlreq at tempboxa=\box\jlreq at resultbox
\ifnum\@tempcntb<#5\relax% 行数が達していないならOK
- % \message{行数 = \the\@tempcntb により確定}
+% \message{行数 = \the\@tempcntb により確定}
% #5行になるまで空の水平ボックスを加えていく．
\global\setbox\jlreq at resultbox=\vbox{#2%
\unvbox\@tempboxa\hbox{\unhbox\jlreq at tempboxa\unskip\unskip\unpenalty}%
@@ -4034,7 +4064,7 @@
% そうでない場合は最後の二行の長さを比較する
\jlreq at getlastbox{\@tempboxa}%
\setbox\jlreq at tempboxb=\box\jlreq at resultbox
- % \message{最終行の長さ \the\wd\jlreq at tempboxa, その前の長さ \the\wd\jlreq at tempboxb}%
+% \message{最終行の長さ \the\wd\jlreq at tempboxa, その前の長さ \the\wd\jlreq at tempboxb}%
\ifdim\wd\jlreq at tempboxa>\wd\jlreq at tempboxb
\advance\jlreq at tempdima by 0.3pt\relax% 0.3ptに意味はない
\else
@@ -6194,17 +6224,17 @@
\ltj at setpar@global
\cs_set:Nn \l_jlreq_do: {}
\tl_if_empty:nF {#1} {
- \skip_set:Nn \l_jlreq_tmpa_skip { #1 }
+ \skip_set:Nn \l__jlreq_tmpa_skip { #1 }
\cs_set:Nx \l_jlreq_do: { \exp_not:o \l_jlreq_do:
- \exp_not:N \cs_set:Npn \exp_not:N \jlreqkanjiskip { \skip_use:N \l_jlreq_tmpa_skip }
- \exp_not:N \ltjsetkanjiskip \skip_use:N \l_jlreq_tmpa_skip
+ \exp_not:N \cs_set:Npn \exp_not:N \jlreqkanjiskip { \skip_use:N \l__jlreq_tmpa_skip }
+ \exp_not:N \ltjsetkanjiskip \skip_use:N \l__jlreq_tmpa_skip
}
}
\tl_if_empty:nF {#2} {
- \skip_set:Nn \l_jlreq_tmpa_skip { #2 }
+ \skip_set:Nn \l__jlreq_tmpa_skip { #2 }
\cs_set:Nx \l_jlreq_do: { \exp_not:o \l_jlreq_do:
- \exp_not:N \cs_set:Npn \exp_not:N \jlreqxkanjiskip { \skip_use:N \l_jlreq_tmpa_skip }
- \exp_not:N \ltjsetxkanjiskip \skip_use:N \l_jlreq_tmpa_skip
+ \exp_not:N \cs_set:Npn \exp_not:N \jlreqxkanjiskip { \skip_use:N \l__jlreq_tmpa_skip }
+ \exp_not:N \ltjsetxkanjiskip \skip_use:N \l__jlreq_tmpa_skip
}
}
\exp_after:wN \group_end:
@@ -6215,17 +6245,17 @@
\group_begin:
\cs_set:Nn \l_jlreq_do: {}
\tl_if_empty:nF {#1} {
- \skip_set:Nn \l_jlreq_tmpa_skip { #1 }
+ \skip_set:Nn \l__jlreq_tmpa_skip { #1 }
\cs_set:Nx \l_jlreq_do: { \exp_not:o \l_jlreq_do:
- \exp_not:N \cs_set:Npx \exp_not:N \jlreqkanjiskip { \skip_use:N \l_jlreq_tmpa_skip }
- \exp_not:N \skip_set:Nn \exp_not:N \kanjiskip { \skip_use:N \l_jlreq_tmpa_skip }
+ \exp_not:N \cs_set:Npx \exp_not:N \jlreqkanjiskip { \skip_use:N \l__jlreq_tmpa_skip }
+ \exp_not:N \skip_set:Nn \exp_not:N \kanjiskip { \skip_use:N \l__jlreq_tmpa_skip }
}
}
\tl_if_empty:nF {#2} {
- \skip_set:Nn \l_jlreq_tmpa_skip { #2 }
+ \skip_set:Nn \l__jlreq_tmpa_skip { #2 }
\cs_set:Nx \l_jlreq_do: { \exp_not:o \l_jlreq_do:
- \exp_not:N \cs_set:Npx \exp_not:N \jlreqxkanjiskip { \skip_use:N \l_jlreq_tmpa_skip }
- \exp_not:N \skip_set:Nn \exp_not:N \xkanjiskip { \skip_use:N \l_jlreq_tmpa_skip }
+ \exp_not:N \cs_set:Npx \exp_not:N \jlreqxkanjiskip { \skip_use:N \l__jlreq_tmpa_skip }
+ \exp_not:N \skip_set:Nn \exp_not:N \xkanjiskip { \skip_use:N \l__jlreq_tmpa_skip }
}
}
\exp_after:wN \group_end:
More information about the tex-live-commits
mailing list.