From d1d6cfcf29eb1210b0af247a208dc064ce7411de Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 11 Aug 2021 20:17:23 +0000 Subject: jxu (11aug21) git-svn-id: svn://tug.org/texlive/trunk@60223 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/beaulivre/beaulivre.cls | 9 ++++---- Master/texmf-dist/tex/latex/colorist/colorart.cls | 3 ++- Master/texmf-dist/tex/latex/colorist/colorbook.cls | 3 ++- Master/texmf-dist/tex/latex/colorist/colorist.sty | 19 ++++++++++------ Master/texmf-dist/tex/latex/einfart/einfart.cls | 9 ++++---- Master/texmf-dist/tex/latex/lebhart/lebhart.cls | 9 ++++---- .../texmf-dist/tex/latex/minimalist/minimalist.sty | 25 +++++++++++++++------- .../texmf-dist/tex/latex/minimalist/minimart.cls | 3 ++- .../texmf-dist/tex/latex/minimalist/minimbook.cls | 3 ++- .../texmf-dist/tex/latex/simplivre/simplivre.cls | 9 ++++---- 10 files changed, 58 insertions(+), 34 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls b/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls index 4da4aadc4fe..b7dcdc06fb3 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/08/09 A colorful book style] + [2021/08/11 A colorful book style] \def\colorclass@baseclass{book} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -34,6 +34,7 @@ \DeclareBoolOption[false]{noto} \DeclareBoolOption[false]{biolinum} \DeclareBoolOption[false]{customfont} +\DeclareStringOption{thmnum}[PJL@thmnum@default] \newif\if@colorclass@bfivepaper\@colorclass@bfivepaperfalse \DeclareVoidOption{b5paper}{\@colorclass@bfivepapertrue} @@ -314,7 +315,7 @@ \apptocmd{\ttfamily}{\CJKttfamily}{}{\FAIL} \if@PJLlang@enable@CN -\gappto{\PJLlang@langconfig@schinese}{% +\gappto{\PJLlang@langconfig@CN}{% \def\CJKsffamily{\CJKfamily{SCsans}}% \def\CJKttfamily{\CJKfamily{SCmono}}% \CJKfamily{SCmain}% @@ -322,7 +323,7 @@ \fi \if@PJLlang@enable@TC -\gappto{\PJLlang@langconfig@tchinese}{% +\gappto{\PJLlang@langconfig@TC}{% \def\CJKsffamily{\CJKfamily{TCsans}}% \def\CJKttfamily{\CJKfamily{TCmono}}% \CJKfamily{TCmain}% @@ -330,7 +331,7 @@ \fi \if@PJLlang@enable@JP -\gappto{\PJLlang@langconfig@japanese}{% +\gappto{\PJLlang@langconfig@JP}{% \def\CJKsffamily{\CJKfamily{JPsans}}% \def\CJKttfamily{\CJKfamily{JPmono}}% \CJKfamily{JPmain}% diff --git a/Master/texmf-dist/tex/latex/colorist/colorart.cls b/Master/texmf-dist/tex/latex/colorist/colorart.cls index 446fa868add..e44367a8cab 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/08/09 A colorful article style] + [2021/08/11 A colorful article style] \def\colorclass@baseclass{article} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -34,6 +34,7 @@ \DeclareBoolOption[false]{noto} \DeclareBoolOption[false]{biolinum} \DeclareBoolOption[false]{customfont} +\DeclareStringOption{thmnum}[PJL@thmnum@default] \newif\if@colorclass@bfivepaper\@colorclass@bfivepaperfalse \DeclareVoidOption{b5paper}{\@colorclass@bfivepapertrue} diff --git a/Master/texmf-dist/tex/latex/colorist/colorbook.cls b/Master/texmf-dist/tex/latex/colorist/colorbook.cls index 711916d8998..e07b345a91a 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/08/09 A colorful book style] + [2021/08/11 A colorful book style] \def\colorclass@baseclass{book} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -34,6 +34,7 @@ \DeclareBoolOption[false]{noto} \DeclareBoolOption[false]{biolinum} \DeclareBoolOption[false]{customfont} +\DeclareStringOption{thmnum}[PJL@thmnum@default] \newif\if@colorclass@bfivepaper\@colorclass@bfivepaperfalse \DeclareVoidOption{b5paper}{\@colorclass@bfivepapertrue} diff --git a/Master/texmf-dist/tex/latex/colorist/colorist.sty b/Master/texmf-dist/tex/latex/colorist/colorist.sty index 0374aec6142..348f23ee1a7 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/08/09 A colorful style for articles and books] + [2021/08/11 A colorful style for articles and books] \RequirePackage{kvoptions} \RequirePackage{etoolbox} \SetupKeyvalOptions{% @@ -28,6 +28,7 @@ \DeclareBoolOption[false]{fast} \DeclareBoolOption[false]{puretext} \DeclareBoolOption[false]{nothms} +\DeclareBoolOption[false]{delaythms} \DeclareBoolOption[false]{nothmnum} \DeclareStringOption{thmnum}[colorist@thmnum@default] \DeclareBoolOption[true]{regionalref} @@ -170,13 +171,13 @@ \gappto{\PJLlang@langconfig@common}{% \renewcommand{\partstring}{\MakeUppercase{{\partname~\protect\thepart}}}% } -\gappto{\PJLlang@langconfig@schinese}{% +\gappto{\PJLlang@langconfig@CN}{% \renewcommand{\partstring}{第~\thepart~部分}% } -\gappto{\PJLlang@langconfig@tchinese}{% +\gappto{\PJLlang@langconfig@TC}{% \renewcommand{\partstring}{第~\thepart~部分}% } -\gappto{\PJLlang@langconfig@japanese}{% +\gappto{\PJLlang@langconfig@JP}{% \renewcommand{\partstring}{第~\thepart~部}% } @@ -400,7 +401,7 @@ \setlist[itemize]{leftmargin=*} \gappto{\PJLlang@langconfig@common}{\setlist[itemize,1]{label=\textcolor{maintext!25}{$\bullet$}}} -\gappto{\PJLlang@langconfig@french}{\setlist[itemize,1]{label=\textcolor{maintext!50}{---}}} +\gappto{\PJLlang@langconfig@FR}{\setlist[itemize,1]{label=\textcolor{maintext!50}{---}}} \setlist[itemize,2]{label=\textcolor{maintext!27}{--}} \setlist[itemize,3]{label=\textcolor{maintext!27}{\texttt{*}}} @@ -747,7 +748,7 @@ \expandafter\def\csname definition-propositionnameRU\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries{Определение}-\propositionnameRU} \expandafter\def\csname definition-theoremnameRU\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries{Определение}-\theoremnameRU} -\AtEndPreamble{ +\def\colorist@definethms{ \if@colorist@nothms\else \theoremstyle{basic} \if@colorist@nothmnum @@ -829,6 +830,12 @@ \fi } +\if@colorist@delaythms + \AtEndPreamble{\colorist@definethms} +\else + \colorist@definethms +\fi + \theoremstyle{simple} \creflabelformat{PJLtheorem}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} diff --git a/Master/texmf-dist/tex/latex/einfart/einfart.cls b/Master/texmf-dist/tex/latex/einfart/einfart.cls index 9ac16f3b9af..27363074fa0 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/08/08a A simple and clear article style] + [2021/08/11 A simple and clear article style] \def\minimclass@baseclass{article} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -36,6 +36,7 @@ \DeclareBoolOption[false]{noto} \DeclareBoolOption[false]{biolinum} \DeclareBoolOption[false]{customfont} +\DeclareStringOption{thmnum}[PJL@thmnum@default] \newif\if@minimclass@bfivepaper\@minimclass@bfivepaperfalse \DeclareVoidOption{b5paper}{\@minimclass@bfivepapertrue} @@ -321,7 +322,7 @@ \apptocmd{\ttfamily}{\CJKttfamily}{}{\FAIL} \if@PJLlang@enable@CN -\gappto{\PJLlang@langconfig@schinese}{% +\gappto{\PJLlang@langconfig@CN}{% \def\CJKsffamily{\CJKfamily{SCsans}}% \def\CJKttfamily{\CJKfamily{SCmono}}% \CJKfamily{SCmain}% @@ -329,7 +330,7 @@ \fi \if@PJLlang@enable@TC -\gappto{\PJLlang@langconfig@tchinese}{% +\gappto{\PJLlang@langconfig@TC}{% \def\CJKsffamily{\CJKfamily{TCsans}}% \def\CJKttfamily{\CJKfamily{TCmono}}% \CJKfamily{TCmain}% @@ -337,7 +338,7 @@ \fi \if@PJLlang@enable@JP -\gappto{\PJLlang@langconfig@japanese}{% +\gappto{\PJLlang@langconfig@JP}{% \def\CJKsffamily{\CJKfamily{JPsans}}% \def\CJKttfamily{\CJKfamily{JPmono}}% \CJKfamily{JPmain}% diff --git a/Master/texmf-dist/tex/latex/lebhart/lebhart.cls b/Master/texmf-dist/tex/latex/lebhart/lebhart.cls index e4688e8c6e3..a3a18edaabc 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/08/09 A colorful article style] + [2021/08/11 A colorful article style] \def\colorclass@baseclass{article} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -34,6 +34,7 @@ \DeclareBoolOption[false]{noto} \DeclareBoolOption[false]{biolinum} \DeclareBoolOption[false]{customfont} +\DeclareStringOption{thmnum}[PJL@thmnum@default] \newif\if@colorclass@bfivepaper\@colorclass@bfivepaperfalse \DeclareVoidOption{b5paper}{\@colorclass@bfivepapertrue} @@ -314,7 +315,7 @@ \apptocmd{\ttfamily}{\CJKttfamily}{}{\FAIL} \if@PJLlang@enable@CN -\gappto{\PJLlang@langconfig@schinese}{% +\gappto{\PJLlang@langconfig@CN}{% \def\CJKsffamily{\CJKfamily{SCsans}}% \def\CJKttfamily{\CJKfamily{SCmono}}% \CJKfamily{SCmain}% @@ -322,7 +323,7 @@ \fi \if@PJLlang@enable@TC -\gappto{\PJLlang@langconfig@tchinese}{% +\gappto{\PJLlang@langconfig@TC}{% \def\CJKsffamily{\CJKfamily{TCsans}}% \def\CJKttfamily{\CJKfamily{TCmono}}% \CJKfamily{TCmain}% @@ -330,7 +331,7 @@ \fi \if@PJLlang@enable@JP -\gappto{\PJLlang@langconfig@japanese}{% +\gappto{\PJLlang@langconfig@JP}{% \def\CJKsffamily{\CJKfamily{JPsans}}% \def\CJKttfamily{\CJKfamily{JPmono}}% \CJKfamily{JPmain}% diff --git a/Master/texmf-dist/tex/latex/minimalist/minimalist.sty b/Master/texmf-dist/tex/latex/minimalist/minimalist.sty index 04aba94b439..1892b05e4a8 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/08/08a A simple and clear style for articles and books] + [2021/08/11 A simple and clear style for articles and books] \RequirePackage{kvoptions} \RequirePackage{etoolbox} \SetupKeyvalOptions{% @@ -28,6 +28,7 @@ \DeclareBoolOption[false]{fast} \DeclareBoolOption[false]{puretext} \DeclareBoolOption[false]{nothms} +\DeclareBoolOption[false]{delaythms} \DeclareBoolOption[false]{nothmnum} \DeclareStringOption{thmnum}[minimalist@thmnum@default] \DeclareBoolOption[true]{regionalref} @@ -89,7 +90,7 @@ \newcommand{\chapfont}{\conditionalbfseries\minimalist@titlefontshape} \newcommand{\secfont}{\conditionalbfseries\minimalist@titlefontshape} \newcommand{\subsecfont}{\conditionalbfseries\minimalist@titlefontshape} -\newcommand{\subsubsecfont}{\conditionalbfseries\minimalist@titlefontshape\itshape} +\newcommand{\subsubsecfont}{\conditionalbfseries\minimalist@titlefontshape} \fi %%================================ @@ -252,13 +253,13 @@ \gappto{\PJLlang@langconfig@common}{% \renewcommand{\partstring}{\MakeUppercase{{\partname~\protect\thepart}}}% } -\gappto{\PJLlang@langconfig@schinese}{% +\gappto{\PJLlang@langconfig@CN}{% \renewcommand{\partstring}{第~\thepart~部分}% } -\gappto{\PJLlang@langconfig@tchinese}{% +\gappto{\PJLlang@langconfig@TC}{% \renewcommand{\partstring}{第~\thepart~部分}% } -\gappto{\PJLlang@langconfig@japanese}{% +\gappto{\PJLlang@langconfig@JP}{% \renewcommand{\partstring}{第~\thepart~部}% } @@ -491,7 +492,7 @@ \setlist[itemize]{leftmargin=*} \gappto{\PJLlang@langconfig@common}{\setlist[itemize,1]{label=\textcolor{maintext!25}{$\bullet$}}} -\gappto{\PJLlang@langconfig@french}{\setlist[itemize,1]{label=\textcolor{maintext!50}{---}}} +\gappto{\PJLlang@langconfig@FR}{\setlist[itemize,1]{label=\textcolor{maintext!50}{---}}} \setlist[itemize,2]{label=\textcolor{maintext!27}{--}} \setlist[itemize,3]{label=\textcolor{maintext!27}{\texttt{*}}} @@ -702,8 +703,10 @@ \pretocmd{\remarknameES}{\itshape}{}{\FAIL} \pretocmd{\observationnameES}{\itshape}{}{\FAIL} -\AtEndPreamble{ + \theoremstyle{simple} + +\def\minimalist@definethms{ \if@minimalist@nothms\else \if@minimalist@nothmnum \CreateTheorem*{theorem} @@ -780,6 +783,12 @@ \fi } +\if@minimalist@delaythms + \AtEndPreamble{\minimalist@definethms} +\else + \minimalist@definethms +\fi + \ifbool{IsBook}{}{% %%================================ @@ -852,7 +861,7 @@ \LocallyStopLineNumbers% \vspace{-\baselineskip}% \begin{center}% - \textsc{\conditionalbfseries\small\abstractname}\\% + \textsc{\conditionalbfseries\minimalist@titlefontshape\small\abstractname}\\% \vspace{-.3\baselineskip}% \begin{minipage}[t]{.833\textwidth}% \vspace{0pt}% diff --git a/Master/texmf-dist/tex/latex/minimalist/minimart.cls b/Master/texmf-dist/tex/latex/minimalist/minimart.cls index 11d68580552..b35e37468c6 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/08/08a A simple and clear article style] + [2021/08/11 A simple and clear article style] \def\minimclass@baseclass{article} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -36,6 +36,7 @@ \DeclareBoolOption[false]{noto} \DeclareBoolOption[false]{biolinum} \DeclareBoolOption[false]{customfont} +\DeclareStringOption{thmnum}[PJL@thmnum@default] \newif\if@minimclass@bfivepaper\@minimclass@bfivepaperfalse \DeclareVoidOption{b5paper}{\@minimclass@bfivepapertrue} diff --git a/Master/texmf-dist/tex/latex/minimalist/minimbook.cls b/Master/texmf-dist/tex/latex/minimalist/minimbook.cls index 6a3caba3a89..0c50b2bb81d 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/08/08a A simple and clear book style] + [2021/08/11 A simple and clear book style] \def\minimclass@baseclass{book} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -36,6 +36,7 @@ \DeclareBoolOption[false]{noto} \DeclareBoolOption[false]{biolinum} \DeclareBoolOption[false]{customfont} +\DeclareStringOption{thmnum}[PJL@thmnum@default] \newif\if@minimclass@bfivepaper\@minimclass@bfivepaperfalse \DeclareVoidOption{b5paper}{\@minimclass@bfivepapertrue} diff --git a/Master/texmf-dist/tex/latex/simplivre/simplivre.cls b/Master/texmf-dist/tex/latex/simplivre/simplivre.cls index 58a56303150..84c21b30bb5 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/08/08a A simple and clear book style] + [2021/08/11 A simple and clear book style] \def\minimclass@baseclass{book} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -36,6 +36,7 @@ \DeclareBoolOption[false]{noto} \DeclareBoolOption[false]{biolinum} \DeclareBoolOption[false]{customfont} +\DeclareStringOption{thmnum}[PJL@thmnum@default] \newif\if@minimclass@bfivepaper\@minimclass@bfivepaperfalse \DeclareVoidOption{b5paper}{\@minimclass@bfivepapertrue} @@ -321,7 +322,7 @@ \apptocmd{\ttfamily}{\CJKttfamily}{}{\FAIL} \if@PJLlang@enable@CN -\gappto{\PJLlang@langconfig@schinese}{% +\gappto{\PJLlang@langconfig@CN}{% \def\CJKsffamily{\CJKfamily{SCsans}}% \def\CJKttfamily{\CJKfamily{SCmono}}% \CJKfamily{SCmain}% @@ -329,7 +330,7 @@ \fi \if@PJLlang@enable@TC -\gappto{\PJLlang@langconfig@tchinese}{% +\gappto{\PJLlang@langconfig@TC}{% \def\CJKsffamily{\CJKfamily{TCsans}}% \def\CJKttfamily{\CJKfamily{TCmono}}% \CJKfamily{TCmain}% @@ -337,7 +338,7 @@ \fi \if@PJLlang@enable@JP -\gappto{\PJLlang@langconfig@japanese}{% +\gappto{\PJLlang@langconfig@JP}{% \def\CJKsffamily{\CJKfamily{JPsans}}% \def\CJKttfamily{\CJKfamily{JPmono}}% \CJKfamily{JPmain}% -- cgit v1.2.3