summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc/latex/fduthesis
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-03-17 21:38:24 +0000
committerKarl Berry <karl@freefriends.org>2019-03-17 21:38:24 +0000
commit39948ee1306a518baab7bd81a847e11249643885 (patch)
treec553796b1fc65014f8f3139236889456dc917f6a /Master/texmf-dist/doc/latex/fduthesis
parent256f8bfa32f3e9134067457fc40c38ee02d01253 (diff)
fduthesis (17mar19)
git-svn-id: svn://tug.org/texlive/trunk@50428 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc/latex/fduthesis')
-rw-r--r--Master/texmf-dist/doc/latex/fduthesis/README.md12
-rw-r--r--Master/texmf-dist/doc/latex/fduthesis/fdulogo-example.tex4
-rw-r--r--Master/texmf-dist/doc/latex/fduthesis/fduthesis-code.pdfbin918250 -> 917309 bytes
-rw-r--r--Master/texmf-dist/doc/latex/fduthesis/fduthesis-cover.tex4
-rw-r--r--Master/texmf-dist/doc/latex/fduthesis/fduthesis-en.pdfbin145674 -> 162719 bytes
-rw-r--r--Master/texmf-dist/doc/latex/fduthesis/fduthesis-en.tex130
-rw-r--r--Master/texmf-dist/doc/latex/fduthesis/fduthesis-template.tex30
-rw-r--r--Master/texmf-dist/doc/latex/fduthesis/fduthesis.pdfbin374280 -> 410642 bytes
-rw-r--r--Master/texmf-dist/doc/latex/fduthesis/latexmkrc17
-rw-r--r--Master/texmf-dist/doc/latex/fduthesis/latexmkrc-en10
10 files changed, 101 insertions, 106 deletions
diff --git a/Master/texmf-dist/doc/latex/fduthesis/README.md b/Master/texmf-dist/doc/latex/fduthesis/README.md
index 59bf8c50bcf..b47bd09e422 100644
--- a/Master/texmf-dist/doc/latex/fduthesis/README.md
+++ b/Master/texmf-dist/doc/latex/fduthesis/README.md
@@ -1,7 +1,7 @@
The `fduthesis` Class
=====================
-*LaTeX thesis template for Fudan University, v0.7b*
+*LaTeX thesis template for Fudan University, v0.7c*
Overview
--------
@@ -21,7 +21,7 @@ The documentation can be found in
[fduthesis-en.pdf](http://mirrors.ctan.org/macros/latex/contrib/fduthesis/fduthesis-en.pdf)
(in English).
-GitHub re­pos­i­tory: <https://github.com/Stone-Zeng/fduthesis>.
+GitHub re­pos­i­tory: <https://github.com/stone-zeng/fduthesis>.
Installation
------------
@@ -39,7 +39,7 @@ To install `fduthesis`, you can use one of the following methods:
- Get the source from GitHub:
- git clone https://github.com/Stone-Zeng/fduthesis.git
+ git clone https://github.com/stone-zeng/fduthesis.git
Run `install-win.bat` (on Windows) or `install-linux.sh` (on Linux)
to generate the templates and configuration files. These files would
@@ -64,8 +64,8 @@ To install `fduthesis`, you can use one of the following methods:
Contributing
------------
-[Issues](https://github.com/Stone-Zeng/fduthesis/issues) and
-[pull requests](https://github.com/Stone-Zeng/fduthesis/pulls)
+[Issues](https://github.com/stone-zeng/fduthesis/issues) and
+[pull requests](https://github.com/stone-zeng/fduthesis/pulls)
are always welcome.
License
@@ -78,4 +78,4 @@ version.
-----
-Copyright (C) 2017, 2018 by Xiangdong Zeng <xdzeng96@gmail.com>.
+Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <xdzeng96@gmail.com>.
diff --git a/Master/texmf-dist/doc/latex/fduthesis/fdulogo-example.tex b/Master/texmf-dist/doc/latex/fduthesis/fdulogo-example.tex
index 78a1900736e..71e00f8aa79 100644
--- a/Master/texmf-dist/doc/latex/fduthesis/fdulogo-example.tex
+++ b/Master/texmf-dist/doc/latex/fduthesis/fdulogo-example.tex
@@ -7,7 +7,7 @@
%% fduthesis.dtx (with options: `ex-logo')
%% fduthesis-logo.dtx (with options: `ex-logo')
%%
-%% Copyright (C) 2017, 2018 by Xiangdong Zeng <xdzeng96@gmail.com>
+%% Copyright (C) 2017--2019 by Xiangdong Zeng <xdzeng96@gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -42,8 +42,6 @@
%% fduthesis.pdf,
%% fduthesis-en.pdf,
%% fduthesis-code.pdf,
-%% latexmkrc,
-%% latexmkrc-en,
%% and README.md.
%%
\documentclass{article}
diff --git a/Master/texmf-dist/doc/latex/fduthesis/fduthesis-code.pdf b/Master/texmf-dist/doc/latex/fduthesis/fduthesis-code.pdf
index 3a35c9cd441..06cba4d2332 100644
--- a/Master/texmf-dist/doc/latex/fduthesis/fduthesis-code.pdf
+++ b/Master/texmf-dist/doc/latex/fduthesis/fduthesis-code.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/fduthesis/fduthesis-cover.tex b/Master/texmf-dist/doc/latex/fduthesis/fduthesis-cover.tex
index eaeda2e3474..057c55840c9 100644
--- a/Master/texmf-dist/doc/latex/fduthesis/fduthesis-cover.tex
+++ b/Master/texmf-dist/doc/latex/fduthesis/fduthesis-cover.tex
@@ -7,7 +7,7 @@
%% fduthesis.dtx (with options: `cover')
%% fduthesis-logo.dtx (with options: `cover')
%%
-%% Copyright (C) 2017, 2018 by Xiangdong Zeng <xdzeng96@gmail.com>
+%% Copyright (C) 2017--2019 by Xiangdong Zeng <xdzeng96@gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -42,8 +42,6 @@
%% fduthesis.pdf,
%% fduthesis-en.pdf,
%% fduthesis-code.pdf,
-%% latexmkrc,
-%% latexmkrc-en,
%% and README.md.
%%
\documentclass{standalone}
diff --git a/Master/texmf-dist/doc/latex/fduthesis/fduthesis-en.pdf b/Master/texmf-dist/doc/latex/fduthesis/fduthesis-en.pdf
index a728509082d..5b38e773b6f 100644
--- a/Master/texmf-dist/doc/latex/fduthesis/fduthesis-en.pdf
+++ b/Master/texmf-dist/doc/latex/fduthesis/fduthesis-en.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/fduthesis/fduthesis-en.tex b/Master/texmf-dist/doc/latex/fduthesis/fduthesis-en.tex
index d8409a0d4e4..63f6062269d 100644
--- a/Master/texmf-dist/doc/latex/fduthesis/fduthesis-en.tex
+++ b/Master/texmf-dist/doc/latex/fduthesis/fduthesis-en.tex
@@ -6,7 +6,7 @@
%%
%% fduthesis.dtx
%%
-%% Copyright (C) 2017, 2018 by Xiangdong Zeng <xdzeng96@gmail.com>
+%% Copyright (C) 2017--2019 by Xiangdong Zeng <xdzeng96@gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -41,41 +41,27 @@
%% fduthesis.pdf,
%% fduthesis-en.pdf,
%% fduthesis-code.pdf,
-%% latexmkrc,
-%% latexmkrc-en,
%% and README.md.
%%
\PassOptionsToPackage{scheme=plain, linespread=1.1}{ctex}
\documentclass{fdudoc}
-\hypersetup
- {
- pdftitle = {fduthesis: LaTeX Thesis Template for Fudan University},
- pdfauthor = {Xiangdong Zeng}
- }
-\ctexset
- {
- section = {name = {}, format+ = \raggedright},
- subsubsection/tocline = {\CTEXnumberline{#1}#2}
- }
+\hypersetup{
+ pdftitle = {fduthesis: LaTeX Thesis Template for Fudan University},
+ pdfauthor = {Xiangdong Zeng}}
+\ctexset{
+ section = {name = {}, format+ = \raggedright},
+ subsubsection/tocline = {\CTEXnumberline{#1}#2}}
\pagestyle{headings}
-\renewcommand*\expstar{\hyperlink{expstar}{$\mfrake$}}
-\renewcommand*\rexpstar{\hyperlink{rexpstar}{$\mfrakc$}}
-\newcommand\FSID{{\xeCJKsetup{PunctStyle=banjiao}。}}
-\newcommand\FSFW{{\xeCJKsetup{PunctStyle=banjiao}.}}
-\IndexPrologue{\section{Index}}
-\def\IndexLayout{%
- \setlength\IndexMin{0.5\textheight}%
- \ctexset{section/numbering=false}%
- \StopSpecialIndexModule}
-\def\indexname{Index}
-\let\usage\relax
+\def\FSID{{\xeCJKsetup{PunctStyle=banjiao}。}}
+\def\FSFW{{\xeCJKsetup{PunctStyle=banjiao}.}}
+\AtBeginDocument{\def\QED{\blacksquare}}
\title{\textcolor{MaterialIndigo800}{%
\textbf{The \textsf{fduthesis} Class \\
\LaTeX{} Thesis Template for Fudan University}}}
\author{Xiangdong Zeng}
-\date{\today \quad v0.7b%
- \thanks{\url{https://github.com/Stone-Zeng/fduthesis}.}}
+\date{2019/03/17\quad v0.7c%
+ \thanks{\url{https://github.com/stone-zeng/fduthesis}.}}
\begin{document}
@@ -100,8 +86,8 @@
\tableofcontents
\newgeometry{
- left = 1.75 in,
- right = 1.00 in,
+ left = 1.65 in,
+ right = 0.80 in,
top = 1.25 in,
bottom = 1.00 in
}
@@ -152,7 +138,7 @@ divided into the following three types:
If you want to read the implementation part, please turn to the
Chinese version. Any issues or feature requests can be submitted
-in the \href{https://github.com/Stone-Zeng/fduthesis/issues}%
+in the \href{https://github.com/stone-zeng/fduthesis/issues}%
{GitHub repository}.
\section{Installation}
@@ -187,14 +173,14 @@ manually, the recommended way is to use the TDS ZIP file:
Although not recommended, you may generate the whole template
from source code as well:
\begin{itemize}
- \item Open the project's \href{https://github.com/Stone-Zeng/fduthesis}%
+ \item Open the project's \href{https://github.com/stone-zeng/fduthesis}%
{homepage}, click ``Clone or download'' and choose
``Download ZIP'' to download \file{fduthesis-master.zip}.
If you have git program on your computer, you can also
clone the repository directly:
\begin{shellexample}[gobble=5,alsoletter={.},%
morekeywords={git,clone}]
- git clone https://github.com/Stone-Zeng/fduthesis.git
+ git clone https://github.com/stone-zeng/fduthesis.git
\end{shellexample}
\item Extract files, and get into the \file{source} directory.
Run the following command to generate all the components:
@@ -323,10 +309,6 @@ or
latexmk -lualatex thesis
\end{shellexample}
-Note that you should not put the profile \file{latexmkrc} in
-your working directory. This file is meant to generate the
-user's guide.
-
\subsection{Options of the template}
You can specify some \emph{template options} when loading
@@ -370,8 +352,8 @@ At two-sided mode, left headers on the even pages (left hand)
in \emph{main body} will show the title of chapters, while the
right headers on the odd pages (right hand) will show the
title of sections. Headers in \emph{front matter} have the
-same style, but they will only show the title as
-``\textit{Contents}'', ``\textit{Abstract}'', etc.
+same style, but they will only show the title as ``Contents'',
+``Abstract'', etc.
At one-sided mode, both left and right headers on \emph{all}
pages in main body will be shown. The text is the title of
@@ -438,9 +420,8 @@ methods:
\fdusetup{
style = {cjk-font = adobe, font-size = -4},
info = {
- title = {关于光产生和转变的一个启发性观点},
- title* = {On a Heuristic Viewpoint Concerning the Production
- and Transformation of Light},
+ title = {论动体的电动力学},
+ title* = {On the Electrodynamics of Moving Bodies},
author = {阿尔伯特·爱因斯坦},
author* = {Albert Einstein},
department = {物理学系}
@@ -453,9 +434,8 @@ or
\fdusetup{
style/cjk-font = adobe,
style/font-size = -4,
- info/title = {关于光产生和转变的一个启发性观点},
- info/title* = {On a Heuristic Viewpoint Concerning the Production
- and Transformation of Light},
+ info/title = {论动体的电动力学},
+ info/title* = {On the Electrodynamics of Moving Bodies},
info/author = {阿尔伯特·爱因斯坦},
info/author* = {Albert Einstein},
info/department = {物理学系}
@@ -475,20 +455,65 @@ Note that you may \emph{not} put spaces around ``|/|''.
See the following details.
\end{function}
-\begin{function}[updated=2017-09-23]{style/font}
+\begin{function}[updated=2019-03-05]{style/font}
\begin{fdusyntax}[gobble=4,emph={[1]font}]
- font = (*<libertinus|lm|palatino|(times)|none>*)
+ font = (*<garamond|libertinus|lm|palatino|(times)|times*|none>*)
\end{fdusyntax}
- Set the western fonts (including math fonts).
+ Set fonts (including math fonts). The details can be found in table~\ref{tab:font}.
\end{function}
-\begin{function}[rEXP,updated=2017-09-23]{style/cjk-font}
+\begin{table}[ht]
+\begin{threeparttable}
+ \caption{Font configuration}
+ \label{tab:font}
+ \centering
+ \begin{tabular}{ccccc}
+ \toprule
+ & \strong{Roman} & \strong{Sans-serif} & \strong{Monospaced} & \strong{Math} \\
+ \midrule
+ |garamond| & EB Garamond & Libertinus Sans & LM Mono\tnote{a} & Garamond Math \\
+ |libertinus| & Libertinus Serif & Libertinus Sans & LM Mono & Libertinus Math \\
+ |lm| & LM Roman & LM Sans & LM Mono & LM Math \\
+ |palatino| & TG Pagella\tnote{b} & Libertinus Sans & LM Mono & TG Pagella Math \\
+ |times| & XITS & TG Heros & TG Cursor & XITS Math \\
+ |times*|\tnote{c} & Times New Roman & Arial & Courier New & XITS Math \\
+ \bottomrule
+ \end{tabular}
+ \begin{tablenotes}
+ \item[a] ``LM'' is the abbreviation of Latin Modern.
+ \item[b] ``TG'' is the abbreviation of TeX Gyre.
+ \item[c] Here, Times New Roman, Arial and Courier New are commercial fonts. They are
+ installed on Windows and macOS by default.
+ \end{tablenotes}
+\end{threeparttable}
+\end{table}
+\begin{function}[rEXP,updated=2019-03-05]{style/cjk-font}
\begin{fdusyntax}[gobble=4,emph={[1]cjk-font}]
- cjk-font = (*<adobe|(fandol)|founder|mac|windows|none>*)
+ cjk-font = (*<adobe|(fandol)|founder|mac|sinotype|sourcehan|windows|none>*)
\end{fdusyntax}
- Set CJK (Chinese, Japanese and Korean) fonts.
+ Set CJK (Chinese, Japanese and Korean) fonts. The details can be found in
+ table~\ref{tab:cjk-font}.
\end{function}
+\begin{table}[ht]
+ \caption{CJK font configuration}
+ \label{tab:cjk-font}
+ \centering
+ \begin{tabular}{cccc}
+ \toprule
+ & \strong{Roman (song)} & \strong{Sans-serif (hei)} & \strong{Monospaced (fang)} \\
+ \midrule
+ |adobe| & Adobe Song Std & Adobe Heiti Std & Adobe Fangsong Std \\
+ |fandol| & FandolSong & FandolHei & FandolFang \\
+ |founder| & FZShuSong-Z01 & FZHei-B01 & FZFangSong-Z02 \\
+ |mac| & Songti SC & Heiti SC & STFangsong \\
+ |sinotype| & STSong & STHeiti & STFangsong \\
+ |sourcehan| & Source Han Serif SC & Source Han Sans SC & --- \\
+ |windows| & SimSun & SimHei & FangSong \\
+ \bottomrule
+ \end{tabular}
+\end{table}
+
When you choose \kvopt{font}{none} or \kvopt{cjk-font}{none},
\cls{fduthesis} will disable the default western/CJK font
settings. You may use \cs{setmainfont}, \cs{setCJKmainfont}
@@ -657,7 +682,7 @@ will be helpful:
\begin{function}[added=2018-01-25]{style/bib-resource}
\begin{fdusyntax}[gobble=4,emph={[1]bib-resource}]
- bib-resource = (*\marg{bib file(s)}*)
+ bib-resource = (*\marg{bib file\symbol{"28}s\symbol{"29}}*)
\end{fdusyntax}
Specify the bibliography database (usually in \file{.bib}
format). If using more than one files, the file names should
@@ -713,7 +738,7 @@ will be helpful:
the corresponding English items.
\end{function}
-\begin{function}[added=2018-02-01]{info/degree}
+\begin{function}[added=2018-02-01,updated=2019-03-12]{info/degree}
\begin{fdusyntax}[gobble=4,emph={[1]degree}]
degree = (*<(academic)|professional>*)
\end{fdusyntax}
@@ -950,7 +975,7 @@ the position of QED symbol correct.
\end{function}
Actually, the pre-defined math environments are just defined
-with \cs{newtheorem} and \cs{newtheorem*}:
+with \cs{new\-the\-o\-rem} and \cs{new\-the\-o\-rem*}:
\begin{latexexample}[gobble=1,deletetexcs={\newtheorem},
morekeywords={\newtheorem,\newtheorem*}]
\newtheorem*{proof}{proof}
@@ -1071,7 +1096,6 @@ different packages dependency. Details are as follows:
\item \pkg{graphicx}
\item \pkg{longtable}
\item \pkg{caption}
- \item \pkg{natbib}
\item \pkg{xcolor}
\item \pkg{hyperref}
\end{itemize}
diff --git a/Master/texmf-dist/doc/latex/fduthesis/fduthesis-template.tex b/Master/texmf-dist/doc/latex/fduthesis/fduthesis-template.tex
index 810de971784..3db6babcc34 100644
--- a/Master/texmf-dist/doc/latex/fduthesis/fduthesis-template.tex
+++ b/Master/texmf-dist/doc/latex/fduthesis/fduthesis-template.tex
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2017, 2018 by Xiangdong Zeng <xdzeng96@gmail.com>
+% Copyright (C) 2017--2019 by Xiangdong Zeng <xdzeng96@gmail.com>
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -19,6 +19,9 @@
% \fi
%>********************************************************************
+%> fduthesis: 复旦大学论文模板
+%> 2019/03/17 v0.7c
+%>
%> 重要提示:
%> 1. 请确保使用 UTF-8 编码保存
%> 2. 请使用 XeLaTeX 或 LuaLaTeX 编译
@@ -35,7 +38,7 @@
%> 带选项的用法示例:
%> \documentclass[oneside]{fduthesis}
%> \documentclass[twoside, draft=true]{fduthesis}
-%> \documentclass[type=bavhelor, twoside, draft=true]{fduthesis}
+%> \documentclass[type=bachelor, twoside, draft=true]{fduthesis}
\fdusetup{
%> 参数设置
@@ -53,20 +56,20 @@
% font = times,
%> 西文字体(包括数学字体)
%> 允许选项:
- %> font = libertinus|lm|palatino|times|none
+ %> font = garamond|libertinus|lm|palatino|times|times*|none
%
% cjk-font = fandol,
%> 中文字体
%> 允许选项:
- %> cjk-font = adobe|fandol|founder|mac|windows|none
+ %> cjk-font = adobe|fandol|founder|mac|sinotype|sourcehan|windows|none
%
%> 注意:
%> 1. 中文字体设置高度依赖于系统。各系统建议方案:
%> windows:cjk-font = windows
%> mac: cjk-font = mac
%> linux: cjk-font = fandol(默认值)
- %> 2. 除 fandol 外,其余字体均为商用字体,请注意版权问题
- %> 3. 但 fandol 字体缺字比较严重
+ %> 2. 除 fandol 和 sourcehan 外,其余字体均为商用字体,请注意版权问题
+ %> 3. 但 fandol 字体缺字比较严重,而 sourcehan 没有配备楷体和仿宋体
%> 4. 这里中西文字体设置均注释掉了,即使用默认设置:
%> font = times
%> cjk-font = fandol
@@ -104,10 +107,9 @@
%> hyperlink-color = default|classic|elegant|fantasy|material|
%> business|science|summer|autumn|graylevel|prl
%
- logo = {../logo/pdf/fudan-name-black.pdf},
- % logo = {fudan-name.pdf}, %> 图片与本文件放在同一目录
- % logo = {figure/fudan-name.pdf}, %> 图片放在 figure/ 目录
+ % logo = {fudan-name.pdf},
%> 封面中的校名图片
+ %> 模版已自带,通常不需要额外配置
%
% logo-size = {0.5\textwidth}, %> 只设置宽度
% logo-size = {{}, 3cm}, %> 只设置高度
@@ -133,7 +135,7 @@
title* = {Thesis Title},
%> 英文标题
%
- author = {你的名字},
+ author = {王二},
%> 作者姓名
%
% author* = {Your name},
@@ -153,7 +155,7 @@
student-id = {12300000000},
%> 作者学号
%
- % date = {2018 年 1 月 1 日},
+ % date = {2019 年 1 月 1 日},
%> 日期
%> 注释掉表示使用编译日期
%
@@ -172,9 +174,9 @@
%> secret-level = none 时该选项无效
%
instructors = {
- {张\quad 三 \quad 工程师},
- {李\quad 四 \quad 工程师},
- {王五六 \quad 讲\quad 师}
+ {张\quad 三 \quad 教\quad 授},
+ {李\quad 四 \quad 教\quad 授},
+ {王五六 \quad 研究员}
},
%> 指导小组成员
%> 使用英文逗号 “,” 分隔
diff --git a/Master/texmf-dist/doc/latex/fduthesis/fduthesis.pdf b/Master/texmf-dist/doc/latex/fduthesis/fduthesis.pdf
index ee510b3d67d..4e774d0ccb2 100644
--- a/Master/texmf-dist/doc/latex/fduthesis/fduthesis.pdf
+++ b/Master/texmf-dist/doc/latex/fduthesis/fduthesis.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/fduthesis/latexmkrc b/Master/texmf-dist/doc/latex/fduthesis/latexmkrc
deleted file mode 100644
index bd20435ac52..00000000000
--- a/Master/texmf-dist/doc/latex/fduthesis/latexmkrc
+++ /dev/null
@@ -1,17 +0,0 @@
-# Latexmk configuration file.
-
-# Use XeLaTeX to compile.
-$pdf_mode = 5;
-
-# Process index.
-$makeindex = 'zhmakeindex -s gind.ist %O -o %D %S';
-
-# Show CPU time used.
-$show_time = 1;
-
-# Process glossary (change history).
-add_cus_dep('glo', 'gls', 0, 'makeglo2gls');
-sub makeglo2gls {
- system("zhmakeindex -s gglo.ist -o \"$_[0].gls\"
- -t \"$_[0].glg\" \"$_[0].glo\"");
-}
diff --git a/Master/texmf-dist/doc/latex/fduthesis/latexmkrc-en b/Master/texmf-dist/doc/latex/fduthesis/latexmkrc-en
deleted file mode 100644
index e9b1d150b8f..00000000000
--- a/Master/texmf-dist/doc/latex/fduthesis/latexmkrc-en
+++ /dev/null
@@ -1,10 +0,0 @@
-# Latexmk configuration file.
-
-# Use XeLaTeX to compile.
-$pdf_mode = 5;
-
-# Process index.
-$makeindex = 'zhmakeindex -s gind.ist %O -o %D %S';
-
-# Show CPU time used.
-$show_time = 1;