From 9bf57f7a3e6283e02e7567b547bdad4c7d8adc6b Mon Sep 17 00:00:00 2001 From: EthanDeng Date: Sat, 9 Apr 2022 14:33:42 +0800 Subject: [PATCH] v2.5 update --- .gitignore | 6 +- elegantnote-cn.tex | 2 + elegantnote-en.tex | 76 +---------------- elegantnote.cls | 205 +++++++++++++++++++++++++-------------------- 4 files changed, 124 insertions(+), 165 deletions(-) diff --git a/.gitignore b/.gitignore index 2ac7678..086d2ad 100644 --- a/.gitignore +++ b/.gitignore @@ -11,9 +11,11 @@ *.cb *.cb2 .*.lb -elegantnote-en.pdf -elegantnote-cn.pdf +.DS_Store clean.bat +elegant*-cn.pdf +elegant*-en.pdf +*.dates ## Intermediate documents: *.dvi diff --git a/elegantnote-cn.tex b/elegantnote-cn.tex index 35f7325..fc38af3 100644 --- a/elegantnote-cn.tex +++ b/elegantnote-cn.tex @@ -326,4 +326,6 @@ \section{常见问题 FAQ} \end{lstlisting} \end{enumerate} +%\printbibliography[heading=bibintoc, title=\ebibname] + \end{document} diff --git a/elegantnote-en.tex b/elegantnote-en.tex index 198c053..2023dc1 100644 --- a/elegantnote-en.tex +++ b/elegantnote-en.tex @@ -5,7 +5,7 @@ \author{Dongsheng Deng} \institute{Elegant\LaTeX{} Program} -\version{2.30} +\version{2.40} \date{\today} \begin{document} @@ -206,79 +206,9 @@ \section{Writing Sample} \end{itemize} -\section{Recruit Support Members} - -Recruit support members for Elegant\LaTeX{} to translate template official guide, maintain wiki entries, update Wechat articles. No deadline for this recruitment. - -So far, Elegant\LaTeX{} has four support members: -\begin{itemize} - \item OG Translator: \href{https://github.com/peggy2006xzyz}{YPY}; - \item Wiki Maintainer: \href{https://github.com/izinngo}{Ingo Zinngo}, \href{https://github.com/xiaohao890809}{Xiaohao890809}; - \item QQ Group Manager: \href{https://github.com/sikouhjw}{Sikouhjw}. -\end{itemize} - -Thank them all!!! - \section{Acknowledgement} -The number of stars on GitHub for ElegantPaper reached 176 on April 12, 2020 at the release of ElegantNote v2.20. -Thank China\TeX{} and \href{http://www.latexstudio.net/}{\LaTeX{} studio} for their promotion. - -If you like our templates, star on GitHub. -\begin{figure}[!ht] - \centering - \includegraphics[width=\textwidth]{star.png} - \caption{Twinkle, Twinkle, Little Star} -\end{figure} - -\section{Donation} -To express your love for our templates and/or our developers, please do not hesitate to tip us. -\begin{figure}[!htbp] - \centering - \includegraphics[width=0.4\textwidth]{donate.jpg} -\end{figure} -\textbf{The explanation right of the tip usage belongs to Elegant\LaTeX{} with no supervision. Feel free to tip us.} Those who donate more than 10 RMB will be recorded in the donation list and will receive a donation certificate. Thank all the tippers! - -\begin{table}[htbp] - \centering - \scriptsize - \caption{Donation List} - \begin{tabular}{cccccccc} - \toprule - \textbf{Tipper} & \textbf{Amount} & \textbf{Date} & \textbf{Channel} & \textbf{Tipper} & \textbf{Amount} & \textbf{Date} & \textbf{Channel} \\ - \midrule - Lerh & 10 RMB & 2019/05/15 & Wechat & yueguodipingxian & 10 RMB & 2019/05/15 & Wechat \\ - yinsang & 20 RMB & 2019/05/27 & Wechat & *kong & 10 RMB & 2019/05/30 & Wechat \\ - latexstudio.net & 666 RMB & 2019/06/05 & Alipay & A*n & 40 RMB & 2019/06/15 & Wechat \\ - * xia & 22 RMB & 2019/06/15 & Wechat & * qian & 21 RMB & 2019/06/15 & Wechat \\ - Cassis & 11 RMB & 2019/06/30 & Wechat & * jun & 10 RMB & 2019/07/23 & Wechat \\ - P*u & 50 RMB & 2019/07/30 & Wechat & * meng & 19 RMB & 2019/08/28 & Wechat \\ - Qu Doudou & 10 RMB & 2019/08/28 & Wechat & Li Bo & 100 RMB & 2019/10/06 & Wechat \\ - Njustsll & 10 RMB & 2019/10/11 & Wechat & Liu Zhikuo & 99.99 RMB & 2019/10/15 & Alipay \\ - * tao & 16 RMB & 2019/10/17 & Wechat & Chini & 12 RMB & 2019/10/17 & Alipay \\ - yuanfengjing & 10 RMB & 2019/10/28 & Wechat & Guo Deliang & 88 RMB & 2019/11/03 & Wechat \\ - ziqiangbuxi & 20 RMB & 2019/11/04 & Alipay & dushuzhichong & 20 RMB & 2019/11/18 & Wechat \\ - * deng & 10 RMB & 2019/11/18 & Wechat & * zhe & 20 RMB & 2019/11/18 & Wechat \\ - anonymous & 10 RMB & 2019/11/24 & Wechat & Jiye Qian & 66 RMB & 2019/12/04 & Wechat \\ - * yang & 20 RMB & 2019/12/05 & Wechat & Catcher & 11 RMB & 2019/12/08 & Alipay \\ - xierbotementu & 10 RMB & 2019/12/09 & Alipay & * wei & 10 RMB & 2019/12/09 & Wechat \\ - Simon & 20 RMB & 2019/12/11 & Alipay & liushangqianyi & 66.60 RMB & 2019/12/18 & Alipay \\ - yu & 10 RMB & 2019/12/20 & Alipay & *chen & 15 RMB & 2019/12/20 & Wechat \\ - suifeng & 20 RMB & 2019/12/27 & Alipay & Ws & 23.30 RMB & 2019/12/28 & Wechat \\ - chuba & 100 RMB & 2020/01/02 & Alipay & p*e & 20 RMB & 2020/01/03 & Wechat \\ - Shunmx & 100 RMB & 2020/01/03 & Wechat & hj & 10 RMB & 2020/01/03 & Wechat \\ - F*5 & 10 RMB & 2020/01/03 & Wechat & S*m & 20.20 RMB & 2020/01/03 & Wechat \\ - erdaiqingzhi & 13 RMB & 2020/01/14 & Alipay & *? & 66 RMB & 2020/01/15 & Wechat \\ - Mr. Xiong & 20 RMB & 2020/01/17 & Wechat & *bo & 15 RMB & 2020/01/18 & Wechat \\ - *Zhe & 10 RMB & 2020/02/02 & Wechat & Jackie & 88.80 RMB & 2020/02/09 & Wechat \\ - Henry\_Sun & 50 RMB & 2020/02/14 & Alipay & * Qiao & 50 RMB & 2020/02/21 & Wechat \\ - YunLian & 10 RMB & 2020/03/02 & Alipay & S*y & 10 RMB & 2020/03/15 & Wechat \\ - * Ge & 66.66 RMB & 2020/03/17 & Wechat & K*e & 30 RMB & 2020/03/30 & Wechat\\ - * Yang & 20 RMB & 2020/04/02 & Wechat & Shi*n & 30 RMB & 2020/04/11 & Wechat \\ -\bottomrule -\end{tabular}% - \label{tab:donation}% -\end{table}% +Thank \href{https://github.com/sikouhjw}{sikouhjw} and \href{https://github.com/syvshc}{syvshc} for their quick response to Github issues and continuously support work for ElegantLaTeX. Thank ChinaTeX and \href{http://www.latexstudio.net/}{LaTeX Studio} for their promotion. \section{FAQ} @@ -296,4 +226,6 @@ \section{FAQ} \end{enumerate} +%\printbibliography[heading=bibintoc, title=\ebibname] + \end{document} diff --git a/elegantnote.cls b/elegantnote.cls index eb4a9e7..872e4ff 100644 --- a/elegantnote.cls +++ b/elegantnote.cls @@ -4,12 +4,10 @@ % Lastest Version: https://github.com/ElegantLaTeX/ElegantNote % --- Class structure: identification part -\ProvidesClass{elegantnote}[2020/04/12 ElegantNote v2.30 class] +\ProvidesClass{elegantnote}[2022/04/09 ElegantNote v2.40 class] \NeedsTeXFormat{LaTeX2e} -%%% patch for newtx v1.7 or later -\IfFileExists{newtx.sty}{\PassOptionsToPackage{nofontspec}{newtxtext}}{} -%%% + \RequirePackage{kvoptions} \RequirePackage{etoolbox} \RequirePackage{calc} @@ -46,12 +44,13 @@ \DeclareVoidOption{founder}{\ekv{chinesefont=founder}} \DeclareVoidOption{nofont}{\ekv{chinesefont=nofont}} -\DeclareStringOption[numbers]{cite} -\DeclareVoidOption{numbers}{\ekv{cite=numbers}} -\DeclareVoidOption{authoryear}{\ekv{cite=authoryear}} -\DeclareVoidOption{super}{\ekv{cite=super}} +\DeclareStringOption[numeric-comp]{citestyle} +\DeclareStringOption[numeric]{bibstyle} + +\DeclareStringOption[biber]{bibend} +\DeclareVoidOption{biber}{\ekv{bibend=biber}} +\DeclareVoidOption{bibtex}{\ekv{bibend=bibtex}} -\DeclareStringOption[apalike]{bibstyle} \DeclareStringOption[11pt]{fontsize} \DeclareVoidOption{10pt}{\ekv{fontsize=10pt}} @@ -71,40 +70,59 @@ \LoadClass{article} \PassOptionsToPackage{no-math}{fontspec} +\PassOptionsToPackage{quiet}{fontspec} \RequirePackage{amsmath,amsthm} \RequirePackage{iftex} -\ifdefstring{\ELEGANT@lang}{cn}{% \ifXeTeX - \ifdefstring{\ELEGANT@chinesefont}{founder}{ - \RequirePackage[UTF8,scheme=plain,fontset=none]{ctex} - \setCJKmainfont[BoldFont={FZHei-B01},ItalicFont={FZKai-Z03}]{FZShuSong-Z01} - \setCJKsansfont[BoldFont={FZHei-B01},ItalicFont={FZHei-B01}]{FZHei-B01} - \setCJKmonofont[BoldFont={FZHei-B01},ItalicFont={FZHei-B01}]{FZFangSong-Z02} - \setCJKfamilyfont{zhsong}{FZShuSong-Z01} - \setCJKfamilyfont{zhhei}{FZHei-B01} - \setCJKfamilyfont{zhkai}{FZKai-Z03} - \setCJKfamilyfont{zhfs}{FZFangSong-Z02} - \newcommand*{\songti}{\CJKfamily{zhsong}} - \newcommand*{\heiti}{\CJKfamily{zhhei}} - \newcommand*{\kaishu}{\CJKfamily{zhkai}} - \newcommand*{\fangsong}{\CJKfamily{zhfs}}}{\relax} + \RequirePackage[no-math]{fontspec} + \setmainfont{texgyretermes}[ + UprightFont = *-regular , + BoldFont = *-bold , + ItalicFont = *-italic , + BoldItalicFont = *-bolditalic , + Extension = .otf , + Scale = 1.0] - \ifdefstring{\ELEGANT@chinesefont}{nofont}{ - \RequirePackage[UTF8,scheme=plain,fontset=none]{ctex}}{\relax} - - \ifdefstring{\ELEGANT@chinesefont}{ctexfont}{ - \RequirePackage[UTF8,scheme=plain]{ctex}}{\relax} - \else - \ifdefstring{\ELEGANT@chinesefont}{ctexfont}{ - \RequirePackage[UTF8,scheme=plain]{ctex}}{\relax} - \fi - \AfterEndPreamble{ - % \renewcommand{\itshape}{\kaishu} - \setlength\parindent{2\ccwd}} - }{\relax} + \setsansfont{texgyreheros}[ + UprightFont = *-regular , + BoldFont = *-bold , + ItalicFont = *-italic , + BoldItalicFont = *-bolditalic , + Extension = .otf , + Scale = 0.9] +\else + \RequirePackage{newtxtext} + \RequirePackage[scaled=.90]{helvet} +\fi + + +\ifdefstring{\ELEGANT@lang}{cn}{ + \ifdefstring{\ELEGANT@chinesefont}{founder}{ + \RequirePackage[UTF8,scheme=plain,fontset=none]{ctex} + \setCJKmainfont[BoldFont={FZHei-B01},ItalicFont={FZKai-Z03}]{FZShuSong-Z01} + \setCJKsansfont[BoldFont={FZHei-B01}]{FZKai-Z03} + \setCJKmonofont[BoldFont={FZHei-B01}]{FZFangSong-Z02} + \setCJKfamilyfont{zhsong}{FZShuSong-Z01} + \setCJKfamilyfont{zhhei}{FZHei-B01} + \setCJKfamilyfont{zhkai}[BoldFont={FZHei-B01}]{FZKai-Z03} + \setCJKfamilyfont{zhfs}[BoldFont={FZHei-B01}]{FZFangSong-Z02} + \newcommand*{\songti}{\CJKfamily{zhsong}} + \newcommand*{\heiti}{\CJKfamily{zhhei}} + \newcommand*{\kaishu}{\CJKfamily{zhkai}} + \newcommand*{\fangsong}{\CJKfamily{zhfs}}}{\relax} + + \ifdefstring{\ELEGANT@chinesefont}{nofont}{ + \RequirePackage[UTF8,scheme=plain,fontset=none]{ctex}}{\relax} + + \ifdefstring{\ELEGANT@chinesefont}{ctexfont}{ + \RequirePackage[UTF8,scheme=plain]{ctex}}{\relax} + + \AfterEndPreamble{ + \setlength\parindent{2\ccwd}} +}{\relax} \ifcsname kaishu\endcsname \newcommand{\citshape}{\kaishu} @@ -123,7 +141,6 @@ \fi -\RequirePackage{newtxtext} \ifdefstring{\ELEGANT@math}{newtx}{ \RequirePackage{newtxmath} \let\Bbbk\relax @@ -144,6 +161,61 @@ }{\relax} +\RequirePackage[ + backend=\ELEGANT@bibend, + citestyle=\ELEGANT@citestyle, + bibstyle=\ELEGANT@bibstyle]{biblatex} +\defbibheading{elegantbook}[\ebibname]{#1} + +\RequirePackage{appendix} + +\ifdefstring{\ELEGANT@lang}{cn}{% + \theoremstyle{plain}% default + \newtheorem{theorem}{定理}[section] % + \newtheorem{lemma}[theorem]{引理} % + \newtheorem{proposition}[theorem]{命题} % + \newtheorem*{corollary}{推论} % + \theoremstyle{definition} % + \newtheorem{definition}{定义}[section] % + \newtheorem{conjecture}{猜想}[section] % + \newtheorem{example}{例}[section] % + \theoremstyle{remark} % + \newtheorem*{remark}{\normalfont\bfseries 评论} % + \newtheorem*{note}{\normalfont\bfseries 注} % + \newtheorem{case}{\normalfont\bfseries 案例} % + \renewcommand*{\proofname}{\normalfont\bfseries\color{ecolor}证明} % + \renewcommand\contentsname{\color{ecolor}目录} + \renewcommand\refname{\color{ecolor}参考文献} % + \renewcommand\figurename{图} % + \renewcommand\tablename{表} + \newcommand\versiontext{版本：}% + \newcommand\updatetext{更新：}% + \newcommand\ebibname{参考文献} + \setlength{\parindent}{2em} + \newcommand{\keywords}[1]{% + \vskip2ex\par\noindent\normalfont{\bfseries 关键词: } #1} + }{\relax} + +\ifdefstring{\ELEGANT@lang}{en}{ + \theoremstyle{plain}% default + \newtheorem{theorem}{Theorem}[section] % + \newtheorem{lemma}[theorem]{Lemma} % + \newtheorem{proposition}[theorem]{Proposition} % + \newtheorem*{corollary}{Corollary} % + \theoremstyle{definition} % + \newtheorem{definition}{Definition}[section] % + \newtheorem{conjecture}{Conjecture}[section] % + \newtheorem{example}{Example}[section] % + \theoremstyle{remark} % + \newtheorem*{remark}{Remark} % + \newtheorem*{note}{Note} % + \newcommand\ebibname{Bibliography} + \newtheorem{case}{Case} + \renewcommand*{\proofname}{% + \normalfont\bfseries\color{ecolor} Proof} + \newcommand\versiontext{Version: }% + \newcommand\updatetext{Update: }}{\relax} + \RequirePackage{indentfirst} \RequirePackage{anyfontsize} @@ -325,61 +397,7 @@ \pagestyle{fancy-note} -\ifdefstring{\ELEGANT@lang}{cn}{% - \theoremstyle{plain}% default - \newtheorem{theorem}{定理}[section] % - \newtheorem{lemma}[theorem]{引理} % - \newtheorem{proposition}[theorem]{命题} % - \newtheorem*{corollary}{推论} % - \theoremstyle{definition} % - \newtheorem{definition}{定义}[section] % - \newtheorem{conjecture}{猜想}[section] % - \newtheorem{example}{例}[section] % - \theoremstyle{remark} % - \newtheorem*{remark}{\normalfont\bfseries 评论} % - \newtheorem*{note}{\normalfont\bfseries 注} % - \newtheorem{case}{\normalfont\bfseries 案例} % - \renewcommand*{\proofname}{\normalfont\bfseries\color{ecolor}证明} % - \renewcommand\contentsname{\color{ecolor}目录} - \renewcommand\refname{\color{ecolor}参考文献} % - \renewcommand\figurename{图} % - \renewcommand\tablename{表} - \newcommand\versiontext{版本：}% - \newcommand\updatetext{更新：}% - \setlength{\parindent}{2em} - \newcommand{\keywords}[1]{% - \vskip2ex\par\noindent\normalfont{\bfseries 关键词: } #1} - \RequirePackage{gbt7714} - \ifdefstring{\ELEGANT@cite}{authoryear}{ - \bibliographystyle{gbt7714-author-year}}{ - \bibliographystyle{gbt7714-numerical}} - \ifdefstring{\ELEGANT@cite}{numbers}{ - \citestyle{numbers}}{\relax} - }{\relax} - -\ifdefstring{\ELEGANT@lang}{en}{ - \theoremstyle{plain}% default - \newtheorem{theorem}{Theorem}[section] % - \newtheorem{lemma}[theorem]{Lemma} % - \newtheorem{proposition}[theorem]{Proposition} % - \newtheorem*{corollary}{Corollary} % - \theoremstyle{definition} % - \newtheorem{definition}{Definition}[section] % - \newtheorem{conjecture}{Conjecture}[section] % - \newtheorem{example}{Example}[section] % - \theoremstyle{remark} % - \newtheorem*{remark}{Remark} % - \newtheorem*{note}{Note} % - \newtheorem{case}{Case} - \renewcommand*{\proofname}{% - \normalfont\bfseries\color{ecolor} Proof} - \newcommand\versiontext{Version: }% - \newcommand\updatetext{Update: }% - \RequirePackage[\ELEGANT@cite,sort&compress]{natbib} - \bibliographystyle{\ELEGANT@bibstyle}}{% - \relax} -\setlength{\bibsep}{0.0pt} \def\bibfont{\footnotesize} \def\IfEmpty#1{% @@ -563,3 +581,8 @@ keywords}, frame=none, tabsize=2} + +\addbibresource[location=local]{reference.bib} + +% restore the tt default family to lmodern tt family +\renewcommand\ttdefault{lmtt}