Skip to content

Commit b8afbcf

Browse files
HuangruiMoHuangruiMo
committed
New Release
Former-commit-id: 307a230
1 parent d96130f commit b8afbcf

7 files changed

+156
-83
lines changed

‎README.md

+7-9
Original file line numberDiff line numberDiff line change
@@ -24,32 +24,30 @@
2424

2525
## 重要通知
2626

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

2929
## 更新记录
3030

31-
* `2019-02-06` 增加定理、定义、证明等数学环境并完善中文版和国际版之间的中英格式切换。
31+
* `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) ，使数字字体和英文字体一致。完善中文版和国际版之间的中英格式切换。
3232

33-
* `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)。
34-
35-
* `2018-04-08` 在邵岳林的建议下将附录复原为常规的排版设置。若需将附录置于参考文献后，请见：[琐屑细节](https://github.com/mohuangrui/ucasthesis/wiki/琐屑细节)。
33+
* `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/琐屑细节)。
3634

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

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

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

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

48-
* `2018-03-21` 使用 [xiaoyao9933](https://github.com/xiaoyao9933/UCASthesis) 制作的 ucas_logo.pdf 使学校 logo 放大不失真，问题/建议由 zhanglinbo 提出。回答标题英文如何设为 Times New Roman 字体，问题/建议由 Starsky Wong 提出。矫正由 will0n 和赵永明提出的一些格式细节问题，根据赵永明的建议设置双语图表标题，根据 tangjie1992 的建议配置算法环境。
46+
* `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) ，配置算法环境。
4947

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

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

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

‎Style/artratex.sty

+57-17
Original file line numberDiff line numberDiff line change
@@ -171,15 +171,26 @@
171171
%-
172172
\ProcessOptions\relax%
173173
%---------------------------------------------------------------------------%
174+
%->> Detect class and counter
175+
%---------------------------------------------------------------------------%
176+
\newcommand*{\ifcounter}[1]{% check if counter exists
177+
\ifcsname c@#1\endcsname%
178+
\expandafter\@firstoftwo%
179+
\else%
180+
\expandafter\@secondoftwo%
181+
\fi
182+
}
183+
\ifcounter{chapter}{\def\maincounter{chapter}}{\def\maincounter{section}}
184+
%---------------------------------------------------------------------------%
174185
%->> Required packages
175186
%---------------------------------------------------------------------------%
176187
%-
177188
%-> Math packages
178189
%-
179-
\RequirePackage{amsmath,amsthm,amssymb}% math packages
190+
\RequirePackage{amsmath,amsthm,amssymb}% math structures, theorems, and extended symbols
180191
\theoremstyle{plain}% for theorems, lemmas, propositions, etc
181192
\providecommand{\theoremname}{Theorem}%
182-
\newtheorem{theorem}{\theoremname}[chapter]
193+
\newtheorem{theorem}{\theoremname}[\maincounter]
183194
\providecommand{\axiomname}{Axiom}%
184195
\newtheorem{axiom}[theorem]{\axiomname}
185196
\providecommand{\lemmaname}{Lemma}%
@@ -194,30 +205,36 @@
194205
\newtheorem{conjecture}[theorem]{\conjecturename}
195206
\theoremstyle{definition}% for definitions and examples
196207
\providecommand{\definitionname}{Definition}%
197-
\newtheorem{definition}{\definitionname}[chapter]
208+
\newtheorem{definition}{\definitionname}[\maincounter]
198209
\providecommand{\examplename}{Example}%
199-
\newtheorem{example}{\examplename}[chapter]
210+
\newtheorem{example}{\examplename}[\maincounter]
200211
\theoremstyle{remark}% for remarks and notes
201212
\providecommand{\remarkname}{Remark}%
202213
\newtheorem*{remark}{\remarkname}
203214

