diff options
| author | Karl Berry <karl@freefriends.org> | 2023-07-14 21:05:11 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2023-07-14 21:05:11 +0000 |
| commit | 4f4a6fbdcff9c424b96574e43efe30c376e6ea33 (patch) | |
| tree | 8d380d0e8b502eee1bc72982537eee8e7d52568e /Master/texmf-dist | |
| parent | ac0972ebf6b5b92c6cc75542aa4add3bc6f8b15c (diff) | |
jxu (14jul23)
git-svn-id: svn://tug.org/texlive/trunk@67629 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
39 files changed, 531 insertions, 166 deletions
diff --git a/Master/texmf-dist/doc/latex/beaulivre/README.md b/Master/texmf-dist/doc/latex/beaulivre/README.md index 1841ec55d55..7ae628f855e 100644 --- a/Master/texmf-dist/doc/latex/beaulivre/README.md +++ b/Master/texmf-dist/doc/latex/beaulivre/README.md @@ -2,7 +2,7 @@ # `beaulivre` : write you books in a colorful way -> **New documentations are being written and are expected to be completed by the end of 2023. In the meantime, only the core code would be included in TeX Live 2023 coming this April (old documentations have been removed from the distribution).** +> **New documentations are still being written. For now, only the core code is included in TeX Live 2023 (old documentations have been removed from the distribution).** `beaulivre` is a LaTeX class for typesetting books, which has a colorful design. diff --git a/Master/texmf-dist/doc/latex/colorist/README.md b/Master/texmf-dist/doc/latex/colorist/README.md index 8e281b3e90f..c72a30f9fdf 100644 --- a/Master/texmf-dist/doc/latex/colorist/README.md +++ b/Master/texmf-dist/doc/latex/colorist/README.md @@ -2,7 +2,7 @@ # `colorist` bundle: write you documents in a colorful way -> **New documentations are being written and are expected to be completed by the end of 2023. In the meantime, only the core code would be included in TeX Live 2023 coming this April (old documentations have been removed from the distribution).** +> **New documentations are still being written. For now, only the core code is included in TeX Live 2023 (old documentations have been removed from the distribution).** ## Introduction @@ -33,15 +33,17 @@ It mainly consists of two parts. typesetting, and also use more beautiful fonts. ### How to get these files -You can get the `.sty` and `.cls` files mentioned above simply by compiling +You can get the `.sty` and `.cls` files mentioned above by compiling `colorist.ins`: ``` latex colorist.ins ``` +<!-- To get the `.tex` source files of the documentation, compile `colorist-doc.ins`: ``` latex colorist-doc.ins ``` +--> ## Features diff --git a/Master/texmf-dist/doc/latex/create-theorem/README.md b/Master/texmf-dist/doc/latex/create-theorem/README.md index 4da4d7324b8..5b741c38c57 100644 --- a/Master/texmf-dist/doc/latex/create-theorem/README.md +++ b/Master/texmf-dist/doc/latex/create-theorem/README.md @@ -1,4 +1,4 @@ -<!-- Copyright (C) 2021-2022 by Jinwen XU --> +<!-- Copyright (C) 2021-2023 by Jinwen XU --> # `create-theorem` - Initializing theorem-like environments with multilingual support diff --git a/Master/texmf-dist/doc/latex/create-theorem/create-theorem-doc.pdf b/Master/texmf-dist/doc/latex/create-theorem/create-theorem-doc.pdf Binary files differindex 6d62f0dcd60..977be9c9131 100644 --- a/Master/texmf-dist/doc/latex/create-theorem/create-theorem-doc.pdf +++ b/Master/texmf-dist/doc/latex/create-theorem/create-theorem-doc.pdf diff --git a/Master/texmf-dist/doc/latex/create-theorem/create-theorem-doc.tex b/Master/texmf-dist/doc/latex/create-theorem/create-theorem-doc.tex index f25bf10a891..d7ef8a56d90 100644 --- a/Master/texmf-dist/doc/latex/create-theorem/create-theorem-doc.tex +++ b/Master/texmf-dist/doc/latex/create-theorem/create-theorem-doc.tex @@ -106,13 +106,13 @@ \begin{document} -\def\PackageVersion{2022/08/08} -\def\PackageSubVersion{a} +\def\PackageVersion{2023/07/14} +\def\PackageSubVersion{} \title{\createtheorempackage{}\\\smallskip\itshape Initializing theorem-like environments with multilingual support} \author{Jinwen XU} \thanks{Corresponding to: \texttt{\createtheorempackage{} \PackageVersion\PackageSubVersion}} -\date{\TheDate{\PackageVersion}[only-year-month], in Paris} +\date{\TheDate{\PackageVersion}[only-year-month], in Beijing} \maketitle diff --git a/Master/texmf-dist/doc/latex/einfart/README.md b/Master/texmf-dist/doc/latex/einfart/README.md index 4f72b8b80c0..a7ac3720e32 100644 --- a/Master/texmf-dist/doc/latex/einfart/README.md +++ b/Master/texmf-dist/doc/latex/einfart/README.md @@ -2,7 +2,7 @@ # `einfart` : write you articles in a simple and clear way -> **New documentations are being written and are expected to be completed by the end of 2023. In the meantime, only the core code would be included in TeX Live 2023 coming this April (old documentations have been removed from the distribution).** +> **New documentations are still being written. For now, only the core code is included in TeX Live 2023 (old documentations have been removed from the distribution).** `einfart` is a LaTeX class for typesetting articles, which has a simple and clear design. diff --git a/Master/texmf-dist/doc/latex/lebhart/README.md b/Master/texmf-dist/doc/latex/lebhart/README.md index 8c6c5d027b9..6ede054a38b 100644 --- a/Master/texmf-dist/doc/latex/lebhart/README.md +++ b/Master/texmf-dist/doc/latex/lebhart/README.md @@ -2,7 +2,7 @@ # `lebhart` : write you articles in a colorful way -> **New documentations are being written and are expected to be completed by the end of 2023. In the meantime, only the core code would be included in TeX Live 2023 coming this April (old documentations have been removed from the distribution).** +> **New documentations are still being written. For now, only the core code is included in TeX Live 2023 (old documentations have been removed from the distribution).** `lebhart` is a LaTeX class for typesetting articles, which has a colorful design. diff --git a/Master/texmf-dist/doc/latex/minimalist/README.md b/Master/texmf-dist/doc/latex/minimalist/README.md index a86486ba21e..03402471eeb 100644 --- a/Master/texmf-dist/doc/latex/minimalist/README.md +++ b/Master/texmf-dist/doc/latex/minimalist/README.md @@ -2,7 +2,7 @@ # `minimalist` bundle: write you documents in a simple and clear way -> **New documentations are being written and are expected to be completed by the end of 2023. In the meantime, only the core code would be included in TeX Live 2023 coming this April (old documentations have been removed from the distribution).** +> **New documentations are still being written. For now, only the core code is included in TeX Live 2023 (old documentations have been removed from the distribution).** ## Introduction @@ -36,16 +36,18 @@ It mainly consists of two parts. typesetting, and also use more beautiful fonts. ### How to get these files -You can get the `.sty` and `.cls` files mentioned above simply by compiling +You can get the `.sty` and `.cls` files mentioned above by compiling `minimalist.ins`: ``` latex minimalist.ins ``` +<!-- To get the `.tex` source files of the documentation, compile `minimalist-doc.ins`: ``` latex minimalist-doc.ins ``` +--> ## Features diff --git a/Master/texmf-dist/doc/latex/projlib/README.md b/Master/texmf-dist/doc/latex/projlib/README.md index c7b786b84a2..f5d45d14cb9 100644 --- a/Master/texmf-dist/doc/latex/projlib/README.md +++ b/Master/texmf-dist/doc/latex/projlib/README.md @@ -1,12 +1,13 @@ <!-- Copyright (C) 2021-2023 by Jinwen XU --> - +<!--  --> +<div align=center><img height="150" src="https://github.com/Jinwen-XU/ProjLib/raw/main/logo/ProjLib-logo.png"/></div> # The `ProjLib` Toolkit -> **This bundle is dated 2023/01/05.** +> **This bundle is dated 2023/07/14.** -> **New documentations are being written and are expected to be completed by the end of 2023. In the meantime, only the core code would be included in TeX Live 2023 coming this April (old documentations have been removed from the distribution).** +> **New documentations are still being written. For now, only the core code is included in TeX Live 2023 (old documentations have been removed from the distribution).** ## Introduction @@ -67,14 +68,14 @@ The modules include: > Since the module `theorem` uses `cleveref`, it should be loaded after `varioref` and `hyperref` (same for the main package `ProjLib`). -## Regarding the files and the compilation of documentations +<!-- ## Regarding the files and the compilation of documentations --> ### How to get these files -You can get the `.sty` files mentioned above simply by compiling `ProjLib.ins`: +You can get the `.sty` files mentioned above by compiling `ProjLib.ins`: ``` latex ProjLib.ins ``` - +<!-- ### How to get the source of the documentation You can get the `.tex` source files of the documentation by compiling `ProjLib-doc.ins`: ``` @@ -90,6 +91,7 @@ Here `**` should be replaced with the language identifier, such as `en`. ### Automation All these can be done with the given script `MakeFile.sh`. +--> # License diff --git a/Master/texmf-dist/doc/latex/simplivre/README.md b/Master/texmf-dist/doc/latex/simplivre/README.md index 99d73b75476..2b6b50b385a 100644 --- a/Master/texmf-dist/doc/latex/simplivre/README.md +++ b/Master/texmf-dist/doc/latex/simplivre/README.md @@ -2,7 +2,7 @@ # `simplivre` : write you books in a simple and clear way -> **New documentations are being written and are expected to be completed by the end of 2023. In the meantime, only the core code would be included in TeX Live 2023 coming this April (old documentations have been removed from the distribution).** +> **New documentations are still being written. For now, only the core code is included in TeX Live 2023 (old documentations have been removed from the distribution).** `simplivre` is a LaTeX class for typesetting books, which has a simple and clear design. diff --git a/Master/texmf-dist/source/latex/projlib/ProjLib.dtx b/Master/texmf-dist/source/latex/projlib/ProjLib.dtx index 6123adab0cf..baba6274a8d 100644 --- a/Master/texmf-dist/source/latex/projlib/ProjLib.dtx +++ b/Master/texmf-dist/source/latex/projlib/ProjLib.dtx @@ -19,84 +19,84 @@ %<*ProjLib> \ProvidesExplPackage {ProjLib} - {2023/01/05} {} + {2023/07/14} {} {Collective interface of the ProjLib toolkit} %</ProjLib> % %<*projlib-author> \ProvidesExplPackage {projlib-author} - {2023/01/05} {} + {2023/07/14} {} {Enhanced author information block} %</projlib-author> % %<*projlib-datetime> \ProvidesExplPackage {projlib-datetime} - {2023/01/05} {} + {2023/07/14} {} {Convert numeric date-time string to natural language} %</projlib-datetime> % %<*projlib-draft> \ProvidesExplPackage {projlib-draft} - {2023/01/05} {} + {2023/07/14} {} {Useful commands during draft stage} %</projlib-draft> % %<*projlib-font> \ProvidesExplPackage {projlib-font} - {2023/01/05} {} + {2023/07/14} {} {Font selection and configuration} %</projlib-font> % %<*projlib-language> \ProvidesExplPackage {projlib-language} - {2023/01/05} {} + {2023/07/14} {} {Multi-language configuration} %</projlib-language> % %<*projlib-logo> \ProvidesExplPackage {projlib-logo} - {2023/01/05} {} + {2023/07/14} {} {The ProjLib logo} %</projlib-logo> % %<*projlib-math> \ProvidesExplPackage {projlib-math} - {2023/01/05} {} + {2023/07/14} {} {Efficient math setup} %</projlib-math> % %<*projlib-paper> \ProvidesExplPackage {projlib-paper} - {2023/01/05} {} + {2023/07/14} {} {Configuration of the paper style} %</projlib-paper> % %<*projlib-text> \ProvidesExplPackage {projlib-text} - {2023/01/05} {} + {2023/07/14} {} {Text-related commands} %</projlib-text> % %<*projlib-theorem> \ProvidesExplPackage {projlib-theorem} - {2023/01/05} {} + {2023/07/14} {} {Configuration of theorem-like environments} %</projlib-theorem> % %<*projlib-titlepage> \ProvidesExplPackage {projlib-titlepage} - {2023/01/05} {} + {2023/07/14} {} {Commands for rendering the title page} %</projlib-titlepage> @@ -317,7 +317,6 @@ \NewCommandCopy \projlib_author_backup_footnotemark: \footnotemark - \tl_gset:Nn \footnotemark {} \NewCommandCopy \projlib_author_backup_thanks:w \thanks \cs_undefine:N \thanks @@ -341,7 +340,9 @@ { \hook_gput_code:nnn { cmd/@title/after } { projlib-author } { + \tl_set:Nn \footnotemark {} \projlib_author_pre_thanks:n { #1 } + \RenewCommandCopy \footnotemark \projlib_author_backup_footnotemark: } } } @@ -353,10 +354,8 @@ { \projlib_author_backup_my_author:w { - \RenewCommandCopy \footnotemark \projlib_author_backup_footnotemark: \RenewCommandCopy \thanks \projlib_author_backup_thanks:w #1 - \tl_gset:Nn \footnotemark {} } } } @@ -443,8 +442,8 @@ \cs_undefine:N \email \cs_undefine:N \dedicatory \cs_undefine:N \keywords - \cs_undefine:N \footnotemark - \NewCommandCopy \footnotemark \projlib_author_backup_footnotemark: + % \cs_undefine:N \footnotemark + % \NewCommandCopy \footnotemark \projlib_author_backup_footnotemark: \bool_gset_true:N \g__projlib_author_already_maketitle_bool } } @@ -3236,6 +3235,11 @@ \projlib_language_use_language_locally:en { #1 } { #2 } \group_end: } +\NewDocumentEnvironment { OtherLanguage } { m +b } + { + \projlib_language_use_language_locally:en { #1 } { #2 } + } + { } \UseLanguage { \g__projlib_language_main_str } @@ -3957,14 +3961,14 @@ \CreateTheorem { theorem } { parent counter = chapter, create starred version } \bool_if:NT \l__projlib_theorem_separate_theorem_numbering_bool { - \exp_args:Nv \CreateTheorem { c_projlib_theorem_supported_clist } { parent counter = chapter, create starred version } + \exp_args:Nv \CreateTheorem { c_projlib_theorem_supported_clist } { parent counter = chapter, create starred version, quiet } } } { % without \chapter \CreateTheorem { theorem } { parent counter = section, create starred version } \bool_if:NT \l__projlib_theorem_separate_theorem_numbering_bool { - \exp_args:Nv \CreateTheorem { c_projlib_theorem_supported_clist } { parent counter = section, create starred version } + \exp_args:Nv \CreateTheorem { c_projlib_theorem_supported_clist } { parent counter = section, create starred version, quiet } } } } @@ -3974,14 +3978,14 @@ \CreateTheorem { theorem } { create starred version } \bool_if:NT \l__projlib_theorem_separate_theorem_numbering_bool { - \exp_args:Nv \CreateTheorem { c_projlib_theorem_supported_clist } { create starred version } + \exp_args:Nv \CreateTheorem { c_projlib_theorem_supported_clist } { create starred version, quiet } } } { \CreateTheorem { theorem } { parent counter = \l__projlib_theorem_theorem_numbering_tl, create starred version } \bool_if:NT \l__projlib_theorem_separate_theorem_numbering_bool { - \exp_args:Nv \CreateTheorem { c_projlib_theorem_supported_clist } { parent counter = \l__projlib_theorem_theorem_numbering_tl, create starred version } + \exp_args:Nv \CreateTheorem { c_projlib_theorem_supported_clist } { parent counter = \l__projlib_theorem_theorem_numbering_tl, create starred version, quiet } } } } @@ -4685,7 +4689,7 @@ } , crefname = { , english = {Example}{Example} - , french = [l']{Example}[les]{Example} + , french = [l']{Exemple}[les]{Exemple} , ngerman = {Beispiel}{Beispiel} , italian = [l']{Esempio}[gli]{Esempio} , portuguese = [o]{Exemplo}[os]{Exemplo} @@ -4698,7 +4702,7 @@ } , Crefname = { , english = {Example}{Example} - , french = [L']{Example}[Les]{Example} + , french = [L']{Exemple}[Les]{Exemple} , ngerman = {Beispiel}{Beispiel} , italian = [L']{Esempio}[Gli]{Esempio} , portuguese = [O]{Exemplo}[Os]{Exemplo} @@ -5436,12 +5440,12 @@ \fill [color=titlepage-main] ($(current~page.north~west)$) rectangle ($(current~page.north~west)+(.125\paperwidth,-.3\paperheight)$); \fill [color=titlepage-back] ($(current~page.north~east)$) rectangle ($(current~page.north~west)+(.125\paperwidth,-.3\paperheight)$); \node[text~width=.3\paperwidth, text~height=.2\paperheight, align=flush~left] - at ($(current~page.north~west)+(.32\paperwidth,-.17\paperheight)$) + at ($(current~page.north~west)+(.333\paperwidth,-.17\paperheight)$) { \projlib_titlepage_show_logo:n { \scalebox { 2 } { \ProjLib } } }; \node[text~width=.8\paperwidth, text~height=.5\paperheight, align=flush~left] - at ($(current~page.north~west)+(.57\paperwidth,-.28\paperheight)$) + at ($(current~page.north~west)+(.583\paperwidth,-.28\paperheight)$) { \color{titlepage-back} \sffamily @@ -5470,12 +5474,12 @@ \fill[color=white] ($(current~page.south~west)$) rectangle ($(current~page.north~east)$); \fill[color=titlepage-main] ($(current~page.south~west)$) rectangle ($(current~page.north~east)+(0,-.3\paperheight)$); \node[text~width=.3\paperwidth, text~height=.2\paperheight, align=flush~left] - at ($(current~page.north~west)+(.27\paperwidth,-.15\paperheight)$) + at ($(current~page.north~west)+(.28\paperwidth,-.15\paperheight)$) { \projlib_titlepage_show_logo:n { \scalebox { 2 } { \ProjLib } } }; \node[text~width=.8\paperwidth, text~height=.5\paperheight, align=flush~left] - at ($(current~page.north~west)+(.52\paperwidth,-.28\paperheight)$) + at ($(current~page.north~west)+(.53\paperwidth,-.28\paperheight)$) { \color{white} \sffamily diff --git a/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls b/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls index b73a8a293b4..6a88c6e9498 100644 --- a/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls +++ b/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplClass {beaulivre} - {2023/01/05} {} + {2023/07/14} {} {A colorful book style} \tl_const:Nn \l__colorclass_base_class_tl { book } @@ -103,6 +103,9 @@ , b5paper .bool_set:N = \l__colorclass_b_five_paper_bool , b5paper .initial:n = { false } + , oneside .code:n = { \PassOptionsToClass { \CurrentOption } { \l__colorclass_base_class_tl } } + , twoside .code:n = { \PassOptionsToClass { \CurrentOption } { \l__colorclass_base_class_tl } } + , 11pt .code:n = { \PassOptionsToClass { \CurrentOption } { \l__colorclass_base_class_tl } } , 12pt .code:n = { \PassOptionsToClass { \CurrentOption } { \l__colorclass_base_class_tl } } @@ -243,16 +246,26 @@ BoldItalicFont = *-BoldItalic, Numbers = OldStyle , ] - \setsansfont { SourceSansPro } + \setsansfont { texgyreheros } [ - Extension = .otf, - UprightFont = *-Regular, - BoldFont = *-Semibold, - ItalicFont = *-RegularIt, - BoldItalicFont = *-SemiboldIt, - WordSpace = {1.25, 1, 1} , + Extension = .otf , + Scale = MatchUppercase , + UprightFont = *-regular , + BoldFont = *-bold , + ItalicFont = *-italic , + BoldItalicFont = *-bolditalic , Numbers = OldStyle , ] + % \setsansfont { SourceSansPro } + % [ + % Extension = .otf, + % UprightFont = *-Regular, + % BoldFont = *-Semibold, + % ItalicFont = *-RegularIt, + % BoldItalicFont = *-SemiboldIt, + % WordSpace = {1.25, 1, 1} , + % Numbers = OldStyle , + % ] } { \setmainfont { TeXGyrePagellaX } @@ -263,15 +276,24 @@ ItalicFont = *-Italic, BoldItalicFont = *-BoldItalic, ] - \setsansfont { SourceSansPro } + \setsansfont { texgyreheros } [ - Extension = .otf, - UprightFont = *-Regular, - BoldFont = *-Semibold, - ItalicFont = *-RegularIt, - BoldItalicFont = *-SemiboldIt, - WordSpace = {1.25, 1, 1} , + Extension = .otf , + Scale = MatchUppercase , + UprightFont = *-regular , + BoldFont = *-bold , + ItalicFont = *-italic , + BoldItalicFont = *-bolditalic , ] + % \setsansfont { SourceSansPro } + % [ + % Extension = .otf, + % UprightFont = *-Regular, + % BoldFont = *-Semibold, + % ItalicFont = *-RegularIt, + % BoldItalicFont = *-SemiboldIt, + % WordSpace = {1.25, 1, 1} , + % ] } \setmonofont { NewCMMono10 } [ @@ -624,6 +646,7 @@ \setmathfont { KpMath-Regular.otf } [ range = { cal, bfcal }, RawFeature=+ss01 ] % \setmathfont { KpMath-Regular.otf } [ range = {} ] + % https://tex.stackexchange.com/a/646715 \sys_if_engine_luatex:T { \mathitalicsmode=1 @@ -633,6 +656,11 @@ { \cs_gset_eq:NN \overline \wideoverbar \cs_gset_eq:NN \square \mdwhtsquare + + % https://tex.stackexchange.com/a/678611 + \newcommand{\limstrut}{\vrule depth0.2ex width 0pt} + \renewcommand{\varprojlim}{\mathop{\underleftarrow{{\lim}\limstrut}}} + \renewcommand{\varinjlim}{\mathop{\underrightarrow{{\lim}\limstrut}}} } % https://tex.stackexchange.com/a/647789 @@ -650,6 +678,22 @@ \endgroup } + % https://tex.stackexchange.com/a/678998 + \hook_gput_code:nnn { begindocument } { colorclass } + { + \NewCommandCopy\standarddashv\dashv + \NewCommandCopy\standardvdash\vdash + \RenewDocumentCommand{\dashv}{}{\mathrel{\mathpalette\raisesymbol\standarddashv}} + \RenewDocumentCommand{\vdash}{}{\mathrel{\mathpalette\raisesymbol\standardvdash}} + } + \newcommand{\raisesymbol}[2]{% + \begingroup + \sbox\z@{$\m@th#1A$}% + \sbox\tw@{$\m@th#1#2$}% + \raisebox{\dimexpr(\ht\z@-\ht\tw@)/2}{\usebox{\tw@}}% + \endgroup + } + \RequirePackage { tikz-cd } \tikzcdset { arrow~style = tikz, diagrams = { >={Stealth[round,length=3.4pt,width=6.15pt,inset=2.25pt]} } } @@ -710,6 +754,41 @@ { \colorclass_xarrows_generic:nnnn { #1 } { #2 } {} { edge [ commutative~diagrams/twoheadleftarrow ] } } + + \cs_new_protected:Nn \colorclass_xarrows_double_generic:nnnnnn + % #3 = option of \tikz + % #4 = edge 1 of \draw + % #5 = edge 2 of \draw + % #6 = sep/2 + { + \hbox_set:Nn \l__colorclass_xarrows_below_box { \ensuremath { \scriptstyle #1 } } + \hbox_set:Nn \l__colorclass_xarrows_above_box { \ensuremath { \scriptstyle #2 } } + \dim_set:Nn \l__colorclass_xarrows_length_dim + { \dim_eval:n { \dim_max:nn { \box_wd:N \l__colorclass_xarrows_below_box } { \box_wd:N \l__colorclass_xarrows_above_box } + 1em } } + \mathrel + { + \tikz [ #3, line~width = .6pt, baseline = -.5ex, every~node/.style = { inner~sep = 0pt }, >={Stealth[round,length=3.4pt,width=6.15pt,inset=2.25pt]} ] + { + \draw (0,#6) #4 + node [ below = 4pt+#6 ] { \box_use:N \l__colorclass_xarrows_below_box } + ( \l__colorclass_xarrows_length_dim ,#6) ; + \draw (0,-#6) #5 + node [ above = 3pt+#6 ] { \box_use:N \l__colorclass_xarrows_above_box } + ( \l__colorclass_xarrows_length_dim ,-#6) ; + } + } + } + + \NewDocumentCommand \xrightrightarrows { O{} m } + { + \colorclass_xarrows_double_generic:nnnnnn { #1 } { #2 } {} { edge [ commutative~diagrams/rightarrow ] } { edge [ commutative~diagrams/rightarrow ] } { .2em } + } + + \NewDocumentCommand \xleftleftarrows { O{} m } + { + \colorclass_xarrows_double_generic:nnnnnn { #1 } { #2 } {} { edge [ commutative~diagrams/leftarrow ] } { edge [ commutative~diagrams/leftarrow ] } { .2em } + } + \hook_gput_code:nnn { begindocument/end } { colorclass } { \RenewDocumentCommand \twoheadrightarrow {} diff --git a/Master/texmf-dist/tex/latex/colorist/colorart.cls b/Master/texmf-dist/tex/latex/colorist/colorart.cls index 6ef63c01794..278cf0f3358 100644 --- a/Master/texmf-dist/tex/latex/colorist/colorart.cls +++ b/Master/texmf-dist/tex/latex/colorist/colorart.cls @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplClass {colorart} - {2023/03/07} {} + {2023/07/14} {} {A colorful article style} \tl_const:Nn \l__colorclass_base_class_tl { article } @@ -60,6 +60,9 @@ , b5paper .bool_set:N = \l__colorclass_b_five_paper_bool , b5paper .initial:n = { false } + , oneside .code:n = { \PassOptionsToClass { \CurrentOption } { \l__colorclass_base_class_tl } } + , twoside .code:n = { \PassOptionsToClass { \CurrentOption } { \l__colorclass_base_class_tl } } + , 11pt .code:n = { \PassOptionsToClass { \CurrentOption } { \l__colorclass_base_class_tl } } , 12pt .code:n = { \PassOptionsToClass { \CurrentOption } { \l__colorclass_base_class_tl } } diff --git a/Master/texmf-dist/tex/latex/colorist/colorbook.cls b/Master/texmf-dist/tex/latex/colorist/colorbook.cls index 6b19466127d..1c39ab987f7 100644 --- a/Master/texmf-dist/tex/latex/colorist/colorbook.cls +++ b/Master/texmf-dist/tex/latex/colorist/colorbook.cls @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplClass {colorbook} - {2023/03/07} {} + {2023/07/14} {} {A colorful book style} \tl_const:Nn \l__colorclass_base_class_tl { book } @@ -60,6 +60,9 @@ , b5paper .bool_set:N = \l__colorclass_b_five_paper_bool , b5paper .initial:n = { false } + , oneside .code:n = { \PassOptionsToClass { \CurrentOption } { \l__colorclass_base_class_tl } } + , twoside .code:n = { \PassOptionsToClass { \CurrentOption } { \l__colorclass_base_class_tl } } + , 11pt .code:n = { \PassOptionsToClass { \CurrentOption } { \l__colorclass_base_class_tl } } , 12pt .code:n = { \PassOptionsToClass { \CurrentOption } { \l__colorclass_base_class_tl } } diff --git a/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty b/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty index 0afe2b971d1..1fddb04d17c 100644 --- a/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty +++ b/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {colorist-fancy} - {2023/03/07} {} + {2023/07/14} {} {The fancy style of colorist} \IfPackageLoadedTF { colorist } {} @@ -1206,6 +1206,18 @@ heading_suffix "}\n" \PassOptionsToPackage { amsfashion } { projlib-author } \RequirePackage { projlib-author } +%%================================ +%% Special adjustment +%%================================ +\crefformat { chapter } { \nobreak \crefthemark { \crefthe_retrieve_space: } \nobreak #2 \normalfont\textcolor{maintheme} {\larger #1} #3 } +\labelcrefformat { chapter } { #2 \normalfont\textcolor{maintheme} {\larger #1} #3 } +\crefformat { section } { \nobreak \crefthemark { \crefthe_retrieve_space: } \nobreak #2 \color{maintheme} \g_colorist_title_font_section_tl {#1} #3 } +\labelcrefformat { section } { #2 \color{maintheme} \g_colorist_title_font_section_tl {#1} #3 } +\crefformat { subsection } { \nobreak \crefthemark { \crefthe_retrieve_space: } \nobreak #2 \g_colorist_title_font_subsection_tl {#1} #3 } +\labelcrefformat { subsection } { #2 \g_colorist_title_font_subsection_tl {#1} #3 } +\crefformat { subsubsection } { \nobreak \crefthemark { \crefthe_retrieve_space: } \nobreak #2 \color{main-text!70!paper} \g_colorist_title_font_subsubsection_tl {#1} #3 } +\labelcrefformat { subsubsection } { #2 \color{main-text!70!paper} \g_colorist_title_font_subsubsection_tl {#1} #3 } + \endinput %% %% End of file `colorist/colorist-fancy.sty'. diff --git a/Master/texmf-dist/tex/latex/colorist/colorist.sty b/Master/texmf-dist/tex/latex/colorist/colorist.sty index 083a67f51c2..b750f4d1ef4 100644 --- a/Master/texmf-dist/tex/latex/colorist/colorist.sty +++ b/Master/texmf-dist/tex/latex/colorist/colorist.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {colorist} - {2023/03/07} {} + {2023/07/14} {} {A colorful style for articles and books} \keys_define:nn { colorist } diff --git a/Master/texmf-dist/tex/latex/create-theorem/create-theorem.sty b/Master/texmf-dist/tex/latex/create-theorem/create-theorem.sty index 1286548a981..7eefe80b812 100644 --- a/Master/texmf-dist/tex/latex/create-theorem/create-theorem.sty +++ b/Master/texmf-dist/tex/latex/create-theorem/create-theorem.sty @@ -1,5 +1,5 @@ %% -%% Copyright (C) 2021-2022 by Jinwen XU +%% Copyright (C) 2021-2023 by Jinwen XU %% ------------------------------------ %% %% This file may be distributed and/or modified under the conditions of @@ -12,7 +12,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {create-theorem} - {2022/08/08a} {} + {2023/07/14} {} {Initializing theorem-like environments with multilingual support} \keys_define:nn { create-theorem } @@ -224,8 +224,8 @@ { \tl_gset:cn { g_crthm_core_name_ #7 ref_article_singular_ #1 _ #2 _tl } { } \tl_gset:cn { g_crthm_core_name_ #7 ref_article_plural_ #1 _ #2 _tl } { } - \tl_gset:cn { g_crthm_name_ #7 ref_article_singular_ #1 _ #2 _tl } { \nobreak \crefthemark { \skip_horizontal:n { -\crefthe_width_of_space_dim } } \nobreak } - \tl_gset:cn { g_crthm_name_ #7 ref_article_plural_ #1 _ #2 _tl } { \nobreak \crefthemark { \skip_horizontal:n { -\crefthe_width_of_space_dim } } \nobreak } + \tl_gset:cn { g_crthm_name_ #7 ref_article_singular_ #1 _ #2 _tl } { \nobreak \crefthemark { \crefthe_retrieve_space: } \nobreak } + \tl_gset:cn { g_crthm_name_ #7 ref_article_plural_ #1 _ #2 _tl } { \nobreak \crefthemark { \crefthe_retrieve_space: } \nobreak } } { \tl_gset:cn { g_crthm_core_name_ #7 ref_article_singular_ #1 _ #2 _tl } { #3 } @@ -241,7 +241,7 @@ \tl_if_blank:eTF { #4 } { - \tl_gset:cn { g_crthm_name_ #7 ref_singular_ #1 _ #2 _tl } { \nobreak \skip_horizontal:n { -\crefthe_width_of_space_dim } \nobreak } + \tl_gset:cn { g_crthm_name_ #7 ref_singular_ #1 _ #2 _tl } { \nobreak \crefthe_retrieve_space: \nobreak } } { \tl_gset:cn { g_crthm_name_ #7 ref_singular_ #1 _ #2 _tl } { \tl_use:c { g_crthm_style_ #7 refname_ #1 _ #2 _tl } { #4 } } @@ -249,7 +249,7 @@ \tl_if_blank:eTF { #6 } { - \tl_gset:cn { g_crthm_name_ #7 ref_plural_ #1 _ #2 _tl } { \nobreak \skip_horizontal:n { -\crefthe_width_of_space_dim } \nobreak } + \tl_gset:cn { g_crthm_name_ #7 ref_plural_ #1 _ #2 _tl } { \nobreak \crefthe_retrieve_space: \nobreak } } { \tl_gset:cn { g_crthm_name_ #7 ref_plural_ #1 _ #2 _tl } { \tl_use:c { g_crthm_style_ #7 refname_ #1 _ #2 _tl } { #6 } } @@ -1618,7 +1618,7 @@ } , crefname = { , english = {example}{examples} - , french = [l']{example}[les]{examples} + , french = [l']{exemple}[les]{exemples} , ngerman = {Beispiel}{Beispiele} , italian = [l']{esempio}[gli]{esempi} , portuguese = [o]{exemplo}[os]{exemplos} @@ -1631,7 +1631,7 @@ } , Crefname = { , english = {Example}{Examples} - , french = [L']{example}[Les]{examples} + , french = [L']{exemple}[Les]{exemples} , ngerman = {Beispiel}{Beispiele} , italian = [L']{esempio}[Gli]{esempi} , portuguese = [O]{exemplo}[Os]{exemplos} diff --git a/Master/texmf-dist/tex/latex/einfart/einfart.cls b/Master/texmf-dist/tex/latex/einfart/einfart.cls index bc5d8039c2a..4b52a0831c4 100644 --- a/Master/texmf-dist/tex/latex/einfart/einfart.cls +++ b/Master/texmf-dist/tex/latex/einfart/einfart.cls @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplClass {einfart} - {2023/01/05} {} + {2023/07/14} {} {A simple and clear article style} \tl_const:Nn \l__minimclass_base_class_tl { article } @@ -110,6 +110,9 @@ , b5paper .bool_set:N = \l__minimclass_b_five_paper_bool , b5paper .initial:n = { false } + , oneside .code:n = { \PassOptionsToClass { \CurrentOption } { \l__minimclass_base_class_tl } } + , twoside .code:n = { \PassOptionsToClass { \CurrentOption } { \l__minimclass_base_class_tl } } + , 11pt .code:n = { \PassOptionsToClass { \CurrentOption } { \l__minimclass_base_class_tl } } , 12pt .code:n = { \PassOptionsToClass { \CurrentOption } { \l__minimclass_base_class_tl } } @@ -264,16 +267,26 @@ BoldItalicFont = *-BoldItalic, Numbers = OldStyle , ] - \setsansfont { SourceSansPro } + \setsansfont { texgyreheros } [ - Extension = .otf, - UprightFont = *-Regular, - BoldFont = *-Semibold, - ItalicFont = *-RegularIt, - BoldItalicFont = *-SemiboldIt, - WordSpace = {1.25, 1, 1} , + Extension = .otf , + Scale = MatchUppercase , + UprightFont = *-regular , + BoldFont = *-bold , + ItalicFont = *-italic , + BoldItalicFont = *-bolditalic , Numbers = OldStyle , ] + % \setsansfont { SourceSansPro } + % [ + % Extension = .otf, + % UprightFont = *-Regular, + % BoldFont = *-Semibold, + % ItalicFont = *-RegularIt, + % BoldItalicFont = *-SemiboldIt, + % WordSpace = {1.25, 1, 1} , + % Numbers = OldStyle , + % ] } { \setmainfont { TeXGyrePagellaX } @@ -284,15 +297,24 @@ ItalicFont = *-Italic, BoldItalicFont = *-BoldItalic, ] - \setsansfont { SourceSansPro } + \setsansfont { texgyreheros } [ - Extension = .otf, - UprightFont = *-Regular, - BoldFont = *-Semibold, - ItalicFont = *-RegularIt, - BoldItalicFont = *-SemiboldIt, - WordSpace = {1.25, 1, 1} , + Extension = .otf , + Scale = MatchUppercase , + UprightFont = *-regular , + BoldFont = *-bold , + ItalicFont = *-italic , + BoldItalicFont = *-bolditalic , ] + % \setsansfont { SourceSansPro } + % [ + % Extension = .otf, + % UprightFont = *-Regular, + % BoldFont = *-Semibold, + % ItalicFont = *-RegularIt, + % BoldItalicFont = *-SemiboldIt, + % WordSpace = {1.25, 1, 1} , + % ] } \setmonofont { NewCMMono10 } [ @@ -603,7 +625,7 @@ \CJKfamily { JPmain } } - \tl_gset:Nn \g_minimalist_title_font_common_tl { \minimclass_cjk_sffamily: } + % \tl_gset:Nn \g_minimalist_title_font_common_tl { \minimclass_cjk_sffamily: } } \__minimclass_load_file_or_config:Nnn \l__minimclass_load_custom_font_file_math_bool { \l__minimclass_custom_font_file_math_str } @@ -647,6 +669,7 @@ \setmathfont { KpMath-Regular.otf } [ range = { cal, bfcal }, RawFeature=+ss01 ] % \setmathfont { KpMath-Regular.otf } [ range = {} ] + % https://tex.stackexchange.com/a/646715 \sys_if_engine_luatex:T { \mathitalicsmode=1 @@ -656,6 +679,11 @@ { \cs_gset_eq:NN \overline \wideoverbar \cs_gset_eq:NN \square \mdwhtsquare + + % https://tex.stackexchange.com/a/678611 + \newcommand{\limstrut}{\vrule depth0.2ex width 0pt} + \renewcommand{\varprojlim}{\mathop{\underleftarrow{{\lim}\limstrut}}} + \renewcommand{\varinjlim}{\mathop{\underrightarrow{{\lim}\limstrut}}} } % https://tex.stackexchange.com/a/647789 @@ -673,6 +701,22 @@ \endgroup } + % https://tex.stackexchange.com/a/678998 + \hook_gput_code:nnn { begindocument } { minimclass } + { + \NewCommandCopy\standarddashv\dashv + \NewCommandCopy\standardvdash\vdash + \RenewDocumentCommand{\dashv}{}{\mathrel{\mathpalette\raisesymbol\standarddashv}} + \RenewDocumentCommand{\vdash}{}{\mathrel{\mathpalette\raisesymbol\standardvdash}} + } + \newcommand{\raisesymbol}[2]{% + \begingroup + \sbox\z@{$\m@th#1A$}% + \sbox\tw@{$\m@th#1#2$}% + \raisebox{\dimexpr(\ht\z@-\ht\tw@)/2}{\usebox{\tw@}}% + \endgroup + } + \RequirePackage { tikz-cd } \tikzcdset { arrow~style = tikz, diagrams = { >={Stealth[round,length=3.4pt,width=6.15pt,inset=2.25pt]} } } @@ -733,6 +777,41 @@ { \minimclass_xarrows_generic:nnnn { #1 } { #2 } {} { edge [ commutative~diagrams/twoheadleftarrow ] } } + + \cs_new_protected:Nn \minimclass_xarrows_double_generic:nnnnnn + % #3 = option of \tikz + % #4 = edge 1 of \draw + % #5 = edge 2 of \draw + % #6 = sep/2 + { + \hbox_set:Nn \l__minimclass_xarrows_below_box { \ensuremath { \scriptstyle #1 } } + \hbox_set:Nn \l__minimclass_xarrows_above_box { \ensuremath { \scriptstyle #2 } } + \dim_set:Nn \l__minimclass_xarrows_length_dim + { \dim_eval:n { \dim_max:nn { \box_wd:N \l__minimclass_xarrows_below_box } { \box_wd:N \l__minimclass_xarrows_above_box } + 1em } } + \mathrel + { + \tikz [ #3, line~width = .6pt, baseline = -.5ex, every~node/.style = { inner~sep = 0pt }, >={Stealth[round,length=3.4pt,width=6.15pt,inset=2.25pt]} ] + { + \draw (0,#6) #4 + node [ below = 4pt+#6 ] { \box_use:N \l__minimclass_xarrows_below_box } + ( \l__minimclass_xarrows_length_dim ,#6) ; + \draw (0,-#6) #5 + node [ above = 3pt+#6 ] { \box_use:N \l__minimclass_xarrows_above_box } + ( \l__minimclass_xarrows_length_dim ,-#6) ; + } + } + } + + \NewDocumentCommand \xrightrightarrows { O{} m } + { + \minimclass_xarrows_double_generic:nnnnnn { #1 } { #2 } {} { edge [ commutative~diagrams/rightarrow ] } { edge [ commutative~diagrams/rightarrow ] } { .2em } + } + + \NewDocumentCommand \xleftleftarrows { O{} m } + { + \minimclass_xarrows_double_generic:nnnnnn { #1 } { #2 } {} { edge [ commutative~diagrams/leftarrow ] } { edge [ commutative~diagrams/leftarrow ] } { .2em } + } + \hook_gput_code:nnn { begindocument/end } { minimclass } { \RenewDocumentCommand \twoheadrightarrow {} diff --git a/Master/texmf-dist/tex/latex/lebhart/lebhart.cls b/Master/texmf-dist/tex/latex/lebhart/lebhart.cls index ef57540e3dd..1e4e760f702 100644 --- a/Master/texmf-dist/tex/latex/lebhart/lebhart.cls +++ b/Master/texmf-dist/tex/latex/lebhart/lebhart.cls @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplClass {lebhart} - {2023/01/05} {} + {2023/07/14} {} {A colorful article style} \tl_const:Nn \l__colorclass_base_class_tl { article } @@ -103,6 +103,9 @@ , b5paper .bool_set:N = \l__colorclass_b_five_paper_bool , b5paper .initial:n = { false } + , oneside .code:n = { \PassOptionsToClass { \CurrentOption } { \l__colorclass_base_class_tl } } + , twoside .code:n = { \PassOptionsToClass { \CurrentOption } { \l__colorclass_base_class_tl } } + , 11pt .code:n = { \PassOptionsToClass { \CurrentOption } { \l__colorclass_base_class_tl } } , 12pt .code:n = { \PassOptionsToClass { \CurrentOption } { \l__colorclass_base_class_tl } } @@ -243,16 +246,26 @@ BoldItalicFont = *-BoldItalic, Numbers = OldStyle , ] - \setsansfont { SourceSansPro } + \setsansfont { texgyreheros } [ - Extension = .otf, - UprightFont = *-Regular, - BoldFont = *-Semibold, - ItalicFont = *-RegularIt, - BoldItalicFont = *-SemiboldIt, - WordSpace = {1.25, 1, 1} , + Extension = .otf , + Scale = MatchUppercase , + UprightFont = *-regular , + BoldFont = *-bold , + ItalicFont = *-italic , + BoldItalicFont = *-bolditalic , Numbers = OldStyle , ] + % \setsansfont { SourceSansPro } + % [ + % Extension = .otf, + % UprightFont = *-Regular, + % BoldFont = *-Semibold, + % ItalicFont = *-RegularIt, + % BoldItalicFont = *-SemiboldIt, + % WordSpace = {1.25, 1, 1} , + % Numbers = OldStyle , + % ] } { \setmainfont { TeXGyrePagellaX } @@ -263,15 +276,24 @@ ItalicFont = *-Italic, BoldItalicFont = *-BoldItalic, ] - \setsansfont { SourceSansPro } + \setsansfont { texgyreheros } [ - Extension = .otf, - UprightFont = *-Regular, - BoldFont = *-Semibold, - ItalicFont = *-RegularIt, - BoldItalicFont = *-SemiboldIt, - WordSpace = {1.25, 1, 1} , + Extension = .otf , + Scale = MatchUppercase , + UprightFont = *-regular , + BoldFont = *-bold , + ItalicFont = *-italic , + BoldItalicFont = *-bolditalic , ] + % \setsansfont { SourceSansPro } + % [ + % Extension = .otf, + % UprightFont = *-Regular, + % BoldFont = *-Semibold, + % ItalicFont = *-RegularIt, + % BoldItalicFont = *-SemiboldIt, + % WordSpace = {1.25, 1, 1} , + % ] } \setmonofont { NewCMMono10 } [ @@ -624,6 +646,7 @@ \setmathfont { KpMath-Regular.otf } [ range = { cal, bfcal }, RawFeature=+ss01 ] % \setmathfont { KpMath-Regular.otf } [ range = {} ] + % https://tex.stackexchange.com/a/646715 \sys_if_engine_luatex:T { \mathitalicsmode=1 @@ -633,6 +656,11 @@ { \cs_gset_eq:NN \overline \wideoverbar \cs_gset_eq:NN \square \mdwhtsquare + + % https://tex.stackexchange.com/a/678611 + \newcommand{\limstrut}{\vrule depth0.2ex width 0pt} + \renewcommand{\varprojlim}{\mathop{\underleftarrow{{\lim}\limstrut}}} + \renewcommand{\varinjlim}{\mathop{\underrightarrow{{\lim}\limstrut}}} } % https://tex.stackexchange.com/a/647789 @@ -650,6 +678,22 @@ \endgroup } + % https://tex.stackexchange.com/a/678998 + \hook_gput_code:nnn { begindocument } { colorclass } + { + \NewCommandCopy\standarddashv\dashv + \NewCommandCopy\standardvdash\vdash + \RenewDocumentCommand{\dashv}{}{\mathrel{\mathpalette\raisesymbol\standarddashv}} + \RenewDocumentCommand{\vdash}{}{\mathrel{\mathpalette\raisesymbol\standardvdash}} + } + \newcommand{\raisesymbol}[2]{% + \begingroup + \sbox\z@{$\m@th#1A$}% + \sbox\tw@{$\m@th#1#2$}% + \raisebox{\dimexpr(\ht\z@-\ht\tw@)/2}{\usebox{\tw@}}% + \endgroup + } + \RequirePackage { tikz-cd } \tikzcdset { arrow~style = tikz, diagrams = { >={Stealth[round,length=3.4pt,width=6.15pt,inset=2.25pt]} } } @@ -710,6 +754,41 @@ { \colorclass_xarrows_generic:nnnn { #1 } { #2 } {} { edge [ commutative~diagrams/twoheadleftarrow ] } } + + \cs_new_protected:Nn \colorclass_xarrows_double_generic:nnnnnn + % #3 = option of \tikz + % #4 = edge 1 of \draw + % #5 = edge 2 of \draw + % #6 = sep/2 + { + \hbox_set:Nn \l__colorclass_xarrows_below_box { \ensuremath { \scriptstyle #1 } } + \hbox_set:Nn \l__colorclass_xarrows_above_box { \ensuremath { \scriptstyle #2 } } + \dim_set:Nn \l__colorclass_xarrows_length_dim + { \dim_eval:n { \dim_max:nn { \box_wd:N \l__colorclass_xarrows_below_box } { \box_wd:N \l__colorclass_xarrows_above_box } + 1em } } + \mathrel + { + \tikz [ #3, line~width = .6pt, baseline = -.5ex, every~node/.style = { inner~sep = 0pt }, >={Stealth[round,length=3.4pt,width=6.15pt,inset=2.25pt]} ] + { + \draw (0,#6) #4 + node [ below = 4pt+#6 ] { \box_use:N \l__colorclass_xarrows_below_box } + ( \l__colorclass_xarrows_length_dim ,#6) ; + \draw (0,-#6) #5 + node [ above = 3pt+#6 ] { \box_use:N \l__colorclass_xarrows_above_box } + ( \l__colorclass_xarrows_length_dim ,-#6) ; + } + } + } + + \NewDocumentCommand \xrightrightarrows { O{} m } + { + \colorclass_xarrows_double_generic:nnnnnn { #1 } { #2 } {} { edge [ commutative~diagrams/rightarrow ] } { edge [ commutative~diagrams/rightarrow ] } { .2em } + } + + \NewDocumentCommand \xleftleftarrows { O{} m } + { + \colorclass_xarrows_double_generic:nnnnnn { #1 } { #2 } {} { edge [ commutative~diagrams/leftarrow ] } { edge [ commutative~diagrams/leftarrow ] } { .2em } + } + \hook_gput_code:nnn { begindocument/end } { colorclass } { \RenewDocumentCommand \twoheadrightarrow {} diff --git a/Master/texmf-dist/tex/latex/minimalist/minimalist-classical.sty b/Master/texmf-dist/tex/latex/minimalist/minimalist-classical.sty index 31bbbdf00b9..43e69a81ff7 100644 --- a/Master/texmf-dist/tex/latex/minimalist/minimalist-classical.sty +++ b/Master/texmf-dist/tex/latex/minimalist/minimalist-classical.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {minimalist-classical} - {2023/03/07} {} + {2023/07/14} {} {The "classical" style of minimalist} \IfPackageLoadedTF { minimalist } {} @@ -340,10 +340,10 @@ } -\bool_if:NTF \l__minimalist_is_book_bool - { \setcounter{secnumdepth}{3} +\bool_if:NTF \l__minimalist_is_book_bool + { %% Part \titleclass{\part}{top} % make part like a chapter \titleformat{\part}[display] diff --git a/Master/texmf-dist/tex/latex/minimalist/minimalist-flow.sty b/Master/texmf-dist/tex/latex/minimalist/minimalist-flow.sty index 106d18dc0bc..5eabb82c3b3 100644 --- a/Master/texmf-dist/tex/latex/minimalist/minimalist-flow.sty +++ b/Master/texmf-dist/tex/latex/minimalist/minimalist-flow.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {minimalist-flow} - {2023/03/07} {} + {2023/07/14} {} {The "flow" style of minimalist} \IfPackageLoadedTF { minimalist } {} @@ -338,10 +338,10 @@ } -\bool_if:NTF \l__minimalist_is_book_bool - { \setcounter{secnumdepth}{3} +\bool_if:NTF \l__minimalist_is_book_bool + { %% Part \titleclass{\part}{top} % make part like a chapter \titleformat{\part}[display] diff --git a/Master/texmf-dist/tex/latex/minimalist/minimalist-plain.sty b/Master/texmf-dist/tex/latex/minimalist/minimalist-plain.sty index 134fb890809..5ce38ad1632 100644 --- a/Master/texmf-dist/tex/latex/minimalist/minimalist-plain.sty +++ b/Master/texmf-dist/tex/latex/minimalist/minimalist-plain.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {minimalist-plain} - {2023/03/07} {} + {2023/07/14} {} {The "plain" style of minimalist} \IfPackageLoadedTF { minimalist } {} @@ -338,10 +338,10 @@ } -\bool_if:NTF \l__minimalist_is_book_bool - { \setcounter{secnumdepth}{3} +\bool_if:NTF \l__minimalist_is_book_bool + { %% Part \titleclass{\part}{top} % make part like a chapter \titleformat{\part}[display] diff --git a/Master/texmf-dist/tex/latex/minimalist/minimalist-stream.sty b/Master/texmf-dist/tex/latex/minimalist/minimalist-stream.sty index d81bcbd0593..3f84aaedc50 100644 --- a/Master/texmf-dist/tex/latex/minimalist/minimalist-stream.sty +++ b/Master/texmf-dist/tex/latex/minimalist/minimalist-stream.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {minimalist-stream} - {2023/03/07} {} + {2023/07/14} {} {The "stream" style of minimalist} \IfPackageLoadedTF { minimalist } {} @@ -308,12 +308,23 @@ \regex_replace_all:nnN { (\w) } { \c{minimalist_original_bfseries:}{\1} } \l_tmpa_tl \regex_replace_all:nnN { (\d) } { {\c{minimalist_title_numbering_apply_font:n}{\1}} } \l_tmpa_tl \exp_args:Nnx \regex_count:nnN { \. } {#1} \l_tmpa_int - \int_case:nn { \l_tmpa_int } + \bool_if:NTF \l__minimalist_is_book_bool { - { 0 } { \textcolor { main-text!39!paper } } - { 1 } { \textcolor { main-text!39!paper } } - { 2 } { \textcolor { main-text!39!paper } } - { 3 } { \smaller[2] \textcolor { main-text!24!paper } } + \int_case:nn { \l_tmpa_int } + { + { 0 } { \textcolor { main-text!39!paper } } + { 1 } { \textcolor { main-text!39!paper } } + { 2 } { \textcolor { main-text!39!paper } } + { 3 } { \smaller \textcolor { main-text!24!paper } } + } + } + { + \int_case:nn { \l_tmpa_int } + { + { 0 } { \textcolor { main-text!39!paper } } + { 1 } { \textcolor { main-text!39!paper } } + { 2 } { \smaller[2] \textcolor { main-text!24!paper } } + } } \l_tmpa_tl \group_end: @@ -341,10 +352,10 @@ \dim_new:N \l_minimalist_title_sep_dim \dim_set:Nn \l_minimalist_title_sep_dim { 1em } -\bool_if:NTF \l__minimalist_is_book_bool - { \setcounter{secnumdepth}{4} +\bool_if:NTF \l__minimalist_is_book_bool + { %% Part \titleclass{\part}{top} % make part like a chapter \titleformat{\part}[display] diff --git a/Master/texmf-dist/tex/latex/minimalist/minimalist.sty b/Master/texmf-dist/tex/latex/minimalist/minimalist.sty index 8eeb64e7472..2cf94896b82 100644 --- a/Master/texmf-dist/tex/latex/minimalist/minimalist.sty +++ b/Master/texmf-dist/tex/latex/minimalist/minimalist.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {minimalist} - {2023/03/07} {} + {2023/07/14} {} {A simple and clear style for articles and books} \keys_define:nn { minimalist } diff --git a/Master/texmf-dist/tex/latex/minimalist/minimart.cls b/Master/texmf-dist/tex/latex/minimalist/minimart.cls index 04e877e1039..db630668095 100644 --- a/Master/texmf-dist/tex/latex/minimalist/minimart.cls +++ b/Master/texmf-dist/tex/latex/minimalist/minimart.cls @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplClass {minimart} - {2023/03/07} {} + {2023/07/14} {} {A simple and clear article style} \tl_const:Nn \l__minimclass_base_class_tl { article } @@ -67,6 +67,9 @@ , b5paper .bool_set:N = \l__minimclass_b_five_paper_bool , b5paper .initial:n = { false } + , oneside .code:n = { \PassOptionsToClass { \CurrentOption } { \l__minimclass_base_class_tl } } + , twoside .code:n = { \PassOptionsToClass { \CurrentOption } { \l__minimclass_base_class_tl } } + , 11pt .code:n = { \PassOptionsToClass { \CurrentOption } { \l__minimclass_base_class_tl } } , 12pt .code:n = { \PassOptionsToClass { \CurrentOption } { \l__minimclass_base_class_tl } } diff --git a/Master/texmf-dist/tex/latex/minimalist/minimbook.cls b/Master/texmf-dist/tex/latex/minimalist/minimbook.cls index 536a23fe552..6e52b41bff8 100644 --- a/Master/texmf-dist/tex/latex/minimalist/minimbook.cls +++ b/Master/texmf-dist/tex/latex/minimalist/minimbook.cls @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplClass {minimbook} - {2023/03/07} {} + {2023/07/14} {} {A simple and clear book style} \tl_const:Nn \l__minimclass_base_class_tl { book } @@ -67,6 +67,9 @@ , b5paper .bool_set:N = \l__minimclass_b_five_paper_bool , b5paper .initial:n = { false } + , oneside .code:n = { \PassOptionsToClass { \CurrentOption } { \l__minimclass_base_class_tl } } + , twoside .code:n = { \PassOptionsToClass { \CurrentOption } { \l__minimclass_base_class_tl } } + , 11pt .code:n = { \PassOptionsToClass { \CurrentOption } { \l__minimclass_base_class_tl } } , 12pt .code:n = { \PassOptionsToClass { \CurrentOption } { \l__minimclass_base_class_tl } } diff --git a/Master/texmf-dist/tex/latex/projlib/ProjLib.sty b/Master/texmf-dist/tex/latex/projlib/ProjLib.sty index 9eae2de74ad..93549e3fef7 100644 --- a/Master/texmf-dist/tex/latex/projlib/ProjLib.sty +++ b/Master/texmf-dist/tex/latex/projlib/ProjLib.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {ProjLib} - {2023/01/05} {} + {2023/07/14} {} {Collective interface of the ProjLib toolkit} \keys_define:nn { ProjLib } diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-author.sty b/Master/texmf-dist/tex/latex/projlib/projlib-author.sty index e4a551c336e..0beec8a6af4 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-author.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-author.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {projlib-author} - {2023/01/05} {} + {2023/07/14} {} {Enhanced author information block} \keys_define:nn { projlib-author } @@ -175,7 +175,6 @@ } \NewCommandCopy \projlib_author_backup_footnotemark: \footnotemark - \tl_gset:Nn \footnotemark {} \NewCommandCopy \projlib_author_backup_thanks:w \thanks \cs_undefine:N \thanks @@ -199,7 +198,9 @@ { \hook_gput_code:nnn { cmd/@title/after } { projlib-author } { + \tl_set:Nn \footnotemark {} \projlib_author_pre_thanks:n { #1 } + \RenewCommandCopy \footnotemark \projlib_author_backup_footnotemark: } } } @@ -211,10 +212,8 @@ { \projlib_author_backup_my_author:w { - \RenewCommandCopy \footnotemark \projlib_author_backup_footnotemark: \RenewCommandCopy \thanks \projlib_author_backup_thanks:w #1 - \tl_gset:Nn \footnotemark {} } } } @@ -301,8 +300,8 @@ \cs_undefine:N \email \cs_undefine:N \dedicatory \cs_undefine:N \keywords - \cs_undefine:N \footnotemark - \NewCommandCopy \footnotemark \projlib_author_backup_footnotemark: + % \cs_undefine:N \footnotemark + % \NewCommandCopy \footnotemark \projlib_author_backup_footnotemark: \bool_gset_true:N \g__projlib_author_already_maketitle_bool } } diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-datetime.sty b/Master/texmf-dist/tex/latex/projlib/projlib-datetime.sty index d7f7beefe81..b0503eda627 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-datetime.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-datetime.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {projlib-datetime} - {2023/01/05} {} + {2023/07/14} {} {Convert numeric date-time string to natural language} \tl_new:N \g__projlib_datetime_input_format_tl diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-draft.sty b/Master/texmf-dist/tex/latex/projlib/projlib-draft.sty index c525cddb585..d2a3636cacd 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-draft.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-draft.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {projlib-draft} - {2023/01/05} {} + {2023/07/14} {} {Useful commands during draft stage} \keys_define:nn { projlib-draft } diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-font.sty b/Master/texmf-dist/tex/latex/projlib/projlib-font.sty index b9479d11145..a5eb8fad1ed 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-font.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-font.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {projlib-font} - {2023/01/05} {} + {2023/07/14} {} {Font selection and configuration} \keys_define:nn { projlib-font } diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-language.sty b/Master/texmf-dist/tex/latex/projlib/projlib-language.sty index 617f7ee4d92..1d9fa50451e 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-language.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-language.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {projlib-language} - {2023/01/05} {} + {2023/07/14} {} {Multi-language configuration} \clist_const:Nn \c__projlib_language_supported_clist @@ -633,6 +633,11 @@ \projlib_language_use_language_locally:en { #1 } { #2 } \group_end: } +\NewDocumentEnvironment { OtherLanguage } { m +b } + { + \projlib_language_use_language_locally:en { #1 } { #2 } + } + { } \UseLanguage { \g__projlib_language_main_str } diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-logo.sty b/Master/texmf-dist/tex/latex/projlib/projlib-logo.sty index e7f131c4ef8..f7ab0cdd42e 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-logo.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-logo.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {projlib-logo} - {2023/01/05} {} + {2023/07/14} {} {The ProjLib logo} \keys_define:nn { projlib-logo } diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-math.sty b/Master/texmf-dist/tex/latex/projlib/projlib-math.sty index d7eec1d5cfa..a633bbdc10d 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-math.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-math.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {projlib-math} - {2023/01/05} {} + {2023/07/14} {} {Efficient math setup} \keys_define:nn { projlib-math } diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-paper.sty b/Master/texmf-dist/tex/latex/projlib/projlib-paper.sty index d5737c21796..14b47d4c14d 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-paper.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-paper.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {projlib-paper} - {2023/01/05} {} + {2023/07/14} {} {Configuration of the paper style} \keys_define:nn { projlib-paper } diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-text.sty b/Master/texmf-dist/tex/latex/projlib/projlib-text.sty index bca4821e01b..9f18874e087 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-text.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-text.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {projlib-text} - {2023/01/05} {} + {2023/07/14} {} {Text-related commands} \keys_define:nn { projlib-text } diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-theorem.sty b/Master/texmf-dist/tex/latex/projlib/projlib-theorem.sty index 209c1d55eb4..5dd3613b6db 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-theorem.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-theorem.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {projlib-theorem} - {2023/01/05} {} + {2023/07/14} {} {Configuration of theorem-like environments} \keys_define:nn { projlib-theorem } @@ -176,14 +176,14 @@ \CreateTheorem { theorem } { parent counter = chapter, create starred version } \bool_if:NT \l__projlib_theorem_separate_theorem_numbering_bool { - \exp_args:Nv \CreateTheorem { c_projlib_theorem_supported_clist } { parent counter = chapter, create starred version } + \exp_args:Nv \CreateTheorem { c_projlib_theorem_supported_clist } { parent counter = chapter, create starred version, quiet } } } { % without \chapter \CreateTheorem { theorem } { parent counter = section, create starred version } \bool_if:NT \l__projlib_theorem_separate_theorem_numbering_bool { - \exp_args:Nv \CreateTheorem { c_projlib_theorem_supported_clist } { parent counter = section, create starred version } + \exp_args:Nv \CreateTheorem { c_projlib_theorem_supported_clist } { parent counter = section, create starred version, quiet } } } } @@ -193,14 +193,14 @@ \CreateTheorem { theorem } { create starred version } \bool_if:NT \l__projlib_theorem_separate_theorem_numbering_bool { - \exp_args:Nv \CreateTheorem { c_projlib_theorem_supported_clist } { create starred version } + \exp_args:Nv \CreateTheorem { c_projlib_theorem_supported_clist } { create starred version, quiet } } } { \CreateTheorem { theorem } { parent counter = \l__projlib_theorem_theorem_numbering_tl, create starred version } \bool_if:NT \l__projlib_theorem_separate_theorem_numbering_bool { - \exp_args:Nv \CreateTheorem { c_projlib_theorem_supported_clist } { parent counter = \l__projlib_theorem_theorem_numbering_tl, create starred version } + \exp_args:Nv \CreateTheorem { c_projlib_theorem_supported_clist } { parent counter = \l__projlib_theorem_theorem_numbering_tl, create starred version, quiet } } } } @@ -900,7 +900,7 @@ } , crefname = { , english = {Example}{Example} - , french = [l']{Example}[les]{Example} + , french = [l']{Exemple}[les]{Exemple} , ngerman = {Beispiel}{Beispiel} , italian = [l']{Esempio}[gli]{Esempio} , portuguese = [o]{Exemplo}[os]{Exemplo} @@ -913,7 +913,7 @@ } , Crefname = { , english = {Example}{Example} - , french = [L']{Example}[Les]{Example} + , french = [L']{Exemple}[Les]{Exemple} , ngerman = {Beispiel}{Beispiel} , italian = [L']{Esempio}[Gli]{Esempio} , portuguese = [O]{Exemplo}[Os]{Exemplo} diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-titlepage.sty b/Master/texmf-dist/tex/latex/projlib/projlib-titlepage.sty index dfe0f7d7e53..0ada0edb4df 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-titlepage.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-titlepage.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {projlib-titlepage} - {2023/01/05} {} + {2023/07/14} {} {Commands for rendering the title page} \keys_define:nn { projlib-titlepage } @@ -134,12 +134,12 @@ \fill [color=titlepage-main] ($(current~page.north~west)$) rectangle ($(current~page.north~west)+(.125\paperwidth,-.3\paperheight)$); \fill [color=titlepage-back] ($(current~page.north~east)$) rectangle ($(current~page.north~west)+(.125\paperwidth,-.3\paperheight)$); \node[text~width=.3\paperwidth, text~height=.2\paperheight, align=flush~left] - at ($(current~page.north~west)+(.32\paperwidth,-.17\paperheight)$) + at ($(current~page.north~west)+(.333\paperwidth,-.17\paperheight)$) { \projlib_titlepage_show_logo:n { \scalebox { 2 } { \ProjLib } } }; \node[text~width=.8\paperwidth, text~height=.5\paperheight, align=flush~left] - at ($(current~page.north~west)+(.57\paperwidth,-.28\paperheight)$) + at ($(current~page.north~west)+(.583\paperwidth,-.28\paperheight)$) { \color{titlepage-back} \sffamily @@ -168,12 +168,12 @@ \fill[color=white] ($(current~page.south~west)$) rectangle ($(current~page.north~east)$); \fill[color=titlepage-main] ($(current~page.south~west)$) rectangle ($(current~page.north~east)+(0,-.3\paperheight)$); \node[text~width=.3\paperwidth, text~height=.2\paperheight, align=flush~left] - at ($(current~page.north~west)+(.27\paperwidth,-.15\paperheight)$) + at ($(current~page.north~west)+(.28\paperwidth,-.15\paperheight)$) { \projlib_titlepage_show_logo:n { \scalebox { 2 } { \ProjLib } } }; \node[text~width=.8\paperwidth, text~height=.5\paperheight, align=flush~left] - at ($(current~page.north~west)+(.52\paperwidth,-.28\paperheight)$) + at ($(current~page.north~west)+(.53\paperwidth,-.28\paperheight)$) { \color{white} \sffamily diff --git a/Master/texmf-dist/tex/latex/simplivre/simplivre.cls b/Master/texmf-dist/tex/latex/simplivre/simplivre.cls index b49f3d82e9a..3ca9fbd1d14 100644 --- a/Master/texmf-dist/tex/latex/simplivre/simplivre.cls +++ b/Master/texmf-dist/tex/latex/simplivre/simplivre.cls @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplClass {simplivre} - {2023/01/05} {} + {2023/07/14} {} {A simple and clear book style} \tl_const:Nn \l__minimclass_base_class_tl { book } @@ -110,6 +110,9 @@ , b5paper .bool_set:N = \l__minimclass_b_five_paper_bool , b5paper .initial:n = { false } + , oneside .code:n = { \PassOptionsToClass { \CurrentOption } { \l__minimclass_base_class_tl } } + , twoside .code:n = { \PassOptionsToClass { \CurrentOption } { \l__minimclass_base_class_tl } } + , 11pt .code:n = { \PassOptionsToClass { \CurrentOption } { \l__minimclass_base_class_tl } } , 12pt .code:n = { \PassOptionsToClass { \CurrentOption } { \l__minimclass_base_class_tl } } @@ -264,16 +267,26 @@ BoldItalicFont = *-BoldItalic, Numbers = OldStyle , ] - \setsansfont { SourceSansPro } + \setsansfont { texgyreheros } [ - Extension = .otf, - UprightFont = *-Regular, - BoldFont = *-Semibold, - ItalicFont = *-RegularIt, - BoldItalicFont = *-SemiboldIt, - WordSpace = {1.25, 1, 1} , + Extension = .otf , + Scale = MatchUppercase , + UprightFont = *-regular , + BoldFont = *-bold , + ItalicFont = *-italic , + BoldItalicFont = *-bolditalic , Numbers = OldStyle , ] + % \setsansfont { SourceSansPro } + % [ + % Extension = .otf, + % UprightFont = *-Regular, + % BoldFont = *-Semibold, + % ItalicFont = *-RegularIt, + % BoldItalicFont = *-SemiboldIt, + % WordSpace = {1.25, 1, 1} , + % Numbers = OldStyle , + % ] } { \setmainfont { TeXGyrePagellaX } @@ -284,15 +297,24 @@ ItalicFont = *-Italic, BoldItalicFont = *-BoldItalic, ] - \setsansfont { SourceSansPro } + \setsansfont { texgyreheros } [ - Extension = .otf, - UprightFont = *-Regular, - BoldFont = *-Semibold, - ItalicFont = *-RegularIt, - BoldItalicFont = *-SemiboldIt, - WordSpace = {1.25, 1, 1} , + Extension = .otf , + Scale = MatchUppercase , + UprightFont = *-regular , + BoldFont = *-bold , + ItalicFont = *-italic , + BoldItalicFont = *-bolditalic , ] + % \setsansfont { SourceSansPro } + % [ + % Extension = .otf, + % UprightFont = *-Regular, + % BoldFont = *-Semibold, + % ItalicFont = *-RegularIt, + % BoldItalicFont = *-SemiboldIt, + % WordSpace = {1.25, 1, 1} , + % ] } \setmonofont { NewCMMono10 } [ @@ -603,7 +625,7 @@ \CJKfamily { JPmain } } - \tl_gset:Nn \g_minimalist_title_font_common_tl { \minimclass_cjk_sffamily: } + % \tl_gset:Nn \g_minimalist_title_font_common_tl { \minimclass_cjk_sffamily: } } \__minimclass_load_file_or_config:Nnn \l__minimclass_load_custom_font_file_math_bool { \l__minimclass_custom_font_file_math_str } @@ -647,6 +669,7 @@ \setmathfont { KpMath-Regular.otf } [ range = { cal, bfcal }, RawFeature=+ss01 ] % \setmathfont { KpMath-Regular.otf } [ range = {} ] + % https://tex.stackexchange.com/a/646715 \sys_if_engine_luatex:T { \mathitalicsmode=1 @@ -656,6 +679,11 @@ { \cs_gset_eq:NN \overline \wideoverbar \cs_gset_eq:NN \square \mdwhtsquare + + % https://tex.stackexchange.com/a/678611 + \newcommand{\limstrut}{\vrule depth0.2ex width 0pt} + \renewcommand{\varprojlim}{\mathop{\underleftarrow{{\lim}\limstrut}}} + \renewcommand{\varinjlim}{\mathop{\underrightarrow{{\lim}\limstrut}}} } % https://tex.stackexchange.com/a/647789 @@ -673,6 +701,22 @@ \endgroup } + % https://tex.stackexchange.com/a/678998 + \hook_gput_code:nnn { begindocument } { minimclass } + { + \NewCommandCopy\standarddashv\dashv + \NewCommandCopy\standardvdash\vdash + \RenewDocumentCommand{\dashv}{}{\mathrel{\mathpalette\raisesymbol\standarddashv}} + \RenewDocumentCommand{\vdash}{}{\mathrel{\mathpalette\raisesymbol\standardvdash}} + } + \newcommand{\raisesymbol}[2]{% + \begingroup + \sbox\z@{$\m@th#1A$}% + \sbox\tw@{$\m@th#1#2$}% + \raisebox{\dimexpr(\ht\z@-\ht\tw@)/2}{\usebox{\tw@}}% + \endgroup + } + \RequirePackage { tikz-cd } \tikzcdset { arrow~style = tikz, diagrams = { >={Stealth[round,length=3.4pt,width=6.15pt,inset=2.25pt]} } } @@ -733,6 +777,41 @@ { \minimclass_xarrows_generic:nnnn { #1 } { #2 } {} { edge [ commutative~diagrams/twoheadleftarrow ] } } + + \cs_new_protected:Nn \minimclass_xarrows_double_generic:nnnnnn + % #3 = option of \tikz + % #4 = edge 1 of \draw + % #5 = edge 2 of \draw + % #6 = sep/2 + { + \hbox_set:Nn \l__minimclass_xarrows_below_box { \ensuremath { \scriptstyle #1 } } + \hbox_set:Nn \l__minimclass_xarrows_above_box { \ensuremath { \scriptstyle #2 } } + \dim_set:Nn \l__minimclass_xarrows_length_dim + { \dim_eval:n { \dim_max:nn { \box_wd:N \l__minimclass_xarrows_below_box } { \box_wd:N \l__minimclass_xarrows_above_box } + 1em } } + \mathrel + { + \tikz [ #3, line~width = .6pt, baseline = -.5ex, every~node/.style = { inner~sep = 0pt }, >={Stealth[round,length=3.4pt,width=6.15pt,inset=2.25pt]} ] + { + \draw (0,#6) #4 + node [ below = 4pt+#6 ] { \box_use:N \l__minimclass_xarrows_below_box } + ( \l__minimclass_xarrows_length_dim ,#6) ; + \draw (0,-#6) #5 + node [ above = 3pt+#6 ] { \box_use:N \l__minimclass_xarrows_above_box } + ( \l__minimclass_xarrows_length_dim ,-#6) ; + } + } + } + + \NewDocumentCommand \xrightrightarrows { O{} m } + { + \minimclass_xarrows_double_generic:nnnnnn { #1 } { #2 } {} { edge [ commutative~diagrams/rightarrow ] } { edge [ commutative~diagrams/rightarrow ] } { .2em } + } + + \NewDocumentCommand \xleftleftarrows { O{} m } + { + \minimclass_xarrows_double_generic:nnnnnn { #1 } { #2 } {} { edge [ commutative~diagrams/leftarrow ] } { edge [ commutative~diagrams/leftarrow ] } { .2em } + } + \hook_gput_code:nnn { begindocument/end } { minimclass } { \RenewDocumentCommand \twoheadrightarrow {} |