texlive[54964] Master/texmf-dist: jlreq (1may20)
commits+karl at tug.org
commits+karl at tug.org
Fri May 1 23:33:56 CEST 2020
Revision: 54964
http://tug.org/svn/texlive?view=revision&revision=54964
Author: karl
Date: 2020-05-01 23:33:56 +0200 (Fri, 01 May 2020)
Log Message:
-----------
jlreq (1may20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/jlreq/README-ja.md
trunk/Master/texmf-dist/doc/latex/jlreq/README.md
trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html
trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.pdf
trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.html
trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.md
trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.html
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/source/latex/jlreq/Makefile
trunk/Master/texmf-dist/tex/latex/jlreq/jlreq-helpers.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 2020-05-01 21:30:00 UTC (rev 54963)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/README-ja.md 2020-05-01 21:33:56 UTC (rev 54964)
@@ -178,9 +178,13 @@
### 定理環境
`\jlreqsetup`で指定します．
* `theorem_beforeafter_space=<寸法>`：定理環境の前後の空きを指定します．
+* `theorem_label_font=<フォント設定コード>`：定理環境のラベル部分のフォントを設定します．
+* `theorem_font=<フォント設定コード>`：定理環境本体のフォントを設定します．
+`amsthm`パッケージが読み込まれると，新しい定理スタイル`jlreq`が定義され，現在のスタイルが`jlreq`へと変更されます．このとき，上記設定はこの`jlreq`スタイルへの設定として機能します．
+
### 前付きなど
-`\fontmatter` / `\mainmatter` / `\backmatter` / `\appendix`での処理を`\jlreqsetup`で指定できます．
+`\frontmatter` / `\mainmatter` / `\backmatter` / `\appendix`での処理を`\jlreqsetup`で指定できます．
* `frontmatter_pagebreak=[cleardoublepage/clearpage/]`：`\frontmatter`実行時の改ページを実行する命令名を指定します．空にすると何もしません．
* `frontmatter_counter={<カウンタ名>={value=<値>, the=<コード>, restore=[true/false]},...}`：`\frontmatter`時でのカウンタの操作を指定します．例えば`chapter={value=0,the={[\arabic{chapter]}}`とすると，`chapter`カウンタの値が`0`になり，`\thechapter`が`[\arabic{chapter}]`となります．デフォルトでは`\mainmatter`時に値と`\the<カウンタ名>`の定義を戻しますが，`restore=false`とするとこの動きが抑制されます．
* `frontmatter_heading={<見出し命令名>={<設定>},...}`：見出し命令の動きを変更します．`\Delare***Heading`で指定できる項目の他以下を受け付けます．
@@ -472,6 +476,9 @@
- `\rmfamily`などの再定義をやめ，`\@rmfamilyhook`などにコードを挿入することにした．
- `\parskip`を`0pt`に変更．
- バグ修正．
+* 2020-05-01
+ - `\jlreqsetup`に`theorem_label_font`と`theorem_font`を追加．
+ - バグ修正．
--------------
Noriyuki Abe
Modified: trunk/Master/texmf-dist/doc/latex/jlreq/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/README.md 2020-05-01 21:30:00 UTC (rev 54963)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/README.md 2020-05-01 21:33:56 UTC (rev 54964)
@@ -124,6 +124,9 @@
- Removed the redefinitions `\rmfamily` etc and added a code to `\@rmfamilyhook`.
- Changed `\parskip` to `0pt`.
- Fixed bugs.
+* 2020-05-01
+ - Added `theorem_label_font` and `theorem_font` to `\jlreqsetup`.
+ - Fixed bugs.
--------------
Noriyuki Abe
Modified: trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html 2020-05-01 21:30:00 UTC (rev 54963)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html 2020-05-01 21:33:56 UTC (rev 54964)
@@ -240,9 +240,12 @@
<p><code>\jlreqsetup</code>で指定します．</p>
<ul>
<li><code>theorem_beforeafter_space=<寸法></code>：定理環境の前後の空きを指定します．</li>
+<li><code>theorem_label_font=<フォント設定コード></code>：定理環境のラベル部分のフォントを設定します．</li>
+<li><code>theorem_font=<フォント設定コード></code>：定理環境本体のフォントを設定します．</li>
</ul>
+<p><code>amsthm</code>パッケージが読み込まれると，新しい定理スタイル<code>jlreq</code>が定義され，現在のスタイルが<code>jlreq</code>へと変更されます．このとき，上記設定はこの<code>jlreq</code>スタイルへの設定として機能します．</p>
<h3 id="前付きなど">前付きなど</h3>
-<p><code>\fontmatter</code> / <code>\mainmatter</code> / <code>\backmatter</code> / <code>\appendix</code>での処理を<code>\jlreqsetup</code>で指定できます．</p>
+<p><code>\frontmatter</code> / <code>\mainmatter</code> / <code>\backmatter</code> / <code>\appendix</code>での処理を<code>\jlreqsetup</code>で指定できます．</p>
<ul>
<li><code>frontmatter_pagebreak=[cleardoublepage/clearpage/]</code>：<code>\frontmatter</code>実行時の改ページを実行する命令名を指定します．空にすると何もしません．</li>
<li><code>frontmatter_counter={<カウンタ名>={value=<値>, the=<コード>, restore=[true/false]},...}</code>：<code>\frontmatter</code>時でのカウンタの操作を指定します．例えば<code>chapter={value=0,the={[\arabic{chapter]}}</code>とすると，<code>chapter</code>カウンタの値が<code>0</code>になり，<code>\thechapter</code>が<code>[\arabic{chapter}]</code>となります．デフォルトでは<code>\mainmatter</code>時に値と<code>\the<カウンタ名></code>の定義を戻しますが，<code>restore=false</code>とするとこの動きが抑制されます．</li>
@@ -570,6 +573,11 @@
<li><code>\parskip</code>を<code>0pt</code>に変更．</li>
<li>バグ修正．</li>
</ul></li>
+<li>2020-05-01
+<ul>
+<li><code>\jlreqsetup</code>に<code>theorem_label_font</code>と<code>theorem_font</code>を追加．</li>
+<li>バグ修正．</li>
+</ul></li>
</ul>
<hr />
<p>Noriyuki Abe <a href="https://github.com/abenori/jlreq">https://github.com/abenori/jlreq</a></p>
Modified: trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.html
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.html 2020-05-01 21:30:00 UTC (rev 54963)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.html 2020-05-01 21:33:56 UTC (rev 54964)
@@ -231,6 +231,12 @@
<li><code>\jlreqtrimmarkssetup</code>内の<code>banner</code>を更に拡張．</li>
<li><code>bleed_margin</code>を拡張．</li>
</ul></li>
+<li>2020-05-01
+<ul>
+<li><code>\jlreqtrimmarkssetup</code>の<code>banner</code>を使わない場合，<code>\@bannertoken</code>の中身を偶奇ページ両方に出力するようにした．</li>
+<li><code>\jlreqtrimmarkssetup</code>の<code>banner</code>を使う場合，<code>\@bannertoken</code>の中身を無視するようにした．</li>
+<li><code>\jlreqtrimmarkssetup</code>の<code>banner_font</code>が指定された場合，<code>\@bannerfont</code>を無視するようにした．</li>
+</ul></li>
</ul>
<hr />
<p>Noriyuki Abe <a href="https://github.com/abenori/jlreq">https://github.com/abenori/jlreq</a></p>
Modified: trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.md 2020-05-01 21:30:00 UTC (rev 54963)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.md 2020-05-01 21:33:56 UTC (rev 54964)
@@ -157,8 +157,11 @@
* 2019-04-01
- `\jlreqtrimmarkssetup`内の`banner`を更に拡張．
- `bleed_margin`を拡張．
+* 2020-05-01
+ - `\jlreqtrimmarkssetup`の`banner`を使わない場合，`\@bannertoken`の中身を偶奇ページ両方に出力するようにした．
+ - `\jlreqtrimmarkssetup`の`banner`を使う場合，`\@bannertoken`の中身を無視するようにした．
+ - `\jlreqtrimmarkssetup`の`banner_font`が指定された場合，`\@bannerfont`を無視するようにした．
-
--------------
Noriyuki Abe
https://github.com/abenori/jlreq
Modified: trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.html
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.html 2020-05-01 21:30:00 UTC (rev 54963)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.html 2020-05-01 21:33:56 UTC (rev 54964)
@@ -124,7 +124,7 @@
<li>If <code><paper size></code> is empty (e.g. <code>trimmarks_paper=+2cm</code>), the current paper size (which is specified usually by the option for the document class) is used.</li>
</ul>
<h3 id="landscape"><code>landscape</code></h3>
-<p>Swap the width and the height. This swaps only the width and height which is specified with the option <code>trimmarks_paper</code>. For example, <code>landscape,trimmarks_paper=+{2cm,1cm}</code>, adds 1cm to the height and 2cm to the width. But the current paper size is not swapped.</p>
+<p>Swap the width and the height. This swaps only the width and height which is specified with the option <code>trimmarks_paper</code>. For example, <code>landscape,trimmarks_paper=+{1cm,2cm}</code>, adds 1cm to the height and 2cm to the width. But the current paper size is not swapped.</p>
<h3 id="show"><code>show</code></h3>
<p>Specify the types of trim marks which the package outputs. It is specified with the comma separated list like <code>show={trimmarks,banner,digital}</code>. If no argument is given, everything will be showed.</p>
<ul>
@@ -225,6 +225,14 @@
<li>Extended <code>bleed_margin</code>．</li>
</ul></li>
</ul>
+<ul>
+<li>2020-05-01
+<ul>
+<li><code>jlreq-trimmarks</code> outputs the contents in <code>\@bannertoken</code> when <code>banner</code> in <code>\jlreqtrimmarkssetup</code> is not used.</li>
+<li><code>\@bannertoken</code> is ignored when <code>banner</code> in <code>\jlreqtrimmarkssetup</code> is used.</li>
+<li><code>\@bannerfont</code> is ignored when <code>banner_font</code> in <code>\jlreqtrimmarkssetup</code> is used.</li>
+</ul></li>
+</ul>
<hr />
<p>Noriyuki Abe <a href="https://github.com/abenori/jlreq">https://github.com/abenori/jlreq</a></p>
</article>
Modified: trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.md 2020-05-01 21:30:00 UTC (rev 54963)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.md 2020-05-01 21:33:56 UTC (rev 54964)
@@ -46,7 +46,7 @@
* If `<paper size>` is empty (e.g. `trimmarks_paper=+2cm`), the current paper size (which is specified usually by the option for the document class) is used.
### `landscape`
-Swap the width and the height. This swaps only the width and height which is specified with the option `trimmarks_paper`. For example, `landscape,trimmarks_paper=+{2cm,1cm}`, adds 1cm to the height and 2cm to the width. But the current paper size is not swapped.
+Swap the width and the height. This swaps only the width and height which is specified with the option `trimmarks_paper`. For example, `landscape,trimmarks_paper=+{1cm,2cm}`, adds 1cm to the height and 2cm to the width. But the current paper size is not swapped.
### `show`
Specify the types of trim marks which the package outputs. It is specified with the comma separated list like `show={trimmarks,banner,digital}`. If no argument is given, everything will be showed.
@@ -151,8 +151,11 @@
* 2019-04-01
- Extended `banner` in `\jlreqtrimmarkssetup`.
- Extended `bleed_margin`．
+- 2020-05-01
+ - `jlreq-trimmarks` outputs the contents in `\@bannertoken` when `banner` in `\jlreqtrimmarkssetup` is not used.
+ - `\@bannertoken` is ignored when `banner` in `\jlreqtrimmarkssetup` is used.
+ - `\@bannerfont` is ignored when `banner_font` in `\jlreqtrimmarkssetup` is used.
-
--------------
Noriyuki Abe
https://github.com/abenori/jlreq
Modified: trunk/Master/texmf-dist/doc/latex/jlreq/jlreq.html
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/jlreq.html 2020-05-01 21:30:00 UTC (rev 54963)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/jlreq.html 2020-05-01 21:33:56 UTC (rev 54964)
@@ -228,6 +228,11 @@
<li>Changed <code>\parskip</code> to <code>0pt</code>.</li>
<li>Fixed bugs.</li>
</ul></li>
+<li>2020-05-01
+<ul>
+<li>Added <code>theorem_label_font</code> and <code>theorem_font</code> to <code>\jlreqsetup</code>.</li>
+<li>Fixed bugs.</li>
+</ul></li>
</ul>
<hr />
<p>Noriyuki Abe <a href="https://github.com/abenori/jlreq">https://github.com/abenori/jlreq</a></p>
Modified: trunk/Master/texmf-dist/doc/latex/jlreq/jlreq.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/jlreq/Makefile
===================================================================
--- trunk/Master/texmf-dist/source/latex/jlreq/Makefile 2020-05-01 21:30:00 UTC (rev 54963)
+++ trunk/Master/texmf-dist/source/latex/jlreq/Makefile 2020-05-01 21:33:56 UTC (rev 54964)
@@ -143,7 +143,7 @@
install: jfm-install cls-install sty-install
-tds: jfm jlreq.cls README.md README-ja.md LICENSE jlreq.html jlreq-ja.html jlreq-trimmarks.html jlreq-trimmarks-ja.html jlreq.pdf jlreq-ja.pdf jlreq-trimmarks.pdf jlreq-trimmarks-ja.pdf
+tds: jfm jlreq.cls README.md README-ja.md LICENSE jlreq.html jlreq-ja.html jlreq-trimmarks.html jlreq-trimmarks-ja.html jlreq.pdf jlreq-ja.pdf
mkdir -p ./tds/fonts/tfm/public/jlreq
cp -f *.tfm ./tds/fonts/tfm/public/jlreq
mkdir -p ./tds/fonts/vf/public/jlreq
Modified: trunk/Master/texmf-dist/tex/latex/jlreq/jlreq-helpers.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/jlreq/jlreq-helpers.sty 2020-05-01 21:30:00 UTC (rev 54963)
+++ trunk/Master/texmf-dist/tex/latex/jlreq/jlreq-helpers.sty 2020-05-01 21:33:56 UTC (rev 54964)
@@ -73,12 +73,22 @@
\expandafter\expandafter\expandafter\jlreq at ifmacro@noargument@\jlreq at getfirsttoken#1\jlreq at uniqtoken{}\jlreq at endmark@
}}}
\long\def\jlreq at ifmacro@noargument@#1{\expandafter\jlreq at ifmacro@noargument@@\expandafter{\meaning #1}}
-\edef\jlreq at do{%
- \unexpanded{\def\jlreq at ifmacro@noargument@@}##1{\noexpand\jlreq at ifmacro@noargument@@@##1\expandonce{\detokenize{macro:->}}\noexpand\jlreq at endmark}
- \unexpanded{\def\jlreq at ifmacro@noargument@@@}##1\expandonce{\detokenize{macro:->}}##2\noexpand\jlreq at endmark{\noexpand\jlreq at ifempty{##1}}
+\def\@tempa#1{%
+ \def\jlreq at ifmacro@noargument@@##1{\jlreq at ifmacro@noargument@@@##1#1\noexpand\jlreq at endmark}
+ \def\jlreq at ifmacro@noargument@@@##1#1##2\jlreq at endmark{\jlreq at ifempty{##1}}
}
+\edef\jlreq at do{\noexpand\@tempa{\detokenize{macro:->}}}
\jlreq at do
+% こちらは単にマクロか
+\def\@tempa#1{%
+ \long\def\jlreq at ifmacro##1{\jlreq at ifempty{##1}{\@secondoftwo}{\expandafter\jlreq at ifmacro@i\meaning##1#1\jlreq at endmark}}
+ \long\def\jlreq at ifmacro@i##1#1##2\jlreq at endmark{\jlreq at ifempty{##1}}
+}
+\edef\jlreq at do{\noexpand\@tempa{\detokenize{macro:}}}
+\jlreq at do
+
+
% #1（skipレジスタ）が0か（展開不可）．
\newcommand*\jlreq at ifgluezero[1]{%
\begingroup
Modified: trunk/Master/texmf-dist/tex/latex/jlreq/jlreq-trimmarks.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/jlreq/jlreq-trimmarks.sty 2020-05-01 21:30:00 UTC (rev 54963)
+++ trunk/Master/texmf-dist/tex/latex/jlreq/jlreq-trimmarks.sty 2020-05-01 21:33:56 UTC (rev 54964)
@@ -1,5 +1,5 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{jlreq-trimmarks}[2019/04/01 jlreq-trimmarks]
+\ProvidesPackage{jlreq-trimmarks}[2020/05/01 jlreq-trimmarks]
\RequirePackage{xkeyval,etoolbox}
\RequirePackage{jlreq-helpers}
@@ -33,16 +33,10 @@
\@ifclassloaded{jlreq}{\let\ifjlreq at trimmarks@jlreqloaded=\@firstoftwo}{\let\ifjlreq at trimmarks@jlreqloaded=\@secondoftwo}
-\def\ifjlreq at trimmarks@tate@{%
- \if at tate\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi
-}
+\def\ifjlreq at trimmarks@tate@{\jlreq at if{\if at tate\fi}}%
% \@firstoftwo when \if at tate is defined and \if at tate=\iftrue
\def\ifjlreq at trimmarks@tate{%
- \ifnum0\ifx\if at tate\@undefined 1\fi\ifx\if at tate\relax 1\fi>0
- \expandafter\@secondoftwo
- \else
- \expandafter\ifjlreq at trimmarks@tate@
- \fi
+ \jlreq at if{\ifnum0\ifx\if at tate\@undefined 1\fi\ifx\if at tate\relax 1\fi>0 \fi}{\@secondoftwo}{\ifjlreq at trimmarks@tate@}%
}
@@ -256,9 +250,9 @@
}%
}%
}{#3}%
- \ifx\jlreq at do\@empty
+ \jlreq at if{\ifx\jlreq at do\@empty\fi}{%
\appto\jlreq at do{\jlreq at trimmarks@setbanner@@{yoko@#1}{yoko@#2}{#3}}%
- \fi
+ }{}%
\expandafter\endgroup
\jlreq at do
}
@@ -277,9 +271,9 @@
}%
}%
}{#3}%
- \ifx\jlreq at do\@empty
+ \jlreq at if{\ifx\jlreq at do\@empty\fi}{
\appto\jlreq at do{\jlreq at trimmarks@setbanner@@{before@#1}{before@#2}{#3}}%
- \fi
+ }{}%
\expandafter\endgroup
\jlreq at do
}
@@ -296,12 +290,12 @@
}%
}%
}{#3}%
- \ifx\jlreq at do\@empty
+ \jlreq at if{\ifx\jlreq at do\@empty\fi}{
\appto\jlreq at do{%
\expandafter\edef\csname jlreq at trimmarks@banner at odd@#1\endcsname{\unexpanded{#3}}%
\expandafter\edef\csname jlreq at trimmarks@banner at even@#2\endcsname{\unexpanded{#3}}%
}%
- \fi
+ }{}%
\expandafter\endgroup
\jlreq at do
}
@@ -326,11 +320,9 @@
}%
}%
}%
- \@bannertoken{}%
\def\jlreq at do{}%
\jlreq at parsekeyval@nokey{%
\ifjlreq at parsekeyval@nokey at novalue{}{%
- \jlreq at tempafalse
\edef\jlreq at gutterodd{\ifjlreq at trimmarks@tate{right}{left}}%
\if at twoside
\edef\jlreq at guttereven{\ifjlreq at trimmarks@tate{left}{right}}%
@@ -338,8 +330,8 @@
\let\jlreq at guttereven\jlreq at gutterodd
\fi
\jlreq at switch*{####1}{
- {top-left}{\jlreq at tempatrue\appto\jlreq at do{\jlreq at trimmarks@setbanner{top at left}{top at left}{####2}}}
- {left-top}{\jlreq at tempatrue\appto\jlreq at do{\jlreq at trimmarks@setbanner{top at left}{top at left}{####2}}}
+ {top-left}{\appto\jlreq at do{\jlreq at trimmarks@setbanner{top at left}{top at left}{####2}}}
+ {left-top}{\appto\jlreq at do{\jlreq at trimmarks@setbanner{top at left}{top at left}{####2}}}
{top-right}{\appto\jlreq at do{\jlreq at trimmarks@setbanner{top at right}{top at right}{####2}}}
{right-top}{\appto\jlreq at do{\jlreq at trimmarks@setbanner{top at right}{top at right}{####2}}}
{top-gutter}{\appto\jlreq at do{\jlreq at trimmarks@setbanner{top@\jlreq at gutterodd}{top@\jlreq at guttereven}{####2}}}
@@ -367,17 +359,12 @@
{center-fore-edge}{\appto\jlreq at do{\jlreq at trimmarks@setbanner@{center@\jlreq at guttereven}{center@\jlreq at gutterodd}{####2}}}
{fore-edge-center}{\appto\jlreq at do{\jlreq at trimmarks@setbanner@{center@\jlreq at guttereven}{center@\jlreq at gutterodd}{####2}}}
}%
- \ifjlreq at tempa
- \appto\jlreq at do{\expandafter\@bannertoken\expandafter{\jlreq at trimmarks@banner at odd@yoko at top@left}}%
- \fi
}%
}{##1}%
- \ifx\jlreq at do\@empty
- \jlreq at trimmarks@setbanner{top at left}{##1}%
- \expandafter\@bannertoken\expandafter{\jlreq at trimmarks@banner at odd@yoko at top@left}%
- \else
- \jlreq at do
- \fi
+ \jlreq at if{\ifx\jlreq at do\@empty\fi}{
+ \appto\jlreq at do{\jlreq at trimmarks@setbanner{top at left}{top at left}{##1}}%
+ }{}%
+ \jlreq at do
}
{banner_font}{\def\jlreq at trimmarks@bannerfont{##1}}
{trimmarks_width}{\setlength{\@tombowwidth}{##1}}
@@ -418,12 +405,13 @@
}{#1}%
}
\@onlypreamble\jlreqtrimmarkssetup
+\@bannertoken{%
+ \jobname\space(\number\year-\two at digits\month-\two at digits\day
+ \space\two at digits\hour:\two at digits\minute)%
+}
\jlreqtrimmarkssetup{
- banner={%
- \jobname\space(\number\year-\two at digits\month-\two at digits\day
- \space\two at digits\hour:\two at digits\minute)%
- },
- banner_font={},
+ banner={\the\@bannertoken},
+ banner_font={\@bannerfont},
color={}
}
@@ -461,7 +449,7 @@
}{
\def\@tombowreset@@paper{%
\@@topmargin\topmargin
- \iftombow
+ \jlreq at if{\iftombow\fi}{
\@@paperwidth\paperwidth
\advance\@@paperwidth 2\dimexpr\@tombowbleed\relax
\@@paperheight\paperheight \advance\@@paperheight 10mm\relax
@@ -468,7 +456,7 @@
\advance\@@paperheight 2\dimexpr\@tombowbleed\relax
% 1in -> 1truein
\advance\@@topmargin 1truein\relax \advance\@themargin 1truein\relax
- \fi
+ }{}%
}
}
\fi
@@ -484,21 +472,21 @@
\setlength{\stockheight}{\dimexpr\jlreq at trimmarks@paperheight\relax}
\def\jlreq at trimmarks@outputbanner#1#2{%
- \iftombowdate
+ \jlreq at if{\iftombowdate\fi}{%
\expandafter\let\expandafter\jlreq at tempa\csname jlreq at trimmarks@banner@\ifodd\c at page odd\else even\fi @#1\endcsname
- \ifx\jlreq at tempa\@empty\else
+ \jlreq at if{\ifx\jlreq at tempa\@empty\fi}{}{%
\def\@tempa##1{#2}%
\expandafter\@tempa\expandafter{\jlreq at tempa}%
- \fi
- \fi
+ }%
+ }{}%
}
\def\jlreq at trimmarks@bleed{3mm}
% left=gutter?
\def\ifjlreq at trimmarks@leftisgutter{%
\ifjlreq at trimmarks@tate{%
- \ifnum 0\ifodd\c at page 1\fi\if at twoside\else 1\fi>0 \expandafter\@secondoftwo\else\expandafter\@firstoftwo\fi
+ \jlreq at if{\ifnum 0\ifodd\c at page 1\fi\if at twoside\else 1\fi>0 \fi}{\@secondoftwo}{\@firstoftwo}%
}{%
- \ifnum 0\ifodd\c at page 1\fi\if at twoside\else 1\fi>0 \expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi
+ \jlreq at if{\ifnum 0\ifodd\c at page 1\fi\if at twoside\else 1\fi>0 \fi}{\@firstoftwo}{\@secondoftwo}%
}%
}
\def\jlreq at trimmarks@bleed at left{\ifjlreq at trimmarks@leftisgutter{\jlreq at trimmarks@bleed at gutter}{\expandafter\csname jlreq at trimmarks@bleed at fore-edge\endcsname}}
@@ -516,15 +504,13 @@
\yoko\hss
\vrule width\dimexpr 10mm + \jlreq at trimmarks@bleed at left\relax height\@tombowwidth depth\z@
\vrule height10mm width\@tombowwidth depth\z@
- \iftombowdate
- \setbox\jlreq at tempboxa=\hbox to\z@{\hskip5mm\@bannerfont\jlreq at trimmarks@bannerfont
- \ifodd\c at page\the\@bannertoken\else\jlreq at trimmarks@banner at even@yoko at top@left\fi
- \hss}%
+ \jlreq at trimmarks@outputbanner{yoko at top@left}{%
+ \setbox\jlreq at tempboxa=\hbox to\z@{\hskip5mm\jlreq at trimmarks@bannerfont##1\hss}%
\dp\jlreq at tempboxa=0pt
\raise 4pt\box\jlreq at tempboxa
- \fi
+ }%
\jlreq at trimmarks@outputbanner{inyoko at top@left}{%
- \setbox\jlreq at tempboxa=\hbox to 0pt{\@bannerfont\jlreq at trimmarks@bannerfont##1\hss}%
+ \setbox\jlreq at tempboxa=\hbox to 0pt{\jlreq at trimmarks@bannerfont##1\hss}%
\jlreq at tempdima=\dimexpr\ht\jlreq at tempboxa + \jlreq at trimmarks@bleed at top\relax
\ht\jlreq at tempboxa=0pt \dp\jlreq at tempboxa=0pt
\raise-\jlreq at tempdima\box\jlreq at tempboxa
@@ -537,12 +523,12 @@
\yoko
\vrule width10mm height\@tombowwidth depth\z@
\jlreq at trimmarks@outputbanner{before at top@center}{%
- \setbox\jlreq at tempboxa=\hbox to 0pt{\hss\@bannerfont\jlreq at trimmarks@bannerfont##1\hskip 5mm}%
+ \setbox\jlreq at tempboxa=\hbox to 0pt{\hss\jlreq at trimmarks@bannerfont##1\hskip 5mm}%
\ht\jlreq at tempboxa=0pt \dp\jlreq at tempboxa=0pt \wd\jlreq at tempboxa=0pt
\raise 4pt\box\jlreq at tempboxa
}%
\jlreq at trimmarks@outputbanner{in at top@center}{%
- \setbox\jlreq at tempboxa=\hbox{\@bannerfont\jlreq at trimmarks@bannerfont##1}%
+ \setbox\jlreq at tempboxa=\hbox{\jlreq at trimmarks@bannerfont##1}%
\jlreq at tempdima=\dimexpr\ht\jlreq at tempboxa + \jlreq at trimmarks@bleed at top\relax
\jlreq at tempdimb=0.5\wd\jlreq at tempboxa
\ht\jlreq at tempboxa=0pt \dp\jlreq at tempboxa=0pt \wd\jlreq at tempboxa=0pt
@@ -550,7 +536,7 @@
}%
\vrule height10mm width\@tombowwidth depth\z@
\jlreq at trimmarks@outputbanner{after at top@center}{%
- \setbox\jlreq at tempboxa=\hbox to 0pt{\hskip 5mm\@bannerfont\jlreq at trimmarks@bannerfont##1\hss}%
+ \setbox\jlreq at tempboxa=\hbox to 0pt{\hskip 5mm\jlreq at trimmarks@bannerfont##1\hss}%
\ht\jlreq at tempboxa=0pt \dp\jlreq at tempboxa=0pt \wd\jlreq at tempboxa=0pt
\raise 4pt\box\jlreq at tempboxa
}%
@@ -562,12 +548,12 @@
\setbox\jlreq at tempboxa=\hbox to\z@{% \@TR
\yoko
\jlreq at trimmarks@outputbanner{yoko at top@right}{%
- \setbox\jlreq at tempboxa=\hbox to 0pt{\yoko\hss\@bannerfont\jlreq at trimmarks@bannerfont##1\hskip 5mm}%
+ \setbox\jlreq at tempboxa=\hbox to 0pt{\yoko\hss\jlreq at trimmarks@bannerfont##1\hskip 5mm}%
\ht\jlreq at tempboxa=0pt \dp\jlreq at tempboxa=0pt
\raise 4pt\box\jlreq at tempboxa
}%
\jlreq at trimmarks@outputbanner{inyoko at top@right}{%
- \setbox\jlreq at tempboxa=\hbox to 0pt{\yoko\hss\@bannerfont\jlreq at trimmarks@bannerfont##1}%
+ \setbox\jlreq at tempboxa=\hbox to 0pt{\yoko\hss\jlreq at trimmarks@bannerfont##1}%
\jlreq at tempdima=\dimexpr\jlreq at trimmarks@bleed at top + \ht\jlreq at tempboxa\relax
\ht\jlreq at tempboxa=0pt \dp\jlreq at tempboxa=0pt
\raise-\jlreq at tempdima\box\jlreq at tempboxa
@@ -574,7 +560,7 @@
}%
\vrule height10mm width\@tombowwidth depth\z@
\jlreq at trimmarks@outputbanner{corner at top@right}{%
- \setbox\jlreq at tempboxa=\hbox to 0pt{\hskip\dimexpr\jlreq at trimmarks@bleed at right + 4pt\relax\@bannerfont\jlreq at trimmarks@bannerfont##1\hss}%
+ \setbox\jlreq at tempboxa=\hbox to 0pt{\hskip\dimexpr\jlreq at trimmarks@bleed at right + 4pt\relax\jlreq at trimmarks@bannerfont##1\hss}%
\ht\jlreq at tempboxa=0pt \dp\jlreq at tempboxa=0pt
\raise 4pt\box\jlreq at tempboxa
}%
@@ -590,13 +576,13 @@
\yoko\hss
\vrule width10mm height\@tombowwidth depth\z@
\jlreq at trimmarks@outputbanner{corner at top@left}{%
- \setbox\jlreq at tempboxa=\hbox to 0pt{\hss\@bannerfont\jlreq at trimmarks@bannerfont##1\hskip 4pt}%
+ \setbox\jlreq at tempboxa=\hbox to 0pt{\hss\jlreq at trimmarks@bannerfont##1\hskip 4pt}%
\dp\jlreq at tempboxa=0pt \ht\jlreq at tempboxa=0pt
\raise\dimexpr \jlreq at trimmarks@bleed at top + 4pt\relax\box\jlreq at tempboxa
}%
\vrule height\dimexpr 10mm + \jlreq at trimmarks@bleed at top\relax width\@tombowwidth depth\z@
\jlreq at trimmarks@outputbanner{tate at top@left}{%
- \setbox\jlreq at tempboxa=\hbox to 0pt{\tate\adjustbaseline\@bannerfont\jlreq at trimmarks@bannerfont##1\hss}%
+ \setbox\jlreq at tempboxa=\hbox to 0pt{\tate\adjustbaseline\jlreq at trimmarks@bannerfont##1\hss}%
\ifx l\jlreq at trimmarks@engine
\jlreq at tempdima=\dimexpr 4pt + \ht\jlreq at tempboxa\relax
\else
@@ -606,7 +592,7 @@
\kern-\jlreq at tempdima\raise-5mm\box\jlreq at tempboxa\kern\jlreq at tempdima
}%
\jlreq at trimmarks@outputbanner{intate at top@left}{%
- \setbox\jlreq at tempboxa=\hbox to 0pt{\tate\adjustbaseline\@bannerfont\jlreq at trimmarks@bannerfont##1\hss}%
+ \setbox\jlreq at tempboxa=\hbox to 0pt{\tate\adjustbaseline\jlreq at trimmarks@bannerfont##1\hss}%
\jlreq at tempdima=\dimexpr\jlreq at trimmarks@bleed at left \ifx l\jlreq at trimmarks@engine + \ht\jlreq at tempboxa\fi\relax
\wd\jlreq at tempboxa=0pt \ht\jlreq at tempboxa=0pt \dp\jlreq at tempboxa=0pt
\kern\jlreq at tempdima\box\jlreq at tempboxa\kern-\jlreq at tempdima
@@ -616,13 +602,13 @@
\hbox to\z@{% \@Tr
\yoko
\jlreq at trimmarks@outputbanner{tate at top@right}{%
- \setbox\jlreq at tempboxa=\hbox to 0pt{\tate\adjustbaseline\@bannerfont\jlreq at trimmarks@bannerfont##1\hss}%
+ \setbox\jlreq at tempboxa=\hbox to 0pt{\tate\adjustbaseline\jlreq at trimmarks@bannerfont##1\hss}%
\jlreq at tempdima=\dimexpr 4pt \ifx l\jlreq at trimmarks@engine + \dp\jlreq at tempboxa\fi\relax
\ht\jlreq at tempboxa=0pt \dp\jlreq at tempboxa=0pt \wd\jlreq at tempboxa=0pt
\kern\jlreq at tempdima\raise -5mm\box\jlreq at tempboxa\kern-\jlreq at tempdima
}%
\jlreq at trimmarks@outputbanner{intate at top@right}{%
- \setbox\jlreq at tempboxa=\hbox to 0pt{\tate\adjustbaseline\@bannerfont\jlreq at trimmarks@bannerfont##1\hss}%
+ \setbox\jlreq at tempboxa=\hbox to 0pt{\tate\adjustbaseline\jlreq at trimmarks@bannerfont##1\hss}%
\ifx l\jlreq at trimmarks@engine
\jlreq at tempdima=\dimexpr\jlreq at trimmarks@bleed at top + \ht\jlreq at tempboxa\relax
\else
@@ -642,7 +628,7 @@
\yoko\hss
\vrule width10mm height.5\@tombowwidth depth.5\@tombowwidth
\jlreq at trimmarks@outputbanner{before at center@left}{%
- \setbox\jlreq at tempboxa=\hbox to 0pt{\tate\hss\adjustbaseline\@bannerfont\jlreq at trimmarks@bannerfont##1\hskip 5mm}%
+ \setbox\jlreq at tempboxa=\hbox to 0pt{\tate\hss\adjustbaseline\jlreq at trimmarks@bannerfont##1\hskip 5mm}%
\ifx l\jlreq at trimmarks@engine
\jlreq at tempdima=\dimexpr 4pt + \ht\jlreq at tempboxa\relax
\else
@@ -652,7 +638,7 @@
\kern-\jlreq at tempdima\box\jlreq at tempboxa\kern\jlreq at tempdima
}%
\jlreq at trimmarks@outputbanner{after at center@left}{%
- \setbox\jlreq at tempboxa=\hbox to 0pt{\tate\hskip 5mm\adjustbaseline\@bannerfont\jlreq at trimmarks@bannerfont##1\hss}%
+ \setbox\jlreq at tempboxa=\hbox to 0pt{\tate\hskip 5mm\adjustbaseline\jlreq at trimmarks@bannerfont##1\hss}%
\ifx l\jlreq at trimmarks@engine
\jlreq at tempdima=\dimexpr 4pt + \ht\jlreq at tempboxa\relax
\else
@@ -663,7 +649,7 @@
}%
\vrule height10mm depth10mm width\@tombowwidth
\jlreq at trimmarks@outputbanner{in at center@left}{%
- \setbox\jlreq at tempboxa=\hbox{\tate\adjustbaseline\@bannerfont\jlreq at trimmarks@bannerfont##1}%
+ \setbox\jlreq at tempboxa=\hbox{\tate\adjustbaseline\jlreq at trimmarks@bannerfont##1}%
\ifx l\jlreq at trimmarks@engine
\jlreq at tempdima=\dimexpr\jlreq at trimmarks@bleed at left + \ht\jlreq at tempboxa\relax
\jlreq at tempdimb=.5\wd\jlreq at tempboxa
@@ -679,7 +665,7 @@
\hbox to\z@{% \@CR
\yoko
\jlreq at trimmarks@outputbanner{in at center@right}{%
- \setbox\jlreq at tempboxa=\hbox{\tate\adjustbaseline\@bannerfont\jlreq at trimmarks@bannerfont##1}%
+ \setbox\jlreq at tempboxa=\hbox{\tate\adjustbaseline\jlreq at trimmarks@bannerfont##1}%
\ifx l\jlreq at trimmarks@engine
\jlreq at tempdima=\dimexpr\jlreq at trimmarks@bleed at right + \ht\jlreq at tempboxa\relax
\jlreq at tempdimb=0.5\wd\jlreq at tempboxa
@@ -692,13 +678,13 @@
}%
\vrule height10mm depth10mm width\@tombowwidth
\jlreq at trimmarks@outputbanner{before at center@right}{%
- \setbox\jlreq at tempboxa=\hbox to 0pt{\tate\hss\adjustbaseline\@bannerfont\jlreq at trimmarks@bannerfont##1\hskip 5mm}%
+ \setbox\jlreq at tempboxa=\hbox to 0pt{\tate\hss\adjustbaseline\jlreq at trimmarks@bannerfont##1\hskip 5mm}%
\jlreq at tempdima=\dimexpr 4pt \ifx l\jlreq at trimmarks@engine + \dp\jlreq at tempboxa\fi\relax
\dp\jlreq at tempboxa=0pt \ht\jlreq at tempboxa=0pt \wd\jlreq at tempboxa=0pt
\kern\jlreq at tempdima\box\jlreq at tempboxa\kern-\jlreq at tempdima
}%
\jlreq at trimmarks@outputbanner{after at center@right}{%
- \setbox\jlreq at tempboxa=\hbox to 0pt{\tate\hskip 5mm\adjustbaseline\@bannerfont\jlreq at trimmarks@bannerfont##1\hss}%
+ \setbox\jlreq at tempboxa=\hbox to 0pt{\tate\hskip 5mm\adjustbaseline\jlreq at trimmarks@bannerfont##1\hss}%
\jlreq at tempdima=\dimexpr 4pt \ifx l\jlreq at trimmarks@engine + \dp\jlreq at tempboxa\fi\relax
\dp\jlreq at tempboxa=0pt \ht\jlreq at tempboxa=0pt \wd\jlreq at tempboxa=0pt
\kern\jlreq at tempdima\box\jlreq at tempboxa\kern-\jlreq at tempdima
@@ -713,7 +699,7 @@
\vrule width10mm depth\@tombowwidth height\z@
\vrule depth\dimexpr 10mm + \jlreq at trimmarks@bleed at bottom\relax width\@tombowwidth height\z@
\jlreq at trimmarks@outputbanner{tate at bottom@left}{%
- \setbox\jlreq at tempboxa=\hbox to 0pt{\tate\adjustbaseline\hss\@bannerfont\jlreq at trimmarks@bannerfont##1}%
+ \setbox\jlreq at tempboxa=\hbox to 0pt{\tate\adjustbaseline\hss\jlreq at trimmarks@bannerfont##1}%
\ifx l\jlreq at trimmarks@engine
\jlreq at tempdima=\dimexpr 4pt + \ht\jlreq at tempboxa\relax
\else
@@ -723,7 +709,7 @@
\kern-\jlreq at tempdima\raise 5mm\box\jlreq at tempboxa\kern\jlreq at tempdima
}%
\jlreq at trimmarks@outputbanner{intate at bottom@left}{%
- \setbox\jlreq at tempboxa=\hbox to 0pt{\tate\adjustbaseline\hss\@bannerfont\jlreq at trimmarks@bannerfont##1}%
+ \setbox\jlreq at tempboxa=\hbox to 0pt{\tate\adjustbaseline\hss\jlreq at trimmarks@bannerfont##1}%
\jlreq at tempdima=\dimexpr\jlreq at trimmarks@bleed at left \ifx l\jlreq at trimmarks@engine + \ht\jlreq at tempboxa\fi\relax
\wd\jlreq at tempboxa=0pt \ht\jlreq at tempboxa=0pt \dp\jlreq at tempboxa=0pt
\kern\jlreq at tempdima\box\jlreq at tempboxa\kern-\jlreq at tempdima
@@ -733,13 +719,13 @@
\hbox to\z@{% \@Br
\yoko
\jlreq at trimmarks@outputbanner{tate at bottom@right}{%
- \setbox\jlreq at tempboxa=\hbox to 0pt{\tate\adjustbaseline\hss\@bannerfont\jlreq at trimmarks@bannerfont##1}%
+ \setbox\jlreq at tempboxa=\hbox to 0pt{\tate\adjustbaseline\hss\jlreq at trimmarks@bannerfont##1}%
\jlreq at tempdima=\dimexpr\ifx l\jlreq at trimmarks@engine\ht\jlreq at tempboxa + \fi 4pt\relax
\ht\jlreq at tempboxa=0pt \dp\jlreq at tempboxa=0pt \wd\jlreq at tempboxa=0pt
\kern\jlreq at tempdima\raise5mm\box\jlreq at tempboxa\kern-\jlreq at tempdima
}%
\jlreq at trimmarks@outputbanner{intate at bottom@right}{%
- \setbox\jlreq at tempboxa=\hbox to 0pt{\tate\adjustbaseline\hss\@bannerfont\jlreq at trimmarks@bannerfont##1}%
+ \setbox\jlreq at tempboxa=\hbox to 0pt{\tate\adjustbaseline\hss\jlreq at trimmarks@bannerfont##1}%
\ifx l\jlreq at trimmarks@engine
\jlreq at tempdima=\dimexpr\jlreq at trimmarks@bleed at right + \ht\jlreq at tempboxa\relax
\else
@@ -750,7 +736,7 @@
}%
\vrule depth\dimexpr 10mm + \jlreq at trimmarks@bleed at bottom\relax width\@tombowwidth height\z@
\jlreq at trimmarks@outputbanner{corner at bottom@right}{%
- \setbox\jlreq at tempboxa=\hbox to 0pt{\hskip 4pt\relax\@bannerfont\jlreq at trimmarks@bannerfont##1\hss}%
+ \setbox\jlreq at tempboxa=\hbox to 0pt{\hskip 4pt\relax\jlreq at trimmarks@bannerfont##1\hss}%
\jlreq at tempdima=\dimexpr\ht\jlreq at tempboxa + \jlreq at trimmarks@bleed at bottom + 4pt\relax
\ht\jlreq at tempboxa=0pt \dp\jlreq at tempboxa=0pt
\raise-\jlreq at tempdima\box\jlreq at tempboxa
@@ -765,7 +751,7 @@
\yoko\hss
\vrule width\dimexpr 10mm + \jlreq at trimmarks@bleed at left\relax depth\@tombowwidth height\z@
\jlreq at trimmarks@outputbanner{corner at bottom@left}{%
- \setbox\jlreq at tempboxa=\hbox to 0pt{\hss\@bannerfont\jlreq at trimmarks@bannerfont##1\hskip\dimexpr\jlreq at trimmarks@bleed at left + 4pt\relax}%
+ \setbox\jlreq at tempboxa=\hbox to 0pt{\hss\jlreq at trimmarks@bannerfont##1\hskip\dimexpr\jlreq at trimmarks@bleed at left + 4pt\relax}%
\jlreq at tempdima=\dimexpr\ht\jlreq at tempboxa + 4pt\relax
\ht\jlreq at tempboxa=0pt \dp\jlreq at tempboxa=0pt
\raise-\jlreq at tempdima\box\jlreq at tempboxa
@@ -772,13 +758,13 @@
}%
\vrule depth10mm width\@tombowwidth height\z@
\jlreq at trimmarks@outputbanner{yoko at bottom@left}{%
- \setbox\jlreq at tempboxa=\hbox to 0pt{\yoko\hskip 5mm\@bannerfont\jlreq at trimmarks@bannerfont##1\hss}%
+ \setbox\jlreq at tempboxa=\hbox to 0pt{\yoko\hskip 5mm\jlreq at trimmarks@bannerfont##1\hss}%
\jlreq at tempdima=\dimexpr\ht\jlreq at tempboxa + 4pt\relax
\ht\jlreq at tempboxa=0pt \dp\jlreq at tempboxa=0pt
\raise-\jlreq at tempdima\box\jlreq at tempboxa
}%
\jlreq at trimmarks@outputbanner{inyoko at bottom@left}{%
- \setbox\jlreq at tempboxa=\hbox to 0pt{\yoko\@bannerfont\jlreq at trimmarks@bannerfont##1\hss}%
+ \setbox\jlreq at tempboxa=\hbox to 0pt{\yoko\jlreq at trimmarks@bannerfont##1\hss}%
\jlreq at tempdima=\dimexpr\jlreq at trimmarks@bleed at bottom + \dp\jlreq at tempboxa\relax
\ht\jlreq at tempboxa=0pt \dp\jlreq at tempboxa=0pt
\raise\jlreq at tempdima\box\jlreq at tempboxa
@@ -791,13 +777,13 @@
\yoko
\vrule width10mm depth\@tombowwidth height\z@
\jlreq at trimmarks@outputbanner{before at bottom@center}{%
- \setbox\jlreq at tempboxa=\hbox to 0pt{\hss\@bannerfont\jlreq at trimmarks@bannerfont##1\hskip 5mm}%
+ \setbox\jlreq at tempboxa=\hbox to 0pt{\hss\jlreq at trimmarks@bannerfont##1\hskip 5mm}%
\jlreq at tempdima=\dimexpr\ht\jlreq at tempboxa + 4pt\relax
\ht\jlreq at tempboxa=0pt \dp\jlreq at tempboxa=0pt
\raise-\jlreq at tempdima\box\jlreq at tempboxa
}%
\jlreq at trimmarks@outputbanner{in at bottom@center}{%
- \setbox\jlreq at tempboxa=\hbox{\@bannerfont\jlreq at trimmarks@bannerfont##1}%
+ \setbox\jlreq at tempboxa=\hbox{\jlreq at trimmarks@bannerfont##1}%
\jlreq at tempdima=\dimexpr\dp\jlreq at tempboxa + \jlreq at trimmarks@bleed at bottom\relax
\jlreq at tempdimb=.5\wd\jlreq at tempboxa
\ht\jlreq at tempboxa=0pt \dp\jlreq at tempboxa=0pt \wd\jlreq at tempboxa=0pt
@@ -805,7 +791,7 @@
}%
\vrule depth10mm width\@tombowwidth height\z@
\jlreq at trimmarks@outputbanner{before at bottom@center}{%
- \setbox\jlreq at tempboxa=\hbox to 0pt{\hskip 5mm\@bannerfont\jlreq at trimmarks@bannerfont##1\hss}%
+ \setbox\jlreq at tempboxa=\hbox to 0pt{\hskip 5mm\jlreq at trimmarks@bannerfont##1\hss}%
\jlreq at tempdima=\dimexpr\ht\jlreq at tempboxa + 4pt\relax
\ht\jlreq at tempboxa=0pt \dp\jlreq at tempboxa=0pt
\raise-\jlreq at tempdima\box\jlreq at tempboxa
@@ -818,13 +804,13 @@
\setbox\jlreq at tempboxa=\hbox to 0pt{% \@BR
\yoko
\jlreq at trimmarks@outputbanner{yoko at bottom@right}{%
- \setbox\jlreq at tempboxa=\hbox to 0pt{\yoko\hss\@bannerfont\jlreq at trimmarks@bannerfont##1\hskip 5mm}%
+ \setbox\jlreq at tempboxa=\hbox to 0pt{\yoko\hss\jlreq at trimmarks@bannerfont##1\hskip 5mm}%
\jlreq at tempdima=\dimexpr\ht\jlreq at tempboxa + 4pt\relax
\ht\jlreq at tempboxa=0pt \dp\jlreq at tempboxa=0pt
\raise-\jlreq at tempdima\box\jlreq at tempboxa
}%
\jlreq at trimmarks@outputbanner{inyoko at bottom@right}{%
- \setbox\jlreq at tempboxa=\hbox to 0pt{\yoko\hss\@bannerfont\jlreq at trimmarks@bannerfont##1}%
+ \setbox\jlreq at tempboxa=\hbox to 0pt{\yoko\hss\jlreq at trimmarks@bannerfont##1}%
\jlreq at tempdima=\dimexpr\dp\jlreq at tempboxa + \jlreq at trimmarks@bleed at bottom\relax
\ht\jlreq at tempboxa=0pt \dp\jlreq at tempboxa=0pt
\raise\jlreq at tempdima\box\jlreq at tempboxa
Modified: trunk/Master/texmf-dist/tex/latex/jlreq/jlreq.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/jlreq/jlreq.cls 2020-05-01 21:30:00 UTC (rev 54963)
+++ trunk/Master/texmf-dist/tex/latex/jlreq/jlreq.cls 2020-05-01 21:33:56 UTC (rev 54964)
@@ -5,7 +5,7 @@
%%
% (based on JLReq 20120403 https://www.w3.org/TR/2012/NOTE-jlreq-20120403/ja/)
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{jlreq}[2020/02/07 jlreq]
+\ProvidesClass{jlreq}[2020/05/01 jlreq]
\RequirePackage{xkeyval,everyhook,filehook,etoolbox,ifthen}
\RequirePackage{jlreq-helpers}
@@ -3769,6 +3769,14 @@
{%
\begingroup
\jlreq at pagestyle@parse at position@#1-\jlreq at endmark
+ \ifthenelse{\equal{\jlreq at tempa}{fore}}{%
+ \expandafter\jlreq at pagestyle@parse at position@\jlreq at tempb-\jlreq at endmark
+ \ifthenelse{\equal{\jlreq at tempa}{edge}}{%
+ \def\jlreq at tempa{fore-edge}%
+ }{%
+ \ClassError{jlreq}{Invalid position: fore-\jlreq at tempa}{\@ehc}%
+ }%
+ }{}%
% \jlreq at tempcに縦方向を，\jlreq at tempdに横方向を入れる
\def\jlreq at tempc{}\def\jlreq at tempd{}%
\jlreq at pagestyle@parse at position@@{\jlreq at tempa}%
@@ -3786,8 +3794,8 @@
\jlreq at ifempty{#2}{%
\ifx\jlreq at tempb\@empty\ClassError{jlreq}{Invalid position: #1}{\@ehc}\fi
}{%
- \def\@tempa##1-{\def\jlreq at tempb{##1}}%
- \@tempa#2\relax
+ \def\@tempa##1-\jlreq at endmark{\def\jlreq at tempb{##1}}%
+ \@tempa#2\jlreq at endmark\relax
}%
}
@@ -4230,9 +4238,8 @@
\jlreq at if{\ifjlreq at pstate\fi}{% tate
% headの方に処理を入れる．footは空．
\def\jlreq at oddfoot{}\def\jlreq at evenfoot{}%
- \jlreq at for@noexpand\jlreq at position:=\jlreq at nombre@i at position,\jlreq at running@head at i@position\do{%
- \expandafter\ifx\jlreq at position\@empty\expandafter\def\jlreq at position{0pt}\fi
- }%
+ \ifx\jlreq at nombre@i at position\@empty\def\jlreq at nombre@i at position{5\jlreq at zw}\fi
+ \ifx\jlreq at running@head at i@position\@empty\def\jlreq at running@head at i@position{4\jlreq at zw}\fi
\edef\jlreq at gapcs{\noexpand\hskip\noexpand\glueexpr\expandonce{\jlreq at nombre@gap}\noexpand\relax}%
\jlreq at pagestyle@addifempty{\jlreq at nombre@iii at position}{\jlreq at nombre@ii}{\jlreq at gapcs}{\jlreq at nombre@iii}%
\jlreq at pagestyle@addifempty{\jlreq at nombre@ii at position}{\jlreq at nombre@i}{\jlreq at gapcs}{\jlreq at nombre@ii}%
@@ -4246,15 +4253,16 @@
\expandafter\let\expandafter\jlreq at position\csname jlreq at nombre@\jlreq at i @position\endcsname
\expandafter\ifx\csname jlreq at nombre@\jlreq at i\endcsname\@empty\else
\jlreq at ifgluezero{\glueexpr\jlreq at position\relax}{\def\jlreq at position{}}{}%
+ \expandafter\let\expandafter\jlreq at tempa\expandafter=\csname jlreq at nombre@\jlreq at i\endcsname
+ \jlreq at pagestyle@addfont at tocs{jlreq at tempa}{jlreq at nombre@font}%
\eappto\jlreq at nombre@contents{%
\noexpand\hbox to 0pt{\noexpand\hss
+ \expandonce{\jlreq at tempa}%
\ifx\jlreq at position\@empty\else\unexpanded{\hskip \glueexpr}\expandonce{\jlreq at position}\noexpand\relax\fi
- \csexpandonce{jlreq at nombre@\jlreq at i}%
}%
}%
\fi
}%
- \jlreq at pagestyle@addfont at tocs{jlreq at nombre@contents}{jlreq at nombre@font}%
% \jlreq@(odd|even)@contentsに柱を入れる（上の方に出力）
\@for\jlreq at parity:=odd,even\do{%
\expandafter\def\csname jlreq@\jlreq at parity @contents\endcsname{}%
@@ -4262,17 +4270,18 @@
\expandafter\let\expandafter\jlreq at position\csname jlreq at running@head@\jlreq at i @position\endcsname
\expandafter\ifx\csname jlreq@\jlreq at parity @running at head@\jlreq at i\endcsname\@empty\else
\jlreq at ifgluezero{\glueexpr\jlreq at position\relax}{\def\jlreq at position{}}{}%
+ \expandafter\let\expandafter\jlreq at tempa\expandafter=\csname jlreq@\jlreq at parity @running at head@\jlreq at i\endcsname
+ \jlreq at pagestyle@addfont at tocs{jlreq at tempa}{jlreq at running@head at font}%
\expandafter\eappto\csname jlreq@\jlreq at parity @contents\endcsname{%
\noexpand\hbox to 0pt{\unexpanded{\hskip\glueexpr\headsep + \headheight}%
\if at tate\else\unexpanded{+ \topskip - \Cht}\fi
\ifx\jlreq at position\@empty\else + \expandonce{\jlreq at position}\fi\noexpand\relax
- \csexpandonce{jlreq@\jlreq at parity @running at head@\jlreq at i}%
+ \expandonce{\jlreq at tempa}%
\noexpand\hss
}%
}%
\fi
}%
- \jlreq at pagestyle@addfont at tocs{jlreq@\jlreq at parity @contents}{jlreq at running@head at font}%
% \jlreq@(odd|even)headの構築
% 空き指定には基本版面の文字サイズを使う（2.6.1.c）
\@ifundefined{jlreq@\jlreq at parity headformat}
@@ -4455,7 +4464,7 @@
\jlreq at pagestyle@setheadfoot{\jlreq at oddfoot}{jlreq at odd@bottom at left}{jlreq at odd@bottom at center}{jlreq at odd@bottom at right}%
\jlreq at pagestyle@setheadfoot{\jlreq at evenhead}{jlreq at even@top at left}{jlreq at even@top at center}{jlreq at even@top at right}%
\jlreq at pagestyle@setheadfoot{\jlreq at evenfoot}{jlreq at even@bottom at left}{jlreq at even@bottom at center}{jlreq at even@bottom at right}%
- \ifthenelse{\lengthtest{\marginparwidth>0pt} \AND \(\NOT\boolean{@tate}\)}{%
+ \ifthenelse{\lengthtest{\jlreq at sidenote@length >0pt} \AND \(\NOT\boolean{@tate}\)}{%
\def\jlreq at defaultformat{\hss\hbox to \jlreqyokoheadlength{####1}\hss}%
}{%
\def\jlreq at defaultformat{####1}%
@@ -4465,7 +4474,7 @@
\jlreq at pagestyle@applyformat{\jlreq at oddfoot}{\jlreq at oddfootformat}{\jlreq at defaultformat}%
\jlreq at pagestyle@applyformat{\jlreq at evenfoot}{\jlreq at evenfootformat}{\jlreq at defaultformat}%
% 傍注用調整
- \ifdim\marginparwidth>0pt
+ \ifdim\jlreq at sidenote@length>0pt
\if at tate\else
\if at twocolumn
\jlreq at pagestyle@addsidenotemargin at bothside{\jlreq at oddhead}%
@@ -4507,7 +4516,7 @@
\if at tate
\def\jlreqyokoheadlength{\textheight}
\else
- \ifdim\marginparwidth>0pt
+ \ifdim\jlreq at sidenote@length>0pt
\if at twocolumn
\def\jlreqyokoheadlength{\dimexpr\textwidth + 2\jlreq at sidenote@length + 2\jlreq at sidenote@sep\relax}
\else
@@ -4514,7 +4523,7 @@
\def\jlreqyokoheadlength{\dimexpr\textwidth + \jlreq at sidenote@length + \jlreq at sidenote@sep\relax}
\fi
\else
- \def\jlreqyokoheadlength{\textwidth}
+ \def\jlreqyokoheadlength{\dimexpr\textwidth\relax}
\fi
\fi
\edef\jlreqtateheadlength{\unexpanded{\dimexpr\headsep + \headheight + \textheight}\if at tate\else\unexpanded{- \topskip + 1\jlreq at zh}\fi\noexpand\relax}
@@ -5615,11 +5624,13 @@
\def\@begintheorem#1#2{\topsep=\dimexpr\jlreq at theorem@beforeafter at space\relax
\trivlist\labelsep=1\jlreq at zw
\itemindent=\dimexpr\jlreq at theorem@indent\relax
- \item[\hskip \labelsep{\sffamily\gtfamily\bfseries #1\ #2}]}
+ \jlreq at theorem@font
+ \item[\hskip \labelsep{\reset at font\jlreq at theorem@label at font #1\ #2}]}
\def\@opargbegintheorem#1#2#3{\topsep=\dimexpr\jlreq at theorem@beforeafter at space\relax
\trivlist\labelsep=1\jlreq at zw
\itemindent=\dimexpr\jlreq at theorem@indent\relax
- \item[\hskip \labelsep{\sffamily\gtfamily\bfseries #1\ #2（#3）}]}
+ \jlreq at theorem@font
+ \item[\hskip \labelsep{\reset at font\jlreq at theorem@label at font #1\ #2（#3）}]}
\AtEndOfPackageFile*{amsthm}{%
\jlreq at saveoriginalcs{\proof}%
\jlreq at saveoriginalcs{\endproof}%
@@ -5626,7 +5637,7 @@
\edef\jlreq at do{
\unexpanded{\def\jlreq at proof[#1]}{%
\unexpanded{\labelsep=1\jlreq at zw}%
- \expandonce{\proof[{\reset at font\sffamily\gtfamily\bfseries #1\inhibitglue}\nopunct]}%
+ \expandonce{\proof[{\reset at font\jlreq at proof@label at font #1\inhibitglue}\nopunct]}%
}
}
\jlreq at do
@@ -5636,18 +5647,30 @@
\theoremstyle{jlreq}
}
\def\jlreq at setupamsthm{
- \newtheoremstyle{jlreq}{\dimexpr\jlreq at theorem@beforeafter at space\relax}{\dimexpr\jlreq at theorem@beforeafter at space\relax}{\normalfont}{\dimexpr\jlreq at theorem@indent\relax}{\sffamily\gtfamily\bfseries}{}{1\jlreq at zw}{\thmname{##1}\thmnumber{\ ##2}\thmnote{（##3）}}
+ \newtheoremstyle{jlreq}{\dimexpr\jlreq at theorem@beforeafter at space\relax}{\dimexpr\jlreq at theorem@beforeafter at space\relax}{\jlreq at theorem@font}{\dimexpr\jlreq at theorem@indent\relax}{\jlreq at theorem@label at font}{}{1\jlreq at zw}{\thmname{##1}\thmnumber{\ ##2}\thmnote{（##3）}}
}
\jlreq at jlreqsetup@add{theorem_beforeafter_space}{
\def\jlreq at theorem@beforeafter at space{#1}
+ \begingroup\jlreq at tempdima=\dimexpr\jlreq at theorem@beforeafter at space\relax\endgroup
\@ifpackageloaded{amsthm}{\jlreq at setupamsthm}{}
}
\jlreq at jlreqsetup@add{theorem_indent}{
\def\jlreq at theorem@indent{#1}
+ \begingroup\jlreq at tempdima=\dimexpr\jlreq at theorem@indent\relax\endgroup
\@ifpackageloaded{amsthm}{\jlreq at setupamsthm}{}
}
+\jlreq at jlreqsetup@add{theorem_font}{
+ \def\jlreq at theorem@font{#1}
+ \@ifpackageloaded{amsthm}{\jlreq at setupamsthm}{}
+}
+\jlreq at jlreqsetup@add{theorem_label_font}{
+ \def\jlreq at theorem@label at font{#1}
+ \@ifpackageloaded{amsthm}{\jlreq at setupamsthm}{}
+}
+\jlreq at jlreqsetup@add{proof_label_font}{
+ \def\jlreq at proof@label at font{#1}
+}
-
%. デフォルト設定
%.. 見出し
\if at tate
@@ -5765,7 +5788,7 @@
\jlreqsetup{footnote_second_indent=1\jlreq at zw}
\jlreqsetup{endnote_second_indent=2\jlreq at zw}
\jlreqsetup{endnote_position=headings}
-\ifdim\marginparwidth>0pt
+\ifdim\jlreq at sidenote@length>0pt
\jlreqsetup{sidenote_type=number}
\jlreqsetup{sidenote_symbol=＊,sidenote_keyword_font={}}
\fi
@@ -5930,7 +5953,13 @@
}
\jlreqsetup{theindex_pagestyle=plain}
\jlreqsetup{year_style=seireki}
-\jlreqsetup{theorem_beforeafter_space=1\baselineskip,theorem_indent=0pt}
+\jlreqsetup{
+ theorem_beforeafter_space=1\baselineskip,
+ theorem_indent=0pt,
+ theorem_label_font = {\bfseries\gtfamily\sffamily},
+ theorem_font = {\normalfont},
+ proof_label_font = {\bfseries\gtfamily\sffamily},
+}
\newcommand{\contentsname}{目次}
More information about the tex-live-commits
mailing list.