From 334433e8aa144221ad36bda32aaf78b52d7b35a2 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 1 May 2020 21:33:56 +0000 Subject: jlreq (1may20) git-svn-id: svn://tug.org/texlive/trunk@54964 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/jlreq/README-ja.md | 9 +- Master/texmf-dist/doc/latex/jlreq/README.md | 3 + Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html | 10 +- Master/texmf-dist/doc/latex/jlreq/jlreq-ja.pdf | Bin 359176 -> 359458 bytes .../doc/latex/jlreq/jlreq-trimmarks-ja.html | 6 + .../doc/latex/jlreq/jlreq-trimmarks-ja.md | 5 +- .../doc/latex/jlreq/jlreq-trimmarks.html | 10 +- .../texmf-dist/doc/latex/jlreq/jlreq-trimmarks.md | 7 +- Master/texmf-dist/doc/latex/jlreq/jlreq.html | 5 + Master/texmf-dist/doc/latex/jlreq/jlreq.pdf | Bin 116207 -> 116315 bytes Master/texmf-dist/source/latex/jlreq/Makefile | 2 +- .../texmf-dist/tex/latex/jlreq/jlreq-helpers.sty | 16 ++- .../texmf-dist/tex/latex/jlreq/jlreq-trimmarks.sty | 140 ++++++++++----------- Master/texmf-dist/tex/latex/jlreq/jlreq.cls | 71 +++++++---- 14 files changed, 176 insertions(+), 108 deletions(-) diff --git a/Master/texmf-dist/doc/latex/jlreq/README-ja.md b/Master/texmf-dist/doc/latex/jlreq/README-ja.md index a57b5d4f4bb..544f1ce7cf7 100644 --- a/Master/texmf-dist/doc/latex/jlreq/README-ja.md +++ b/Master/texmf-dist/doc/latex/jlreq/README-ja.md @@ -178,9 +178,13 @@ pLaTeX / upLaTeX / LuaLaTeX上で動きます.以下のパッケージを内 ### 定理環境 `\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 @@ JFMの名前は次の通りです.`[]`で囲まれている文字は設定に - `\rmfamily`などの再定義をやめ,`\@rmfamilyhook`などにコードを挿入することにした. - `\parskip`を`0pt`に変更. - バグ修正. +* 2020-05-01 + - `\jlreqsetup`に`theorem_label_font`と`theorem_font`を追加. + - バグ修正. -------------- Noriyuki Abe diff --git a/Master/texmf-dist/doc/latex/jlreq/README.md b/Master/texmf-dist/doc/latex/jlreq/README.md index fb5175fb94c..c0ef2c541f5 100644 --- a/Master/texmf-dist/doc/latex/jlreq/README.md +++ b/Master/texmf-dist/doc/latex/jlreq/README.md @@ -124,6 +124,9 @@ This package is distributed under the BSD 2-Clause License. See [LICENSE](LICENS - 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 diff --git a/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html b/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html index 69d1fcfa429..cfcf43cc71f 100644 --- a/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html +++ b/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html @@ -240,9 +240,12 @@

\jlreqsetupで指定します.

+

amsthmパッケージが読み込まれると,新しい定理スタイルjlreqが定義され,現在のスタイルがjlreqへと変更されます.このとき,上記設定はこのjlreqスタイルへの設定として機能します.

前付きなど

-

\fontmatter / \mainmatter / \backmatter / \appendixでの処理を\jlreqsetupで指定できます.

+

\frontmatter / \mainmatter / \backmatter / \appendixでの処理を\jlreqsetupで指定できます.

