diff options
author | Karl Berry <karl@freefriends.org> | 2022-06-16 20:21:36 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-06-16 20:21:36 +0000 |
commit | e69119d55d51d7fae1816c0e872d57c62694b3cb (patch) | |
tree | 794c1f7c078c28f126ed58422c684cae64aaae0f /Master/texmf-dist/tex/latex | |
parent | 1f9af4111f133e2a9a62e36bd20422ca1d5ac470 (diff) |
jxu (16jun22)
git-svn-id: svn://tug.org/texlive/trunk@63612 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r-- | Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls | 126 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/colorist/colorart.cls | 22 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/colorist/colorbook.cls | 22 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty | 58 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/colorist/colorist.sty | 27 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/einfart/einfart.cls | 126 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/lebhart/lebhart.cls | 126 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/minimalist/minimalist-classical.sty | 138 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/minimalist/minimalist-plain.sty | 158 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/minimalist/minimalist.sty | 27 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/minimalist/minimart.cls | 22 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/minimalist/minimbook.cls | 22 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/simplivre/simplivre.cls | 126 |
13 files changed, 584 insertions, 416 deletions
diff --git a/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls b/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls index 05924ada809..7c63f734795 100644 --- a/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls +++ b/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls @@ -1,7 +1,7 @@ %% %% This is file `beaulivre/beaulivre.cls', %% generated with the docstrip utility. - +%% %% Copyright (C) 2021-2022 by Jinwen XU %% %% This is part of the colorist class series. @@ -19,7 +19,7 @@ \RequirePackage{l3keys2e} \ProvidesExplClass {beaulivre} - {2022/04/24} {} + {2022/06/16} {} {A colorful book style} \tl_const:Nn \l__colorclass_base_class_tl { book } @@ -229,43 +229,39 @@ \__colorclass_load_file_or_config:Nnn \l__colorclass_load_custom_font_file_latin_bool { \l__colorclass_custom_font_file_latin_str } { - \__colorclass_if_font_exist:nnn { Palatino~Linotype } + \bool_if:NTF \l__projlib_font_useosf_bool { - \bool_if:NTF \l__projlib_font_useosf_bool - { - \setmainfont { Palatino~Linotype } [ Numbers = OldStyle ] - } - { - \setmainfont { Palatino~Linotype } - } + \setmainfont { TeXGyrePagellaX-Regular.otf } + [ + BoldFont = TeXGyrePagellaX-Bold.otf , + ItalicFont = TeXGyrePagellaX-Italic.otf , + BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf , + Numbers = OldStyle , + ] + \setsansfont { SourceSansPro-Regular.otf } + [ + Scale = 1.05 , + BoldFont = SourceSansPro-Semibold.otf , + ItalicFont = SourceSansPro-RegularIt.otf , + BoldItalicFont = SourceSansPro-SemiboldIt.otf , + Numbers = OldStyle , + ] } { - \bool_if:NTF \l__projlib_font_useosf_bool - { - \setmainfont { TeXGyrePagellaX-Regular.otf } - [ - BoldFont = TeXGyrePagellaX-Bold.otf , - ItalicFont = TeXGyrePagellaX-Italic.otf , - BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf , - Numbers = OldStyle , - ] - } - { - \setmainfont { TeXGyrePagellaX-Regular.otf } - [ - BoldFont = TeXGyrePagellaX-Bold.otf , - ItalicFont = TeXGyrePagellaX-Italic.otf , - BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf , - ] - } + \setmainfont { TeXGyrePagellaX-Regular.otf } + [ + BoldFont = TeXGyrePagellaX-Bold.otf , + ItalicFont = TeXGyrePagellaX-Italic.otf , + BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf , + ] + \setsansfont { SourceSansPro-Regular.otf } + [ + Scale = 1.05 , + BoldFont = SourceSansPro-Semibold.otf , + ItalicFont = SourceSansPro-RegularIt.otf , + BoldItalicFont = SourceSansPro-SemiboldIt.otf , + ] } - \setsansfont { SourceSansPro-Regular.otf } - [ - Scale = 1.05 , - BoldFont = SourceSansPro-Bold.otf , - ItalicFont = SourceSansPro-RegularIt.otf , - BoldItalicFont = SourceSansPro-BoldIt.otf , - ] \setmonofont { NewCMMono10-Regular.otf } [ Scale = 1.05 , @@ -544,10 +540,8 @@ { \bool_if:NF \g_projlib_font_already_set_bool { - \bool_if:NTF \l__colorclass_fast_bool - { - \RequirePackage { amssymb } - } + \RequirePackage { amssymb } + \bool_if:NF \l__colorclass_fast_bool { \PassOptionsToPackage { warnings-off = { mathtools-colon, mathtools-overbracket } } { unicode-math } \RequirePackage { unicode-math } @@ -559,6 +553,11 @@ ] \setmathfont { latinmodern-math.otf } [ + range = { \ast } , + Scale = 1.10 + ] + \setmathfont { latinmodern-math.otf } + [ range = { frak, bffrak } ] \DeclareMathAlphabet{\mathcal}{OMS}{cmsy}{m}{n} @@ -571,17 +570,34 @@ [ range = { it / { Latin, latin }, bfit / { Latin, latin }, up / num, bfup / num } ] + \setmathfont { KpMath-Regular.otf } [ range = {} ] + + \sys_if_engine_luatex:T + { + \mathitalicsmode=1 + } \hook_gput_code:nnn { begindocument } { colorclass } { - \NewCommandCopy \colorclass_backup_mid: \mid - \RenewDocumentCommand \mid {} - { \skip_horizontal:n {-.1em} \colorclass_backup_mid: \skip_horizontal:n {-.1em} } - \NewCommandCopy \colorclass_backup_nmid: \nmid - \RenewDocumentCommand \nmid {} - { \skip_horizontal:n {-.1em} \colorclass_backup_nmid: \skip_horizontal:n {-.1em} } + \cs_gset_eq:NN \overline \wideoverbar + \cs_gset_eq:NN \square \mdwhtsquare } + % A temporary hack proposed in https://tex.stackexchange.com/a/647789 + \hook_gput_code:nnn { begindocument } { minimclass } + { + \NewCommandCopy\unicodevdots\vdots + \RenewDocumentCommand{\vdots}{}{\mathrel{\loweredvdots}} + } + \newcommand{\loweredvdots}{\mathpalette\loweredvdots@\relax} + \newcommand{\loweredvdots@}[2]{% + \begingroup + \sbox\z@{$\m@th#1\unicodevdots$}% + \vrule width \z@ height 2.25\ht\z@ depth 0.012\ht\z@ + \raisebox{0.25\height}{\usebox\z@}% + \endgroup + } + \RequirePackage { tikz-cd } \tikzcdset { arrow~style = tikz, diagrams = { >={Stealth[round,length=3.4pt,width=6.15pt,inset=2.25pt]} } } @@ -650,21 +666,27 @@ } } +\char_set_catcode_active:n { `\· } +\cs_new_protected:Npn · { \ensuremath\cdot } + \PassOptionsToPackage { all } { nowidow } \RequirePackage { nowidow } -\RequirePackage { regexpatch } -\skip_new:N \g_colorclass_parfillskip_skip -\xpatchcmd{\@trivlist}{\@flushglue}{\g_colorclass_parfillskip_skip}{}{} -\hook_gput_code:nnn { begindocument } { colorclass } +\sys_if_engine_xetex:T { - \skip_gset:Nn \g_colorclass_parfillskip_skip { 0pt plus \dim_eval:n { \linewidth - 2\parindent } } - \skip_gset_eq:NN \parfillskip \g_colorclass_parfillskip_skip + \RequirePackage { regexpatch } + \skip_new:N \g_colorclass_parfillskip_skip + \xpatchcmd{\@trivlist}{\@flushglue}{\g_colorclass_parfillskip_skip}{}{} + \hook_gput_code:nnn { begindocument } { colorclass } + { + \skip_gset:Nn \g_colorclass_parfillskip_skip { 0pt plus \dim_eval:n { \linewidth - 3em } } + \skip_gset_eq:NN \parfillskip \g_colorclass_parfillskip_skip + } } \hook_gput_code:nnn { begindocument/before } { colorclass } { - \@ifpackageloaded { biblatex } + \IfPackageLoadedTF { biblatex } { \PassOptionsToPackage { biblatex } { embrac } } {} diff --git a/Master/texmf-dist/tex/latex/colorist/colorart.cls b/Master/texmf-dist/tex/latex/colorist/colorart.cls index b347658bbbf..9c838e534de 100644 --- a/Master/texmf-dist/tex/latex/colorist/colorart.cls +++ b/Master/texmf-dist/tex/latex/colorist/colorart.cls @@ -1,7 +1,7 @@ %% %% This is file `colorist/colorart.cls', %% generated with the docstrip utility. - +%% %% Copyright (C) 2021-2022 by Jinwen XU %% %% This is part of the colorist class series. @@ -19,7 +19,7 @@ \RequirePackage{l3keys2e} \ProvidesExplClass {colorart} - {2022/04/24} {} + {2022/06/16} {} {A colorful article style} \tl_const:Nn \l__colorclass_base_class_tl { article } @@ -169,21 +169,25 @@ } } + \PassOptionsToPackage { all } { nowidow } \RequirePackage { nowidow } -\RequirePackage { regexpatch } -\skip_new:N \g_colorclass_parfillskip_skip -\xpatchcmd{\@trivlist}{\@flushglue}{\g_colorclass_parfillskip_skip}{}{} -\hook_gput_code:nnn { begindocument } { colorclass } +\sys_if_engine_xetex:T { - \skip_gset:Nn \g_colorclass_parfillskip_skip { 0pt plus \dim_eval:n { \linewidth - 2\parindent } } - \skip_gset_eq:NN \parfillskip \g_colorclass_parfillskip_skip + \RequirePackage { regexpatch } + \skip_new:N \g_colorclass_parfillskip_skip + \xpatchcmd{\@trivlist}{\@flushglue}{\g_colorclass_parfillskip_skip}{}{} + \hook_gput_code:nnn { begindocument } { colorclass } + { + \skip_gset:Nn \g_colorclass_parfillskip_skip { 0pt plus \dim_eval:n { \linewidth - 3em } } + \skip_gset_eq:NN \parfillskip \g_colorclass_parfillskip_skip + } } \hook_gput_code:nnn { begindocument/before } { colorclass } { - \@ifpackageloaded { biblatex } + \IfPackageLoadedTF { biblatex } { \PassOptionsToPackage { biblatex } { embrac } } {} diff --git a/Master/texmf-dist/tex/latex/colorist/colorbook.cls b/Master/texmf-dist/tex/latex/colorist/colorbook.cls index 2fe78fc5f31..877f6d9cf0e 100644 --- a/Master/texmf-dist/tex/latex/colorist/colorbook.cls +++ b/Master/texmf-dist/tex/latex/colorist/colorbook.cls @@ -1,7 +1,7 @@ %% %% This is file `colorist/colorbook.cls', %% generated with the docstrip utility. - +%% %% Copyright (C) 2021-2022 by Jinwen XU %% %% This is part of the colorist class series. @@ -19,7 +19,7 @@ \RequirePackage{l3keys2e} \ProvidesExplClass {colorbook} - {2022/04/24} {} + {2022/06/16} {} {A colorful book style} \tl_const:Nn \l__colorclass_base_class_tl { book } @@ -169,21 +169,25 @@ } } + \PassOptionsToPackage { all } { nowidow } \RequirePackage { nowidow } -\RequirePackage { regexpatch } -\skip_new:N \g_colorclass_parfillskip_skip -\xpatchcmd{\@trivlist}{\@flushglue}{\g_colorclass_parfillskip_skip}{}{} -\hook_gput_code:nnn { begindocument } { colorclass } +\sys_if_engine_xetex:T { - \skip_gset:Nn \g_colorclass_parfillskip_skip { 0pt plus \dim_eval:n { \linewidth - 2\parindent } } - \skip_gset_eq:NN \parfillskip \g_colorclass_parfillskip_skip + \RequirePackage { regexpatch } + \skip_new:N \g_colorclass_parfillskip_skip + \xpatchcmd{\@trivlist}{\@flushglue}{\g_colorclass_parfillskip_skip}{}{} + \hook_gput_code:nnn { begindocument } { colorclass } + { + \skip_gset:Nn \g_colorclass_parfillskip_skip { 0pt plus \dim_eval:n { \linewidth - 3em } } + \skip_gset_eq:NN \parfillskip \g_colorclass_parfillskip_skip + } } \hook_gput_code:nnn { begindocument/before } { colorclass } { - \@ifpackageloaded { biblatex } + \IfPackageLoadedTF { biblatex } { \PassOptionsToPackage { biblatex } { embrac } } {} diff --git a/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty b/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty index 8f0d97307a9..cc3db07f88b 100644 --- a/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty +++ b/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty @@ -1,7 +1,7 @@ %% %% This is file `colorist/colorist-fancy.sty', %% generated with the docstrip utility. - +%% %% Copyright (C) 2021-2022 by Jinwen XU %% %% This is part of the colorist class series. @@ -19,10 +19,10 @@ \RequirePackage{l3keys2e} \ProvidesExplPackage {colorist-fancy} - {2022/04/24} {} + {2022/06/16} {} {The fancy style of colorist} -\@ifpackageloaded { colorist } {} +\IfPackageLoadedTF { colorist } {} { \msg_new:nnn { \@currname } { colorist-not-loaded } @@ -34,6 +34,7 @@ %%================================ %% Title fonts %%================================ +\RequirePackage { relsize } \RequirePackage { anyfontsize } \NewCommandCopy \colorist_original_bfseries: \bfseries @@ -57,6 +58,14 @@ \cs_new:Nn \colorist_bfseries: {} } +\bool_if:NTF \l__colorist_use_scshape_bool + { + \cs_new:Nn \colorist_scshape: { \scshape } + } + { + \cs_new:Nn \colorist_scshape: {} + } + \tl_new:N \g_colorist_title_font_common_tl \tl_new:N \g_colorist_title_font_part_tl @@ -211,7 +220,7 @@ %%================================ %% Title format %%================================ -\RequirePackage [ explicit, newparttoc, nobottomtitles* ] { titlesec } +\RequirePackage [ explicit, newparttoc ] { titlesec } \PassOptionsToPackage { normalem } { ulem } \RequirePackage { ulem } @@ -254,7 +263,7 @@ \end{tikzpicture} } {1em} - {\fontsize{20}{0}\selectfont\MakeUppercase{#1}} + {\fontsize{20}{24}\selectfont\MakeUppercase{#1}} \titleformat{name=\part,numberless}[display] {% \phantomsection\addcontentsline{toc}{part}{#1}% \g_colorist_title_font_part_tl \filleft} @@ -266,7 +275,7 @@ \end{tikzpicture} } {1em} - {\fontsize{20}{0}\selectfont\MakeUppercase{#1}} + {\fontsize{20}{24}\selectfont\MakeUppercase{#1}} \titlespacing*{\part}{0pt}{5em}{6em} %% Text after part \newcommand{\parttext}[1]{ @@ -315,7 +324,7 @@ } \titleformat{name=\chapter} - { \g_colorist_title_font_chapter_tl \scshape\huge} % Format + { \g_colorist_title_font_chapter_tl \colorist_scshape:\huge} % Format {} % Label {0mm} % Sep { \colorist_chapter_inner:nn { \thechapter } { #1 } } % Before-code @@ -323,7 +332,7 @@ {0em}{*2}{0em} % {left}{before-sep}{after-sep} \titleformat{name=\chapter, numberless} - {\filcenter \g_colorist_title_font_chapter_tl \scshape\huge} + {\filcenter \g_colorist_title_font_chapter_tl \colorist_scshape:\huge} {} {0mm} { \colorist_chapter_inner:n { #1 } } @@ -366,7 +375,7 @@ %% Section \titleformat{\section} {\color{maintheme} \g_colorist_title_font_section_tl \large} - {\thesection}{.75em}{\scshape #1} + {\thesection}{.75em}{\colorist_scshape: #1} %% Subsection \titleformat{\subsection} @@ -416,7 +425,7 @@ { \titlecontents{chapter} [2em] % i.e., 0em (part) + 2em - {\addvspace{1pc} \color{maintheme} \normalfont \sffamily \colorist_bfseries: \scshape } + {\addvspace{1pc} \color{maintheme} \normalfont \sffamily \colorist_bfseries: \colorist_scshape: } {\contentslabel[ \raisebox{-.03\baselineskip}{ \large \normalfont \sffamily \colorist_bfseries: \thecontentslabel } ]{2em}} {\hspace*{-2em}} {\titlerule*[10pt]{\parbox{3pt}{\hspace*{-.25pt}\textcolor{main-text!15!paper}{.}}}\color{maintheme}\normalfont\sffamily\contentspage} @@ -442,7 +451,7 @@ { \titlecontents{section} [2em] % i.e., 0em (part) + 2em - {\addvspace{.3pc} \color{maintheme} \normalfont \sffamily \scshape } + {\addvspace{.3pc} \color{maintheme} \normalfont \sffamily \colorist_scshape: } {\contentslabel[ { \normalfont \sffamily \thecontentslabel } ]{1.75em}} {\hspace*{-1.75em}} {\titlerule*[10pt]{\parbox{3pt}{\textcolor{main-text!15!paper}{.}}}\color{maintheme}\normalfont\sffamily\contentspage} @@ -465,7 +474,7 @@ %%================================ \RequirePackage { enumitem } \setlistdepth{10} -\setlist{noitemsep, topsep=.33\topsep} +\setlist{noitemsep, topsep=.33\topsep-.5\parskip} \setlist[enumerate]{labelsep=*, leftmargin=*} \setlist[enumerate,1]{label=\arabic*$)$, ref = \arabic*$)$} @@ -478,8 +487,8 @@ \renewlist{itemize}{itemize}{10} \setlist[itemize]{leftmargin=*,label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\cdot$}} \AddLanguageSetting { \setlist[itemize,1]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\bullet$}} } -\AddLanguageSetting [french] { \setlist[itemize,1]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{---}} } -\setlist[itemize,2]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{--}} +\AddLanguageSetting [french] { \setlist[itemize,1]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{\rule[.2\baselineskip]{.8em}{.75pt}}} } +\setlist[itemize,2]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{\rule[.2\baselineskip]{.5em}{.75pt}}} \setlist[itemize,3]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\circ$}} \setlist[itemize,4]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\ast$}} @@ -548,9 +557,7 @@ heading_suffix "}\n" \newcommand*{\IndexDotfill} { - \nobreakspace\nobreakspace - \titlerule*[.67em]{\textcolor{main-text!15!paper}{.}} - \nobreakspace\nobreakspace + \leaders \hbox to .67em {\hss \textcolor{main-text!15!paper}{.} \hss} \hfill } \newcommand*{\IndexHeading}[1] { @@ -658,7 +665,7 @@ heading_suffix "}\n" \rlap{\vbox{\hbox{\parbox{\linewidth}{ {\thmname{#1}\thmnumber{\nobreakspace #2}} {\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}} - }}\hbox{\strut}\vspace{-2\parskip}}} + }}\hbox{\strut}\vspace{0pt}}} } } { @@ -686,7 +693,7 @@ heading_suffix "}\n" \rlap{\vbox{\hbox{\parbox{\linewidth}{ {\thmname{#1}\nobreakspace\thmnumber{\textup{#2}}} \thmnote{\normalfont\sffamily\color{main-text}\nobreakspace(#3)} - }}\hbox{\strut}\vspace{-2\parskip}}} + }}\hbox{\strut}\vspace{0pt}}} } } { @@ -744,7 +751,7 @@ heading_suffix "}\n" \tl_gset:Nn \g_crthm_combined_name_sep_tl { \textcolor{main-text}{-} } -\SetTheorem { theorem, lemma, proposition, corollary, property, axiom, construction, definition-theorem, definition-proposition } +\SetTheorem { theorem, lemma, proposition, corollary, property, axiom, construction, definition-theorem, definition-proposition, theorem-with-name } { name style = { heading style = { \color{orange}\colorist_bfseries:\g_colorist_title_font_common_tl\textsc } @@ -774,7 +781,7 @@ heading_suffix "}\n" \bool_if:NF \l__projlib_theorem_complexname_bool { - \SetTheorem { theorem, lemma, proposition, corollary, property, axiom, construction, definition-theorem, definition-proposition } + \SetTheorem { theorem, lemma, proposition, corollary, property, axiom, construction, definition-theorem, definition-proposition, theorem-with-name } { name style = { , crefname style = { \color{orange}\colorist_bfseries:\g_colorist_title_font_common_tl\textsc } @@ -916,7 +923,7 @@ heading_suffix "}\n" \tcolorboxenvironment { #1 } { #2 } } -\colorist_add_colorbox:nn { theorem, lemma, proposition, corollary, property, axiom, construction, definition-proposition, definition-theorem } +\colorist_add_colorbox:nn { theorem, lemma, proposition, corollary, property, axiom, construction, definition-proposition, definition-theorem, theorem-with-name } { enhanced~jigsaw, breakable, lines~before~break=3, left=3.5mm, right=3.5mm, @@ -1070,7 +1077,7 @@ heading_suffix "}\n" { \hook_gput_code:nnn { package/projlib-author/after } { colorist } { - \tl_gset:Nn \g__projlib_author_font_author_tl { \normalfont \scshape } + \tl_gset:Nn \g__projlib_author_font_author_tl { \normalfont \colorist_scshape: } \tl_gset:Nn \g__projlib_author_font_institute_tl { \large \normalfont } \tl_gset:Nn \g__projlib_author_font_address_tl { \large \normalfont \itshape } \tl_gset:Nn \g__projlib_author_font_curraddr_tl { \large \normalfont \itshape } @@ -1094,12 +1101,11 @@ heading_suffix "}\n" { \begin{center} \color{maintheme} - {\Large\sffamily\scshape \colorist_bfseries: \@title}\\\bigskip + {\Large\sffamily\colorist_scshape: \colorist_bfseries: \@title}\\\bigskip \color{main-text!80!paper} - {\scshape\@author}\par\smallskip + {\colorist_scshape:\@author}\par\smallskip {\@date} \end{center} - \ifx\@date\@empty\bigskip\fi \medskip } diff --git a/Master/texmf-dist/tex/latex/colorist/colorist.sty b/Master/texmf-dist/tex/latex/colorist/colorist.sty index 24f6910e3f3..9e7c85109cf 100644 --- a/Master/texmf-dist/tex/latex/colorist/colorist.sty +++ b/Master/texmf-dist/tex/latex/colorist/colorist.sty @@ -1,7 +1,7 @@ %% %% This is file `colorist/colorist.sty', %% generated with the docstrip utility. - +%% %% Copyright (C) 2021-2022 by Jinwen XU %% %% This is part of the colorist class series. @@ -19,7 +19,7 @@ \RequirePackage{l3keys2e} \ProvidesExplPackage {colorist} - {2022/04/24} {} + {2022/06/16} {} {A colorful style for articles and books} \keys_define:nn { colorist } @@ -30,17 +30,30 @@ , style .str_set:N = \l__colorist_style_str , style .initial:n = { fancy } + , use-style .str_set:N = \l__colorist_style_str + , use~style .str_set:N = \l__colorist_style_str + , use style .str_set:N = \l__colorist_style_str , fancy .meta:n = { style = fancy } , use-boldface .bool_set:N = \l__colorist_use_boldface_bool , use-boldface .initial:n = { false } , use~boldface .bool_set:N = \l__colorist_use_boldface_bool , use boldface .bool_set:N = \l__colorist_use_boldface_bool - , usebf .bool_set:N = \l__colorist_use_boldface_bool - , allow-boldface .bool_set:N = \l__colorist_use_boldface_bool - , allow~boldface .bool_set:N = \l__colorist_use_boldface_bool - , allow boldface .bool_set:N = \l__colorist_use_boldface_bool - , allowbf .bool_set:N = \l__colorist_use_boldface_bool + , title-in-boldface .bool_set:N = \l__colorist_use_boldface_bool + , title~in~boldface .bool_set:N = \l__colorist_use_boldface_bool + , title in boldface .bool_set:N = \l__colorist_use_boldface_bool + , title-in-bold .bool_set:N = \l__colorist_use_boldface_bool + , title~in~bold .bool_set:N = \l__colorist_use_boldface_bool + , title in bold .bool_set:N = \l__colorist_use_boldface_bool + + , use-scshape .bool_set:N = \l__colorist_use_scshape_bool + , use-scshape .initial:n = { false } + , use~scshape .bool_set:N = \l__colorist_use_scshape_bool + , use scshape .bool_set:N = \l__colorist_use_scshape_bool + , title-in-scshape .bool_set:N = \l__colorist_use_scshape_bool + , title~in~scshape .bool_set:N = \l__colorist_use_scshape_bool + , title in scshape .bool_set:N = \l__colorist_use_scshape_bool + , runin .bool_set:N = \l__colorist_runin_bool , runin .initial:n = { false } diff --git a/Master/texmf-dist/tex/latex/einfart/einfart.cls b/Master/texmf-dist/tex/latex/einfart/einfart.cls index 37a460b9d01..c27101fa25e 100644 --- a/Master/texmf-dist/tex/latex/einfart/einfart.cls +++ b/Master/texmf-dist/tex/latex/einfart/einfart.cls @@ -1,7 +1,7 @@ %% %% This is file `einfart/einfart.cls', %% generated with the docstrip utility. - +%% %% Copyright (C) 2021-2022 by Jinwen XU %% %% This is part of the minimalist class series. @@ -19,7 +19,7 @@ \RequirePackage{l3keys2e} \ProvidesExplClass {einfart} - {2022/04/24} {} + {2022/06/16} {} {A simple and clear article style} \tl_const:Nn \l__minimclass_base_class_tl { article } @@ -250,43 +250,39 @@ \__minimclass_load_file_or_config:Nnn \l__minimclass_load_custom_font_file_latin_bool { \l__minimclass_custom_font_file_latin_str } { - \__minimclass_if_font_exist:nnn { Palatino~Linotype } + \bool_if:NTF \l__projlib_font_useosf_bool { - \bool_if:NTF \l__projlib_font_useosf_bool - { - \setmainfont { Palatino~Linotype } [ Numbers = OldStyle ] - } - { - \setmainfont { Palatino~Linotype } - } + \setmainfont { TeXGyrePagellaX-Regular.otf } + [ + BoldFont = TeXGyrePagellaX-Bold.otf , + ItalicFont = TeXGyrePagellaX-Italic.otf , + BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf , + Numbers = OldStyle , + ] + \setsansfont { SourceSansPro-Regular.otf } + [ + Scale = 1.05 , + BoldFont = SourceSansPro-Semibold.otf , + ItalicFont = SourceSansPro-RegularIt.otf , + BoldItalicFont = SourceSansPro-SemiboldIt.otf , + Numbers = OldStyle , + ] } { - \bool_if:NTF \l__projlib_font_useosf_bool - { - \setmainfont { TeXGyrePagellaX-Regular.otf } - [ - BoldFont = TeXGyrePagellaX-Bold.otf , - ItalicFont = TeXGyrePagellaX-Italic.otf , - BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf , - Numbers = OldStyle , - ] - } - { - \setmainfont { TeXGyrePagellaX-Regular.otf } - [ - BoldFont = TeXGyrePagellaX-Bold.otf , - ItalicFont = TeXGyrePagellaX-Italic.otf , - BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf , - ] - } + \setmainfont { TeXGyrePagellaX-Regular.otf } + [ + BoldFont = TeXGyrePagellaX-Bold.otf , + ItalicFont = TeXGyrePagellaX-Italic.otf , + BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf , + ] + \setsansfont { SourceSansPro-Regular.otf } + [ + Scale = 1.05 , + BoldFont = SourceSansPro-Semibold.otf , + ItalicFont = SourceSansPro-RegularIt.otf , + BoldItalicFont = SourceSansPro-SemiboldIt.otf , + ] } - \setsansfont { SourceSansPro-Regular.otf } - [ - Scale = 1.05 , - BoldFont = SourceSansPro-Bold.otf , - ItalicFont = SourceSansPro-RegularIt.otf , - BoldItalicFont = SourceSansPro-BoldIt.otf , - ] \setmonofont { NewCMMono10-Regular.otf } [ Scale = 1.05 , @@ -567,10 +563,8 @@ { \bool_if:NF \g_projlib_font_already_set_bool { - \bool_if:NTF \l__minimclass_fast_bool - { - \RequirePackage { amssymb } - } + \RequirePackage { amssymb } + \bool_if:NF \l__minimclass_fast_bool { \PassOptionsToPackage { warnings-off = { mathtools-colon, mathtools-overbracket } } { unicode-math } \RequirePackage { unicode-math } @@ -582,6 +576,11 @@ ] \setmathfont { latinmodern-math.otf } [ + range = { \ast } , + Scale = 1.10 + ] + \setmathfont { latinmodern-math.otf } + [ range = { frak, bffrak } ] \DeclareMathAlphabet{\mathcal}{OMS}{cmsy}{m}{n} @@ -594,17 +593,34 @@ [ range = { it / { Latin, latin }, bfit / { Latin, latin }, up / num, bfup / num } ] + \setmathfont { KpMath-Regular.otf } [ range = {} ] + + \sys_if_engine_luatex:T + { + \mathitalicsmode=1 + } \hook_gput_code:nnn { begindocument } { minimclass } { - \NewCommandCopy \minimclass_backup_mid: \mid - \RenewDocumentCommand \mid {} - { \skip_horizontal:n {-.1em} \minimclass_backup_mid: \skip_horizontal:n {-.1em} } - \NewCommandCopy \minimclass_backup_nmid: \nmid - \RenewDocumentCommand \nmid {} - { \skip_horizontal:n {-.1em} \minimclass_backup_nmid: \skip_horizontal:n {-.1em} } + \cs_gset_eq:NN \overline \wideoverbar + \cs_gset_eq:NN \square \mdwhtsquare } + % A temporary hack proposed in https://tex.stackexchange.com/a/647789 + \hook_gput_code:nnn { begindocument } { minimclass } + { + \NewCommandCopy\unicodevdots\vdots + \RenewDocumentCommand{\vdots}{}{\mathrel{\loweredvdots}} + } + \newcommand{\loweredvdots}{\mathpalette\loweredvdots@\relax} + \newcommand{\loweredvdots@}[2]{% + \begingroup + \sbox\z@{$\m@th#1\unicodevdots$}% + \vrule width \z@ height 2.25\ht\z@ depth 0.012\ht\z@ + \raisebox{0.25\height}{\usebox\z@}% + \endgroup + } + \RequirePackage { tikz-cd } \tikzcdset { arrow~style = tikz, diagrams = { >={Stealth[round,length=3.4pt,width=6.15pt,inset=2.25pt]} } } @@ -673,21 +689,27 @@ } } +\char_set_catcode_active:n { `\· } +\cs_new_protected:Npn · { \ensuremath\cdot } + \PassOptionsToPackage { all } { nowidow } \RequirePackage { nowidow } -\RequirePackage { regexpatch } -\skip_new:N \g_minimclass_parfillskip_skip -\xpatchcmd{\@trivlist}{\@flushglue}{\g_minimclass_parfillskip_skip}{}{} -\hook_gput_code:nnn { begindocument } { minimclass } +\sys_if_engine_xetex:T { - \skip_gset:Nn \g_minimclass_parfillskip_skip { 0pt plus \dim_eval:n { \linewidth - 2\parindent } } - \skip_gset_eq:NN \parfillskip \g_minimclass_parfillskip_skip + \RequirePackage { regexpatch } + \skip_new:N \g_minimclass_parfillskip_skip + \xpatchcmd{\@trivlist}{\@flushglue}{\g_minimclass_parfillskip_skip}{}{} + \hook_gput_code:nnn { begindocument } { minimclass } + { + \skip_gset:Nn \g_minimclass_parfillskip_skip { 0pt plus \dim_eval:n { \linewidth - 3em } } + \skip_gset_eq:NN \parfillskip \g_minimclass_parfillskip_skip + } } \hook_gput_code:nnn { begindocument/before } { minimclass } { - \@ifpackageloaded { biblatex } + \IfPackageLoadedTF { biblatex } { \PassOptionsToPackage { biblatex } { embrac } } {} diff --git a/Master/texmf-dist/tex/latex/lebhart/lebhart.cls b/Master/texmf-dist/tex/latex/lebhart/lebhart.cls index 7cdec242e0c..9635010f702 100644 --- a/Master/texmf-dist/tex/latex/lebhart/lebhart.cls +++ b/Master/texmf-dist/tex/latex/lebhart/lebhart.cls @@ -1,7 +1,7 @@ %% %% This is file `lebhart/lebhart.cls', %% generated with the docstrip utility. - +%% %% Copyright (C) 2021-2022 by Jinwen XU %% %% This is part of the colorist class series. @@ -19,7 +19,7 @@ \RequirePackage{l3keys2e} \ProvidesExplClass {lebhart} - {2022/04/24} {} + {2022/06/16} {} {A colorful article style} \tl_const:Nn \l__colorclass_base_class_tl { article } @@ -229,43 +229,39 @@ \__colorclass_load_file_or_config:Nnn \l__colorclass_load_custom_font_file_latin_bool { \l__colorclass_custom_font_file_latin_str } { - \__colorclass_if_font_exist:nnn { Palatino~Linotype } + \bool_if:NTF \l__projlib_font_useosf_bool { - \bool_if:NTF \l__projlib_font_useosf_bool - { - \setmainfont { Palatino~Linotype } [ Numbers = OldStyle ] - } - { - \setmainfont { Palatino~Linotype } - } + \setmainfont { TeXGyrePagellaX-Regular.otf } + [ + BoldFont = TeXGyrePagellaX-Bold.otf , + ItalicFont = TeXGyrePagellaX-Italic.otf , + BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf , + Numbers = OldStyle , + ] + \setsansfont { SourceSansPro-Regular.otf } + [ + Scale = 1.05 , + BoldFont = SourceSansPro-Semibold.otf , + ItalicFont = SourceSansPro-RegularIt.otf , + BoldItalicFont = SourceSansPro-SemiboldIt.otf , + Numbers = OldStyle , + ] } { - \bool_if:NTF \l__projlib_font_useosf_bool - { - \setmainfont { TeXGyrePagellaX-Regular.otf } - [ - BoldFont = TeXGyrePagellaX-Bold.otf , - ItalicFont = TeXGyrePagellaX-Italic.otf , - BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf , - Numbers = OldStyle , - ] - } - { - \setmainfont { TeXGyrePagellaX-Regular.otf } - [ - BoldFont = TeXGyrePagellaX-Bold.otf , - ItalicFont = TeXGyrePagellaX-Italic.otf , - BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf , - ] - } + \setmainfont { TeXGyrePagellaX-Regular.otf } + [ + BoldFont = TeXGyrePagellaX-Bold.otf , + ItalicFont = TeXGyrePagellaX-Italic.otf , + BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf , + ] + \setsansfont { SourceSansPro-Regular.otf } + [ + Scale = 1.05 , + BoldFont = SourceSansPro-Semibold.otf , + ItalicFont = SourceSansPro-RegularIt.otf , + BoldItalicFont = SourceSansPro-SemiboldIt.otf , + ] } - \setsansfont { SourceSansPro-Regular.otf } - [ - Scale = 1.05 , - BoldFont = SourceSansPro-Bold.otf , - ItalicFont = SourceSansPro-RegularIt.otf , - BoldItalicFont = SourceSansPro-BoldIt.otf , - ] \setmonofont { NewCMMono10-Regular.otf } [ Scale = 1.05 , @@ -544,10 +540,8 @@ { \bool_if:NF \g_projlib_font_already_set_bool { - \bool_if:NTF \l__colorclass_fast_bool - { - \RequirePackage { amssymb } - } + \RequirePackage { amssymb } + \bool_if:NF \l__colorclass_fast_bool { \PassOptionsToPackage { warnings-off = { mathtools-colon, mathtools-overbracket } } { unicode-math } \RequirePackage { unicode-math } @@ -559,6 +553,11 @@ ] \setmathfont { latinmodern-math.otf } [ + range = { \ast } , + Scale = 1.10 + ] + \setmathfont { latinmodern-math.otf } + [ range = { frak, bffrak } ] \DeclareMathAlphabet{\mathcal}{OMS}{cmsy}{m}{n} @@ -571,17 +570,34 @@ [ range = { it / { Latin, latin }, bfit / { Latin, latin }, up / num, bfup / num } ] + \setmathfont { KpMath-Regular.otf } [ range = {} ] + + \sys_if_engine_luatex:T + { + \mathitalicsmode=1 + } \hook_gput_code:nnn { begindocument } { colorclass } { - \NewCommandCopy \colorclass_backup_mid: \mid - \RenewDocumentCommand \mid {} - { \skip_horizontal:n {-.1em} \colorclass_backup_mid: \skip_horizontal:n {-.1em} } - \NewCommandCopy \colorclass_backup_nmid: \nmid - \RenewDocumentCommand \nmid {} - { \skip_horizontal:n {-.1em} \colorclass_backup_nmid: \skip_horizontal:n {-.1em} } + \cs_gset_eq:NN \overline \wideoverbar + \cs_gset_eq:NN \square \mdwhtsquare } + % A temporary hack proposed in https://tex.stackexchange.com/a/647789 + \hook_gput_code:nnn { begindocument } { minimclass } + { + \NewCommandCopy\unicodevdots\vdots + \RenewDocumentCommand{\vdots}{}{\mathrel{\loweredvdots}} + } + \newcommand{\loweredvdots}{\mathpalette\loweredvdots@\relax} + \newcommand{\loweredvdots@}[2]{% + \begingroup + \sbox\z@{$\m@th#1\unicodevdots$}% + \vrule width \z@ height 2.25\ht\z@ depth 0.012\ht\z@ + \raisebox{0.25\height}{\usebox\z@}% + \endgroup + } + \RequirePackage { tikz-cd } \tikzcdset { arrow~style = tikz, diagrams = { >={Stealth[round,length=3.4pt,width=6.15pt,inset=2.25pt]} } } @@ -650,21 +666,27 @@ } } +\char_set_catcode_active:n { `\· } +\cs_new_protected:Npn · { \ensuremath\cdot } + \PassOptionsToPackage { all } { nowidow } \RequirePackage { nowidow } -\RequirePackage { regexpatch } -\skip_new:N \g_colorclass_parfillskip_skip -\xpatchcmd{\@trivlist}{\@flushglue}{\g_colorclass_parfillskip_skip}{}{} -\hook_gput_code:nnn { begindocument } { colorclass } +\sys_if_engine_xetex:T { - \skip_gset:Nn \g_colorclass_parfillskip_skip { 0pt plus \dim_eval:n { \linewidth - 2\parindent } } - \skip_gset_eq:NN \parfillskip \g_colorclass_parfillskip_skip + \RequirePackage { regexpatch } + \skip_new:N \g_colorclass_parfillskip_skip + \xpatchcmd{\@trivlist}{\@flushglue}{\g_colorclass_parfillskip_skip}{}{} + \hook_gput_code:nnn { begindocument } { colorclass } + { + \skip_gset:Nn \g_colorclass_parfillskip_skip { 0pt plus \dim_eval:n { \linewidth - 3em } } + \skip_gset_eq:NN \parfillskip \g_colorclass_parfillskip_skip + } } \hook_gput_code:nnn { begindocument/before } { colorclass } { - \@ifpackageloaded { biblatex } + \IfPackageLoadedTF { biblatex } { \PassOptionsToPackage { biblatex } { embrac } } {} diff --git a/Master/texmf-dist/tex/latex/minimalist/minimalist-classical.sty b/Master/texmf-dist/tex/latex/minimalist/minimalist-classical.sty index 5fd710c03e9..cb0e3df249d 100644 --- a/Master/texmf-dist/tex/latex/minimalist/minimalist-classical.sty +++ b/Master/texmf-dist/tex/latex/minimalist/minimalist-classical.sty @@ -1,7 +1,7 @@ %% %% This is file `minimalist/minimalist-classical.sty', %% generated with the docstrip utility. - +%% %% Copyright (C) 2021-2022 by Jinwen XU %% %% This is part of the minimalist class series. @@ -19,10 +19,10 @@ \RequirePackage{l3keys2e} \ProvidesExplPackage {minimalist-classical} - {2022/04/24} {} + {2022/06/16} {} {The classical style of minimalist} -\@ifpackageloaded { minimalist } {} +\IfPackageLoadedTF { minimalist } {} { \msg_new:nnn { \@currname } { minimalist-not-loaded } @@ -34,6 +34,7 @@ %%================================ %% Title fonts %%================================ +\RequirePackage { relsize } \RequirePackage { anyfontsize } \NewCommandCopy \minimalist_original_bfseries: \bfseries @@ -57,6 +58,14 @@ \cs_new:Nn \minimalist_bfseries: {} } +\bool_if:NTF \l__minimalist_use_scshape_bool + { + \cs_new:Nn \minimalist_scshape: { \scshape } + } + { + \cs_new:Nn \minimalist_scshape: {} + } + \tl_new:N \g_minimalist_title_font_common_tl \tl_new:N \g_minimalist_title_font_part_tl @@ -67,11 +76,11 @@ \tl_new:N \g_minimalist_title_font_paragraph_tl \tl_gset:Nn \g_minimalist_title_font_part_tl { \minimalist_bfseries: \g_minimalist_title_font_common_tl } -\tl_gset:Nn \g_minimalist_title_font_chapter_tl { \minimalist_bfseries: \g_minimalist_title_font_common_tl \scshape } +\tl_gset:Nn \g_minimalist_title_font_chapter_tl { \minimalist_bfseries: \g_minimalist_title_font_common_tl \minimalist_scshape: } \tl_gset:Nn \g_minimalist_title_font_section_tl { \minimalist_bfseries: } \tl_gset:Nn \g_minimalist_title_font_subsection_tl { \minimalist_bfseries: } \tl_gset:Nn \g_minimalist_title_font_subsubsection_tl { \minimalist_bfseries: \itshape } -\tl_gset:Nn \g_minimalist_title_font_paragraph_tl { \minimalist_bfseries: \scshape } +\tl_gset:Nn \g_minimalist_title_font_paragraph_tl { \minimalist_bfseries: \minimalist_scshape: } \bool_if:NF \l__minimalist_fast_bool { @@ -251,7 +260,7 @@ \renewcommand{\chaptermark}[1]{\markboth{\textsc{#1}}{\textsc{#1}}} \fi \renewcommand*{\sectionmark}[1]{ - \markright{\protect\g_minimalist_section_decoration_char_tl\nobreakspace\arabic{section}\nobreakspace\protect\g_minimalist_section_decoration_char_tl\nobreakspace\nobreakspace\nobreakspace#1}} + \markright{\protect\g_minimalist_section_decoration_char_tl\nobreakspace\thesection\nobreakspace\protect\g_minimalist_section_decoration_char_tl\nobreakspace\nobreakspace\nobreakspace#1}} } { \if@twoside @@ -264,16 +273,33 @@ %%================================ %% Title format %%================================ -\RequirePackage [ explicit, newparttoc, nobottomtitles* ] { titlesec } +\RequirePackage [ explicit, newparttoc ] { titlesec } \PassOptionsToPackage { normalem } { ulem } \RequirePackage { ulem } -\cs_generate_variant:Nn \seq_set_split:Nnn { Nnx } -\cs_new:Nn \minimalist_apply_title_numbering_style:n +\cs_new_protected:Nn \minimalist_apply_title_numbering_style_static:n { #1 } +\cs_new_protected:Nn \minimalist_apply_title_numbering_style:n + { + \group_begin: + \tl_set:Nx \l_tmpa_tl { #1 } + \regex_replace_all:nnN { (\w) } { \c{minimalist_original_bfseries:}{\1} } \l_tmpa_tl + \regex_replace_all:nnN { (\d) } { {\c{usefont}{U}{zeur}{b}{n}\1} } \l_tmpa_tl + \exp_args:Nnx \regex_count:nnN { \. } {#1} \l_tmpa_int + \int_case:nn { \l_tmpa_int } + { + { 0 } { \textcolor { main-text!24!paper } } + { 1 } { \textcolor { main-text!39!paper } } + { 2 } { \textcolor { main-text!39!paper } } + { 3 } { \smaller[2] \textcolor { main-text!24!paper } } + } + \l_tmpa_tl + \group_end: + } + \newcommand{\partstring}{\MakeUppercase{{\partname\nobreakspace\protect\thepart}}} \AddLanguageSetting @@ -305,7 +331,7 @@ \g_minimalist_title_font_part_tl\filleft} {\partstring} {1em} - {\fontsize{20}{0}\selectfont\MakeUppercase{#1}} + {\fontsize{20}{24}\selectfont\MakeUppercase{#1}} [\ResumeLineNumbers] \titleformat{name=\part,numberless}[display] {\thispagestyle{part} @@ -314,7 +340,7 @@ \g_minimalist_title_font_part_tl\filleft} {\phantom{\MakeUppercase{\partname}}} {1em} - {\fontsize{20}{0}\selectfont\MakeUppercase{#1}} + {\fontsize{20}{24}\selectfont\MakeUppercase{#1}} [\ResumeLineNumbers] \titlespacing*{\part}{0pt}{5em}{6em} %% Text after part @@ -454,7 +480,7 @@ \titlecontents{part} [0em] {\addvspace{1.5pc}\filcenter\normalfont} - { \minimalist_apply_title_numbering_style:n { \thecontentslabel } \nopagebreak\\\nopagebreak\uppercase} + { \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } \nopagebreak\\\nopagebreak\uppercase} {} {} % without page number [\addvspace{.5pc}] @@ -464,25 +490,25 @@ \titlecontents{chapter} [2em] % i.e., 0em (part) + 2em {\addvspace{.5pc}\normalfont} - {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{2em}} + {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{2em}} {\hspace*{-2em}} {\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage} \titlecontents{section} [5em] % i.e., 2em (chapter) + 3em {\normalfont} - {\contentslabel[\textcolor{main-text!27!paper}{\small\g_minimalist_section_decoration_char_tl}\,\textcolor{main-text!90!paper}{ \minimalist_apply_title_numbering_style:n { \thecontentslabel } }\,\textcolor{main-text!27!paper}{\small\g_minimalist_section_decoration_char_tl}]{2.75em}} + {\contentslabel[\textcolor{main-text!27!paper}{\small\g_minimalist_section_decoration_char_tl}\,\textcolor{main-text!90!paper}{ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } }\,\textcolor{main-text!27!paper}{\small\g_minimalist_section_decoration_char_tl}]{2.75em}} {\hspace*{-2.75em}} {\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage} \titlecontents{subsection} [8em] % i.e., 5em (section) + 3em {\normalfont} - {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{2.75em}} + {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{2.75em}} {\hspace*{-2.75em}} {\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage} \titlecontents{subsubsection} [12em] % i.e., 8em (subsection) + 4em {\normalfont} - {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{3.75em}} + {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{3.75em}} {\hspace*{-3.75em}} {\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage} } @@ -490,19 +516,19 @@ \titlecontents{section} [2em] % i.e., 0em (part) + 2em {\normalfont} - {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{1.75em}} + {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{1.75em}} {\hspace*{-1.75em}} {\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage} \titlecontents{subsection} [4.75em] % i.e., 2em (section) + 2.75em {\normalfont} - {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{2.50em}} + {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{2.50em}} {\hspace*{-2.50em}} {\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage} \titlecontents{subsubsection} [8.25em] % i.e., 4.75em (subsection) + 3.5em {\normalfont} - {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{3.25em}} + {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{3.25em}} {\hspace*{-3.25em}} {\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage} } @@ -512,7 +538,7 @@ %%================================ \RequirePackage { enumitem } \setlistdepth{10} -\setlist{noitemsep, topsep=.33\topsep} +\setlist{noitemsep, topsep=.33\topsep-.5\parskip} \setlist[enumerate]{labelsep=*, leftmargin=*} \setlist[enumerate,1]{label=\arabic*$)$, ref = \arabic*$)$} @@ -530,8 +556,8 @@ \renewlist{itemize}{itemize}{10} \setlist[itemize]{leftmargin=*,label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\cdot$}} \AddLanguageSetting { \setlist[itemize,1]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\bullet$}} } -\AddLanguageSetting [french] { \setlist[itemize,1]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{---}} } -\setlist[itemize,2]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{--}} +\AddLanguageSetting [french] { \setlist[itemize,1]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{\rule[.2\baselineskip]{.8em}{.75pt}}} } +\setlist[itemize,2]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{\rule[.2\baselineskip]{.5em}{.75pt}}} \setlist[itemize,3]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\circ$}} \setlist[itemize,4]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\ast$}} @@ -600,16 +626,14 @@ heading_suffix "}\n" \newcommand*{\IndexDotfill} { - \nobreakspace\nobreakspace - \titlerule*[.67em]{\textcolor{main-text!15!paper}{.}} - \nobreakspace\nobreakspace + \leaders \hbox to .67em {\hss \textcolor{main-text!15!paper}{.} \hss} \hfill } \newcommand*{\IndexHeading}[1] { \str_if_eq:nnTF { #1 } { Symbols } { \tl_set:Nn \l_tmpa_tl { \index_symbols_name } } { \tl_set:Nn \l_tmpa_tl { #1 } } - \centerline{ \g_minimalist_title_font_common_tl \minimalist_apply_title_numbering_style:n { \l_tmpa_tl } } + \centerline{ \g_minimalist_title_font_common_tl \minimalist_apply_title_numbering_style_static:n { \l_tmpa_tl } } \nopagebreak \par \vspace{.3\baselineskip} @@ -668,7 +692,7 @@ heading_suffix "}\n" \rlap{\vbox{\hbox{\parbox{\linewidth}{ {\thmname{#1}\thmnumber{\nobreakspace #2}} \thmnote{\hspace{.4em}\textcolor{main-text!27!paper}{ \l_minimalist_sep_bar }\hspace{.4em}\color{main-text!50!paper}$($#3$)$} - }}\hbox{\strut}\vspace{-2\parskip}}} + }}\hbox{\strut}\vspace{0pt}}}\vspace{-2\parskip} \pushQED{\qed} } } @@ -712,7 +736,7 @@ heading_suffix "}\n" \RequirePackage { projlib-theorem } -\exp_args:No \SetTheorem { \c_projlib_theorem_supported_clist } +\exp_args:No \SetTheorem { \c_projlib_theorem_supported_clist, theorem-with-name } { name style = { , heading style = { @@ -753,7 +777,7 @@ heading_suffix "}\n" \bool_if:NF \l__projlib_theorem_complexname_bool { - \exp_args:No \SetTheorem { \c_projlib_theorem_supported_clist } + \exp_args:No \SetTheorem { \c_projlib_theorem_supported_clist, theorem-with-name } { name style = { , crefname style = { @@ -783,17 +807,7 @@ heading_suffix "}\n" , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl } , numbering style = { - , english = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , french = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , ngerman = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , italian = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , portuguese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , brazilian = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , spanish = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , schinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , tchinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , japanese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl + \minimalist_bfseries:\g_minimalist_title_font_common_tl } } } @@ -830,17 +844,7 @@ heading_suffix "}\n" , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl } , numbering style = { - , english = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , french = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , ngerman = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , italian = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , portuguese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , brazilian = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , spanish = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , schinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , tchinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , japanese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl + \minimalist_bfseries:\g_minimalist_title_font_common_tl } } } @@ -878,7 +882,7 @@ heading_suffix "}\n" { \hook_gput_code:nnn { package/projlib-author/after } { minimalist } { - \tl_gset:Nn \g__projlib_author_font_author_tl { \normalfont \scshape } + \tl_gset:Nn \g__projlib_author_font_author_tl { \normalfont \minimalist_scshape: } \tl_gset:Nn \g__projlib_author_font_institute_tl { \large \normalfont } \tl_gset:Nn \g__projlib_author_font_address_tl { \large \normalfont \itshape } \tl_gset:Nn \g__projlib_author_font_curraddr_tl { \large \normalfont \itshape } @@ -909,18 +913,18 @@ heading_suffix "}\n" \let\footnote\thanks {\minimalist_bfseries:\@title}\\\medskip \color{main-text!80!paper} - {\small\scshape\@author} + {\small\minimalist_scshape:\@author} \par\vspace{-\parskip}\vspace{2pt} {\small\@date} \end{flushright} - % \vspace{-\parskip} \vspace{-.5\baselineskip} - \ifx\@date\@empty - \vspace{\baselineskip} - \vspace{1.2\parskip} - \else + \projlib_author_if_content_empty:nTF { \@date } + { + \vspace{-.2\baselineskip} + } + { \vspace{-.5\baselineskip} - \fi + } {\textcolor{main-text!27!paper}{\rule{\textwidth}{0.75pt}}\par} \ResumeLineNumbers } @@ -934,7 +938,7 @@ heading_suffix "}\n" { \LocallyStopLineNumbers \begin{flushright} - { \g_minimalist_title_font_section_tl \scshape \small\abstractname}\par + { \g_minimalist_title_font_section_tl \minimalist_scshape: \small\abstractname}\par \vspace{-\parskip} \vspace{-.25\baselineskip} \begin{minipage}[t]{.833\textwidth} @@ -972,7 +976,7 @@ heading_suffix "}\n" \LocallyStopLineNumbers \vspace{-.5\baselineskip} \begin{flushright} - {\minimalist_bfseries:\scshape\small\keywordname}\par + {\minimalist_bfseries:\minimalist_scshape:\small\keywordname}\par \vspace{-\parskip} \vspace{-.30\baselineskip} \begin{minipage}[t]{.833\textwidth} @@ -995,6 +999,18 @@ heading_suffix "}\n" \PassOptionsToPackage { amsfashion } { projlib-author } \RequirePackage { projlib-author } +%%================================ +%% Special adjustment +%%================================ +\crefformat { chapter } { #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 } +\labelcrefformat { chapter } { #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 } +\crefformat { section } { #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 } +\labelcrefformat { section } { #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 } +\crefformat { subsection } { #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 } +\labelcrefformat { subsection } { #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 } +\crefformat { subsubsection } { #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 } +\labelcrefformat { subsubsection } { #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 } + \endinput %% %% End of file `minimalist/minimalist-classical.sty'. diff --git a/Master/texmf-dist/tex/latex/minimalist/minimalist-plain.sty b/Master/texmf-dist/tex/latex/minimalist/minimalist-plain.sty index 28dbd470e83..6afa15b14ed 100644 --- a/Master/texmf-dist/tex/latex/minimalist/minimalist-plain.sty +++ b/Master/texmf-dist/tex/latex/minimalist/minimalist-plain.sty @@ -1,7 +1,7 @@ %% %% This is file `minimalist/minimalist-plain.sty', %% generated with the docstrip utility. - +%% %% Copyright (C) 2021-2022 by Jinwen XU %% %% This is part of the minimalist class series. @@ -19,10 +19,10 @@ \RequirePackage{l3keys2e} \ProvidesExplPackage {minimalist-plain} - {2022/04/24} {} + {2022/06/16} {} {The plain style of minimalist} -\@ifpackageloaded { minimalist } {} +\IfPackageLoadedTF { minimalist } {} { \msg_new:nnn { \@currname } { minimalist-not-loaded } @@ -34,6 +34,7 @@ %%================================ %% Title fonts %%================================ +\RequirePackage { relsize } \RequirePackage { anyfontsize } \NewCommandCopy \minimalist_original_bfseries: \bfseries @@ -57,6 +58,14 @@ \cs_new:Nn \minimalist_bfseries: {} } +\bool_if:NTF \l__minimalist_use_scshape_bool + { + \cs_new:Nn \minimalist_scshape: { \scshape } + } + { + \cs_new:Nn \minimalist_scshape: {} + } + \tl_new:N \g_minimalist_title_font_common_tl \tl_new:N \g_minimalist_title_font_part_tl @@ -67,11 +76,11 @@ \tl_new:N \g_minimalist_title_font_paragraph_tl \tl_gset:Nn \g_minimalist_title_font_part_tl { \minimalist_bfseries: \g_minimalist_title_font_common_tl } -\tl_gset:Nn \g_minimalist_title_font_chapter_tl { \minimalist_bfseries: \g_minimalist_title_font_common_tl \scshape } -\tl_gset:Nn \g_minimalist_title_font_section_tl { \minimalist_bfseries: \g_minimalist_title_font_common_tl \scshape } -\tl_gset:Nn \g_minimalist_title_font_subsection_tl { \minimalist_bfseries: \g_minimalist_title_font_common_tl \scshape } +\tl_gset:Nn \g_minimalist_title_font_chapter_tl { \minimalist_bfseries: \g_minimalist_title_font_common_tl \minimalist_scshape: } +\tl_gset:Nn \g_minimalist_title_font_section_tl { \minimalist_bfseries: \g_minimalist_title_font_common_tl \minimalist_scshape: } +\tl_gset:Nn \g_minimalist_title_font_subsection_tl { \minimalist_bfseries: \g_minimalist_title_font_common_tl \minimalist_scshape: } \tl_gset:Nn \g_minimalist_title_font_subsubsection_tl { \minimalist_bfseries: \g_minimalist_title_font_common_tl } -\tl_gset:Nn \g_minimalist_title_font_paragraph_tl { \minimalist_bfseries: \g_minimalist_title_font_common_tl \scshape } +\tl_gset:Nn \g_minimalist_title_font_paragraph_tl { \minimalist_bfseries: \g_minimalist_title_font_common_tl \minimalist_scshape: } \bool_if:NF \l__minimalist_fast_bool { @@ -134,7 +143,7 @@ \rlap { \nobreakspace \nobreakspace \nobreakspace \nobreakspace - \textcolor { main-text!75!paper } { \minimalist_bfseries: \thepage } + \textcolor { main-text!75!paper } { \thepage } } } \fancyfoot[LE] @@ -142,7 +151,7 @@ \leavevmode \llap { - \textcolor { main-text!75!paper } { \minimalist_bfseries: \thepage } + \textcolor { main-text!75!paper } { \thepage } \nobreakspace \nobreakspace \nobreakspace \nobreakspace } \textcolor { main-text!30!paper } { \small \l_minimalist_leftmark_tl } @@ -154,7 +163,7 @@ \rlap { \nobreakspace \nobreakspace \nobreakspace \nobreakspace - \textcolor { main-text!75!paper } { \minimalist_bfseries: \thepage } + \textcolor { main-text!75!paper } { \thepage } } } \fi @@ -172,7 +181,7 @@ \rlap { \nobreakspace \nobreakspace \nobreakspace \nobreakspace - \textcolor { main-text!75!paper } { \minimalist_bfseries: \thepage } + \textcolor { main-text!75!paper } { \thepage } } } \fancyfoot[LE] @@ -180,7 +189,7 @@ \leavevmode \llap { - \textcolor { main-text!75!paper } { \minimalist_bfseries: \thepage } + \textcolor { main-text!75!paper } { \thepage } \nobreakspace \nobreakspace \nobreakspace \nobreakspace } \nobreakspace @@ -192,7 +201,7 @@ \rlap { \nobreakspace \nobreakspace \nobreakspace \nobreakspace - \textcolor { main-text!75!paper } { \minimalist_bfseries: \thepage } + \textcolor { main-text!75!paper } { \thepage } } } \fi @@ -237,7 +246,7 @@ \renewcommand{\chaptermark}[1]{\markboth{\textsc{#1}}{\textsc{#1}}} \fi \renewcommand*{\sectionmark}[1]{ - \markright{\protect\g_minimalist_section_decoration_char_tl\nobreakspace\arabic{section}\nobreakspace\protect\g_minimalist_section_decoration_char_tl\nobreakspace\nobreakspace\nobreakspace#1}} + \markright{\protect\g_minimalist_section_decoration_char_tl\nobreakspace\thesection\nobreakspace\protect\g_minimalist_section_decoration_char_tl\nobreakspace\nobreakspace\nobreakspace#1}} } { \if@twoside @@ -250,17 +259,34 @@ %%================================ %% Title format %%================================ -\RequirePackage [ explicit, newparttoc, nobottomtitles* ] { titlesec } +\RequirePackage [ explicit, newparttoc ] { titlesec } \PassOptionsToPackage { normalem } { ulem } \RequirePackage { ulem } -\cs_generate_variant:Nn \seq_set_split:Nnn { Nnx } -\cs_new:Nn \minimalist_apply_title_numbering_style:n +\cs_new_protected:Nn \minimalist_apply_title_numbering_style_static:n { \tl_set:Nx \l_tmpa_tl { #1 } - \regex_replace_all:nnN { (\w) } { \c{textbf}{\1} } \l_tmpa_tl + \regex_replace_all:nnN { (\w) } { \c{minimalist_original_bfseries:}{\1} } \l_tmpa_tl \regex_replace_all:nnN { (\d) } { {\c{usefont}{U}{zeur}{b}{n}\1} } \l_tmpa_tl - \textcolor { main-text!39!paper } { \l_tmpa_tl } + \textcolor { main-text!39!paper } { \normalfont \l_tmpa_tl } + } + +\cs_new_protected:Nn \minimalist_apply_title_numbering_style:n + { + \group_begin: + \tl_set:Nx \l_tmpa_tl { #1 } + \regex_replace_all:nnN { (\w) } { \c{minimalist_original_bfseries:}{\1} } \l_tmpa_tl + \regex_replace_all:nnN { (\d) } { {\c{usefont}{U}{zeur}{b}{n}\1} } \l_tmpa_tl + \exp_args:Nnx \regex_count:nnN { \. } {#1} \l_tmpa_int + \int_case:nn { \l_tmpa_int } + { + { 0 } { \textcolor { main-text!24!paper } } + { 1 } { \textcolor { main-text!39!paper } } + { 2 } { \textcolor { main-text!39!paper } } + { 3 } { \smaller[2] \textcolor { main-text!24!paper } } + } + \l_tmpa_tl + \group_end: } \newcommand{\partstring}{\MakeUppercase{{\partname\nobreakspace\protect\thepart}}} @@ -294,7 +320,7 @@ \g_minimalist_title_font_part_tl\filleft} {\partstring} {1em} - {\fontsize{20}{0}\selectfont\MakeUppercase{#1}} + {\fontsize{20}{24}\selectfont\MakeUppercase{#1}} [\ResumeLineNumbers] \titleformat{name=\part,numberless}[display] {\thispagestyle{part} @@ -303,7 +329,7 @@ \g_minimalist_title_font_part_tl\filleft} {\phantom{\MakeUppercase{\partname}}} {1em} - {\fontsize{20}{0}\selectfont\MakeUppercase{#1}} + {\fontsize{20}{24}\selectfont\MakeUppercase{#1}} [\ResumeLineNumbers] \titlespacing*{\part}{0pt}{5em}{6em} %% Text after part @@ -384,7 +410,7 @@ \titleformat{\section} {\LocallyStopLineNumbers \g_minimalist_title_font_section_tl\centering} - {\raisebox{-.02\baselineskip}{\large \minimalist_apply_title_numbering_style:n { \thesection } }}{1em} + {\raisebox{-.02\baselineskip}{\large \minimalist_apply_title_numbering_style_static:n { \thesection } }}{1em} {#1} [\ResumeLineNumbers] @@ -392,7 +418,7 @@ \titleformat{\subsection} {\LocallyStopLineNumbers \g_minimalist_title_font_subsection_tl} - { \minimalist_apply_title_numbering_style:n { \thesubsection } }{.75em} + { \minimalist_apply_title_numbering_style_static:n { \thesubsection } }{.75em} {#1} [\ResumeLineNumbers] @@ -401,14 +427,14 @@ { \titleformat{\subsubsection}[runin] {\g_minimalist_title_font_subsubsection_tl} - { \minimalist_apply_title_numbering_style:n { \thesection } }{.5em} + { \minimalist_apply_title_numbering_style_static:n { \thesection } }{.5em} {#1.}[\hspace*{.3em}] } { \titleformat{\subsubsection} {\LocallyStopLineNumbers \g_minimalist_title_font_subsubsection_tl} - { \minimalist_apply_title_numbering_style:n { \thesubsubsection } }{.5em} + { \minimalist_apply_title_numbering_style_static:n { \thesubsubsection } }{.5em} {#1} [\ResumeLineNumbers] } @@ -428,7 +454,7 @@ \titlecontents{part} [0em] {\addvspace{1.5pc}\filcenter\normalfont} - { \minimalist_apply_title_numbering_style:n { \thecontentslabel } \nopagebreak\\\nopagebreak\uppercase} + { \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } \nopagebreak\\\nopagebreak\uppercase} {} {} % without page number [\addvspace{.5pc}] @@ -438,25 +464,25 @@ \titlecontents{chapter} [2em] % i.e., 0em (part) + 2em {\addvspace{.5pc}\normalfont} - {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{2em}} + {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{2em}} {\hspace*{-2em}} {\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage} \titlecontents{section} [5em] % i.e., 2em (chapter) + 3em {\normalfont} - {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{2.75em}} + {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{2.75em}} {\hspace*{-2.75em}} {\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage} \titlecontents{subsection} [9em] % i.e., 5em (section) + 4em {\normalfont} - {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{3.75em}} + {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{3.75em}} {\hspace*{-3.75em}} {\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage} \titlecontents{subsubsection} [13.5em] % i.e., 9em (subsection) + 4.5em {\normalfont} - {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{4.25em}} + {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{4.25em}} {\hspace*{-4.25em}} {\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage} } @@ -464,19 +490,19 @@ \titlecontents{section} [2em] % i.e., 0em (part) + 2em {\normalfont} - {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{1.75em}} + {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{1.75em}} {\hspace*{-1.75em}} {\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage} \titlecontents{subsection} [5em] % i.e., 2em (section) + 3em {\normalfont} - {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{2.75em}} + {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{2.75em}} {\hspace*{-2.75em}} {\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage} \titlecontents{subsubsection} [9em] % i.e., 5em (subsection) + 4em {\normalfont} - {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{3.75em}} + {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{3.75em}} {\hspace*{-3.75em}} {\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage} } @@ -486,7 +512,7 @@ %%================================ \RequirePackage { enumitem } \setlistdepth{10} -\setlist{noitemsep, topsep=.33\topsep} +\setlist{noitemsep, topsep=.33\topsep-.5\parskip} \setlist[enumerate]{labelsep=*, leftmargin=*} \setlist[enumerate,1]{label=\arabic*$)$, ref = \arabic*$)$} @@ -499,8 +525,8 @@ \renewlist{itemize}{itemize}{10} \setlist[itemize]{leftmargin=*,label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\cdot$}} \AddLanguageSetting { \setlist[itemize,1]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\bullet$}} } -\AddLanguageSetting [french] { \setlist[itemize,1]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{---}} } -\setlist[itemize,2]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{--}} +\AddLanguageSetting [french] { \setlist[itemize,1]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{\rule[.2\baselineskip]{.8em}{.75pt}}} } +\setlist[itemize,2]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{\rule[.2\baselineskip]{.5em}{.75pt}}} \setlist[itemize,3]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\circ$}} \setlist[itemize,4]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\ast$}} @@ -569,16 +595,14 @@ heading_suffix "}\n" \newcommand*{\IndexDotfill} { - \nobreakspace\nobreakspace - \titlerule*[.67em]{\textcolor{main-text!15!paper}{.}} - \nobreakspace\nobreakspace + \leaders \hbox to .67em {\hss \textcolor{main-text!15!paper}{.} \hss} \hfill } \newcommand*{\IndexHeading}[1] { \str_if_eq:nnTF { #1 } { Symbols } { \tl_set:Nn \l_tmpa_tl { \index_symbols_name } } { \tl_set:Nn \l_tmpa_tl { #1 } } - \centerline{ \g_minimalist_title_font_common_tl \minimalist_apply_title_numbering_style:n { \l_tmpa_tl } } + \centerline{ \g_minimalist_title_font_common_tl \minimalist_apply_title_numbering_style_static:n { \l_tmpa_tl } } \nopagebreak \par \vspace{.3\baselineskip} @@ -635,7 +659,7 @@ heading_suffix "}\n" \rlap{\vbox{\hbox{\parbox{\linewidth}{ {\thmname{#1}\thmnumber{\nobreakspace #2}} {\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}} - }}\hbox{\strut}\vspace{-2\parskip}}} + }}\hbox{\strut}\vspace{0pt}}} } } { @@ -671,7 +695,7 @@ heading_suffix "}\n" \RequirePackage { projlib-theorem } -\exp_args:No \SetTheorem { \c_projlib_theorem_supported_clist } +\exp_args:No \SetTheorem { \c_projlib_theorem_supported_clist, theorem-with-name } { name style = { , heading style = { @@ -712,7 +736,7 @@ heading_suffix "}\n" \bool_if:NF \l__projlib_theorem_complexname_bool { - \exp_args:No \SetTheorem { \c_projlib_theorem_supported_clist } + \exp_args:No \SetTheorem { \c_projlib_theorem_supported_clist, theorem-with-name } { name style = { , crefname style = { @@ -742,17 +766,7 @@ heading_suffix "}\n" , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl } , numbering style = { - , english = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , french = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , ngerman = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , italian = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , portuguese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , brazilian = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , spanish = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , schinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , tchinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , japanese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl + \minimalist_bfseries:\g_minimalist_title_font_common_tl } } } @@ -789,17 +803,7 @@ heading_suffix "}\n" , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl } , numbering style = { - , english = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , french = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , ngerman = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , italian = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , portuguese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , brazilian = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , spanish = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , schinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , tchinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , japanese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl + \minimalist_bfseries:\g_minimalist_title_font_common_tl } } } @@ -838,7 +842,7 @@ heading_suffix "}\n" { \hook_gput_code:nnn { package/projlib-author/after } { minimalist } { - \tl_gset:Nn \g__projlib_author_font_author_tl { \normalfont \scshape } + \tl_gset:Nn \g__projlib_author_font_author_tl { \normalfont \minimalist_scshape: } \tl_gset:Nn \g__projlib_author_font_institute_tl { \large \normalfont } \tl_gset:Nn \g__projlib_author_font_address_tl { \large \normalfont \itshape } \tl_gset:Nn \g__projlib_author_font_curraddr_tl { \large \normalfont \itshape } @@ -863,13 +867,13 @@ heading_suffix "}\n" \LocallyStopLineNumbers \begin{center} \let\footnote\thanks - {\minimalist_bfseries:\sffamily\scshape\Large\@title}\\\bigskip + {\minimalist_bfseries:\sffamily\minimalist_scshape:\Large\@title}\\\bigskip \color{main-text!80!paper} - {\small\scshape\@author} + {\small\minimalist_scshape:\@author} \par\smallskip\vspace{-\parskip} {\small\@date} \end{center} - \ifx\@date\@empty\medskip\fi + \projlib_author_if_content_empty:nT { \@date } { \medskip } \medskip\par \ResumeLineNumbers } @@ -884,7 +888,7 @@ heading_suffix "}\n" \LocallyStopLineNumbers \vspace{-.5\baselineskip} \begin{center} - { \g_minimalist_title_font_section_tl \scshape \small\abstractname}\\ + { \g_minimalist_title_font_section_tl \minimalist_scshape: \small\abstractname}\\ \vspace{-.3\baselineskip} \begin{minipage}[t]{.833\textwidth} \vspace{0pt} @@ -921,7 +925,7 @@ heading_suffix "}\n" \LocallyStopLineNumbers \vspace{-.75\baselineskip} \begin{center} - {\minimalist_bfseries:\scshape\small\keywordname}\\ + {\minimalist_bfseries:\minimalist_scshape:\small\keywordname}\\ \vspace{-.3\baselineskip} \begin{minipage}[t]{.833\textwidth} \vspace{0pt} @@ -944,6 +948,18 @@ heading_suffix "}\n" \PassOptionsToPackage { amsfashion } { projlib-author } \RequirePackage { projlib-author } +%%================================ +%% Special adjustment +%%================================ +\crefformat { chapter } { #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 } +\labelcrefformat { chapter } { #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 } +\crefformat { section } { #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 } +\labelcrefformat { section } { #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 } +\crefformat { subsection } { #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 } +\labelcrefformat { subsection } { #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 } +\crefformat { subsubsection } { #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 } +\labelcrefformat { subsubsection } { #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 } + \endinput %% %% End of file `minimalist/minimalist-plain.sty'. diff --git a/Master/texmf-dist/tex/latex/minimalist/minimalist.sty b/Master/texmf-dist/tex/latex/minimalist/minimalist.sty index 7dde7289fe5..910f1e7960c 100644 --- a/Master/texmf-dist/tex/latex/minimalist/minimalist.sty +++ b/Master/texmf-dist/tex/latex/minimalist/minimalist.sty @@ -1,7 +1,7 @@ %% %% This is file `minimalist/minimalist.sty', %% generated with the docstrip utility. - +%% %% Copyright (C) 2021-2022 by Jinwen XU %% %% This is part of the minimalist class series. @@ -19,7 +19,7 @@ \RequirePackage{l3keys2e} \ProvidesExplPackage {minimalist} - {2022/04/24} {} + {2022/06/16} {} {A simple and clear style for articles and books} \keys_define:nn { minimalist } @@ -30,17 +30,30 @@ , style .str_set:N = \l__minimalist_style_str , style .initial:n = { plain } + , use-style .str_set:N = \l__minimalist_style_str + , use~style .str_set:N = \l__minimalist_style_str + , use style .str_set:N = \l__minimalist_style_str , classical .meta:n = { style = classical } , use-boldface .bool_set:N = \l__minimalist_use_boldface_bool , use-boldface .initial:n = { false } , use~boldface .bool_set:N = \l__minimalist_use_boldface_bool , use boldface .bool_set:N = \l__minimalist_use_boldface_bool - , usebf .bool_set:N = \l__minimalist_use_boldface_bool - , allow-boldface .bool_set:N = \l__minimalist_use_boldface_bool - , allow~boldface .bool_set:N = \l__minimalist_use_boldface_bool - , allow boldface .bool_set:N = \l__minimalist_use_boldface_bool - , allowbf .bool_set:N = \l__minimalist_use_boldface_bool + , title-in-boldface .bool_set:N = \l__minimalist_use_boldface_bool + , title~in~boldface .bool_set:N = \l__minimalist_use_boldface_bool + , title in boldface .bool_set:N = \l__minimalist_use_boldface_bool + , title-in-bold .bool_set:N = \l__minimalist_use_boldface_bool + , title~in~bold .bool_set:N = \l__minimalist_use_boldface_bool + , title in bold .bool_set:N = \l__minimalist_use_boldface_bool + + , use-scshape .bool_set:N = \l__minimalist_use_scshape_bool + , use-scshape .initial:n = { false } + , use~scshape .bool_set:N = \l__minimalist_use_scshape_bool + , use scshape .bool_set:N = \l__minimalist_use_scshape_bool + , title-in-scshape .bool_set:N = \l__minimalist_use_scshape_bool + , title~in~scshape .bool_set:N = \l__minimalist_use_scshape_bool + , title in scshape .bool_set:N = \l__minimalist_use_scshape_bool + , runin .bool_set:N = \l__minimalist_runin_bool , runin .initial:n = { false } diff --git a/Master/texmf-dist/tex/latex/minimalist/minimart.cls b/Master/texmf-dist/tex/latex/minimalist/minimart.cls index aaa62d78524..5ad76079323 100644 --- a/Master/texmf-dist/tex/latex/minimalist/minimart.cls +++ b/Master/texmf-dist/tex/latex/minimalist/minimart.cls @@ -1,7 +1,7 @@ %% %% This is file `minimalist/minimart.cls', %% generated with the docstrip utility. - +%% %% Copyright (C) 2021-2022 by Jinwen XU %% %% This is part of the minimalist class series. @@ -19,7 +19,7 @@ \RequirePackage{l3keys2e} \ProvidesExplClass {minimart} - {2022/04/24} {} + {2022/06/16} {} {A simple and clear article style} \tl_const:Nn \l__minimclass_base_class_tl { article } @@ -190,21 +190,25 @@ } } + \PassOptionsToPackage { all } { nowidow } \RequirePackage { nowidow } -\RequirePackage { regexpatch } -\skip_new:N \g_minimclass_parfillskip_skip -\xpatchcmd{\@trivlist}{\@flushglue}{\g_minimclass_parfillskip_skip}{}{} -\hook_gput_code:nnn { begindocument } { minimclass } +\sys_if_engine_xetex:T { - \skip_gset:Nn \g_minimclass_parfillskip_skip { 0pt plus \dim_eval:n { \linewidth - 2\parindent } } - \skip_gset_eq:NN \parfillskip \g_minimclass_parfillskip_skip + \RequirePackage { regexpatch } + \skip_new:N \g_minimclass_parfillskip_skip + \xpatchcmd{\@trivlist}{\@flushglue}{\g_minimclass_parfillskip_skip}{}{} + \hook_gput_code:nnn { begindocument } { minimclass } + { + \skip_gset:Nn \g_minimclass_parfillskip_skip { 0pt plus \dim_eval:n { \linewidth - 3em } } + \skip_gset_eq:NN \parfillskip \g_minimclass_parfillskip_skip + } } \hook_gput_code:nnn { begindocument/before } { minimclass } { - \@ifpackageloaded { biblatex } + \IfPackageLoadedTF { biblatex } { \PassOptionsToPackage { biblatex } { embrac } } {} diff --git a/Master/texmf-dist/tex/latex/minimalist/minimbook.cls b/Master/texmf-dist/tex/latex/minimalist/minimbook.cls index 61a27b439c6..f844f26ffb7 100644 --- a/Master/texmf-dist/tex/latex/minimalist/minimbook.cls +++ b/Master/texmf-dist/tex/latex/minimalist/minimbook.cls @@ -1,7 +1,7 @@ %% %% This is file `minimalist/minimbook.cls', %% generated with the docstrip utility. - +%% %% Copyright (C) 2021-2022 by Jinwen XU %% %% This is part of the minimalist class series. @@ -19,7 +19,7 @@ \RequirePackage{l3keys2e} \ProvidesExplClass {minimbook} - {2022/04/24} {} + {2022/06/16} {} {A simple and clear book style} \tl_const:Nn \l__minimclass_base_class_tl { book } @@ -190,21 +190,25 @@ } } + \PassOptionsToPackage { all } { nowidow } \RequirePackage { nowidow } -\RequirePackage { regexpatch } -\skip_new:N \g_minimclass_parfillskip_skip -\xpatchcmd{\@trivlist}{\@flushglue}{\g_minimclass_parfillskip_skip}{}{} -\hook_gput_code:nnn { begindocument } { minimclass } +\sys_if_engine_xetex:T { - \skip_gset:Nn \g_minimclass_parfillskip_skip { 0pt plus \dim_eval:n { \linewidth - 2\parindent } } - \skip_gset_eq:NN \parfillskip \g_minimclass_parfillskip_skip + \RequirePackage { regexpatch } + \skip_new:N \g_minimclass_parfillskip_skip + \xpatchcmd{\@trivlist}{\@flushglue}{\g_minimclass_parfillskip_skip}{}{} + \hook_gput_code:nnn { begindocument } { minimclass } + { + \skip_gset:Nn \g_minimclass_parfillskip_skip { 0pt plus \dim_eval:n { \linewidth - 3em } } + \skip_gset_eq:NN \parfillskip \g_minimclass_parfillskip_skip + } } \hook_gput_code:nnn { begindocument/before } { minimclass } { - \@ifpackageloaded { biblatex } + \IfPackageLoadedTF { biblatex } { \PassOptionsToPackage { biblatex } { embrac } } {} diff --git a/Master/texmf-dist/tex/latex/simplivre/simplivre.cls b/Master/texmf-dist/tex/latex/simplivre/simplivre.cls index 07780bdd10d..25377b24b8e 100644 --- a/Master/texmf-dist/tex/latex/simplivre/simplivre.cls +++ b/Master/texmf-dist/tex/latex/simplivre/simplivre.cls @@ -1,7 +1,7 @@ %% %% This is file `simplivre/simplivre.cls', %% generated with the docstrip utility. - +%% %% Copyright (C) 2021-2022 by Jinwen XU %% %% This is part of the minimalist class series. @@ -19,7 +19,7 @@ \RequirePackage{l3keys2e} \ProvidesExplClass {simplivre} - {2022/04/24} {} + {2022/06/16} {} {A simple and clear book style} \tl_const:Nn \l__minimclass_base_class_tl { book } @@ -250,43 +250,39 @@ \__minimclass_load_file_or_config:Nnn \l__minimclass_load_custom_font_file_latin_bool { \l__minimclass_custom_font_file_latin_str } { - \__minimclass_if_font_exist:nnn { Palatino~Linotype } + \bool_if:NTF \l__projlib_font_useosf_bool { - \bool_if:NTF \l__projlib_font_useosf_bool - { - \setmainfont { Palatino~Linotype } [ Numbers = OldStyle ] - } - { - \setmainfont { Palatino~Linotype } - } + \setmainfont { TeXGyrePagellaX-Regular.otf } + [ + BoldFont = TeXGyrePagellaX-Bold.otf , + ItalicFont = TeXGyrePagellaX-Italic.otf , + BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf , + Numbers = OldStyle , + ] + \setsansfont { SourceSansPro-Regular.otf } + [ + Scale = 1.05 , + BoldFont = SourceSansPro-Semibold.otf , + ItalicFont = SourceSansPro-RegularIt.otf , + BoldItalicFont = SourceSansPro-SemiboldIt.otf , + Numbers = OldStyle , + ] } { - \bool_if:NTF \l__projlib_font_useosf_bool - { - \setmainfont { TeXGyrePagellaX-Regular.otf } - [ - BoldFont = TeXGyrePagellaX-Bold.otf , - ItalicFont = TeXGyrePagellaX-Italic.otf , - BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf , - Numbers = OldStyle , - ] - } - { - \setmainfont { TeXGyrePagellaX-Regular.otf } - [ - BoldFont = TeXGyrePagellaX-Bold.otf , - ItalicFont = TeXGyrePagellaX-Italic.otf , - BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf , - ] - } + \setmainfont { TeXGyrePagellaX-Regular.otf } + [ + BoldFont = TeXGyrePagellaX-Bold.otf , + ItalicFont = TeXGyrePagellaX-Italic.otf , + BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf , + ] + \setsansfont { SourceSansPro-Regular.otf } + [ + Scale = 1.05 , + BoldFont = SourceSansPro-Semibold.otf , + ItalicFont = SourceSansPro-RegularIt.otf , + BoldItalicFont = SourceSansPro-SemiboldIt.otf , + ] } - \setsansfont { SourceSansPro-Regular.otf } - [ - Scale = 1.05 , - BoldFont = SourceSansPro-Bold.otf , - ItalicFont = SourceSansPro-RegularIt.otf , - BoldItalicFont = SourceSansPro-BoldIt.otf , - ] \setmonofont { NewCMMono10-Regular.otf } [ Scale = 1.05 , @@ -567,10 +563,8 @@ { \bool_if:NF \g_projlib_font_already_set_bool { - \bool_if:NTF \l__minimclass_fast_bool - { - \RequirePackage { amssymb } - } + \RequirePackage { amssymb } + \bool_if:NF \l__minimclass_fast_bool { \PassOptionsToPackage { warnings-off = { mathtools-colon, mathtools-overbracket } } { unicode-math } \RequirePackage { unicode-math } @@ -582,6 +576,11 @@ ] \setmathfont { latinmodern-math.otf } [ + range = { \ast } , + Scale = 1.10 + ] + \setmathfont { latinmodern-math.otf } + [ range = { frak, bffrak } ] \DeclareMathAlphabet{\mathcal}{OMS}{cmsy}{m}{n} @@ -594,17 +593,34 @@ [ range = { it / { Latin, latin }, bfit / { Latin, latin }, up / num, bfup / num } ] + \setmathfont { KpMath-Regular.otf } [ range = {} ] + + \sys_if_engine_luatex:T + { + \mathitalicsmode=1 + } \hook_gput_code:nnn { begindocument } { minimclass } { - \NewCommandCopy \minimclass_backup_mid: \mid - \RenewDocumentCommand \mid {} - { \skip_horizontal:n {-.1em} \minimclass_backup_mid: \skip_horizontal:n {-.1em} } - \NewCommandCopy \minimclass_backup_nmid: \nmid - \RenewDocumentCommand \nmid {} - { \skip_horizontal:n {-.1em} \minimclass_backup_nmid: \skip_horizontal:n {-.1em} } + \cs_gset_eq:NN \overline \wideoverbar + \cs_gset_eq:NN \square \mdwhtsquare } + % A temporary hack proposed in https://tex.stackexchange.com/a/647789 + \hook_gput_code:nnn { begindocument } { minimclass } + { + \NewCommandCopy\unicodevdots\vdots + \RenewDocumentCommand{\vdots}{}{\mathrel{\loweredvdots}} + } + \newcommand{\loweredvdots}{\mathpalette\loweredvdots@\relax} + \newcommand{\loweredvdots@}[2]{% + \begingroup + \sbox\z@{$\m@th#1\unicodevdots$}% + \vrule width \z@ height 2.25\ht\z@ depth 0.012\ht\z@ + \raisebox{0.25\height}{\usebox\z@}% + \endgroup + } + \RequirePackage { tikz-cd } \tikzcdset { arrow~style = tikz, diagrams = { >={Stealth[round,length=3.4pt,width=6.15pt,inset=2.25pt]} } } @@ -673,21 +689,27 @@ } } +\char_set_catcode_active:n { `\· } +\cs_new_protected:Npn · { \ensuremath\cdot } + \PassOptionsToPackage { all } { nowidow } \RequirePackage { nowidow } -\RequirePackage { regexpatch } -\skip_new:N \g_minimclass_parfillskip_skip -\xpatchcmd{\@trivlist}{\@flushglue}{\g_minimclass_parfillskip_skip}{}{} -\hook_gput_code:nnn { begindocument } { minimclass } +\sys_if_engine_xetex:T { - \skip_gset:Nn \g_minimclass_parfillskip_skip { 0pt plus \dim_eval:n { \linewidth - 2\parindent } } - \skip_gset_eq:NN \parfillskip \g_minimclass_parfillskip_skip + \RequirePackage { regexpatch } + \skip_new:N \g_minimclass_parfillskip_skip + \xpatchcmd{\@trivlist}{\@flushglue}{\g_minimclass_parfillskip_skip}{}{} + \hook_gput_code:nnn { begindocument } { minimclass } + { + \skip_gset:Nn \g_minimclass_parfillskip_skip { 0pt plus \dim_eval:n { \linewidth - 3em } } + \skip_gset_eq:NN \parfillskip \g_minimclass_parfillskip_skip + } } \hook_gput_code:nnn { begindocument/before } { minimclass } { - \@ifpackageloaded { biblatex } + \IfPackageLoadedTF { biblatex } { \PassOptionsToPackage { biblatex } { embrac } } {} |