elegantpaper (25feb19)

git-svn-id: svn://tug.org/texlive/trunk@50128 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 35 insertions, 24 deletions

diff --git a/Master/texmf-dist/tex/latex/elegantpaper/elegantpaper.cls b/Master/texmf-dist/tex/latex/elegantpaper/elegantpaper.cls
index b2c67917e0b..4ab2e959a70 100644
--- a/Master/texmf-dist/tex/latex/elegantpaper/elegantpaper.cls
+++ b/Master/texmf-dist/tex/latex/elegantpaper/elegantpaper.cls
@@ -1,11 +1,11 @@
-% Current Version: 0.05
+% Current Version: 0.06
 % Author: Dongsheng Deng
 % Homepage: https://ddswhu.me/
 % Email: elegantlatex2e@gmail.com
 % Lastest Version: https://github.com/ElegantLaTeX/ElegantPaper
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{elegantpaper}[2019/02/01 v0.05 ElegantLaTeX Paper class]
+\ProvidesClass{elegantpaper}[2019/02/25 v0.06 ElegantLaTeX Paper class]
   
 \LoadClass[11pt]{article}
 
@@ -98,12 +98,12 @@
 	\RequirePackage[no-math]{fontspec}
 	\setmainfont{Times New Roman}[NFSSFamily=ntxtlf]
 	\setsansfont{Arial}
-	%\setmonofont[Scale=0.9]{Courier New}
+	%\setmonofont[Scale=0.7]{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.9]{Microsoft YaHei}
+	\setCJKmonofont[BoldFont={SimHei},ItalicFont={KaiTi},Scale=0.7]{Microsoft YaHei}
 	\XeTeXlinebreaklocale "zh"
 	\XeTeXlinebreakskip = 0pt plus 1pt minus 0.1pt
 	\RequirePackage{newtxmath}
@@ -123,7 +123,7 @@
 	\RequirePackage{newtxmath}
 	\RequirePackage[UTF8, scheme=plain]{ctex}
 \fi
-\RequirePackage[scale=0.8]{FiraMono}
+\RequirePackage[scale=0.7]{FiraMono}
 
 \ifdefstring{\ELEGANT@lang}{cn}{
   	\theoremstyle{plain}% default
@@ -136,20 +136,22 @@
 	\newtheorem{conjecture}{猜想}[section] %
 	\newtheorem{example}{例}[section] %
 	\theoremstyle{remark} %
-	\newtheorem*{remark}{\normalfont\bfseries评论} %
-	\newtheorem*{note}{\normalfont\bfseries注} %
-	\newtheorem{case}{\normalfont\bfseries案例} %
-	\renewcommand*{\proofname}{\normalfont\bfseries证明} %
+	\newtheorem*{remark}{\normalfont\bfseries 评论} %
+	\newtheorem*{note}{\normalfont\bfseries 注} %
+	\newtheorem{case}{\normalfont\bfseries 案例} %
+	\renewcommand*{\proofname}{\normalfont\bfseries 证明} %
 	\renewcommand\contentsname{目录}
 	\renewcommand\refname{参考文献} %
 	\renewcommand\figurename{图} %
 	\renewcommand\tablename{表}%
 	\newcommand\versiontext{版本：}%
-	\newcommand\updatetext{最后更新：}%
+	\newcommand\updatetext{更新：}%
 	\renewcommand\abstractname{摘\hspace{2em}要}
 	\setlength{\parindent}{2em}
 	\renewcommand{\abstracttextfont}{\kaishu\sffamily\small}
 	\newcommand{\keywords}[1]{\vskip2ex\par\noindent\normalfont{\bfseries 关键词: } #1}
+	\newcommand\figref[1]{{\bfseries 图~\ref{#1}}}
+	\newcommand\tabref[1]{{\bfseries 表~\ref{#1}}}
 }{\relax}
 \ifdefstring{\ELEGANT@lang}{en}{
   \theoremstyle{plain}% default
@@ -165,18 +167,24 @@
 	\newtheorem*{remark}{Remark} %
 	\newtheorem*{note}{Note} %
 	\newtheorem{case}{Case} %
-	\renewcommand*{\proofname}{\normalfont\bfseries\color{ecolor}Proof}%
+	\renewcommand*{\proofname}{\normalfont\bfseries Proof}%
 	\newcommand\versiontext{Version: }%
-	\newcommand\updatetext{Last update: }%
+	\newcommand\updatetext{Update: }%
 	\renewcommand{\abstracttextfont}{\sffamily\small}
 	\newcommand{\keywords}[1]{\vskip2ex\par\noindent\normalfont{\bfseries Keywords: } #1}
+	\newcommand\figref[1]{{\bfseries Figure~\ref{#1}}}
+	\newcommand\tabref[1]{{\bfseries Table~\ref{#1}}}
 }{\relax}
 
 \AtBeginEnvironment{verbatim}{\microtypesetup{activate=false}}
 
+\def\IfEmpty#1{%
+  \edef\1{\the#1}
+  \ifx\1\empty
+}
 \newtoks\version
 \newtoks\institute
-
+\def \ifempty#1{\def\temp{#1} \ifx\temp\empty }
 \renewcommand\maketitle{\par
   \begingroup
     \renewcommand\thefootnote{\@fnsymbol\c@footnote}%
@@ -203,12 +211,14 @@
   \global\let\@maketitle\relax
   \global\let\@thanks\@empty
   \global\let\@author\@empty
+  \global\let\@ELEGANT@version\@empty
   \global\let\@date\@empty
   \global\let\@title\@empty
   \global\let\title\relax
   \global\let\author\relax
   \global\let\date\relax
   \global\let\and\relax
+  \global\let\ELEGANT@version\relax
 }
 \def\@maketitle{%
   \newpage
@@ -224,13 +234,19 @@
         \@author\\
         \the\institute
       \end{tabular}\par}%
-    \vskip 1.5em%
-    {\small\itshape \versiontext \the\version}%
-    \vskip .1em%
-    {\small\itshape \updatetext \@date}%
+\vskip 1.5em%
+\IfEmpty\version
+\else 
+{\small\itshape \versiontext \the\version}
+\fi
+\ifx\@date\empty
+\else
+\vskip 0.1em%
+ 	{\small\itshape \updatetext \@date}%
+\fi
   \end{center}%
   \par
-  \vskip 1.5em}
+}
   
 
 
@@ -245,17 +261,12 @@
   \let\prod\prodop
 
 
-
-\newcommand\figref[1]{{\bfseries Figure~\ref{#1}}}
-\newcommand\tabref[1]{{\bfseries Table~\ref{#1}}}
-
-
 \RequirePackage{listings} 
 \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=\footnotesize\ttfamily,
+	basicstyle=\ttfamily,
 	numbers=none,
 	breaklines=true,
 	keywordstyle=\bf\color{winered}\ttfamily,