+
  • 2020-05-01 +

  • Noriyuki Abe https://github.com/abenori/jlreq

    diff --git a/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.pdf b/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.pdf index 76cb0ff3747..3a0fb1c3f7a 100644 Binary files a/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.pdf and b/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.pdf differ diff --git a/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.html b/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.html index 5c9d2ca7991..e811910bbc1 100644 --- a/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.html +++ b/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.html @@ -231,6 +231,12 @@
  • \jlreqtrimmarkssetup内のbannerを更に拡張.
  • bleed_marginを拡張.
  • +
  • 2020-05-01 +

  • Noriyuki Abe https://github.com/abenori/jlreq

    diff --git a/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.md b/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.md index 7531072932a..e75a31512d2 100644 --- a/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.md +++ b/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.md @@ -157,7 +157,10 @@ dviドライバの指定です.エンジンに`lualatex`を利用する場合 * 2019-04-01 - `\jlreqtrimmarkssetup`内の`banner`を更に拡張. - `bleed_margin`を拡張. - +* 2020-05-01 + - `\jlreqtrimmarkssetup`の`banner`を使わない場合,`\@bannertoken`の中身を偶奇ページ両方に出力するようにした. + - `\jlreqtrimmarkssetup`の`banner`を使う場合,`\@bannertoken`の中身を無視するようにした. + - `\jlreqtrimmarkssetup`の`banner_font`が指定された場合,`\@bannerfont`を無視するようにした. -------------- Noriyuki Abe diff --git a/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.html b/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.html index 2161b33a602..4836a367e58 100644 --- a/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.html +++ b/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.html @@ -124,7 +124,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.

    +

    Noriyuki Abe https://github.com/abenori/jlreq

    diff --git a/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.md b/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.md index 3d66dd56ef9..a8fb96bf48e 100644 --- a/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.md +++ b/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.md @@ -46,7 +46,7 @@ Set the size of the paper including trim marks. * If `` 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,7 +151,10 @@ This package is distributed under the BSD 2-Clause License. See [LICENSE](LICENS * 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 diff --git a/Master/texmf-dist/doc/latex/jlreq/jlreq.html b/Master/texmf-dist/doc/latex/jlreq/jlreq.html index 7e3c6f793d6..15785cccf70 100644 --- a/Master/texmf-dist/doc/latex/jlreq/jlreq.html +++ b/Master/texmf-dist/doc/latex/jlreq/jlreq.html @@ -228,6 +228,11 @@
  • Changed \parskip to 0pt.
  • Fixed bugs.
  • +
  • 2020-05-01 +
      +
    • Added theorem_label_font and theorem_font to \jlreqsetup.
    • +
    • Fixed bugs.
    • +

  • Noriyuki Abe https://github.com/abenori/jlreq

    diff --git a/Master/texmf-dist/doc/latex/jlreq/jlreq.pdf b/Master/texmf-dist/doc/latex/jlreq/jlreq.pdf index 6f92ea5c51f..b770c646812 100644 Binary files a/Master/texmf-dist/doc/latex/jlreq/jlreq.pdf and b/Master/texmf-dist/doc/latex/jlreq/jlreq.pdf differ diff --git a/Master/texmf-dist/source/latex/jlreq/Makefile b/Master/texmf-dist/source/latex/jlreq/Makefile index 139d68925ff..2d7b5285479 100644 --- a/Master/texmf-dist/source/latex/jlreq/Makefile +++ b/Master/texmf-dist/source/latex/jlreq/Makefile @@ -143,7 +143,7 @@ sty-install: 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 diff --git a/Master/texmf-dist/tex/latex/jlreq/jlreq-helpers.sty b/Master/texmf-dist/tex/latex/jlreq/jlreq-helpers.sty index 3594c7d1f82..46a619a84c4 100644 --- a/Master/texmf-dist/tex/latex/jlreq/jlreq-helpers.sty +++ b/Master/texmf-dist/tex/latex/jlreq/jlreq-helpers.sty @@ -73,11 +73,21 @@ \expandafter\expandafter\expandafter\jlreq@ifmacro@noargument@\jlreq@getfirsttoken#1\jlreq@uniqtoken{}\jlreq@endmark@ }}} \long\def\jlreq@ifmacro@noargument@#1{\expandafter\jlreq@ifmacro@noargument@@\expandafter{\meaning #1}} -\edef\jlreq@do{% - \unexpanded{\def\jlreq@ifmacro@noargument@@}##1{\noexpand\jlreq@ifmacro@noargument@@@##1\expandonce{\detokenize{macro:->}}\noexpand\jlreq@endmark} - \unexpanded{\def\jlreq@ifmacro@noargument@@@}##1\expandonce{\detokenize{macro:->}}##2\noexpand\jlreq@endmark{\noexpand\jlreq@ifempty{##1}} +\def\@tempa#1{% + \def\jlreq@ifmacro@noargument@@##1{\jlreq@ifmacro@noargument@@@##1#1\noexpand\jlreq@endmark} + \def\jlreq@ifmacro@noargument@@@##1#1##2\jlreq@endmark{\jlreq@ifempty{##1}} } +\edef\jlreq@do{\noexpand\@tempa{\detokenize{macro:->}}} \jlreq@do +% こちらは単にマクロか +\def\@tempa#1{% + \long\def\jlreq@ifmacro##1{\jlreq@ifempty{##1}{\@secondoftwo}{\expandafter\jlreq@ifmacro@i\meaning##1#1\jlreq@endmark}} + \long\def\jlreq@ifmacro@i##1#1##2\jlreq@endmark{\jlreq@ifempty{##1}} +} +\edef\jlreq@do{\noexpand\@tempa{\detokenize{macro:}}} +\jlreq@do + + % #1(skipレジスタ)が0か(展開不可). \newcommand*\jlreq@ifgluezero[1]{% diff --git a/Master/texmf-dist/tex/latex/jlreq/jlreq-trimmarks.sty b/Master/texmf-dist/tex/latex/jlreq/jlreq-trimmarks.sty index 6ba910a240b..03c31e521a9 100644 --- a/Master/texmf-dist/tex/latex/jlreq/jlreq-trimmarks.sty +++ b/Master/texmf-dist/tex/latex/jlreq/jlreq-trimmarks.sty @@ -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@trimmarks@jlreqloaded=\@firstoftwo}{\let\ifjlreq@trimmarks@jlreqloaded=\@secondoftwo} -\def\ifjlreq@trimmarks@tate@{% - \if@tate\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi -} +\def\ifjlreq@trimmarks@tate@{\jlreq@if{\if@tate\fi}}% % \@firstoftwo when \if@tate is defined and \if@tate=\iftrue \def\ifjlreq@trimmarks@tate{% - \ifnum0\ifx\if@tate\@undefined 1\fi\ifx\if@tate\relax 1\fi>0 - \expandafter\@secondoftwo - \else - \expandafter\ifjlreq@trimmarks@tate@ - \fi + \jlreq@if{\ifnum0\ifx\if@tate\@undefined 1\fi\ifx\if@tate\relax 1\fi>0 \fi}{\@secondoftwo}{\ifjlreq@trimmarks@tate@}% } @@ -256,9 +250,9 @@ }% }% }{#3}% - \ifx\jlreq@do\@empty + \jlreq@if{\ifx\jlreq@do\@empty\fi}{% \appto\jlreq@do{\jlreq@trimmarks@setbanner@@{yoko@#1}{yoko@#2}{#3}}% - \fi + }{}% \expandafter\endgroup \jlreq@do } @@ -277,9 +271,9 @@ }% }% }{#3}% - \ifx\jlreq@do\@empty + \jlreq@if{\ifx\jlreq@do\@empty\fi}{ \appto\jlreq@do{\jlreq@trimmarks@setbanner@@{before@#1}{before@#2}{#3}}% - \fi + }{}% \expandafter\endgroup \jlreq@do } @@ -296,12 +290,12 @@ }% }% }{#3}% - \ifx\jlreq@do\@empty + \jlreq@if{\ifx\jlreq@do\@empty\fi}{ \appto\jlreq@do{% \expandafter\edef\csname jlreq@trimmarks@banner@odd@#1\endcsname{\unexpanded{#3}}% \expandafter\edef\csname jlreq@trimmarks@banner@even@#2\endcsname{\unexpanded{#3}}% }% - \fi + }{}% \expandafter\endgroup \jlreq@do } @@ -326,11 +320,9 @@ }% }% }% - \@bannertoken{}% \def\jlreq@do{}% \jlreq@parsekeyval@nokey{% \ifjlreq@parsekeyval@nokey@novalue{}{% - \jlreq@tempafalse \edef\jlreq@gutterodd{\ifjlreq@trimmarks@tate{right}{left}}% \if@twoside \edef\jlreq@guttereven{\ifjlreq@trimmarks@tate{left}{right}}% @@ -338,8 +330,8 @@ \let\jlreq@guttereven\jlreq@gutterodd \fi \jlreq@switch*{####1}{ - {top-left}{\jlreq@tempatrue\appto\jlreq@do{\jlreq@trimmarks@setbanner{top@left}{top@left}{####2}}} - {left-top}{\jlreq@tempatrue\appto\jlreq@do{\jlreq@trimmarks@setbanner{top@left}{top@left}{####2}}} + {top-left}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{top@left}{top@left}{####2}}} + {left-top}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{top@left}{top@left}{####2}}} {top-right}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{top@right}{top@right}{####2}}} {right-top}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{top@right}{top@right}{####2}}} {top-gutter}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{top@\jlreq@gutterodd}{top@\jlreq@guttereven}{####2}}} @@ -367,17 +359,12 @@ {center-fore-edge}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@{center@\jlreq@guttereven}{center@\jlreq@gutterodd}{####2}}} {fore-edge-center}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@{center@\jlreq@guttereven}{center@\jlreq@gutterodd}{####2}}} }% - \ifjlreq@tempa - \appto\jlreq@do{\expandafter\@bannertoken\expandafter{\jlreq@trimmarks@banner@odd@yoko@top@left}}% - \fi }% }{##1}% - \ifx\jlreq@do\@empty - \jlreq@trimmarks@setbanner{top@left}{##1}% - \expandafter\@bannertoken\expandafter{\jlreq@trimmarks@banner@odd@yoko@top@left}% - \else - \jlreq@do - \fi + \jlreq@if{\ifx\jlreq@do\@empty\fi}{ + \appto\jlreq@do{\jlreq@trimmarks@setbanner{top@left}{top@left}{##1}}% + }{}% + \jlreq@do } {banner_font}{\def\jlreq@trimmarks@bannerfont{##1}} {trimmarks_width}{\setlength{\@tombowwidth}{##1}} @@ -418,12 +405,13 @@ }{#1}% } \@onlypreamble\jlreqtrimmarkssetup +\@bannertoken{% + \jobname\space(\number\year-\two@digits\month-\two@digits\day + \space\two@digits\hour:\two@digits\minute)% +} \jlreqtrimmarkssetup{ - banner={% - \jobname\space(\number\year-\two@digits\month-\two@digits\day - \space\two@digits\hour:\two@digits\minute)% - }, - banner_font={}, + banner={\the\@bannertoken}, + banner_font={\@bannerfont}, color={} } @@ -461,14 +449,14 @@ }{ \def\@tombowreset@@paper{% \@@topmargin\topmargin - \iftombow + \jlreq@if{\iftombow\fi}{ \@@paperwidth\paperwidth \advance\@@paperwidth 2\dimexpr\@tombowbleed\relax \@@paperheight\paperheight \advance\@@paperheight 10mm\relax \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@trimmarks@paperheight\relax} \def\jlreq@trimmarks@outputbanner#1#2{% - \iftombowdate + \jlreq@if{\iftombowdate\fi}{% \expandafter\let\expandafter\jlreq@tempa\csname jlreq@trimmarks@banner@\ifodd\c@page odd\else even\fi @#1\endcsname - \ifx\jlreq@tempa\@empty\else + \jlreq@if{\ifx\jlreq@tempa\@empty\fi}{}{% \def\@tempa##1{#2}% \expandafter\@tempa\expandafter{\jlreq@tempa}% - \fi - \fi + }% + }{}% } \def\jlreq@trimmarks@bleed{3mm} % left=gutter? \def\ifjlreq@trimmarks@leftisgutter{% \ifjlreq@trimmarks@tate{% - \ifnum 0\ifodd\c@page 1\fi\if@twoside\else 1\fi>0 \expandafter\@secondoftwo\else\expandafter\@firstoftwo\fi + \jlreq@if{\ifnum 0\ifodd\c@page 1\fi\if@twoside\else 1\fi>0 \fi}{\@secondoftwo}{\@firstoftwo}% }{% - \ifnum 0\ifodd\c@page 1\fi\if@twoside\else 1\fi>0 \expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi + \jlreq@if{\ifnum 0\ifodd\c@page 1\fi\if@twoside\else 1\fi>0 \fi}{\@firstoftwo}{\@secondoftwo}% }% } \def\jlreq@trimmarks@bleed@left{\ifjlreq@trimmarks@leftisgutter{\jlreq@trimmarks@bleed@gutter}{\expandafter\csname jlreq@trimmarks@bleed@fore-edge\endcsname}} @@ -516,15 +504,13 @@ \yoko\hss \vrule width\dimexpr 10mm + \jlreq@trimmarks@bleed@left\relax height\@tombowwidth depth\z@ \vrule height10mm width\@tombowwidth depth\z@ - \iftombowdate - \setbox\jlreq@tempboxa=\hbox to\z@{\hskip5mm\@bannerfont\jlreq@trimmarks@bannerfont - \ifodd\c@page\the\@bannertoken\else\jlreq@trimmarks@banner@even@yoko@top@left\fi - \hss}% + \jlreq@trimmarks@outputbanner{yoko@top@left}{% + \setbox\jlreq@tempboxa=\hbox to\z@{\hskip5mm\jlreq@trimmarks@bannerfont##1\hss}% \dp\jlreq@tempboxa=0pt \raise 4pt\box\jlreq@tempboxa - \fi + }% \jlreq@trimmarks@outputbanner{inyoko@top@left}{% - \setbox\jlreq@tempboxa=\hbox to 0pt{\@bannerfont\jlreq@trimmarks@bannerfont##1\hss}% + \setbox\jlreq@tempboxa=\hbox to 0pt{\jlreq@trimmarks@bannerfont##1\hss}% \jlreq@tempdima=\dimexpr\ht\jlreq@tempboxa + \jlreq@trimmarks@bleed@top\relax \ht\jlreq@tempboxa=0pt \dp\jlreq@tempboxa=0pt \raise-\jlreq@tempdima\box\jlreq@tempboxa @@ -537,12 +523,12 @@ \yoko \vrule width10mm height\@tombowwidth depth\z@ \jlreq@trimmarks@outputbanner{before@top@center}{% - \setbox\jlreq@tempboxa=\hbox to 0pt{\hss\@bannerfont\jlreq@trimmarks@bannerfont##1\hskip 5mm}% + \setbox\jlreq@tempboxa=\hbox to 0pt{\hss\jlreq@trimmarks@bannerfont##1\hskip 5mm}% \ht\jlreq@tempboxa=0pt \dp\jlreq@tempboxa=0pt \wd\jlreq@tempboxa=0pt \raise 4pt\box\jlreq@tempboxa }% \jlreq@trimmarks@outputbanner{in@top@center}{% - \setbox\jlreq@tempboxa=\hbox{\@bannerfont\jlreq@trimmarks@bannerfont##1}% + \setbox\jlreq@tempboxa=\hbox{\jlreq@trimmarks@bannerfont##1}% \jlreq@tempdima=\dimexpr\ht\jlreq@tempboxa + \jlreq@trimmarks@bleed@top\relax \jlreq@tempdimb=0.5\wd\jlreq@tempboxa \ht\jlreq@tempboxa=0pt \dp\jlreq@tempboxa=0pt \wd\jlreq@tempboxa=0pt @@ -550,7 +536,7 @@ }% \vrule height10mm width\@tombowwidth depth\z@ \jlreq@trimmarks@outputbanner{after@top@center}{% - \setbox\jlreq@tempboxa=\hbox to 0pt{\hskip 5mm\@bannerfont\jlreq@trimmarks@bannerfont##1\hss}% + \setbox\jlreq@tempboxa=\hbox to 0pt{\hskip 5mm\jlreq@trimmarks@bannerfont##1\hss}% \ht\jlreq@tempboxa=0pt \dp\jlreq@tempboxa=0pt \wd\jlreq@tempboxa=0pt \raise 4pt\box\jlreq@tempboxa }% @@ -562,19 +548,19 @@ \setbox\jlreq@tempboxa=\hbox to\z@{% \@TR \yoko \jlreq@trimmarks@outputbanner{yoko@top@right}{% - \setbox\jlreq@tempboxa=\hbox to 0pt{\yoko\hss\@bannerfont\jlreq@trimmarks@bannerfont##1\hskip 5mm}% + \setbox\jlreq@tempboxa=\hbox to 0pt{\yoko\hss\jlreq@trimmarks@bannerfont##1\hskip 5mm}% \ht\jlreq@tempboxa=0pt \dp\jlreq@tempboxa=0pt \raise 4pt\box\jlreq@tempboxa }% \jlreq@trimmarks@outputbanner{inyoko@top@right}{% - \setbox\jlreq@tempboxa=\hbox to 0pt{\yoko\hss\@bannerfont\jlreq@trimmarks@bannerfont##1}% + \setbox\jlreq@tempboxa=\hbox to 0pt{\yoko\hss\jlreq@trimmarks@bannerfont##1}% \jlreq@tempdima=\dimexpr\jlreq@trimmarks@bleed@top + \ht\jlreq@tempboxa\relax \ht\jlreq@tempboxa=0pt \dp\jlreq@tempboxa=0pt \raise-\jlreq@tempdima\box\jlreq@tempboxa }% \vrule height10mm width\@tombowwidth depth\z@ \jlreq@trimmarks@outputbanner{corner@top@right}{% - \setbox\jlreq@tempboxa=\hbox to 0pt{\hskip\dimexpr\jlreq@trimmarks@bleed@right + 4pt\relax\@bannerfont\jlreq@trimmarks@bannerfont##1\hss}% + \setbox\jlreq@tempboxa=\hbox to 0pt{\hskip\dimexpr\jlreq@trimmarks@bleed@right + 4pt\relax\jlreq@trimmarks@bannerfont##1\hss}% \ht\jlreq@tempboxa=0pt \dp\jlreq@tempboxa=0pt \raise 4pt\box\jlreq@tempboxa }% @@ -590,13 +576,13 @@ \yoko\hss \vrule width10mm height\@tombowwidth depth\z@ \jlreq@trimmarks@outputbanner{corner@top@left}{% - \setbox\jlreq@tempboxa=\hbox to 0pt{\hss\@bannerfont\jlreq@trimmarks@bannerfont##1\hskip 4pt}% + \setbox\jlreq@tempboxa=\hbox to 0pt{\hss\jlreq@trimmarks@bannerfont##1\hskip 4pt}% \dp\jlreq@tempboxa=0pt \ht\jlreq@tempboxa=0pt \raise\dimexpr \jlreq@trimmarks@bleed@top + 4pt\relax\box\jlreq@tempboxa }% \vrule height\dimexpr 10mm + \jlreq@trimmarks@bleed@top\relax width\@tombowwidth depth\z@ \jlreq@trimmarks@outputbanner{tate@top@left}{% - \setbox\jlreq@tempboxa=\hbox to 0pt{\tate\adjustbaseline\@bannerfont\jlreq@trimmarks@bannerfont##1\hss}% + \setbox\jlreq@tempboxa=\hbox to 0pt{\tate\adjustbaseline\jlreq@trimmarks@bannerfont##1\hss}% \ifx l\jlreq@trimmarks@engine \jlreq@tempdima=\dimexpr 4pt + \ht\jlreq@tempboxa\relax \else @@ -606,7 +592,7 @@ \kern-\jlreq@tempdima\raise-5mm\box\jlreq@tempboxa\kern\jlreq@tempdima }% \jlreq@trimmarks@outputbanner{intate@top@left}{% - \setbox\jlreq@tempboxa=\hbox to 0pt{\tate\adjustbaseline\@bannerfont\jlreq@trimmarks@bannerfont##1\hss}% + \setbox\jlreq@tempboxa=\hbox to 0pt{\tate\adjustbaseline\jlreq@trimmarks@bannerfont##1\hss}% \jlreq@tempdima=\dimexpr\jlreq@trimmarks@bleed@left \ifx l\jlreq@trimmarks@engine + \ht\jlreq@tempboxa\fi\relax \wd\jlreq@tempboxa=0pt \ht\jlreq@tempboxa=0pt \dp\jlreq@tempboxa=0pt \kern\jlreq@tempdima\box\jlreq@tempboxa\kern-\jlreq@tempdima @@ -616,13 +602,13 @@ \hbox to\z@{% \@Tr \yoko \jlreq@trimmarks@outputbanner{tate@top@right}{% - \setbox\jlreq@tempboxa=\hbox to 0pt{\tate\adjustbaseline\@bannerfont\jlreq@trimmarks@bannerfont##1\hss}% + \setbox\jlreq@tempboxa=\hbox to 0pt{\tate\adjustbaseline\jlreq@trimmarks@bannerfont##1\hss}% \jlreq@tempdima=\dimexpr 4pt \ifx l\jlreq@trimmarks@engine + \dp\jlreq@tempboxa\fi\relax \ht\jlreq@tempboxa=0pt \dp\jlreq@tempboxa=0pt \wd\jlreq@tempboxa=0pt \kern\jlreq@tempdima\raise -5mm\box\jlreq@tempboxa\kern-\jlreq@tempdima }% \jlreq@trimmarks@outputbanner{intate@top@right}{% - \setbox\jlreq@tempboxa=\hbox to 0pt{\tate\adjustbaseline\@bannerfont\jlreq@trimmarks@bannerfont##1\hss}% + \setbox\jlreq@tempboxa=\hbox to 0pt{\tate\adjustbaseline\jlreq@trimmarks@bannerfont##1\hss}% \ifx l\jlreq@trimmarks@engine \jlreq@tempdima=\dimexpr\jlreq@trimmarks@bleed@top + \ht\jlreq@tempboxa\relax \else @@ -642,7 +628,7 @@ \yoko\hss \vrule width10mm height.5\@tombowwidth depth.5\@tombowwidth \jlreq@trimmarks@outputbanner{before@center@left}{% - \setbox\jlreq@tempboxa=\hbox to 0pt{\tate\hss\adjustbaseline\@bannerfont\jlreq@trimmarks@bannerfont##1\hskip 5mm}% + \setbox\jlreq@tempboxa=\hbox to 0pt{\tate\hss\adjustbaseline\jlreq@trimmarks@bannerfont##1\hskip 5mm}% \ifx l\jlreq@trimmarks@engine \jlreq@tempdima=\dimexpr 4pt + \ht\jlreq@tempboxa\relax \else @@ -652,7 +638,7 @@ \kern-\jlreq@tempdima\box\jlreq@tempboxa\kern\jlreq@tempdima }% \jlreq@trimmarks@outputbanner{after@center@left}{% - \setbox\jlreq@tempboxa=\hbox to 0pt{\tate\hskip 5mm\adjustbaseline\@bannerfont\jlreq@trimmarks@bannerfont##1\hss}% + \setbox\jlreq@tempboxa=\hbox to 0pt{\tate\hskip 5mm\adjustbaseline\jlreq@trimmarks@bannerfont##1\hss}% \ifx l\jlreq@trimmarks@engine \jlreq@tempdima=\dimexpr 4pt + \ht\jlreq@tempboxa\relax \else @@ -663,7 +649,7 @@ }% \vrule height10mm depth10mm width\@tombowwidth \jlreq@trimmarks@outputbanner{in@center@left}{% - \setbox\jlreq@tempboxa=\hbox{\tate\adjustbaseline\@bannerfont\jlreq@trimmarks@bannerfont##1}% + \setbox\jlreq@tempboxa=\hbox{\tate\adjustbaseline\jlreq@trimmarks@bannerfont##1}% \ifx l\jlreq@trimmarks@engine \jlreq@tempdima=\dimexpr\jlreq@trimmarks@bleed@left + \ht\jlreq@tempboxa\relax \jlreq@tempdimb=.5\wd\jlreq@tempboxa @@ -679,7 +665,7 @@ \hbox to\z@{% \@CR \yoko \jlreq@trimmarks@outputbanner{in@center@right}{% - \setbox\jlreq@tempboxa=\hbox{\tate\adjustbaseline\@bannerfont\jlreq@trimmarks@bannerfont##1}% + \setbox\jlreq@tempboxa=\hbox{\tate\adjustbaseline\jlreq@trimmarks@bannerfont##1}% \ifx l\jlreq@trimmarks@engine \jlreq@tempdima=\dimexpr\jlreq@trimmarks@bleed@right + \ht\jlreq@tempboxa\relax \jlreq@tempdimb=0.5\wd\jlreq@tempboxa @@ -692,13 +678,13 @@ }% \vrule height10mm depth10mm width\@tombowwidth \jlreq@trimmarks@outputbanner{before@center@right}{% - \setbox\jlreq@tempboxa=\hbox to 0pt{\tate\hss\adjustbaseline\@bannerfont\jlreq@trimmarks@bannerfont##1\hskip 5mm}% + \setbox\jlreq@tempboxa=\hbox to 0pt{\tate\hss\adjustbaseline\jlreq@trimmarks@bannerfont##1\hskip 5mm}% \jlreq@tempdima=\dimexpr 4pt \ifx l\jlreq@trimmarks@engine + \dp\jlreq@tempboxa\fi\relax \dp\jlreq@tempboxa=0pt \ht\jlreq@tempboxa=0pt \wd\jlreq@tempboxa=0pt \kern\jlreq@tempdima\box\jlreq@tempboxa\kern-\jlreq@tempdima }% \jlreq@trimmarks@outputbanner{after@center@right}{% - \setbox\jlreq@tempboxa=\hbox to 0pt{\tate\hskip 5mm\adjustbaseline\@bannerfont\jlreq@trimmarks@bannerfont##1\hss}% + \setbox\jlreq@tempboxa=\hbox to 0pt{\tate\hskip 5mm\adjustbaseline\jlreq@trimmarks@bannerfont##1\hss}% \jlreq@tempdima=\dimexpr 4pt \ifx l\jlreq@trimmarks@engine + \dp\jlreq@tempboxa\fi\relax \dp\jlreq@tempboxa=0pt \ht\jlreq@tempboxa=0pt \wd\jlreq@tempboxa=0pt \kern\jlreq@tempdima\box\jlreq@tempboxa\kern-\jlreq@tempdima @@ -713,7 +699,7 @@ \vrule width10mm depth\@tombowwidth height\z@ \vrule depth\dimexpr 10mm + \jlreq@trimmarks@bleed@bottom\relax width\@tombowwidth height\z@ \jlreq@trimmarks@outputbanner{tate@bottom@left}{% - \setbox\jlreq@tempboxa=\hbox to 0pt{\tate\adjustbaseline\hss\@bannerfont\jlreq@trimmarks@bannerfont##1}% + \setbox\jlreq@tempboxa=\hbox to 0pt{\tate\adjustbaseline\hss\jlreq@trimmarks@bannerfont##1}% \ifx l\jlreq@trimmarks@engine \jlreq@tempdima=\dimexpr 4pt + \ht\jlreq@tempboxa\relax \else @@ -723,7 +709,7 @@ \kern-\jlreq@tempdima\raise 5mm\box\jlreq@tempboxa\kern\jlreq@tempdima }% \jlreq@trimmarks@outputbanner{intate@bottom@left}{% - \setbox\jlreq@tempboxa=\hbox to 0pt{\tate\adjustbaseline\hss\@bannerfont\jlreq@trimmarks@bannerfont##1}% + \setbox\jlreq@tempboxa=\hbox to 0pt{\tate\adjustbaseline\hss\jlreq@trimmarks@bannerfont##1}% \jlreq@tempdima=\dimexpr\jlreq@trimmarks@bleed@left \ifx l\jlreq@trimmarks@engine + \ht\jlreq@tempboxa\fi\relax \wd\jlreq@tempboxa=0pt \ht\jlreq@tempboxa=0pt \dp\jlreq@tempboxa=0pt \kern\jlreq@tempdima\box\jlreq@tempboxa\kern-\jlreq@tempdima @@ -733,13 +719,13 @@ \hbox to\z@{% \@Br \yoko \jlreq@trimmarks@outputbanner{tate@bottom@right}{% - \setbox\jlreq@tempboxa=\hbox to 0pt{\tate\adjustbaseline\hss\@bannerfont\jlreq@trimmarks@bannerfont##1}% + \setbox\jlreq@tempboxa=\hbox to 0pt{\tate\adjustbaseline\hss\jlreq@trimmarks@bannerfont##1}% \jlreq@tempdima=\dimexpr\ifx l\jlreq@trimmarks@engine\ht\jlreq@tempboxa + \fi 4pt\relax \ht\jlreq@tempboxa=0pt \dp\jlreq@tempboxa=0pt \wd\jlreq@tempboxa=0pt \kern\jlreq@tempdima\raise5mm\box\jlreq@tempboxa\kern-\jlreq@tempdima }% \jlreq@trimmarks@outputbanner{intate@bottom@right}{% - \setbox\jlreq@tempboxa=\hbox to 0pt{\tate\adjustbaseline\hss\@bannerfont\jlreq@trimmarks@bannerfont##1}% + \setbox\jlreq@tempboxa=\hbox to 0pt{\tate\adjustbaseline\hss\jlreq@trimmarks@bannerfont##1}% \ifx l\jlreq@trimmarks@engine \jlreq@tempdima=\dimexpr\jlreq@trimmarks@bleed@right + \ht\jlreq@tempboxa\relax \else @@ -750,7 +736,7 @@ }% \vrule depth\dimexpr 10mm + \jlreq@trimmarks@bleed@bottom\relax width\@tombowwidth height\z@ \jlreq@trimmarks@outputbanner{corner@bottom@right}{% - \setbox\jlreq@tempboxa=\hbox to 0pt{\hskip 4pt\relax\@bannerfont\jlreq@trimmarks@bannerfont##1\hss}% + \setbox\jlreq@tempboxa=\hbox to 0pt{\hskip 4pt\relax\jlreq@trimmarks@bannerfont##1\hss}% \jlreq@tempdima=\dimexpr\ht\jlreq@tempboxa + \jlreq@trimmarks@bleed@bottom + 4pt\relax \ht\jlreq@tempboxa=0pt \dp\jlreq@tempboxa=0pt \raise-\jlreq@tempdima\box\jlreq@tempboxa @@ -765,20 +751,20 @@ \yoko\hss \vrule width\dimexpr 10mm + \jlreq@trimmarks@bleed@left\relax depth\@tombowwidth height\z@ \jlreq@trimmarks@outputbanner{corner@bottom@left}{% - \setbox\jlreq@tempboxa=\hbox to 0pt{\hss\@bannerfont\jlreq@trimmarks@bannerfont##1\hskip\dimexpr\jlreq@trimmarks@bleed@left + 4pt\relax}% + \setbox\jlreq@tempboxa=\hbox to 0pt{\hss\jlreq@trimmarks@bannerfont##1\hskip\dimexpr\jlreq@trimmarks@bleed@left + 4pt\relax}% \jlreq@tempdima=\dimexpr\ht\jlreq@tempboxa + 4pt\relax \ht\jlreq@tempboxa=0pt \dp\jlreq@tempboxa=0pt \raise-\jlreq@tempdima\box\jlreq@tempboxa }% \vrule depth10mm width\@tombowwidth height\z@ \jlreq@trimmarks@outputbanner{yoko@bottom@left}{% - \setbox\jlreq@tempboxa=\hbox to 0pt{\yoko\hskip 5mm\@bannerfont\jlreq@trimmarks@bannerfont##1\hss}% + \setbox\jlreq@tempboxa=\hbox to 0pt{\yoko\hskip 5mm\jlreq@trimmarks@bannerfont##1\hss}% \jlreq@tempdima=\dimexpr\ht\jlreq@tempboxa + 4pt\relax \ht\jlreq@tempboxa=0pt \dp\jlreq@tempboxa=0pt \raise-\jlreq@tempdima\box\jlreq@tempboxa }% \jlreq@trimmarks@outputbanner{inyoko@bottom@left}{% - \setbox\jlreq@tempboxa=\hbox to 0pt{\yoko\@bannerfont\jlreq@trimmarks@bannerfont##1\hss}% + \setbox\jlreq@tempboxa=\hbox to 0pt{\yoko\jlreq@trimmarks@bannerfont##1\hss}% \jlreq@tempdima=\dimexpr\jlreq@trimmarks@bleed@bottom + \dp\jlreq@tempboxa\relax \ht\jlreq@tempboxa=0pt \dp\jlreq@tempboxa=0pt \raise\jlreq@tempdima\box\jlreq@tempboxa @@ -791,13 +777,13 @@ \yoko \vrule width10mm depth\@tombowwidth height\z@ \jlreq@trimmarks@outputbanner{before@bottom@center}{% - \setbox\jlreq@tempboxa=\hbox to 0pt{\hss\@bannerfont\jlreq@trimmarks@bannerfont##1\hskip 5mm}% + \setbox\jlreq@tempboxa=\hbox to 0pt{\hss\jlreq@trimmarks@bannerfont##1\hskip 5mm}% \jlreq@tempdima=\dimexpr\ht\jlreq@tempboxa + 4pt\relax \ht\jlreq@tempboxa=0pt \dp\jlreq@tempboxa=0pt \raise-\jlreq@tempdima\box\jlreq@tempboxa }% \jlreq@trimmarks@outputbanner{in@bottom@center}{% - \setbox\jlreq@tempboxa=\hbox{\@bannerfont\jlreq@trimmarks@bannerfont##1}% + \setbox\jlreq@tempboxa=\hbox{\jlreq@trimmarks@bannerfont##1}% \jlreq@tempdima=\dimexpr\dp\jlreq@tempboxa + \jlreq@trimmarks@bleed@bottom\relax \jlreq@tempdimb=.5\wd\jlreq@tempboxa \ht\jlreq@tempboxa=0pt \dp\jlreq@tempboxa=0pt \wd\jlreq@tempboxa=0pt @@ -805,7 +791,7 @@ }% \vrule depth10mm width\@tombowwidth height\z@ \jlreq@trimmarks@outputbanner{before@bottom@center}{% - \setbox\jlreq@tempboxa=\hbox to 0pt{\hskip 5mm\@bannerfont\jlreq@trimmarks@bannerfont##1\hss}% + \setbox\jlreq@tempboxa=\hbox to 0pt{\hskip 5mm\jlreq@trimmarks@bannerfont##1\hss}% \jlreq@tempdima=\dimexpr\ht\jlreq@tempboxa + 4pt\relax \ht\jlreq@tempboxa=0pt \dp\jlreq@tempboxa=0pt \raise-\jlreq@tempdima\box\jlreq@tempboxa @@ -818,13 +804,13 @@ \setbox\jlreq@tempboxa=\hbox to 0pt{% \@BR \yoko \jlreq@trimmarks@outputbanner{yoko@bottom@right}{% - \setbox\jlreq@tempboxa=\hbox to 0pt{\yoko\hss\@bannerfont\jlreq@trimmarks@bannerfont##1\hskip 5mm}% + \setbox\jlreq@tempboxa=\hbox to 0pt{\yoko\hss\jlreq@trimmarks@bannerfont##1\hskip 5mm}% \jlreq@tempdima=\dimexpr\ht\jlreq@tempboxa + 4pt\relax \ht\jlreq@tempboxa=0pt \dp\jlreq@tempboxa=0pt \raise-\jlreq@tempdima\box\jlreq@tempboxa }% \jlreq@trimmarks@outputbanner{inyoko@bottom@right}{% - \setbox\jlreq@tempboxa=\hbox to 0pt{\yoko\hss\@bannerfont\jlreq@trimmarks@bannerfont##1}% + \setbox\jlreq@tempboxa=\hbox to 0pt{\yoko\hss\jlreq@trimmarks@bannerfont##1}% \jlreq@tempdima=\dimexpr\dp\jlreq@tempboxa + \jlreq@trimmarks@bleed@bottom\relax \ht\jlreq@tempboxa=0pt \dp\jlreq@tempboxa=0pt \raise\jlreq@tempdima\box\jlreq@tempboxa diff --git a/Master/texmf-dist/tex/latex/jlreq/jlreq.cls b/Master/texmf-dist/tex/latex/jlreq/jlreq.cls index 8f1ed6dfb15..913785b02da 100644 --- a/Master/texmf-dist/tex/latex/jlreq/jlreq.cls +++ b/Master/texmf-dist/tex/latex/jlreq/jlreq.cls @@ -5,7 +5,7 @@ %% % (based on JLReq 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@pagestyle@parse@position@#1-\jlreq@endmark + \ifthenelse{\equal{\jlreq@tempa}{fore}}{% + \expandafter\jlreq@pagestyle@parse@position@\jlreq@tempb-\jlreq@endmark + \ifthenelse{\equal{\jlreq@tempa}{edge}}{% + \def\jlreq@tempa{fore-edge}% + }{% + \ClassError{jlreq}{Invalid position: fore-\jlreq@tempa}{\@ehc}% + }% + }{}% % \jlreq@tempcに縦方向を,\jlreq@tempdに横方向を入れる \def\jlreq@tempc{}\def\jlreq@tempd{}% \jlreq@pagestyle@parse@position@@{\jlreq@tempa}% @@ -3786,8 +3794,8 @@ \jlreq@ifempty{#2}{% \ifx\jlreq@tempb\@empty\ClassError{jlreq}{Invalid position: #1}{\@ehc}\fi }{% - \def\@tempa##1-{\def\jlreq@tempb{##1}}% - \@tempa#2\relax + \def\@tempa##1-\jlreq@endmark{\def\jlreq@tempb{##1}}% + \@tempa#2\jlreq@endmark\relax }% } @@ -4230,9 +4238,8 @@ \jlreq@if{\ifjlreq@pstate\fi}{% tate % headの方に処理を入れる.footは空. \def\jlreq@oddfoot{}\def\jlreq@evenfoot{}% - \jlreq@for@noexpand\jlreq@position:=\jlreq@nombre@i@position,\jlreq@running@head@i@position\do{% - \expandafter\ifx\jlreq@position\@empty\expandafter\def\jlreq@position{0pt}\fi - }% + \ifx\jlreq@nombre@i@position\@empty\def\jlreq@nombre@i@position{5\jlreq@zw}\fi + \ifx\jlreq@running@head@i@position\@empty\def\jlreq@running@head@i@position{4\jlreq@zw}\fi \edef\jlreq@gapcs{\noexpand\hskip\noexpand\glueexpr\expandonce{\jlreq@nombre@gap}\noexpand\relax}% \jlreq@pagestyle@addifempty{\jlreq@nombre@iii@position}{\jlreq@nombre@ii}{\jlreq@gapcs}{\jlreq@nombre@iii}% \jlreq@pagestyle@addifempty{\jlreq@nombre@ii@position}{\jlreq@nombre@i}{\jlreq@gapcs}{\jlreq@nombre@ii}% @@ -4246,15 +4253,16 @@ \expandafter\let\expandafter\jlreq@position\csname jlreq@nombre@\jlreq@i @position\endcsname \expandafter\ifx\csname jlreq@nombre@\jlreq@i\endcsname\@empty\else \jlreq@ifgluezero{\glueexpr\jlreq@position\relax}{\def\jlreq@position{}}{}% + \expandafter\let\expandafter\jlreq@tempa\expandafter=\csname jlreq@nombre@\jlreq@i\endcsname + \jlreq@pagestyle@addfont@tocs{jlreq@tempa}{jlreq@nombre@font}% \eappto\jlreq@nombre@contents{% \noexpand\hbox to 0pt{\noexpand\hss + \expandonce{\jlreq@tempa}% \ifx\jlreq@position\@empty\else\unexpanded{\hskip \glueexpr}\expandonce{\jlreq@position}\noexpand\relax\fi - \csexpandonce{jlreq@nombre@\jlreq@i}% }% }% \fi }% - \jlreq@pagestyle@addfont@tocs{jlreq@nombre@contents}{jlreq@nombre@font}% % \jlreq@(odd|even)@contentsに柱を入れる(上の方に出力) \@for\jlreq@parity:=odd,even\do{% \expandafter\def\csname jlreq@\jlreq@parity @contents\endcsname{}% @@ -4262,17 +4270,18 @@ \expandafter\let\expandafter\jlreq@position\csname jlreq@running@head@\jlreq@i @position\endcsname \expandafter\ifx\csname jlreq@\jlreq@parity @running@head@\jlreq@i\endcsname\@empty\else \jlreq@ifgluezero{\glueexpr\jlreq@position\relax}{\def\jlreq@position{}}{}% + \expandafter\let\expandafter\jlreq@tempa\expandafter=\csname jlreq@\jlreq@parity @running@head@\jlreq@i\endcsname + \jlreq@pagestyle@addfont@tocs{jlreq@tempa}{jlreq@running@head@font}% \expandafter\eappto\csname jlreq@\jlreq@parity @contents\endcsname{% \noexpand\hbox to 0pt{\unexpanded{\hskip\glueexpr\headsep + \headheight}% \if@tate\else\unexpanded{+ \topskip - \Cht}\fi \ifx\jlreq@position\@empty\else + \expandonce{\jlreq@position}\fi\noexpand\relax - \csexpandonce{jlreq@\jlreq@parity @running@head@\jlreq@i}% + \expandonce{\jlreq@tempa}% \noexpand\hss }% }% \fi }% - \jlreq@pagestyle@addfont@tocs{jlreq@\jlreq@parity @contents}{jlreq@running@head@font}% % \jlreq@(odd|even)headの構築 % 空き指定には基本版面の文字サイズを使う(2.6.1.c) \@ifundefined{jlreq@\jlreq@parity headformat} @@ -4455,7 +4464,7 @@ \jlreq@pagestyle@setheadfoot{\jlreq@oddfoot}{jlreq@odd@bottom@left}{jlreq@odd@bottom@center}{jlreq@odd@bottom@right}% \jlreq@pagestyle@setheadfoot{\jlreq@evenhead}{jlreq@even@top@left}{jlreq@even@top@center}{jlreq@even@top@right}% \jlreq@pagestyle@setheadfoot{\jlreq@evenfoot}{jlreq@even@bottom@left}{jlreq@even@bottom@center}{jlreq@even@bottom@right}% - \ifthenelse{\lengthtest{\marginparwidth>0pt} \AND \(\NOT\boolean{@tate}\)}{% + \ifthenelse{\lengthtest{\jlreq@sidenote@length >0pt} \AND \(\NOT\boolean{@tate}\)}{% \def\jlreq@defaultformat{\hss\hbox to \jlreqyokoheadlength{####1}\hss}% }{% \def\jlreq@defaultformat{####1}% @@ -4465,7 +4474,7 @@ \jlreq@pagestyle@applyformat{\jlreq@oddfoot}{\jlreq@oddfootformat}{\jlreq@defaultformat}% \jlreq@pagestyle@applyformat{\jlreq@evenfoot}{\jlreq@evenfootformat}{\jlreq@defaultformat}% % 傍注用調整 - \ifdim\marginparwidth>0pt + \ifdim\jlreq@sidenote@length>0pt \if@tate\else \if@twocolumn \jlreq@pagestyle@addsidenotemargin@bothside{\jlreq@oddhead}% @@ -4507,14 +4516,14 @@ \if@tate \def\jlreqyokoheadlength{\textheight} \else - \ifdim\marginparwidth>0pt + \ifdim\jlreq@sidenote@length>0pt \if@twocolumn \def\jlreqyokoheadlength{\dimexpr\textwidth + 2\jlreq@sidenote@length + 2\jlreq@sidenote@sep\relax} \else \def\jlreqyokoheadlength{\dimexpr\textwidth + \jlreq@sidenote@length + \jlreq@sidenote@sep\relax} \fi \else - \def\jlreqyokoheadlength{\textwidth} + \def\jlreqyokoheadlength{\dimexpr\textwidth\relax} \fi \fi \edef\jlreqtateheadlength{\unexpanded{\dimexpr\headsep + \headheight + \textheight}\if@tate\else\unexpanded{- \topskip + 1\jlreq@zh}\fi\noexpand\relax} @@ -5615,18 +5624,20 @@ \def\@begintheorem#1#2{\topsep=\dimexpr\jlreq@theorem@beforeafter@space\relax \trivlist\labelsep=1\jlreq@zw \itemindent=\dimexpr\jlreq@theorem@indent\relax - \item[\hskip \labelsep{\sffamily\gtfamily\bfseries #1\ #2}]} + \jlreq@theorem@font + \item[\hskip \labelsep{\reset@font\jlreq@theorem@label@font #1\ #2}]} \def\@opargbegintheorem#1#2#3{\topsep=\dimexpr\jlreq@theorem@beforeafter@space\relax \trivlist\labelsep=1\jlreq@zw \itemindent=\dimexpr\jlreq@theorem@indent\relax - \item[\hskip \labelsep{\sffamily\gtfamily\bfseries #1\ #2(#3)}]} + \jlreq@theorem@font + \item[\hskip \labelsep{\reset@font\jlreq@theorem@label@font #1\ #2(#3)}]} \AtEndOfPackageFile*{amsthm}{% \jlreq@saveoriginalcs{\proof}% \jlreq@saveoriginalcs{\endproof}% \edef\jlreq@do{ \unexpanded{\def\jlreq@proof[#1]}{% \unexpanded{\labelsep=1\jlreq@zw}% - \expandonce{\proof[{\reset@font\sffamily\gtfamily\bfseries #1\inhibitglue}\nopunct]}% + \expandonce{\proof[{\reset@font\jlreq@proof@label@font #1\inhibitglue}\nopunct]}% } } \jlreq@do @@ -5636,17 +5647,29 @@ \theoremstyle{jlreq} } \def\jlreq@setupamsthm{ - \newtheoremstyle{jlreq}{\dimexpr\jlreq@theorem@beforeafter@space\relax}{\dimexpr\jlreq@theorem@beforeafter@space\relax}{\normalfont}{\dimexpr\jlreq@theorem@indent\relax}{\sffamily\gtfamily\bfseries}{}{1\jlreq@zw}{\thmname{##1}\thmnumber{\ ##2}\thmnote{(##3)}} + \newtheoremstyle{jlreq}{\dimexpr\jlreq@theorem@beforeafter@space\relax}{\dimexpr\jlreq@theorem@beforeafter@space\relax}{\jlreq@theorem@font}{\dimexpr\jlreq@theorem@indent\relax}{\jlreq@theorem@label@font}{}{1\jlreq@zw}{\thmname{##1}\thmnumber{\ ##2}\thmnote{(##3)}} } \jlreq@jlreqsetup@add{theorem_beforeafter_space}{ \def\jlreq@theorem@beforeafter@space{#1} + \begingroup\jlreq@tempdima=\dimexpr\jlreq@theorem@beforeafter@space\relax\endgroup \@ifpackageloaded{amsthm}{\jlreq@setupamsthm}{} } \jlreq@jlreqsetup@add{theorem_indent}{ \def\jlreq@theorem@indent{#1} + \begingroup\jlreq@tempdima=\dimexpr\jlreq@theorem@indent\relax\endgroup \@ifpackageloaded{amsthm}{\jlreq@setupamsthm}{} } - +\jlreq@jlreqsetup@add{theorem_font}{ + \def\jlreq@theorem@font{#1} + \@ifpackageloaded{amsthm}{\jlreq@setupamsthm}{} +} +\jlreq@jlreqsetup@add{theorem_label_font}{ + \def\jlreq@theorem@label@font{#1} + \@ifpackageloaded{amsthm}{\jlreq@setupamsthm}{} +} +\jlreq@jlreqsetup@add{proof_label_font}{ + \def\jlreq@proof@label@font{#1} +} %. デフォルト設定 %.. 見出し @@ -5765,7 +5788,7 @@ \jlreqsetup{footnote_second_indent=1\jlreq@zw} \jlreqsetup{endnote_second_indent=2\jlreq@zw} \jlreqsetup{endnote_position=headings} -\ifdim\marginparwidth>0pt +\ifdim\jlreq@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}{目次} -- cgit v1.2.3