diff options
author | Karl Berry <karl@freefriends.org> | 2021-07-30 20:18:00 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-07-30 20:18:00 +0000 |
commit | d51594c5e7ede77367a50e2be6d41634018de32b (patch) | |
tree | 6083a0f3440c57fc3ca7aa3e04544532a3d8c9b1 /Master/texmf-dist/tex/latex | |
parent | 8d8cf4124219dd759dffc1a733fb415bfcc2abc5 (diff) |
jxu (30jul21)
git-svn-id: svn://tug.org/texlive/trunk@60121 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r-- | Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls | 16 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/colorist/colorart.cls | 16 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/colorist/colorbook.cls | 16 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/colorist/colorist.sty | 46 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/einfart/einfart.cls | 16 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/lebhart/lebhart.cls | 16 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/minimalist/minimalist.sty | 36 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/minimalist/minimart.cls | 16 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/minimalist/minimbook.cls | 16 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/simplivre/simplivre.cls | 16 |
10 files changed, 182 insertions, 28 deletions
diff --git a/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls b/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls index 2651b3037fc..d6f3ef19c4d 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/27 A colorful book style] + [2021/07/30 A colorful book style] \def\colorclass@baseclass{book} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -31,6 +31,7 @@ \DeclareBoolOption[false]{palatino} \DeclareBoolOption[false]{times} \DeclareBoolOption[false]{garamond} +\DeclareBoolOption[false]{noto} \DeclareBoolOption[false]{biolinum} \DeclareBoolOption[false]{customfont} @@ -55,6 +56,9 @@ \if@colorclass@garamond \@colorclass@customfonttrue \fi +\if@colorclass@noto + \@colorclass@customfonttrue +\fi \if@colorclass@biolinum \@colorclass@customfonttrue \fi @@ -326,6 +330,16 @@ \let\colorist@sffamily\relax \fi +\if@colorclass@noto + \RequirePackage{amssymb} + \if@colorclass@useosf + \PassOptionsToPackage{oldstyle}{notomath} + \fi + \RequirePackage{anyfontsize} + \RequirePackage{notomath} + \PJLsetlinespacing{\setstretch{1.00}} +\fi + \if@colorclass@biolinum \RequirePackage{amssymb} % \RequirePackage{mathpazo} diff --git a/Master/texmf-dist/tex/latex/colorist/colorart.cls b/Master/texmf-dist/tex/latex/colorist/colorart.cls index 64c68139bd4..5d45070c7ac 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/27 A colorful article style] + [2021/07/30 A colorful article style] \def\colorclass@baseclass{article} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -31,6 +31,7 @@ \DeclareBoolOption[false]{palatino} \DeclareBoolOption[false]{times} \DeclareBoolOption[false]{garamond} +\DeclareBoolOption[false]{noto} \DeclareBoolOption[false]{biolinum} \DeclareBoolOption[false]{customfont} @@ -55,6 +56,9 @@ \if@colorclass@garamond \@colorclass@customfonttrue \fi +\if@colorclass@noto + \@colorclass@customfonttrue +\fi \if@colorclass@biolinum \@colorclass@customfonttrue \fi @@ -149,6 +153,16 @@ \let\colorist@textsc\relax \fi +\if@colorclass@noto + \RequirePackage{amssymb} + \if@colorclass@useosf + \PassOptionsToPackage{oldstyle}{notomath} + \fi + \RequirePackage{anyfontsize} + \RequirePackage{notomath} + \PJLsetlinespacing{\setstretch{1.00}} +\fi + \if@colorclass@biolinum \RequirePackage{amssymb} % \RequirePackage{mathpazo} diff --git a/Master/texmf-dist/tex/latex/colorist/colorbook.cls b/Master/texmf-dist/tex/latex/colorist/colorbook.cls index 45efb1360c5..798ec0bcb3d 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/27 A colorful book style] + [2021/07/30 A colorful book style] \def\colorclass@baseclass{book} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -31,6 +31,7 @@ \DeclareBoolOption[false]{palatino} \DeclareBoolOption[false]{times} \DeclareBoolOption[false]{garamond} +\DeclareBoolOption[false]{noto} \DeclareBoolOption[false]{biolinum} \DeclareBoolOption[false]{customfont} @@ -55,6 +56,9 @@ \if@colorclass@garamond \@colorclass@customfonttrue \fi +\if@colorclass@noto + \@colorclass@customfonttrue +\fi \if@colorclass@biolinum \@colorclass@customfonttrue \fi @@ -149,6 +153,16 @@ \let\colorist@textsc\relax \fi +\if@colorclass@noto + \RequirePackage{amssymb} + \if@colorclass@useosf + \PassOptionsToPackage{oldstyle}{notomath} + \fi + \RequirePackage{anyfontsize} + \RequirePackage{notomath} + \PJLsetlinespacing{\setstretch{1.00}} +\fi + \if@colorclass@biolinum \RequirePackage{amssymb} % \RequirePackage{mathpazo} diff --git a/Master/texmf-dist/tex/latex/colorist/colorist.sty b/Master/texmf-dist/tex/latex/colorist/colorist.sty index ddc6055a053..354006dc4b2 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/27 A colorful style for articles and books] + [2021/07/30 A colorful style for articles and books] \RequirePackage{kvoptions} \RequirePackage{etoolbox} \SetupKeyvalOptions{% @@ -29,10 +29,16 @@ \DeclareBoolOption[false]{puretext} \DeclareBoolOption[false]{nothms} \DeclareBoolOption[false]{nothmnum} +\DeclareStringOption{thmnum}[colorist@thmnum@default] +\DeclareBoolOption[true]{regionalref} +\DeclareBoolOption[false]{originalref} \DeclareBoolOption[false]{allowbf} \DeclareBoolOption[false]{runin} \ProcessKeyvalOptions*\relax +\if@colorist@originalref + \@colorist@regionalreffalse +\fi \if@colorist@draft \@colorist@fasttrue \fi @@ -40,6 +46,21 @@ \@colorist@nothmstrue \fi +\if@colorist@fast + \PassOptionsToPackage{fast}{PJLdraft} + \PassOptionsToPackage{fast}{PJLthm} +\fi +\expandafter\ifstrempty\expandafter{\@colorist@thmnum}{}{ + \expandafter\ifstrequal\expandafter{\@colorist@thmnum}{colorist@thmnum@default}{ + \PassOptionsToPackage{thmnum}{PJLthm} + }{ + \PassOptionsToPackage{thmnum=\@colorist@thmnum}{PJLthm} + } +} +\if@colorist@regionalref\else + \PassOptionsToPackage{originalref}{PJLthm} +\fi + \if@colorist@allowbf \newcommand{\conditionalbfseries}{\bfseries\colorlet{PJLtempcolor}{.}\color{PJLtempcolor!90!paper}} \else @@ -728,12 +749,8 @@ \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{ \theoremstyle{basic} -\ifbool{IsBook}{ - \newaliascnt{highest}{chapter} -}{ - \newaliascnt{highest}{section} -} \if@colorist@nothms\else \if@colorist@nothmnum \CreateTheorem*{theorem} @@ -746,7 +763,7 @@ \CreateTheorem*{fact} \CreateTheorem*{conjecture} \else -\CreateTheorem{theorem}<highest> +\CreateTheorem@thmnum{theorem} \CreateTheorem{lemma}[theorem] \CreateTheorem{proposition}[theorem] \CreateTheorem{corollary}[theorem] @@ -804,14 +821,13 @@ \CreateTheorem*{remark} \CreateTheorem*{observation} \else -\CreateTheorem{remark}<highest> -\CreateTheorem{observation}<highest> +\CreateTheorem@thmnum{remark} +\CreateTheorem@thmnum{observation} \fi \CreateTheorem*{remark*} \CreateTheorem*{observation*} \fi - -\numberwithin{equation}{highest} +} \creflabelformat{PJLtheorem}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} \creflabelformat{PJLlemma}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3} @@ -1287,27 +1303,35 @@ \tcolorboxenvironment{question} {enhanced jigsaw,pad at break*=1mm,breakable,oversize, + top=0mm,bottom=0mm, opacityframe=0,opacityback=0,lines before break=3} \tcolorboxenvironment{question*} {enhanced jigsaw,pad at break*=1mm,breakable,oversize, + top=0mm,bottom=0mm, opacityframe=0,opacityback=0,lines before break=3} \tcolorboxenvironment{exercise} {enhanced jigsaw,pad at break*=1mm,breakable,oversize, + top=0mm,bottom=0mm, opacityframe=0,opacityback=0,lines before break=3} \tcolorboxenvironment{exercise*} {enhanced jigsaw,pad at break*=1mm,breakable,oversize, + top=0mm,bottom=0mm, opacityframe=0,opacityback=0,lines before break=3} \tcolorboxenvironment{remark} {enhanced jigsaw,pad at break*=1mm,breakable,oversize, + top=0mm,bottom=0mm, opacityframe=0,opacityback=0,lines before break=3} \tcolorboxenvironment{remark*} {enhanced jigsaw,pad at break*=1mm,breakable,oversize, + top=0mm,bottom=0mm, opacityframe=0,opacityback=0,lines before break=3} \tcolorboxenvironment{observation} {enhanced jigsaw,pad at break*=1mm,breakable,oversize, + top=0mm,bottom=0mm, opacityframe=0,opacityback=0,lines before break=3} \tcolorboxenvironment{observation*} {enhanced jigsaw,pad at break*=1mm,breakable,oversize, + top=0mm,bottom=0mm, opacityframe=0,opacityback=0,lines before break=3} \ExplSyntaxOn diff --git a/Master/texmf-dist/tex/latex/einfart/einfart.cls b/Master/texmf-dist/tex/latex/einfart/einfart.cls index 9bd5664b8af..c4d8d43f01f 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/27 A simple and clear article style] + [2021/07/30 A simple and clear article style] \def\minimclass@baseclass{article} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -33,6 +33,7 @@ \DeclareBoolOption[false]{palatino} \DeclareBoolOption[false]{times} \DeclareBoolOption[false]{garamond} +\DeclareBoolOption[false]{noto} \DeclareBoolOption[false]{biolinum} \DeclareBoolOption[false]{customfont} @@ -60,6 +61,9 @@ \if@minimclass@garamond \@minimclass@customfonttrue \fi +\if@minimclass@noto + \@minimclass@customfonttrue +\fi \if@minimclass@biolinum \@minimclass@customfonttrue \fi @@ -342,6 +346,16 @@ \PJLsetlinespacing{\setstretch{1.00}} \fi +\if@minimclass@noto + \RequirePackage{amssymb} + \if@minimclass@useosf + \PassOptionsToPackage{oldstyle}{notomath} + \fi + \RequirePackage{anyfontsize} + \RequirePackage{notomath} + \PJLsetlinespacing{\setstretch{1.00}} +\fi + \if@minimclass@biolinum \RequirePackage{amssymb} % \RequirePackage{mathpazo} diff --git a/Master/texmf-dist/tex/latex/lebhart/lebhart.cls b/Master/texmf-dist/tex/latex/lebhart/lebhart.cls index 529837fadbe..f7e3535e489 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/27 A colorful article style] + [2021/07/30 A colorful article style] \def\colorclass@baseclass{article} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -31,6 +31,7 @@ \DeclareBoolOption[false]{palatino} \DeclareBoolOption[false]{times} \DeclareBoolOption[false]{garamond} +\DeclareBoolOption[false]{noto} \DeclareBoolOption[false]{biolinum} \DeclareBoolOption[false]{customfont} @@ -55,6 +56,9 @@ \if@colorclass@garamond \@colorclass@customfonttrue \fi +\if@colorclass@noto + \@colorclass@customfonttrue +\fi \if@colorclass@biolinum \@colorclass@customfonttrue \fi @@ -326,6 +330,16 @@ \let\colorist@sffamily\relax \fi +\if@colorclass@noto + \RequirePackage{amssymb} + \if@colorclass@useosf + \PassOptionsToPackage{oldstyle}{notomath} + \fi + \RequirePackage{anyfontsize} + \RequirePackage{notomath} + \PJLsetlinespacing{\setstretch{1.00}} +\fi + \if@colorclass@biolinum \RequirePackage{amssymb} % \RequirePackage{mathpazo} diff --git a/Master/texmf-dist/tex/latex/minimalist/minimalist.sty b/Master/texmf-dist/tex/latex/minimalist/minimalist.sty index 9ae2e948b5f..9f972f569d5 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/27 A simple and clear style for articles and books] + [2021/07/30 A simple and clear style for articles and books] \RequirePackage{kvoptions} \RequirePackage{etoolbox} \SetupKeyvalOptions{% @@ -29,11 +29,17 @@ \DeclareBoolOption[false]{puretext} \DeclareBoolOption[false]{nothms} \DeclareBoolOption[false]{nothmnum} +\DeclareStringOption{thmnum}[minimalist@thmnum@default] +\DeclareBoolOption[true]{regionalref} +\DeclareBoolOption[false]{originalref} \DeclareBoolOption[false]{allowbf} \DeclareBoolOption[false]{classical} \DeclareBoolOption[false]{runin} \ProcessKeyvalOptions*\relax +\if@minimalist@originalref + \@minimalist@regionalreffalse +\fi \if@minimalist@draft \@minimalist@fasttrue \fi @@ -41,6 +47,21 @@ \@minimalist@nothmstrue \fi +\if@minimalist@fast + \PassOptionsToPackage{fast}{PJLdraft} + \PassOptionsToPackage{fast}{PJLthm} +\fi +\expandafter\ifstrempty\expandafter{\@minimalist@thmnum}{}{ + \expandafter\ifstrequal\expandafter{\@minimalist@thmnum}{minimalist@thmnum@default}{ + \PassOptionsToPackage{thmnum}{PJLthm} + }{ + \PassOptionsToPackage{thmnum=\@minimalist@thmnum}{PJLthm} + } +} +\if@minimalist@regionalref\else + \PassOptionsToPackage{originalref}{PJLthm} +\fi + \if@minimalist@allowbf \newcommand{\conditionalbfseries}{\bfseries\colorlet{PJLtempcolor}{.}\color{PJLtempcolor!83!paper}} \else @@ -681,12 +702,8 @@ \pretocmd{\remarknameES}{\itshape}{}{\FAIL} \pretocmd{\observationnameES}{\itshape}{}{\FAIL} +\AtEndPreamble{ \theoremstyle{simple} -\ifbool{IsBook}{ - \newaliascnt{highest}{chapter} -}{ - \newaliascnt{highest}{section} -} \if@minimalist@nothms\else \if@minimalist@nothmnum \CreateTheorem*{theorem} @@ -699,7 +716,7 @@ \CreateTheorem*{fact} \CreateTheorem*{conjecture} \else -\CreateTheorem{theorem}<highest> +\CreateTheorem@thmnum{theorem} \CreateTheorem{lemma}[theorem] \CreateTheorem{proposition}[theorem] \CreateTheorem{corollary}[theorem] @@ -755,12 +772,13 @@ \CreateTheorem*{remark} \CreateTheorem*{observation} \else -\CreateTheorem{remark}<highest> -\CreateTheorem{observation}<highest> +\CreateTheorem@thmnum{remark} +\CreateTheorem@thmnum{observation} \fi \CreateTheorem*{remark*} \CreateTheorem*{observation*} \fi +} \ifbool{IsBook}{}{% diff --git a/Master/texmf-dist/tex/latex/minimalist/minimart.cls b/Master/texmf-dist/tex/latex/minimalist/minimart.cls index 8953e92b7cd..a8c8ae4754b 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/27 A simple and clear article style] + [2021/07/30 A simple and clear article style] \def\minimclass@baseclass{article} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -33,6 +33,7 @@ \DeclareBoolOption[false]{palatino} \DeclareBoolOption[false]{times} \DeclareBoolOption[false]{garamond} +\DeclareBoolOption[false]{noto} \DeclareBoolOption[false]{biolinum} \DeclareBoolOption[false]{customfont} @@ -60,6 +61,9 @@ \if@minimclass@garamond \@minimclass@customfonttrue \fi +\if@minimclass@noto + \@minimclass@customfonttrue +\fi \if@minimclass@biolinum \@minimclass@customfonttrue \fi @@ -154,6 +158,16 @@ \PJLsetlinespacing{\setstretch{1.00}} \fi +\if@minimclass@noto + \RequirePackage{amssymb} + \if@minimclass@useosf + \PassOptionsToPackage{oldstyle}{notomath} + \fi + \RequirePackage{anyfontsize} + \RequirePackage{notomath} + \PJLsetlinespacing{\setstretch{1.00}} +\fi + \if@minimclass@biolinum \RequirePackage{amssymb} % \RequirePackage{mathpazo} diff --git a/Master/texmf-dist/tex/latex/minimalist/minimbook.cls b/Master/texmf-dist/tex/latex/minimalist/minimbook.cls index 83a16c03f44..68c787254ae 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/27 A simple and clear book style] + [2021/07/30 A simple and clear book style] \def\minimclass@baseclass{book} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -33,6 +33,7 @@ \DeclareBoolOption[false]{palatino} \DeclareBoolOption[false]{times} \DeclareBoolOption[false]{garamond} +\DeclareBoolOption[false]{noto} \DeclareBoolOption[false]{biolinum} \DeclareBoolOption[false]{customfont} @@ -60,6 +61,9 @@ \if@minimclass@garamond \@minimclass@customfonttrue \fi +\if@minimclass@noto + \@minimclass@customfonttrue +\fi \if@minimclass@biolinum \@minimclass@customfonttrue \fi @@ -154,6 +158,16 @@ \PJLsetlinespacing{\setstretch{1.00}} \fi +\if@minimclass@noto + \RequirePackage{amssymb} + \if@minimclass@useosf + \PassOptionsToPackage{oldstyle}{notomath} + \fi + \RequirePackage{anyfontsize} + \RequirePackage{notomath} + \PJLsetlinespacing{\setstretch{1.00}} +\fi + \if@minimclass@biolinum \RequirePackage{amssymb} % \RequirePackage{mathpazo} diff --git a/Master/texmf-dist/tex/latex/simplivre/simplivre.cls b/Master/texmf-dist/tex/latex/simplivre/simplivre.cls index 113e881f817..f8359a10c4c 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/27 A simple and clear book style] + [2021/07/30 A simple and clear book style] \def\minimclass@baseclass{book} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -33,6 +33,7 @@ \DeclareBoolOption[false]{palatino} \DeclareBoolOption[false]{times} \DeclareBoolOption[false]{garamond} +\DeclareBoolOption[false]{noto} \DeclareBoolOption[false]{biolinum} \DeclareBoolOption[false]{customfont} @@ -60,6 +61,9 @@ \if@minimclass@garamond \@minimclass@customfonttrue \fi +\if@minimclass@noto + \@minimclass@customfonttrue +\fi \if@minimclass@biolinum \@minimclass@customfonttrue \fi @@ -342,6 +346,16 @@ \PJLsetlinespacing{\setstretch{1.00}} \fi +\if@minimclass@noto + \RequirePackage{amssymb} + \if@minimclass@useosf + \PassOptionsToPackage{oldstyle}{notomath} + \fi + \RequirePackage{anyfontsize} + \RequirePackage{notomath} + \PJLsetlinespacing{\setstretch{1.00}} +\fi + \if@minimclass@biolinum \RequirePackage{amssymb} % \RequirePackage{mathpazo} |