diff options
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls | 323 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/colorist/colorart.cls | 71 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/colorist/colorbook.cls | 71 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty | 89 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/colorist/colorist.sty | 7 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/crefthe/crefthe.sty | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/einfart/einfart.cls | 321 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/lebhart/lebhart.cls | 323 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/minimalist/minimalist-classical.sty | 73 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/minimalist/minimalist-plain.sty | 83 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/minimalist/minimalist.sty | 7 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/minimalist/minimart.cls | 71 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/minimalist/minimbook.cls | 71 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/simplivre/simplivre.cls | 321 |
14 files changed, 1105 insertions, 730 deletions
diff --git a/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls b/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls index 7c63f734795..d06122aa4e9 100644 --- a/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls +++ b/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls @@ -15,11 +15,10 @@ %% and version 1.3c or later is part of all distributions of LaTeX version %% 2005/12/01 or later. %% -\NeedsTeXFormat{LaTeX2e}[2020-10-01] -\RequirePackage{l3keys2e} +\NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplClass {beaulivre} - {2022/06/16} {} + {2022/09/03} {} {A colorful book style} \tl_const:Nn \l__colorclass_base_class_tl { book } @@ -126,7 +125,7 @@ \PassOptionsToPackage { \CurrentOption } { colorist } } } -\ProcessKeysOptions { colorclass } +\ProcessKeyOptions [ colorclass ] \LoadClass{\l__colorclass_base_class_tl} @@ -183,9 +182,6 @@ \RequirePackage { colorist } -\raggedbottom -\hfuzz=2pt -\vfuzz=2pt %%================================ %% Fonts @@ -193,6 +189,15 @@ \WarningFilter { latexfont } { Font~shape } \WarningFilter { latexfont } { Some~font } +\hook_gput_code:nnn { begindocument/before } { colorclass } + { + \IfPackageLoadedTF { biblatex } + { + \PassOptionsToPackage { biblatex } { embrac } + } {} + \RequirePackage { embrac } + } + \cs_new_protected:Nn \__colorclass_load_file_or_config:Nnn { \bool_if:NT #1 @@ -231,46 +236,62 @@ { \bool_if:NTF \l__projlib_font_useosf_bool { - \setmainfont { TeXGyrePagellaX-Regular.otf } + \setmainfont { TeXGyrePagellaX } [ - BoldFont = TeXGyrePagellaX-Bold.otf , - ItalicFont = TeXGyrePagellaX-Italic.otf , - BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Italic, + BoldItalicFont = *-BoldItalic, Numbers = OldStyle , ] - \setsansfont { SourceSansPro-Regular.otf } + \setsansfont { SourceSansPro } [ - Scale = 1.05 , - BoldFont = SourceSansPro-Semibold.otf , - ItalicFont = SourceSansPro-RegularIt.otf , - BoldItalicFont = SourceSansPro-SemiboldIt.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Semibold, + ItalicFont = *-RegularIt, + BoldItalicFont = *-SemiboldIt, + WordSpace = {1.25, 1, 1} , Numbers = OldStyle , ] } { - \setmainfont { TeXGyrePagellaX-Regular.otf } + \setmainfont { TeXGyrePagellaX } [ - BoldFont = TeXGyrePagellaX-Bold.otf , - ItalicFont = TeXGyrePagellaX-Italic.otf , - BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Italic, + BoldItalicFont = *-BoldItalic, ] - \setsansfont { SourceSansPro-Regular.otf } + \setsansfont { SourceSansPro } [ - Scale = 1.05 , - BoldFont = SourceSansPro-Semibold.otf , - ItalicFont = SourceSansPro-RegularIt.otf , - BoldItalicFont = SourceSansPro-SemiboldIt.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Semibold, + ItalicFont = *-RegularIt, + BoldItalicFont = *-SemiboldIt, + WordSpace = {1.25, 1, 1} , ] } - \setmonofont { NewCMMono10-Regular.otf } + \setmonofont { NewCMMono10 } [ Scale = 1.05 , - BoldFont = NewCMMono10-Bold.otf , - ItalicFont = NewCMMono10-Italic.otf , - BoldItalicFont = NewCMMono10-BoldOblique.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Italic, + BoldItalicFont = *-BoldOblique, ] \projlib_language_set_linespacing_latin:n { \setstretch { 1.07 } } + + \hook_gput_code:nnn { begindocument/before } { colorclass } + { + \RenewEmph{[}{]} + \RenewEmph{(}{)} + } } } @@ -281,48 +302,55 @@ { \__colorclass_if_font_exist:nnn { SourceHanSerifSC-Regular } { - \setCJKmainfont { SourceHanSerifSC-Regular } + \setCJKmainfont { SourceHanSerifSC } [ - BoldFont = SourceHanSerifSC-Bold , - ItalicFont = * , - BoldItalicFont = SourceHanSerifSC-Bold , + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } { - \setCJKmainfont { FandolSong-Regular.otf } + \setCJKmainfont { FandolSong } [ - BoldFont = FandolSong-Bold.otf , - ItalicFont = FandolKai-Regular.otf , - BoldItalicFont = FandolKai-Regular.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = FandolKai-Regular , + BoldItalicFont = FandolKai-Regular , BoldItalicFeatures = { FakeBold = 4 } , ] } \__colorclass_if_font_exist:nnn { SourceHanSansSC-Regular } { - \setCJKsansfont{SourceHanSansSC-Regular} + \setCJKsansfont { SourceHanSansSC } [ - BoldFont = SourceHanSansSC-Bold , - ItalicFont = * , - BoldItalicFont = SourceHanSansSC-Bold , + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } { - \setCJKsansfont { FandolHei-Regular.otf } + \setCJKsansfont { FandolHei } [ - BoldFont = FandolHei-Bold.otf , - ItalicFont = * , - BoldItalicFont = FandolHei-Bold.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } \__colorclass_if_font_exist:nnn { SourceHanMonoSC-Regular } { - \setCJKmonofont { SourceHanMonoSC-Regular } + \setCJKmonofont { SourceHanMonoSC } [ - BoldFont = SourceHanMonoSC-Medium , - ItalicFont = * , - BoldItalicFont = SourceHanMonoSC-Medium , + UprightFont = *-Regular, + BoldFont = *-Medium, + ItalicFont = *-Regular, + BoldItalicFont = *-Medium, ] } { @@ -340,46 +368,53 @@ { \__colorclass_if_font_exist:nnn { SourceHanSerifSC-Regular } { - \setCJKfamilyfont { SCmain } { SourceHanSerifSC-Regular } + \setCJKfamilyfont { SCmain } { SourceHanSerifSC } [ - BoldFont = SourceHanSerifSC-Bold , - ItalicFont = * , - BoldItalicFont = SourceHanSerifSC-Bold , + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } { - \setCJKfamilyfont { SCmain } { FandolSong-Regular.otf } + \setCJKfamilyfont { SCmain } { FandolSong } [ - BoldFont = FandolSong-Bold.otf , - ItalicFont = FandolKai-Regular.otf , - BoldItalicFont = FandolKai-Regular.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = FandolKai-Regular , + BoldItalicFont = FandolKai-Regular , BoldItalicFeatures = { FakeBold = 4 } , ] } \__colorclass_if_font_exist:nnn { SourceHanSansSC-Regular } { - \setCJKfamilyfont { SCsans } { SourceHanSansSC-Regular } + \setCJKfamilyfont { SCsans } { SourceHanSansSC } [ - BoldFont = SourceHanSansSC-Bold , - ItalicFont = * , - BoldItalicFont = SourceHanSansSC-Bold , + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } { - \setCJKfamilyfont { SCsans } { FandolHei-Regular.otf } + \setCJKfamilyfont { SCsans } { FandolHei } [ - BoldFont = FandolHei-Bold.otf , - ItalicFont = * , - BoldItalicFont = FandolHei-Bold.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } \__colorclass_if_font_exist:nnn { SourceHanMonoSC-Regular } { - \setCJKfamilyfont { SCmono } { SourceHanMonoSC-Regular } + \setCJKfamilyfont { SCmono } { SourceHanMonoSC } [ - BoldFont = SourceHanMonoSC-Medium , - ItalicFont = * , - BoldItalicFont = SourceHanMonoSC-Medium , + UprightFont = *-Regular, + BoldFont = *-Medium, + ItalicFont = *-Regular, + BoldItalicFont = *-Medium, ] } { @@ -398,46 +433,53 @@ { \__colorclass_if_font_exist:nnn { SourceHanSerifTC-Regular } { - \setCJKfamilyfont { TCmain } { SourceHanSerifTC-Regular } + \setCJKfamilyfont { TCmain } { SourceHanSerifTC } [ - BoldFont = SourceHanSerifTC-Bold , - ItalicFont = * , - BoldItalicFont = SourceHanSerifTC-Bold , + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } { - \setCJKfamilyfont { TCmain } { FandolSong-Regular.otf } + \setCJKfamilyfont { TCmain } { FandolSong } [ - BoldFont = FandolSong-Bold.otf , - ItalicFont = FandolKai-Regular.otf , - BoldItalicFont = FandolKai-Regular.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = FandolKai-Regular , + BoldItalicFont = FandolKai-Regular , BoldItalicFeatures = { FakeBold = 4 } , ] } \__colorclass_if_font_exist:nnn { SourceHanSansTC-Regular } { - \setCJKfamilyfont { TCsans } { SourceHanSansTC-Regular } + \setCJKfamilyfont { TCsans } { SourceHanSansTC } [ - BoldFont = SourceHanSansTC-Bold , - ItalicFont = * , - BoldItalicFont = SourceHanSansTC-Bold , + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } { - \setCJKfamilyfont { TCsans } { FandolHei-Regular.otf } + \setCJKfamilyfont { TCsans } { FandolHei } [ - BoldFont = FandolHei-Bold.otf , - ItalicFont = * , - BoldItalicFont = FandolHei-Bold.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } \__colorclass_if_font_exist:nnn { SourceHanMonoTC-Regular } { - \setCJKfamilyfont { TCmono } { SourceHanMonoTC-Regular } + \setCJKfamilyfont { TCmono } { SourceHanMonoTC } [ - BoldFont = SourceHanMonoTC-Medium , - ItalicFont = * , - BoldItalicFont = SourceHanMonoTC-Medium , + UprightFont = *-Regular, + BoldFont = *-Medium, + ItalicFont = *-Regular, + BoldItalicFont = *-Medium, ] } { @@ -456,46 +498,53 @@ { \__colorclass_if_font_exist:nnn { SourceHanSerif-Regular } { - \setCJKfamilyfont { JPmain } { SourceHanSerif-Regular } + \setCJKfamilyfont { JPmain } { SourceHanSerif } [ - BoldFont = SourceHanSerif-Bold , - ItalicFont = * , - BoldItalicFont = SourceHanSerif-Bold , + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } { - \setCJKfamilyfont { JPmain } { FandolSong-Regular.otf } + \setCJKfamilyfont { JPmain } { FandolSong } [ - BoldFont = FandolSong-Bold.otf , - ItalicFont = FandolKai-Regular.otf , - BoldItalicFont = FandolKai-Regular.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = FandolKai-Regular , + BoldItalicFont = FandolKai-Regular , BoldItalicFeatures = { FakeBold = 4 } , ] } \__colorclass_if_font_exist:nnn { SourceHanSans-Regular } { - \setCJKfamilyfont { JPsans } { SourceHanSans-Regular } + \setCJKfamilyfont { JPsans } { SourceHanSans } [ - BoldFont = SourceHanSans-Bold , - ItalicFont = * , - BoldItalicFont = SourceHanSans-Bold , + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } { - \setCJKfamilyfont { JPsans } { FandolHei-Regular.otf } + \setCJKfamilyfont { JPsans } { FandolHei } [ - BoldFont = FandolHei-Bold.otf , - ItalicFont = * , - BoldItalicFont = FandolHei-Bold.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } \__colorclass_if_font_exist:nnn { SourceHanMono-Regular } { - \setCJKfamilyfont { JPmono } { SourceHanMono-Regular } + \setCJKfamilyfont { JPmono } { SourceHanMono } [ - BoldFont = SourceHanMono-Medium , - ItalicFont = * , - BoldItalicFont = SourceHanMono-Medium , + UprightFont = *-Regular, + BoldFont = *-Medium, + ItalicFont = *-Regular, + BoldItalicFont = *-Medium, ] } { @@ -547,9 +596,14 @@ \RequirePackage { unicode-math } \unimathsetup { math-style = ISO, partial = upright, nabla = upright } \setmathfont { KpMath-Regular.otf } + \setmathfont { KpMath-Regular.otf } + [ + range = \amalg , + Scale = 0.84625 + ] \setmathfont { KpMath-Sans.otf } [ - range = { \sum, \prod, \coprod } + range = { \sum } ] \setmathfont { latinmodern-math.otf } [ @@ -583,8 +637,8 @@ \cs_gset_eq:NN \square \mdwhtsquare } - % A temporary hack proposed in https://tex.stackexchange.com/a/647789 - \hook_gput_code:nnn { begindocument } { minimclass } + % https://tex.stackexchange.com/a/647789 + \hook_gput_code:nnn { begindocument } { colorclass } { \NewCommandCopy\unicodevdots\vdots \RenewDocumentCommand{\vdots}{}{\mathrel{\loweredvdots}} @@ -669,8 +723,30 @@ \char_set_catcode_active:n { `\· } \cs_new_protected:Npn · { \ensuremath\cdot } -\PassOptionsToPackage { all } { nowidow } -\RequirePackage { nowidow } +%%================================ +%% Graphics +%%================================ +\RequirePackage { graphicx } +\graphicspath { { images/ } } +\RequirePackage { wrapfig } +\RequirePackage { float } +\RequirePackage { caption } +\captionsetup { font = small } + +%%================================ +%% Icing on the cake +%%================================ +\bool_if:NT \l__colorclass_fast_bool { \endinput } + +\sys_if_engine_luatex:TF + { + \RequirePackage { lua-widow-control } + \lwcsetup { balanced } + } + { + \PassOptionsToPackage { all } { nowidow } + \RequirePackage { nowidow } + } \sys_if_engine_xetex:T { @@ -684,25 +760,6 @@ } } -\hook_gput_code:nnn { begindocument/before } { colorclass } - { - \IfPackageLoadedTF { biblatex } - { - \PassOptionsToPackage { biblatex } { embrac } - } {} - \RequirePackage { embrac } - } - -%%================================ -%% Graphics -%%================================ -\RequirePackage { graphicx } -\graphicspath { { images/ } } -\RequirePackage { wrapfig } -\RequirePackage { float } -\RequirePackage { caption } -\captionsetup { font = small } - \endinput %% %% End of file `beaulivre/beaulivre.cls'. diff --git a/Master/texmf-dist/tex/latex/colorist/colorart.cls b/Master/texmf-dist/tex/latex/colorist/colorart.cls index 9c838e534de..72929ae9162 100644 --- a/Master/texmf-dist/tex/latex/colorist/colorart.cls +++ b/Master/texmf-dist/tex/latex/colorist/colorart.cls @@ -15,11 +15,10 @@ %% and version 1.3c or later is part of all distributions of LaTeX version %% 2005/12/01 or later. %% -\NeedsTeXFormat{LaTeX2e}[2020-10-01] -\RequirePackage{l3keys2e} +\NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplClass {colorart} - {2022/06/16} {} + {2022/09/03} {} {A colorful article style} \tl_const:Nn \l__colorclass_base_class_tl { article } @@ -65,7 +64,7 @@ \PassOptionsToPackage { \CurrentOption } { colorist } } } -\ProcessKeysOptions { colorclass } +\ProcessKeyOptions [ colorclass ] \LoadClass{\l__colorclass_base_class_tl} @@ -122,9 +121,6 @@ \RequirePackage { colorist } -\raggedbottom -\hfuzz=2pt -\vfuzz=2pt %%================================ %% Fonts @@ -132,6 +128,15 @@ \WarningFilter { latexfont } { Font~shape } \WarningFilter { latexfont } { Some~font } +\hook_gput_code:nnn { begindocument/before } { colorclass } + { + \IfPackageLoadedTF { biblatex } + { + \PassOptionsToPackage { biblatex } { embrac } + } {} + \RequirePackage { embrac } + } + \cs_new_protected:Nn \__colorclass_load_file_or_config:Nnn { \bool_if:NT #1 @@ -154,6 +159,7 @@ { \RequirePackage { mathpazo } \RequirePackage { newpxtext } + \bool_if:NT \l__projlib_font_useosf_bool { \useosf } \RequirePackage { amssymb } \sys_if_engine_pdftex:F { @@ -166,12 +172,40 @@ BoldItalicFont = *-bolditalic , ] } + % Adjusting the kerning of 'embrac' for 'newpxtext' + \hook_gput_code:nnn { begindocument/before } { colorclass } + { + \RenewEmph{[}{]} + \RenewEmph{(}{)} + } } } -\PassOptionsToPackage { all } { nowidow } -\RequirePackage { nowidow } +%%================================ +%% Graphics +%%================================ +\RequirePackage { graphicx } +\graphicspath { { images/ } } +\RequirePackage { wrapfig } +\RequirePackage { float } +\RequirePackage { caption } +\captionsetup { font = small } + +%%================================ +%% Icing on the cake +%%================================ +\bool_if:NT \l__colorclass_fast_bool { \endinput } + +\sys_if_engine_luatex:TF + { + \RequirePackage { lua-widow-control } + \lwcsetup { balanced } + } + { + \PassOptionsToPackage { all } { nowidow } + \RequirePackage { nowidow } + } \sys_if_engine_xetex:T { @@ -185,25 +219,6 @@ } } -\hook_gput_code:nnn { begindocument/before } { colorclass } - { - \IfPackageLoadedTF { biblatex } - { - \PassOptionsToPackage { biblatex } { embrac } - } {} - \RequirePackage { embrac } - } - -%%================================ -%% Graphics -%%================================ -\RequirePackage { graphicx } -\graphicspath { { images/ } } -\RequirePackage { wrapfig } -\RequirePackage { float } -\RequirePackage { caption } -\captionsetup { font = small } - \endinput %% %% End of file `colorist/colorart.cls'. diff --git a/Master/texmf-dist/tex/latex/colorist/colorbook.cls b/Master/texmf-dist/tex/latex/colorist/colorbook.cls index 877f6d9cf0e..26c988c87a4 100644 --- a/Master/texmf-dist/tex/latex/colorist/colorbook.cls +++ b/Master/texmf-dist/tex/latex/colorist/colorbook.cls @@ -15,11 +15,10 @@ %% and version 1.3c or later is part of all distributions of LaTeX version %% 2005/12/01 or later. %% -\NeedsTeXFormat{LaTeX2e}[2020-10-01] -\RequirePackage{l3keys2e} +\NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplClass {colorbook} - {2022/06/16} {} + {2022/09/03} {} {A colorful book style} \tl_const:Nn \l__colorclass_base_class_tl { book } @@ -65,7 +64,7 @@ \PassOptionsToPackage { \CurrentOption } { colorist } } } -\ProcessKeysOptions { colorclass } +\ProcessKeyOptions [ colorclass ] \LoadClass{\l__colorclass_base_class_tl} @@ -122,9 +121,6 @@ \RequirePackage { colorist } -\raggedbottom -\hfuzz=2pt -\vfuzz=2pt %%================================ %% Fonts @@ -132,6 +128,15 @@ \WarningFilter { latexfont } { Font~shape } \WarningFilter { latexfont } { Some~font } +\hook_gput_code:nnn { begindocument/before } { colorclass } + { + \IfPackageLoadedTF { biblatex } + { + \PassOptionsToPackage { biblatex } { embrac } + } {} + \RequirePackage { embrac } + } + \cs_new_protected:Nn \__colorclass_load_file_or_config:Nnn { \bool_if:NT #1 @@ -154,6 +159,7 @@ { \RequirePackage { mathpazo } \RequirePackage { newpxtext } + \bool_if:NT \l__projlib_font_useosf_bool { \useosf } \RequirePackage { amssymb } \sys_if_engine_pdftex:F { @@ -166,12 +172,40 @@ BoldItalicFont = *-bolditalic , ] } + % Adjusting the kerning of 'embrac' for 'newpxtext' + \hook_gput_code:nnn { begindocument/before } { colorclass } + { + \RenewEmph{[}{]} + \RenewEmph{(}{)} + } } } -\PassOptionsToPackage { all } { nowidow } -\RequirePackage { nowidow } +%%================================ +%% Graphics +%%================================ +\RequirePackage { graphicx } +\graphicspath { { images/ } } +\RequirePackage { wrapfig } +\RequirePackage { float } +\RequirePackage { caption } +\captionsetup { font = small } + +%%================================ +%% Icing on the cake +%%================================ +\bool_if:NT \l__colorclass_fast_bool { \endinput } + +\sys_if_engine_luatex:TF + { + \RequirePackage { lua-widow-control } + \lwcsetup { balanced } + } + { + \PassOptionsToPackage { all } { nowidow } + \RequirePackage { nowidow } + } \sys_if_engine_xetex:T { @@ -185,25 +219,6 @@ } } -\hook_gput_code:nnn { begindocument/before } { colorclass } - { - \IfPackageLoadedTF { biblatex } - { - \PassOptionsToPackage { biblatex } { embrac } - } {} - \RequirePackage { embrac } - } - -%%================================ -%% Graphics -%%================================ -\RequirePackage { graphicx } -\graphicspath { { images/ } } -\RequirePackage { wrapfig } -\RequirePackage { float } -\RequirePackage { caption } -\captionsetup { font = small } - \endinput %% %% End of file `colorist/colorbook.cls'. diff --git a/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty b/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty index cc3db07f88b..409bb5b7c99 100644 --- a/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty +++ b/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty @@ -15,11 +15,10 @@ %% and version 1.3c or later is part of all distributions of LaTeX version %% 2005/12/01 or later. %% -\NeedsTeXFormat{LaTeX2e}[2020-10-01] -\RequirePackage{l3keys2e} +\NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {colorist-fancy} - {2022/06/16} {} + {2022/09/03} {} {The fancy style of colorist} \IfPackageLoadedTF { colorist } {} @@ -405,9 +404,15 @@ \titleformat{\paragraph}[runin] {\color{main-text!50!paper} \g_colorist_title_font_paragraph_tl }{\theparagraph}{1em}{#1} -\titlespacing{\section}{0pt}{\baselineskip}{.6\baselineskip} -\titlespacing{\subsection}{0pt}{.75\baselineskip}{.4\baselineskip} -\titlespacing{\subsubsection}{0pt}{.5\baselineskip}{.3\baselineskip} +\titlespacing{\section}{0pt}{1\baselineskip plus .5\baselineskip minus .2\baselineskip}{.6\baselineskip plus .3\baselineskip minus .2\baselineskip} +\titlespacing{\subsection}{0pt}{.75\baselineskip plus .3\baselineskip minus .2\baselineskip}{.4\baselineskip plus .2\baselineskip minus .1\baselineskip} +\bool_if:NTF \l__colorist_runin_bool + { + \titlespacing{\subsubsection}{0pt}{.5\baselineskip plus .2\baselineskip minus .1\baselineskip}{0pt} + } + { + \titlespacing{\subsubsection}{0pt}{.5\baselineskip plus .2\baselineskip minus .1\baselineskip}{.3\baselineskip plus .2\baselineskip minus .1\baselineskip} + } %%================================ %% ToC format @@ -476,21 +481,21 @@ \setlistdepth{10} \setlist{noitemsep, topsep=.33\topsep-.5\parskip} \setlist[enumerate]{labelsep=*, leftmargin=*} -\setlist[enumerate,1]{label=\arabic*$)$, - ref = \arabic*$)$} -\setlist[enumerate,2]{label=\emph{\roman*}$)$, - ref = \arabic{enumi}.\emph{\roman*}$)$} -\setlist[enumerate,3]{label=\emph{\alph*}$)$, - ref = \arabic{enumi}.\emph{\roman{enumii}}.\emph{\alph*}$)$} +\setlist[enumerate,1]{label = \normalfont\arabic*$\mskip-.5mu\big)$, + ref = \normalfont\color{.!45!paper}\arabic*$\mskip-.5mu\big)$} +\setlist[enumerate,2]{label = \normalfont\emph{\roman*}$\mskip-.5mu\big)$, + ref = \normalfont\color{.!45!paper}\arabic{enumi}.\emph{\roman*}$\mskip-.5mu\big)$} +\setlist[enumerate,3]{label = \normalfont\emph{\alph*}$\mskip-.5mu\big)$, + ref = \normalfont\color{.!45!paper}\arabic{enumi}.\emph{\roman{enumii}}.\emph{\alph*}$\mskip-.5mu\big)$} \setlist[description]{font=\normalfont\colorist_bfseries:} \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}{\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$}} +\setlist[itemize]{leftmargin=*,label=\textcolor{.!27!paper}{$\cdot$}} +\AddLanguageSetting { \setlist[itemize,1]{label=\textcolor{.!27!paper}{$\bullet$},leftmargin=\maxof{\parindent}{1.5em}} } +\AddLanguageSetting [french] { \setlist[itemize,1]{label=\textcolor{.!39!paper}{\rule[.2\baselineskip]{.8em}{.75pt}},leftmargin=\maxof{\parindent}{1.5em}} } +\setlist[itemize,2]{label=\textcolor{.!27!paper}{\rule[.2\baselineskip]{.55em}{.75pt}}} +\setlist[itemize,3]{label=\textcolor{.!27!paper}{$\circ$}} +\setlist[itemize,4]{label=\textcolor{.!27!paper}{$\ast$}} %%================================ %% Blank page @@ -557,8 +562,17 @@ heading_suffix "}\n" \newcommand*{\IndexDotfill} { - \leaders \hbox to .67em {\hss \textcolor{main-text!15!paper}{.} \hss} \hfill + \null\nobreak + \leaders \hbox to .67em {\hss \textcolor{main-text!15!paper}{.} \hss} \hskip1em plus1fill + } +\newcommand*{\IndexLinebreak} + { + \nobreakspace\textcolor{main-text!45!paper}{\raisebox{.4ex}{.}\raisebox{.2ex}{.}} + \item\hspace*{\hangindent} + \textcolor{main-text!45!paper}{\raisebox{.45ex}{.}\raisebox{.25ex}{.}}\: + \unskip } + \newcommand*{\IndexHeading}[1] { \str_if_eq:nnTF { #1 } { Symbols } @@ -582,7 +596,7 @@ heading_suffix "}\n" \renewcommand*{\indexspace} { \par - \vspace{2pc ~ plus ~ .5pc ~ minus ~ .3pc} + \vspace{2pc plus .5pc minus .3pc} } \bool_new:N \l__colorist_if_first_subitem_bool @@ -654,6 +668,10 @@ heading_suffix "}\n" \RequirePackage { mathtools } \RequirePackage { amsthm } +\def\tagform@#1{\maketag@@@{\textcolor{main-text!39!paper}{(\ignorespaces#1\unskip\@@italiccorr)}}} + +\PassOptionsToPackage { nopatch = eqnum } { microtype } + \bool_if:NTF \l__colorist_theorem_in_new_line_bool { \newtheoremstyle{simple} @@ -678,9 +696,9 @@ heading_suffix "}\n" {\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}}\nobreakspace\nobreakspace{\normalfont\textcolor{main-text!27!paper}{---}}\nobreakspace\nobreakspace} } -\renewcommand{\qedsymbol}{ +\newcommand{\customqedsymbol}{ \makebox[1em]{\color{main-text!27!paper}\rule[-0.1em]{.95em}{.95em}}} -\let\qedsymbolOriginal\qedsymbol +\let\qedsymbol\customqedsymbol \bool_if:NTF \l__colorist_theorem_in_new_line_bool { @@ -735,6 +753,13 @@ heading_suffix "}\n" \hypersetup{ hidelinks, linktoc = all } \bookmarksetup{ numbered } \renewcommand\Hy@numberline[1]{#1.~} + % https://tex.stackexchange.com/a/1821 + % Add the bookmark of ToC + \hook_gput_code:nnn { cmd/tableofcontents/before } { colorist } + { + \if@openright\cleardoublepage\else\clearpage\fi + \pdfbookmark[0]{\contentsname}{toc} + } } @@ -751,7 +776,9 @@ 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, theorem-with-name } +\SetTheorem { proof, proof* } { qed-symbol = { \customqedsymbol } } + +\SetTheorem { theorem, lemma, proposition, corollary, property, axiom, construction, theorem-with-name } { name style = { heading style = { \color{orange}\colorist_bfseries:\g_colorist_title_font_common_tl\textsc } @@ -781,7 +808,7 @@ heading_suffix "}\n" \bool_if:NF \l__projlib_theorem_complexname_bool { - \SetTheorem { theorem, lemma, proposition, corollary, property, axiom, construction, definition-theorem, definition-proposition, theorem-with-name } + \SetTheorem { theorem, lemma, proposition, corollary, property, axiom, construction, theorem-with-name } { name style = { , crefname style = { \color{orange}\colorist_bfseries:\g_colorist_title_font_common_tl\textsc } @@ -923,7 +950,7 @@ heading_suffix "}\n" \tcolorboxenvironment { #1 } { #2 } } -\colorist_add_colorbox:nn { theorem, lemma, proposition, corollary, property, axiom, construction, definition-proposition, definition-theorem, theorem-with-name } +\colorist_add_colorbox:nn { theorem, lemma, proposition, corollary, property, axiom, construction, definition-corollary, definition-proposition, definition-theorem, theorem-with-name } { enhanced~jigsaw, breakable, lines~before~break=3, left=3.5mm, right=3.5mm, @@ -931,7 +958,7 @@ heading_suffix "}\n" opacityframe=0.9, colframe=orange, arc=.7mm } - \colorist_add_colorbox:nn { definition, assumption, convention, hypothesis, notation, proposition-definition, theorem-definition } + \colorist_add_colorbox:nn { definition, assumption, convention, hypothesis, notation, corollary-definition, proposition-definition, theorem-definition } { enhanced~jigsaw, breakable, lines~before~break=3, left=4mm, right=4mm, top=1mm, bottom=1mm, @@ -1030,21 +1057,21 @@ heading_suffix "}\n" } \cs_new_protected:Nn \__colorist_add_scan_env_do:n { - \tl_const:cn { l__colorist_scan_env_ #1 } + \tl_const:cn { l__colorist_scan_env_ #1 _tl } { \AfterEnvEnd { \ScanEnv* { #1 } - { \skip_vertical:n { -0.9\baselineskip } } + { \vspace { -1.15\baselineskip } } { \ScanEnv* { #1* } - { \skip_vertical:n { -0.9\baselineskip } } + { \vspace { -1.15\baselineskip } } {} } } } - \hook_gput_code:nnn { env/#1/end } { colorist } { \tl_use:c { l__colorist_scan_env_ #1 } } - \hook_gput_code:nnn { env/#1*/end } { colorist } { \tl_use:c { l__colorist_scan_env_ #1 } } + \hook_gput_code:nnn { env/#1/end } { colorist } { \tl_use:c { l__colorist_scan_env_ #1 _tl } } + \hook_gput_code:nnn { env/#1*/end } { colorist } { \tl_use:c { l__colorist_scan_env_ #1 _tl } } } \colorist_add_scan_env:n { definition, assumption, convention, hypothesis, notation } diff --git a/Master/texmf-dist/tex/latex/colorist/colorist.sty b/Master/texmf-dist/tex/latex/colorist/colorist.sty index 9e7c85109cf..4bbe5b57ecf 100644 --- a/Master/texmf-dist/tex/latex/colorist/colorist.sty +++ b/Master/texmf-dist/tex/latex/colorist/colorist.sty @@ -15,11 +15,10 @@ %% and version 1.3c or later is part of all distributions of LaTeX version %% 2005/12/01 or later. %% -\NeedsTeXFormat{LaTeX2e}[2020-10-01] -\RequirePackage{l3keys2e} +\NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {colorist} - {2022/06/16} {} + {2022/09/03} {} {A colorful style for articles and books} \keys_define:nn { colorist } @@ -74,7 +73,7 @@ \PassOptionsToPackage { \CurrentOption } { projlib-theorem } } } -\ProcessKeysOptions { colorist } +\ProcessKeyOptions [ colorist ] \bool_new:N \l__colorist_is_book_bool \cs_if_exist:cTF { c@chapter } diff --git a/Master/texmf-dist/tex/latex/crefthe/crefthe.sty b/Master/texmf-dist/tex/latex/crefthe/crefthe.sty index 8fc93018ceb..40456ebd51a 100644 --- a/Master/texmf-dist/tex/latex/crefthe/crefthe.sty +++ b/Master/texmf-dist/tex/latex/crefthe/crefthe.sty @@ -12,7 +12,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {crefthe} - {2022/08/28} {} + {2022/09/03} {} {Cross referencing with proper definite articles} \keys_define:nn { crefthe } @@ -141,7 +141,7 @@ \__crefthe_name_general:nnnnnn { #1 } { #2 } { #3 } { #4 } { #5 } { C } } -\cs_new:Npn \crefthe_width_of_space_dim { \tex_fontdimen:D 2 \tex_font:D } +\cs_new:Npn \crefthe_width_of_space_dim { \tex_fontdimen:D 2 \tex_font:D~plus -\tex_fontdimen:D 3 \tex_font:D~minus -\tex_fontdimen:D 4 \tex_font:D } \cs_new:Nn \crefthe_empty_adjust:n { diff --git a/Master/texmf-dist/tex/latex/einfart/einfart.cls b/Master/texmf-dist/tex/latex/einfart/einfart.cls index c27101fa25e..e95c073d6fa 100644 --- a/Master/texmf-dist/tex/latex/einfart/einfart.cls +++ b/Master/texmf-dist/tex/latex/einfart/einfart.cls @@ -15,11 +15,10 @@ %% and version 1.3c or later is part of all distributions of LaTeX version %% 2005/12/01 or later. %% -\NeedsTeXFormat{LaTeX2e}[2020-10-01] -\RequirePackage{l3keys2e} +\NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplClass {einfart} - {2022/06/16} {} + {2022/09/03} {} {A simple and clear article style} \tl_const:Nn \l__minimclass_base_class_tl { article } @@ -133,7 +132,7 @@ \PassOptionsToPackage { \CurrentOption } { minimalist } } } -\ProcessKeysOptions { minimclass } +\ProcessKeyOptions [ minimclass ] \LoadClass{\l__minimclass_base_class_tl} @@ -204,9 +203,6 @@ \RequirePackage { minimalist } -\raggedbottom -\hfuzz=2pt -\vfuzz=2pt %%================================ %% Fonts @@ -214,6 +210,15 @@ \WarningFilter { latexfont } { Font~shape } \WarningFilter { latexfont } { Some~font } +\hook_gput_code:nnn { begindocument/before } { minimclass } + { + \IfPackageLoadedTF { biblatex } + { + \PassOptionsToPackage { biblatex } { embrac } + } {} + \RequirePackage { embrac } + } + \cs_new_protected:Nn \__minimclass_load_file_or_config:Nnn { \bool_if:NT #1 @@ -252,46 +257,62 @@ { \bool_if:NTF \l__projlib_font_useosf_bool { - \setmainfont { TeXGyrePagellaX-Regular.otf } + \setmainfont { TeXGyrePagellaX } [ - BoldFont = TeXGyrePagellaX-Bold.otf , - ItalicFont = TeXGyrePagellaX-Italic.otf , - BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Italic, + BoldItalicFont = *-BoldItalic, Numbers = OldStyle , ] - \setsansfont { SourceSansPro-Regular.otf } + \setsansfont { SourceSansPro } [ - Scale = 1.05 , - BoldFont = SourceSansPro-Semibold.otf , - ItalicFont = SourceSansPro-RegularIt.otf , - BoldItalicFont = SourceSansPro-SemiboldIt.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Semibold, + ItalicFont = *-RegularIt, + BoldItalicFont = *-SemiboldIt, + WordSpace = {1.25, 1, 1} , Numbers = OldStyle , ] } { - \setmainfont { TeXGyrePagellaX-Regular.otf } + \setmainfont { TeXGyrePagellaX } [ - BoldFont = TeXGyrePagellaX-Bold.otf , - ItalicFont = TeXGyrePagellaX-Italic.otf , - BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Italic, + BoldItalicFont = *-BoldItalic, ] - \setsansfont { SourceSansPro-Regular.otf } + \setsansfont { SourceSansPro } [ - Scale = 1.05 , - BoldFont = SourceSansPro-Semibold.otf , - ItalicFont = SourceSansPro-RegularIt.otf , - BoldItalicFont = SourceSansPro-SemiboldIt.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Semibold, + ItalicFont = *-RegularIt, + BoldItalicFont = *-SemiboldIt, + WordSpace = {1.25, 1, 1} , ] } - \setmonofont { NewCMMono10-Regular.otf } + \setmonofont { NewCMMono10 } [ Scale = 1.05 , - BoldFont = NewCMMono10-Bold.otf , - ItalicFont = NewCMMono10-Italic.otf , - BoldItalicFont = NewCMMono10-BoldOblique.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Italic, + BoldItalicFont = *-BoldOblique, ] \projlib_language_set_linespacing_latin:n { \setstretch { 1.07 } } + + \hook_gput_code:nnn { begindocument/before } { minimclass } + { + \RenewEmph{[}{]} + \RenewEmph{(}{)} + } } } @@ -302,48 +323,55 @@ { \__minimclass_if_font_exist:nnn { SourceHanSerifSC-Regular } { - \setCJKmainfont { SourceHanSerifSC-Regular } + \setCJKmainfont { SourceHanSerifSC } [ - BoldFont = SourceHanSerifSC-Bold , - ItalicFont = * , - BoldItalicFont = SourceHanSerifSC-Bold , + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } { - \setCJKmainfont { FandolSong-Regular.otf } + \setCJKmainfont { FandolSong } [ - BoldFont = FandolSong-Bold.otf , - ItalicFont = FandolKai-Regular.otf , - BoldItalicFont = FandolKai-Regular.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = FandolKai-Regular , + BoldItalicFont = FandolKai-Regular , BoldItalicFeatures = { FakeBold = 4 } , ] } \__minimclass_if_font_exist:nnn { SourceHanSansSC-Regular } { - \setCJKsansfont{SourceHanSansSC-Regular} + \setCJKsansfont { SourceHanSansSC } [ - BoldFont = SourceHanSansSC-Bold , - ItalicFont = * , - BoldItalicFont = SourceHanSansSC-Bold , + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } { - \setCJKsansfont { FandolHei-Regular.otf } + \setCJKsansfont { FandolHei } [ - BoldFont = FandolHei-Bold.otf , - ItalicFont = * , - BoldItalicFont = FandolHei-Bold.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } \__minimclass_if_font_exist:nnn { SourceHanMonoSC-Regular } { - \setCJKmonofont { SourceHanMonoSC-Regular } + \setCJKmonofont { SourceHanMonoSC } [ - BoldFont = SourceHanMonoSC-Medium , - ItalicFont = * , - BoldItalicFont = SourceHanMonoSC-Medium , + UprightFont = *-Regular, + BoldFont = *-Medium, + ItalicFont = *-Regular, + BoldItalicFont = *-Medium, ] } { @@ -361,46 +389,53 @@ { \__minimclass_if_font_exist:nnn { SourceHanSerifSC-Regular } { - \setCJKfamilyfont { SCmain } { SourceHanSerifSC-Regular } + \setCJKfamilyfont { SCmain } { SourceHanSerifSC } [ - BoldFont = SourceHanSerifSC-Bold , - ItalicFont = * , - BoldItalicFont = SourceHanSerifSC-Bold , + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } { - \setCJKfamilyfont { SCmain } { FandolSong-Regular.otf } + \setCJKfamilyfont { SCmain } { FandolSong } [ - BoldFont = FandolSong-Bold.otf , - ItalicFont = FandolKai-Regular.otf , - BoldItalicFont = FandolKai-Regular.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = FandolKai-Regular , + BoldItalicFont = FandolKai-Regular , BoldItalicFeatures = { FakeBold = 4 } , ] } \__minimclass_if_font_exist:nnn { SourceHanSansSC-Regular } { - \setCJKfamilyfont { SCsans } { SourceHanSansSC-Regular } + \setCJKfamilyfont { SCsans } { SourceHanSansSC } [ - BoldFont = SourceHanSansSC-Bold , - ItalicFont = * , - BoldItalicFont = SourceHanSansSC-Bold , + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } { - \setCJKfamilyfont { SCsans } { FandolHei-Regular.otf } + \setCJKfamilyfont { SCsans } { FandolHei } [ - BoldFont = FandolHei-Bold.otf , - ItalicFont = * , - BoldItalicFont = FandolHei-Bold.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } \__minimclass_if_font_exist:nnn { SourceHanMonoSC-Regular } { - \setCJKfamilyfont { SCmono } { SourceHanMonoSC-Regular } + \setCJKfamilyfont { SCmono } { SourceHanMonoSC } [ - BoldFont = SourceHanMonoSC-Medium , - ItalicFont = * , - BoldItalicFont = SourceHanMonoSC-Medium , + UprightFont = *-Regular, + BoldFont = *-Medium, + ItalicFont = *-Regular, + BoldItalicFont = *-Medium, ] } { @@ -419,46 +454,53 @@ { \__minimclass_if_font_exist:nnn { SourceHanSerifTC-Regular } { - \setCJKfamilyfont { TCmain } { SourceHanSerifTC-Regular } + \setCJKfamilyfont { TCmain } { SourceHanSerifTC } [ - BoldFont = SourceHanSerifTC-Bold , - ItalicFont = * , - BoldItalicFont = SourceHanSerifTC-Bold , + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } { - \setCJKfamilyfont { TCmain } { FandolSong-Regular.otf } + \setCJKfamilyfont { TCmain } { FandolSong } [ - BoldFont = FandolSong-Bold.otf , - ItalicFont = FandolKai-Regular.otf , - BoldItalicFont = FandolKai-Regular.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = FandolKai-Regular , + BoldItalicFont = FandolKai-Regular , BoldItalicFeatures = { FakeBold = 4 } , ] } \__minimclass_if_font_exist:nnn { SourceHanSansTC-Regular } { - \setCJKfamilyfont { TCsans } { SourceHanSansTC-Regular } + \setCJKfamilyfont { TCsans } { SourceHanSansTC } [ - BoldFont = SourceHanSansTC-Bold , - ItalicFont = * , - BoldItalicFont = SourceHanSansTC-Bold , + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } { - \setCJKfamilyfont { TCsans } { FandolHei-Regular.otf } + \setCJKfamilyfont { TCsans } { FandolHei } [ - BoldFont = FandolHei-Bold.otf , - ItalicFont = * , - BoldItalicFont = FandolHei-Bold.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } \__minimclass_if_font_exist:nnn { SourceHanMonoTC-Regular } { - \setCJKfamilyfont { TCmono } { SourceHanMonoTC-Regular } + \setCJKfamilyfont { TCmono } { SourceHanMonoTC } [ - BoldFont = SourceHanMonoTC-Medium , - ItalicFont = * , - BoldItalicFont = SourceHanMonoTC-Medium , + UprightFont = *-Regular, + BoldFont = *-Medium, + ItalicFont = *-Regular, + BoldItalicFont = *-Medium, ] } { @@ -477,46 +519,53 @@ { \__minimclass_if_font_exist:nnn { SourceHanSerif-Regular } { - \setCJKfamilyfont { JPmain } { SourceHanSerif-Regular } + \setCJKfamilyfont { JPmain } { SourceHanSerif } [ - BoldFont = SourceHanSerif-Bold , - ItalicFont = * , - BoldItalicFont = SourceHanSerif-Bold , + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } { - \setCJKfamilyfont { JPmain } { FandolSong-Regular.otf } + \setCJKfamilyfont { JPmain } { FandolSong } [ - BoldFont = FandolSong-Bold.otf , - ItalicFont = FandolKai-Regular.otf , - BoldItalicFont = FandolKai-Regular.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = FandolKai-Regular , + BoldItalicFont = FandolKai-Regular , BoldItalicFeatures = { FakeBold = 4 } , ] } \__minimclass_if_font_exist:nnn { SourceHanSans-Regular } { - \setCJKfamilyfont { JPsans } { SourceHanSans-Regular } + \setCJKfamilyfont { JPsans } { SourceHanSans } [ - BoldFont = SourceHanSans-Bold , - ItalicFont = * , - BoldItalicFont = SourceHanSans-Bold , + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } { - \setCJKfamilyfont { JPsans } { FandolHei-Regular.otf } + \setCJKfamilyfont { JPsans } { FandolHei } [ - BoldFont = FandolHei-Bold.otf , - ItalicFont = * , - BoldItalicFont = FandolHei-Bold.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } \__minimclass_if_font_exist:nnn { SourceHanMono-Regular } { - \setCJKfamilyfont { JPmono } { SourceHanMono-Regular } + \setCJKfamilyfont { JPmono } { SourceHanMono } [ - BoldFont = SourceHanMono-Medium , - ItalicFont = * , - BoldItalicFont = SourceHanMono-Medium , + UprightFont = *-Regular, + BoldFont = *-Medium, + ItalicFont = *-Regular, + BoldItalicFont = *-Medium, ] } { @@ -570,9 +619,14 @@ \RequirePackage { unicode-math } \unimathsetup { math-style = ISO, partial = upright, nabla = upright } \setmathfont { KpMath-Regular.otf } + \setmathfont { KpMath-Regular.otf } + [ + range = \amalg , + Scale = 0.84625 + ] \setmathfont { KpMath-Sans.otf } [ - range = { \sum, \prod, \coprod } + range = { \sum } ] \setmathfont { latinmodern-math.otf } [ @@ -606,7 +660,7 @@ \cs_gset_eq:NN \square \mdwhtsquare } - % A temporary hack proposed in https://tex.stackexchange.com/a/647789 + % https://tex.stackexchange.com/a/647789 \hook_gput_code:nnn { begindocument } { minimclass } { \NewCommandCopy\unicodevdots\vdots @@ -692,8 +746,30 @@ \char_set_catcode_active:n { `\· } \cs_new_protected:Npn · { \ensuremath\cdot } -\PassOptionsToPackage { all } { nowidow } -\RequirePackage { nowidow } +%%================================ +%% Graphics +%%================================ +\RequirePackage { graphicx } +\graphicspath { { images/ } } +\RequirePackage { wrapfig } +\RequirePackage { float } +\RequirePackage { caption } +\captionsetup { font = small } + +%%================================ +%% Icing on the cake +%%================================ +\bool_if:NT \l__minimclass_fast_bool { \endinput } + +\sys_if_engine_luatex:TF + { + \RequirePackage { lua-widow-control } + \lwcsetup { balanced } + } + { + \PassOptionsToPackage { all } { nowidow } + \RequirePackage { nowidow } + } \sys_if_engine_xetex:T { @@ -707,25 +783,6 @@ } } -\hook_gput_code:nnn { begindocument/before } { minimclass } - { - \IfPackageLoadedTF { biblatex } - { - \PassOptionsToPackage { biblatex } { embrac } - } {} - \RequirePackage { embrac } - } - -%%================================ -%% Graphics -%%================================ -\RequirePackage { graphicx } -\graphicspath { { images/ } } -\RequirePackage { wrapfig } -\RequirePackage { float } -\RequirePackage { caption } -\captionsetup { font = small } - \endinput %% %% End of file `einfart/einfart.cls'. diff --git a/Master/texmf-dist/tex/latex/lebhart/lebhart.cls b/Master/texmf-dist/tex/latex/lebhart/lebhart.cls index 9635010f702..a78a85bccd8 100644 --- a/Master/texmf-dist/tex/latex/lebhart/lebhart.cls +++ b/Master/texmf-dist/tex/latex/lebhart/lebhart.cls @@ -15,11 +15,10 @@ %% and version 1.3c or later is part of all distributions of LaTeX version %% 2005/12/01 or later. %% -\NeedsTeXFormat{LaTeX2e}[2020-10-01] -\RequirePackage{l3keys2e} +\NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplClass {lebhart} - {2022/06/16} {} + {2022/09/03} {} {A colorful article style} \tl_const:Nn \l__colorclass_base_class_tl { article } @@ -126,7 +125,7 @@ \PassOptionsToPackage { \CurrentOption } { colorist } } } -\ProcessKeysOptions { colorclass } +\ProcessKeyOptions [ colorclass ] \LoadClass{\l__colorclass_base_class_tl} @@ -183,9 +182,6 @@ \RequirePackage { colorist } -\raggedbottom -\hfuzz=2pt -\vfuzz=2pt %%================================ %% Fonts @@ -193,6 +189,15 @@ \WarningFilter { latexfont } { Font~shape } \WarningFilter { latexfont } { Some~font } +\hook_gput_code:nnn { begindocument/before } { colorclass } + { + \IfPackageLoadedTF { biblatex } + { + \PassOptionsToPackage { biblatex } { embrac } + } {} + \RequirePackage { embrac } + } + \cs_new_protected:Nn \__colorclass_load_file_or_config:Nnn { \bool_if:NT #1 @@ -231,46 +236,62 @@ { \bool_if:NTF \l__projlib_font_useosf_bool { - \setmainfont { TeXGyrePagellaX-Regular.otf } + \setmainfont { TeXGyrePagellaX } [ - BoldFont = TeXGyrePagellaX-Bold.otf , - ItalicFont = TeXGyrePagellaX-Italic.otf , - BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Italic, + BoldItalicFont = *-BoldItalic, Numbers = OldStyle , ] - \setsansfont { SourceSansPro-Regular.otf } + \setsansfont { SourceSansPro } [ - Scale = 1.05 , - BoldFont = SourceSansPro-Semibold.otf , - ItalicFont = SourceSansPro-RegularIt.otf , - BoldItalicFont = SourceSansPro-SemiboldIt.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Semibold, + ItalicFont = *-RegularIt, + BoldItalicFont = *-SemiboldIt, + WordSpace = {1.25, 1, 1} , Numbers = OldStyle , ] } { - \setmainfont { TeXGyrePagellaX-Regular.otf } + \setmainfont { TeXGyrePagellaX } [ - BoldFont = TeXGyrePagellaX-Bold.otf , - ItalicFont = TeXGyrePagellaX-Italic.otf , - BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Italic, + BoldItalicFont = *-BoldItalic, ] - \setsansfont { SourceSansPro-Regular.otf } + \setsansfont { SourceSansPro } [ - Scale = 1.05 , - BoldFont = SourceSansPro-Semibold.otf , - ItalicFont = SourceSansPro-RegularIt.otf , - BoldItalicFont = SourceSansPro-SemiboldIt.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Semibold, + ItalicFont = *-RegularIt, + BoldItalicFont = *-SemiboldIt, + WordSpace = {1.25, 1, 1} , ] } - \setmonofont { NewCMMono10-Regular.otf } + \setmonofont { NewCMMono10 } [ Scale = 1.05 , - BoldFont = NewCMMono10-Bold.otf , - ItalicFont = NewCMMono10-Italic.otf , - BoldItalicFont = NewCMMono10-BoldOblique.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Italic, + BoldItalicFont = *-BoldOblique, ] \projlib_language_set_linespacing_latin:n { \setstretch { 1.07 } } + + \hook_gput_code:nnn { begindocument/before } { colorclass } + { + \RenewEmph{[}{]} + \RenewEmph{(}{)} + } } } @@ -281,48 +302,55 @@ { \__colorclass_if_font_exist:nnn { SourceHanSerifSC-Regular } { - \setCJKmainfont { SourceHanSerifSC-Regular } + \setCJKmainfont { SourceHanSerifSC } [ - BoldFont = SourceHanSerifSC-Bold , - ItalicFont = * , - BoldItalicFont = SourceHanSerifSC-Bold , + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } { - \setCJKmainfont { FandolSong-Regular.otf } + \setCJKmainfont { FandolSong } [ - BoldFont = FandolSong-Bold.otf , - ItalicFont = FandolKai-Regular.otf , - BoldItalicFont = FandolKai-Regular.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = FandolKai-Regular , + BoldItalicFont = FandolKai-Regular , BoldItalicFeatures = { FakeBold = 4 } , ] } \__colorclass_if_font_exist:nnn { SourceHanSansSC-Regular } { - \setCJKsansfont{SourceHanSansSC-Regular} + \setCJKsansfont { SourceHanSansSC } [ - BoldFont = SourceHanSansSC-Bold , - ItalicFont = * , - BoldItalicFont = SourceHanSansSC-Bold , + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } { - \setCJKsansfont { FandolHei-Regular.otf } + \setCJKsansfont { FandolHei } [ - BoldFont = FandolHei-Bold.otf , - ItalicFont = * , - BoldItalicFont = FandolHei-Bold.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } \__colorclass_if_font_exist:nnn { SourceHanMonoSC-Regular } { - \setCJKmonofont { SourceHanMonoSC-Regular } + \setCJKmonofont { SourceHanMonoSC } [ - BoldFont = SourceHanMonoSC-Medium , - ItalicFont = * , - BoldItalicFont = SourceHanMonoSC-Medium , + UprightFont = *-Regular, + BoldFont = *-Medium, + ItalicFont = *-Regular, + BoldItalicFont = *-Medium, ] } { @@ -340,46 +368,53 @@ { \__colorclass_if_font_exist:nnn { SourceHanSerifSC-Regular } { - \setCJKfamilyfont { SCmain } { SourceHanSerifSC-Regular } + \setCJKfamilyfont { SCmain } { SourceHanSerifSC } [ - BoldFont = SourceHanSerifSC-Bold , - ItalicFont = * , - BoldItalicFont = SourceHanSerifSC-Bold , + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } { - \setCJKfamilyfont { SCmain } { FandolSong-Regular.otf } + \setCJKfamilyfont { SCmain } { FandolSong } [ - BoldFont = FandolSong-Bold.otf , - ItalicFont = FandolKai-Regular.otf , - BoldItalicFont = FandolKai-Regular.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = FandolKai-Regular , + BoldItalicFont = FandolKai-Regular , BoldItalicFeatures = { FakeBold = 4 } , ] } \__colorclass_if_font_exist:nnn { SourceHanSansSC-Regular } { - \setCJKfamilyfont { SCsans } { SourceHanSansSC-Regular } + \setCJKfamilyfont { SCsans } { SourceHanSansSC } [ - BoldFont = SourceHanSansSC-Bold , - ItalicFont = * , - BoldItalicFont = SourceHanSansSC-Bold , + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } { - \setCJKfamilyfont { SCsans } { FandolHei-Regular.otf } + \setCJKfamilyfont { SCsans } { FandolHei } [ - BoldFont = FandolHei-Bold.otf , - ItalicFont = * , - BoldItalicFont = FandolHei-Bold.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } \__colorclass_if_font_exist:nnn { SourceHanMonoSC-Regular } { - \setCJKfamilyfont { SCmono } { SourceHanMonoSC-Regular } + \setCJKfamilyfont { SCmono } { SourceHanMonoSC } [ - BoldFont = SourceHanMonoSC-Medium , - ItalicFont = * , - BoldItalicFont = SourceHanMonoSC-Medium , + UprightFont = *-Regular, + BoldFont = *-Medium, + ItalicFont = *-Regular, + BoldItalicFont = *-Medium, ] } { @@ -398,46 +433,53 @@ { \__colorclass_if_font_exist:nnn { SourceHanSerifTC-Regular } { - \setCJKfamilyfont { TCmain } { SourceHanSerifTC-Regular } + \setCJKfamilyfont { TCmain } { SourceHanSerifTC } [ - BoldFont = SourceHanSerifTC-Bold , - ItalicFont = * , - BoldItalicFont = SourceHanSerifTC-Bold , + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } { - \setCJKfamilyfont { TCmain } { FandolSong-Regular.otf } + \setCJKfamilyfont { TCmain } { FandolSong } [ - BoldFont = FandolSong-Bold.otf , - ItalicFont = FandolKai-Regular.otf , - BoldItalicFont = FandolKai-Regular.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = FandolKai-Regular , + BoldItalicFont = FandolKai-Regular , BoldItalicFeatures = { FakeBold = 4 } , ] } \__colorclass_if_font_exist:nnn { SourceHanSansTC-Regular } { - \setCJKfamilyfont { TCsans } { SourceHanSansTC-Regular } + \setCJKfamilyfont { TCsans } { SourceHanSansTC } [ - BoldFont = SourceHanSansTC-Bold , - ItalicFont = * , - BoldItalicFont = SourceHanSansTC-Bold , + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } { - \setCJKfamilyfont { TCsans } { FandolHei-Regular.otf } + \setCJKfamilyfont { TCsans } { FandolHei } [ - BoldFont = FandolHei-Bold.otf , - ItalicFont = * , - BoldItalicFont = FandolHei-Bold.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } \__colorclass_if_font_exist:nnn { SourceHanMonoTC-Regular } { - \setCJKfamilyfont { TCmono } { SourceHanMonoTC-Regular } + \setCJKfamilyfont { TCmono } { SourceHanMonoTC } [ - BoldFont = SourceHanMonoTC-Medium , - ItalicFont = * , - BoldItalicFont = SourceHanMonoTC-Medium , + UprightFont = *-Regular, + BoldFont = *-Medium, + ItalicFont = *-Regular, + BoldItalicFont = *-Medium, ] } { @@ -456,46 +498,53 @@ { \__colorclass_if_font_exist:nnn { SourceHanSerif-Regular } { - \setCJKfamilyfont { JPmain } { SourceHanSerif-Regular } + \setCJKfamilyfont { JPmain } { SourceHanSerif } [ - BoldFont = SourceHanSerif-Bold , - ItalicFont = * , - BoldItalicFont = SourceHanSerif-Bold , + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } { - \setCJKfamilyfont { JPmain } { FandolSong-Regular.otf } + \setCJKfamilyfont { JPmain } { FandolSong } [ - BoldFont = FandolSong-Bold.otf , - ItalicFont = FandolKai-Regular.otf , - BoldItalicFont = FandolKai-Regular.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = FandolKai-Regular , + BoldItalicFont = FandolKai-Regular , BoldItalicFeatures = { FakeBold = 4 } , ] } \__colorclass_if_font_exist:nnn { SourceHanSans-Regular } { - \setCJKfamilyfont { JPsans } { SourceHanSans-Regular } + \setCJKfamilyfont { JPsans } { SourceHanSans } [ - BoldFont = SourceHanSans-Bold , - ItalicFont = * , - BoldItalicFont = SourceHanSans-Bold , + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } { - \setCJKfamilyfont { JPsans } { FandolHei-Regular.otf } + \setCJKfamilyfont { JPsans } { FandolHei } [ - BoldFont = FandolHei-Bold.otf , - ItalicFont = * , - BoldItalicFont = FandolHei-Bold.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } \__colorclass_if_font_exist:nnn { SourceHanMono-Regular } { - \setCJKfamilyfont { JPmono } { SourceHanMono-Regular } + \setCJKfamilyfont { JPmono } { SourceHanMono } [ - BoldFont = SourceHanMono-Medium , - ItalicFont = * , - BoldItalicFont = SourceHanMono-Medium , + UprightFont = *-Regular, + BoldFont = *-Medium, + ItalicFont = *-Regular, + BoldItalicFont = *-Medium, ] } { @@ -547,9 +596,14 @@ \RequirePackage { unicode-math } \unimathsetup { math-style = ISO, partial = upright, nabla = upright } \setmathfont { KpMath-Regular.otf } + \setmathfont { KpMath-Regular.otf } + [ + range = \amalg , + Scale = 0.84625 + ] \setmathfont { KpMath-Sans.otf } [ - range = { \sum, \prod, \coprod } + range = { \sum } ] \setmathfont { latinmodern-math.otf } [ @@ -583,8 +637,8 @@ \cs_gset_eq:NN \square \mdwhtsquare } - % A temporary hack proposed in https://tex.stackexchange.com/a/647789 - \hook_gput_code:nnn { begindocument } { minimclass } + % https://tex.stackexchange.com/a/647789 + \hook_gput_code:nnn { begindocument } { colorclass } { \NewCommandCopy\unicodevdots\vdots \RenewDocumentCommand{\vdots}{}{\mathrel{\loweredvdots}} @@ -669,8 +723,30 @@ \char_set_catcode_active:n { `\· } \cs_new_protected:Npn · { \ensuremath\cdot } -\PassOptionsToPackage { all } { nowidow } -\RequirePackage { nowidow } +%%================================ +%% Graphics +%%================================ +\RequirePackage { graphicx } +\graphicspath { { images/ } } +\RequirePackage { wrapfig } +\RequirePackage { float } +\RequirePackage { caption } +\captionsetup { font = small } + +%%================================ +%% Icing on the cake +%%================================ +\bool_if:NT \l__colorclass_fast_bool { \endinput } + +\sys_if_engine_luatex:TF + { + \RequirePackage { lua-widow-control } + \lwcsetup { balanced } + } + { + \PassOptionsToPackage { all } { nowidow } + \RequirePackage { nowidow } + } \sys_if_engine_xetex:T { @@ -684,25 +760,6 @@ } } -\hook_gput_code:nnn { begindocument/before } { colorclass } - { - \IfPackageLoadedTF { biblatex } - { - \PassOptionsToPackage { biblatex } { embrac } - } {} - \RequirePackage { embrac } - } - -%%================================ -%% Graphics -%%================================ -\RequirePackage { graphicx } -\graphicspath { { images/ } } -\RequirePackage { wrapfig } -\RequirePackage { float } -\RequirePackage { caption } -\captionsetup { font = small } - \endinput %% %% End of file `lebhart/lebhart.cls'. diff --git a/Master/texmf-dist/tex/latex/minimalist/minimalist-classical.sty b/Master/texmf-dist/tex/latex/minimalist/minimalist-classical.sty index cb0e3df249d..d52f7f51f51 100644 --- a/Master/texmf-dist/tex/latex/minimalist/minimalist-classical.sty +++ b/Master/texmf-dist/tex/latex/minimalist/minimalist-classical.sty @@ -15,11 +15,10 @@ %% and version 1.3c or later is part of all distributions of LaTeX version %% 2005/12/01 or later. %% -\NeedsTeXFormat{LaTeX2e}[2020-10-01] -\RequirePackage{l3keys2e} +\NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {minimalist-classical} - {2022/06/16} {} + {2022/09/03} {} {The classical style of minimalist} \IfPackageLoadedTF { minimalist } {} @@ -469,9 +468,15 @@ \titleformat{\paragraph}[runin] { \g_minimalist_title_font_paragraph_tl }{\theparagraph}{1em}{#1} -\titlespacing{\section}{0pt}{\baselineskip}{.6\baselineskip} -\titlespacing{\subsection}{0pt}{.75\baselineskip}{.4\baselineskip} -\titlespacing{\subsubsection}{0pt}{.5\baselineskip}{.3\baselineskip} +\titlespacing{\section}{0pt}{1\baselineskip plus .5\baselineskip minus .2\baselineskip}{.6\baselineskip plus .3\baselineskip minus .2\baselineskip} +\titlespacing{\subsection}{0pt}{.75\baselineskip plus .3\baselineskip minus .2\baselineskip}{.4\baselineskip plus .2\baselineskip minus .1\baselineskip} +\bool_if:NTF \l__minimalist_runin_bool + { + \titlespacing{\subsubsection}{0pt}{.5\baselineskip plus .2\baselineskip minus .1\baselineskip}{0pt} + } + { + \titlespacing{\subsubsection}{0pt}{.5\baselineskip plus .2\baselineskip minus .1\baselineskip}{.3\baselineskip plus .2\baselineskip minus .1\baselineskip} + } %%================================ %% ToC format @@ -540,26 +545,26 @@ \setlistdepth{10} \setlist{noitemsep, topsep=.33\topsep-.5\parskip} \setlist[enumerate]{labelsep=*, leftmargin=*} -\setlist[enumerate,1]{label=\arabic*$)$, - ref = \arabic*$)$} -\setlist[enumerate,2]{label=\emph{\roman*}$)$, - ref = \arabic{enumi}.\emph{\roman*}$)$} -\setlist[enumerate,3]{label=\emph{\alph*}$)$, - ref = \arabic{enumi}.\emph{\roman{enumii}}.\emph{\alph*}$)$} +\setlist[enumerate,1]{label = \normalfont\arabic*$\mskip-.5mu\big)$, + ref = \normalfont\color{.!45!paper}\arabic*$\mskip-.5mu\big)$} +\setlist[enumerate,2]{label = \normalfont\emph{\roman*}$\mskip-.5mu\big)$, + ref = \normalfont\color{.!45!paper}\arabic{enumi}.\emph{\roman*}$\mskip-.5mu\big)$} +\setlist[enumerate,3]{label = \normalfont\emph{\alph*}$\mskip-.5mu\big)$, + ref = \normalfont\color{.!45!paper}\arabic{enumi}.\emph{\roman{enumii}}.\emph{\alph*}$\mskip-.5mu\big)$} \setlist[description]{font=\normalfont\minimalist_bfseries:} -\newcommand\desculine{\colorlet{currentcolor}{.}\bgroup\markoverwith{\color{currentcolor!55!paper} +\newcommand\desculine{\bgroup\markoverwith{\color{.!55!paper} \rule[-.45ex]{2pt}{.75pt}}\ULon} \renewcommand{\descriptionlabel}[1]{ \hspace{\labelsep}\normalfont\desculine{#1} } \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}{\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$}} +\setlist[itemize]{leftmargin=*,label=\textcolor{.!27!paper}{$\cdot$}} +\AddLanguageSetting { \setlist[itemize,1]{label=\textcolor{.!27!paper}{$\bullet$},leftmargin=\maxof{\parindent}{1.5em}} } +\AddLanguageSetting [french] { \setlist[itemize,1]{label=\textcolor{.!39!paper}{\rule[.2\baselineskip]{.8em}{.75pt}},leftmargin=\maxof{\parindent}{1.5em}} } +\setlist[itemize,2]{label=\textcolor{.!27!paper}{\rule[.2\baselineskip]{.55em}{.75pt}}} +\setlist[itemize,3]{label=\textcolor{.!27!paper}{$\circ$}} +\setlist[itemize,4]{label=\textcolor{.!27!paper}{$\ast$}} %%================================ %% Blank page @@ -626,8 +631,17 @@ heading_suffix "}\n" \newcommand*{\IndexDotfill} { - \leaders \hbox to .67em {\hss \textcolor{main-text!15!paper}{.} \hss} \hfill + \null\nobreak + \leaders \hbox to .67em {\hss \textcolor{main-text!15!paper}{.} \hss} \hskip1em plus1fill + } +\newcommand*{\IndexLinebreak} + { + \nobreakspace\textcolor{main-text!50!paper}{\raisebox{.25ex}{.}\raisebox{.05ex}{.}} + \item\hspace*{\hangindent} + \textcolor{main-text!50!paper}{\raisebox{.35ex}{.}\raisebox{.15ex}{.}}\, + \unskip } + \newcommand*{\IndexHeading}[1] { \str_if_eq:nnTF { #1 } { Symbols } @@ -642,7 +656,7 @@ heading_suffix "}\n" \renewcommand*{\indexspace} { \par - \vspace{2pc ~ plus ~ .5pc ~ minus ~ .3pc} + \vspace{2pc plus .5pc minus .3pc} } \bool_new:N \l__minimalist_if_first_subitem_bool @@ -679,6 +693,10 @@ heading_suffix "}\n" \RequirePackage { mathtools } \RequirePackage { amsthm } +\def\tagform@#1{\maketag@@@{\textcolor{main-text!39!paper}{(\ignorespaces#1\unskip\@@italiccorr)}}} + +\PassOptionsToPackage { nopatch = eqnum } { microtype } + \def\simpleqedsymbol{ \makebox[1em]{\rlap{\textcolor{main-text!12!paper}{\rule[-0.1em]{.95em}{.95em}}}{\kern.07em\raisebox{.07em}{\textcolor{paper}{\rule[-0.1em]{.81em}{.81em}}}\kern.07em}}} \bool_if:NTF \l__minimalist_theorem_in_new_line_bool @@ -715,9 +733,9 @@ heading_suffix "}\n" \theoremstyle{simple} -\renewcommand{\qedsymbol}{ +\newcommand{\customqedsymbol}{ \makebox[1em]{\color{main-text!27!paper}\rule[-0.1em]{.95em}{.95em}}} -\let\qedsymbolOriginal\qedsymbol +\let\qedsymbol\customqedsymbol \bool_if:NTF \l__minimalist_fast_bool { @@ -732,10 +750,19 @@ heading_suffix "}\n" \hypersetup{ hidelinks, linktoc = all } \bookmarksetup{ numbered } \renewcommand\Hy@numberline[1]{#1.~} + % https://tex.stackexchange.com/a/1821 + % Add the bookmark of ToC + \hook_gput_code:nnn { cmd/tableofcontents/before } { minimalist } + { + \if@openright\cleardoublepage\else\clearpage\fi + \pdfbookmark[0]{\contentsname}{toc} + } } \RequirePackage { projlib-theorem } +\SetTheorem { proof, proof* } { qed-symbol = { \customqedsymbol } } + \exp_args:No \SetTheorem { \c_projlib_theorem_supported_clist, theorem-with-name } { name style = { diff --git a/Master/texmf-dist/tex/latex/minimalist/minimalist-plain.sty b/Master/texmf-dist/tex/latex/minimalist/minimalist-plain.sty index 6afa15b14ed..051a773624e 100644 --- a/Master/texmf-dist/tex/latex/minimalist/minimalist-plain.sty +++ b/Master/texmf-dist/tex/latex/minimalist/minimalist-plain.sty @@ -15,11 +15,10 @@ %% and version 1.3c or later is part of all distributions of LaTeX version %% 2005/12/01 or later. %% -\NeedsTeXFormat{LaTeX2e}[2020-10-01] -\RequirePackage{l3keys2e} +\NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {minimalist-plain} - {2022/06/16} {} + {2022/09/03} {} {The plain style of minimalist} \IfPackageLoadedTF { minimalist } {} @@ -443,9 +442,15 @@ \titleformat{\paragraph}[runin] { \g_minimalist_title_font_paragraph_tl }{\theparagraph}{1em}{#1} -\titlespacing{\section}{0pt}{\baselineskip}{.6\baselineskip} -\titlespacing{\subsection}{0pt}{.75\baselineskip}{.4\baselineskip} -\titlespacing{\subsubsection}{0pt}{.5\baselineskip}{.3\baselineskip} +\titlespacing{\section}{0pt}{1\baselineskip plus .5\baselineskip minus .2\baselineskip}{.6\baselineskip plus .3\baselineskip minus .2\baselineskip} +\titlespacing{\subsection}{0pt}{.75\baselineskip plus .3\baselineskip minus .2\baselineskip}{.4\baselineskip plus .2\baselineskip minus .1\baselineskip} +\bool_if:NTF \l__minimalist_runin_bool + { + \titlespacing{\subsubsection}{0pt}{.5\baselineskip plus .2\baselineskip minus .1\baselineskip}{0pt} + } + { + \titlespacing{\subsubsection}{0pt}{.5\baselineskip plus .2\baselineskip minus .1\baselineskip}{.3\baselineskip plus .2\baselineskip minus .1\baselineskip} + } %%================================ %% ToC format @@ -514,21 +519,21 @@ \setlistdepth{10} \setlist{noitemsep, topsep=.33\topsep-.5\parskip} \setlist[enumerate]{labelsep=*, leftmargin=*} -\setlist[enumerate,1]{label=\arabic*$)$, - ref = \arabic*$)$} -\setlist[enumerate,2]{label=\emph{\roman*}$)$, - ref = \arabic{enumi}.\emph{\roman*}$)$} -\setlist[enumerate,3]{label=\emph{\alph*}$)$, - ref = \arabic{enumi}.\emph{\roman{enumii}}.\emph{\alph*}$)$} +\setlist[enumerate,1]{label = \normalfont\arabic*$\mskip-.5mu\big)$, + ref = \normalfont\color{.!45!paper}\arabic*$\mskip-.5mu\big)$} +\setlist[enumerate,2]{label = \normalfont\emph{\roman*}$\mskip-.5mu\big)$, + ref = \normalfont\color{.!45!paper}\arabic{enumi}.\emph{\roman*}$\mskip-.5mu\big)$} +\setlist[enumerate,3]{label = \normalfont\emph{\alph*}$\mskip-.5mu\big)$, + ref = \normalfont\color{.!45!paper}\arabic{enumi}.\emph{\roman{enumii}}.\emph{\alph*}$\mskip-.5mu\big)$} \setlist[description]{font=\normalfont\minimalist_bfseries:} \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}{\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$}} +\setlist[itemize]{leftmargin=*,label=\textcolor{.!27!paper}{$\cdot$}} +\AddLanguageSetting { \setlist[itemize,1]{label=\textcolor{.!27!paper}{$\bullet$},leftmargin=\maxof{\parindent}{1.5em}} } +\AddLanguageSetting [french] { \setlist[itemize,1]{label=\textcolor{.!39!paper}{\rule[.2\baselineskip]{.8em}{.75pt}},leftmargin=\maxof{\parindent}{1.5em}} } +\setlist[itemize,2]{label=\textcolor{.!27!paper}{\rule[.2\baselineskip]{.55em}{.75pt}}} +\setlist[itemize,3]{label=\textcolor{.!27!paper}{$\circ$}} +\setlist[itemize,4]{label=\textcolor{.!27!paper}{$\ast$}} %%================================ %% Blank page @@ -595,8 +600,17 @@ heading_suffix "}\n" \newcommand*{\IndexDotfill} { - \leaders \hbox to .67em {\hss \textcolor{main-text!15!paper}{.} \hss} \hfill + \null\nobreak + \leaders \hbox to .67em {\hss \textcolor{main-text!15!paper}{.} \hss} \hskip1em plus1fill } +\newcommand*{\IndexLinebreak} + { + \nobreakspace\textcolor{main-text!50!paper}{\raisebox{.25ex}{.}\raisebox{.05ex}{.}} + \item\hspace*{\hangindent} + \textcolor{main-text!50!paper}{\raisebox{.35ex}{.}\raisebox{.15ex}{.}}\, + \unskip + } + \newcommand*{\IndexHeading}[1] { \str_if_eq:nnTF { #1 } { Symbols } @@ -611,7 +625,7 @@ heading_suffix "}\n" \renewcommand*{\indexspace} { \par - \vspace{2pc ~ plus ~ .5pc ~ minus ~ .3pc} + \vspace{2pc plus .5pc minus .3pc} } \bool_new:N \l__minimalist_if_first_subitem_bool @@ -648,11 +662,19 @@ heading_suffix "}\n" \RequirePackage { mathtools } \RequirePackage { amsthm } +\def\tagform@#1{\maketag@@@{\textcolor{main-text!39!paper}{(\ignorespaces#1\unskip\@@italiccorr)}}} + +\PassOptionsToPackage { nopatch = eqnum } { microtype } + \bool_if:NTF \l__minimalist_theorem_in_new_line_bool { \newtheoremstyle{simple} {.75\baselineskip}{} - {\normalfont}{} + { + \normalfont + \parindent=0pt + \parskip=.3333\baselineskip plus .0667\baselineskip minus .0833\baselineskip + }{} {\normalfont}{} {0pt} { @@ -665,7 +687,11 @@ heading_suffix "}\n" { \newtheoremstyle{simple} {}{} - {\normalfont}{} + { + \normalfont + \parindent=0pt + \parskip=.3333\baselineskip plus .0667\baselineskip minus .0833\baselineskip + }{} {\normalfont}{} {0pt} {{\thmname{#1}\thmnumber{\nobreakspace #2}} @@ -674,9 +700,9 @@ heading_suffix "}\n" \theoremstyle{simple} -\renewcommand{\qedsymbol}{ +\newcommand{\customqedsymbol}{ \makebox[1em]{\color{main-text!27!paper}\rule[-0.1em]{.95em}{.95em}}} -\let\qedsymbolOriginal\qedsymbol +\let\qedsymbol\customqedsymbol \bool_if:NTF \l__minimalist_fast_bool { @@ -691,10 +717,19 @@ heading_suffix "}\n" \hypersetup{ hidelinks, linktoc = all } \bookmarksetup{ numbered } \renewcommand\Hy@numberline[1]{#1.~} + % https://tex.stackexchange.com/a/1821 + % Add the bookmark of ToC + \hook_gput_code:nnn { cmd/tableofcontents/before } { minimalist } + { + \if@openright\cleardoublepage\else\clearpage\fi + \pdfbookmark[0]{\contentsname}{toc} + } } \RequirePackage { projlib-theorem } +\SetTheorem { proof, proof* } { qed-symbol = { \customqedsymbol } } + \exp_args:No \SetTheorem { \c_projlib_theorem_supported_clist, theorem-with-name } { name style = { diff --git a/Master/texmf-dist/tex/latex/minimalist/minimalist.sty b/Master/texmf-dist/tex/latex/minimalist/minimalist.sty index 910f1e7960c..77be9865b6b 100644 --- a/Master/texmf-dist/tex/latex/minimalist/minimalist.sty +++ b/Master/texmf-dist/tex/latex/minimalist/minimalist.sty @@ -15,11 +15,10 @@ %% and version 1.3c or later is part of all distributions of LaTeX version %% 2005/12/01 or later. %% -\NeedsTeXFormat{LaTeX2e}[2020-10-01] -\RequirePackage{l3keys2e} +\NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {minimalist} - {2022/06/16} {} + {2022/09/03} {} {A simple and clear style for articles and books} \keys_define:nn { minimalist } @@ -74,7 +73,7 @@ \PassOptionsToPackage { \CurrentOption } { projlib-theorem } } } -\ProcessKeysOptions { minimalist } +\ProcessKeyOptions [ minimalist ] \bool_new:N \l__minimalist_is_book_bool \cs_if_exist:cTF { c@chapter } diff --git a/Master/texmf-dist/tex/latex/minimalist/minimart.cls b/Master/texmf-dist/tex/latex/minimalist/minimart.cls index 5ad76079323..4620adb745a 100644 --- a/Master/texmf-dist/tex/latex/minimalist/minimart.cls +++ b/Master/texmf-dist/tex/latex/minimalist/minimart.cls @@ -15,11 +15,10 @@ %% and version 1.3c or later is part of all distributions of LaTeX version %% 2005/12/01 or later. %% -\NeedsTeXFormat{LaTeX2e}[2020-10-01] -\RequirePackage{l3keys2e} +\NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplClass {minimart} - {2022/06/16} {} + {2022/09/03} {} {A simple and clear article style} \tl_const:Nn \l__minimclass_base_class_tl { article } @@ -72,7 +71,7 @@ \PassOptionsToPackage { \CurrentOption } { minimalist } } } -\ProcessKeysOptions { minimclass } +\ProcessKeyOptions [ minimclass ] \LoadClass{\l__minimclass_base_class_tl} @@ -143,9 +142,6 @@ \RequirePackage { minimalist } -\raggedbottom -\hfuzz=2pt -\vfuzz=2pt %%================================ %% Fonts @@ -153,6 +149,15 @@ \WarningFilter { latexfont } { Font~shape } \WarningFilter { latexfont } { Some~font } +\hook_gput_code:nnn { begindocument/before } { minimclass } + { + \IfPackageLoadedTF { biblatex } + { + \PassOptionsToPackage { biblatex } { embrac } + } {} + \RequirePackage { embrac } + } + \cs_new_protected:Nn \__minimclass_load_file_or_config:Nnn { \bool_if:NT #1 @@ -175,6 +180,7 @@ { \RequirePackage { mathpazo } \RequirePackage { newpxtext } + \bool_if:NT \l__projlib_font_useosf_bool { \useosf } \RequirePackage { amssymb } \sys_if_engine_pdftex:F { @@ -187,12 +193,40 @@ BoldItalicFont = *-bolditalic , ] } + % Adjusting the kerning of 'embrac' for 'newpxtext' + \hook_gput_code:nnn { begindocument/before } { minimclass } + { + \RenewEmph{[}{]} + \RenewEmph{(}{)} + } } } -\PassOptionsToPackage { all } { nowidow } -\RequirePackage { nowidow } +%%================================ +%% Graphics +%%================================ +\RequirePackage { graphicx } +\graphicspath { { images/ } } +\RequirePackage { wrapfig } +\RequirePackage { float } +\RequirePackage { caption } +\captionsetup { font = small } + +%%================================ +%% Icing on the cake +%%================================ +\bool_if:NT \l__minimclass_fast_bool { \endinput } + +\sys_if_engine_luatex:TF + { + \RequirePackage { lua-widow-control } + \lwcsetup { balanced } + } + { + \PassOptionsToPackage { all } { nowidow } + \RequirePackage { nowidow } + } \sys_if_engine_xetex:T { @@ -206,25 +240,6 @@ } } -\hook_gput_code:nnn { begindocument/before } { minimclass } - { - \IfPackageLoadedTF { biblatex } - { - \PassOptionsToPackage { biblatex } { embrac } - } {} - \RequirePackage { embrac } - } - -%%================================ -%% Graphics -%%================================ -\RequirePackage { graphicx } -\graphicspath { { images/ } } -\RequirePackage { wrapfig } -\RequirePackage { float } -\RequirePackage { caption } -\captionsetup { font = small } - \endinput %% %% End of file `minimalist/minimart.cls'. diff --git a/Master/texmf-dist/tex/latex/minimalist/minimbook.cls b/Master/texmf-dist/tex/latex/minimalist/minimbook.cls index f844f26ffb7..45908a0e44e 100644 --- a/Master/texmf-dist/tex/latex/minimalist/minimbook.cls +++ b/Master/texmf-dist/tex/latex/minimalist/minimbook.cls @@ -15,11 +15,10 @@ %% and version 1.3c or later is part of all distributions of LaTeX version %% 2005/12/01 or later. %% -\NeedsTeXFormat{LaTeX2e}[2020-10-01] -\RequirePackage{l3keys2e} +\NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplClass {minimbook} - {2022/06/16} {} + {2022/09/03} {} {A simple and clear book style} \tl_const:Nn \l__minimclass_base_class_tl { book } @@ -72,7 +71,7 @@ \PassOptionsToPackage { \CurrentOption } { minimalist } } } -\ProcessKeysOptions { minimclass } +\ProcessKeyOptions [ minimclass ] \LoadClass{\l__minimclass_base_class_tl} @@ -143,9 +142,6 @@ \RequirePackage { minimalist } -\raggedbottom -\hfuzz=2pt -\vfuzz=2pt %%================================ %% Fonts @@ -153,6 +149,15 @@ \WarningFilter { latexfont } { Font~shape } \WarningFilter { latexfont } { Some~font } +\hook_gput_code:nnn { begindocument/before } { minimclass } + { + \IfPackageLoadedTF { biblatex } + { + \PassOptionsToPackage { biblatex } { embrac } + } {} + \RequirePackage { embrac } + } + \cs_new_protected:Nn \__minimclass_load_file_or_config:Nnn { \bool_if:NT #1 @@ -175,6 +180,7 @@ { \RequirePackage { mathpazo } \RequirePackage { newpxtext } + \bool_if:NT \l__projlib_font_useosf_bool { \useosf } \RequirePackage { amssymb } \sys_if_engine_pdftex:F { @@ -187,12 +193,40 @@ BoldItalicFont = *-bolditalic , ] } + % Adjusting the kerning of 'embrac' for 'newpxtext' + \hook_gput_code:nnn { begindocument/before } { minimclass } + { + \RenewEmph{[}{]} + \RenewEmph{(}{)} + } } } -\PassOptionsToPackage { all } { nowidow } -\RequirePackage { nowidow } +%%================================ +%% Graphics +%%================================ +\RequirePackage { graphicx } +\graphicspath { { images/ } } +\RequirePackage { wrapfig } +\RequirePackage { float } +\RequirePackage { caption } +\captionsetup { font = small } + +%%================================ +%% Icing on the cake +%%================================ +\bool_if:NT \l__minimclass_fast_bool { \endinput } + +\sys_if_engine_luatex:TF + { + \RequirePackage { lua-widow-control } + \lwcsetup { balanced } + } + { + \PassOptionsToPackage { all } { nowidow } + \RequirePackage { nowidow } + } \sys_if_engine_xetex:T { @@ -206,25 +240,6 @@ } } -\hook_gput_code:nnn { begindocument/before } { minimclass } - { - \IfPackageLoadedTF { biblatex } - { - \PassOptionsToPackage { biblatex } { embrac } - } {} - \RequirePackage { embrac } - } - -%%================================ -%% Graphics -%%================================ -\RequirePackage { graphicx } -\graphicspath { { images/ } } -\RequirePackage { wrapfig } -\RequirePackage { float } -\RequirePackage { caption } -\captionsetup { font = small } - \endinput %% %% End of file `minimalist/minimbook.cls'. diff --git a/Master/texmf-dist/tex/latex/simplivre/simplivre.cls b/Master/texmf-dist/tex/latex/simplivre/simplivre.cls index 25377b24b8e..cedeb63c85c 100644 --- a/Master/texmf-dist/tex/latex/simplivre/simplivre.cls +++ b/Master/texmf-dist/tex/latex/simplivre/simplivre.cls @@ -15,11 +15,10 @@ %% and version 1.3c or later is part of all distributions of LaTeX version %% 2005/12/01 or later. %% -\NeedsTeXFormat{LaTeX2e}[2020-10-01] -\RequirePackage{l3keys2e} +\NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplClass {simplivre} - {2022/06/16} {} + {2022/09/03} {} {A simple and clear book style} \tl_const:Nn \l__minimclass_base_class_tl { book } @@ -133,7 +132,7 @@ \PassOptionsToPackage { \CurrentOption } { minimalist } } } -\ProcessKeysOptions { minimclass } +\ProcessKeyOptions [ minimclass ] \LoadClass{\l__minimclass_base_class_tl} @@ -204,9 +203,6 @@ \RequirePackage { minimalist } -\raggedbottom -\hfuzz=2pt -\vfuzz=2pt %%================================ %% Fonts @@ -214,6 +210,15 @@ \WarningFilter { latexfont } { Font~shape } \WarningFilter { latexfont } { Some~font } +\hook_gput_code:nnn { begindocument/before } { minimclass } + { + \IfPackageLoadedTF { biblatex } + { + \PassOptionsToPackage { biblatex } { embrac } + } {} + \RequirePackage { embrac } + } + \cs_new_protected:Nn \__minimclass_load_file_or_config:Nnn { \bool_if:NT #1 @@ -252,46 +257,62 @@ { \bool_if:NTF \l__projlib_font_useosf_bool { - \setmainfont { TeXGyrePagellaX-Regular.otf } + \setmainfont { TeXGyrePagellaX } [ - BoldFont = TeXGyrePagellaX-Bold.otf , - ItalicFont = TeXGyrePagellaX-Italic.otf , - BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Italic, + BoldItalicFont = *-BoldItalic, Numbers = OldStyle , ] - \setsansfont { SourceSansPro-Regular.otf } + \setsansfont { SourceSansPro } [ - Scale = 1.05 , - BoldFont = SourceSansPro-Semibold.otf , - ItalicFont = SourceSansPro-RegularIt.otf , - BoldItalicFont = SourceSansPro-SemiboldIt.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Semibold, + ItalicFont = *-RegularIt, + BoldItalicFont = *-SemiboldIt, + WordSpace = {1.25, 1, 1} , Numbers = OldStyle , ] } { - \setmainfont { TeXGyrePagellaX-Regular.otf } + \setmainfont { TeXGyrePagellaX } [ - BoldFont = TeXGyrePagellaX-Bold.otf , - ItalicFont = TeXGyrePagellaX-Italic.otf , - BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Italic, + BoldItalicFont = *-BoldItalic, ] - \setsansfont { SourceSansPro-Regular.otf } + \setsansfont { SourceSansPro } [ - Scale = 1.05 , - BoldFont = SourceSansPro-Semibold.otf , - ItalicFont = SourceSansPro-RegularIt.otf , - BoldItalicFont = SourceSansPro-SemiboldIt.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Semibold, + ItalicFont = *-RegularIt, + BoldItalicFont = *-SemiboldIt, + WordSpace = {1.25, 1, 1} , ] } - \setmonofont { NewCMMono10-Regular.otf } + \setmonofont { NewCMMono10 } [ Scale = 1.05 , - BoldFont = NewCMMono10-Bold.otf , - ItalicFont = NewCMMono10-Italic.otf , - BoldItalicFont = NewCMMono10-BoldOblique.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Italic, + BoldItalicFont = *-BoldOblique, ] \projlib_language_set_linespacing_latin:n { \setstretch { 1.07 } } + + \hook_gput_code:nnn { begindocument/before } { minimclass } + { + \RenewEmph{[}{]} + \RenewEmph{(}{)} + } } } @@ -302,48 +323,55 @@ { \__minimclass_if_font_exist:nnn { SourceHanSerifSC-Regular } { - \setCJKmainfont { SourceHanSerifSC-Regular } + \setCJKmainfont { SourceHanSerifSC } [ - BoldFont = SourceHanSerifSC-Bold , - ItalicFont = * , - BoldItalicFont = SourceHanSerifSC-Bold , + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } { - \setCJKmainfont { FandolSong-Regular.otf } + \setCJKmainfont { FandolSong } [ - BoldFont = FandolSong-Bold.otf , - ItalicFont = FandolKai-Regular.otf , - BoldItalicFont = FandolKai-Regular.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = FandolKai-Regular , + BoldItalicFont = FandolKai-Regular , BoldItalicFeatures = { FakeBold = 4 } , ] } \__minimclass_if_font_exist:nnn { SourceHanSansSC-Regular } { - \setCJKsansfont{SourceHanSansSC-Regular} + \setCJKsansfont { SourceHanSansSC } [ - BoldFont = SourceHanSansSC-Bold , - ItalicFont = * , - BoldItalicFont = SourceHanSansSC-Bold , + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } { - \setCJKsansfont { FandolHei-Regular.otf } + \setCJKsansfont { FandolHei } [ - BoldFont = FandolHei-Bold.otf , - ItalicFont = * , - BoldItalicFont = FandolHei-Bold.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } \__minimclass_if_font_exist:nnn { SourceHanMonoSC-Regular } { - \setCJKmonofont { SourceHanMonoSC-Regular } + \setCJKmonofont { SourceHanMonoSC } [ - BoldFont = SourceHanMonoSC-Medium , - ItalicFont = * , - BoldItalicFont = SourceHanMonoSC-Medium , + UprightFont = *-Regular, + BoldFont = *-Medium, + ItalicFont = *-Regular, + BoldItalicFont = *-Medium, ] } { @@ -361,46 +389,53 @@ { \__minimclass_if_font_exist:nnn { SourceHanSerifSC-Regular } { - \setCJKfamilyfont { SCmain } { SourceHanSerifSC-Regular } + \setCJKfamilyfont { SCmain } { SourceHanSerifSC } [ - BoldFont = SourceHanSerifSC-Bold , - ItalicFont = * , - BoldItalicFont = SourceHanSerifSC-Bold , + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } { - \setCJKfamilyfont { SCmain } { FandolSong-Regular.otf } + \setCJKfamilyfont { SCmain } { FandolSong } [ - BoldFont = FandolSong-Bold.otf , - ItalicFont = FandolKai-Regular.otf , - BoldItalicFont = FandolKai-Regular.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = FandolKai-Regular , + BoldItalicFont = FandolKai-Regular , BoldItalicFeatures = { FakeBold = 4 } , ] } \__minimclass_if_font_exist:nnn { SourceHanSansSC-Regular } { - \setCJKfamilyfont { SCsans } { SourceHanSansSC-Regular } + \setCJKfamilyfont { SCsans } { SourceHanSansSC } [ - BoldFont = SourceHanSansSC-Bold , - ItalicFont = * , - BoldItalicFont = SourceHanSansSC-Bold , + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } { - \setCJKfamilyfont { SCsans } { FandolHei-Regular.otf } + \setCJKfamilyfont { SCsans } { FandolHei } [ - BoldFont = FandolHei-Bold.otf , - ItalicFont = * , - BoldItalicFont = FandolHei-Bold.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } \__minimclass_if_font_exist:nnn { SourceHanMonoSC-Regular } { - \setCJKfamilyfont { SCmono } { SourceHanMonoSC-Regular } + \setCJKfamilyfont { SCmono } { SourceHanMonoSC } [ - BoldFont = SourceHanMonoSC-Medium , - ItalicFont = * , - BoldItalicFont = SourceHanMonoSC-Medium , + UprightFont = *-Regular, + BoldFont = *-Medium, + ItalicFont = *-Regular, + BoldItalicFont = *-Medium, ] } { @@ -419,46 +454,53 @@ { \__minimclass_if_font_exist:nnn { SourceHanSerifTC-Regular } { - \setCJKfamilyfont { TCmain } { SourceHanSerifTC-Regular } + \setCJKfamilyfont { TCmain } { SourceHanSerifTC } [ - BoldFont = SourceHanSerifTC-Bold , - ItalicFont = * , - BoldItalicFont = SourceHanSerifTC-Bold , + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } { - \setCJKfamilyfont { TCmain } { FandolSong-Regular.otf } + \setCJKfamilyfont { TCmain } { FandolSong } [ - BoldFont = FandolSong-Bold.otf , - ItalicFont = FandolKai-Regular.otf , - BoldItalicFont = FandolKai-Regular.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = FandolKai-Regular , + BoldItalicFont = FandolKai-Regular , BoldItalicFeatures = { FakeBold = 4 } , ] } \__minimclass_if_font_exist:nnn { SourceHanSansTC-Regular } { - \setCJKfamilyfont { TCsans } { SourceHanSansTC-Regular } + \setCJKfamilyfont { TCsans } { SourceHanSansTC } [ - BoldFont = SourceHanSansTC-Bold , - ItalicFont = * , - BoldItalicFont = SourceHanSansTC-Bold , + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } { - \setCJKfamilyfont { TCsans } { FandolHei-Regular.otf } + \setCJKfamilyfont { TCsans } { FandolHei } [ - BoldFont = FandolHei-Bold.otf , - ItalicFont = * , - BoldItalicFont = FandolHei-Bold.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } \__minimclass_if_font_exist:nnn { SourceHanMonoTC-Regular } { - \setCJKfamilyfont { TCmono } { SourceHanMonoTC-Regular } + \setCJKfamilyfont { TCmono } { SourceHanMonoTC } [ - BoldFont = SourceHanMonoTC-Medium , - ItalicFont = * , - BoldItalicFont = SourceHanMonoTC-Medium , + UprightFont = *-Regular, + BoldFont = *-Medium, + ItalicFont = *-Regular, + BoldItalicFont = *-Medium, ] } { @@ -477,46 +519,53 @@ { \__minimclass_if_font_exist:nnn { SourceHanSerif-Regular } { - \setCJKfamilyfont { JPmain } { SourceHanSerif-Regular } + \setCJKfamilyfont { JPmain } { SourceHanSerif } [ - BoldFont = SourceHanSerif-Bold , - ItalicFont = * , - BoldItalicFont = SourceHanSerif-Bold , + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } { - \setCJKfamilyfont { JPmain } { FandolSong-Regular.otf } + \setCJKfamilyfont { JPmain } { FandolSong } [ - BoldFont = FandolSong-Bold.otf , - ItalicFont = FandolKai-Regular.otf , - BoldItalicFont = FandolKai-Regular.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = FandolKai-Regular , + BoldItalicFont = FandolKai-Regular , BoldItalicFeatures = { FakeBold = 4 } , ] } \__minimclass_if_font_exist:nnn { SourceHanSans-Regular } { - \setCJKfamilyfont { JPsans } { SourceHanSans-Regular } + \setCJKfamilyfont { JPsans } { SourceHanSans } [ - BoldFont = SourceHanSans-Bold , - ItalicFont = * , - BoldItalicFont = SourceHanSans-Bold , + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } { - \setCJKfamilyfont { JPsans } { FandolHei-Regular.otf } + \setCJKfamilyfont { JPsans } { FandolHei } [ - BoldFont = FandolHei-Bold.otf , - ItalicFont = * , - BoldItalicFont = FandolHei-Bold.otf , + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Regular, + BoldItalicFont = *-Bold, ] } \__minimclass_if_font_exist:nnn { SourceHanMono-Regular } { - \setCJKfamilyfont { JPmono } { SourceHanMono-Regular } + \setCJKfamilyfont { JPmono } { SourceHanMono } [ - BoldFont = SourceHanMono-Medium , - ItalicFont = * , - BoldItalicFont = SourceHanMono-Medium , + UprightFont = *-Regular, + BoldFont = *-Medium, + ItalicFont = *-Regular, + BoldItalicFont = *-Medium, ] } { @@ -570,9 +619,14 @@ \RequirePackage { unicode-math } \unimathsetup { math-style = ISO, partial = upright, nabla = upright } \setmathfont { KpMath-Regular.otf } + \setmathfont { KpMath-Regular.otf } + [ + range = \amalg , + Scale = 0.84625 + ] \setmathfont { KpMath-Sans.otf } [ - range = { \sum, \prod, \coprod } + range = { \sum } ] \setmathfont { latinmodern-math.otf } [ @@ -606,7 +660,7 @@ \cs_gset_eq:NN \square \mdwhtsquare } - % A temporary hack proposed in https://tex.stackexchange.com/a/647789 + % https://tex.stackexchange.com/a/647789 \hook_gput_code:nnn { begindocument } { minimclass } { \NewCommandCopy\unicodevdots\vdots @@ -692,8 +746,30 @@ \char_set_catcode_active:n { `\· } \cs_new_protected:Npn · { \ensuremath\cdot } -\PassOptionsToPackage { all } { nowidow } -\RequirePackage { nowidow } +%%================================ +%% Graphics +%%================================ +\RequirePackage { graphicx } +\graphicspath { { images/ } } +\RequirePackage { wrapfig } +\RequirePackage { float } +\RequirePackage { caption } +\captionsetup { font = small } + +%%================================ +%% Icing on the cake +%%================================ +\bool_if:NT \l__minimclass_fast_bool { \endinput } + +\sys_if_engine_luatex:TF + { + \RequirePackage { lua-widow-control } + \lwcsetup { balanced } + } + { + \PassOptionsToPackage { all } { nowidow } + \RequirePackage { nowidow } + } \sys_if_engine_xetex:T { @@ -707,25 +783,6 @@ } } -\hook_gput_code:nnn { begindocument/before } { minimclass } - { - \IfPackageLoadedTF { biblatex } - { - \PassOptionsToPackage { biblatex } { embrac } - } {} - \RequirePackage { embrac } - } - -%%================================ -%% Graphics -%%================================ -\RequirePackage { graphicx } -\graphicspath { { images/ } } -\RequirePackage { wrapfig } -\RequirePackage { float } -\RequirePackage { caption } -\captionsetup { font = small } - \endinput %% %% End of file `simplivre/simplivre.cls'. |