204215
\ifartx@math% extra math packages
205-
\RequirePackage{mathtools}%
216+
\RequirePackage{mathtools}% extension to amsmath
206217
\fi
207218
%-
208219
%-> Language settings
209220
%-
210221
\ifartx@pdftex% <pdflatex> call font packages
211222
\RequirePackage[utf8]{inputenc}% set input encoding, document must use utf-8 encoding
212223
\RequirePackage[T1]{fontenc}% set font encoding to enable modern font encoding
213-
%- Call font package options:
214-
%- Text + Math: Times Roman
215-
\RequirePackage{newtxtext}%
216-
\RequirePackage[cmintegrals]{newtxmath}% load after math packages
217-
%- Text + Math: Palatino
218-
%\RequirePackage{palatino}%
224+
%- Text font: Chinese
225+
%\RequirePackage{zhmCJK}% support calling system fonts
226+
%\ifartx@windows%
227+
% \setCJKmainfont[AutoFakeBold,ItalicFont=simkai.ttf]{simsun.ttc}%
228+
% \setCJKsansfont[AutoFakeBold]{simhei.ttf}%
229+
% \setCJKmonofont{simfang.ttf}%
230+
%\fi
231+
%- Text font: English <default: computer modern|others: font packages>
232+
\RequirePackage{newtxtext}% main font, <times font: newtxtext|others: palatino>
233+
%- Math font: <default: computer modern|others: font packages>
234+
\RequirePackage[cmintegrals]{newtxmath}% times font, load after amsmath and newtxtext packages
235+
\RequirePackage{mathrsfs}% enable \mathscr for script alphabet
236+
\RequirePackage[cal=cm]{mathalfa}% map styles for calligraphic \mathcal and script \mathscr alphabet
219237
\else% <xelatex> or <lualatex> call system fonts
220-
\RequirePackage[cmintegrals]{newtxmath}% math symbol font, load after math but before fontspec packages
221238
\RequirePackage{fontspec}% support calling system fonts
222239
%- Font properties: <family> + <weight> + <shape> + <size>
223240
%- Specify the three default TeX font families: <main>, <sans>, <mono>
@@ -237,12 +254,10 @@
237254
%- examples: Rockwell, Andale Mono, Courier
238255
%\setmonofont{Rockwell}% font switches: {\ttfamily, ...}, \texttt{...}
239256
%- Specify user-defined font families and font switches
257+
%- without NFSSFamily option, a font family is defined only if adding a new font name
240258
%\newfontfamily\<font-switch>{<font>}[<font features>]%
241259
%\newcommand{\text<font-switch>}[1]{{\<font-switch> #1}}%
242-
% without NFSSFamily option, a font family is defined only when the added font name
243-
% is a new one. mathrm and mathsf can be set by \setmathrm and \setmathsf
244-
%\RequirePackage{unicode-math}% another math symbol font configuration
245-
%\setmathfont{XITS Math}% a complete symbol set for STIX math fonts
260+
%- Text font: Chinese
246261
\ifartx@windows%
247262
\setCJKmainfont[AutoFakeBold,ItalicFont=KaiTi]{SimSun}%
248263
\setCJKsansfont[AutoFakeBold]{SimHei}%
@@ -256,13 +271,38 @@
256271
\setCJKsansfont[AutoFakeBold]{AdobeHeitiStd-Regular}%
257272
\setCJKmonofont{AdobeFangsongStd-Regular}%
258273
\fi\fi\fi
274+
%- Text font: English <default: computer modern|fontspec: system fonts|others: font packages>
259275
\ifartx@times%
260276
\setmainfont[NFSSFamily=entextrm]{Times New Roman}%
261277
\setsansfont[NFSSFamily=entextsf]{Times New Roman}%
278+
%\setmonofont[NFSSFamily=entexttt]{Courier New}%
262279
\else
263280
\setmainfont[NFSSFamily=entextrm]{FreeSerif}%
264281
\setsansfont[NFSSFamily=entextsf]{FreeSerif}%
282+
%\setmonofont[NFSSFamily=entexttt]{FreeMono}%
265283
\fi
284+
%\RequirePackage{newtxtext}% main font
285+
%- Math font: <default: computer modern|others: font packages <newtxmath|unicode-math>>
286+
\RequirePackage[cmintegrals]{newtxmath}% times font, load after amsmath and newtxtext packages
287+
\DeclareSymbolFont{operators}{OT1}{ntxtlf}{m}{n}% fix numbers by setting operator font to newtx-family
288+
\SetSymbolFont{operators}{bold}{OT1}{ntxtlf}{b}{n}% fix numbers by setting operator font to newtx-family
289+
\AtBeginDocument{%
290+
\DeclareMathSymbol{0}{\mathalpha}{operators}{`0}%
291+
\DeclareMathSymbol{1}{\mathalpha}{operators}{`1}%
292+
\DeclareMathSymbol{2}{\mathalpha}{operators}{`2}%
293+
\DeclareMathSymbol{3}{\mathalpha}{operators}{`3}%
294+
\DeclareMathSymbol{4}{\mathalpha}{operators}{`4}%
295+
\DeclareMathSymbol{5}{\mathalpha}{operators}{`5}%
296+
\DeclareMathSymbol{6}{\mathalpha}{operators}{`6}%
297+
\DeclareMathSymbol{7}{\mathalpha}{operators}{`7}%
298+
\DeclareMathSymbol{8}{\mathalpha}{operators}{`8}%
299+
\DeclareMathSymbol{9}{\mathalpha}{operators}{`9}%
300+
}
301+
\RequirePackage{mathrsfs}% enable \mathscr for script alphabet
302+
\RequirePackage[cal=cm]{mathalfa}% map styles for calligraphic \mathcal and script \mathscr alphabet
303+
%\RequirePackage{unicode-math}% another math font configuration
304+
%\setmathfont{XITS Math}% a complete symbol set for STIX math fonts
305+
%- mathrm and mathsf can be set by \setmathrm and \setmathsf
266306
\fi
267307
%-
268308
%-> Bibliography processor and package
@@ -467,7 +507,7 @@
467507
%-
468508
%-> Macro for adding content link to the table of content and bookmark
469509
%-
470-
\providecommand{\intotoc}[2][chapter]{%
510+
\providecommand{\intotoc}[2][\maincounter]{%
471511
\cleardoublepage% ensure correct page reference
472512
\markboth{\MakeUppercase{#2}}{}% set the leftmark
473513
\phantomsection% create link in bookmarks

‎Style/ucasthesis.cfg

-46
Original file line numberDiff line numberDiff line change
@@ -101,51 +101,5 @@
101101
}
102102
\def\ucas@value@ch@declare@rule{涉密及延迟公开的学位论文在解密或延迟期后适用本声明。}
103103
%---------------------------------------------------------------------------%
104-
%->> Structure layout
105-
%---------------------------------------------------------------------------%
106-
%- chapter
107-
\ctexset {
108-
chapter = {
109-
format = \linespread{1.0}\zihao{4}\bfseries\sffamily\centering,
110-
number = \arabic{chapter},
111-
aftername = \quad,
112-
beforeskip = {7pt},
113-
afterskip = {18pt},
114-
pagestyle = plain,
115-
}
116-
}
117-
%- section
118-
\ctexset {
119-
section = {
120-
format = \linespread{1.0}\zihao{-4}\sffamily\raggedright,
121-
aftername = \quad,
122-
beforeskip = {24pt},
123-
afterskip = {6pt},
124-
}
125-
}
126-
%- subsection
127-
\ctexset {
128-
subsection = {
129-
format = \linespread{1.0}\zihao{-4}\sffamily\raggedright,
130-
aftername = \quad,
131-
beforeskip = {12pt},
132-
afterskip = {6pt},
133-
}
134-
}
135-
%- subsubsection
136-
\ctexset {
137-
subsubsection = {
138-
format = \linespread{1.0}\zihao{-4}\sffamily\raggedright,
139-
aftername = \quad,
140-
beforeskip = {12pt},
141-
afterskip = {6pt},
142-
}
143-
}
144-
%- appendix
145-
\ctexset {
146-
appendix = {
147-
}
148-
}
149-
%---------------------------------------------------------------------------%
150104
\endinput
151105

‎Style/ucasthesis.cls

+76-5
Original file line numberDiff line numberDiff line change
@@ -408,13 +408,76 @@
408408
\renewcommand{\proofname}{\ucas@label@ch@proofname}
409409
\fi
410410
%---------------------------------------------------------------------------%
411+
%->> Structure layout
412+
%---------------------------------------------------------------------------%
413+
%- chapter
414+
\ctexset {
415+
chapter = {
416+
format = \linespread{1.0}\zihao{4}\bfseries\sffamily\centering,
417+
number = \arabic{chapter},
418+
%numberformat = \rmfamily,
419+
aftername = \quad,
420+
beforeskip = {7pt},
421+
afterskip = {18pt},
422+
pagestyle = plain,
423+
}
424+
}
425+
%- section
426+
\ctexset {
427+
section = {
428+
format = \linespread{1.0}\zihao{-4}\sffamily\raggedright,
429+
%numberformat = \rmfamily,
430+
aftername = \quad,
431+
beforeskip = {24pt},
432+
afterskip = {6pt},
433+
}
434+
}
435+
%- subsection
436+
\ctexset {
437+
subsection = {
438+
format = \linespread{1.0}\zihao{-4}\sffamily\raggedright,
439+
%numberformat = \rmfamily,
440+
aftername = \quad,
441+
beforeskip = {12pt},
442+
afterskip = {6pt},
443+
}
444+
}
445+
%- subsubsection
446+
\ctexset {
447+
subsubsection = {
448+
format = \linespread{1.0}\zihao{-4}\sffamily\raggedright,
449+
%numberformat = \rmfamily,
450+
aftername = \quad,
451+
beforeskip = {12pt},
452+
afterskip = {6pt},
453+
}
454+
}
455+
%- appendix
456+
\ctexset {
457+
appendix = {
458+
%numbering = true|false,
459+
%number = \rmfamily\Alph{chapter},
460+
}
461+
}
462+
%---------------------------------------------------------------------------%
411463
%->> Configure table of contents
412464
%---------------------------------------------------------------------------%
413-
%- define spacing and length
414-
\def\@dotsep{1.5mu}% spacing for dots
415-
\def\@pnumwidth{2em}% spacing between titles and page numbers
416-
\def\@tocrmarg{2em}% right margin indentation
417-
\def\@chaptervspace{1ex}% spacing between chapter titles
465+
%- the table of contents is specified by defining \l@chapter, \l@section, ...
466+
%- most commands are then defined with the \@dottedtocline:
467+
%- \@dottedtocline{⟨level⟩}{⟨indent⟩}{⟨numwidth⟩}{⟨title⟩}{⟨page⟩}
468+
%- ⟨level⟩ an entry is produced only if ⟨level⟩ <= value of the tocdepth counter
469+
%- note, \chapter is level 0, \section is level 1, etc
470+
%- ⟨indent⟩ indentation from the outer left margin of the start of the contents line
471+
%- ⟨numwidth⟩ width of a box in which the section number is to go
472+
%- <title> title
473+
%- <page> page number
474+
475+
%- parameters for spacing and length in toc
476+
\def\@dotsep{1.5mu}% separation between dots in mu units
477+
\def\@pnumwidth{2em}% width of a box in which the page number is put
478+
\def\@tocrmarg{2em}% right margin for multiple line entries, \@tocrmarg ≥ \@pnumwidth
479+
\def\@chaptervspace{1ex}% vertical space between chapter titles
480+
418481
%- redefine dottedtocline from classes.dtx and latex.ltx
419482
\renewcommand*{\@dottedtocline}[5]{% [<level>,<indent>,<numwidth>,<title>,<page>]
420483
\ifnum #1>\c@tocdepth \else
@@ -470,6 +533,14 @@
470533
\endgroup
471534
\fi
472535
}
536+
%- redefine indentation for others
537+
\renewcommand*\l@section{\@dottedtocline{1}{1em}{2em}}
538+
\renewcommand*\l@subsection{\@dottedtocline{2}{2em}{3em}}
539+
\renewcommand*\l@subsubsection{\@dottedtocline{3}{3em}{4em}}
540+
\renewcommand*\l@paragraph{\@dottedtocline{4}{4em}{5em}}
541+
\renewcommand*\l@subparagraph{\@dottedtocline{5}{5em}{6em}}
542+
\renewcommand*\l@figure{\@dottedtocline{1}{1em}{2em}}
543+
\renewcommand*\l@table{\@dottedtocline{1}{1em}{2em}}
473544
%---------------------------------------------------------------------------%
474545
\endinput
475546

‎Tex/Appendix.tex

+4-2
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@ \section{论文无附录者无需附录部分}
77
\section{测试公式编号} \label{sec:testmath}
88

99
\begin{equation} \label{eq:appedns}
10+
\adddotsbeforeeqnnum%
1011
\begin{cases}
11-
\frac{\partial \rho}{\partial t} + \nabla\cdot(\rho\Vector{V}) = 0 \ \mathrm{times\ font\ test}\\
12-
\frac{\partial (\rho\Vector{V})}{\partial t} + \nabla\cdot(\rho\Vector{V}\Vector{V}) = \nabla\cdot\Tensor{\sigma} \ \text{times font test}\\
12+
\frac{\partial \rho}{\partial t} + \nabla\cdot(\rho\Vector{V}) = 0\\
13+
\frac{\partial (\rho\Vector{V})}{\partial t} + \nabla\cdot(\rho\Vector{V}\Vector{V}) = \nabla\cdot\Tensor{\sigma}\\
1314
\frac{\partial (\rho E)}{\partial t} + \nabla\cdot(\rho E\Vector{V}) = \nabla\cdot(k\nabla T) + \nabla\cdot(\Tensor{\sigma}\cdot\Vector{V})
1415
\end{cases}
1516
\end{equation}
1617
\begin{equation}
18+
\adddotsbeforeeqnnum%
1719
\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}
1820
\end{equation}
1921

0 commit comments

Comments
 (0)