diff options
author | Karl Berry <karl@freefriends.org> | 2022-12-31 20:37:48 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-12-31 20:37:48 +0000 |
commit | 74fd318e9b1ffca5a102c9a9922e3de890ce53ee (patch) | |
tree | 3dddb08e64ff3b771e01eadc714ed6170e111220 /Master/texmf-dist/tex | |
parent | 2467c10530e7cab29c557fa3e6660f6f432f87b3 (diff) |
elegant* (31dec22)
git-svn-id: svn://tug.org/texlive/trunk@65414 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
3 files changed, 78 insertions, 27 deletions
diff --git a/Master/texmf-dist/tex/latex/elegantbook/elegantbook.cls b/Master/texmf-dist/tex/latex/elegantbook/elegantbook.cls index 93f4dd99190..4fb3e3d93a7 100644 --- a/Master/texmf-dist/tex/latex/elegantbook/elegantbook.cls +++ b/Master/texmf-dist/tex/latex/elegantbook/elegantbook.cls @@ -8,7 +8,7 @@ %%%%%%%%%%%%%%%%%%%%% % % !Mode:: "TeX:UTF-8" \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{elegantbook}[2022/04/09 v4.3 ElegantBook document class] +\ProvidesClass{elegantbook}[2022/12/31 v4.5 ElegantBook document class] %%% @@ -16,7 +16,6 @@ \RequirePackage{etoolbox} \SetupKeyvalOptions{family=ELEGANT, prefix=ELEGANT@, setkeys=\kvsetkeys} \newcommand{\ekv}[1]{\kvsetkeys{ELEGANT}{#1}} - % ----- Colors ----- \DeclareStringOption[blue]{color} \DeclareStringOption[en]{lang} @@ -56,6 +55,7 @@ \DeclareVoidOption{fancy}{\ekv{mode=fancy}} \DeclareVoidOption{simple}{\ekv{mode=simple}} +\DeclareBoolOption[false]{usesamecnt} \DeclareVoidOption{answer}{\ekv{result=answer}} \DeclareVoidOption{noanswer}{\ekv{result=noanswer}} @@ -895,6 +895,19 @@ \RequirePackage[many]{tcolorbox} % \newlength{\normalparindent} % \setlength{\normalparindent}{\parindent} +\newcommand{\ELEGANT@tmp@tl}{} +\ifELEGANT@usesamecnt + \newcounter{ELEGANT@samecnt} + \counterwithin{ELEGANT@samecnt}{\ELEGANT@thmcnt} + \tcbset{ + new/usesamecnt/.style = {use counter = ELEGANT@samecnt} + } +\else + \tcbset{ + new/usesamecnt/.style = {} + } +\fi + \ifdefstring{\ELEGANT@mode}{fancy}{ \tcbset{ common/.style={ @@ -944,9 +957,16 @@ \textcolor{third}{$\spadesuit$}};}}, ELEGANT@title/.code n args={2} { - \ifblank{#2} - {\tcbset{title={\csname #1name\endcsname~\thetcbcounter}}} - {\tcbset{title={\csname #1name\endcsname~\thetcbcounter\ (#2)}}} + + \tcbset + { + title= + { + \csname #1name\endcsname~% + \ifdef{\thetcbcounter}{\thetcbcounter}{}% + \ifblank{#2}{}{\ (#2)} + } + } }, ELEGANT@label/.code n args={2} { @@ -962,14 +982,23 @@ % will define two environments: numbered ``theorem'' and no-numbered ``theorem*'' % WARNING FOR MULTILINGUAL: this cs will automatically find \theoremname's definition, % WARNING FOR MULTILINGUAL: it should be defined in language settings. - \newcommand{\ELEGANT@newtheorem}[3]{ + \NewDocumentCommand \ELEGANT@newtheorem { m m m O{} }{ \ifcsundef{#1name}{% \ClassError{elegantbook}{% \ #1name undefined, \MessageBreak Please check in language setting }{} }{\relax} - \DeclareTColorBox[auto counter,number within=\ELEGANT@thmcnt]{#1}{ g o t\label g }{ + \expandafter\ifblank\expandafter{#4}{ + \tcbset{ + new/usecnt/.style={} + } + }{ + \tcbset{ + new/usecnt/.style= {use counter from = #4} + } + } + \DeclareTColorBox[auto counter,number within=\ELEGANT@thmcnt,usesamecnt,usecnt]{#1}{ g o t\label g }{ common,#3, IfValueTF={##1} {ELEGANT@title={#1}{##1}} @@ -998,8 +1027,8 @@ } % define several environment % we define headers like \definitionname before - \ELEGANT@newtheorem{definition}{def}{defstyle} \ELEGANT@newtheorem{theorem}{thm}{thmstyle} + \ELEGANT@newtheorem{definition}{def}{defstyle} \ELEGANT@newtheorem{postulate}{pos}{thmstyle} \ELEGANT@newtheorem{axiom}{axi}{thmstyle} \ELEGANT@newtheorem{corollary}{cor}{thmstyle} @@ -1030,16 +1059,24 @@ % will define two environments: numbered ``theorem'' and no-numbered ``theorem*'' % WARNING FOR MULTILINGUAL: this cs will automatically find \theoremname's definition, % WARNING FOR MULTILINGUAL: it should be defined in language settings. - \newcommand{\ELEGANT@newtheorem}[2]{ + \NewDocumentCommand \ELEGANT@newtheorem { m m O{} } { \theoremstyle{#2} - \newtheorem{#1}{\csname #1name\endcsname}[\ELEGANT@thmcnt] + \ifELEGANT@usesamecnt + \newtheorem{#1}[ELEGANT@samecnt]{\csname #1name\endcsname} + \else + \ifblank{#3}{ + \newtheorem{#1}{\csname #1name\endcsname}[\ELEGANT@thmcnt] + }{ + \newtheorem{#1}[#3]{\csname #1name\endcsname} + } + \fi \newtheorem*{#1*}{\csname #1name\endcsname} } % define several environment % we define headers like \definitionname before - \ELEGANT@newtheorem{definition}{defstyle} \ELEGANT@newtheorem{theorem}{thmstyle} + \ELEGANT@newtheorem{definition}{defstyle} \ELEGANT@newtheorem{postulate}{thmstyle} \ELEGANT@newtheorem{axiom}{thmstyle} \ELEGANT@newtheorem{corollary}{thmstyle} @@ -1056,12 +1093,19 @@ % and a warning will be raised \newcommand{\ELEGANT@newtheorem@warning}{} \newcommand{\ELEGANT@newtheorem@error}{} -\NewDocumentCommand\elegantnewtheorem{ m m m g } +\newcommand{\ELEGANT@usesamecnt@warning}{} +\NewDocumentCommand\elegantnewtheorem{ m m m g O{} } { + \renewcommand{\ELEGANT@usesamecnt@warning}{ + \ClassWarning{elegantbook}{% + [#5] won't make sence with option \MessageBreak + `usesamecnt'. + } + } \renewcommand{\ELEGANT@newtheorem@warning}{ \ClassWarning{elegantbook}{% - Because you didn't provide a prefix. \MessageBreak - We use #1 as the default prefix. \MessageBreak + Because you didn't provide a prefix, \MessageBreak + we use #1 as the default prefix. \MessageBreak You have to use \MessageBreak \ref{#1:label} to refer a \MessageBreak \begin{#1}{name}{label} environment. \MessageBreak @@ -1078,11 +1122,16 @@ The 4th parameter ``prefix'' isn't allowed. } } + \ifELEGANT@usesamecnt + \ifblank{#5}{}{\ELEGANT@usesamecnt@warning} + \else + \renewcommand{\ELEGANT@tmp@tl}{#5} + \fi \expandafter\def\csname #1name\endcsname{#2} \ifdefstring{\ELEGANT@mode}{simple}{% \IfValueTF{#4} {\ELEGANT@newtheorem@error} - {\ELEGANT@newtheorem{#1}{#3}} + {\ELEGANT@newtheorem{#1}{#3}[\ELEGANT@tmp@tl]} }{\relax} \ifdefstring{\ELEGANT@mode}{fancy}{% \IfValueTF{#4} @@ -1090,13 +1139,13 @@ \def\ELEGANT@temp@prefix{#4} \ifdefempty{\ELEGANT@temp@prefix} { - \ELEGANT@newtheorem{#1}{#1}{#3} + \ELEGANT@newtheorem{#1}{#1}{#3}[\ELEGANT@tmp@tl] \ELEGANT@newtheorem@warning } - {\ELEGANT@newtheorem{#1}{#4}{#3}} + {\ELEGANT@newtheorem{#1}{#4}{#3}[\ELEGANT@tmp@tl]} } { - \ELEGANT@newtheorem{#1}{#1}{#3} + \ELEGANT@newtheorem{#1}{#1}{#3}[\ELEGANT@tmp@tl] \ELEGANT@newtheorem@warning } }{\relax} @@ -1321,9 +1370,9 @@ breaklines=true, keywordstyle=\color{winered}, commentstyle=\color{gray}, - emph={elegantpaper,fontenc,fontspec,xeCJK,citestyle,FiraMono,xunicode,figure,fig,image,img,table,itemize,enumerate,ctex,microtype,description,times,booktabs,tabular,PDFLaTeX,XeLaTeX,type1cm,BibTeX,device,color,mode,lang,amsthm,tcolorbox,titlestyle,cite,ctex,listings,base,math,scheme,toc,esint,chinesefont,amsmath,bibstyle,natbib,pgfornament}, + emph={elegantpaper,fontenc,fontspec,xeCJK,citestyle,FiraMono,xunicode,figure,fig,image,img,table,itemize,enumerate,ctex,microtype,description,times,booktabs,tabular,PDFLaTeX,XeLaTeX,type1cm,BibTeX,device,color,mode,lang,amsthm,tcolorbox,titlestyle,cite,ctex,listings,base,math,scheme,toc,esint,chinesefont,amsmath,bibstyle,natbib,pgfornament,addbibresource,printbibliography}, emphstyle={\color{frenchplum}}, - morekeywords={DeclareSymbolFont,SetSymbolFont,toprule,midrule,bottomrule,institute,version,includegraphics,setmainfont,setsansfont,setmonofont ,setCJKmainfont,setCJKsansfont,setCJKmonofont,RequirePackage,figref,tabref,email,maketitle,keywords,definecolor,extrainfo,logo,cover,subtitle,appendix,chapter,section,hypersetup,mainmatter,frontmatter,tableofcontents,elegantpar,heiti,kaishu,lstset,pagecolor,zhnumber,marginpar,part,equote,marginnote,bioinfo,datechange,listofchange,lvert,lastpage,songti,heiti,fangsong,setCJKfamilyfont,textbf,elegantnewtheorem,thmcnt,colorlet}, + morekeywords={DeclareSymbolFont,SetSymbolFont,toprule,midrule,bottomrule,institute,version,includegraphics,setmainfont,setsansfont,setmonofont ,setCJKmainfont,setCJKsansfont,setCJKmonofont,RequirePackage,figref,tabref,email,maketitle,keywords,definecolor,extrainfo,logo,cover,subtitle,appendix,chapter,section,hypersetup,mainmatter,frontmatter,tableofcontents,elegantpar,heiti,kaishu,lstset,pagecolor,zhnumber,marginpar,part,equote,marginnote,bioinfo,datechange,listofchange,lvert,lastpage,songti,heiti,fangsong,setCJKfamilyfont,textbf,elegantnewtheorem,thmcnt,colorlet,usesamecnt}, frame=single, tabsize=2, rulecolor=\color{structurecolor}, @@ -1387,7 +1436,7 @@ \renewcommand*{\cleardoublepage}{\clearpage\if@twoside \ifodd\c@page\else \hbox{}% \thispagestyle{empty}% -beforechap\newpage% +\newpage% \if@twocolumn\hbox{}\newpage\fi\fi\fi} @@ -1397,7 +1446,10 @@ beforechap\newpage% \ifdefstring{\ELEGANT@lang}{cn}{ % \renewcommand{\cftchappresnum}{\beforechap\space} % \renewcommand{\cftchapaftersnum}{\space\afterchap} - \setlength{\cftchapnumwidth}{\widthof{\textbf{附录~999}}} + % \setlength{\cftchapnumwidth}{\widthof{\textbf{附录~十一}}} + \renewcommand{\numberline}[1]{% + \@cftbsnum #1\@cftasnum~\@cftasnumb ~% + } \g@addto@macro\appendix{% % recover \thechapter in the \NR@chapter's \numberline \ifELEGANT@Hy@later diff --git a/Master/texmf-dist/tex/latex/elegantnote/elegantnote.cls b/Master/texmf-dist/tex/latex/elegantnote/elegantnote.cls index 872e4ff188d..4dc70b15d42 100644 --- a/Master/texmf-dist/tex/latex/elegantnote/elegantnote.cls +++ b/Master/texmf-dist/tex/latex/elegantnote/elegantnote.cls @@ -4,7 +4,7 @@ % Lastest Version: https://github.com/ElegantLaTeX/ElegantNote % --- Class structure: identification part -\ProvidesClass{elegantnote}[2022/04/09 ElegantNote v2.40 class] +\ProvidesClass{elegantnote}[2022/12/31 ElegantNote v2.50 class] \NeedsTeXFormat{LaTeX2e} @@ -165,7 +165,7 @@ backend=\ELEGANT@bibend, citestyle=\ELEGANT@citestyle, bibstyle=\ELEGANT@bibstyle]{biblatex} -\defbibheading{elegantbook}[\ebibname]{#1} + \RequirePackage{appendix} diff --git a/Master/texmf-dist/tex/latex/elegantpaper/elegantpaper.cls b/Master/texmf-dist/tex/latex/elegantpaper/elegantpaper.cls index 4b4a2a34d9f..ca6a74f313b 100644 --- a/Master/texmf-dist/tex/latex/elegantpaper/elegantpaper.cls +++ b/Master/texmf-dist/tex/latex/elegantpaper/elegantpaper.cls @@ -4,7 +4,7 @@ % Lastest Version: https://github.com/ElegantLaTeX/ElegantPaper % --- Class structure: identification part -\ProvidesClass{elegantpaper}[2022/04/09 v0.10 ElegantLaTeX Paper class] +\ProvidesClass{elegantpaper}[2022/12/31 v0.11 ElegantLaTeX Paper class] \NeedsTeXFormat{LaTeX2e} %%% @@ -197,7 +197,6 @@ backend=\ELEGANT@bibend, citestyle=\ELEGANT@citestyle, bibstyle=\ELEGANT@bibstyle]{biblatex} -\defbibheading{elegantbook}[\ebibname]{#1} \RequirePackage{appendix} @@ -366,7 +365,7 @@ backgroundcolor=\color{lightgrey} } -\addbibresource[location=local]{reference.bib} + % restore the tt default family to lmodern tt family \renewcommand\ttdefault{lmtt} |