From eb233e43098ee13d72830bb12dddf877b0baec5b Mon Sep 17 00:00:00 2001
From: EthanDeng <ddswhu@outlook.com>
Date: Thu, 7 Apr 2022 21:33:50 +0800
Subject: [PATCH] update font settings

---
 .DS_Store          | Bin 0 -> 6148 bytes
 elegantbook-cn.tex |  13 ++++++++++++-
 elegantbook-en.tex |   2 ++
 elegantbook.cls    |  25 ++-----------------------
 4 files changed, 16 insertions(+), 24 deletions(-)
 create mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..b4e92f00162da73764fb38b16a14e0bd5f0a2b81
GIT binary patch
literal 6148
zcmeHKJ5Iwu5S<CZ1VNFK(gihAZeW7p0=WQ$fI*7o2$6ycAB00t(sKjE0gxzYY3O;g
zJF<64LKz`6BkjKRe0Ijqmd8s(Je*GkM13OaVF-4%F)b0X%UF<(YIcDvdrXVL=)5Xt
z3!bL<s|?7q>(T)gbWOM6^W*!6r_febc|M+2W9WLt-O178*Yja)pZsc{UA6B9*KY`=
zgf5Y_pgG;pMVOnmK3;y>!~ErblRw&{tlAn@`Gj@oYrTmoN;*R&aTUpHf+_-QSi^hK
z)DU^J6)g9N@+Y6dgNZR<3>X9JW&k}~q_^YIW@Eq@Fa{b1<ol3f2xf}4NB8N#<c<Kq
zF4Ru2ma~M!q>7nh?GY9T`%s_{W&Iap9}a!0ewkwJ(T5Z3;e$0Z>j{NjcI=-zcjC;W
z&BlN+5HqmhFZ<H}k5`}n;~={-28@A!#Q=BnQ9i^iX>VP)Iq9`2#wmt~_|+bp5G-6P
fhOe~ZJq#z%r?LQMinT{*Aoe5RXt2o`SSthHEi7r%

literal 0
HcmV?d00001

diff --git a/elegantbook-cn.tex b/elegantbook-cn.tex
index 3526973..66e653b 100644
--- a/elegantbook-cn.tex
+++ b/elegantbook-cn.tex
@@ -1,4 +1,4 @@
-\documentclass[lang=cn,10pt]{elegantbook}
+\documentclass[lang=cn,10pt,founder]{elegantbook}
 
 \title{ElegantBook：优美的 \LaTeX{} 书籍模板}
 \subtitle{Elegant\LaTeX{} 经典之作}
@@ -16,6 +16,17 @@
 \logo{logo-blue.png}
 \cover{cover.jpg}
 
+\usepackage{lmodern}
+
+\setmainfont{texgyretermes}[
+  UprightFont = *-regular ,
+  BoldFont = *-bold ,
+  ItalicFont = *-italic ,
+  BoldItalicFont = *-bolditalic ,
+  Extension = .otf ,
+  Scale = 1.0]
+
+\usepackage[]{newtxmath}
 % 本文档命令
 \usepackage{array}
 \newcommand{\ccr}[1]{\makecell{{\color{#1}\rule{1cm}{1cm}}}}
diff --git a/elegantbook-en.tex b/elegantbook-en.tex
index dfe4057..921a762 100644
--- a/elegantbook-en.tex
+++ b/elegantbook-en.tex
@@ -18,6 +18,8 @@
 \colorlet{coverlinecolor}{customcolor}
 
 
+\usepackage{mathptmx}
+
 \begin{document}
 
 \maketitle
diff --git a/elegantbook.cls b/elegantbook.cls
index b02a16c..d20ff06 100644
--- a/elegantbook.cls
+++ b/elegantbook.cls
@@ -10,8 +10,7 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{elegantbook}[2022/03/08 v4.2 ElegantBook document class]
 
-%%% patch for newtx v1.7 or later
-\IfFileExists{newtx.sty}{\PassOptionsToPackage{nofontspec}{newtxtext}}{}
+
 %%%
 \RequirePackage{kvoptions}
 \RequirePackage{etoolbox}
@@ -61,7 +60,6 @@
 \DeclareStringOption[numeric]{bibstyle}
 
 
-\DeclareVoidOption{newtx}{\ekv{math=newtx}}
 \DeclareVoidOption{mtpro2}{\ekv{math=mtpro2}}
 \DeclareVoidOption{cm}{\ekv{math=cm}}
 
@@ -203,26 +201,7 @@
   \newcommand{\cfs}{\normalfont}
 \fi
 
-\RequirePackage{newtxtext}
 \RequirePackage{anyfontsize}
-\ifdefstring{\ELEGANT@math}{newtx}{
-  \RequirePackage{newtxmath}
-  \let\Bbbk\relax
-  \RequirePackage{esint}
-  %%% use yhmath pkg, uncomment following code
-  % \let\oldwidering\widering
-  % \let\widering\undefined
-  % \RequirePackage{yhmath}
-  % \let\widering\oldwidering
-
-  %%% use esvect pkg, uncomment following code
-  % \RequirePackage{esvect}
-
-  \DeclareSymbolFont{CMlargesymbols}{OMX}{cmex}{m}{n}
-  \let\sumop\relax\let\prodop\relax
-  \DeclareMathSymbol{\sumop}{\mathop}{CMlargesymbols}{"50}
-  \DeclareMathSymbol{\prodop}{\mathop}{CMlargesymbols}{"51}
-}{\relax}
 
 % ----- Handle Colors -----
 %% 章节以及页脚图形
@@ -1159,7 +1138,7 @@
   breaklines=true,
   keywordstyle=\color{winered},
   commentstyle=\color{gray},
-  emph={elegantpaper,fontenc,fontspec,xeCJK,citestyle,FiraMono,xunicode,newtxmath,figure,fig,image,img,table,itemize,enumerate,newtxtext,newtxtt,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},
   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,hypersetup,mainmatter,frontmatter,tableofcontents,elegantpar,heiti,kaishu,lstset,pagecolor,zhnumber,marginpar,part,equote,marginnote,bioinfo,datechange,listofchange,lvert,lastpage,songti,heiti,fangsong,setCJKfamilyfont,textbf},
   frame=single,