Skip to content

Commit

Permalink
New Release
Browse files Browse the repository at this point in the history 
Former-commit-id: 307a230
  • Loading branch information
@HuangruiMo
HuangruiMo committed Feb 19, 2019
1 parent d96130f commit b8afbcf
Show file tree
Hide file tree
Showing 7 changed files with 156 additions and 83 deletions.
16 changes: 7 additions & 9 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,32 +24,30 @@

## 重要通知

* `2019-02-06` 模板样式进行了修改，请查看下面的修改描述，以决定是否需要更新。
* `2019-02-20` 模板样式进行了修改，请查看下面的修改描述，以决定是否需要更新。

## 更新记录

* `2019-02-06` 增加定理、定义、证明等数学环境并完善中文版和国际版之间的中英格式切换。
* `2019-02-20` 根据 [opt-gaobin, issue #100](https://github.com/mohuangrui/ucasthesis/issues/100) ，增加定理、定义、证明等数学环境。根据 [DRjy, issue #102](https://github.com/mohuangrui/ucasthesis/issues/102) ，调整 \mathcal 字体样式。根据 [zike Liu, email] ，适当缩减目录列表的缩进。根据 [xiaoyaoE, issue #105](https://github.com/mohuangrui/ucasthesis/issues/105) ，使数字字体和英文字体一致。完善中文版和国际版之间的中英格式切换。

* `2019-01-10` 将公式编号前加点纳入模版默认，更多相关讨论可见：[琐屑细节](https://github.com/mohuangrui/ucasthesis/wiki/琐屑细节)。在 yunyun2019 的建议下，采用 [zepinglee](https://github.com/zepinglee) 基于国标样式为 ucas 所定制文献样式：[ucas 样式分支](https://github.com/CTeX-org/gbt7714-bibtex-style/tree/ucas)。文献样式设定的更多讨论可见：[文献样式](https://github.com/mohuangrui/ucasthesis/wiki/%E6%96%87%E7%8C%AE%E6%A0%B7%E5%BC%8F)。

* `2018-04-08` 在邵岳林的建议下将附录复原为常规的排版设置。若需将附录置于参考文献后，请见：[琐屑细节](https://github.com/mohuangrui/ucasthesis/wiki/琐屑细节)。
* `2019-01-10` 根据 [mnpengjk, issue #57](https://github.com/mohuangrui/ucasthesis/issues/57) ， 将公式编号前加点纳入模版默认，更多讨论可见：[琐屑细节](https://github.com/mohuangrui/ucasthesis/wiki/琐屑细节) 。根据 [yunyun2019, issue #95](https://github.com/mohuangrui/ucasthesis/issues/95) ，采用 [zepinglee](https://github.com/zepinglee) 基于国标样式为 ucas 所定制文献样式：[ucas 样式分支](https://github.com/CTeX-org/gbt7714-bibtex-style/tree/ucas) ，文献样式更多讨论可见：[文献样式](https://github.com/mohuangrui/ucasthesis/wiki/%E6%96%87%E7%8C%AE%E6%A0%B7%E5%BC%8F)。根据 [邵岳林, email] ，将附录复原为常规的排版设置，若需将附录置于参考文献后，请见：[琐屑细节](https://github.com/mohuangrui/ucasthesis/wiki/琐屑细节)。

* `2018-04-03` 根据国科大本科部陆晴老师和本科部学位办丁云云老师的复审审核建议再次修复一些样式细节问题。

* `2018-04-02` 模板进行了重大更新，修复了样式、字体、格式等许多问题。

* 根据国科大本科部陆晴老师的建议对模版样式进行了诸多拓展和修正，并完善对本科生论文元素的兼容性。
* 在赵永明同学的建议下对数学符号字体进行调整。在 [ctex](https://github.com/CTeX-org/ctex-kit) 开发者的帮助下解决了如何多次调用 Times New Roman 而不导致黑体调用错误的问题。修复 twn1993 发现的默认黑体为微软雅黑而不是SimHei的问题。
* 在 [ctex](https://github.com/CTeX-org/ctex-kit) 开发者的帮助下解决了如何多次调用 Times New Roman 而不导致黑体调用错误的问题。根据 [twn1993, email]，修复默认黑体为微软雅黑而不是SimHei的问题。
* 繁复折腾测试后终于找出一个在ctex默认黑体替换粗宋体设定环境内全局AutoFakeBold失效状态下折衷特定字体库不全条件下生僻字显示和系统默认字重不全条件下粗宋体显示以及不同操作系统下如何平衡上述字库自重矛盾还有根据操作系统自动调用所带有的Times字体的方案。祝贺大家不用再为字体调用苦恼了。
* 设定论文封面据英文学位名如 Bachelor，Master，或 Doctor 自动切换。密级据是否填写自动显示。

* `2018-03-22` 演示表标题居表上，加粗图表标注，设置长图表标题悬挂缩进（由于 bicaption 宏包无法正确接受 caption 宏包的 margin 选项，图表中英标题第一行无法正确同步缩进，从而放弃第一行的缩进），强调多图中子图标题的规范使用，通过摘要和符号列表演示标题不在目录中显示却仍在页眉中显示，修改附录为学位办给出的特殊显示行为。设置 bicaption 不在图形列表和表格列表中显示英文标题，问题/建议由赵永明提出。
* `2018-03-22` 演示表标题居表上，加粗图表标注，设置长图表标题悬挂缩进（由于 bicaption 宏包无法正确接受 caption 宏包的 margin 选项，图表中英标题第一行无法正确同步缩进，从而放弃第一行的缩进），强调多图中子图标题的规范使用，通过摘要和符号列表演示标题不在目录中显示却仍在页眉中显示。根据 [赵永明, email]，设置双语图表标题和 bicaption 不在图形列表和表格列表中显示英文标题。

* `2018-03-21` 使用 [xiaoyao9933](https://github.com/xiaoyao9933/UCASthesis) 制作的 ucas_logo.pdf 使学校 logo 放大不失真，问题/建议由 zhanglinbo 提出。回答标题英文如何设为 Times New Roman 字体，问题/建议由 Starsky Wong 提出。矫正由 will0n 和赵永明提出的一些格式细节问题，根据赵永明的建议设置双语图表标题，根据 tangjie1992 的建议配置算法环境。
* `2018-03-21` 根据 [zhanglinbo, issue #42](https://github.com/mohuangrui/ucasthesis/issues/42) ，使用 [xiaoyao9933](https://github.com/xiaoyao9933/UCASthesis) 制作的 ucas_logo.pdf 使学校 logo 放大不失真。根据 [Starsky Wong, issue #41](https://github.com/mohuangrui/ucasthesis/issues/41) ，设置标题英文设为 Times New Roman 。根据 [will0n, issue #29](https://github.com/mohuangrui/ucasthesis/issues/29) ，[Man-Ting-Fang, issue #26](https://github.com/mohuangrui/ucasthesis/issues/26) ，[diyiliaoya, issue #12](https://github.com/mohuangrui/ucasthesis/issues/12) ，和 [赵永明, email] ，矫正一些格式细节问题。根据 [tangjie1992, issue #30](https://github.com/mohuangrui/ucasthesis/issues/30) ，配置算法环境。

* `2018-02-04` 在 [ctex](https://github.com/CTeX-org/ctex-kit) 开发者的帮助下修复误用字体命令导致的粗宋体异常。然后，将模板兼容性进一步扩展为兼容操作系统 Windows，Linux，MacOS 和 LaTeX 编译引擎 pdflatex，xelatex，lualatex。移除 microtype 宏包以提高编译效率。

* `2018-01-28` 基于国科大 2018 新版论文规范进行了重大修改，采用新的封面、声明、页眉页脚样式。展示标题中使用数学公式。

* `2017-05-14` 增加 \citepns{} 和 \citetns{} 命令提供上标引用下混合非上标引用的需求，问题/建议由赵永明提出。添加设定论文为 thesis 或 dissertation 的命令 \englishthesistype{}，问题/建议由臧光明提出。
* `2017-05-14` 根据 [赵永明, email] ，增加 \citepns{} 和 \citetns{} 命令提供上标引用下混合非上标引用的需求。根据 [臧光明, email] ，添加设定论文为 thesis 或 dissertation 的命令。

74 changes: 57 additions & 17 deletions Style/artratex.sty
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,15 +171,26 @@
%-
\ProcessOptions\relax%
%---------------------------------------------------------------------------%
%->> Detect class and counter
%---------------------------------------------------------------------------%
\newcommand*{\ifcounter}[1]{% check if counter exists
\ifcsname c@#1\endcsname%
\expandafter\@firstoftwo%
\else%
\expandafter\@secondoftwo%
\fi
}
\ifcounter{chapter}{\def\maincounter{chapter}}{\def\maincounter{section}}
%---------------------------------------------------------------------------%
%->> Required packages
%---------------------------------------------------------------------------%
%-
%-> Math packages
%-
\RequirePackage{amsmath,amsthm,amssymb}% math packages
\RequirePackage{amsmath,amsthm,amssymb}% math structures, theorems, and extended symbols
\theoremstyle{plain}% for theorems, lemmas, propositions, etc
\providecommand{\theoremname}{Theorem}%
\newtheorem{theorem}{\theoremname}[chapter]
\newtheorem{theorem}{\theoremname}[\maincounter]
\providecommand{\axiomname}{Axiom}%
\newtheorem{axiom}[theorem]{\axiomname}
\providecommand{\lemmaname}{Lemma}%
Expand All @@ -194,30 +205,36 @@
\newtheorem{conjecture}[theorem]{\conjecturename}
\theoremstyle{definition}% for definitions and examples
\providecommand{\definitionname}{Definition}%
\newtheorem{definition}{\definitionname}[chapter]
\newtheorem{definition}{\definitionname}[\maincounter]
\providecommand{\examplename}{Example}%
\newtheorem{example}{\examplename}[chapter]
\newtheorem{example}{\examplename}[\maincounter]
\theoremstyle{remark}% for remarks and notes
\providecommand{\remarkname}{Remark}%
\newtheorem*{remark}{\remarkname}

\ifartx@math% extra math packages
\RequirePackage{mathtools}%
\RequirePackage{mathtools}% extension to amsmath
\fi
%-
%-> Language settings
%-
\ifartx@pdftex% <pdflatex> call font packages
\RequirePackage[utf8]{inputenc}% set input encoding, document must use utf-8 encoding
\RequirePackage[T1]{fontenc}% set font encoding to enable modern font encoding
%- Call font package options:
%- Text + Math: Times Roman
\RequirePackage{newtxtext}%
\RequirePackage[cmintegrals]{newtxmath}% load after math packages
%- Text + Math: Palatino
%\RequirePackage{palatino}%
%- Text font: Chinese
%\RequirePackage{zhmCJK}% support calling system fonts
%\ifartx@windows%
% \setCJKmainfont[AutoFakeBold,ItalicFont=simkai.ttf]{simsun.ttc}%
% \setCJKsansfont[AutoFakeBold]{simhei.ttf}%
% \setCJKmonofont{simfang.ttf}%
%\fi
%- Text font: English <default: computer modern|others: font packages>
\RequirePackage{newtxtext}% main font, <times font: newtxtext|others: palatino>
%- Math font: <default: computer modern|others: font packages>
\RequirePackage[cmintegrals]{newtxmath}% times font, load after amsmath and newtxtext packages
\RequirePackage{mathrsfs}% enable \mathscr for script alphabet
\RequirePackage[cal=cm]{mathalfa}% map styles for calligraphic \mathcal and script \mathscr alphabet
\else% <xelatex> or <lualatex> call system fonts
\RequirePackage[cmintegrals]{newtxmath}% math symbol font, load after math but before fontspec packages
\RequirePackage{fontspec}% support calling system fonts
%- Font properties: <family> + <weight> + <shape> + <size>
%- Specify the three default TeX font families: <main>, <sans>, <mono>
Expand All @@ -237,12 +254,10 @@
%- examples: Rockwell, Andale Mono, Courier
%\setmonofont{Rockwell}% font switches: {\ttfamily, ...}, \texttt{...}
%- Specify user-defined font families and font switches
%- without NFSSFamily option, a font family is defined only if adding a new font name
%\newfontfamily\<font-switch>{<font>}[<font features>]%
%\newcommand{\text<font-switch>}[1]{{\<font-switch> #1}}%
% without NFSSFamily option, a font family is defined only when the added font name
% is a new one. mathrm and mathsf can be set by \setmathrm and \setmathsf
%\RequirePackage{unicode-math}% another math symbol font configuration
%\setmathfont{XITS Math}% a complete symbol set for STIX math fonts
%- Text font: Chinese
\ifartx@windows%
\setCJKmainfont[AutoFakeBold,ItalicFont=KaiTi]{SimSun}%
\setCJKsansfont[AutoFakeBold]{SimHei}%
Expand All @@ -256,13 +271,38 @@
\setCJKsansfont[AutoFakeBold]{AdobeHeitiStd-Regular}%
\setCJKmonofont{AdobeFangsongStd-Regular}%
\fi\fi\fi
%- Text font: English <default: computer modern|fontspec: system fonts|others: font packages>
\ifartx@times%
\setmainfont[NFSSFamily=entextrm]{Times New Roman}%
\setsansfont[NFSSFamily=entextsf]{Times New Roman}%
%\setmonofont[NFSSFamily=entexttt]{Courier New}%
\else
\setmainfont[NFSSFamily=entextrm]{FreeSerif}%
\setsansfont[NFSSFamily=entextsf]{FreeSerif}%
%\setmonofont[NFSSFamily=entexttt]{FreeMono}%
\fi
%\RequirePackage{newtxtext}% main font
%- Math font: <default: computer modern|others: font packages <newtxmath|unicode-math>>
\RequirePackage[cmintegrals]{newtxmath}% times font, load after amsmath and newtxtext packages
\DeclareSymbolFont{operators}{OT1}{ntxtlf}{m}{n}% fix numbers by setting operator font to newtx-family
\SetSymbolFont{operators}{bold}{OT1}{ntxtlf}{b}{n}% fix numbers by setting operator font to newtx-family
\AtBeginDocument{%
\DeclareMathSymbol{0}{\mathalpha}{operators}{`0}%
\DeclareMathSymbol{1}{\mathalpha}{operators}{`1}%
\DeclareMathSymbol{2}{\mathalpha}{operators}{`2}%
\DeclareMathSymbol{3}{\mathalpha}{operators}{`3}%
\DeclareMathSymbol{4}{\mathalpha}{operators}{`4}%
\DeclareMathSymbol{5}{\mathalpha}{operators}{`5}%
\DeclareMathSymbol{6}{\mathalpha}{operators}{`6}%
\DeclareMathSymbol{7}{\mathalpha}{operators}{`7}%
\DeclareMathSymbol{8}{\mathalpha}{operators}{`8}%
\DeclareMathSymbol{9}{\mathalpha}{operators}{`9}%
}
\RequirePackage{mathrsfs}% enable \mathscr for script alphabet
\RequirePackage[cal=cm]{mathalfa}% map styles for calligraphic \mathcal and script \mathscr alphabet
%\RequirePackage{unicode-math}% another math font configuration
%\setmathfont{XITS Math}% a complete symbol set for STIX math fonts
%- mathrm and mathsf can be set by \setmathrm and \setmathsf
\fi
%-
%-> Bibliography processor and package
Expand Down Expand Up @@ -467,7 +507,7 @@
%-
%-> Macro for adding content link to the table of content and bookmark
%-
\providecommand{\intotoc}[2][chapter]{%
\providecommand{\intotoc}[2][\maincounter]{%
\cleardoublepage% ensure correct page reference
\markboth{\MakeUppercase{#2}}{}% set the leftmark
\phantomsection% create link in bookmarks
Expand Down
46 changes: 0 additions & 46 deletions Style/ucasthesis.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,51 +101,5 @@
}
\def\ucas@value@ch@declare@rule{涉密及延迟公开的学位论文在解密或延迟期后适用本声明。}
%---------------------------------------------------------------------------%
%->> Structure layout
%---------------------------------------------------------------------------%
%- chapter
\ctexset {
chapter = {
format = \linespread{1.0}\zihao{4}\bfseries\sffamily\centering,
number = \arabic{chapter},
aftername = \quad,
beforeskip = {7pt},
afterskip = {18pt},
pagestyle = plain,
}
}
%- section
\ctexset {
section = {
format = \linespread{1.0}\zihao{-4}\sffamily\raggedright,
aftername = \quad,
beforeskip = {24pt},
afterskip = {6pt},
}
}
%- subsection
\ctexset {
subsection = {
format = \linespread{1.0}\zihao{-4}\sffamily\raggedright,
aftername = \quad,
beforeskip = {12pt},
afterskip = {6pt},
}
}
%- subsubsection
\ctexset {
subsubsection = {
format = \linespread{1.0}\zihao{-4}\sffamily\raggedright,
aftername = \quad,
beforeskip = {12pt},
afterskip = {6pt},
}
}
%- appendix
\ctexset {
appendix = {
}
}
%---------------------------------------------------------------------------%
\endinput
81 changes: 76 additions & 5 deletions Style/ucasthesis.cls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -408,13 +408,76 @@
\renewcommand{\proofname}{\ucas@label@ch@proofname}
\fi
%---------------------------------------------------------------------------%
%->> Structure layout
%---------------------------------------------------------------------------%
%- chapter
\ctexset {
chapter = {
format = \linespread{1.0}\zihao{4}\bfseries\sffamily\centering,
number = \arabic{chapter},
%numberformat = \rmfamily,
aftername = \quad,
beforeskip = {7pt},
afterskip = {18pt},
pagestyle = plain,
}
}
%- section
\ctexset {
section = {
format = \linespread{1.0}\zihao{-4}\sffamily\raggedright,
%numberformat = \rmfamily,
aftername = \quad,
beforeskip = {24pt},
afterskip = {6pt},
}
}
%- subsection
\ctexset {
subsection = {
format = \linespread{1.0}\zihao{-4}\sffamily\raggedright,
%numberformat = \rmfamily,
aftername = \quad,
beforeskip = {12pt},
afterskip = {6pt},
}
}
%- subsubsection
\ctexset {
subsubsection = {
format = \linespread{1.0}\zihao{-4}\sffamily\raggedright,
%numberformat = \rmfamily,
aftername = \quad,
beforeskip = {12pt},
afterskip = {6pt},
}
}
%- appendix
\ctexset {
appendix = {
%numbering = true|false,
%number = \rmfamily\Alph{chapter},
}
}
%---------------------------------------------------------------------------%
%->> Configure table of contents
%---------------------------------------------------------------------------%
%- define spacing and length
\def\@dotsep{1.5mu}% spacing for dots
\def\@pnumwidth{2em}% spacing between titles and page numbers
\def\@tocrmarg{2em}% right margin indentation
\def\@chaptervspace{1ex}% spacing between chapter titles
%- the table of contents is specified by defining \l@chapter, \l@section, ...
%- most commands are then defined with the \@dottedtocline:
%- \@dottedtocline{⟨level⟩}{⟨indent⟩}{⟨numwidth⟩}{⟨title⟩}{⟨page⟩}
%- ⟨level⟩ an entry is produced only if ⟨level⟩ <= value of the tocdepth counter
%- note, \chapter is level 0, \section is level 1, etc
%- ⟨indent⟩ indentation from the outer left margin of the start of the contents line
%- ⟨numwidth⟩ width of a box in which the section number is to go
%- <title> title
%- <page> page number

%- parameters for spacing and length in toc
\def\@dotsep{1.5mu}% separation between dots in mu units
\def\@pnumwidth{2em}% width of a box in which the page number is put
\def\@tocrmarg{2em}% right margin for multiple line entries, \@tocrmarg ≥ \@pnumwidth
\def\@chaptervspace{1ex}% vertical space between chapter titles

%- redefine dottedtocline from classes.dtx and latex.ltx
\renewcommand*{\@dottedtocline}[5]{% [<level>,<indent>,<numwidth>,<title>,<page>]
\ifnum #1>\c@tocdepth \else
Expand Down Expand Up @@ -470,6 +533,14 @@
\endgroup
\fi
}
%- redefine indentation for others
\renewcommand*\l@section{\@dottedtocline{1}{1em}{2em}}
\renewcommand*\l@subsection{\@dottedtocline{2}{2em}{3em}}
\renewcommand*\l@subsubsection{\@dottedtocline{3}{3em}{4em}}
\renewcommand*\l@paragraph{\@dottedtocline{4}{4em}{5em}}
\renewcommand*\l@subparagraph{\@dottedtocline{5}{5em}{6em}}
\renewcommand*\l@figure{\@dottedtocline{1}{1em}{2em}}
\renewcommand*\l@table{\@dottedtocline{1}{1em}{2em}}
%---------------------------------------------------------------------------%
\endinput

6 changes: 4 additions & 2 deletions Tex/Appendix.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@ \section{论文无附录者无需附录部分}
\section{测试公式编号} \label{sec:testmath}

\begin{equation} \label{eq:appedns}
\adddotsbeforeeqnnum%
\begin{cases}
\frac{\partial \rho}{\partial t} + \nabla\cdot(\rho\Vector{V}) = 0 \ \mathrm{times\ font\ test}\\
\frac{\partial (\rho\Vector{V})}{\partial t} + \nabla\cdot(\rho\Vector{V}\Vector{V}) = \nabla\cdot\Tensor{\sigma} \ \text{times font test}\\
\frac{\partial \rho}{\partial t} + \nabla\cdot(\rho\Vector{V}) = 0\\
\frac{\partial (\rho\Vector{V})}{\partial t} + \nabla\cdot(\rho\Vector{V}\Vector{V}) = \nabla\cdot\Tensor{\sigma}\\
\frac{\partial (\rho E)}{\partial t} + \nabla\cdot(\rho E\Vector{V}) = \nabla\cdot(k\nabla T) + \nabla\cdot(\Tensor{\sigma}\cdot\Vector{V})
\end{cases}
\end{equation}
\begin{equation}
\adddotsbeforeeqnnum%
\frac{\partial }{\partial t}\int\limits_{\Omega} u \, \mathrm{d}\Omega + \int\limits_{S} \unitVector{n}\cdot(u\Vector{V}) \, \mathrm{d}S = \dot{\phi}
\end{equation}

Expand Down
Loading

0 comments on commit b8afbcf

Please sign in to comment.