summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/elegantbook
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-05-05 17:39:49 +0000
committerKarl Berry <karl@freefriends.org>2019-05-05 17:39:49 +0000
commit43c8ffeda0f732ffbf41e0cfd74547b319469670 (patch)
treea5e1fc5ef193816d314c5b86c3a19621b8ff05ea /Master/texmf-dist/tex/latex/elegantbook
parentd88aa33d2c9df0778d2f472ad338f9a0b1f0c962 (diff)
elegantbook (15apr19)
git-svn-id: svn://tug.org/texlive/trunk@51002 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/elegantbook')
-rw-r--r--Master/texmf-dist/tex/latex/elegantbook/elegantbook.cls411
1 files changed, 285 insertions, 126 deletions
diff --git a/Master/texmf-dist/tex/latex/elegantbook/elegantbook.cls b/Master/texmf-dist/tex/latex/elegantbook/elegantbook.cls
index 74ca033c189..9dbcc18b657 100644
--- a/Master/texmf-dist/tex/latex/elegantbook/elegantbook.cls
+++ b/Master/texmf-dist/tex/latex/elegantbook/elegantbook.cls
@@ -5,11 +5,11 @@
%% This work may be distributed and/or modified freely
%% available at https://github.com/ElegantLaTeX/ElegantBook
% %
-%% Last Modification 2019-02-25
+%% Last Modification 2019-04-12
%%%%%%%%%%%%%%%%%%%%%
% % !Mode:: "TeX:UTF-8"
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{elegantbook}[2019/02/24 v3.06 ElegantBook document class]
+\ProvidesClass{elegantbook}[2019/04/03 v3.07 ElegantBook document class]
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
@@ -17,16 +17,33 @@
\newcommand{\ekv}[1]{\kvsetkeys{ELEGANT}{#1}}
% ----- Colors -----
-\DeclareStringOption[green]{color}
+\DeclareStringOption[blue]{color}
\DeclareStringOption[en]{lang}
+\DeclareStringOption[answer]{result}
+\DeclareStringOption[fancy]{mode}
+\DeclareStringOption[show]{base}
+
+
% ----- backward compatibility
\DeclareVoidOption{green}{\ekv{color = green}}
\DeclareVoidOption{cyan}{\ekv{color = cyan}}
\DeclareVoidOption{blue}{\ekv{color = blue}}
-\DeclareVoidOption{plain}{\ekv{color = plain}}
+\DeclareVoidOption{gray}{\ekv{color = gray}}
+\DeclareVoidOption{black}{\ekv{color = black}}
\DeclareVoidOption{nocolor}{\ekv{color = none}}
+
\DeclareVoidOption{en}{\ekv{lang=en}}
\DeclareVoidOption{cn}{\ekv{lang=cn}}
+
+\DeclareVoidOption{fancy}{\ekv{mode=fancy}}
+\DeclareVoidOption{simple}{\ekv{mode=simple}}
+
+\DeclareVoidOption{answer}{\ekv{result = answer}}
+\DeclareVoidOption{noanswer}{\ekv{result = noanswer}}
+
+\DeclareVoidOption{hide}{\ekv{base = hide}}
+\DeclareVoidOption{show}{\ekv{base = show}}
+
% ----- Math option -----
\newcommand\mailto[1]{\href{mailto:#1}{\nolinkurl{#1}}}
@@ -40,44 +57,26 @@
\ProcessKeyvalOptions*\relax
% \ProcessOptions*\relax
-\LoadClass[12pt,a4paper,oneside,openany]{book}
+\LoadClass[a4paper,oneside,openany]{book}
-\RequirePackage{indentfirst}
+\RequirePackage{indentfirst,comment}
\setlength\parindent{2em}
% fontsetting
+
+\PassOptionsToPackage{no-math}{fontspec}
+\RequirePackage[UTF8, scheme=plain,punct=kaiming]{ctex}
+
\RequirePackage{ifxetex}
+
\ifxetex
\RequirePackage{fontenc}
- \RequirePackage[no-math]{fontspec}
- \setmainfont{Times New Roman}[NFSSFamily=ntxtlf]
- \setsansfont{Arial}
- %\setmonofont[Scale=0.9]{Courier New}
- \RequirePackage{xeCJK}
- \RequirePackage{xunicode}
- \setCJKmainfont[BoldFont={SimHei},ItalicFont={KaiTi}]{SimSun}
- \setCJKsansfont[BoldFont={SimHei},ItalicFont={KaiTi}]{KaiTi}
- \setCJKmonofont[BoldFont={SimHei},ItalicFont={KaiTi},Scale=0.7]{Microsoft YaHei}
- \XeTeXlinebreaklocale "zh"
- \XeTeXlinebreakskip = 0pt plus 1pt minus 0.1pt
- \RequirePackage{newtxmath}
- %\DeclareSymbolFont{operators}{OT1}{ntxtlf}{m}{n}
- %\SetSymbolFont{operators}{bold}{OT1}{ntxtlf}{b}{n}
- \setCJKfamilyfont{zhsong}{SimSun}
- \setCJKfamilyfont{zhhei}{SimHei}
- \setCJKfamilyfont{zhkai}{KaiTi}
- \setCJKfamilyfont{zhfs}{FangSong}
- \newcommand*{\songti}{\CJKfamily{zhsong}}
- \newcommand*{\heiti}{\CJKfamily{zhhei}}
- \newcommand*{\kaishu}{\CJKfamily{zhkai}}
- \newcommand*{\fangsong}{\CJKfamily{zhfs}}
\else
- \RequirePackage{fontenc}
- \RequirePackage{newtxtext}
- \RequirePackage{newtxmath}
- \RequirePackage[UTF8, scheme=plain]{ctex}
+ \RequirePackage[T1]{fontenc}
\fi
-\RequirePackage[scale=0.7]{FiraMono}
+
+\RequirePackage{newtxtext}
+\RequirePackage{newtxmath}
%
% font setting for text and math
@@ -87,15 +86,27 @@
% \RequirePackage[scale=0.85]{newtxtt}
\RequirePackage{anyfontsize}
-\DeclareSymbolFont{cmlargesymbols}{OMX}{cmex}{m}{n}
-\DeclareMathSymbol{\intop}{\mathop}{cmlargesymbols}{"5A}
- \def\int{\intop\nolimits}
-\DeclareMathSymbol{\ointop}{\mathop}{cmlargesymbols}{"49}
- \def\oint{\ointop\nolimits}
-\DeclareMathSymbol{\sumop}{\mathop}{cmlargesymbols}{"58}
- \let\sum\sumop
-\DeclareMathSymbol{\prodop}{\mathop}{cmlargesymbols}{"59}
- \let\prod\prodop
+\DeclareSymbolFont{CMletters} {OML}{cmm} {m}{it}%
+\DeclareSymbolFont{CMsymbols} {OMS}{cmsy}{m}{n}%
+\DeclareSymbolFont{CMlargesymbols}{OMX}{cmex}{m}{n}%
+
+% \let\sum\relax
+% \DeclareMathSymbol{\sum}{\mathop}{CMlargesymbols}{"50}%
+% \let\int\relax
+% \DeclareMathSymbol{\int}{\mathop}{CMlargesymbols}{"5A}%
+
+\let\intop\relax\let\sumop\relax\let\ointop\relax\let\prodop\relax
+\DeclareMathSymbol{\sumop}{\mathop}{CMlargesymbols}{"50}
+\DeclareMathSymbol{\intop}{\mathop}{CMlargesymbols}{"52}
+\DeclareMathSymbol{\ointop}{\mathop}{CMlargesymbols}{"49}
+\DeclareMathSymbol{\prodop}{\mathop}{CMlargesymbols}{"59}
+
+% \let\partial\relax
+% \DeclareMathSymbol{\partial}{\mathord}{CMletters}{"40}%
+% \let\in\relax
+%\DeclareMathSymbol{\in}{\mathrel}{CMsymbols}{"32}%
+% \let\pi\relax
+% \DeclareMathSymbol{\pi}{\mathord}{CMletters}{"19}
% ----- Handle Colors -----
@@ -103,40 +114,61 @@
\RequirePackage{xcolor}
\ifdefstring{\ELEGANT@color}{green}{
+ \definecolor{structurecolor}{RGB}{0,120,2}%
\definecolor{main}{RGB}{0,120,2}%
\definecolor{second}{RGB}{230,90,7}%
\definecolor{third}{RGB}{0,160,152}%
}{\relax}
-
\ifdefstring{\ELEGANT@color}{cyan}{
- \definecolor{main}{RGB}{0,175,152}%
- \definecolor{second}{RGB}{239,126,30}%
- \definecolor{third}{RGB}{120,8,13}%
+ \definecolor{structurecolor}{RGB}{31,186,190}%
+ \definecolor{main}{RGB}{59,180,5}%
+ \definecolor{second}{RGB}{175,153,8}%
+ \definecolor{third}{RGB}{244,105,102}%
}{\relax}
\ifdefstring{\ELEGANT@color}{blue}{
- \definecolor{main}{RGB}{20,50,104}%
- \definecolor{second}{RGB}{180,50,131}%
- \definecolor{third}{RGB}{7,127,128}%
+ \definecolor{structurecolor}{RGB}{60,113,183}
+ \definecolor{main}{RGB}{0,166,82}%
+ \definecolor{second}{RGB}{255,134,24}%
+ \definecolor{third}{RGB}{0,174,247}%
+}{\relax}
+\ifdefstring{\ELEGANT@color}{gray}{
+ \definecolor{structurecolor}{RGB}{0,0,0}
+ \definecolor{main}{RGB}{150,150,150}%
+ \definecolor{second}{RGB}{150,150,150}%
+ \definecolor{third}{RGB}{150,150,150}%
}{\relax}
-\ifdefstring{\ELEGANT@color}{plain}{
- \definecolor{main}{RGB}{50,50,50}%
- \definecolor{second}{RGB}{50,50,50}%
- \definecolor{third}{RGB}{50,50,50}%
+\ifdefstring{\ELEGANT@color}{black}{
+ \definecolor{structurecolor}{RGB}{0,0,0}
+ \definecolor{main}{RGB}{0,0,0}%
+ \definecolor{second}{RGB}{0,0,0}%
+ \definecolor{third}{RGB}{0,0,0}%
}{\relax}
%green color
-\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{main2}{RGB}{0,175,152}
-\definecolor{second2}{RGB}{239,126,30}
-\definecolor{third2}{RGB}{120,8,13}
+ \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{main3}{RGB}{20,50,104}
-\definecolor{second3}{RGB}{180,50,131}
-\definecolor{third3}{RGB}{7,127,128}
-
+ \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}{0,0,0}
+ \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}%
% corlor definition
\definecolor{winered}{rgb}{0.5,0,0}
@@ -176,21 +208,20 @@
% caption settings
\RequirePackage{caption}
\captionsetup{labelfont = bf}
-\RequirePackage[font=small,labelfont={bf,color=main}]{caption}
+\RequirePackage[font=small,labelfont={bf,color=structurecolor}]{caption}
\captionsetup[table]{skip=3pt}
\captionsetup[figure]{skip=3pt}
%% 常用宏包
\linespread{1.3}
-\RequirePackage{microtype}
\RequirePackage{graphicx}
%\RequirePackage{enumerate}
-\RequirePackage{amsmath,mathrsfs,amsfonts}
+\RequirePackage{amsmath,mathrsfs,amsfonts,amssymb}
\RequirePackage{booktabs}
\RequirePackage{multicol}
\RequirePackage{xcolor}
\RequirePackage{fancyvrb}
-\RequirePackage{makecell,lipsum,texnames,setspace}
+\RequirePackage{makecell,lipsum,bxtexlogo,setspace}
%%中文结构名字
@@ -200,7 +231,7 @@
\renewcommand{\chaptername}{Chapter \thechapter}
}{\relax}
\ifdefstring{\ELEGANT@lang}{cn}{
-\renewcommand{\contentsname}{目录}
+\renewcommand{\contentsname}{目\hspace{2em}录}
\renewcommand{\figurename}{图}
\renewcommand{\tablename}{表}
\renewcommand{\partname}{第 \thepart\; 部分}
@@ -208,7 +239,7 @@
\renewcommand{\listtablename}{表格目录}
\renewcommand{\bibname}{参考文献}
\renewcommand{\appendixname}{附录}
-\renewcommand{\indexname}{索引}
+\renewcommand{\indexname}{索\hspace{2em}引}
\newcommand\figref[1]{\textbf{图}~\ref{#1}}
\newcommand\tabref[1]{\textbf{表}~\ref{#1}}
\renewcommand{\chaptername}{第 \thechapter\;章}
@@ -222,13 +253,13 @@
\usetikzlibrary{backgrounds,calc,shadows}
\usepackage[object=vectorian]{pgfornament} %%
-\newcommand*{\eitemi}{\tikz \draw [baseline, ball color=main, draw=main] circle (2pt);}
-\newcommand*{\eitemii}{\tikz \draw [baseline, fill=main,draw=main,circular drop shadow] circle (2pt);}
-\newcommand*{\eitemiii}{\tikz \draw [baseline, fill=main,draw=main] circle (2pt);}
-\setlist[enumerate,1]{label=\color{main}\arabic*.}
-\setlist[enumerate,2]{label=\color{main}(\alph*).}
-\setlist[enumerate,3]{label=\color{main}\Roman*.}
-\setlist[enumerate,4]{label=\color{main}\Alph*.}
+\newcommand*{\eitemi}{\tikz \draw [baseline, ball color=structurecolor, draw=none] circle (2pt);}
+\newcommand*{\eitemii}{\tikz \draw [baseline, fill=structurecolor,draw=none,circular drop shadow] circle (2pt);}
+\newcommand*{\eitemiii}{\tikz \draw [baseline, fill=structurecolor,draw=none] circle (2pt);}
+\setlist[enumerate,1]{label=\color{structurecolor}\arabic*.}
+\setlist[enumerate,2]{label=\color{structurecolor}(\alph*).}
+\setlist[enumerate,3]{label=\color{structurecolor}\Roman*.}
+\setlist[enumerate,4]{label=\color{structurecolor}\Alph*.}
\setlist[itemize,1]{label={\eitemi}}
\setlist[itemize,2]{label={\eitemii}}
\setlist[itemize,3]{label={\eitemiii}}
@@ -238,7 +269,8 @@
\def\bibfont{\footnotesize}
-%% 页面设置
+%% device settings
+
\RequirePackage{geometry}
\geometry{
a4paper,
@@ -250,6 +282,7 @@
footskip=12mm
}
+
\RequirePackage{hyperref}
\hypersetup{
breaklinks,
@@ -267,45 +300,50 @@
pdfborder={0 0 0},
linktocpage
}
-
+\let\email\relax
+\newcommand\email[1]{\href{mailto:#1}{\nolinkurl{#1}}}
%% 章节设置
\RequirePackage[center,pagestyles]{titlesec}
\RequirePackage{apptools}
\RequirePackage[toc,page]{appendix}
+\setcounter{secnumdepth}{5}
\titleformat{\chapter}[\style]{\bfseries}
-{\filcenter\LARGE\enspace\bfseries{\color{main}\IfAppendix{\appendixname}{\chaptername}\enspace}}{1pt}{\bfseries\color{main}\LARGE\filcenter}[\filcenter\base{main}{88}]
+{\filcenter\LARGE\enspace\bfseries{\color{structurecolor}\IfAppendix{\appendixname}{\chaptername}\enspace}}{1pt}{\bfseries\color{structurecolor}\LARGE\filcenter}[\ifdefstring{\ELEGANT@base}{hide}{}{\filcenter\base{structurecolor}{88}}]
\titleformat{\section}[hang]{\bfseries}
-{\hspace{-2.45em}\Large\bfseries{\color{main}\thesection}\enspace}{1pt}{\color{main}\Large\bfseries\filright}
+{\hspace{-2.45em}\Large\bfseries{\color{structurecolor}\thesection}\enspace}{1pt}{\color{structurecolor}\Large\bfseries\filright}
\titleformat{\subsection}[hang]{\bfseries}
-{\hspace{-2.45em}\large\bfseries\color{main}\thesubsection\enspace}{1pt}{\color{main}\large\bfseries\filright}
+{\hspace{-2.45em}\large\bfseries\color{structurecolor}\thesubsection\enspace}{1pt}{\color{structurecolor}\large\bfseries\filright}
\titleformat{\subsubsection}[hang]{\bfseries}
-{\hspace{-2.45em}\large\bfseries\color{main}\thesubsection\enspace}{1pt}{\color{main}\large\bfseries\filright}
+{\hspace{-2.45em}\large\bfseries\color{structurecolor}\thesubsubsection\enspace}{1pt}{\color{structurecolor}\large\bfseries\filright}
-\titlespacing{\chapter}{0pt}{0pt}{1.5\baselineskip}
+\titlespacing{\chapter}{0pt}{-20pt}{1.3\baselineskip}
%\titlespacing{\subsection}{0pt}{0.5\baselineskip}{-\baselineskip}
-
+%%define the note and proof environment
+\RequirePackage{pifont,manfnt,bbding}
% list/itemize/enumerate setting
\RequirePackage[shortlabels]{enumitem}
\setlist{nolistsep}
-\RequirePackage[most]{tcolorbox}
+\RequirePackage[many]{tcolorbox}
+\ifdefstring{\ELEGANT@mode}{fancy}{
\tcbset{
common/.style={
- fontupper=\itshape,
+ fontupper=\ifdefstring{\ELEGANT@lang}{en}{\itshape}{\upshape\kaishu},
lower separated=false,
coltitle=white,
- colback=gray!10,
+ colback=gray!5,
+ boxrule=0.5pt,
fonttitle=\bfseries,
enhanced,
breakable,
@@ -313,23 +351,26 @@
before skip=8pt,
attach boxed title to top left={yshift=-0.11in,xshift=0.15in},
boxed title style={boxrule=0pt,colframe=white,arc=0pt,outer arc=0pt},
- % separator sign={:},
+ separator sign={.},
},
defstyle/.style={
common,
colframe=main,
+ colback=main!5,
colbacktitle=main,
overlay unbroken and last={\node[anchor=south east, outer sep=6pt] at (\textwidth-width,0) {\textcolor{main}{$\clubsuit$}}; }
},
thmstyle/.style={
common,
colframe=second,
+ colback=second!5,
colbacktitle=second,
overlay unbroken and last={\node[anchor=south east, outer sep=6pt] at (\textwidth-width,0) {\textcolor{second}{$\heartsuit$}}; }
},
propstyle/.style={
common,
colframe=third,
+ colback=third!5,
colbacktitle=third,
overlay unbroken and last={\node[anchor=south east, outer sep=6pt] at (\textwidth-width,0) {\textcolor{third}{$\spadesuit$}}; }
},
@@ -355,13 +396,86 @@
\ifdefstring{\ELEGANT@lang}{en}{Lemma}{引理}
}{thmstyle}{lem}
+}{\relax}
+
+\ifdefstring{\ELEGANT@mode}{simple}{
+\let\openbox\relax
+\RequirePackage{amsthm}
+\let\proof\relax
+\let\endproof\relax
+% declare a new theorem style
+\newtheoremstyle{edefstyle}%
+{3pt}% Space above
+{3pt}% Space below
+{\ifdefstring{\ELEGANT@lang}{en}{\itshape}{\upshape\kaishu}}% Body font
+{}% Indent amount
+{\bfseries\color{main}}% Theorem head font
+{.}% Punctuation after theorem head
+{.5em}% Space after theorem head
+{\thmname{#1}\thmnumber{ #2}\thmnote{ (#3)}}% Theorem head spec (can be left empty, meaning ‘normal’)
+% -------------------------------------------------%
+\newtheoremstyle{ethmstyle}%
+{3pt}% Space above
+{3pt}% Space below
+{\ifdefstring{\ELEGANT@lang}{en}{\itshape}{\upshape\kaishu}}% Body font
+{}% Indent amount
+{\bfseries\color{second}}% Theorem head font
+{.}% Punctuation after theorem head
+{.5em}% Space after theorem head
+{\thmname{#1}\thmnumber{ #2}\thmnote{ (#3)}}% Theorem head spec (can be left empty, meaning ‘normal’)
+% -------------------------------------------------%
+\newtheoremstyle{eprostyle}%
+{3pt}% Space above
+{3pt}% Space below
+{\ifdefstring{\ELEGANT@lang}{en}{\itshape}{\upshape\kaishu}}% Body font
+{}% Indent amount
+{\bfseries\color{third}}% Theorem head font
+{.}% Punctuation after theorem head
+{.5em}% Space after theorem head
+{\thmname{#1}\thmnumber{ #2}\thmnote{ (#3)}}% Theorem head spec (can be left empty, meaning ‘normal’)
+
+\theoremstyle{edefstyle}
+\newtheorem{edefinition}{\ifdefstring{\ELEGANT@lang}{en}{Definition}{定义}}[chapter]
+
+\theoremstyle{ethmstyle}
+\newtheorem{etheorem}{\ifdefstring{\ELEGANT@lang}{en}{Theorem}{定理}}[chapter]
+\newtheorem{elemma}{\ifdefstring{\ELEGANT@lang}{en}{Lemma}{引理}}[chapter]
+\newtheorem{ecorollary}{\ifdefstring{\ELEGANT@lang}{en}{Corollary}{推论}}[chapter]
+
+\theoremstyle{eprostyle}
+\newtheorem{eproposition}{\ifdefstring{\ELEGANT@lang}{en}{Proposition}{命题}}[chapter]
+
+\newenvironment{theorem}[2]
+ {\ifstrempty{#1}{\etheorem}{\etheorem[#1]}\ifstrempty{#2}{}{\label{thm:#2}}}
+ {\endetheorem}
+
+\newenvironment{definition}[2]
+ {\ifstrempty{#1}{\edefinition}{\edefinition[#1]}\ifstrempty{#2}{}{\label{def:#2}}}
+ {\endedefinition}
+
+\newenvironment{lemma}[2]
+ {\ifstrempty{#1}{\elemma}{\elemma[#1]}\ifstrempty{#2}{}{\label{lem:#2}}}
+ {\endelemma}
+
+\newenvironment{corollary}[2]
+ {\ifstrempty{#1}{\ecorollary}{\ecorollary[#1]}\ifstrempty{#2}{}{\label{cor:#2}}}
+ {\endecorollary}
+
+\newenvironment{proposition}[2]
+ {\ifstrempty{#1}{\eproposition}{\eproposition[#1]}\ifstrempty{#2}{}{\label{pro:#2}}}
+ {\endeproposition}
+}{\relax}
+
+% main(green-def): example exercise problem solution
+% second(orange-thm): proof note remark
+% third(blue-prop): assumptions property conclusion custom
%% Example with counter
\newcounter{exam}[chapter]
\setcounter{exam}{0}
\renewcommand{\theexam}{\thechapter.\arabic{exam}}
\newenvironment{example}[1][]{
- \refstepcounter{exam}\par\medskip\noindent \textbf{\color{main}{
+ \refstepcounter{exam}\par\noindent\textbf{\color{main}{
\ifdefstring{\ELEGANT@lang}{en}{Example}{例}
}~\theexam #1: }\rmfamily %
}{
@@ -373,7 +487,7 @@
\setcounter{exer}{0}
\renewcommand{\theexer}{\thechapter.\arabic{exer}}
\newenvironment{exercise}[1][]{
- \refstepcounter{exer}\par\medskip\noindent \textbf{\color{main}{
+ \refstepcounter{exer}\par\noindent\makebox[-3pt][r]{\scriptsize\color{red!90}\HandPencilLeft\quad}\textbf{\color{main}{
\ifdefstring{\ELEGANT@lang}{en}{Exercise}{练习}
}~\theexer #1: }\rmfamily %
}{
@@ -385,52 +499,71 @@
\setcounter{prob}{0}
\renewcommand{\theprob}{\thechapter.\arabic{prob}}
\newenvironment{problem}[1][]{
- \refstepcounter{prob}\par\medskip\noindent \textbf{\color{main}{
+ \refstepcounter{prob}\par\noindent\textbf{\color{main}{%
\ifdefstring{\ELEGANT@lang}{en}{Problem}{例题}
}~\theprob #1: }\rmfamily %
}{
\par\medskip\ignorespacesafterend %
}
-%%define the note and proof environment
-\RequirePackage{pifont,manfnt}
-\newenvironment{note}{\par\noindent{\makebox[0pt][r]{\scriptsize\color{red!90}\textdbend\quad}\textbf{\color{main}
+
+\newenvironment{note}{\par\noindent{\makebox[0pt][r]{\scriptsize\color{red!90}\textdbend\quad}\textbf{\color{second}
\ifdefstring{\ELEGANT@lang}{en}{Note:}{注意:}
-}}\itshape}{\par}
+}}\ifdefstring{\ELEGANT@lang}{en}{\itshape}{\kaishu}}{\par}
-\newenvironment{proof}{\par\noindent\textbf{\color{main}
+\newenvironment{proof}{\par\noindent\textbf{\color{second}
\ifdefstring{\ELEGANT@lang}{en}{Proof:}{证明:}
-}\color{black!90}\small}{\hfill$\Box$\quad\par}
-\newenvironment{remark}{\noindent\textbf{\color{main}
+}\color{black!90}\small}{
+%\hfill$\Box$\quad
+\par}
+\newenvironment{remark}{\noindent\textbf{\color{second}
\ifdefstring{\ELEGANT@lang}{en}{Remark:}{注:}
}}{\par}
-\newenvironment{assumption}{\par\noindent\textbf{\color{main}
+\newenvironment{assumption}{\par\noindent\textbf{\color{third}
\ifdefstring{\ELEGANT@lang}{en}{Assumption:}{假设:}
}}{\par}
-\newenvironment{conclusion}{\par\noindent\textbf{\color{main}
+\newenvironment{conclusion}{\par\noindent\textbf{\color{third}
\ifdefstring{\ELEGANT@lang}{en}{Conclusion:}{结论:}
}}{\par}
\newenvironment{solution}{\par\noindent\textbf{\color{main}
\ifdefstring{\ELEGANT@lang}{en}{Solution:}{解:}
}}{\par}
-\newenvironment{property}{\par\noindent\textbf{\color{main}
+\newenvironment{property}{\par\noindent\textbf{\color{third}
\ifdefstring{\ELEGANT@lang}{en}{Property:}{性质:}
}}{\par}
+\newenvironment{custom}[1]{\par\noindent\textbf{\color{third}
+ \ifdefstring{\ELEGANT@lang}{en}{#1:}{#1:}
+}}{\par}
+\ifdefstring{\ELEGANT@result}{noanswer}{
+ \AtBeginDocument{
+ \excludecomment{solution}
+ \excludecomment{proof}
+ \excludecomment{inline}
+ }
+}{\relax}
%页眉页脚
\RequirePackage{fancyhdr}
\RequirePackage{lastpage}
\fancyhf{}
-\fancyhead[EL,OR]{\color{main}--\thepage/\pageref*{LastPage}--}
-\fancyhead[ER]{\color{main}\em\nouppercase\leftmark{}}
-\fancyhead[OL]{\color{main}\em\nouppercase\rightmark}
-\fancyfoot[c]{\base{main}{88}}
-\renewcommand{\headrule}{\color{main}\hrule width\textwidth}
-\pagestyle{fancy}
+\if@twoside
+\fancyhead[EL,OR]{\color{structurecolor}\ifdefstring{\ELEGANT@lang}{en}{\itshape}{\kaishu}--\thepage/\pageref*{LastPage}--}
+\fancyhead[ER]{\color{structurecolor}\ifdefstring{\ELEGANT@lang}{en}{\itshape}{\kaishu}\leftmark{}}
+\fancyhead[OL]{\color{structurecolor}\ifdefstring{\ELEGANT@lang}{en}{\itshape}{\kaishu}\rightmark}
+\else
+\fancyhead[R]{\color{structurecolor}\ifdefstring{\ELEGANT@lang}{en}{\itshape}{\kaishu}--\thepage/\pageref*{LastPage}--}
+\fancyhead[L]{\color{structurecolor}\ifdefstring{\ELEGANT@lang}{en}{\itshape}{\kaishu}\rightmark}
+\fi
+
+\fancyfoot[c]{\base{structurecolor}{88}}
+\renewcommand{\headrule}{\color{structurecolor}\hrule width\textwidth}
+\pagestyle{fancy}
+\renewcommand{\headrulewidth}{1pt}
+% \renewcommand{\headrule}{}
\fancypagestyle{plain}{\renewcommand{\headrulewidth}{0pt}\fancyhf{}\renewcommand{\headrule}{}}
\renewcommand{\sectionmark}[1]{\markright{\thesection\; #1}{} }
\renewcommand{\chaptermark}[1]{\markboth{\chaptername \; #1\;}{}}
@@ -438,73 +571,99 @@
%%封面
\newcommand*{\equote}[1]{\def\@equote{#1}}
+\def\IfEmpty#1{%
+ \edef\1{\the#1}
+ \ifx\1\empty
+}
+\def \ifempty#1{\def\temp{#1} \ifx\temp\empty }
+
\newcommand*{\logo}[1]{
- \def\@logo{\includegraphics[width=0.3\textwidth]{#1}
+ \def\@logo{\includegraphics[width=4.2cm]{#1}
}
}
\newcommand*{\cover}[1]{
- \def\@logo{\includegraphics[width=\linewidth]{cover.jpg}
+ \def\@cover{\includegraphics[width=\linewidth]{#1}
}
}
+
+\renewcommand{\baselinestretch}{1.35}
+
\renewcommand*{\maketitle}{%
\hypersetup{pageanchor=false}
\begin{titlepage}
- \newpage
\newgeometry{margin = 0in}
\parindent=0pt
- \renewcommand\baselinestretch{2.5}
- \includegraphics[width=\linewidth]{cover.jpg}
+ \@cover
\setlength{\fboxsep}{0pt}
\colorbox{second}{\makebox[\linewidth][c]{\shortstack[c]{\vspace{0.5in}}}}
\vfill
- \hfill
+ \vskip-2ex
\hspace{2em}
+ \parbox{0.8\textwidth}{
+ \bfseries\Huge \@title\par
+ }
+ \vfill
+ \vspace{-1.0cm}
+ \setstretch{2.5}
+ \hspace{2.5em}
\begin{minipage}[c]{0.68\linewidth}
- {\bfseries\Huge \@title\\}
{\color{darkgray}\bfseries\Large \the\subtitle\\[2ex]}
\color{gray}\kaishu\normalsize
{\renewcommand{\arraystretch}{0.618}
\begin{tabular}{l}
- \ifdefstring{\ELEGANT@lang}{en}{\textbf{Author: }}{\textbf{作者:}}\@author \\
- \ifdefstring{\ELEGANT@lang}{en}{\textbf{Institute: }}{\textbf{组织:}}\the\institute\\
- \ifdefstring{\ELEGANT@lang}{en}{\textbf{Update: }}{\textbf{更新:}}\@date\\
- \ifdefstring{\ELEGANT@lang}{en}{\textbf{Version: }}{\textbf{版本:}}\the\version \\
+ \ifdefstring{\ELEGANT@lang}{en}{\textbf{Author: }}{\textbf{作者:}} \@author \\
+ \ifdefstring{\ELEGANT@lang}{en}{\textbf{Institute: }}{\textbf{组织:}} \the\institute\\
+ \ifdefstring{\ELEGANT@lang}{en}{\textbf{Date: }}{\textbf{时间:}} \@date\\
+ \ifdefstring{\ELEGANT@lang}{en}{\textbf{Version: }}{\textbf{版本:}} \the\version\\
\end{tabular}}
\end{minipage}
\begin{minipage}[c]{0.27\linewidth}
\begin{tikzpicture}[remember picture,overlay]
\begin{pgfonlayer}{background}
- \node[opacity=0.8,anchor=south east,outer sep=0pt,inner sep=0pt] at ($(current page.south east) +(-0.8in,1.5in)$) {\includegraphics[width=0.7\textwidth]{logo.png}};
+ \node[opacity=0.8,anchor=south east,outer sep=0pt,inner sep=0pt] at ($(current page.south east) +(-0.8in,1.5in)$) {\@logo};
\end{pgfonlayer}
\end{tikzpicture}
\end{minipage}
\vfill
\centerline{\itshape \@equote}
\vfill
- \restoregeometry
\end{titlepage}
+\restoregeometry
\thispagestyle{empty}
}
+
+
+
\RequirePackage{listings}
+\renewcommand{\ttdefault}{cmtt}
+\lstdefinestyle{mystyle}{
+ basicstyle=%
+ \ttfamily
+ \lst@ifdisplaystyle\small\fi
+}
+
+\lstset{basicstyle=\ttfamily,style=mystyle}
+
\definecolor{lightgrey}{rgb}{0.9,0.9,0.9}
\definecolor{frenchplum}{RGB}{190,20,83}
\lstset{language=[LaTeX]TeX,
- texcsstyle=*\bf\color{winered}\ttfamily,
- basicstyle=\ttfamily,
+ texcsstyle=*\color{winered},
numbers=none,
breaklines=true,
- keywordstyle=\bf\color{winered}\ttfamily,
+ keywordstyle=\color{winered},
commentstyle=\color{gray},
emph={elegantpaper,fontenc,fontspec,xeCJK,FiraMono,xunicode,newtxmath,figure,fig,image,img,table,itemize,enumerate,newtxtext,newtxtt,ctex,microtype,description,times,newtx,booktabs,tabular,PDFLaTeX,XeLaTeX,type1cm,BibTeX,device,color,mode,lang,amsthm,tcolorbox,titlestyle},
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,equote,logo,cover,subtitle,appendix,chapter,hypersetup,mainmatter,tableofcontents},
- frame=none,
+ frame=single,
tabsize=2,
- rulecolor=\color{main},
+ rulecolor=\color{structurecolor},
+ framerule=0.2pt,
+ columns=flexible,
+ % backgroundcolor=\color{lightgrey}
}
-\bibliographystyle{aer}