diff options
author | Karl Berry <karl@freefriends.org> | 2022-07-13 20:46:25 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-07-13 20:46:25 +0000 |
commit | 440dd7f37c23110c65f834c569f0cd0eba922a58 (patch) | |
tree | e157bbc8a73cb6c9d945ecb4c7deb47690e77512 | |
parent | 89d91af8acccda3f27ae8e2f58f83e764506af0b (diff) |
jlreq (13jul22)
git-svn-id: svn://tug.org/texlive/trunk@63885 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Master/texmf-dist/doc/latex/jlreq/LICENSE | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/jlreq/README-ja.md | 3 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/jlreq/README.md | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html | 4 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/jlreq/jlreq-ja.pdf | bin | 371495 -> 371560 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.html | 4 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.md | 3 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.html | 4 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.md | 3 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/jlreq/jlreq.html | 4 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/jlreq/jlreq.pdf | bin | 119744 -> 119802 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/jlreq/Makefile | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/jlreq/jlreq-complements.sty | 259 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/jlreq/jlreq-trimmarks.sty | 9 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/jlreq/jlreq.cls | 156 |
15 files changed, 333 insertions, 122 deletions
diff --git a/Master/texmf-dist/doc/latex/jlreq/LICENSE b/Master/texmf-dist/doc/latex/jlreq/LICENSE index 4e292f4765c..194b3d99942 100644 --- a/Master/texmf-dist/doc/latex/jlreq/LICENSE +++ b/Master/texmf-dist/doc/latex/jlreq/LICENSE @@ -1,6 +1,6 @@ (2-clause BSD license) jlreq and jlreq-trimmarks -Copyright 2017-2021, Noriyuki Abe. +Copyright 2017-2022, Noriyuki Abe. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Master/texmf-dist/doc/latex/jlreq/README-ja.md b/Master/texmf-dist/doc/latex/jlreq/README-ja.md index c2dc666329e..78766ca570a 100644 --- a/Master/texmf-dist/doc/latex/jlreq/README-ja.md +++ b/Master/texmf-dist/doc/latex/jlreq/README-ja.md @@ -538,7 +538,8 @@ JFMの名前は次の通りです.`[]`で囲まれている文字は設定に - その他バグ修正. * 2022-04-11 - バグ修正. - +* 2022-07-13 + - 右側の柱が正しく配置されないバグ修正. -------------- Noriyuki Abe diff --git a/Master/texmf-dist/doc/latex/jlreq/README.md b/Master/texmf-dist/doc/latex/jlreq/README.md index b1df695c653..9d9506678bd 100644 --- a/Master/texmf-dist/doc/latex/jlreq/README.md +++ b/Master/texmf-dist/doc/latex/jlreq/README.md @@ -173,6 +173,8 @@ This package is distributed under the BSD 2-Clause License. See [LICENSE](LICENS - Fixed other bugs. * 2022-04-11 - Fixed a bug. +* 2022-07-13 + - Fixed a bug: The position of running heads were not correct. -------------- 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 7d440ca2767..7b825ed72e3 100644 --- a/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html +++ b/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html @@ -654,6 +654,10 @@ <ul> <li>バグ修正.</li> </ul></li> +<li>2022-07-13 +<ul> +<li>右側の柱が正しく配置されないバグ修正.</li> +</ul></li> </ul> <hr /> <p>Noriyuki Abe <a href="https://github.com/abenori/jlreq">https://github.com/abenori/jlreq</a></p> diff --git a/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.pdf b/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.pdf Binary files differindex 4c4501ca626..2fa852d4e90 100644 --- a/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.pdf +++ b/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.pdf diff --git a/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.html b/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.html index 70ff17e8b9e..0b2917ad558 100644 --- a/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.html +++ b/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.html @@ -244,6 +244,10 @@ <ul> <li><code>etoolbox</code>に依存しないようにした.</li> </ul></li> +<li>2022-07-13 +<ul> +<li>読み込み時にエラーが出るバグ修正.</li> +</ul></li> </ul> <hr /> <p>Noriyuki Abe <a href="https://github.com/abenori/jlreq">https://github.com/abenori/jlreq</a></p> diff --git a/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.md b/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.md index 6c93a850aac..aace5bbeb33 100644 --- a/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.md +++ b/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.md @@ -165,7 +165,8 @@ dviドライバの指定です.エンジンに`lualatex`を利用する場合 - expl3コードとの親和性を高めた. * 2021-08-12 - `etoolbox`に依存しないようにした. - +* 2022-07-13 + - 読み込み時にエラーが出るバグ修正. -------------- 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 9d13ec91a64..14be58383be 100644 --- a/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.html +++ b/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.html @@ -237,6 +237,10 @@ <ul> <li>Removed dependence on <code>etoolbox</code> package.</li> </ul></li> +<li>2022-07-13 +<ul> +<li>Fixed a bug: an error occurred when loading.</li> +</ul></li> </ul> <hr /> <p>Noriyuki Abe <a href="https://github.com/abenori/jlreq">https://github.com/abenori/jlreq</a></p> diff --git a/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.md b/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.md index 8f69b39b571..3f4e72e4d37 100644 --- a/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.md +++ b/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.md @@ -159,7 +159,8 @@ This package is distributed under the BSD 2-Clause License. See [LICENSE](LICENS - It has more compatibility with expl3. * 2021-08-12 - Removed dependence on `etoolbox` package. - +* 2022-07-13 + - Fixed a bug: an error occurred when loading. -------------- Noriyuki Abe diff --git a/Master/texmf-dist/doc/latex/jlreq/jlreq.html b/Master/texmf-dist/doc/latex/jlreq/jlreq.html index 2c7242c445b..c49931c4ae2 100644 --- a/Master/texmf-dist/doc/latex/jlreq/jlreq.html +++ b/Master/texmf-dist/doc/latex/jlreq/jlreq.html @@ -301,6 +301,10 @@ <ul> <li>Fixed a bug.</li> </ul></li> +<li>2022-07-13 +<ul> +<li>Fixed a bug: The position of running heads were not correct.</li> +</ul></li> </ul> <hr /> <p>Noriyuki Abe <a href="https://github.com/abenori/jlreq">https://github.com/abenori/jlreq</a></p> diff --git a/Master/texmf-dist/doc/latex/jlreq/jlreq.pdf b/Master/texmf-dist/doc/latex/jlreq/jlreq.pdf Binary files differindex 453d785a3f9..495dd58d85b 100644 --- a/Master/texmf-dist/doc/latex/jlreq/jlreq.pdf +++ b/Master/texmf-dist/doc/latex/jlreq/jlreq.pdf diff --git a/Master/texmf-dist/source/latex/jlreq/Makefile b/Master/texmf-dist/source/latex/jlreq/Makefile index b9b9eca5d27..ed84b713364 100644 --- a/Master/texmf-dist/source/latex/jlreq/Makefile +++ b/Master/texmf-dist/source/latex/jlreq/Makefile @@ -211,6 +211,7 @@ jfm-install: jfm cls-install: mkdir -p ${TEXMF}/tex/latex/jlreq install jlreq-helpers.sty ${TEXMF}/tex/latex/jlreq + install jlreq-complements.sty ${TEXMF}/tex/latex/jlreq install jlreq.cls ${TEXMF}/tex/latex/jlreq sty-install: @@ -232,6 +233,7 @@ tds: jfm jlreq.cls README.md README-ja.md LICENSE jlreq.html jlreq-ja.html jlreq mkdir -p ./tds/tex/latex/jlreq cp jlreq.cls ./tds/tex/latex/jlreq cp jlreq-helpers.sty ./tds/tex/latex/jlreq + cp jlreq-complements.sty ./tds/tex/latex/jlreq cp jlreq-trimmarks.sty ./tds/tex/latex/jlreq mkdir -p ./tds/doc/latex/jlreq cp README.md ./tds/doc/latex/jlreq diff --git a/Master/texmf-dist/tex/latex/jlreq/jlreq-complements.sty b/Master/texmf-dist/tex/latex/jlreq/jlreq-complements.sty new file mode 100644 index 00000000000..2e20114fe61 --- /dev/null +++ b/Master/texmf-dist/tex/latex/jlreq/jlreq-complements.sty @@ -0,0 +1,259 @@ +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{jlreq-complements}[2022/07/13 jlreq-complements] +\RequirePackage{jlreq-helpers}[2021/08/12] +\RequirePackage{l3keys2e} + +\ExplSyntaxOn + +\str_new:N \g__jlreq_complements_setupname_str +\str_new:N \g__jlreq_complements_engine_str +\tl_new:N \g__jlreq_complements_finally + +\keys_define:nn { jlreq-complements } { + setupname .code:n = { + \str_set:Nn \g__jlreq_complements_setupname_str {#1} + }, + uplatex .code:n = { \str_set:Nn \g__jlreq_complements_engine_str { uplatex } }, + uplatex .value_forbidden:n = true, + platex .code:n = { \str_set:Nn \g__jlreq_complements_engine_str { platex } }, + platex .value_forbidden:n = true, + 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 } + +\str_if_empty:NT \g__jlreq_complements_engine_str { + \jlreq@helper@guessengine + \str_gset:Nx \g__jlreq_complements_engine_str { + \ifx l\jlreq@result lualatex \fi + \ifx u\jlreq@result uplatex \fi + \ifx p\jlreq@result platex \fi + } +} +\str_if_empty:NT \g__jlreq_complements_engine_str { + \PackageError { jlreq-complements } { Cannot~determine~the~engine }{\@ehc} +} + +\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 } + } +}{ + \prg_new_conditional:Nnn \__jlreq_complements_iftdir: { T, F, TF} { \legacy_if_p:n { tdir } } +} + +\@ifundefined{jlreq@zw}{ + \str_if_eq:VnTF \g__jlreq_complements_engine_str { lualatex } + { \def\jlreq@zw{\zw} } + { \def\jlreq@zw{zw} } +} + +\exp_args:Nx \@ifundefined { \g__jlreq_complements_setupname_str } { + \exp_args:Ncnx \NewDocumentCommand {\g__jlreq_complements_setupname_str} { +m } { + \exp_not:N \keys_set:nn { \g__jlreq_complements_setupname_str } {\exp_not:n {#1}} + } +}{} + +\cs_if_exist:NF \keys_define:Vn { + \cs_generate_variant:Nn \keys_define:nn {Vn} + \tl_gput_right:Nn \g__jlreq_complements_finally { + \cs_undefine:N \keys_define:Vn + } +} +\cs_if_exist:NF \keys_set:Vn { + \cs_generate_variant:Nn \keys_set:nn {Vn} + \tl_gput_right:Nn \g__jlreq_complements_finally { + \cs_undefine:N \keys_set:Vn + } +} + +%. thebibliography +\prop_new:N \g__jlreq_complements_thebibliography_prop + +\clist_map_inline:nn { heading,mark,precode,postcode,indent,after_label_space } { + \keys_define:Vn \g__jlreq_complements_setupname_str { + thebibliography_#1 .code:n = { + \prop_gput:Nnn \g__jlreq_complements_thebibliography_prop { #1 } { ##1 } + } + } +} + +\keys_set:Vn \g__jlreq_complements_setupname_str { + thebibliography_mark = { \@mkboth{\refname}{\refname} }, + thebibliography_heading = { \section*{\refname} }, + thebibliography_after_label_space = { 1\jlreq@zw }, + thebibliography_indent = { 0pt }, + thebibliography_precode = {}, + thebibliography_postcode = {}, +} + +\renewenvironment{thebibliography}[1]{% + \prop_item:Nn \g__jlreq_complements_thebibliography_prop { precode } + \prop_item:Nn \g__jlreq_complements_thebibliography_prop { heading } + \prop_item:Nn \g__jlreq_complements_thebibliography_prop { mark } + \list{\@biblabel{\@arabic\c@enumiv}}% + {\settowidth\labelwidth{\@biblabel{#1}}% + \labelsep=\prop_item:Nn \g__jlreq_complements_thebibliography_prop { after_label_space } + \leftmargin\labelwidth + \advance\leftmargin\labelsep + \itemindent=\prop_item:Nn \g__jlreq_complements_thebibliography_prop { indent } + \@openbib@code % only for compatibility + \usecounter{enumiv} + \let\p@enumiv\@empty + \renewcommand\theenumiv{\@arabic\c@enumiv}} + \sloppy + \clubpenalty4000 + \@clubpenalty\clubpenalty + \widowpenalty4000% + \sfcode`\.\@m +}{% + \def\@noitemerr{\@latex@warning{Empty~`thebibliography'~environment}}% + \endlist + \prop_item:Nn \g__jlreq_complements_thebibliography_prop { postcode } +} +\let\@openbib@code\@empty + +%. theindex +\prop_new:N \g__jlreq_complements_theindex_prop +\clist_map_inline:nn { precode,postcode,heading,mark,column_gap,column_rule_width,pagestyle } { + \keys_define:Vn \g__jlreq_complements_setupname_str { + theindex_#1 .code:n = { + \prop_gput:Nnn \g__jlreq_complements_theindex_prop { #1 } { ##1 } + } + } +} + +\bool_new:N \g__jlreq_complements_theindex_yoko_bool +\bool_new:N \g__jlreq_complements_theindex_twocolumn_bool +\bool_new:N \g__jlreq_complements_theindex_restorepagestyle_bool +\keys_define:Vn \g__jlreq_complements_setupname_str { + theindex_yoko .bool_gset:N = \g__jlreq_complements_theindex_yoko_bool, + theindex_twocolumn .bool_gset:N = \g__jlreq_complements_theindex_twcolumn_bool, +} + +\keys_set:Vn \g__jlreq_complements_setupname_str { + theindex_precode = {}, + theindex_postcode = {}, + theindex_heading = { \section*{\indexname} }, + theindex_mark = { \@mkboth{\indexname}{\indexname} }, + theindex_column_gap = { 2\jlreq@zw }, + theindex_column_rule_width = { 0pt }, + theindex_pagestyle = { plain }, + theindex_twocolumn = true +} +\legacy_if:nTF { @tate } + { \keys_set:Vn \g__jlreq_complements_setupname_str { theindex_yoko = false } } + { \keys_set:Vn \g__jlreq_complements_setupname_str { theindex_yoko = true } } + + +\bool_new:N \l__jlreq_complements_resttate_bool +\renewenvironment{theindex}{% + \prop_item:Nn \g__jlreq_complements_theindex_prop { precode } + \bool_set_false:N \l__jlreq_complements_resttate_bool + \bool_if:NT \g__jlreq_complements_theindex_yoko_bool { + \__jlreq_complements_iftdir:T { \clearpage \yoko \bool_set_true:N \l__jlreq_complements_resttate_bool } + } + \bool_if:NTF \g__jlreq_complements_theindex_twocolumn_bool { + \setlength{\columnseprule}{ \prop_item:Nn \g__jlreq_complements_theindex_prop { column_rule_width } } + \setlength{\columnsep} { \prop_item:Nn \g__jlreq_complements_theindex_prop { column_gap } } + \tl_set:Nx \l__jlreq_tmpa_tl { \exp_not:N \twocolumn [ \prop_item:Nn \g__jlreq_complements_theindex_prop { heading } ] } + \l__jlreq_tmpa_tl + }{ + \tl_set:Nx \l__jlreq_tmpa_tl { + \legacy_if:nT { @twocolumn } { \exp_not:N \onecolumn } + \prop_item:Nn \g__jlreq_complements_theindex_prop { heading } + } + \l__jlreq_tmpa_tl + } + \prop_item:Nn \g__jlreq_complements_theindex_prop { mark } + \tl_set:Nx \l__jlreq_tmpa_tl { \exp_not:N \pagestyle { \prop_item:Nn \g__jlreq_complements_theindex_prop { pagestyle } } } + \parindent\z@ + \parskip\z@ \@plus .03\jlreq@zh\relax + \let\item\@idxitem +}{% + \bool_if:NTF \g__jlreq_complements_theindex_twocolumn_bool { + \legacy_if:nF { @twocolumn } { \onecolumn } + }{ + \legacy_if:nT { @twocolumn } { \twocolumn } + } + \clearpage + \bool_if:NT \l__jlreq_complements_resttate_bool { \tate } + \prop_item:Nn \g__jlreq_complements_theindex_prop { postcode } +} + +%. 定理環境 +\prop_new:N \g__jlreq_complements_theorem_prop +\clist_map_inline:nn { beforeafter_space,indent,font,label_font } { + \keys_define:Vn \g__jlreq_complements_setupname_str { + theorem_#1 .code:n = { + \prop_gput:Nnn \g__jlreq_complements_theorem_prop { #1 } { ##1 } + \@ifpackageloaded{amsthm}{\__jlreq_complements_setup_amsthm_theoremstyle:}{} + } + } +} +\keys_define:Vn \g__jlreq_complements_setupname_str { + proof_label_font .code:n = { + \prop_gput:Nnn \g__jlreq_complements_theorem_prop { proof_label_font } {#1} + } +} + +\keys_set:Vn \g__jlreq_complements_setupname_str { + theorem_beforeafter_space=1\baselineskip, + theorem_indent=0pt, + theorem_label_font = {\bfseries\gtfamily\sffamily}, + theorem_font = {\normalfont}, + proof_label_font = {\bfseries\gtfamily\sffamily}, +} + +\let\jlreq@complements@original@@begintheorem=\@begintheorem +\let\jlreq@complements@original@@opargbegintheorem=\@opargbegintheorem +\def\@begintheorem#1#2{\topsep=\dimexpr\prop_item:Nn \g__jlreq_complements_theorem_prop { beforeafter_space }\relax + \trivlist\labelsep=1\jlreq@zw\relax + \itemindent=\dimexpr\prop_item:Nn \g__jlreq_complements_theorem_prop { indent }\relax + \prop_item:Nn \g__jlreq_complements_theorem_prop { font } + \item[\hskip \labelsep{\reset@font\prop_item:Nn \g__jlreq_complements_theorem_prop { label_font } #1\ #2}]} +\def\@opargbegintheorem#1#2#3{\topsep=\dimexpr\prop_item:Nn \g__jlreq_complements_theorem_prop { beforeafter_space }\relax + \trivlist\labelsep=1\jlreq@zw\relax + \itemindent=\dimexpr\prop_item:Nn \g__jlreq_complements_theorem_prop { indent }\relax + \prop_item:Nn \g__jlreq_complements_theorem_prop { font } + \item[\hskip \labelsep{\reset@font\prop_item:Nn \g__jlreq_complements_theorem_prop { label_font } #1\ #2(#3)}]} +\cs_set:Nn \__jlreq_complements_setup_amsthm: { + \let\jlreq@complements@original@proof=\proof + \let\jlreq@complements@original@endproof=\endproof + \tl_set:Nx \l__jlreq_tmpa_tl { + \exp_not:n { \cs_set:Npn \__jlreq_complements_proof [##1] } { + \exp_not:n { \labelsep=1\jlreq@zw\relax } + \exp_not:o {\proof[{\reset@font\prop_item:Nn \g__jlreq_complements_theorem_prop { proof_label_font } ##1\inhibitglue}\nopunct]} + } + } + \l__jlreq_tmpa_tl + \def\proof{\@ifnextchar[{\__jlreq_complements_proof}{\__jlreq_complements_proof[\proofname]}} + \renewcommand{\proofname}{証明} + \__jlreq_complements_setup_amsthm_theoremstyle: + \theoremstyle{jlreq} + % 一度しか実行されないはず + \cs_undefine:N \__jlreq_complements_setup_amsthm: +} +\cs_set:Nn \__jlreq_complements_setup_amsthm_theoremstyle: { + \newtheoremstyle{jlreq} + {\dimexpr\prop_item:Nn \g__jlreq_complements_theorem_prop { beforeafter_space } \relax} + {\dimexpr\prop_item:Nn \g__jlreq_complements_theorem_prop { beforeafter_space } \relax} + {\prop_item:Nn \g__jlreq_complements_theorem_prop { font } } + {\dimexpr\prop_item:Nn \g__jlreq_complements_theorem_prop { indent } } + {\prop_item:Nn \g__jlreq_complements_theorem_prop { label_font } } + {}{1\jlreq@zw}{\thmname{##1}\thmnumber{\ ##2}\thmnote{(##3)}} +} + +\@ifpackageloaded{amsthm}{ + \__jlreq_complements_setup_amsthm: +}{ + \RequirePackage{filehook} + \AtEndOfPackageFile{amsthm}{\__jlreq_complements_setup_amsthm:} +} + +%. 終わり +\g__jlreq_complements_finally +\cs_undefine:N \g__jlreq_complements_finally + +\ExplSyntaxOff diff --git a/Master/texmf-dist/tex/latex/jlreq/jlreq-trimmarks.sty b/Master/texmf-dist/tex/latex/jlreq/jlreq-trimmarks.sty index 3cd358e68cc..b21bdcc4538 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}[2021/11/05 jlreq-trimmarks] +\ProvidesPackage{jlreq-trimmarks}[2022/07/13 jlreq-trimmarks] \RequirePackage{l3keys2e} \RequirePackage{jlreq-helpers} @@ -521,9 +521,10 @@ \def\jlreq@trimmarks@bleed{3mm} % left=gutter? \def\ifjlreq@trimmarks@leftisgutter{% - \bool_if:nTF { - ( \legacy_if_p:n { jlreq@trimmarks@tate } && ( ! ( \int_if_odd_p:n { \c@page } || ! \legacy_if_p:n { @twoside } ) ) ) || - ( ! \legacy_if_p:n { jlreq@trimmarks@tate } && ( \int_if_odd_p:n { \c@page } || ! \legacy_if_p:n { @twoside } ) ) + \ifjlreq@trimmarks@tate { + \bool_if:nTF { ! ( \int_if_odd_p:n { \c@page } || ! \legacy_if_p:n { @twoside } ) ) } + }{ + \bool_if:nTF { ( \int_if_odd_p:n { \c@page } || ! \legacy_if_p:n { @twoside } ) } } } \def\jlreq@trimmarks@bleed@left{\ifjlreq@trimmarks@leftisgutter{\jlreq@trimmarks@bleed@gutter}{\expandafter\csname jlreq@trimmarks@bleed@fore-edge\endcsname}} diff --git a/Master/texmf-dist/tex/latex/jlreq/jlreq.cls b/Master/texmf-dist/tex/latex/jlreq/jlreq.cls index 36c73778935..8615e3bf303 100644 --- a/Master/texmf-dist/tex/latex/jlreq/jlreq.cls +++ b/Master/texmf-dist/tex/latex/jlreq/jlreq.cls @@ -5,7 +5,7 @@ %% % (based on JLReq 20200811 https://www.w3.org/TR/2020/NOTE-jlreq-20200811/) \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{jlreq}[2022/04/11 jlreq] +\ProvidesClass{jlreq}[2022/07/13 jlreq] \RequirePackage{l3keys2e} \RequirePackage{etoolbox} \RequirePackage{jlreq-helpers}[2021/08/12] @@ -4572,7 +4572,7 @@ }{ % 真ん中のを完全に真ん中に配置するために左右の幅を0にしておく \tl_if_empty:nF { #2 } { \tl_set:Nx \l__jlreq_tmpa_tl { \exp_not:N \hbox to~0pt { \exp_not:o { \l__jlreq_tmpa_tl } \exp_not:N \hss } } } - \tl_if_empty:nF { #4 } { \tl_set:Nx \l__jlreq_tmpb_tl { \exp_not:N \hbox to~0pt { \exp_not:o { \l__jlreq_tmpb_tl } \exp_not:N \hss } } } + \tl_if_empty:nF { #4 } { \tl_set:Nx \l__jlreq_tmpb_tl { \exp_not:N \hbox to~0pt { \exp_not:N \hss \exp_not:o { \l__jlreq_tmpb_tl } } } } \tl_set:Nx \l__jlreq_tmpc_tl { \exp_not:o \l__jlreq_tmpa_tl\exp_not:N \hfil \exp_not:n {#3} \exp_not:N \hfil \exp_not:o \l__jlreq_tmpb_tl } @@ -5647,6 +5647,7 @@ \newcommand{\@pnumwidth}{2\jlreq@mol} \newcommand{\@tocrmarg}{2.55em} \newcommand{\@dotsep}{2} % 狭くしてみた +\prop_new:N \g__jlreq_tableofcontents_prop \newskip\toclineskip \setlength\toclineskip{0\jlreq@gol plus .02\jlreq@gol} % tarticleから @@ -5667,33 +5668,28 @@ \jlreq@top@contents=#1\relax \fi } +\newcommand{\tableofcontents}{% + \jlreq@top@contents=-100\relax + \if@twocolumn + \@restonecoltrue\onecolumn + \else + \@restonecolfalse + \fi + \prop_item:Nn \g__jlreq_tableofcontents_prop { heading } + \@mkboth{\contentsname}{\contentsname}% + \@starttoc{toc}% + \if@restonecol\twocolumn\fi +} +\keys_define:nn { jlreqsetup } { + tableofcontents_heading .code:n = { \prop_gput:Nnn \g__jlreq_tableofcontents_prop { heading } {#1} } +} \str_if_eq:VnTF \jlreq@article@type { article } { - \newcommand{\tableofcontents}{% - \jlreq@top@contents=-100\relax - \if@twocolumn - \@restonecoltrue\onecolumn - \else - \@restonecolfalse - \fi - \section*{\contentsname}% - \@mkboth{\contentsname}{\contentsname}% - \@starttoc{toc}% - \if@restonecol\twocolumn\fi - } -}{% book, report - \newcommand{\tableofcontents}{% - \jlreq@top@contents=-100\relax - \if@twocolumn - \@restonecoltrue\onecolumn - \else - \@restonecolfalse - \fi - \chapter*{\contentsname}% - \@mkboth{\contentsname}{\contentsname}% - \@starttoc{toc}% - \if@restonecol\twocolumn\fi - } + \keys_set:nn { jlreqsetup } { tableofcontents_heading = { \section*{\contentsname} } } +}{ + \keys_set:nn { jlreqsetup } { tableofcontents_heading = { \chapter*{\contentsname} } } } + + % JIS X 4051自身の目次に近づけようかと……なりきれてないけど. % 文字の大きさは全て同じ(\normalsize)にする. @@ -5741,8 +5737,6 @@ \let\l@table\l@figure %. 文献,そのまま -\newdimen\bibindent -\setlength\bibindent{2\jlreq@mol} \newcommand{\newblock}{\hskip .11em\@plus.33em\@minus.07em} \newenvironment{thebibliography}[1]{% \jlreq@oldfontcommand@enable @@ -5764,7 +5758,7 @@ \widowpenalty4000% \sfcode`\.\@m }{% - \def\@noitemerr{\@latex@warning{Empty `thebibliography' environment}}% + \def\@noitemerr{\@latex@warning{Empty~`thebibliography'~environment}}% \endlist \jlreq@oldfontcommand@disable } @@ -5794,27 +5788,7 @@ \newcommand{\subitem}{\@idxitem \hspace*{2\jlreq@mol}} \newcommand{\subsubitem}{\@idxitem \hspace*{3\jlreq@mol}} \newcommand{\indexspace}{\par \vskip 1\jlreq@gol \@plus .5\jlreq@gol \@minus .3\jlreq@gol\relax} -\def\jlreq@theindex@pagestyle{} -\keys_define:nn { jlreqsetup } { - theindex_pagestyle .code:n = { - \def\jlreq@tempa{}% ページスタイル名 - \def\jlreq@theindex@pagestyle{}% - \jlreq@tempafalse % restore - \jlreq@parsekeyval@nokey{% - \ifjlreq@parsekeyval@nokey@novalue{\def\jlreq@tempa{##1}}{% - \str_if_eq:nnT {##1} { restore } { - {restore}{\csname jlreq@tempa##2\endcsname}% - }% - }% - }{#1}% - \tl_put_right:Nx \jlreq@theindex@pagestyle { - \exp_not:n {\let\jlreq@theindex@savedpagestyle}\ifjlreq@tempa\exp_not:N \jlreq@current@pagestyle\else\exp_not:N \@undefined\fi - }% - \ifx\jlreq@tempa\@empty\else - \tl_put_right:Nx \jlreq@theindex@pagestyle{\exp_not:N \pagestyle{\exp_not:o \jlreq@tempa}}% - \fi - } -} +\def\jlreq@theindex@pagestyle{\pagestyle{plain}} %. 前付,後付,付録 % \jlreq@matter@heading[restoreする見出し一覧を入れる制御綴]{#2@<見出し命令名>に今の見出しの中身を入れる}{生成する制御綴の名前}{設定} @@ -6253,60 +6227,6 @@ \hour=\time \divide\hour by 60 \minute=\numexpr\time - 60*\hour\relax -%.. 定理環境 -\jlreq@saveoriginalcs{@begintheorem} -\jlreq@saveoriginalcs{@opargbegintheorem} -\def\@begintheorem#1#2{\topsep=\dimexpr\jlreq@theorem@beforeafter@space\relax - \trivlist\labelsep=1\jlreq@zw - \itemindent=\dimexpr\jlreq@theorem@indent\relax - \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 - \jlreq@theorem@font - \item[\hskip \labelsep{\reset@font\jlreq@theorem@label@font #1\ #2(#3)}]} -\RequirePackage{filehook} -\AtEndOfPackageFile{amsthm}{ - \jlreq@saveoriginalcs{proof}% - \jlreq@saveoriginalcs{endproof}% - \edef\jlreq@do{ - \unexpanded{\def\jlreq@proof[#1]}{% - \unexpanded{\labelsep=1\jlreq@zw}% - \exp_not:o {\proof[{\reset@font\jlreq@proof@label@font #1\inhibitglue}\nopunct]}% - } - } - \jlreq@do - \def\proof{\@ifnextchar[{\jlreq@proof}{\jlreq@proof[\proofname]}} - \renewcommand{\proofname}{証明} - \jlreq@setupamsthm - \theoremstyle{jlreq} -} -\def\jlreq@setupamsthm{ - \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)}} -} -\keys_define:nn { jlreqsetup } { - theorem_beforeafter_space .code:n = { - \def\jlreq@theorem@beforeafter@space{#1} - \begingroup\jlreq@tempdima=\dimexpr\jlreq@theorem@beforeafter@space\relax\endgroup - \@ifpackageloaded{amsthm}{\jlreq@setupamsthm}{} - }, - theorem_indent .code:n = { - \def\jlreq@theorem@indent{#1} - \begingroup\jlreq@tempdima=\dimexpr\jlreq@theorem@indent\relax\endgroup - \@ifpackageloaded{amsthm}{\jlreq@setupamsthm}{} - }, - theorem_font .code:n = { - \def\jlreq@theorem@font{#1} - \@ifpackageloaded{amsthm}{\jlreq@setupamsthm}{} - }, - theorem_label_font .code:n = { - \def\jlreq@theorem@label@font{#1} - \@ifpackageloaded{amsthm}{\jlreq@setupamsthm}{} - }, - proof_label_font .tl_set:N = \jlreq@proof@label@font -} - %. デフォルト設定 %.. 見出し \if@tate @@ -6588,16 +6508,7 @@ appendix_precode = {} } } -\jlreqsetup{theindex_pagestyle=plain} \jlreqsetup{year_style=seireki} -\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}{目次} \newcommand{\refname}{参考文献} @@ -6619,6 +6530,23 @@ \raggedbottom \fi +%. complements... +\tl_set:Nx \l__jlreq_tmpa_tl { + \exp_not:N \RequirePackage[ + \ifx l\jlreq@engine lualatex\fi + \ifx p\jlreq@engine platex\fi + \ifx u\jlreq@engine uplatex\fi + ,setupname=jlreqsetup + ]{jlreq-complements}[2022-07-13] +} +\l__jlreq_tmpa_tl +\jlreqsetup{ + thebibliography_precode = { \jlreq@oldfontcommand@enable }, + thebibliography_postcode = { \jlreq@oldfontcommand@disable }, + theindex_precode = { \jlreq@oldfontcommand@enable }, + theindex_postcode = { \jlreq@oldfontcommand@disable } +} + \ExplSyntaxOff \endinput |