diff --git a/README.md b/README.md index 2413a4c..e0695d0 100644 --- a/README.md +++ b/README.md @@ -53,8 +53,21 @@ ElegantBook 是为 LaTeX 书籍写作而设计的模板,由 [Dongsheng Deng](h | 郭德良 | 88 RMB | 2019/11/03 | 微信 | | 自强不息 | 20 RMB | 2019/11/04 | 支付宝 | | 读书之虫 | 20 RMB | 2019/11/18 | 微信 | -| *等 | 10 RMB | 2019/11/18 | 微信 | -| *哲 | 20 RMB | 2019/11/18 | 微信 | +| *等 | 10 RMB | 2019/11/18 | 微信 | +| *哲 | 20 RMB | 2019/11/18 | 微信 | +| 佚名 | 10 RMB | 2019/11/24 | 微信 | +| Jiye Qian | 66 RMB | 2019/12/04 | 微信 | +| * 阳 | 20 RMB | 2019/12/05 | 微信 | +| Catcher | 11 RMB | 2019/12/08 | 支付宝 | +| 希尔波特门徒 | 10 RMB | 2019/12/09 | 支付宝 | +| * 伟 | 10 RMB | 2019/12/09 | 微信 | +| Simon | 20 RMB | 2019/12/11 | 支付宝 | +| 流殇丶浅忆 | 66.60 RMB | 2019/12/18 | 支付宝 | +| 羽 | 10 RMB | 2019/12/20 | 支付宝 | +| * 琛 | 15 RMB | 2019/12/20 | 微信 | +| 随风 | 20 RMB | 2019/12/27 | 支付宝 | +| Ws | 23.30 RMB | 2019/12/28 | 微信 | + 再次感谢大家对于模板的喜爱! diff --git a/elegantbook-cn.tex b/elegantbook-cn.tex index fc26125..c7b9050 100644 --- a/elegantbook-cn.tex +++ b/elegantbook-cn.tex @@ -11,12 +11,10 @@ \extrainfo{Victory won\rq t come to us unless we go to it. --- M. Moore} -\logo{logo.png} +\logo{logo-blue.png} \cover{cover.jpg} - - \begin{document} \maketitle @@ -169,6 +167,7 @@ Elegant\LaTeX{} 系列模板从创立至今已经有 8 年了,我们的模板 \documentclass[lang=cn]{elegantbook} \end{lstlisting} + \begin{remark} 只有中文环境(\lstinline{lang=cn})才可以输入中文。另外如果抄录环境(\lstinline{lstlisting})中有中文字符,请务必使用 \hologo{XeLaTeX} 编译。 \end{remark} @@ -673,7 +672,7 @@ Lebesgue 积分有几种不同的定义方式。我们将采用逐步定义非 \end{custom} \begin{solution} -在 Mac 系统下,中文编译请使用 \lstinline{XeLaTeX}。 +在 Mac 系统下,中文编译请使用 \hologo{XeLaTeX}。 \end{solution} \begin{custom}{问题} diff --git a/elegantbook-en.tex b/elegantbook-en.tex index aecec0a..6d53c2c 100644 --- a/elegantbook-en.tex +++ b/elegantbook-en.tex @@ -10,7 +10,7 @@ \extrainfo{Victory won\rq t come to us unless we go to it. } -\logo{logo.png} +\logo{logo-blue.png} \cover{cover.jpg} \begin{document} diff --git a/elegantbook.cls b/elegantbook.cls index a90dc54..78882c1 100644 --- a/elegantbook.cls +++ b/elegantbook.cls @@ -76,6 +76,33 @@ % \ProcessOptions*\relax \LoadClass[a4paper,oneside]{book} +%% device settings +\RequirePackage{geometry} +\ifdefstring{\ELEGANT@device}{normal}{ +\geometry{ + a4paper, + top=25.4mm, bottom=25.4mm, + headheight=2.17cm, + headsep=4mm, + footskip=12mm +} + +\ifdefstring{\ELEGANT@marginpar}{margintrue}{ +\geometry{ + marginparwidth=5cm, marginparsep=5mm, + left=2cm,right=7cm, +} +}{\relax} +}{\relax} + +\ifdefstring{\ELEGANT@device}{pad}{ +\geometry{ + paperwidth=7.5in, + paperheight=10in, + margin=16mm, + headheight=2.17cm, + footskip=4mm +}}{\relax} \RequirePackage{indentfirst,comment} % fontsetting @@ -155,30 +182,30 @@ }{\relax} %green color - \definecolor{structure1}{RGB}{0,120,2}% - \definecolor{main1}{RGB}{0,120,2}% - \definecolor{second1}{RGB}{230,90,7}% - \definecolor{third1}{RGB}{0,160,152}% +\definecolor{structure1}{RGB}{0,120,2}% +\definecolor{main1}{RGB}{0,120,2}% +\definecolor{second1}{RGB}{230,90,7}% +\definecolor{third1}{RGB}{0,160,152}% %cyan color - \definecolor{structure2}{RGB}{31,186,190}% - \definecolor{main2}{RGB}{59,180,5}% - \definecolor{second2}{RGB}{175,153,8}% - \definecolor{third2}{RGB}{244,105,102}% +\definecolor{structure2}{RGB}{31,186,190}% +\definecolor{main2}{RGB}{59,180,5}% +\definecolor{second2}{RGB}{175,153,8}% +\definecolor{third2}{RGB}{244,105,102}% %blue color - \definecolor{structure3}{RGB}{60,113,183} - \definecolor{main3}{RGB}{0,166,82}% - \definecolor{second3}{RGB}{255,134,24}% - \definecolor{third3}{RGB}{0,174,247}% +\definecolor{structure3}{RGB}{60,113,183} +\definecolor{main3}{RGB}{0,166,82}% +\definecolor{second3}{RGB}{255,134,24}% +\definecolor{third3}{RGB}{0,174,247}% % gray color - \definecolor{structure4}{RGB}{150,150,150} - \definecolor{main4}{RGB}{150,150,150}% - \definecolor{second4}{RGB}{150,150,150}% - \definecolor{third4}{RGB}{150,150,150}% +\definecolor{structure4}{RGB}{150,150,150} +\definecolor{main4}{RGB}{150,150,150}% +\definecolor{second4}{RGB}{150,150,150}% +\definecolor{third4}{RGB}{150,150,150}% % black color - \definecolor{structure5}{RGB}{0,0,0} - \definecolor{main5}{RGB}{0,0,0}% - \definecolor{second5}{RGB}{0,0,0}% - \definecolor{third5}{RGB}{0,0,0}% +\definecolor{structure5}{RGB}{0,0,0} +\definecolor{main5}{RGB}{0,0,0}% +\definecolor{second5}{RGB}{0,0,0}% +\definecolor{third5}{RGB}{0,0,0}% % corlor definition \definecolor{winered}{rgb}{0.5,0,0} @@ -306,35 +333,6 @@ \setlist[itemize,3]{label={\eitemiii}} -%% device settings - -\RequirePackage{geometry} -\ifdefstring{\ELEGANT@device}{normal}{ -\geometry{ - a4paper, - top=25.4mm, bottom=25.4mm, - headheight=2.17cm, - headsep=4mm, - footskip=12mm -} - -\ifdefstring{\ELEGANT@marginpar}{margintrue}{ -\geometry{ - marginparwidth=5cm, marginparsep=5mm, - left=2cm,right=7cm, -} -}{\relax} -}{\relax} - -\ifdefstring{\ELEGANT@device}{pad}{ -\geometry{ - paperwidth=7.5in, - paperheight=10in, - margin=16mm, - headheight=2.17cm, - footskip=4mm -}}{\relax} - \RequirePackage{hyperref} \hypersetup{ breaklinks, @@ -441,6 +439,10 @@ \ifdefstring{\ELEGANT@lang}{en}{Theorem}{定理} }{thmstyle}{thm} +% \newtcbtheorem[auto counter,use counter from=theorem]{axiom}{ +% \ifdefstring{\ELEGANT@lang}{en}{Axiom}{公理} +% }{thmstyle}{axi} + \newtcbtheorem[auto counter,number within=chapter]{proposition}{ \ifdefstring{\ELEGANT@lang}{en}{Proposition}{命题} }{propstyle}{pro} diff --git a/figure/logo-blue.png b/figure/logo-blue.png new file mode 100644 index 0000000..5b6db83 Binary files /dev/null and b/figure/logo-blue.png differ