From 3de8aad561c3a6fb16971dc6c7f68c189e8c4dc1 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 8 Aug 2021 20:56:35 +0000 Subject: jxu (8aug21) git-svn-id: svn://tug.org/texlive/trunk@60195 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/beaulivre/beaulivre.cls | 210 +++++++++++++++++--- Master/texmf-dist/tex/latex/colorist/colorart.cls | 2 +- Master/texmf-dist/tex/latex/colorist/colorbook.cls | 2 +- Master/texmf-dist/tex/latex/colorist/colorist.sty | 114 +++++------ Master/texmf-dist/tex/latex/einfart/einfart.cls | 219 +++++++++++++++++---- Master/texmf-dist/tex/latex/lebhart/lebhart.cls | 210 +++++++++++++++++--- .../texmf-dist/tex/latex/minimalist/minimalist.sty | 162 +++++++-------- .../texmf-dist/tex/latex/minimalist/minimart.cls | 4 +- .../texmf-dist/tex/latex/minimalist/minimbook.cls | 4 +- .../texmf-dist/tex/latex/simplivre/simplivre.cls | 219 +++++++++++++++++---- 10 files changed, 862 insertions(+), 284 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls b/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls index d6f3ef19c4d..52192ad71a4 100644 --- a/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls +++ b/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesClass{beaulivre} - [2021/07/30 A colorful book style] + [2021/08/08 A colorful book style] \def\colorclass@baseclass{book} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -116,6 +116,10 @@ \PassOptionsToPackage{no-math}{fontspec} \RequirePackage{fontspec} + +\IfFileExists{colorist-font.tex}{ + \input{colorist-font.tex} +}{ \IfFontExistsTF{Palatino Linotype}{% \setmainfont{Palatino Linotype} [\if@colorclass@useosf Numbers = OldStyle\fi] @@ -133,59 +137,205 @@ BoldItalicFont = SourceSansPro-BoldIt.otf ] \setmonofont{NewCMMono10-Regular.otf}[ Scale = 1.05 , - BoldFont = NewCMMono10-Book.otf , + BoldFont = NewCMMono10-Bold.otf , ItalicFont = NewCMMono10-Italic.otf , - BoldItalicFont = NewCMMono10-BookItalic.otf ] + BoldItalicFont = NewCMMono10-BoldOblique.otf ] +} \PassOptionsToPackage{fontset=none,scheme=plain}{ctex} \RequirePackage{ctex} -\WarningFilter{everysel}{Everysel is no longer required} -\IfFontExistsTF{FZYOUSK_507R--GBK1-0}{% - \setCJKmainfont{FZYOUSK_507R--GBK1-0}[ - BoldFont = FZYOUSK_509R--GBK1-0 , - BoldFeatures = {FakeBold=4} , + +\IfFileExists{colorist-font.cjk.tex}{ + \input{colorist-font.cjk.tex} +}{ +\IfFontExistsTF{SourceHanSerifSC-Regular}{% + \setCJKmainfont{SourceHanSerifSC-Regular}[ + BoldFont = SourceHanSerifSC-Bold , ItalicFont = * , - BoldItalicFont = FZYOUSK_509R--GBK1-0 , - BoldItalicFeatures = {FakeBold=4} , - SmallCapsFont = * ] + BoldItalicFont = SourceHanSerifSC-Bold ] }{ \setCJKmainfont{FandolSong-Regular.otf}[ BoldFont = FandolSong-Bold.otf , ItalicFont = FandolKai-Regular.otf , BoldItalicFont = FandolKai-Regular.otf , - BoldItalicFeatures = {FakeBold=4} , - SmallCapsFont = * ] + BoldItalicFeatures = {FakeBold=4} ] } -\IfFontExistsTF{FZYOUSK_507R--GBK1-0}{% - \setCJKmonofont{FZYOUSK_507R--GBK1-0}[ - BoldFont = FZYOUSK_509R--GBK1-0 , - BoldFeatures = {FakeBold=4} , + +\IfFontExistsTF{SourceHanSansSC-Regular}{% + \setCJKsansfont{SourceHanSansSC-Regular}[ + BoldFont = SourceHanSansSC-Bold , ItalicFont = * , - BoldItalicFont = FZYOUSK_509R--GBK1-0 , - BoldItalicFeatures = {FakeBold=4} , - SmallCapsFont = * ] + BoldItalicFont = SourceHanSansSC-Bold ] +}{ + \setCJKsansfont{FandolHei-Regular.otf}[ + BoldFont = FandolHei-Bold.otf , + ItalicFont = * , + BoldItalicFont = FandolHei-Bold.otf ] +} + +\IfFontExistsTF{SourceHanMonoSC-Regular}{% + \setCJKmonofont{SourceHanMonoSC-Regular}[ + BoldFont = SourceHanMonoSC-Medium , + ItalicFont = * , + BoldItalicFont = SourceHanMonoSC-Medium ] }{ \setCJKmonofont{FandolFang-Regular.otf}[ BoldFont = * , BoldFeatures = {FakeBold=4} , ItalicFont = * , BoldItalicFont = * , - BoldItalicFeatures = {FakeBold=4} , - SmallCapsFont = * ] + BoldItalicFeatures = {FakeBold=4} ] +} + +\if@PJLlang@enable@CN +\IfFontExistsTF{SourceHanSerifSC-Regular}{% + \setCJKfamilyfont{SCmain}{SourceHanSerifSC-Regular}[ + BoldFont = SourceHanSerifSC-Bold , + ItalicFont = * , + BoldItalicFont = SourceHanSerifSC-Bold ] +}{ + \setCJKfamilyfont{SCmain}{FandolSong-Regular.otf}[ + BoldFont = FandolSong-Bold.otf , + ItalicFont = FandolKai-Regular.otf , + BoldItalicFont = FandolKai-Regular.otf , + BoldItalicFeatures = {FakeBold=4} ] +} +\IfFontExistsTF{SourceHanSansSC-Regular}{% + \setCJKfamilyfont{SCsans}{SourceHanSansSC-Regular}[ + BoldFont = SourceHanSansSC-Bold , + ItalicFont = * , + BoldItalicFont = SourceHanSansSC-Bold ] +}{ + \setCJKfamilyfont{SCsans}{FandolHei-Regular.otf}[ + BoldFont = FandolHei-Bold.otf , + ItalicFont = * , + BoldItalicFont = FandolHei-Bold.otf ] } -\IfFontExistsTF{FZYOUHK_506L--GBK1-0}{% - \setCJKsansfont{FZYOUHK_506L--GBK1-0}[ - BoldFont = FZYOUHK_509R--GBK1-0 , +\IfFontExistsTF{SourceHanMonoSC-Regular}{% + \setCJKfamilyfont{SCmono}{SourceHanMonoSC-Regular}[ + BoldFont = SourceHanMonoSC-Medium , + ItalicFont = * , + BoldItalicFont = SourceHanMonoSC-Medium ] +}{ + \setCJKfamilyfont{SCmono}{FandolFang-Regular.otf}[ + BoldFont = * , BoldFeatures = {FakeBold=4} , ItalicFont = * , - BoldItalicFont = FZYOUHK_509R--GBK1-0 , - SmallCapsFont = * ] + BoldItalicFont = * , + BoldItalicFeatures = {FakeBold=4} ] +} +\fi + +\if@PJLlang@enable@TC +\IfFontExistsTF{SourceHanSerifTC-Regular}{% + \setCJKfamilyfont{TCmain}{SourceHanSerifTC-Regular}[ + BoldFont = SourceHanSerifTC-Bold , + ItalicFont = * , + BoldItalicFont = SourceHanSerifTC-Bold ] }{ - \setCJKsansfont{FandolHei-Regular.otf}[ + \setCJKfamilyfont{TCmain}{FandolSong-Regular.otf}[ + BoldFont = FandolSong-Bold.otf , + ItalicFont = FandolKai-Regular.otf , + BoldItalicFont = FandolKai-Regular.otf , + BoldItalicFeatures = {FakeBold=4} ] +} +\IfFontExistsTF{SourceHanSansTC-Regular}{% + \setCJKfamilyfont{TCsans}{SourceHanSansTC-Regular}[ + BoldFont = SourceHanSansTC-Bold , + ItalicFont = * , + BoldItalicFont = SourceHanSansTC-Bold ] +}{ + \setCJKfamilyfont{TCsans}{FandolHei-Regular.otf}[ BoldFont = FandolHei-Bold.otf , ItalicFont = * , - BoldItalicFont = FandolHei-Bold.otf , - SmallCapsFont = * ] + BoldItalicFont = FandolHei-Bold.otf ] +} +\IfFontExistsTF{SourceHanMonoTC-Regular}{% + \setCJKfamilyfont{TCmono}{SourceHanMonoTC-Regular}[ + BoldFont = SourceHanMonoTC-Medium , + ItalicFont = * , + BoldItalicFont = SourceHanMonoTC-Medium ] +}{ + \setCJKfamilyfont{TCmono}{FandolFang-Regular.otf}[ + BoldFont = * , + BoldFeatures = {FakeBold=4} , + ItalicFont = * , + BoldItalicFont = * , + BoldItalicFeatures = {FakeBold=4} ] +} +\fi + +\if@PJLlang@enable@JP +\IfFontExistsTF{SourceHanSerif-Regular}{% + \setCJKfamilyfont{JPmain}{SourceHanSerif-Regular}[ + BoldFont = SourceHanSerif-Bold , + ItalicFont = * , + BoldItalicFont = SourceHanSerif-Bold ] +}{ + \setCJKfamilyfont{JPmain}{FandolSong-Regular.otf}[ + BoldFont = FandolSong-Bold.otf , + ItalicFont = FandolKai-Regular.otf , + BoldItalicFont = FandolKai-Regular.otf , + BoldItalicFeatures = {FakeBold=4} ] +} +\IfFontExistsTF{SourceHanSans-Regular}{% + \setCJKfamilyfont{JPsans}{SourceHanSans-Regular}[ + BoldFont = SourceHanSans-Bold , + ItalicFont = * , + BoldItalicFont = SourceHanSans-Bold ] +}{ + \setCJKfamilyfont{JPsans}{FandolHei-Regular.otf}[ + BoldFont = FandolHei-Bold.otf , + ItalicFont = * , + BoldItalicFont = FandolHei-Bold.otf ] +} +\IfFontExistsTF{SourceHanMono-Regular}{% + \setCJKfamilyfont{JPmono}{SourceHanMono-Regular}[ + BoldFont = SourceHanMono-Medium , + ItalicFont = * , + BoldItalicFont = SourceHanMono-Medium ] +}{ + \setCJKfamilyfont{JPmono}{FandolFang-Regular.otf}[ + BoldFont = * , + BoldFeatures = {FakeBold=4} , + ItalicFont = * , + BoldItalicFont = * , + BoldItalicFeatures = {FakeBold=4} ] +} +\fi + +\WarningFilter{latexfont}{Font shape} +\WarningFilter{latexfont}{Some font} + +\def\CJKsffamily{} +\def\CJKttfamily{} + +\apptocmd{\sffamily}{\CJKsffamily}{}{\FAIL} +\apptocmd{\ttfamily}{\CJKttfamily}{}{\FAIL} + +\if@PJLlang@enable@CN +\gappto{\PJLlang@langconfig@schinese}{% + \def\CJKsffamily{\CJKfamily{SCsans}}% + \def\CJKttfamily{\CJKfamily{SCmono}}% + \CJKfamily{SCmain}% +} +\fi + +\if@PJLlang@enable@TC +\gappto{\PJLlang@langconfig@tchinese}{% + \def\CJKsffamily{\CJKfamily{TCsans}}% + \def\CJKttfamily{\CJKfamily{TCmono}}% + \CJKfamily{TCmain}% +} +\fi + +\if@PJLlang@enable@JP +\gappto{\PJLlang@langconfig@japanese}{% + \def\CJKsffamily{\CJKfamily{JPsans}}% + \def\CJKttfamily{\CJKfamily{JPmono}}% + \CJKfamily{JPmain}% +} +\fi } \if@colorclass@customfont\else diff --git a/Master/texmf-dist/tex/latex/colorist/colorart.cls b/Master/texmf-dist/tex/latex/colorist/colorart.cls index 5d45070c7ac..4f2a247c674 100644 --- a/Master/texmf-dist/tex/latex/colorist/colorart.cls +++ b/Master/texmf-dist/tex/latex/colorist/colorart.cls @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesClass{colorart} - [2021/07/30 A colorful article style] + [2021/08/08 A colorful article style] \def\colorclass@baseclass{article} \RequirePackage{kvoptions} \RequirePackage{etoolbox} diff --git a/Master/texmf-dist/tex/latex/colorist/colorbook.cls b/Master/texmf-dist/tex/latex/colorist/colorbook.cls index 798ec0bcb3d..cefcb450bb5 100644 --- a/Master/texmf-dist/tex/latex/colorist/colorbook.cls +++ b/Master/texmf-dist/tex/latex/colorist/colorbook.cls @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesClass{colorbook} - [2021/07/30 A colorful book style] + [2021/08/08 A colorful book style] \def\colorclass@baseclass{book} \RequirePackage{kvoptions} \RequirePackage{etoolbox} diff --git a/Master/texmf-dist/tex/latex/colorist/colorist.sty b/Master/texmf-dist/tex/latex/colorist/colorist.sty index 354006dc4b2..f5f9766e09e 100644 --- a/Master/texmf-dist/tex/latex/colorist/colorist.sty +++ b/Master/texmf-dist/tex/latex/colorist/colorist.sty @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesPackage{colorist} - [2021/07/30 A colorful style for articles and books] + [2021/08/08 A colorful style for articles and books] \RequirePackage{kvoptions} \RequirePackage{etoolbox} \SetupKeyvalOptions{% @@ -71,6 +71,7 @@ \ifdefined\c@chapter\IsBooktrue\else\IsBookfalse\fi \let\colorist@sffamily\sffamily +\let\colorist@scshape\scshape \let\colorist@textsc\textsc %%================================ @@ -79,7 +80,7 @@ \RequirePackage{anyfontsize} \newcommand{\partfont}{\conditionalbfseries\colorist@sffamily} -\newcommand{\chapfont}{\conditionalbfseries\colorist@sffamily} +\newcommand{\chapfont}{\conditionalbfseries\colorist@sffamily\colorist@scshape} \newcommand{\secfont}{\conditionalbfseries\colorist@sffamily} \newcommand{\subsecfont}{\conditionalbfseries\colorist@sffamily} \newcommand{\subsubsecfont}{\conditionalbfseries\colorist@sffamily} @@ -169,7 +170,7 @@ \gappto{\PJLlang@langconfig@common}{% \renewcommand{\partstring}{\MakeUppercase{{\partname~\protect\thepart}}}% } -\gappto{\PJLlang@langconfig@chinese}{% +\gappto{\PJLlang@langconfig@schinese}{% \renewcommand{\partstring}{第~\thepart~部分}% } \gappto{\PJLlang@langconfig@tchinese}{% @@ -184,13 +185,25 @@ \titleclass{\part}{top} % make part like a chapter \titleformat{\part}[display] {\partfont\filleft} - {\partstring} + {% + \thispagestyle{empty}% + \begin{tikzpicture}[remember picture,overlay] + \fill[maintheme!10!paper] (current page.north west) rectangle (current page.south east); + \node at ($(current page.north west)+(15em,-15em)$) {\normalfont\textcolor{maintheme}{\scalebox{12}{\thepart}}}; + \end{tikzpicture}% + } {1em} {\fontsize{20}{0}\selectfont\MakeUppercase{#1}} \titleformat{name=\part,numberless}[display] {% \phantomsection\addcontentsline{toc}{part}{#1}% \partfont\filleft} - {\phantom{\MakeUppercase{\partname}}} + {% + \thispagestyle{empty}% + \begin{tikzpicture}[remember picture,overlay] + \fill[maintheme!10!paper] (current page.north west) rectangle (current page.south east); + \node at ($(current page.north west)+(15em,-15em)$) {\normalfont\textcolor{maintheme}{\scalebox{12}{$*$}}}; + \end{tikzpicture}% + } {1em} {\fontsize{20}{0}\selectfont\MakeUppercase{#1}} \titlespacing*{\part}{0pt}{5em}{6em} @@ -207,63 +220,48 @@ } %% Chapter - \newlength{\colorist@chapboxwidth} - - \newcommand{\MakeChapBox}[2]{% - \settowidth{\colorist@chapboxwidth}{#1} - \begin{tcolorbox}[ - enhanced, - skin = bicolor, - frame engine = path, - % sharp corners = all, - width = 0.9\textwidth, - top = 4mm, bottom = 4mm, - arc = .5mm, - sidebyside, - frame hidden, - boxrule = 0mm, - lefthand width = 1.5\colorist@chapboxwidth, - colupper = white, - colback = maintheme!80!paper, - colbacklower = maintheme!20!paper, - sidebyside align=center, - halign=center] - \Huge #1% - \tcblower% - #2% - \end{tcolorbox}% + \newcommand{\TheChapter}[2]{% + \tcbsidebyside[enhanced,sidebyside adapt=right,sidebyside align=bottom, + colback=paper,frame hidden, + segmentation code={ + \filldraw[maintheme] (segmentation.north) + -- ($(segmentation.east)-(12pt,0)$) + -- ($(segmentation.west)+(12pt,0)$) + -- (segmentation.south);} + ]{\filleft#2}{\normalfont\textcolor{maintheme}{\scalebox{4}{#1}}} } - \newcommand{\MakeChapBoxSingle}[1]{% + \newcommand{\TheChapterSingle}[1]{% \begin{tcolorbox}[ enhanced, - width = 0.7\textwidth, - % sharp corners = all, - top = 4mm, bottom = 4mm, - arc = .5mm, - frame hidden, - boxrule = 0mm, - colback = maintheme!20!paper, + width = 0.67\textwidth, + colback=paper,frame hidden, halign=center] #1 + \vspace{-.6em} + \begin{center} + \begin{tikzpicture} + \filldraw[maintheme] (-4em,0) -- (4em,0) -- (0,-.1em) -- (0,.1em); + \end{tikzpicture} + \end{center} \end{tcolorbox} } \titleformat{name=\chapter} - {\filright\chapfont\huge} % Format + {\chapfont\huge} % Format {} % Label {0mm} % Sep - {\MakeChapBox{\thechapter}{#1}} % Before-code + {\TheChapter{\thechapter}{#1}} % Before-code \titlespacing*{name=\chapter} {0em}{*2}{0em} % {left}{before-sep}{after-sep} \titleformat{name=\chapter, numberless} - {\filcenter\chapfont\huge} % Format - {} % Label - {0mm} % Sep - {\MakeChapBoxSingle{#1}} % Before-code + {\filcenter\chapfont\huge} + {} + {0mm} + {\TheChapterSingle{#1}} \titlespacing*{name=\chapter, numberless} - {0em}{*2}{0em} % {left}{before-sep}{after-sep} + {0em}{*2}{0em} %% Section \titleformat{\section} @@ -327,7 +325,7 @@ \titlespacing{\section}{0pt}{\baselineskip}{.6\baselineskip} \titlespacing{\subsection}{0pt}{.75\baselineskip}{.4\baselineskip} -\titlespacing{\subsubsection}{0pt}{.5\baselineskip}{.2\baselineskip} +\titlespacing{\subsubsection}{0pt}{.6\baselineskip}{.3\baselineskip} %%================================ %% TOC format @@ -336,7 +334,7 @@ \titlecontents{part} [0em] {\addvspace{1.5pc}\filcenter\colorist@sffamily} - {\thecontentslabel\nopagebreak\\\nopagebreak\uppercase} + {{\normalfont\color{maintheme}\thecontentslabel}\nopagebreak\\\nopagebreak\uppercase} {} {} % without page number [\addvspace{.5pc}] @@ -360,10 +358,10 @@ {\hspace*{-2.75em}} {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\color{maintext!45!paper}\contentspage} \titlecontents{subsubsection} - [9em] % i.e., 7em (subsection) + 2em + [10em] % i.e., 7em (subsection) + 3em {\normalfont\colorist@sffamily} - {\contentslabel{2.75em}} - {\hspace*{-2.75em}} + {\contentslabel{3.25em}} + {\hspace*{-3.25em}} {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\color{maintext!45!paper}\contentspage} }{ \titlecontents{section} @@ -375,11 +373,11 @@ \titlecontents{subsection} [5em] % i.e., 2em (section) + 3em {\addvspace{.15pc}\normalfont\colorist@sffamily} - {\contentslabel{2.75em}} - {\hspace*{-2.75em}} + {\contentslabel{2.25em}} + {\hspace*{-2.25em}} {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\color{maintext!45!paper}\contentspage} \titlecontents{subsubsection} - [7em] % i.e., 5em (subsection) + 2em + [8em] % i.e., 5em (subsection) + 3em {\normalfont\colorist@sffamily} {\contentslabel{2.75em}} {\hspace*{-2.75em}} @@ -750,8 +748,8 @@ \expandafter\def\csname definition-theoremnameRU\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries{Определение}-\theoremnameRU} \AtEndPreamble{ -\theoremstyle{basic} \if@colorist@nothms\else +\theoremstyle{basic} \if@colorist@nothmnum \CreateTheorem*{theorem} \CreateTheorem*{lemma} @@ -826,9 +824,13 @@ \fi \CreateTheorem*{remark*} \CreateTheorem*{observation*} + +\theoremstyle{simple} \fi } +\theoremstyle{simple} + \creflabelformat{PJLtheorem}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} \creflabelformat{PJLlemma}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} \creflabelformat{PJLproposition}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} @@ -1137,8 +1139,6 @@ }} \fi -\theoremstyle{simple}% as the default style for user-defined environments - \renewenvironment{proof}[1][\proofname]{\par \pushQED{\qed}% \normalfont \topsep6\p@\@plus6\p@\relax @@ -1460,7 +1460,7 @@ %% Abstract style %%================================ \renewenvironment{abstract} -{\small{\centerline{\textsc{\conditionalbfseries\abstractname}}\vspace{-0.3\baselineskip}} +{\small{\centerline{\textsc{\conditionalbfseries\sffamily\abstractname}}\vspace{-0.3\baselineskip}} \color{maintext!80!paper}\begin{quotation}} {\end{quotation}\medskip} diff --git a/Master/texmf-dist/tex/latex/einfart/einfart.cls b/Master/texmf-dist/tex/latex/einfart/einfart.cls index c4d8d43f01f..905e16569cb 100644 --- a/Master/texmf-dist/tex/latex/einfart/einfart.cls +++ b/Master/texmf-dist/tex/latex/einfart/einfart.cls @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesClass{einfart} - [2021/07/30 A simple and clear article style] + [2021/08/08 A simple and clear article style] \def\minimclass@baseclass{article} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -49,7 +49,7 @@ \if@minimclass@draft \@minimclass@fasttrue \fi -\if@minimclass@classical +\if@minimclass@classical\else \@minimclass@useindenttrue \fi \if@minimclass@palatino @@ -123,6 +123,10 @@ \PassOptionsToPackage{no-math}{fontspec} \RequirePackage{fontspec} + +\IfFileExists{minimalist-font.tex}{ + \input{minimalist-font.tex} +}{ \IfFontExistsTF{Palatino Linotype}{% \setmainfont{Palatino Linotype} [\if@minimclass@useosf Numbers = OldStyle\fi] @@ -140,73 +144,208 @@ BoldItalicFont = SourceSansPro-BoldIt.otf ] \setmonofont{NewCMMono10-Regular.otf}[ Scale = 1.05 , - BoldFont = NewCMMono10-Book.otf , + BoldFont = NewCMMono10-Bold.otf , ItalicFont = NewCMMono10-Italic.otf , - BoldItalicFont = NewCMMono10-BookItalic.otf ] + BoldItalicFont = NewCMMono10-BoldOblique.otf ] +} \PassOptionsToPackage{fontset=none,scheme=plain}{ctex} \RequirePackage{ctex} -\WarningFilter{everysel}{Everysel is no longer required} -\IfFontExistsTF{FZYOUSK_507R--GBK1-0}{% - \setCJKmainfont{FZYOUSK_507R--GBK1-0}[ - BoldFont = FZYOUSK_509R--GBK1-0 , - BoldFeatures = {FakeBold=4} , + +\IfFileExists{minimalist-font.cjk.tex}{ + \input{minimalist-font.cjk.tex} +}{ +\IfFontExistsTF{SourceHanSerifSC-Regular}{% + \setCJKmainfont{SourceHanSerifSC-Regular}[ + BoldFont = SourceHanSerifSC-Bold , ItalicFont = * , - BoldItalicFont = FZYOUSK_509R--GBK1-0 , - BoldItalicFeatures = {FakeBold=4} , - SmallCapsFont = * ] + BoldItalicFont = SourceHanSerifSC-Bold ] }{ \setCJKmainfont{FandolSong-Regular.otf}[ BoldFont = FandolSong-Bold.otf , ItalicFont = FandolKai-Regular.otf , BoldItalicFont = FandolKai-Regular.otf , - BoldItalicFeatures = {FakeBold=4} , - SmallCapsFont = * ] + BoldItalicFeatures = {FakeBold=4} ] } -\IfFontExistsTF{FZYOUSK_507R--GBK1-0}{% - \setCJKmonofont{FZYOUSK_507R--GBK1-0}[ - BoldFont = FZYOUSK_509R--GBK1-0 , - BoldFeatures = {FakeBold=4} , + +\IfFontExistsTF{SourceHanSansSC-Regular}{% + \setCJKsansfont{SourceHanSansSC-Regular}[ + BoldFont = SourceHanSansSC-Bold , ItalicFont = * , - BoldItalicFont = FZYOUSK_509R--GBK1-0 , - BoldItalicFeatures = {FakeBold=4} , - SmallCapsFont = * ] + BoldItalicFont = SourceHanSansSC-Bold ] +}{ + \setCJKsansfont{FandolHei-Regular.otf}[ + BoldFont = FandolHei-Bold.otf , + ItalicFont = * , + BoldItalicFont = FandolHei-Bold.otf ] +} + +\IfFontExistsTF{SourceHanMonoSC-Regular}{% + \setCJKmonofont{SourceHanMonoSC-Regular}[ + BoldFont = SourceHanMonoSC-Medium , + ItalicFont = * , + BoldItalicFont = SourceHanMonoSC-Medium ] }{ \setCJKmonofont{FandolFang-Regular.otf}[ BoldFont = * , BoldFeatures = {FakeBold=4} , ItalicFont = * , BoldItalicFont = * , - BoldItalicFeatures = {FakeBold=4} , - SmallCapsFont = * ] + BoldItalicFeatures = {FakeBold=4} ] } -\IfFontExistsTF{FZYOUHK_508R--GBK1-0}{% - \setCJKsansfont{FZYOUHK_508R--GBK1-0}[ - BoldFont = FZYOUHK_509R--GBK1-0 , - BoldFeatures = {FakeBold=4} , + +\if@PJLlang@enable@CN +\IfFontExistsTF{SourceHanSerifSC-Regular}{% + \setCJKfamilyfont{SCmain}{SourceHanSerifSC-Regular}[ + BoldFont = SourceHanSerifSC-Bold , ItalicFont = * , - BoldItalicFont = FZYOUHK_509R--GBK1-0 , - SmallCapsFont = * ] - \setCJKfamilyfont{zhhei}{FZYOUHK_508R--GBK1-0}[ - BoldFont = FZYOUHK_509R--GBK1-0 , + BoldItalicFont = SourceHanSerifSC-Bold ] +}{ + \setCJKfamilyfont{SCmain}{FandolSong-Regular.otf}[ + BoldFont = FandolSong-Bold.otf , + ItalicFont = FandolKai-Regular.otf , + BoldItalicFont = FandolKai-Regular.otf , + BoldItalicFeatures = {FakeBold=4} ] +} +\IfFontExistsTF{SourceHanSansSC-Regular}{% + \setCJKfamilyfont{SCsans}{SourceHanSansSC-Regular}[ + BoldFont = SourceHanSansSC-Bold , + ItalicFont = * , + BoldItalicFont = SourceHanSansSC-Bold ] +}{ + \setCJKfamilyfont{SCsans}{FandolHei-Regular.otf}[ + BoldFont = FandolHei-Bold.otf , + ItalicFont = * , + BoldItalicFont = FandolHei-Bold.otf ] +} +\IfFontExistsTF{SourceHanMonoSC-Regular}{% + \setCJKfamilyfont{SCmono}{SourceHanMonoSC-Regular}[ + BoldFont = SourceHanMonoSC-Medium , + ItalicFont = * , + BoldItalicFont = SourceHanMonoSC-Medium ] +}{ + \setCJKfamilyfont{SCmono}{FandolFang-Regular.otf}[ + BoldFont = * , BoldFeatures = {FakeBold=4} , ItalicFont = * , - BoldItalicFont = FZYOUHK_509R--GBK1-0 , - SmallCapsFont = * ] + BoldItalicFont = * , + BoldItalicFeatures = {FakeBold=4} ] +} +\fi + +\if@PJLlang@enable@TC +\IfFontExistsTF{SourceHanSerifTC-Regular}{% + \setCJKfamilyfont{TCmain}{SourceHanSerifTC-Regular}[ + BoldFont = SourceHanSerifTC-Bold , + ItalicFont = * , + BoldItalicFont = SourceHanSerifTC-Bold ] }{ - \setCJKsansfont{FandolHei-Regular.otf}[ + \setCJKfamilyfont{TCmain}{FandolSong-Regular.otf}[ + BoldFont = FandolSong-Bold.otf , + ItalicFont = FandolKai-Regular.otf , + BoldItalicFont = FandolKai-Regular.otf , + BoldItalicFeatures = {FakeBold=4} ] +} +\IfFontExistsTF{SourceHanSansTC-Regular}{% + \setCJKfamilyfont{TCsans}{SourceHanSansTC-Regular}[ + BoldFont = SourceHanSansTC-Bold , + ItalicFont = * , + BoldItalicFont = SourceHanSansTC-Bold ] +}{ + \setCJKfamilyfont{TCsans}{FandolHei-Regular.otf}[ BoldFont = FandolHei-Bold.otf , ItalicFont = * , - BoldItalicFont = FandolHei-Bold.otf , - SmallCapsFont = * ] - \setCJKfamilyfont{zhhei}{FandolHei-Regular.otf}[ + BoldItalicFont = FandolHei-Bold.otf ] +} +\IfFontExistsTF{SourceHanMonoTC-Regular}{% + \setCJKfamilyfont{TCmono}{SourceHanMonoTC-Regular}[ + BoldFont = SourceHanMonoTC-Medium , + ItalicFont = * , + BoldItalicFont = SourceHanMonoTC-Medium ] +}{ + \setCJKfamilyfont{TCmono}{FandolFang-Regular.otf}[ + BoldFont = * , + BoldFeatures = {FakeBold=4} , + ItalicFont = * , + BoldItalicFont = * , + BoldItalicFeatures = {FakeBold=4} ] +} +\fi + +\if@PJLlang@enable@JP +\IfFontExistsTF{SourceHanSerif-Regular}{% + \setCJKfamilyfont{JPmain}{SourceHanSerif-Regular}[ + BoldFont = SourceHanSerif-Bold , + ItalicFont = * , + BoldItalicFont = SourceHanSerif-Bold ] +}{ + \setCJKfamilyfont{JPmain}{FandolSong-Regular.otf}[ + BoldFont = FandolSong-Bold.otf , + ItalicFont = FandolKai-Regular.otf , + BoldItalicFont = FandolKai-Regular.otf , + BoldItalicFeatures = {FakeBold=4} ] +} +\IfFontExistsTF{SourceHanSans-Regular}{% + \setCJKfamilyfont{JPsans}{SourceHanSans-Regular}[ + BoldFont = SourceHanSans-Bold , + ItalicFont = * , + BoldItalicFont = SourceHanSans-Bold ] +}{ + \setCJKfamilyfont{JPsans}{FandolHei-Regular.otf}[ BoldFont = FandolHei-Bold.otf , ItalicFont = * , - BoldItalicFont = FandolHei-Bold.otf , - SmallCapsFont = * ] + BoldItalicFont = FandolHei-Bold.otf ] +} +\IfFontExistsTF{SourceHanMono-Regular}{% + \setCJKfamilyfont{JPmono}{SourceHanMono-Regular}[ + BoldFont = SourceHanMono-Medium , + ItalicFont = * , + BoldItalicFont = SourceHanMono-Medium ] +}{ + \setCJKfamilyfont{JPmono}{FandolFang-Regular.otf}[ + BoldFont = * , + BoldFeatures = {FakeBold=4} , + ItalicFont = * , + BoldItalicFont = * , + BoldItalicFeatures = {FakeBold=4} ] +} +\fi + +\WarningFilter{latexfont}{Font shape} +\WarningFilter{latexfont}{Some font} + +\def\CJKsffamily{} +\def\CJKttfamily{} + +\apptocmd{\sffamily}{\CJKsffamily}{}{\FAIL} +\apptocmd{\ttfamily}{\CJKttfamily}{}{\FAIL} + +\if@PJLlang@enable@CN +\gappto{\PJLlang@langconfig@schinese}{% + \def\CJKsffamily{\CJKfamily{SCsans}}% + \def\CJKttfamily{\CJKfamily{SCmono}}% + \CJKfamily{SCmain}% +} +\fi + +\if@PJLlang@enable@TC +\gappto{\PJLlang@langconfig@tchinese}{% + \def\CJKsffamily{\CJKfamily{TCsans}}% + \def\CJKttfamily{\CJKfamily{TCmono}}% + \CJKfamily{TCmain}% } +\fi -\def\minimalist@titlefontshape{\CJKfamily{zhhei}} +\if@PJLlang@enable@JP +\gappto{\PJLlang@langconfig@japanese}{% + \def\CJKsffamily{\CJKfamily{JPsans}}% + \def\CJKttfamily{\CJKfamily{JPmono}}% + \CJKfamily{JPmain}% +} +\fi + +\def\minimalist@titlefontshape{\CJKsffamily} +} \if@minimclass@customfont\else \if@minimclass@fast diff --git a/Master/texmf-dist/tex/latex/lebhart/lebhart.cls b/Master/texmf-dist/tex/latex/lebhart/lebhart.cls index f7e3535e489..0c298b39da4 100644 --- a/Master/texmf-dist/tex/latex/lebhart/lebhart.cls +++ b/Master/texmf-dist/tex/latex/lebhart/lebhart.cls @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesClass{lebhart} - [2021/07/30 A colorful article style] + [2021/08/08 A colorful article style] \def\colorclass@baseclass{article} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -116,6 +116,10 @@ \PassOptionsToPackage{no-math}{fontspec} \RequirePackage{fontspec} + +\IfFileExists{colorist-font.tex}{ + \input{colorist-font.tex} +}{ \IfFontExistsTF{Palatino Linotype}{% \setmainfont{Palatino Linotype} [\if@colorclass@useosf Numbers = OldStyle\fi] @@ -133,59 +137,205 @@ BoldItalicFont = SourceSansPro-BoldIt.otf ] \setmonofont{NewCMMono10-Regular.otf}[ Scale = 1.05 , - BoldFont = NewCMMono10-Book.otf , + BoldFont = NewCMMono10-Bold.otf , ItalicFont = NewCMMono10-Italic.otf , - BoldItalicFont = NewCMMono10-BookItalic.otf ] + BoldItalicFont = NewCMMono10-BoldOblique.otf ] +} \PassOptionsToPackage{fontset=none,scheme=plain}{ctex} \RequirePackage{ctex} -\WarningFilter{everysel}{Everysel is no longer required} -\IfFontExistsTF{FZYOUSK_507R--GBK1-0}{% - \setCJKmainfont{FZYOUSK_507R--GBK1-0}[ - BoldFont = FZYOUSK_509R--GBK1-0 , - BoldFeatures = {FakeBold=4} , + +\IfFileExists{colorist-font.cjk.tex}{ + \input{colorist-font.cjk.tex} +}{ +\IfFontExistsTF{SourceHanSerifSC-Regular}{% + \setCJKmainfont{SourceHanSerifSC-Regular}[ + BoldFont = SourceHanSerifSC-Bold , ItalicFont = * , - BoldItalicFont = FZYOUSK_509R--GBK1-0 , - BoldItalicFeatures = {FakeBold=4} , - SmallCapsFont = * ] + BoldItalicFont = SourceHanSerifSC-Bold ] }{ \setCJKmainfont{FandolSong-Regular.otf}[ BoldFont = FandolSong-Bold.otf , ItalicFont = FandolKai-Regular.otf , BoldItalicFont = FandolKai-Regular.otf , - BoldItalicFeatures = {FakeBold=4} , - SmallCapsFont = * ] + BoldItalicFeatures = {FakeBold=4} ] } -\IfFontExistsTF{FZYOUSK_507R--GBK1-0}{% - \setCJKmonofont{FZYOUSK_507R--GBK1-0}[ - BoldFont = FZYOUSK_509R--GBK1-0 , - BoldFeatures = {FakeBold=4} , + +\IfFontExistsTF{SourceHanSansSC-Regular}{% + \setCJKsansfont{SourceHanSansSC-Regular}[ + BoldFont = SourceHanSansSC-Bold , ItalicFont = * , - BoldItalicFont = FZYOUSK_509R--GBK1-0 , - BoldItalicFeatures = {FakeBold=4} , - SmallCapsFont = * ] + BoldItalicFont = SourceHanSansSC-Bold ] +}{ + \setCJKsansfont{FandolHei-Regular.otf}[ + BoldFont = FandolHei-Bold.otf , + ItalicFont = * , + BoldItalicFont = FandolHei-Bold.otf ] +} + +\IfFontExistsTF{SourceHanMonoSC-Regular}{% + \setCJKmonofont{SourceHanMonoSC-Regular}[ + BoldFont = SourceHanMonoSC-Medium , + ItalicFont = * , + BoldItalicFont = SourceHanMonoSC-Medium ] }{ \setCJKmonofont{FandolFang-Regular.otf}[ BoldFont = * , BoldFeatures = {FakeBold=4} , ItalicFont = * , BoldItalicFont = * , - BoldItalicFeatures = {FakeBold=4} , - SmallCapsFont = * ] + BoldItalicFeatures = {FakeBold=4} ] +} + +\if@PJLlang@enable@CN +\IfFontExistsTF{SourceHanSerifSC-Regular}{% + \setCJKfamilyfont{SCmain}{SourceHanSerifSC-Regular}[ + BoldFont = SourceHanSerifSC-Bold , + ItalicFont = * , + BoldItalicFont = SourceHanSerifSC-Bold ] +}{ + \setCJKfamilyfont{SCmain}{FandolSong-Regular.otf}[ + BoldFont = FandolSong-Bold.otf , + ItalicFont = FandolKai-Regular.otf , + BoldItalicFont = FandolKai-Regular.otf , + BoldItalicFeatures = {FakeBold=4} ] +} +\IfFontExistsTF{SourceHanSansSC-Regular}{% + \setCJKfamilyfont{SCsans}{SourceHanSansSC-Regular}[ + BoldFont = SourceHanSansSC-Bold , + ItalicFont = * , + BoldItalicFont = SourceHanSansSC-Bold ] +}{ + \setCJKfamilyfont{SCsans}{FandolHei-Regular.otf}[ + BoldFont = FandolHei-Bold.otf , + ItalicFont = * , + BoldItalicFont = FandolHei-Bold.otf ] } -\IfFontExistsTF{FZYOUHK_506L--GBK1-0}{% - \setCJKsansfont{FZYOUHK_506L--GBK1-0}[ - BoldFont = FZYOUHK_509R--GBK1-0 , +\IfFontExistsTF{SourceHanMonoSC-Regular}{% + \setCJKfamilyfont{SCmono}{SourceHanMonoSC-Regular}[ + BoldFont = SourceHanMonoSC-Medium , + ItalicFont = * , + BoldItalicFont = SourceHanMonoSC-Medium ] +}{ + \setCJKfamilyfont{SCmono}{FandolFang-Regular.otf}[ + BoldFont = * , BoldFeatures = {FakeBold=4} , ItalicFont = * , - BoldItalicFont = FZYOUHK_509R--GBK1-0 , - SmallCapsFont = * ] + BoldItalicFont = * , + BoldItalicFeatures = {FakeBold=4} ] +} +\fi + +\if@PJLlang@enable@TC +\IfFontExistsTF{SourceHanSerifTC-Regular}{% + \setCJKfamilyfont{TCmain}{SourceHanSerifTC-Regular}[ + BoldFont = SourceHanSerifTC-Bold , + ItalicFont = * , + BoldItalicFont = SourceHanSerifTC-Bold ] }{ - \setCJKsansfont{FandolHei-Regular.otf}[ + \setCJKfamilyfont{TCmain}{FandolSong-Regular.otf}[ + BoldFont = FandolSong-Bold.otf , + ItalicFont = FandolKai-Regular.otf , + BoldItalicFont = FandolKai-Regular.otf , + BoldItalicFeatures = {FakeBold=4} ] +} +\IfFontExistsTF{SourceHanSansTC-Regular}{% + \setCJKfamilyfont{TCsans}{SourceHanSansTC-Regular}[ + BoldFont = SourceHanSansTC-Bold , + ItalicFont = * , + BoldItalicFont = SourceHanSansTC-Bold ] +}{ + \setCJKfamilyfont{TCsans}{FandolHei-Regular.otf}[ BoldFont = FandolHei-Bold.otf , ItalicFont = * , - BoldItalicFont = FandolHei-Bold.otf , - SmallCapsFont = * ] + BoldItalicFont = FandolHei-Bold.otf ] +} +\IfFontExistsTF{SourceHanMonoTC-Regular}{% + \setCJKfamilyfont{TCmono}{SourceHanMonoTC-Regular}[ + BoldFont = SourceHanMonoTC-Medium , + ItalicFont = * , + BoldItalicFont = SourceHanMonoTC-Medium ] +}{ + \setCJKfamilyfont{TCmono}{FandolFang-Regular.otf}[ + BoldFont = * , + BoldFeatures = {FakeBold=4} , + ItalicFont = * , + BoldItalicFont = * , + BoldItalicFeatures = {FakeBold=4} ] +} +\fi + +\if@PJLlang@enable@JP +\IfFontExistsTF{SourceHanSerif-Regular}{% + \setCJKfamilyfont{JPmain}{SourceHanSerif-Regular}[ + BoldFont = SourceHanSerif-Bold , + ItalicFont = * , + BoldItalicFont = SourceHanSerif-Bold ] +}{ + \setCJKfamilyfont{JPmain}{FandolSong-Regular.otf}[ + BoldFont = FandolSong-Bold.otf , + ItalicFont = FandolKai-Regular.otf , + BoldItalicFont = FandolKai-Regular.otf , + BoldItalicFeatures = {FakeBold=4} ] +} +\IfFontExistsTF{SourceHanSans-Regular}{% + \setCJKfamilyfont{JPsans}{SourceHanSans-Regular}[ + BoldFont = SourceHanSans-Bold , + ItalicFont = * , + BoldItalicFont = SourceHanSans-Bold ] +}{ + \setCJKfamilyfont{JPsans}{FandolHei-Regular.otf}[ + BoldFont = FandolHei-Bold.otf , + ItalicFont = * , + BoldItalicFont = FandolHei-Bold.otf ] +} +\IfFontExistsTF{SourceHanMono-Regular}{% + \setCJKfamilyfont{JPmono}{SourceHanMono-Regular}[ + BoldFont = SourceHanMono-Medium , + ItalicFont = * , + BoldItalicFont = SourceHanMono-Medium ] +}{ + \setCJKfamilyfont{JPmono}{FandolFang-Regular.otf}[ + BoldFont = * , + BoldFeatures = {FakeBold=4} , + ItalicFont = * , + BoldItalicFont = * , + BoldItalicFeatures = {FakeBold=4} ] +} +\fi + +\WarningFilter{latexfont}{Font shape} +\WarningFilter{latexfont}{Some font} + +\def\CJKsffamily{} +\def\CJKttfamily{} + +\apptocmd{\sffamily}{\CJKsffamily}{}{\FAIL} +\apptocmd{\ttfamily}{\CJKttfamily}{}{\FAIL} + +\if@PJLlang@enable@CN +\gappto{\PJLlang@langconfig@schinese}{% + \def\CJKsffamily{\CJKfamily{SCsans}}% + \def\CJKttfamily{\CJKfamily{SCmono}}% + \CJKfamily{SCmain}% +} +\fi + +\if@PJLlang@enable@TC +\gappto{\PJLlang@langconfig@tchinese}{% + \def\CJKsffamily{\CJKfamily{TCsans}}% + \def\CJKttfamily{\CJKfamily{TCmono}}% + \CJKfamily{TCmain}% +} +\fi + +\if@PJLlang@enable@JP +\gappto{\PJLlang@langconfig@japanese}{% + \def\CJKsffamily{\CJKfamily{JPsans}}% + \def\CJKttfamily{\CJKfamily{JPmono}}% + \CJKfamily{JPmain}% +} +\fi } \if@colorclass@customfont\else diff --git a/Master/texmf-dist/tex/latex/minimalist/minimalist.sty b/Master/texmf-dist/tex/latex/minimalist/minimalist.sty index 9f972f569d5..295019f1c9b 100644 --- a/Master/texmf-dist/tex/latex/minimalist/minimalist.sty +++ b/Master/texmf-dist/tex/latex/minimalist/minimalist.sty @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesPackage{minimalist} - [2021/07/30 A simple and clear style for articles and books] + [2021/08/08 A simple and clear style for articles and books] \RequirePackage{kvoptions} \RequirePackage{etoolbox} \SetupKeyvalOptions{% @@ -81,15 +81,15 @@ \if@minimalist@classical \newcommand{\partfont}{\conditionalbfseries\minimalist@titlefontshape} \newcommand{\chapfont}{\conditionalbfseries\minimalist@titlefontshape} -\newcommand{\secfont}{\conditionalbfseries\minimalist@titlefontshape} -\newcommand{\subsecfont}{\conditionalbfseries\minimalist@titlefontshape} -\newcommand{\subsubsecfont}{\conditionalbfseries\minimalist@titlefontshape\itshape} -\else -\newcommand{\partfont}{\conditionalbfseries\minimalist@titlefontshape} -\newcommand{\chapfont}{\conditionalbfseries\minimalist@titlefontshape} \newcommand{\secfont}{\conditionalbfseries} \newcommand{\subsecfont}{\conditionalbfseries} \newcommand{\subsubsecfont}{\conditionalbfseries\itshape} +\else +\newcommand{\partfont}{\conditionalbfseries\minimalist@titlefontshape} +\newcommand{\chapfont}{\conditionalbfseries\minimalist@titlefontshape} +\newcommand{\secfont}{\conditionalbfseries\minimalist@titlefontshape} +\newcommand{\subsecfont}{\conditionalbfseries\minimalist@titlefontshape} +\newcommand{\subsubsecfont}{\conditionalbfseries\minimalist@titlefontshape\itshape} \fi %%================================ @@ -252,7 +252,7 @@ \gappto{\PJLlang@langconfig@common}{% \renewcommand{\partstring}{\MakeUppercase{{\partname~\protect\thepart}}}% } -\gappto{\PJLlang@langconfig@chinese}{% +\gappto{\PJLlang@langconfig@schinese}{% \renewcommand{\partstring}{第~\thepart~部分}% } \gappto{\PJLlang@langconfig@tchinese}{% @@ -344,14 +344,6 @@ %% Section \if@minimalist@classical -\newcommand\sec@decochar{} -\titleformat{\section} - {\LocallyStopLineNumbers% - \secfont\centering} - {\thesection}{.75em} - {#1} - [\ResumeLineNumbers] -\else \renewcommand\thesection{\arabic{section}} \newcommand\seculine{\bgroup\markoverwith{\color{maintext!27!paper}% \rule[-0.9ex]{2pt}{.6pt}\hspace{-2pt}\rule[-1.2ex]{2pt}{.6pt}}\ULon} @@ -370,17 +362,18 @@ \secfont\centering}{}{0em} {\seculine{#1}} [\ResumeLineNumbers] +\else +\newcommand\sec@decochar{} +\titleformat{\section} + {\LocallyStopLineNumbers% + \secfont\centering} + {\thesection}{.75em} + {#1} + [\ResumeLineNumbers] \fi %% Subsection \if@minimalist@classical -\titleformat{\subsection} - {\LocallyStopLineNumbers% - \subsecfont} - {\thesubsection}{.75em} - {#1} - [\ResumeLineNumbers] -\else \renewcommand\thesubsection{% \ifnum\c@section=0\else\arabic{section}.\fi\arabic{subsection}} \newcommand\subseculine{\bgroup\markoverwith{\color{maintext!27!paper}% @@ -395,6 +388,13 @@ \subsecfont}{}{0em} {\subseculine{#1}} [\ResumeLineNumbers] +\else +\titleformat{\subsection} + {\LocallyStopLineNumbers% + \subsecfont} + {\thesubsection}{.75em} + {#1} + [\ResumeLineNumbers] \fi %% Subsubsection @@ -519,6 +519,23 @@ %%================================ \RequirePackage{amsthm} \if@minimalist@classical +\def\simpleqedsymbol{% + \makebox[1em]{\rlap{\textcolor{maintext!12!paper}{\rule[-0.1em]{.95em}{.95em}}}{\kern.07em\raisebox{.07em}{\textcolor{paper}{\rule[-0.1em]{.81em}{.81em}}}\kern.07em}}} +\newtheoremstyle{simple}% + {}{}% + {\normalfont}{}% + {\normalfont}{}% + {0pt}% + {\global\let\qedsymbol\simpleqedsymbol% + {\conditionalbfseries\thmname{#1}\thmnumber{ #2}}\hspace{.4em}% + \textcolor{maintext!27!paper}{$|$}\hspace{.4em}% + \color{maintext!50!paper}\thmnote{\ensuremath{(\text{#3})}~~}% + \pushQED{\qed}% + } +\def\@endtheorem{\global\let\qedsymbol\simpleqedsymbol% + \popQED\endtrivlist\@endpefalse + \global\let\qedsymbol\qedsymbolOriginal} +\else \newtheoremstyle{simple}% {}{}% {\normalfont}{}% @@ -526,23 +543,6 @@ {0pt}% {{\conditionalbfseries\minimalist@titlefontshape\thmname{#1}\thmnumber{ #2}}% {\color{maintext!50!paper}\thmnote{\hspace{.4em}\ensuremath{(\text{#3})}}}~~{\normalfont---}~~} -\else - \def\simpleqedsymbol{% - \makebox[1em]{\rlap{\textcolor{maintext!12!paper}{\rule[-0.1em]{.95em}{.95em}}}{\kern.07em\raisebox{.07em}{\textcolor{paper}{\rule[-0.1em]{.81em}{.81em}}}\kern.07em}}} - \newtheoremstyle{simple}% - {}{}% - {\normalfont}{}% - {\normalfont}{}% - {0pt}% - {\global\let\qedsymbol\simpleqedsymbol% - {\conditionalbfseries\thmname{#1}\thmnumber{ #2}}\hspace{.4em}% - \textcolor{maintext!27!paper}{$|$}\hspace{.4em}% - \color{maintext!50!paper}\thmnote{\ensuremath{(\text{#3})}~~}% - \pushQED{\qed}% - } - \def\@endtheorem{\global\let\qedsymbol\simpleqedsymbol% - \popQED\endtrivlist\@endpefalse - \global\let\qedsymbol\qedsymbolOriginal} \fi \renewcommand{\qedsymbol}{% @@ -786,19 +786,6 @@ %% Title block style %%================================ \if@minimalist@classical -\renewcommand{\@maketitle}{% - \LocallyStopLineNumbers% - \begin{center}% - {\conditionalbfseries\minimalist@titlefontshape\large\@title}\\\bigskip% - \color{maintext!80!paper}% - {\small\scshape\@author}\\[2pt]% - {\small\@date}% - \end{center}% - \ifx\@date\@empty\bigskip\fi% - \bigskip\par% - \ResumeLineNumbers% -} -\else \renewcommand{\@maketitle}{% \LocallyStopLineNumbers% \noindent% @@ -823,6 +810,19 @@ {\textcolor{maintext!27!paper}{\rule{\textwidth}{0.75pt}}\par}% \ResumeLineNumbers% } +\else +\renewcommand{\@maketitle}{% + \LocallyStopLineNumbers% + \begin{center}% + {\conditionalbfseries\minimalist@titlefontshape\large\@title}\\\bigskip% + \color{maintext!80!paper}% + {\small\scshape\@author}\\[2pt]% + {\small\@date}% + \end{center}% + \ifx\@date\@empty\bigskip\fi% + \bigskip\par% + \ResumeLineNumbers% +} \fi \apptocmd{\maketitle}{\thispagestyle{fancy}}{}{\FAIL} @@ -832,10 +832,10 @@ \if@minimalist@classical \renewenvironment{abstract}{% \LocallyStopLineNumbers% - \vspace{-\baselineskip}% - \begin{center}% - \textsc{\conditionalbfseries\small\abstractname}\\% - \vspace{-.3\baselineskip}% + \begin{flushright}% + \textsc{\conditionalbfseries\small\abstractname}\par% + \vspace{-\parskip}% + \vspace{-.25\baselineskip}% \begin{minipage}[t]{.833\textwidth}% \vspace{0pt}% \color{maintext!80!paper}% @@ -843,17 +843,17 @@ \parindent=2em }{% \end{minipage}% - \end{center}% - \medskip% + \end{flushright}% + \bigskip% \ResumeLineNumbers% } \else \renewenvironment{abstract}{% \LocallyStopLineNumbers% - \begin{flushright}% - \textsc{\conditionalbfseries\small\abstractname}\par% - \vspace{-\parskip}% - \vspace{-.25\baselineskip}% + \vspace{-\baselineskip}% + \begin{center}% + \textsc{\conditionalbfseries\small\abstractname}\\% + \vspace{-.3\baselineskip}% \begin{minipage}[t]{.833\textwidth}% \vspace{0pt}% \color{maintext!80!paper}% @@ -861,8 +861,8 @@ \parindent=2em }{% \end{minipage}% - \end{flushright}% - \bigskip% + \end{center}% + \medskip% \ResumeLineNumbers% } \fi @@ -881,41 +881,41 @@ \if@minimalist@classical \newenvironment{keyword}{% \LocallyStopLineNumbers% - \vspace{-.75\baselineskip}% - \begin{center}% - {\conditionalbfseries\small\csname keywordname\csname\languagename ABBR\endcsname\endcsname}\\% - \vspace{-.3\baselineskip}% + \vspace{-.5\baselineskip}% + \begin{flushright}% + {\conditionalbfseries\small\csname keywordname\csname\languagename ABBR\endcsname\endcsname}\par% + \vspace{-\parskip}% + \vspace{-.30\baselineskip}% \begin{minipage}[t]{.833\textwidth}% \vspace{0pt}% \color{maintext!80!paper}% \footnotesize% \parindent=2em - \begin{center}% + \raggedleft% }{% - \end{center}% \end{minipage}% - \end{center}% - \medskip% + \end{flushright}% + \bigskip% \ResumeLineNumbers% } \else \newenvironment{keyword}{% \LocallyStopLineNumbers% - \vspace{-.5\baselineskip}% - \begin{flushright}% - {\conditionalbfseries\small\csname keywordname\csname\languagename ABBR\endcsname\endcsname}\par% - \vspace{-\parskip}% - \vspace{-.30\baselineskip}% + \vspace{-.75\baselineskip}% + \begin{center}% + {\conditionalbfseries\small\csname keywordname\csname\languagename ABBR\endcsname\endcsname}\\% + \vspace{-.3\baselineskip}% \begin{minipage}[t]{.833\textwidth}% \vspace{0pt}% \color{maintext!80!paper}% \footnotesize% \parindent=2em - \raggedleft% + \begin{center}% }{% + \end{center}% \end{minipage}% - \end{flushright}% - \bigskip% + \end{center}% + \medskip% \ResumeLineNumbers% } \fi diff --git a/Master/texmf-dist/tex/latex/minimalist/minimart.cls b/Master/texmf-dist/tex/latex/minimalist/minimart.cls index a8c8ae4754b..263639cc1b6 100644 --- a/Master/texmf-dist/tex/latex/minimalist/minimart.cls +++ b/Master/texmf-dist/tex/latex/minimalist/minimart.cls @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesClass{minimart} - [2021/07/30 A simple and clear article style] + [2021/08/08 A simple and clear article style] \def\minimclass@baseclass{article} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -49,7 +49,7 @@ \if@minimclass@draft \@minimclass@fasttrue \fi -\if@minimclass@classical +\if@minimclass@classical\else \@minimclass@useindenttrue \fi \if@minimclass@palatino diff --git a/Master/texmf-dist/tex/latex/minimalist/minimbook.cls b/Master/texmf-dist/tex/latex/minimalist/minimbook.cls index 68c787254ae..3a53bfbc8de 100644 --- a/Master/texmf-dist/tex/latex/minimalist/minimbook.cls +++ b/Master/texmf-dist/tex/latex/minimalist/minimbook.cls @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesClass{minimbook} - [2021/07/30 A simple and clear book style] + [2021/08/08 A simple and clear book style] \def\minimclass@baseclass{book} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -49,7 +49,7 @@ \if@minimclass@draft \@minimclass@fasttrue \fi -\if@minimclass@classical +\if@minimclass@classical\else \@minimclass@useindenttrue \fi \if@minimclass@palatino diff --git a/Master/texmf-dist/tex/latex/simplivre/simplivre.cls b/Master/texmf-dist/tex/latex/simplivre/simplivre.cls index f8359a10c4c..c3d14669974 100644 --- a/Master/texmf-dist/tex/latex/simplivre/simplivre.cls +++ b/Master/texmf-dist/tex/latex/simplivre/simplivre.cls @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesClass{simplivre} - [2021/07/30 A simple and clear book style] + [2021/08/08 A simple and clear book style] \def\minimclass@baseclass{book} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -49,7 +49,7 @@ \if@minimclass@draft \@minimclass@fasttrue \fi -\if@minimclass@classical +\if@minimclass@classical\else \@minimclass@useindenttrue \fi \if@minimclass@palatino @@ -123,6 +123,10 @@ \PassOptionsToPackage{no-math}{fontspec} \RequirePackage{fontspec} + +\IfFileExists{minimalist-font.tex}{ + \input{minimalist-font.tex} +}{ \IfFontExistsTF{Palatino Linotype}{% \setmainfont{Palatino Linotype} [\if@minimclass@useosf Numbers = OldStyle\fi] @@ -140,73 +144,208 @@ BoldItalicFont = SourceSansPro-BoldIt.otf ] \setmonofont{NewCMMono10-Regular.otf}[ Scale = 1.05 , - BoldFont = NewCMMono10-Book.otf , + BoldFont = NewCMMono10-Bold.otf , ItalicFont = NewCMMono10-Italic.otf , - BoldItalicFont = NewCMMono10-BookItalic.otf ] + BoldItalicFont = NewCMMono10-BoldOblique.otf ] +} \PassOptionsToPackage{fontset=none,scheme=plain}{ctex} \RequirePackage{ctex} -\WarningFilter{everysel}{Everysel is no longer required} -\IfFontExistsTF{FZYOUSK_507R--GBK1-0}{% - \setCJKmainfont{FZYOUSK_507R--GBK1-0}[ - BoldFont = FZYOUSK_509R--GBK1-0 , - BoldFeatures = {FakeBold=4} , + +\IfFileExists{minimalist-font.cjk.tex}{ + \input{minimalist-font.cjk.tex} +}{ +\IfFontExistsTF{SourceHanSerifSC-Regular}{% + \setCJKmainfont{SourceHanSerifSC-Regular}[ + BoldFont = SourceHanSerifSC-Bold , ItalicFont = * , - BoldItalicFont = FZYOUSK_509R--GBK1-0 , - BoldItalicFeatures = {FakeBold=4} , - SmallCapsFont = * ] + BoldItalicFont = SourceHanSerifSC-Bold ] }{ \setCJKmainfont{FandolSong-Regular.otf}[ BoldFont = FandolSong-Bold.otf , ItalicFont = FandolKai-Regular.otf , BoldItalicFont = FandolKai-Regular.otf , - BoldItalicFeatures = {FakeBold=4} , - SmallCapsFont = * ] + BoldItalicFeatures = {FakeBold=4} ] } -\IfFontExistsTF{FZYOUSK_507R--GBK1-0}{% - \setCJKmonofont{FZYOUSK_507R--GBK1-0}[ - BoldFont = FZYOUSK_509R--GBK1-0 , - BoldFeatures = {FakeBold=4} , + +\IfFontExistsTF{SourceHanSansSC-Regular}{% + \setCJKsansfont{SourceHanSansSC-Regular}[ + BoldFont = SourceHanSansSC-Bold , ItalicFont = * , - BoldItalicFont = FZYOUSK_509R--GBK1-0 , - BoldItalicFeatures = {FakeBold=4} , - SmallCapsFont = * ] + BoldItalicFont = SourceHanSansSC-Bold ] +}{ + \setCJKsansfont{FandolHei-Regular.otf}[ + BoldFont = FandolHei-Bold.otf , + ItalicFont = * , + BoldItalicFont = FandolHei-Bold.otf ] +} + +\IfFontExistsTF{SourceHanMonoSC-Regular}{% + \setCJKmonofont{SourceHanMonoSC-Regular}[ + BoldFont = SourceHanMonoSC-Medium , + ItalicFont = * , + BoldItalicFont = SourceHanMonoSC-Medium ] }{ \setCJKmonofont{FandolFang-Regular.otf}[ BoldFont = * , BoldFeatures = {FakeBold=4} , ItalicFont = * , BoldItalicFont = * , - BoldItalicFeatures = {FakeBold=4} , - SmallCapsFont = * ] + BoldItalicFeatures = {FakeBold=4} ] } -\IfFontExistsTF{FZYOUHK_508R--GBK1-0}{% - \setCJKsansfont{FZYOUHK_508R--GBK1-0}[ - BoldFont = FZYOUHK_509R--GBK1-0 , - BoldFeatures = {FakeBold=4} , + +\if@PJLlang@enable@CN +\IfFontExistsTF{SourceHanSerifSC-Regular}{% + \setCJKfamilyfont{SCmain}{SourceHanSerifSC-Regular}[ + BoldFont = SourceHanSerifSC-Bold , ItalicFont = * , - BoldItalicFont = FZYOUHK_509R--GBK1-0 , - SmallCapsFont = * ] - \setCJKfamilyfont{zhhei}{FZYOUHK_508R--GBK1-0}[ - BoldFont = FZYOUHK_509R--GBK1-0 , + BoldItalicFont = SourceHanSerifSC-Bold ] +}{ + \setCJKfamilyfont{SCmain}{FandolSong-Regular.otf}[ + BoldFont = FandolSong-Bold.otf , + ItalicFont = FandolKai-Regular.otf , + BoldItalicFont = FandolKai-Regular.otf , + BoldItalicFeatures = {FakeBold=4} ] +} +\IfFontExistsTF{SourceHanSansSC-Regular}{% + \setCJKfamilyfont{SCsans}{SourceHanSansSC-Regular}[ + BoldFont = SourceHanSansSC-Bold , + ItalicFont = * , + BoldItalicFont = SourceHanSansSC-Bold ] +}{ + \setCJKfamilyfont{SCsans}{FandolHei-Regular.otf}[ + BoldFont = FandolHei-Bold.otf , + ItalicFont = * , + BoldItalicFont = FandolHei-Bold.otf ] +} +\IfFontExistsTF{SourceHanMonoSC-Regular}{% + \setCJKfamilyfont{SCmono}{SourceHanMonoSC-Regular}[ + BoldFont = SourceHanMonoSC-Medium , + ItalicFont = * , + BoldItalicFont = SourceHanMonoSC-Medium ] +}{ + \setCJKfamilyfont{SCmono}{FandolFang-Regular.otf}[ + BoldFont = * , BoldFeatures = {FakeBold=4} , ItalicFont = * , - BoldItalicFont = FZYOUHK_509R--GBK1-0 , - SmallCapsFont = * ] + BoldItalicFont = * , + BoldItalicFeatures = {FakeBold=4} ] +} +\fi + +\if@PJLlang@enable@TC +\IfFontExistsTF{SourceHanSerifTC-Regular}{% + \setCJKfamilyfont{TCmain}{SourceHanSerifTC-Regular}[ + BoldFont = SourceHanSerifTC-Bold , + ItalicFont = * , + BoldItalicFont = SourceHanSerifTC-Bold ] }{ - \setCJKsansfont{FandolHei-Regular.otf}[ + \setCJKfamilyfont{TCmain}{FandolSong-Regular.otf}[ + BoldFont = FandolSong-Bold.otf , + ItalicFont = FandolKai-Regular.otf , + BoldItalicFont = FandolKai-Regular.otf , + BoldItalicFeatures = {FakeBold=4} ] +} +\IfFontExistsTF{SourceHanSansTC-Regular}{% + \setCJKfamilyfont{TCsans}{SourceHanSansTC-Regular}[ + BoldFont = SourceHanSansTC-Bold , + ItalicFont = * , + BoldItalicFont = SourceHanSansTC-Bold ] +}{ + \setCJKfamilyfont{TCsans}{FandolHei-Regular.otf}[ BoldFont = FandolHei-Bold.otf , ItalicFont = * , - BoldItalicFont = FandolHei-Bold.otf , - SmallCapsFont = * ] - \setCJKfamilyfont{zhhei}{FandolHei-Regular.otf}[ + BoldItalicFont = FandolHei-Bold.otf ] +} +\IfFontExistsTF{SourceHanMonoTC-Regular}{% + \setCJKfamilyfont{TCmono}{SourceHanMonoTC-Regular}[ + BoldFont = SourceHanMonoTC-Medium , + ItalicFont = * , + BoldItalicFont = SourceHanMonoTC-Medium ] +}{ + \setCJKfamilyfont{TCmono}{FandolFang-Regular.otf}[ + BoldFont = * , + BoldFeatures = {FakeBold=4} , + ItalicFont = * , + BoldItalicFont = * , + BoldItalicFeatures = {FakeBold=4} ] +} +\fi + +\if@PJLlang@enable@JP +\IfFontExistsTF{SourceHanSerif-Regular}{% + \setCJKfamilyfont{JPmain}{SourceHanSerif-Regular}[ + BoldFont = SourceHanSerif-Bold , + ItalicFont = * , + BoldItalicFont = SourceHanSerif-Bold ] +}{ + \setCJKfamilyfont{JPmain}{FandolSong-Regular.otf}[ + BoldFont = FandolSong-Bold.otf , + ItalicFont = FandolKai-Regular.otf , + BoldItalicFont = FandolKai-Regular.otf , + BoldItalicFeatures = {FakeBold=4} ] +} +\IfFontExistsTF{SourceHanSans-Regular}{% + \setCJKfamilyfont{JPsans}{SourceHanSans-Regular}[ + BoldFont = SourceHanSans-Bold , + ItalicFont = * , + BoldItalicFont = SourceHanSans-Bold ] +}{ + \setCJKfamilyfont{JPsans}{FandolHei-Regular.otf}[ BoldFont = FandolHei-Bold.otf , ItalicFont = * , - BoldItalicFont = FandolHei-Bold.otf , - SmallCapsFont = * ] + BoldItalicFont = FandolHei-Bold.otf ] +} +\IfFontExistsTF{SourceHanMono-Regular}{% + \setCJKfamilyfont{JPmono}{SourceHanMono-Regular}[ + BoldFont = SourceHanMono-Medium , + ItalicFont = * , + BoldItalicFont = SourceHanMono-Medium ] +}{ + \setCJKfamilyfont{JPmono}{FandolFang-Regular.otf}[ + BoldFont = * , + BoldFeatures = {FakeBold=4} , + ItalicFont = * , + BoldItalicFont = * , + BoldItalicFeatures = {FakeBold=4} ] +} +\fi + +\WarningFilter{latexfont}{Font shape} +\WarningFilter{latexfont}{Some font} + +\def\CJKsffamily{} +\def\CJKttfamily{} + +\apptocmd{\sffamily}{\CJKsffamily}{}{\FAIL} +\apptocmd{\ttfamily}{\CJKttfamily}{}{\FAIL} + +\if@PJLlang@enable@CN +\gappto{\PJLlang@langconfig@schinese}{% + \def\CJKsffamily{\CJKfamily{SCsans}}% + \def\CJKttfamily{\CJKfamily{SCmono}}% + \CJKfamily{SCmain}% +} +\fi + +\if@PJLlang@enable@TC +\gappto{\PJLlang@langconfig@tchinese}{% + \def\CJKsffamily{\CJKfamily{TCsans}}% + \def\CJKttfamily{\CJKfamily{TCmono}}% + \CJKfamily{TCmain}% } +\fi -\def\minimalist@titlefontshape{\CJKfamily{zhhei}} +\if@PJLlang@enable@JP +\gappto{\PJLlang@langconfig@japanese}{% + \def\CJKsffamily{\CJKfamily{JPsans}}% + \def\CJKttfamily{\CJKfamily{JPmono}}% + \CJKfamily{JPmain}% +} +\fi + +\def\minimalist@titlefontshape{\CJKsffamily} +} \if@minimclass@customfont\else \if@minimclass@fast -- cgit v1.2.3