diff --git a/contents/abstract.tex b/contents/abstract.tex index d4a0a44e..73cc3b09 100644 --- a/contents/abstract.tex +++ b/contents/abstract.tex @@ -8,7 +8,7 @@ 位论文中文摘要字数为 500 字左右,博士学位论文中文摘要字数为 800 字左右。英文摘 要内容应与中文摘要内容一致。 - 摘要页的下方注明本文的关键词(4~6个)。 + 摘要页的下方注明本文的关键词(4 \textasciitilde{} 6个)。 \end{abstract} \begin{abstract}[en] diff --git a/contents/achievements.tex b/contents/achievements.tex index ea0d1746..38178295 100644 --- a/contents/achievements.tex +++ b/contents/achievements.tex @@ -17,11 +17,11 @@ \subsection*{学术论文} \subsection*{专利} \begin{bibliolist}{00} - \item 第一发明人,“永动机”,专利申请号202510149890.0 + \item 第一发明人, “永动机”, 专利申请号202510149890.0. \end{bibliolist} \begin{bibliolist*}{00} - \item 第一发明人,“永动机”,专利申请号XXXXXXXXXXXX.X + \item 第一发明人, “永动机”, 专利申请号XXXXXXXXXXXX.X. \end{bibliolist*} \end{achievements} diff --git a/contents/acknowledgements.tex b/contents/acknowledgements.tex index 510defab..af892e2d 100644 --- a/contents/acknowledgements.tex +++ b/contents/acknowledgements.tex @@ -1,7 +1,7 @@ % !TEX root = ../main.tex \begin{acknowledgements} - 感谢那位最先制作出博士学位论文 \LaTeX 模板的物理系同学! + 感谢那位最先制作出博士学位论文 \LaTeX{} 模板的物理系同学! 感谢 William Wang 同学对模板移植做出的贡献! @@ -11,6 +11,5 @@ 感谢所有为模板贡献过代码的\href{https://github.com/sjtug/SJTUThesis/graphs/contributors}{同学们}, 以及所有测试和使用模板的各位同学! - 感谢 \LaTeX 和 \href{https://github.com/sjtug/SJTUThesis}{SJTUThesis},帮我节 - 省了不少时间。 + 感谢 \LaTeX 和 \href{https://github.com/sjtug/SJTUThesis}{SJTUThesis},帮我节省了不少时间。 \end{acknowledgements} diff --git a/contents/app_flow_chart.tex b/contents/app_flow_chart.tex index 17297dfe..5c4d6b87 100644 --- a/contents/app_flow_chart.tex +++ b/contents/app_flow_chart.tex @@ -3,12 +3,12 @@ \chapter{绘制流程图} 图~\ref{fig:flow_chart} 是一张流程图示意。使用 \pkg{tikz} 环境,搭配四种预定义节 -点(\verb+startstop+、\verb+process+、\verb+decision+和\verb+io+),可以容易地绘 -制出流程图。 +点(\verb|startstop|、\verb|process|、\verb|decision| 和 \verb|io|),可以容易地 +绘制出流程图。 \begin{figure}[!htp] \centering - \resizebox{6cm}{!}{\input{figures/flow_chart.tex}} + \input{figures/flow_chart.tex} \bicaption{绘制流程图效果}{Flow chart} \label{fig:flow_chart} \end{figure} diff --git a/contents/digest.tex b/contents/digest.tex index 00772ff5..1f4cf5f4 100644 --- a/contents/digest.tex +++ b/contents/digest.tex @@ -18,9 +18,9 @@ management reform of institutions for higher education, regaining its vigor and vitality with an unprecedented momentum of growth. SJTU includes five beautiful campuses, Xuhui, Minhang, Luwan Qibao, and Fahua, taking up an area - of about 3,225,833 m2. A number of disciplines have been advancing towards the - top echelon internationally, and a batch of burgeoning branches of learning - have taken an important position domestically. + of about \qty{3225833}{\square\metre}. A number of disciplines have been + advancing towards the top echelon internationally, and a batch of burgeoning + branches of learning have taken an important position domestically. Today SJTU has 31 schools (departments), 63 undergraduate programs, 250 masters-degree programs, 203 Ph.D. programs, 28 post-doctorate programs, and @@ -28,19 +28,20 @@ SJTU boasts a large number of famous scientists and professors, including 35 academics of the Academy of Sciences and Academy of Engineering, 95 accredited - professors and chair professors of the "Cheung Kong Scholars Program" and more - than 2,000 professors and associate professors. + professors and chair professors of the ``Cheung Kong Scholars Program'' and + more than \num{2000} professors and associate professors. - Its total enrollment of students amounts to 35,929, of which 1,564 are - international students. There are 16,802 undergraduates, and 17,563 masters - and Ph.D. candidates. After more than a century of operation, Jiao Tong - University has inherited the old tradition of "high starting points, solid - foundation, strict requirements and extensive practice." Students from SJTU - have won top prizes in various competitions, including ACM International - Collegiate Programming Contest, International Mathematical Contest in Modeling - and Electronics Design Contests. Famous alumni include Jiang Zemin, Lu Dingyi, - Ding Guangen, Wang Daohan, Qian Xuesen, Wu Wenjun, Zou Taofen, Mao Yisheng, - Cai Er, Huang Yanpei, Shao Lizi, Wang An and many more. More than 200 of the - academics of the Chinese Academy of Sciences and Chinese Academy of - Engineering are alumni of Jiao Tong University. + Its total enrollment of students amounts to \num{35929}, of which \num{1564} + are international students. There are \num{16802} undergraduates, and + \num{17563} masters and Ph.D. candidates. After more than a century of + operation, Jiao Tong University has inherited the old tradition of ``high + starting points, solid foundation, strict requirements and extensive + practice.'' Students from SJTU have won top prizes in various competitions, + including ACM International Collegiate Programming Contest, International + Mathematical Contest in Modeling and Electronics Design Contests. Famous + alumni include Jiang Zemin, Lu Dingyi, Ding Guangen, Wang Daohan, Qian Xuesen, + Wu Wenjun, Zou Taofen, Mao Yisheng, Cai Er, Huang Yanpei, Shao Lizi, Wang An + and many more. More than 200 of the academics of the Chinese Academy of + Sciences and Chinese Academy of Engineering are alumni of Jiao Tong + University. \end{digest} diff --git a/contents/floats.tex b/contents/floats.tex index fbc233b1..ee38aa69 100644 --- a/contents/floats.tex +++ b/contents/floats.tex @@ -27,7 +27,7 @@ \subsection{单个图形} {单个图形示例\cite{He1999}。如果表格的标题很长,那么在表格索引中就会很不美观。可 以在前面用中括号写一个简短的标题,这个标题会出现在索引中。} {Stay hungry, stay foolish.} - \label{fig:cn_100t} + \label{fig:cn_100t} \end{figure} \subsection{多个图形} @@ -48,18 +48,19 @@ \subsection{多个图形} \texttt{parbox} 就可以,如图~\ref{fig:parallel1} 与图~\ref{fig:parallel2}。 \begin{figure}[!htp] -\begin{minipage}{0.48\textwidth} \centering - \includegraphics[height=1.5cm]{sjtu-vi-name-blue.pdf} - \caption{并排第一个图} - \label{fig:parallel1} -\end{minipage}\hfill -\begin{minipage}{0.48\textwidth} - \centering - \includegraphics[height=1.5cm]{sjtu-vi-name-blue.pdf} - \caption{并排第二个图} - \label{fig:parallel2} -\end{minipage} + \begin{minipage}{0.48\textwidth} + \centering + \includegraphics[height=1.5cm]{sjtu-vi-name-blue.pdf} + \caption{并排第一个图} + \label{fig:parallel1} + \end{minipage}\hfill + \begin{minipage}{0.48\textwidth} + \centering + \includegraphics[height=1.5cm]{sjtu-vi-name-blue.pdf} + \caption{并排第二个图} + \label{fig:parallel2} + \end{minipage} \end{figure} 如果要为共用一个计数器的多个子图添加子图题,建议使用较新的 \pkg{subcaption}宏 diff --git a/contents/math_and_citations.tex b/contents/math_and_citations.tex index b98f4fcd..ea387c3c 100644 --- a/contents/math_and_citations.tex +++ b/contents/math_and_citations.tex @@ -9,23 +9,17 @@ \subsection{数字和单位} 宏包 \pkg{siunitx} 提供了更好的数字和单位支持: \begin{itemize} \item \num{12345.67890} - % For TeXLive 2021, siunitx >= 3.0 - % \item \complexnum{1+-2i} - % For siunitx < 3.0 - % \item \num{1+-2i} + \item \complexnum{1+-2i} \item \num{.3e45} - % For TeXLive 2021, siunitx >= 3.0 - % \item \numproduct{1.654 x 2.34 x 3.430} - % For siunitx < 3.0 - % \item \num{1.654 x 2.34 x 3.430} - \item \si{kg.m.s^{-1}} - \item \si{\micro\meter} $\si{\micro\meter}$ - \item \si{\ohm} $\si{\ohm}$ + \item \numproduct{1.654 x 2.34 x 3.430} + \item \unit{kg.m.s^{-1}} + \item \unit{\micro\meter} $\unit{\micro\meter}$ + \item \unit{\ohm} $\unit{\ohm}$ \item \numlist{10;20} \item \numlist{10;20;30} - \item \SIlist{0.13;0.67;0.80}{\milli\metre} + \item \qtylist{0.13;0.67;0.80}{\milli\metre} \item \numrange{10}{20} - \item \SIrange{10}{20}{\degreeCelsius} + \item \qtyrange{10}{20}{\degreeCelsius} \end{itemize} \subsection{数学符号和公式} @@ -49,13 +43,13 @@ \subsection{数学符号和公式} 公式末尾是需要添加标点符号的,至于用逗号还是句号,取决于公式下面一句是接着公式说的,还是另起一句。 \begin{equation} - \frac{2h}{\pi}\int_{0}^{\infty}\frac{\sin\left( \omega\delta \right)}{\omega} - \cos\left( \omega x \right) \dd\omega = - \begin{cases} - h, \ \left| x \right| < \delta, \\ - \frac{h}{2}, \ x = \pm \delta, \\ - 0, \ \left| x \right| > \delta. - \end{cases} + \frac{2h}{\pi}\int_{0}^{\infty}\frac{\sin\left( \omega\delta \right)}{\omega} + \cos\left( \omega x \right) \dd\omega = + \begin{cases} + h, & \left| x \right| < \delta, \\ + \frac{h}{2}, & x = \pm \delta, \\ + 0, & \left| x \right| > \delta. + \end{cases} \end{equation} 公式较长时最好在等号“$=$”处转行。 \begin{align} diff --git a/contents/resume.tex b/contents/resume.tex index e6a03611..67a1d374 100644 --- a/contents/resume.tex +++ b/contents/resume.tex @@ -17,6 +17,6 @@ \subsection*{联系方式} \begin{itemize} \item 地址: 上海市闵行区东川路 800 号,200240 - \item E-mail: \email{xxx@sjtu.edu.cn} + \item E-mail: \email{john_smith@sjtu.edu.cn} \end{itemize} \end{resume} diff --git a/figures/flow_chart.tex b/figures/flow_chart.tex index a77f8841..c0008565 100644 --- a/figures/flow_chart.tex +++ b/figures/flow_chart.tex @@ -3,61 +3,62 @@ \tikzstyle{startstop} = [ rectangle, rounded corners, - minimum width=2cm, - minimum height=1cm, + minimum width=4em, text centered, - draw=black + inner sep=1.5ex, + draw ] \tikzstyle{io} = [ trapezium, trapezium left angle=75, trapezium right angle=105, - minimum width=1cm, - minimum height=1cm, + minimum width=4em, text centered, - draw=black + inner sep=1.5ex, + draw ] \tikzstyle{process} = [ rectangle, - minimum width=2cm, - minimum height=1cm, + minimum width=4em, text centered, - draw=black + inner sep=1.5ex, + draw ] \tikzstyle{decision} = [ diamond, - minimum width=2cm, - minimum height=1cm, + minimum width=4em, + aspect=2, text centered, - draw=black] -\tikzstyle{arrow} = [thick, ->, >=stealth] + draw +] +\tikzstyle{arrow} = [-{LaTeX}] -\begin{tikzpicture}[node distance=2cm] +\begin{tikzpicture}[node distance=1.5cm, every node/.style={font=\footnotesize}] % 设置节点 - \node (pic) [startstop] {待测图片}; - \node (bg) [io, below of=pic] {读取背景}; - \node (pair) [process, below of=bg] {匹配特征点对}; - \node (threshold) [decision, below of=pair, yshift=-0.5cm] {多于阈值}; - \node (clear) [decision, right of=threshold, xshift=3cm] {清晰?}; - \node (capture) [process, right of=pair, xshift=3cm, yshift=0.5cm] {重采}; - \node (matrix_p) [process, below of=threshold, yshift=-0.8cm] {透视变换矩阵}; - \node (matrix_a) [process, right of=matrix_p, xshift=3cm] {仿射变换矩阵}; - \node (reg) [process, below of=matrix_p] {图像修正}; - \node (return) [startstop, below of=reg] {配准结果}; + \node[startstop] (pic) {待测图片}; + \node[io, below of=pic] (bg) {读取背景}; + \node[process, below of=bg] (pair) {匹配特征点对}; + \node[decision, below of=pair, yshift=-2ex] (threshold) {多于阈值}; + \node[decision, right of=threshold, xshift=3cm] (clear) {清晰?}; + \node[process, right of=pair, xshift=3cm] (capture) {重采}; + \node[process, below of=threshold, yshift=-2ex] (matrix_p) {透视变换矩阵}; + \node[process, right of=matrix_p, xshift=3cm] (matrix_a) {仿射变换矩阵}; + \node[process, below of=matrix_p] (reg) {图像修正}; + \node[startstop, below of=reg] (return) {配准结果}; % 连接节点 - \draw [arrow](pic) -- (bg); - \draw [arrow](bg) -- (pair); - \draw [arrow](pair) -- (threshold); + \draw[arrow] (pic) -- (bg); + \draw[arrow] (bg) -- (pair); + \draw[arrow] (pair) -- (threshold); - \draw [arrow](threshold) -- node[anchor=south] {否} (clear); + \draw[arrow] (threshold) -- node[above] {否} (clear); - \draw [arrow](clear) -- node[anchor=west] {否} (capture); - \draw [arrow](capture) |- (pic); - \draw [arrow](clear) -- node[anchor=west] {是} (matrix_a); - \draw [arrow](matrix_a) |- (reg); + \draw[arrow] (clear) -- node[right] {否} (capture); + \draw[arrow] (capture) |- (pic); + \draw[arrow] (clear) -- node[right] {是} (matrix_a); + \draw[arrow] (matrix_a) |- (reg); - \draw [arrow](threshold) -- node[anchor=east] {是} (matrix_p); - \draw [arrow](matrix_p) -- (reg); - \draw [arrow](reg) -- (return); + \draw[arrow] (threshold) -- node[left] {是} (matrix_p); + \draw[arrow] (matrix_p) -- (reg); + \draw[arrow] (reg) -- (return); \end{tikzpicture} diff --git a/bibdata/thesis.bib b/refs.bib similarity index 100% rename from bibdata/thesis.bib rename to refs.bib diff --git a/setup.tex b/setup.tex index 3cc8ea7f..4a8ebd02 100644 --- a/setup.tex +++ b/setup.tex @@ -113,7 +113,7 @@ % 文献表条目间的间距 \setlength{\bibitemsep}{0pt} % 导入参考文献数据库 -\addbibresource{bibdata/thesis.bib} +\addbibresource{refs.bib} % 脚注格式 \usepackage[perpage,bottom,hang]{footmisc} @@ -153,11 +153,30 @@ % 代码环境宏包 \usepackage{listings} -\lstnewenvironment{codeblock}[1][]% - {\lstset{style=lstStyleCode,#1}}{} - -% 物理科学和技术中使用的数学符号,定义了 \qty 命令,与 siunitx 3.0 有冲突 -% \usepackage{physics} +\lstdefinestyle{lstStyleCode}{% + aboveskip = \medskipamount, + belowskip = \medskipamount, + basicstyle = \ttfamily\zihao{6}, + commentstyle = \slshape\color{black!60}, + stringstyle = \color{green!40!black!100}, + keywordstyle = \bfseries\color{blue!50!black}, + extendedchars = false, + upquote = true, + tabsize = 2, + showstringspaces = false, + xleftmargin = 1em, + xrightmargin = 1em, + breaklines = false, + framexleftmargin = 1em, + framexrightmargin = 1em, + backgroundcolor = \color{gray!10}, + columns = flexible, + keepspaces = true, + texcl = true, + mathescape = true +} +\lstnewenvironment{codeblock}[1][]{% + \lstset{style=lstStyleCode,#1}}{} % 直立体数学符号 \providecommand{\dd}{\mathop{}\!\mathrm{d}} @@ -166,7 +185,7 @@ \providecommand{\jj}{\mathrm{j}} % 国际单位制宏包 -\usepackage{siunitx}[=v2] +\usepackage{siunitx} % 定理环境宏包 \usepackage{ntheorem} @@ -174,7 +193,7 @@ % 绘图宏包 \usepackage{tikz} -\usetikzlibrary{shapes.geometric, arrows} +\usetikzlibrary{arrows.meta, shapes.geometric} % 一些文档中用到的 logo \usepackage{hologo} @@ -185,27 +204,8 @@ \DeclareRobustCommand\cs[1]{\texttt{\char`\\#1}} \providecommand\pkg[1]{{\sffamily#1}} -% 自定义命令 - -% E-mail -\newcommand{\email}[1]{\href{mailto:#1}{\texttt{#1}}} - % hyperref 宏包在最后调用 \usepackage{hyperref} -% 自动引用题注更正为中文 -\def\equationautorefname{式} -\def\footnoteautorefname{脚注} -\def\itemautorefname{项} -\def\figureautorefname{图} -\def\tableautorefname{表} -\def\partautorefname{篇} -\def\appendixautorefname{附录} -\def\chapterautorefname{章} -\def\sectionautorefname{节} -\def\subsectionautorefname{小节} -\def\subsubsectionautorefname{小节} -\def\paragraphautorefname{段落} -\def\subparagraphautorefname{子段落} -\def\FancyVerbLineautorefname{行} -\def\theoremautorefname{定理} +% E-mail +\providecommand{\email}[1]{\href{mailto:#1}{\urlstyle{tt}\nolinkurl{#1}}}