texlive[56216] Master/texmf-dist: fduthesis (30aug20)
commits+karl at tug.org
commits+karl at tug.org
Sun Aug 30 23:12:56 CEST 2020
Revision: 56216
http://tug.org/svn/texlive?view=revision&revision=56216
Author: karl
Date: 2020-08-30 23:12:56 +0200 (Sun, 30 Aug 2020)
Log Message:
-----------
fduthesis (30aug20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/fduthesis/README.md
trunk/Master/texmf-dist/doc/latex/fduthesis/fdulogo-example.tex
trunk/Master/texmf-dist/doc/latex/fduthesis/fduthesis-code.pdf
trunk/Master/texmf-dist/doc/latex/fduthesis/fduthesis-cover.tex
trunk/Master/texmf-dist/doc/latex/fduthesis/fduthesis-en.pdf
trunk/Master/texmf-dist/doc/latex/fduthesis/fduthesis-en.tex
trunk/Master/texmf-dist/doc/latex/fduthesis/fduthesis-template.tex
trunk/Master/texmf-dist/doc/latex/fduthesis/fduthesis.pdf
trunk/Master/texmf-dist/source/latex/fduthesis/fduthesis-doc.dtx
trunk/Master/texmf-dist/source/latex/fduthesis/fduthesis-logo.dtx
trunk/Master/texmf-dist/source/latex/fduthesis/fduthesis.dtx
trunk/Master/texmf-dist/source/latex/fduthesis/fduthesis.ins
trunk/Master/texmf-dist/tex/latex/fduthesis/fdudoc.cls
trunk/Master/texmf-dist/tex/latex/fduthesis/fdulogo.sty
trunk/Master/texmf-dist/tex/latex/fduthesis/fduthesis-en.cls
trunk/Master/texmf-dist/tex/latex/fduthesis/fduthesis.cls
trunk/Master/texmf-dist/tex/latex/fduthesis/fduthesis.def
Modified: trunk/Master/texmf-dist/doc/latex/fduthesis/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/fduthesis/README.md 2020-08-30 21:12:39 UTC (rev 56215)
+++ trunk/Master/texmf-dist/doc/latex/fduthesis/README.md 2020-08-30 21:12:56 UTC (rev 56216)
@@ -1,7 +1,7 @@
The `fduthesis` Class
=====================
-*LaTeX thesis template for Fudan University, v0.7d*
+*LaTeX thesis template for Fudan University, v0.7e*
Overview
--------
@@ -78,4 +78,4 @@
-----
-Copyright (C) 2017–2019 by Xiangdong Zeng <xdzeng96 at gmail.com>.
+Copyright (C) 2017–2020 by Xiangdong Zeng <xdzeng96 at gmail.com>.
Modified: trunk/Master/texmf-dist/doc/latex/fduthesis/fdulogo-example.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/fduthesis/fdulogo-example.tex 2020-08-30 21:12:39 UTC (rev 56215)
+++ trunk/Master/texmf-dist/doc/latex/fduthesis/fdulogo-example.tex 2020-08-30 21:12:56 UTC (rev 56216)
@@ -7,7 +7,7 @@
%% fduthesis.dtx (with options: `ex-logo')
%% fduthesis-logo.dtx (with options: `ex-logo')
%%
-%% Copyright (C) 2017--2019 by Xiangdong Zeng <xdzeng96 at gmail.com>
+%% Copyright (C) 2017--2020 by Xiangdong Zeng <xdzeng96 at gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
Modified: trunk/Master/texmf-dist/doc/latex/fduthesis/fduthesis-code.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/fduthesis/fduthesis-cover.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/fduthesis/fduthesis-cover.tex 2020-08-30 21:12:39 UTC (rev 56215)
+++ trunk/Master/texmf-dist/doc/latex/fduthesis/fduthesis-cover.tex 2020-08-30 21:12:56 UTC (rev 56216)
@@ -7,7 +7,7 @@
%% fduthesis.dtx (with options: `cover')
%% fduthesis-logo.dtx (with options: `cover')
%%
-%% Copyright (C) 2017--2019 by Xiangdong Zeng <xdzeng96 at gmail.com>
+%% Copyright (C) 2017--2020 by Xiangdong Zeng <xdzeng96 at gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
Modified: trunk/Master/texmf-dist/doc/latex/fduthesis/fduthesis-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/fduthesis/fduthesis-en.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/fduthesis/fduthesis-en.tex 2020-08-30 21:12:39 UTC (rev 56215)
+++ trunk/Master/texmf-dist/doc/latex/fduthesis/fduthesis-en.tex 2020-08-30 21:12:56 UTC (rev 56216)
@@ -6,7 +6,7 @@
%%
%% fduthesis.dtx
%%
-%% Copyright (C) 2017--2019 by Xiangdong Zeng <xdzeng96 at gmail.com>
+%% Copyright (C) 2017--2020 by Xiangdong Zeng <xdzeng96 at gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -54,13 +54,12 @@
\pagestyle{headings}
\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{2019/04/03\quad v0.7d%
+\date{2020/08/30\quad v0.7e%
\thanks{\url{https://github.com/stone-zeng/fduthesis}.}}
\begin{document}
@@ -874,6 +873,9 @@
\begin{function}{\tableofcontents}
Generate the table of contents (TOC). You need to compile
the source file at least \emph{twice} to get the correct TOC.
+ If your thesis contains many figures or tables, you may also
+ use \cs{listoffigures} or \cs{listoftables} to generate a list
+ of them.
\end{function}
\begin{function}{abstract}
Modified: trunk/Master/texmf-dist/doc/latex/fduthesis/fduthesis-template.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/fduthesis/fduthesis-template.tex 2020-08-30 21:12:39 UTC (rev 56215)
+++ trunk/Master/texmf-dist/doc/latex/fduthesis/fduthesis-template.tex 2020-08-30 21:12:56 UTC (rev 56216)
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2017--2019 by Xiangdong Zeng <xdzeng96 at gmail.com>
+% Copyright (C) 2017--2020 by Xiangdong Zeng <xdzeng96 at gmail.com>
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -18,160 +18,193 @@
%
% \fi
-%>********************************************************************
-%> fduthesis: 复旦大学论文模板
-%> 2019/04/03 v0.7d
-%>
-%> 重要提示：
-%> 1. 请确保使用 UTF-8 编码保存
-%> 2. 请使用 XeLaTeX 或 LuaLaTeX 编译
-%> 3. 请仔细阅读用户文档
-%> 4. 修改、使用、发布本文档请务必遵循 LaTeX Project Public License
-%> 5. 不需要的注释可以尽情删除
-%>********************************************************************
+%*********************************************************************
+% fduthesis: 复旦大学论文模板
+% 2020/08/30 v0.7e
+%
+% 重要提示：
+% 1. 请确保使用 UTF-8 编码保存
+% 2. 请使用 XeLaTeX 或 LuaLaTeX 编译
+% 3. 请仔细阅读用户文档
+% 4. 修改、使用、发布本文档请务必遵循 LaTeX Project Public License
+% 5. 不需要的注释可以尽情删除
+%*********************************************************************
\documentclass{fduthesis}
-%> 模板选项：
-%> type = doctor|master|bachelor 论文类型，默认为本科论文
-%> oneside|twoside 论文的单双面模式，默认为 twoside
-%> draft = true|false 是否开启草稿模式，默认关闭
-%> 带选项的用法示例：
-%> \documentclass[oneside]{fduthesis}
-%> \documentclass[twoside, draft=true]{fduthesis}
-%> \documentclass[type=bachelor, twoside, draft=true]{fduthesis}
+% 模板选项：
+% type = doctor|master|bachelor 论文类型，默认为本科论文
+% oneside|twoside 论文的单双面模式，默认为 twoside
+% draft = true|false 是否开启草稿模式，默认关闭
+% 带选项的用法示例：
+% \documentclass[oneside]{fduthesis}
+% \documentclass[twoside, draft=true]{fduthesis}
+% \documentclass[type=bachelor, twoside, draft=true]{fduthesis}
\fdusetup{
- %> 参数设置
- %> 允许采用两种方式设置选项：
- %> 1. style/... = ...
- %> 2. style = { ... = ... }
- %> 注意事项：
- %> 1. 不要出现空行
- %> 2. “=” 两侧的空格【会】被忽略
- %> 3. “/” 两侧的空格【不会】被忽略
- %> 4. 请使用英文逗号 “,” 分隔选项
+ % 参数设置
+ % 允许采用两种方式设置选项：
+ % 1. style/... = ...
+ % 2. style = { ... = ... }
+ % 注意事项：
+ % 1. 不要出现空行
+ % 2. “=” 两侧的空格会被忽略
+ % 3. “/” 两侧的空格不会被忽略
+ % 4. 请使用英文逗号 “,” 分隔选项
%
- %> style 类用于设置论文格式
+ % style 类用于设置论文格式
style = {
% font = times,
- %> 西文字体（包括数学字体）
- %> 允许选项：
- %> font = garamond|libertinus|lm|palatino|times|times*|none
+ % 西文字体（包括数学字体）
+ % 允许选项：
+ % font = garamond|libertinus|lm|palatino|times|times*|none
%
% cjk-font = fandol,
- %> 中文字体
- %> 允许选项：
- %> cjk-font = adobe|fandol|founder|mac|sinotype|sourcehan|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 和 sourcehan 外，其余字体均为商用字体，请注意版权问题
- %> 3. 但 fandol 字体缺字比较严重，而 sourcehan 没有配备楷体和仿宋体
- %> 4. 这里中西文字体设置均注释掉了，即使用默认设置：
- %> font = times
- %> cjk-font = fandol
- %> 5. 使用 font = none / cjk-font = none 关闭默认字体设置，需手动进行配置
+ % 注意：
+ % 1. 中文字体设置高度依赖于系统。各系统建议方案：
+ % windows：cjk-font = windows
+ % mac： cjk-font = mac
+ % linux： cjk-font = fandol（默认值）
+ % 2. 除 fandol 和 sourcehan 外，其余字体均为商用字体，请注意版权问题
+ % 3. 但 fandol 字体缺字比较严重，而 sourcehan 没有配备楷体和仿宋体
+ % 4. 这里中西文字体设置均注释掉了，即使用默认设置：
+ % font = times
+ % cjk-font = fandol
+ % 5. 使用 font = none / cjk-font = none 关闭默认字体设置，需手动进行配置
%
font-size = 5,
- %> 字号
- %> 允许选项：
- %> font-size = -4|5
+ % 字号
+ % 允许选项：
+ % font-size = -4|5
%
- fullwidth-stop = catcode,
- %> 是否把全角实心句点 “．” 作为默认的句号形状
- %> 允许选项：
- %> fullwidth-stop = catcode|mapping|false
- %> 解释：
- %> catcode 【显式】的 “。” 会被替换为 “．”（e.g. 不包括用宏定义保存的 “。”）
- %> mapping 【所有】的 “。” 会被替换为 “．”（使用 LuaLaTeX 编译则无效）
- %> false 不进行替换
+ % fullwidth-stop = catcode,
+ % 是否把全角实心句点 “．” 作为默认的句号形状
+ % 允许选项：
+ % fullwidth-stop = catcode|mapping|false
+ % 说明：
+ % catcode 显式的 “。” 会被替换为 “．”（e.g. 不包括用宏定义保存的 “。”）
+ % mapping 所有的 “。” 会被替换为 “．”（使用 LuaLaTeX 编译则无效）
+ % false 不进行替换
%
- % footnote-style = pifont,
- %> 脚注编号样式
- %> 允许选项：
- %> footnote-style = plain|libertinus|libertinus*|libertinus-sans|
- %> pifont|pifont*|pifont-sans|pifont-sans*|
- %> xits|xits-sans|xits-sans*
+ footnote-style = xits,
+ % 脚注编号样式
+ % 允许选项：
+ % footnote-style = plain|libertinus|libertinus*|libertinus-sans|
+ % pifont|pifont*|pifont-sans|pifont-sans*|
+ % xits|xits-sans|xits-sans*
%
% hyperlink = color,
- %> 超链接样式
- %> 允许选项：
- %> hyperlink = border|color|none
+ % 超链接样式
+ % 允许选项：
+ % hyperlink = border|color|none
%
% hyperlink-color = default,
- %> 超链接颜色
- %> 允许选项：
- %> hyperlink-color = default|classic|elegant|fantasy|material|
- %> business|science|summer|autumn|graylevel|prl
+ % 超链接颜色
+ % 允许选项：
+ % hyperlink-color = default|classic|elegant|fantasy|material|
+ % business|science|summer|autumn|graylevel|prl
+ % 默认与西文字体保持一致
%
+ bib-backend = bibtex,
+ % 参考文献支持方式
+ % 允许选项：
+ % bib-backend = bibtex|biblatex
+ %
+ % bib-style = numerical,
+ % 参考文献样式
+ % 允许选项：
+ % bib-style = author-year|numerical|<其他样式>
+ % 说明：
+ % author-year 著者—出版年制
+ % numerical 顺序编码制
+ % <其他样式> 使用其他 .bst（bibtex）或 .bbx（biblatex）格式文件
+ %
+ % cite-style = {},
+ % 引用样式
+ % 默认为空，即与参考文献样式保持一致
+ % 仅适用于 biblatex；如要填写，需保证相应的 .cbx 格式文件能被调用
+ %
+ bib-resource = {fduthesis-template.bib},
+ % 参考文献数据源
+ % 可以是单个文件，也可以是用英文逗号 “,” 隔开的一组文件
+ % 如果使用 biblatex，则必须明确给出 .bib 后缀名
+ %
% logo = {fudan-name.pdf},
- %> 封面中的校名图片
- %> 模版已自带，通常不需要额外配置
+ % 封面中的校名图片
+ % 模版已自带，通常不需要额外配置
%
- % logo-size = {0.5\textwidth}, %> 只设置宽度
- % logo-size = {{}, 3cm}, %> 只设置高度
- % logo-size = {8cm, 3cm}, %> 设置宽度和高度
- %> 设置校名图片的大小
- %> 通常不需要调整
+ % logo-size = {0.5\textwidth}, % 只设置宽度
+ % logo-size = {{}, 3cm}, % 只设置高度
+ % logo-size = {8cm, 3cm}, % 设置宽度和高度
+ % 设置校名图片的大小
+ % 通常不需要调整
%
% auto-make-cover = true
- %> 是否自动生成论文封面（封一）、指导小组成员名单（封二）和声明页（封三）
- %> 除非特殊需要（e.g. 不要封面），否则不建议设为 false
+ % 是否自动生成论文封面（封一）、指导小组成员名单（封二）和声明页（封三）
+ % 除非特殊需要（e.g. 不要封面），否则不建议设为 false
},
%
- %> info 类用于录入论文信息
+ % info 类用于录入论文信息
info = {
title = {论文标题},
- %> 中文标题
- %> 长标题建议使用 “\\” 命令手动换行（不是指在源文件里输入回车符，当然
- %> 源文件里适当的换行可以有助于代码清晰）：
- %> title = {最高人民法院、最高人民检察院关于适用\\
- %> 犯罪嫌疑人、被告人逃匿、死亡案件违法所得\\
- %> 没收程序若干问题的规定},
+ % 中文标题
+ % 长标题建议使用 “\\” 命令手动换行（不是指在源文件里输入回车符，当然
+ % 源文件里适当的换行可以有助于代码清晰）：
+ % title = {最高人民法院、最高人民检察院关于适用\\
+ % 犯罪嫌疑人、被告人逃匿、死亡案件违法所得\\
+ % 没收程序若干问题的规定},
%
title* = {Thesis Title},
- %> 英文标题
+ % 英文标题
%
author = {王二},
- %> 作者姓名
+ % 作者姓名
%
% author* = {Your name},
- %> 作者姓名（英文 / 拼音）
- %> 目前不需要填写
+ % 作者姓名（英文 / 拼音）
+ % 目前不需要填写
%
supervisor = {某某某\quad 教授},
- %> 导师
- %> 姓名与职称之间可以用 \quad 打印一个空格
+ % 导师
+ % 姓名与职称之间可以用 \quad 打印一个空格
%
major = {物理学},
- %> 专业
+ % 专业
%
+ degree = academic,
+ % 学位类型
+ % 允许选项：
+ % degree = academic|professional
+ % 说明：
+ % academic 学术学位
+ % professional 专业学位
+ %
department = {物理系},
- %> 院系
+ % 院系
%
student-id = {12300000000},
- %> 作者学号
+ % 作者学号
%
- % date = {2019 年 1 月 1 日},
- %> 日期
- %> 注释掉表示使用编译日期
+ % date = {2020 年 1 月 1 日},
+ % 日期
+ % 注释掉表示使用编译日期
%
% secret-level = ii,
- %> 密级
- %> 允许选项：
- %> secret-level = none|i|ii|iii
- %> 解释：
- %> none 不显示密级与保密年限
- %> i 秘密
- %> ii 机密
- %> iii 绝密
+ % 密级
+ % 允许选项：
+ % secret-level = none|i|ii|iii
+ % 说明：
+ % none 不显示密级与保密年限
+ % i 秘密
+ % ii 机密
+ % iii 绝密
%
% secret-year = {五年},
- %> 保密年限
- %> secret-level = none 时该选项无效
+ % 保密年限
+ % secret-level = none 时该选项无效
%
instructors = {
{张\quad 三 \quad 教\quad 授},
@@ -178,33 +211,45 @@
{李\quad 四 \quad 教\quad 授},
{王五六 \quad 研究员}
},
- %> 指导小组成员
- %> 使用英文逗号 “,” 分隔
- %> 如有需要，可以用 \quad 手工对齐
+ % 指导小组成员
+ % 使用英文逗号 “,” 分隔
+ % 如有需要，可以用 \quad 手工对齐
%
keywords = {不确定关系, 量子力学, 理论物理},
- %> 中文关键字
- %> 使用英文逗号 “,” 分隔
+ % 中文关键字
+ % 使用英文逗号 “,” 分隔
%
keywords* = {Uncertainty principle, quantum mechanics, theoretical physics},
- %> 英文关键字
- %> 使用英文逗号 “,” 分隔
+ % 英文关键字
+ % 使用英文逗号 “,” 分隔
%
clc = {O413.1}
- %> 中图分类号
+ % 中图分类号
}
}
+% 需要的宏包可以自行调用
+\usepackage{physics}
+
+% 需要的命令可以自行定义
+\newcommand{\hilbertH}{\symcal{H}}
+\newcommand{\ee}{\symrm{e}}
+\newcommand{\ii}{\symrm{i}}
+
\begin{document}
+% 这个命令用来关闭版心底部强制对齐，可以减少不必要的 underfull \vbox 提示，但会影响排版效果
% \raggedbottom
-%> 这个命令用来关闭版心底部强制对齐，可以减少不必要的 underfull \vbox 提示，但会影响排版效果
+% 前置部分包含目录、中英文摘要以及符号表等
\frontmatter
-%> 前置部分包含目录、中英文摘要以及符号表等
+% 目录
\tableofcontents
-%> 目录
+% 插图目录
+\listoffigures
+% 表格目录
+% \listoftables
\begin{abstract}
中文摘要
@@ -214,34 +259,39 @@
English abstract
\end{abstract*}
-\begin{notation}
- $x$ & 坐标 \\
- $p$ & 动量 \\
- $\psi(x)$ & 波函数 \\
- $\langle x |$ & 左矢（bra） \\
- $| x \rangle$ & 右矢（ket） \\
- $\langle\alpha|\beta\rangle$ & 内积 \\
+% 符号表
+% 语法与 LaTeX 表格一致：列用 & 区分，行用 \\ 区分
+% 如需修改格式，可以使用可选参数：
+% \begin{notation}[ll]
+% $x$ & 坐标 \\
+% $p$ & 动量
+% \end{notation}
+% 可选参数与 LaTeX 标准表格的列格式说明语法一致
+% 这里的 “ll” 表示两列均为自动宽度，并且左对齐
+\begin{notation}[ll]
+ $x$ & 坐标 \\
+ $p$ & 动量 \\
+ $\psi(x)$ & 波函数 \\
+ $\bra{x}$ & 左矢（bra） \\
+ $\ket{x}$ & 右矢（ket） \\
+ $\ip{\alpha}{\beta}$ & 内积 \\
\end{notation}
-%> 符号表
-%> 语法与 LaTeX 表格一致：列用 & 区分，行用 \\ 区分
-%> 如需修改格式，可以使用可选参数：
-%> \begin{notation}[ll]
-%> $x$ & 坐标 \\
-%> $p$ & 动量
-%> \end{notation}
-%> 可选参数与 LaTeX 标准表格的列格式说明语法一致
-%> 这里的 “ll” 表示两列均为自动宽度，并且左对齐
+% 主体部分是论文的核心
\mainmatter
-%> 主体部分是论文的核心
-%> 建议采用多文件编译的方式
-%> 比较好的做法是把每一章放进一个单独的 tex 文件里，并在这里用 \include 导入，例如
-%> \include{chapter1}
-%> \include{chapter2}
-%> \include{chapter3}
+% 建议采用多文件编译的方式
+% 比较好的做法是把每一章放进一个单独的 tex 文件里，并在这里用 \include 导入，例如
+% \include{chapter1}
+% \include{chapter2}
+% \include{chapter3}
+
\chapter{介绍}
+\strong{量子力学}是物理学的分支学科。它主要描写微观的事物，与相对论一起被认为是现代物理学的两大
+基本支柱，许多物理学理论和科学，如原子物理学、固体物理学、核物理学和粒子物理学以及其它相关的学科，
+都是以其为基础\cite{曾谨言2013量子力学,feynman2011feynman}。
+
\section{量子力学历史概要}
\section{研究对象}
@@ -248,14 +298,85 @@
\section{研究方法}
-\chapter{核心定理证明}
+\chapter{数学基础}
+\section{基础公设}
+
+整个量子力学的数学理论可以建立于五个基础公设。这些公设不能被严格推导出来的，而是从实验结果仔细分析
+归纳总结而得到的。从这五个公设，可以推导出整个量子力学。假若量子力学的理论结果不符合实验结果，
+则必须将这些基础公设加以修改，直到没有任何不符合之处。至今为止，量子力学已被实验核对至极高准确度，
+还没有找到任何与理论不符合的实验结果，虽然有些理论很难直觉地用经典物理的概念来理解，例如，波粒
+二象性、量子纠缠等等\cite{zurek2014quantum,cohen2013claude,zettili2003quantum}。
+
+\begin{enumerate}
+ \item 量子态公设：量子系统在任意时刻的状态（量子态）可以由希尔伯特空间 $\hilbertH$ 中的态矢量
+ $\ket{\psi}$ 来设定，这态矢量完备地给出了这量子系统的所有信息。这公设意味着量子系统遵守%
+ \emph{态叠加原理}，假若 $\ket*{\psi_1}$、$\ket*{\psi_2}$ 属于希尔伯特空间 $\hilbertH$，则
+ $c_1\ket*{\psi_1} + c_2\ket*{\psi_2}$ 也属于希尔伯特空间 $\hilbertH$。
+ \item 时间演化公设： 态矢量为 $\ket{\psi(t)}$ 的量子系统，其动力学演化可以用薛定谔方程表示：
+ \begin{equation}
+ \ii\hbar \pdv{t} \ket{\psi(t)} = \hat{H} \ket{\psi(t)}.
+ \end{equation}
+ 其中，哈密顿算符 $\hat{H}$ 对应于量子系统的总能量，$\hbar$ 是约化普朗克常数。根据薛定谔方程，
+ 假设时间从 $t_0$ 变化到 $t$，则态矢量从 $\ket*{\psi(t_0)}$ 演化到 $\ket{\psi(t)}$，该过程以
+ 方程表示为
+ \begin{equation}
+ \ket{\psi(t)} = \hat{U}(t,\,t_0) \ket*{\psi(t_0)}.
+ \end{equation}
+ 其中 $\hat{U}(t,\,t_0) = \ee^{-\ii\hat{H}(t-t_0) / \hbar}$ 是时间演化算符。
+ \item 可观察量公设：每个可观察量 $A$ 都有其对应的厄米算符 $\hat{A}$，而算符 $\hat{A}$ 的所有
+ 本征矢量共同组成一个完备基底。
+ \item 坍缩公设：对于量子系统测量某个可观察量 $A$ 的过程，可以数学表示为将对应的厄米算符
+ $\hat{A}$ 作用于量子系统的态矢量 $\ket{\psi}$，测量值只能为厄米算符 $\hat{A}$ 的本征值。
+ 在测量后，假设测量值为 $a_i$，则量子系统的量子态立刻会坍缩为对应于本征值 $a_i$ 的本征态
+ $\ket*{e_i}$。
+ \item 波恩公设：对于这测量，获得本征值 $a_i$ 的概率为量子态 $\ket{\psi}$ 处于本征态 $\ket*{e_i}$
+ 的概率幅的绝对值平方。\footnote{%
+ 使用可观察量 $A$ 的基底 $\qty{e_1,\,e_2,\,\ldots,\,e_n}$，量子态 $\ket{\psi}$ 可以表示为
+ $\ket{\psi} = \sum_j c_j \ket*{e_j}$，其中 $c_j$ 是量子态 $\ket{\psi}$ 处于本征态
+ $\ket*{e_j}$ 的概率幅。根据波恩定则，对于此次测量，获得本征值 $a_i$ 的概率为
+ $\abs*{\ip*{e_i}{\psi}}^2 = \abs*{c_i}^2$。}
+\end{enumerate}
+
+\section{量子态与量子算符}
+
+量子态指的是量子系统的状态，态矢量可以用来抽象地表现量子态。采用狄拉克标记，态矢量表示为右矢
+$\ket{\psi}$；其中，在符号内部的希腊字母 $\psi$ 可以是任何符号、字母、数字，或单字。例如，
+沿着磁场方向测量电子的自旋，得到的结果可以是上旋或是下旋，分别标记为 $\ket{\uparrow}$ 和
+$\ket{\downarrow}$。
+
+\begin{figure}[htb]
+ \centering
+ \includegraphics[width=0.5\textwidth]{fduthesis-template-image.png}
+ \caption[施特恩—格拉赫实验]{%
+ 设定施特恩—格拉赫实验仪器的磁场方向为 $z$-轴，入射的银原子束可以被分裂成两道银原子束，每一道
+ 银原子束代表一种量子态，上旋 $\ket{\uparrow}$ 或下旋 $\ket{\downarrow}$%
+ \cite{wikimedia:stern-gerlach-experiment}。}
+ \label{fig:stern-gerlach-experiment}
+\end{figure}
+
+对量子态做操作定义，量子态可以从一系列制备程序来辨认，即这程序所制成的量子系统拥有这量子态。例如，
+使用施特恩—格拉赫实验仪器，设定磁场朝着 $z$-轴方向，如图~\ref{fig:stern-gerlach-experiment} 所示，
+可以将入射的银原子束，依照自旋的 $z$-分量分裂成两道，一道为上旋，量子态为 $\ket{\uparrow}$；另一道
+为下旋，量子态为 $\ket{\downarrow}$，这样，可以制备成量子态为 $\ket{\uparrow}$ 的银原子束，或量子态
+为 $\ket{\downarrow}$ 的银原子束。原本银原子束的态矢量可以按照态叠加原理表示为
+\begin{equation}
+ \ket{\psi} = \alpha \ket{\uparrow} + \beta \ket{\downarrow}.
+\end{equation}
+其中，$\alpha$、$\beta$ 是复值系数，$\abs{\alpha}^2$、$\abs{\beta}^2$ 分别为入射银原子束处于上旋、
+下旋的概率，且有
+\begin{equation}
+ \abs{\alpha}^2 + \abs{\beta}^2 = 1.
+\end{equation}
+
+\section{动力学演化}
+
\chapter{总结与展望}
+% 后置部分包含参考文献、声明页（自动生成）等
\backmatter
-%> 后置部分包含参考文献、声明页（自动生成）等
-% \printbibliography
-%> 打印参考文献列表
+% 打印参考文献列表
+\printbibliography
\end{document}
Modified: trunk/Master/texmf-dist/doc/latex/fduthesis/fduthesis.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/fduthesis/fduthesis-doc.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/fduthesis/fduthesis-doc.dtx 2020-08-30 21:12:39 UTC (rev 56215)
+++ trunk/Master/texmf-dist/source/latex/fduthesis/fduthesis-doc.dtx 2020-08-30 21:12:56 UTC (rev 56216)
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2017--2019 by Xiangdong Zeng <xdzeng96 at gmail.com>
+% Copyright (C) 2017--2020 by Xiangdong Zeng <xdzeng96 at gmail.com>
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -350,7 +350,7 @@
%
% \changes{v0.4}{2017/08/09}{[\pkg{fdudoc}] 修复 \cls{ctxdoc}
% 文档类 v2.4.10 之前版本中行距偏小的问题，见 ctex-kit
-% \href{https://github.com/CTeX-org/ctex-kit/issues/303}{\#~303}。}
+% \href{https://github.com/CTeX-org/ctex-kit/issues/303}{\#303}。}
%
% \begin{macro}{\@@_swap_cr:,\@@_swap_cr_aux:w}
% 把 \cs{l_@@_macro_code_line_tl} 中的回车符 |^^M| 挪到外面。
@@ -1722,12 +1722,12 @@
% 西文字体。为兼容 macOS，系统字体需使用字体名，而 \TeXLive{}
% 中的字体需使用文件名。
% \begin{macrocode}
-\setmainfont{libertinusserif}[%
+\setmainfont{LibertinusSerif}[%
Extension = .otf,
- UprightFont = *-regular,
- BoldFont = *-bold,
- ItalicFont = *-italic,
- BoldItalicFont = *-bolditalic,
+ UprightFont = *-Regular,
+ BoldFont = *-Bold,
+ ItalicFont = *-Italic,
+ BoldItalicFont = *-BoldItalic,
Scale = 1.1]
\setsansfont{IBMPlexSansCondensed}[%
Extension = .otf,
@@ -1739,7 +1739,7 @@
UprightFont = * Light,
BoldFont = * Semibold,
Scale = MatchLowercase]
-\setmathfont{libertinusmath-regular.otf}
+\setmathfont{LibertinusMath-Regular.otf}
% \end{macrocode}
%
% 中文字体。
Modified: trunk/Master/texmf-dist/source/latex/fduthesis/fduthesis-logo.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/fduthesis/fduthesis-logo.dtx 2020-08-30 21:12:39 UTC (rev 56215)
+++ trunk/Master/texmf-dist/source/latex/fduthesis/fduthesis-logo.dtx 2020-08-30 21:12:56 UTC (rev 56216)
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2017--2019 by Xiangdong Zeng <xdzeng96 at gmail.com>
+% Copyright (C) 2017--2020 by Xiangdong Zeng <xdzeng96 at gmail.com>
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
Modified: trunk/Master/texmf-dist/source/latex/fduthesis/fduthesis.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/fduthesis/fduthesis.dtx 2020-08-30 21:12:39 UTC (rev 56215)
+++ trunk/Master/texmf-dist/source/latex/fduthesis/fduthesis.dtx 2020-08-30 21:12:56 UTC (rev 56216)
@@ -2,7 +2,7 @@
% !TeX program = XeLaTeX
% !TeX encoding = UTF-8
%
-% Copyright (C) 2017--2019 by Xiangdong Zeng <xdzeng96 at gmail.com>
+% Copyright (C) 2017--2020 by Xiangdong Zeng <xdzeng96 at gmail.com>
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -47,7 +47,7 @@
The `fduthesis` Class
=====================
-*LaTeX thesis template for Fudan University, v0.7d*
+*LaTeX thesis template for Fudan University, v0.7e*
Overview
--------
@@ -124,7 +124,7 @@
-----
-Copyright (C) 2017–2019 by Xiangdong Zeng <xdzeng96 at gmail.com>.
+Copyright (C) 2017–2020 by Xiangdong Zeng <xdzeng96 at gmail.com>.
%</readme>
%
%<*internal>
@@ -142,7 +142,7 @@
\preamble
- Copyright (C) 2017--2019 by Xiangdong Zeng <xdzeng96 at gmail.com>
+ Copyright (C) 2017--2020 by Xiangdong Zeng <xdzeng96 at gmail.com>
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
@@ -236,7 +236,7 @@
%<class|class-en|doc|logo>\NeedsTeXFormat{LaTeX2e}
%<class|class-en|doc|logo>\RequirePackage{expl3}
%<*!(driver|install|ex-logo|cover)>
-%<!readme>\GetIdInfo $Id: fduthesis.dtx 0.7d 2019-04-03 12:00:00Z Xiangdong Zeng <xdzeng96 at gmail.com> $
+%<!readme>\GetIdInfo $Id: fduthesis.dtx 0.7e 2020-08-30 12:00:00Z Xiangdong Zeng <xdzeng96 at gmail.com> $
%<class> {Thesis template for Fudan University}
%<class>\ProvidesExplClass{\ExplFileName}
%<class-en> {Thesis template for Fudan University (English version)}
@@ -252,7 +252,7 @@
%<*driver>
% \PassOptionsToPackage{showframe}{geometry}
\documentclass{fdudoc}
-\usepackage{multirow,xpinyin}
+\usepackage{multirow,xeCJKfntef,xpinyin}
\hypersetup{
pdftitle = {fduthesis: 复旦大学论文模板},
pdfauthor = {曾祥东}}
@@ -261,8 +261,6 @@
\def\FSFW{“{\xeCJKsetup{PunctStyle=banjiao}．}”} % U+FF0E
\def\COFW{“{\xeCJKsetup{PunctStyle=banjiao}：}”} % U+FF1A
\def\SCFW{“{\xeCJKsetup{PunctStyle=banjiao}；}”} % U+FF1B
-% Libertinus Math 字体不包含 `\QED`，暂时使用 `\blacksquare` 代替
-\AtBeginDocument{\def\QED{\blacksquare}}
%^^A! \PassOptionsToPackage{scheme=plain, linespread=1.1}{ctex}
%^^A! \documentclass{fdudoc}
%^^A! \hypersetup{
@@ -274,19 +272,18 @@
%^^A! \pagestyle{headings}
%^^A! \def\FSID{{\xeCJKsetup{PunctStyle=banjiao}。}}
%^^A! \def\FSFW{{\xeCJKsetup{PunctStyle=banjiao}．}}
-%^^A! \AtBeginDocument{\def\QED{\blacksquare}}
%^^A!
\title{\textcolor{MaterialIndigo800}{%
- \textbf{fduthesis: 复旦大学论文\xpinyin[font=\sffamily]{模}{mu2}板}}}
+ \textbf{fduthesis: 复旦大学论文\xpinyin[font=\sffamily,format=\color{MaterialIndigo800}]{模}{mu2}板}}}
\author{曾祥东}
-\date{2019/04/03\quad v0.7d%
+\date{2020/08/30\quad v0.7e%
\thanks{\url{https://github.com/stone-zeng/fduthesis}.}}
%^^A! \title{\textcolor{MaterialIndigo800}{%
%^^A! \textbf{The \textsf{fduthesis} Class \\
%^^A! \LaTeX{} Thesis Template for Fudan University}}}
%^^A! \author{Xiangdong Zeng}
-%^^A! \date{2019/04/03\quad v0.7d%
+%^^A! \date{2020/08/30\quad v0.7e%
%^^A! \thanks{\url{https://github.com/stone-zeng/fduthesis}.}}
%^^A!
@@ -1844,12 +1841,17 @@
%^^A! main matter.
%^^A!
%
-% \begin{function}{\tableofcontents}
-% 生成目录。为了生成完整、正确的目录，您至少需要编译\emph{两次}。
+% \begin{function}{\tableofcontents,\listoffigures,\listoftables}
+% 生成目录。为了生成完整、正确的目录，您至少需要编译\emph{两次}。对于图表
+% 较多的论文，也可以使用 \cs{listoffigures} 和 \cs{listoftables} 生成单独的
+% 插图、表格目录。
% \end{function}
%^^A! \begin{function}{\tableofcontents}
%^^A! Generate the table of contents (TOC). You need to compile
%^^A! the source file at least \emph{twice} to get the correct TOC.
+%^^A! If your thesis contains many figures or tables, you may also
+%^^A! use \cs{listoffigures} or \cs{listoftables} to generate a list
+%^^A! of them.
%^^A! \end{function}
%^^A!
%
@@ -2384,7 +2386,7 @@
% \bibitem{clreq}
% W3C.
% \newblock \textit{中文排版需求（Requirements for Chinese Text Layout）} [EB/OL].
-% \newblock (2019-03-13)
+% \newblock (2020-08-17)
% \urlprefix\url{https://w3c.github.io/clreq/}
%
% \bibitem{复旦大学论文规范}
@@ -2391,7 +2393,7 @@
% 复旦大学图书馆, 复旦大学研究生院.
% \newblock \textit{复旦大学博士、硕士学位论文规范} [EB/OL].
% \newblock 2017 年 3 月修订版.
-% \newblock (2017-03-27)
+% \newblock (2017-03-27)
% \urlprefix\url{http://www.gs.fudan.edu.cn/_upload/article/4c/a8/a82545ef443b9c057c14ba13782c/c883c6f3-6d7f-410c-8f30-d8bde6fcb990.doc}
%
% \subsection{宏包、模版}
@@ -2399,7 +2401,7 @@
% \bibitem{source2e}
% \textsc{Braams J}, \textsc{Carlisle D}, \textsc{Jeffrey A}, et al.
% \newblock \textit{The \LaTeXe{} Sources} [CP/OL].
-% \newblock (2018-12-01)
+% \newblock (2020-02-02)
% \urlprefix\url{https://ctan.org/pkg/latex}
% \urlprefix\CTANurl[源代码：]{macros/latex/base/source2e.pdf}
%
@@ -2406,8 +2408,8 @@
% \bibitem{CTeX}
% \textsc{CTEX.ORG}.
% \newblock \textit{\CTeX{} 宏集手册} [EB/OL].
-% \newblock version 2.4.14,
-% \newblock (2018-05-02)
+% \newblock version 2.5.4,
+% \newblock (2020-08-23)
% \urlprefix\url{https://ctan.org/pkg/ctex}
% \urlprefix\CTANurl[文档及源代码：]{language/chinese/ctex/ctex.pdf}
%
@@ -2414,8 +2416,8 @@
% \bibitem{xeCJK}
% \textsc{CTEX.ORG}.
% \newblock \textit{\pkg{xeCJK} 宏包} [EB/OL].
-% \newblock version 3.7.1,
-% \newblock (2018-04-30)
+% \newblock version 3.8.5,
+% \newblock (2020-08-23)
% \urlprefix\url{https://ctan.org/pkg/xecjk}
% \urlprefix\CTANurl[文档及源代码：]{macros/xetex/latex/xecjk/xeCJK.pdf}
%
@@ -2423,7 +2425,7 @@
% \textsc{Daly P W}.
% \newblock \textit{Natural Sciences Citations and References} [EB/OL].
% \newblock version 8.31b,
-% \newblock (2010-09-13)
+% \newblock (2010-09-13)
% \urlprefix\url{https://ctan.org/pkg/natbib}
% \urlprefix\CTANurl[文档及源代码：]{macros/latex/contrib/natbib/natbib.pdf}
%
@@ -2430,7 +2432,7 @@
% \bibitem{source3}
% \textsc{The \LaTeX3 Project}.
% \newblock \textit{The \LaTeX3 Sources} [CP/OL].
-% \newblock (2019-03-05)
+% \newblock (2020-08-07)
% \urlprefix\url{https://ctan.org/pkg/l3kernel}
% \urlprefix\CTANurl[源代码：]{macros/latex/contrib/l3kernel/source3.pdf}
%
@@ -2437,8 +2439,8 @@
% \bibitem{biblatex}
% \textsc{Lehman P}, \textsc{Kime P}, \textsc{Boruvka A}, et al.
% \newblock \textit{The \pkg{biblatex} Package} [EB/OL].
-% \newblock version 3.12,
-% \newblock (2018-10-18)
+% \newblock version 3.15a,
+% \newblock (2020-08-23)
% \urlprefix\url{https://ctan.org/pkg/biblatex}
% \urlprefix\CTANurl[文档：]{macros/latex/contrib/biblatex/doc/biblatex.pdf}
%
@@ -2446,16 +2448,16 @@
% \textsc{Oetiker T}, \textsc{Partl H}, \textsc{Hyna I}, et al.
% \newblock \textit{The Not So Short Introduction to \LaTeXe{}: Or \LaTeXe{} in 139 minutes} [EB/OL].
% \newblock version 6.2,
-% \newblock (2018-02-28)
+% \newblock (2018-02-28)
% \urlprefix\url{https://ctan.org/pkg/lshort-english}
% \urlprefix\CTANurl[文档：]{info/lshort/english/lshort.pdf}
%
% \bibitem{lshort-zh-cn}
% \textsc{Oetiker T}, \textsc{Partl H}, \textsc{Hyna I}, et al.
-% \newblock \textit{一份不太简短的 \LaTeXe{} 介绍: 或 106 分钟了解 \LaTeXe{}} [EB/OL].
+% \newblock \textit{一份（不太）简短的 \LaTeXe{} 介绍: 或 112 分钟了解 \LaTeXe{}} [EB/OL].
% \newblock \CTeX{} 开发小组, 译.
-% \newblock 原版版本 version 6.2, 中文版本 version 6.0,
-% \newblock (2018-09-01)
+% \newblock 原版版本 version 6.2, 中文版本 version 6.02,
+% \newblock (2020-08-03)
% \urlprefix\url{https://ctan.org/pkg/lshort-zh-cn}
% \urlprefix\CTANurl[文档：]{info/lshort/chinese/lshort-zh-cn.pdf}
%
@@ -2462,8 +2464,8 @@
% \bibitem{biblatex-gb7714-2015}
% 胡振震.
% \newblock \textit{符合 GB/T 7714-2015 标准的 biblatex 参考文献样式} [EB/OL].
-% \newblock version 1.0q,
-% \newblock (2019-02-11)
+% \newblock version 1.0v,
+% \newblock (2020-07-21)
% \urlprefix\url{https://ctan.org/pkg/biblatex-gb7714-2015}
% \urlprefix\CTANurl[文档：]{biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf}
%
@@ -2470,8 +2472,8 @@
% \bibitem{gbt7714}
% 李泽平（\textsc{Zeping L}）.
% \newblock \textit{GB/T 7714-2015 \BibTeX{} Style} [EB/OL].
-% \newblock version 1.0.9,
-% \newblock (2018-08-05)
+% \newblock version 2.0.2,
+% \newblock (2020-06-08)
% \urlprefix\url{https://ctan.org/pkg/gbt7714}
% \urlprefix\CTANurl[文档：]{biblio/bibtex/contrib/gbt7714/gbt7714.pdf}
%
@@ -2478,16 +2480,16 @@
% \bibitem{cquthesis}
% 李振楠.
% \newblock \textit{\textsc{CquThesis}：重庆大学毕业论文 \LaTeX{} 模板} [EB/OL].
-% \newblock version 1.30,
-% \newblock (2018-02-23)
+% \newblock version 1.50,
+% \newblock (2020-06-23)
% \urlprefix\url{https://ctan.org/pkg/cquthesis}
% \urlprefix\CTANurl[文档及源代码：]{macros/latex/contrib/cquthesis/cquthesis.pdf}
%
% \bibitem{thuthesis}
-% 薛瑞尼.
+% 清华大学 TUNA 协会.
% \newblock \textit{\textsc{ThuThesis}：清华大学学位论文模板} [EB/OL].
-% \newblock version 5.4.5,
-% \newblock (2018-05-17)
+% \newblock version 6.1.3,
+% \newblock (2020-07-09)
% \urlprefix\url{https://ctan.org/pkg/thuthesis}
% \urlprefix\CTANurl[文档及源代码：]{macros/latex/contrib/thuthesis/thuthesis.pdf}
%
@@ -2495,22 +2497,23 @@
%
% \bibitem{sjtuthesis}
% \textsc{SJTUG}.
-% \newblock \textit{上海交通大学 \XeLaTeX{} 学位论文及课程论文模板} [EB/OL].
-% \newblock version 0.10.2,
-% \newblock (2018-11-05)
+% \newblock \textit{上海交通大学学位论文模板} [EB/OL].
+% \newblock version 1.0.0rc7,
+% \newblock (2020-07-31)
% \urlprefix\url{https://github.com/sjtug/SJTUThesis}
+% \urlprefix\url[源代码仓库：]{https://github.com/sjtug/SJTUTeX}
%
% \bibitem{ustcthesis}
% \textsc{USTC \TeX{} User Group}.
% \newblock \textit{中国科学技术大学学位论文 \LaTeX{} 模板} [EB/OL].
-% \newblock version 3.1.03,
-% \newblock (2019-01-01)
+% \newblock version 3.2.1,
+% \newblock (2020-04-03)
% \urlprefix\url{https://github.com/ustctug/ustcthesis}
%
% \bibitem{ucasthesis}
% \textsc{mohuangrui}.
% \newblock \textit{\pkg{ucasthesis} 国科大学位论文 \LaTeX{} 模板} [EB/OL].
-% \newblock (2019-03-14)
+% \newblock (2020-07-28)
% \urlprefix\url{https://github.com/mohuangrui/ucasthesis}
%
% \emph{以下模版现已停止更新。}
@@ -2518,13 +2521,13 @@
% \bibitem{pandoxie2014fduthesislatex}
% \textsc{Pandoxie}.
% \newblock \textit{Fudan University-Latex Template} [EB/OL].
-% \newblock (2014-06-07)
+% \newblock (2014-06-07)
% \urlprefix\url{https://github.com/Pandoxie/FDU-Thesis-Latex}
%
% \bibitem{richard2016fudanthesis}
% \textsc{richard}.
% \newblock \textit{复旦大学硕士学位论文模板} [EB/OL].
-% \newblock (2016-01-31)
+% \newblock (2016-01-31)
% \urlprefix\url{https://github.com/richarddzh/fudan-thesis}
%
% \bibitem{数院毕业论文格式}
@@ -2542,7 +2545,7 @@
% \bibitem{wright2009dtxfile}
% \textsc{Wright J}.
% \newblock \textit{A model dtx file} [EB/OL].
-% \newblock (2009-10-06)
+% \newblock (2009-10-06)
% \urlprefix\url{https://www.texdev.net/2009/10/06/a-model-dtx-file/}
%
% \bibitem{孔雀计划}
@@ -2829,7 +2832,7 @@
% \begin{macrocode}
type .choice:,
type .value_required:n = true,
- type .choices:nn =
+ type .choices:nn =
{ doctor, master, bachelor }
{ \int_set_eq:NN \g_@@_thesis_type_int \l_keys_choice_int },
type .initial:n = bachelor,
@@ -3032,11 +3035,11 @@
%
% \changes{v0.7c}{2019/03/05}{重构字体配置，并兼容 macOS。}
%
-% \begin{variable}{\g_@@_font_set_tl, \g_@@_cjk_font_set_tl}
+% \begin{variable}{\g_@@_fontset_tl, \g_@@_cjk_fontset_tl}
% 存放字体选项值。
% \begin{macrocode}
-\tl_new:N \g_@@_font_set_tl
-%<class>\tl_new:N \g_@@_cjk_font_set_tl
+\tl_new:N \g_@@_fontset_tl
+%<class>\tl_new:N \g_@@_cjk_fontset_tl
% \end{macrocode}
% \end{variable}
%
@@ -3048,7 +3051,7 @@
{
font .choices:nn =
{ garamond, libertinus, lm, palatino, times, times*, none }
- { \tl_set_eq:NN \g_@@_font_set_tl \l_keys_choice_tl }
+ { \tl_set_eq:NN \g_@@_fontset_tl \l_keys_choice_tl }
}
% \end{macrocode}
% \end{macro}
@@ -3062,7 +3065,7 @@
{
cjk-font .choices:nn =
{ adobe, fandol, founder, mac, sinotype, sourcehan, windows, none }
- { \tl_set_eq:NN \g_@@_cjk_font_set_tl \l_keys_choice_tl }
+ { \tl_set_eq:NN \g_@@_cjk_fontset_tl \l_keys_choice_tl }
}
% \end{macrocode}
%</class>
@@ -3180,6 +3183,97 @@
% \end{macrocode}
% \end{macro}
%
+% \changes{v0.7e}{2019/04/10}{兼容 Libertinus 和 XITS 字体的文件名变动。}
+% \begin{macro}{
+% \g_@@_font_family_libertinus_serif_tl,
+% \g_@@_font_family_libertinus_sans_tl,
+% \g_@@_font_style_libertinus_rm_tl,
+% \g_@@_font_style_libertinus_bf_tl,
+% \g_@@_font_style_libertinus_it_tl,
+% \g_@@_font_style_libertinus_bfit_tl,
+% \g_@@_font_style_libertinus_bfsl_tl,
+% \g_@@_font_family_xits_tl,
+% \g_@@_font_style_xits_rm_tl,
+% \g_@@_font_style_xits_bf_tl,
+% \g_@@_font_style_xits_it_tl,
+% \g_@@_font_style_xits_bfit_tl,
+% \g_@@_font_name_libertinus_serif_tl,
+% \g_@@_font_name_libertinus_sans_tl,
+% \g_@@_font_name_libertinus_math_tl,
+% \g_@@_font_name_xits_tl,
+% \g_@@_font_name_xits_math_rm_tl,
+% \g_@@_font_name_xits_math_bf_tl}
+% Libertinus 和 XITS 字体的文件名做过变动，需要特殊处理。
+% \begin{macrocode}
+\tl_new:N \g_@@_font_family_libertinus_serif_tl
+\tl_new:N \g_@@_font_family_libertinus_sans_tl
+\tl_new:N \g_@@_font_style_libertinus_rm_tl
+\tl_new:N \g_@@_font_style_libertinus_bf_tl
+\tl_new:N \g_@@_font_style_libertinus_it_tl
+\tl_new:N \g_@@_font_style_libertinus_bfit_tl
+\tl_new:N \g_@@_font_style_libertinus_bfsl_tl
+\tl_new:N \g_@@_font_family_xits_tl
+\tl_new:N \g_@@_font_style_xits_rm_tl
+\tl_new:N \g_@@_font_style_xits_bf_tl
+\tl_new:N \g_@@_font_style_xits_it_tl
+\tl_new:N \g_@@_font_style_xits_bfit_tl
+\tl_new:N \g_@@_font_name_libertinus_serif_tl
+\tl_new:N \g_@@_font_name_libertinus_sans_tl
+\tl_new:N \g_@@_font_name_libertinus_math_tl
+\tl_new:N \g_@@_font_name_xits_tl
+\tl_new:N \g_@@_font_name_xits_math_rm_tl
+\tl_new:N \g_@@_font_name_xits_math_bf_tl
+\fontspec_font_if_exist:nTF { LibertinusSerif-Regular.otf }
+ {
+ \tl_set:Nn \g_@@_font_family_libertinus_serif_tl { LibertinusSerif }
+ \tl_set:Nn \g_@@_font_family_libertinus_sans_tl { LibertinusSans }
+ \tl_set:Nn \g_@@_font_family_libertinus_math_tl { LibertinusMath }
+ \tl_set:Nn \g_@@_font_style_libertinus_rm_tl { Regular }
+ \tl_set:Nn \g_@@_font_style_libertinus_bf_tl { Bold }
+ \tl_set:Nn \g_@@_font_style_libertinus_it_tl { Italic }
+ \tl_set:Nn \g_@@_font_style_libertinus_bfit_tl { BoldItalic }
+ \tl_set:Nn \g_@@_font_style_libertinus_bfsl_tl { BoldOblique }
+ }
+ {
+ \tl_set:Nn \g_@@_font_family_libertinus_serif_tl { libertinusserif }
+ \tl_set:Nn \g_@@_font_family_libertinus_sans_tl { libertinussans }
+ \tl_set:Nn \g_@@_font_family_libertinus_math_tl { libertinusmath }
+ \tl_set:Nn \g_@@_font_style_libertinus_rm_tl { regular }
+ \tl_set:Nn \g_@@_font_style_libertinus_bf_tl { bold }
+ \tl_set:Nn \g_@@_font_style_libertinus_it_tl { italic }
+ \tl_set:Nn \g_@@_font_style_libertinus_bfit_tl { bolditalic }
+ \tl_set:Nn \g_@@_font_style_libertinus_bfsl_tl { bolditalic }
+ }
+\fontspec_font_if_exist:nTF { XITS-Regular.otf }
+ {
+ \tl_set:Nn \g_@@_font_family_xits_tl { XITS }
+ \tl_set:Nn \g_@@_font_style_xits_rm_tl { Regular }
+ \tl_set:Nn \g_@@_font_style_xits_bf_tl { Bold }
+ \tl_set:Nn \g_@@_font_style_xits_it_tl { Italic }
+ \tl_set:Nn \g_@@_font_style_xits_bfit_tl { BoldItalic }
+ \tl_set:Nn \g_@@_font_name_xits_math_rm_tl { XITSMath-Regular }
+ \tl_set:Nn \g_@@_font_name_xits_math_bf_tl { XITSMath-Bold }
+ }
+ {
+ \tl_set:Nn \g_@@_font_family_xits_tl { xits }
+ \tl_set:Nn \g_@@_font_style_xits_rm_tl { regular }
+ \tl_set:Nn \g_@@_font_style_xits_bf_tl { bold }
+ \tl_set:Nn \g_@@_font_style_xits_it_tl { italic }
+ \tl_set:Nn \g_@@_font_style_xits_bfit_tl { bolditalic }
+ \tl_set:Nn \g_@@_font_name_xits_math_rm_tl { xits-math }
+ \tl_set:Nn \g_@@_font_name_xits_math_bf_tl { xits-mathbold }
+ }
+\tl_set:Nx \g_@@_font_name_libertinus_serif_tl
+ { \g_@@_font_family_libertinus_serif_tl - \g_@@_font_style_libertinus_rm_tl }
+\tl_set:Nx \g_@@_font_name_libertinus_sans_tl
+ { \g_@@_font_family_libertinus_sans_tl - \g_@@_font_style_libertinus_rm_tl }
+\tl_set:Nx \g_@@_font_name_libertinus_math_tl
+ { \g_@@_font_family_libertinus_math_tl - \g_@@_font_style_libertinus_rm_tl }
+\tl_set:Nx \g_@@_font_name_xits_tl
+ { \g_@@_font_family_xits_tl - \g_@@_font_style_xits_rm_tl }
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\@@_load_font_garamond:}
% EB Garamond 系列。
% \begin{macrocode}
@@ -3193,13 +3287,13 @@
ItalicFont = *-Italic,
BoldItalicFont = *-BoldItalic
}
- \@@_setsansfont:nn { libertinussans }
+ \@@_setsansfont:nn { \g_@@_font_family_libertinus_sans_tl }
{
Extension = .otf,
- UprightFont = *-regular,
- BoldFont = *-bold,
- ItalicFont = *-italic,
- BoldItalicFont = *-bolditalic
+ UprightFont = *-\g_@@_font_style_libertinus_rm_tl,
+ BoldFont = *-\g_@@_font_style_libertinus_bf_tl,
+ ItalicFont = *-\g_@@_font_style_libertinus_it_tl,
+ BoldItalicFont = *-\g_@@_font_style_libertinus_bfsl_tl
}
\@@_setmonofont:nn { lmmonolt10 }
{
@@ -3219,21 +3313,21 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_load_font_libertinus:
{
- \@@_setmainfont:nn { libertinusserif }
+ \@@_setmainfont:nn { \g_@@_font_family_libertinus_serif_tl }
{
Extension = .otf,
- UprightFont = *-regular,
- BoldFont = *-bold,
- ItalicFont = *-italic,
- BoldItalicFont = *-bolditalic
+ UprightFont = *-\g_@@_font_style_libertinus_rm_tl,
+ BoldFont = *-\g_@@_font_style_libertinus_bf_tl,
+ ItalicFont = *-\g_@@_font_style_libertinus_it_tl,
+ BoldItalicFont = *-\g_@@_font_style_libertinus_bfit_tl
}
- \@@_setsansfont:nn { libertinussans }
+ \@@_setsansfont:nn { \g_@@_font_family_libertinus_sans_tl }
{
Extension = .otf,
- UprightFont = *-regular,
- BoldFont = *-bold,
- ItalicFont = *-italic,
- BoldItalicFont = *-bolditalic
+ UprightFont = *-\g_@@_font_style_libertinus_rm_tl,
+ BoldFont = *-\g_@@_font_style_libertinus_bf_tl,
+ ItalicFont = *-\g_@@_font_style_libertinus_it_tl,
+ BoldItalicFont = *-\g_@@_font_style_libertinus_bfsl_tl
}
\@@_setmonofont:nn { lmmonolt10 }
{
@@ -3243,7 +3337,7 @@
ItalicFont = *-oblique,
BoldItalicFont = *-boldoblique
}
- \@@_setmathfont:nn { libertinusmath-regular.otf } { }
+ \@@_setmathfont:nn { \g_@@_font_name_libertinus_math_tl .otf } { }
}
% \end{macrocode}
% \end{macro}
@@ -3270,13 +3364,13 @@
ItalicFont = *-italic,
BoldItalicFont = *-bolditalic
}
- \@@_setsansfont:nn { libertinussans }
+ \@@_setsansfont:nn { \g_@@_font_family_libertinus_sans_tl }
{
Extension = .otf,
- UprightFont = *-regular,
- BoldFont = *-bold,
- ItalicFont = *-italic,
- BoldItalicFont = *-bolditalic,
+ UprightFont = *-\g_@@_font_style_libertinus_rm_tl,
+ BoldFont = *-\g_@@_font_style_libertinus_bf_tl,
+ ItalicFont = *-\g_@@_font_style_libertinus_it_tl,
+ BoldItalicFont = *-\g_@@_font_style_libertinus_bfsl_tl,
Scale = MatchUppercase
}
\@@_setmonofont:nn { lmmonolt10 }
@@ -3297,17 +3391,13 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_load_font_times:
{
- \@@_setmainfont:nn { XITS }
+ \@@_setmainfont:nn { \g_@@_font_family_xits_tl }
{
Extension = .otf,
- UprightFont = *-Regular,
- BoldFont = *-Bold,
- ItalicFont = *-Italic,
- BoldItalicFont = *-BoldItalic,
- UprightFeatures = { SmallCapsFont = *-Regular },
- BoldFeatures = { SmallCapsFont = *-Bold },
- ItalicFeatures = { SmallCapsFont = *-Italic },
- BoldItalicFeatures = { SmallCapsFont = *-BoldItalic }
+ UprightFont = *-\g_@@_font_style_xits_rm_tl,
+ BoldFont = *-\g_@@_font_style_xits_bf_tl,
+ ItalicFont = *-\g_@@_font_style_xits_it_tl,
+ BoldItalicFont = *-\g_@@_font_style_xits_bfit_tl
}
\@@_setsansfont:nn { texgyreheros }
{
@@ -3326,13 +3416,14 @@
BoldItalicFont = *-bolditalic,
Ligatures = CommonOff
}
- \@@_setmathfont:nn { XITSMath-Regular.otf }{ BoldFont = XITSMath-Bold.otf }
+ \@@_setmathfont:nn { \g_@@_font_name_xits_math_rm_tl .otf }
+ { BoldFont = \g_@@_font_name_xits_math_bf_tl .otf }
}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\@@_load_font_times*:}
-% Times* 系列，出数学部分外采用系统字体。
+% Times* 系列，除数学部分外采用系统字体。
% \begin{macrocode}
\cs_new_protected:cpn { @@_load_font_ times* : }
{
@@ -3339,7 +3430,8 @@
\@@_setmainfont:nn { Times~ New~ Roman } { }
\@@_setsansfont:nn { Arial } { }
\@@_setmonofont:nn { Courier~ New } { }
- \@@_setmathfont:nn { XITSMath-Regular.otf }{ BoldFont = XITSMath-Bold.otf }
+ \@@_setmathfont:nn { \g_@@_font_name_xits_math_rm_tl .otf }
+ { BoldFont = \g_@@_font_name_xits_math_bf_tl .otf }
}
% \end{macrocode}
% \end{macro}
@@ -3499,8 +3591,8 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_load_font:
{
- \use:c { @@_load_font_ \g_@@_font_set_tl : }
-%<class> \use:c { @@_load_cjk_font_ \g_@@_cjk_font_set_tl : }
+ \use:c { @@_load_font_ \g_@@_fontset_tl : }
+%<class> \use:c { @@_load_cjk_font_ \g_@@_cjk_fontset_tl : }
}
\ctex_at_end_preamble:n { \@@_load_font: }
% \end{macrocode}
@@ -3915,8 +4007,7 @@
% \begin{macro}{\@@_fn_symbol_libertinus_sans:n}
% \opt{libertinus} 阳文无衬线版。符号排列与普通版相同。
% \begin{macrocode}
-\cs_new_eq:NN \@@_fn_symbol_libertinus_sans:n
- \@@_fn_symbol_libertinus:n
+\cs_new_eq:NN \@@_fn_symbol_libertinus_sans:n \@@_fn_symbol_libertinus:n
% \end{macrocode}
% \end{macro}
%
@@ -4011,17 +4102,17 @@
% \begin{macrocode}
\c_@@_fn_style_libertinus_tl
{
- \fontspec { libertinusserif-regular.otf }
+ \fontspec { \g_@@_font_name_libertinus_serif_tl .otf }
\@@_fn_symbol_libertinus:n {#1}
}
\c_@@_fn_style_libertinus_neg_tl
{
- \fontspec { libertinusserif-regular.otf }
+ \fontspec { \g_@@_font_name_libertinus_serif_tl .otf }
\@@_fn_symbol_libertinus_neg:n {#1}
}
\c_@@_fn_style_libertinus_sans_tl
{
- \fontspec { libertinussans-regular.otf }
+ \fontspec { \g_@@_font_name_libertinus_sans_tl .otf }
\@@_fn_symbol_libertinus_sans:n {#1}
}
% \end{macrocode}
@@ -4040,17 +4131,17 @@
% \begin{macrocode}
\c_@@_fn_style_xits_tl
{
- \fontspec { XITS-Regular.otf }
+ \fontspec { \g_@@_font_name_xits_tl .otf }
\@@_fn_symbol_xits:n {#1}
}
\c_@@_fn_style_xits_sans_tl
{
- \fontspec { XITS-Regular.otf }
+ \fontspec { \g_@@_font_name_xits_tl .otf }
\@@_fn_symbol_xits_sans:n {#1}
}
\c_@@_fn_style_xits_sans_neg_tl
{
- \fontspec { XITS-Regular.otf }
+ \fontspec { \g_@@_font_name_xits_tl .otf }
\@@_fn_symbol_xits_sans_neg:n {#1}
}
}
@@ -5094,9 +5185,9 @@
authorization-decl-sig / content =
\@@_cover_signature:N \c_@@_auth_decl_sign_clist,
originality-decl-name / format =
- \@@_line_spread:n { 1.2 } \zihao { -2 } \sffamily,
+ \@@_line_spread:n { 1.2 } \zihao { -2 } \bfseries,
authorization-decl-name / format =
- \@@_line_spread:n { 1.2 } \zihao { -2 } \sffamily,
+ \@@_line_spread:n { 1.2 } \zihao { -2 } \bfseries,
originality-decl-name / bottom-skip = 0.4 cm,
originality-decl-text / bottom-skip = 0.4 cm,
originality-decl-sig / bottom-skip = 0 pt plus 2.5 fill,
@@ -5148,8 +5239,9 @@
% \begin{macrocode}
\keys_set:nn { ctex }
{
-%<class> contentsname = \c_@@_name_toc_tl,
-%<class-en> contentsname = \c_@@_name_toc_en_tl,
+%<class> contentsname = \c_@@_name_toc_tl,
+%<class> listfigurename = \c_@@_name_lof_tl,
+%<class> listtablename = \c_@@_name_lot_tl,
% \end{macrocode}
%
% 设置目录中章节标题的样式。
@@ -5173,17 +5265,36 @@
}
% \end{macrocode}
%
-% \begin{macro}{\tableofcontents}
-% 修改 \cs{tableofcontents} 的定义，使得页眉正确显示，并出现在目录中。原代码
-% 来自于 \LaTeXe{} 标准文档类 \file{book.cls}。
+% \changes{v0.7e}{2019/05/12}{增加对插图、表格目录的处理。}
+%
+% \begin{macro}{\tableofcontents,\listoffigures,\listoftables}
+% 修改 \cs{tableofcontents}、\cs{listoffigures} 和 \cs{listoftables} 的定义，
+% 使得页眉正确显示，并出现在目录及 PDF 书签中。来自于 \LaTeXe{} 标准文档类
+% \file{book.cls}
+% \footnote{原代码中只有 \cs{tableofcontents} 的 \cs{@mkboth} 出现在
+% \cs{chapter*} 内部，这是出于兼容性的考虑而非 typo。}。
% \begin{macrocode}
\@@_patch_cmd:Nnn \tableofcontents
{
\chapter*{\contentsname
- \@mkboth{%
- \MakeUppercase\contentsname}{\MakeUppercase\contentsname}}%
+ \@mkboth{\MakeUppercase\contentsname}
+ {\MakeUppercase\contentsname}}
}
{ \@@_chapter_no_toc:V \contentsname }
+\@@_patch_cmd:Nnn \listoffigures
+ {
+ \chapter*{\listfigurename}
+ \@mkboth{\MakeUppercase\listfigurename}
+ {\MakeUppercase\listfigurename}
+ }
+ { \@@_chapter:V \listfigurename }
+\@@_patch_cmd:Nnn \listoftables
+ {
+ \chapter*{\listtablename}
+ \@mkboth{\MakeUppercase\listtablename}
+ {\MakeUppercase\listtablename}
+ }
+ { \@@_chapter:V \listtablename }
% \end{macrocode}
% \end{macro}
%
@@ -5440,6 +5551,7 @@
% \changes{v0.7}{2018/01/25}{统一使用 \cs{printbibliography} 命令
% 生成参考文献列表。}
% \changes{v0.7d}{2019/03/23}{使参考文献在目录中正常显示。}
+% \changes{v0.7e}{2020/08/30}{同步 \pkg{gbt7714} v2.0。}
%
% \begin{macro}{\@@_bibtex_setup:,\bibsection,\printbibliography}
% \BibTeX{} 相关设置。
@@ -5450,13 +5562,13 @@
{
\tl_if_eq:VnTF \l_@@_bib_gb_style_tl { numerical }
{
- \bibliographystyle { gbt7714-unsrt }
+ \bibliographystyle { gbt7714-numerical }
\@@_set_cite_style_numerical:
}
{
\tl_if_eq:VnT \l_@@_bib_gb_style_tl { author-year }
{
- \bibliographystyle { gbt7714-plain }
+ \bibliographystyle { gbt7714-author-year }
\@@_set_cite_style_author_year:
\cs_set_eq:NN \cite \citep
}
@@ -5697,6 +5809,8 @@
% \end{macrocode}
% \end{variable}
%
+% \changes{v0.7e}{2019/04/23}{处理 \pkg{hyperref} 与 \pkg{unicode-math} 的兼容性问题。}
+%
% 在导言区末尾引入 \pkg{hyperref} 宏包。
% \begin{macrocode}
\ctex_at_end_preamble:n
@@ -5708,6 +5822,8 @@
\hypersetup
{
bookmarksnumbered = true,
+ psdextra = true,
+ unicode = true,
% \end{macrocode}
% 填写 PDF 元信息。
% \begin{macrocode}
@@ -5984,6 +6100,9 @@
{ author_sign } { 作者签名 },
{ supervisor_sign } { 导师签名 },
{ sign_date } { 日期 },
+ { toc } { 目 \quad 录 },
+ { lof } { 插图目录 },
+ { lot } { 表格目录 },
{ bib_en } { Bibliography },
{ pdf_creator } { LaTeX~ with~ fduthesis~ class },
{ orig_decl } { \c_@@_name_simp_tl \\ 学位论文独创性声明 },
@@ -5995,7 +6114,6 @@
{ abstract } { 摘 \quad 要 } { Abstract },
{ keywords } { 关键字 } { Keywords: },
{ clc } { 中图分类号 } { CLC~ number: },
- { toc } { 目 \quad 录 } { Contents },
{ notation } { 符号表 } { List~ of~ Symbols }
}
{ \@@_define_name:nnn #1 }
Modified: trunk/Master/texmf-dist/source/latex/fduthesis/fduthesis.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/fduthesis/fduthesis.ins 2020-08-30 21:12:39 UTC (rev 56215)
+++ trunk/Master/texmf-dist/source/latex/fduthesis/fduthesis.ins 2020-08-30 21:12:56 UTC (rev 56216)
@@ -6,7 +6,7 @@
%%
%% fduthesis.dtx (with options: `install')
%%
-%% Copyright (C) 2017--2019 by Xiangdong Zeng <xdzeng96 at gmail.com>
+%% Copyright (C) 2017--2020 by Xiangdong Zeng <xdzeng96 at gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -49,7 +49,7 @@
\preamble
- Copyright (C) 2017--2019 by Xiangdong Zeng <xdzeng96 at gmail.com>
+ Copyright (C) 2017--2020 by Xiangdong Zeng <xdzeng96 at gmail.com>
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
Modified: trunk/Master/texmf-dist/tex/latex/fduthesis/fdudoc.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fduthesis/fdudoc.cls 2020-08-30 21:12:39 UTC (rev 56215)
+++ trunk/Master/texmf-dist/tex/latex/fduthesis/fdudoc.cls 2020-08-30 21:12:56 UTC (rev 56216)
@@ -7,7 +7,7 @@
%% fduthesis.dtx (with options: `doc')
%% fduthesis-doc.dtx (with options: `doc')
%%
-%% Copyright (C) 2017--2019 by Xiangdong Zeng <xdzeng96 at gmail.com>
+%% Copyright (C) 2017--2020 by Xiangdong Zeng <xdzeng96 at gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -46,7 +46,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo $Id: fduthesis.dtx 0.7d 2019-04-03 12:00:00Z Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo $Id: fduthesis.dtx 0.7e 2020-08-30 12:00:00Z Xiangdong Zeng <xdzeng96 at gmail.com> $
{Documentation class for fduthesis}
\ProvidesExplClass{fdudoc}
{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -853,12 +853,12 @@
\def\indexname{代码索引}
\GlossaryPrologue{\section{\glossaryname}}
\def\glossaryname{修订记录}
-\setmainfont{libertinusserif}[%
+\setmainfont{LibertinusSerif}[%
Extension = .otf,
- UprightFont = *-regular,
- BoldFont = *-bold,
- ItalicFont = *-italic,
- BoldItalicFont = *-bolditalic,
+ UprightFont = *-Regular,
+ BoldFont = *-Bold,
+ ItalicFont = *-Italic,
+ BoldItalicFont = *-BoldItalic,
Scale = 1.1]
\setsansfont{IBMPlexSansCondensed}[%
Extension = .otf,
@@ -870,7 +870,7 @@
UprightFont = * Light,
BoldFont = * Semibold,
Scale = MatchLowercase]
-\setmathfont{libertinusmath-regular.otf}
+\setmathfont{LibertinusMath-Regular.otf}
\setCJKmainfont{Source Han Serif SC}[%
ItalicFont = FZKai-Z03,
RawFeature = +fwid]
Modified: trunk/Master/texmf-dist/tex/latex/fduthesis/fdulogo.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fduthesis/fdulogo.sty 2020-08-30 21:12:39 UTC (rev 56215)
+++ trunk/Master/texmf-dist/tex/latex/fduthesis/fdulogo.sty 2020-08-30 21:12:56 UTC (rev 56216)
@@ -7,7 +7,7 @@
%% fduthesis.dtx (with options: `logo')
%% fduthesis-logo.dtx (with options: `logo')
%%
-%% Copyright (C) 2017--2019 by Xiangdong Zeng <xdzeng96 at gmail.com>
+%% Copyright (C) 2017--2020 by Xiangdong Zeng <xdzeng96 at gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -46,7 +46,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo $Id: fduthesis.dtx 0.7d 2019-04-03 12:00:00Z Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo $Id: fduthesis.dtx 0.7e 2020-08-30 12:00:00Z Xiangdong Zeng <xdzeng96 at gmail.com> $
{Fudan University's Visual Identity}
\ProvidesExplPackage{fdulogo}
{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
Modified: trunk/Master/texmf-dist/tex/latex/fduthesis/fduthesis-en.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fduthesis/fduthesis-en.cls 2020-08-30 21:12:39 UTC (rev 56215)
+++ trunk/Master/texmf-dist/tex/latex/fduthesis/fduthesis-en.cls 2020-08-30 21:12:56 UTC (rev 56216)
@@ -6,7 +6,7 @@
%%
%% fduthesis.dtx (with options: `class-en')
%%
-%% Copyright (C) 2017--2019 by Xiangdong Zeng <xdzeng96 at gmail.com>
+%% Copyright (C) 2017--2020 by Xiangdong Zeng <xdzeng96 at gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -45,7 +45,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo $Id: fduthesis.dtx 0.7d 2019-04-03 12:00:00Z Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo $Id: fduthesis.dtx 0.7e 2020-08-30 12:00:00Z Xiangdong Zeng <xdzeng96 at gmail.com> $
{Thesis template for Fudan University (English version)}
\ProvidesExplClass{\ExplFileName-en}
{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -251,12 +251,12 @@
headheight = 15 pt
}
\bool_if:NT \g__fdu_draft_bool { \geometry { showframe } }
-\tl_new:N \g__fdu_font_set_tl
+\tl_new:N \g__fdu_fontset_tl
\keys_define:nn { fdu / style }
{
font .choices:nn =
{ garamond, libertinus, lm, palatino, times, times*, none }
- { \tl_set_eq:NN \g__fdu_font_set_tl \l_keys_choice_tl }
+ { \tl_set_eq:NN \g__fdu_fontset_tl \l_keys_choice_tl }
}
\cs_new_protected:Npn \__fdu_setmainfont:nn #1#2
{ \__fontspec_main_setmainfont:nn {#2} {#1} }
@@ -275,6 +275,72 @@
}
}
\clist_map_inline:nn { main, sans, mono, math } { \__fdu_set_font_helper:n {#1} }
+\tl_new:N \g__fdu_font_family_libertinus_serif_tl
+\tl_new:N \g__fdu_font_family_libertinus_sans_tl
+\tl_new:N \g__fdu_font_style_libertinus_rm_tl
+\tl_new:N \g__fdu_font_style_libertinus_bf_tl
+\tl_new:N \g__fdu_font_style_libertinus_it_tl
+\tl_new:N \g__fdu_font_style_libertinus_bfit_tl
+\tl_new:N \g__fdu_font_style_libertinus_bfsl_tl
+\tl_new:N \g__fdu_font_family_xits_tl
+\tl_new:N \g__fdu_font_style_xits_rm_tl
+\tl_new:N \g__fdu_font_style_xits_bf_tl
+\tl_new:N \g__fdu_font_style_xits_it_tl
+\tl_new:N \g__fdu_font_style_xits_bfit_tl
+\tl_new:N \g__fdu_font_name_libertinus_serif_tl
+\tl_new:N \g__fdu_font_name_libertinus_sans_tl
+\tl_new:N \g__fdu_font_name_libertinus_math_tl
+\tl_new:N \g__fdu_font_name_xits_tl
+\tl_new:N \g__fdu_font_name_xits_math_rm_tl
+\tl_new:N \g__fdu_font_name_xits_math_bf_tl
+\fontspec_font_if_exist:nTF { LibertinusSerif-Regular.otf }
+ {
+ \tl_set:Nn \g__fdu_font_family_libertinus_serif_tl { LibertinusSerif }
+ \tl_set:Nn \g__fdu_font_family_libertinus_sans_tl { LibertinusSans }
+ \tl_set:Nn \g__fdu_font_family_libertinus_math_tl { LibertinusMath }
+ \tl_set:Nn \g__fdu_font_style_libertinus_rm_tl { Regular }
+ \tl_set:Nn \g__fdu_font_style_libertinus_bf_tl { Bold }
+ \tl_set:Nn \g__fdu_font_style_libertinus_it_tl { Italic }
+ \tl_set:Nn \g__fdu_font_style_libertinus_bfit_tl { BoldItalic }
+ \tl_set:Nn \g__fdu_font_style_libertinus_bfsl_tl { BoldOblique }
+ }
+ {
+ \tl_set:Nn \g__fdu_font_family_libertinus_serif_tl { libertinusserif }
+ \tl_set:Nn \g__fdu_font_family_libertinus_sans_tl { libertinussans }
+ \tl_set:Nn \g__fdu_font_family_libertinus_math_tl { libertinusmath }
+ \tl_set:Nn \g__fdu_font_style_libertinus_rm_tl { regular }
+ \tl_set:Nn \g__fdu_font_style_libertinus_bf_tl { bold }
+ \tl_set:Nn \g__fdu_font_style_libertinus_it_tl { italic }
+ \tl_set:Nn \g__fdu_font_style_libertinus_bfit_tl { bolditalic }
+ \tl_set:Nn \g__fdu_font_style_libertinus_bfsl_tl { bolditalic }
+ }
+\fontspec_font_if_exist:nTF { XITS-Regular.otf }
+ {
+ \tl_set:Nn \g__fdu_font_family_xits_tl { XITS }
+ \tl_set:Nn \g__fdu_font_style_xits_rm_tl { Regular }
+ \tl_set:Nn \g__fdu_font_style_xits_bf_tl { Bold }
+ \tl_set:Nn \g__fdu_font_style_xits_it_tl { Italic }
+ \tl_set:Nn \g__fdu_font_style_xits_bfit_tl { BoldItalic }
+ \tl_set:Nn \g__fdu_font_name_xits_math_rm_tl { XITSMath-Regular }
+ \tl_set:Nn \g__fdu_font_name_xits_math_bf_tl { XITSMath-Bold }
+ }
+ {
+ \tl_set:Nn \g__fdu_font_family_xits_tl { xits }
+ \tl_set:Nn \g__fdu_font_style_xits_rm_tl { regular }
+ \tl_set:Nn \g__fdu_font_style_xits_bf_tl { bold }
+ \tl_set:Nn \g__fdu_font_style_xits_it_tl { italic }
+ \tl_set:Nn \g__fdu_font_style_xits_bfit_tl { bolditalic }
+ \tl_set:Nn \g__fdu_font_name_xits_math_rm_tl { xits-math }
+ \tl_set:Nn \g__fdu_font_name_xits_math_bf_tl { xits-mathbold }
+ }
+\tl_set:Nx \g__fdu_font_name_libertinus_serif_tl
+ { \g__fdu_font_family_libertinus_serif_tl - \g__fdu_font_style_libertinus_rm_tl }
+\tl_set:Nx \g__fdu_font_name_libertinus_sans_tl
+ { \g__fdu_font_family_libertinus_sans_tl - \g__fdu_font_style_libertinus_rm_tl }
+\tl_set:Nx \g__fdu_font_name_libertinus_math_tl
+ { \g__fdu_font_family_libertinus_math_tl - \g__fdu_font_style_libertinus_rm_tl }
+\tl_set:Nx \g__fdu_font_name_xits_tl
+ { \g__fdu_font_family_xits_tl - \g__fdu_font_style_xits_rm_tl }
\cs_new_protected:Npn \__fdu_load_font_garamond:
{
\__fdu_setmainfont:nn { EBGaramond }
@@ -285,13 +351,13 @@
ItalicFont = *-Italic,
BoldItalicFont = *-BoldItalic
}
- \__fdu_setsansfont:nn { libertinussans }
+ \__fdu_setsansfont:nn { \g__fdu_font_family_libertinus_sans_tl }
{
Extension = .otf,
- UprightFont = *-regular,
- BoldFont = *-bold,
- ItalicFont = *-italic,
- BoldItalicFont = *-bolditalic
+ UprightFont = *-\g__fdu_font_style_libertinus_rm_tl,
+ BoldFont = *-\g__fdu_font_style_libertinus_bf_tl,
+ ItalicFont = *-\g__fdu_font_style_libertinus_it_tl,
+ BoldItalicFont = *-\g__fdu_font_style_libertinus_bfsl_tl
}
\__fdu_setmonofont:nn { lmmonolt10 }
{
@@ -305,21 +371,21 @@
}
\cs_new_protected:Npn \__fdu_load_font_libertinus:
{
- \__fdu_setmainfont:nn { libertinusserif }
+ \__fdu_setmainfont:nn { \g__fdu_font_family_libertinus_serif_tl }
{
Extension = .otf,
- UprightFont = *-regular,
- BoldFont = *-bold,
- ItalicFont = *-italic,
- BoldItalicFont = *-bolditalic
+ UprightFont = *-\g__fdu_font_style_libertinus_rm_tl,
+ BoldFont = *-\g__fdu_font_style_libertinus_bf_tl,
+ ItalicFont = *-\g__fdu_font_style_libertinus_it_tl,
+ BoldItalicFont = *-\g__fdu_font_style_libertinus_bfit_tl
}
- \__fdu_setsansfont:nn { libertinussans }
+ \__fdu_setsansfont:nn { \g__fdu_font_family_libertinus_sans_tl }
{
Extension = .otf,
- UprightFont = *-regular,
- BoldFont = *-bold,
- ItalicFont = *-italic,
- BoldItalicFont = *-bolditalic
+ UprightFont = *-\g__fdu_font_style_libertinus_rm_tl,
+ BoldFont = *-\g__fdu_font_style_libertinus_bf_tl,
+ ItalicFont = *-\g__fdu_font_style_libertinus_it_tl,
+ BoldItalicFont = *-\g__fdu_font_style_libertinus_bfsl_tl
}
\__fdu_setmonofont:nn { lmmonolt10 }
{
@@ -329,7 +395,7 @@
ItalicFont = *-oblique,
BoldItalicFont = *-boldoblique
}
- \__fdu_setmathfont:nn { libertinusmath-regular.otf } { }
+ \__fdu_setmathfont:nn { \g__fdu_font_name_libertinus_math_tl .otf } { }
}
\cs_new_protected:Npn \__fdu_load_font_lm:
{ \__fdu_setmathfont:nn { latinmodern-math.otf } { } }
@@ -343,13 +409,13 @@
ItalicFont = *-italic,
BoldItalicFont = *-bolditalic
}
- \__fdu_setsansfont:nn { libertinussans }
+ \__fdu_setsansfont:nn { \g__fdu_font_family_libertinus_sans_tl }
{
Extension = .otf,
- UprightFont = *-regular,
- BoldFont = *-bold,
- ItalicFont = *-italic,
- BoldItalicFont = *-bolditalic,
+ UprightFont = *-\g__fdu_font_style_libertinus_rm_tl,
+ BoldFont = *-\g__fdu_font_style_libertinus_bf_tl,
+ ItalicFont = *-\g__fdu_font_style_libertinus_it_tl,
+ BoldItalicFont = *-\g__fdu_font_style_libertinus_bfsl_tl,
Scale = MatchUppercase
}
\__fdu_setmonofont:nn { lmmonolt10 }
@@ -364,17 +430,13 @@
}
\cs_new_protected:Npn \__fdu_load_font_times:
{
- \__fdu_setmainfont:nn { XITS }
+ \__fdu_setmainfont:nn { \g__fdu_font_family_xits_tl }
{
Extension = .otf,
- UprightFont = *-Regular,
- BoldFont = *-Bold,
- ItalicFont = *-Italic,
- BoldItalicFont = *-BoldItalic,
- UprightFeatures = { SmallCapsFont = *-Regular },
- BoldFeatures = { SmallCapsFont = *-Bold },
- ItalicFeatures = { SmallCapsFont = *-Italic },
- BoldItalicFeatures = { SmallCapsFont = *-BoldItalic }
+ UprightFont = *-\g__fdu_font_style_xits_rm_tl,
+ BoldFont = *-\g__fdu_font_style_xits_bf_tl,
+ ItalicFont = *-\g__fdu_font_style_xits_it_tl,
+ BoldItalicFont = *-\g__fdu_font_style_xits_bfit_tl
}
\__fdu_setsansfont:nn { texgyreheros }
{
@@ -393,7 +455,8 @@
BoldItalicFont = *-bolditalic,
Ligatures = CommonOff
}
- \__fdu_setmathfont:nn { XITSMath-Regular.otf }{ BoldFont = XITSMath-Bold.otf }
+ \__fdu_setmathfont:nn { \g__fdu_font_name_xits_math_rm_tl .otf }
+ { BoldFont = \g__fdu_font_name_xits_math_bf_tl .otf }
}
\cs_new_protected:cpn { __fdu_load_font_ times* : }
{
@@ -400,7 +463,8 @@
\__fdu_setmainfont:nn { Times~ New~ Roman } { }
\__fdu_setsansfont:nn { Arial } { }
\__fdu_setmonofont:nn { Courier~ New } { }
- \__fdu_setmathfont:nn { XITSMath-Regular.otf }{ BoldFont = XITSMath-Bold.otf }
+ \__fdu_setmathfont:nn { \g__fdu_font_name_xits_math_rm_tl .otf }
+ { BoldFont = \g__fdu_font_name_xits_math_bf_tl .otf }
}
\cs_new_protected:Npn \__fdu_load_cjk_font_adobe:
{
@@ -512,7 +576,7 @@
}
\cs_new_protected:Npn \__fdu_load_font:
{
- \use:c { __fdu_load_font_ \g__fdu_font_set_tl : }
+ \use:c { __fdu_load_font_ \g__fdu_fontset_tl : }
}
\ctex_at_end_preamble:n { \__fdu_load_font: }
\keys_set:nn { unicode-math }
@@ -668,8 +732,7 @@
{ \__fdu_symbol:n { \int_eval:n { "24EB - 11 + #1 } } }
{ \__fdu_symbol:n { \int_eval:n { "2776 - 1 + #1 } } }
}
-\cs_new_eq:NN \__fdu_fn_symbol_libertinus_sans:n
- \__fdu_fn_symbol_libertinus:n
+\cs_new_eq:NN \__fdu_fn_symbol_libertinus_sans:n \__fdu_fn_symbol_libertinus:n
\cs_new:Npn \__fdu_fn_symbol_pifont:n #1
{ \ding { \int_eval:n { 171 + #1 } } }
\cs_new:Npn \__fdu_fn_symbol_pifont_neg:n #1
@@ -701,17 +764,17 @@
{ \int_use:N #1 }
\c__fdu_fn_style_libertinus_tl
{
- \fontspec { libertinusserif-regular.otf }
+ \fontspec { \g__fdu_font_name_libertinus_serif_tl .otf }
\__fdu_fn_symbol_libertinus:n {#1}
}
\c__fdu_fn_style_libertinus_neg_tl
{
- \fontspec { libertinusserif-regular.otf }
+ \fontspec { \g__fdu_font_name_libertinus_serif_tl .otf }
\__fdu_fn_symbol_libertinus_neg:n {#1}
}
\c__fdu_fn_style_libertinus_sans_tl
{
- \fontspec { libertinussans-regular.otf }
+ \fontspec { \g__fdu_font_name_libertinus_sans_tl .otf }
\__fdu_fn_symbol_libertinus_sans:n {#1}
}
\c__fdu_fn_style_pifont_tl
@@ -724,17 +787,17 @@
{ \__fdu_fn_symbol_pifont_sans_neg:n {#1} }
\c__fdu_fn_style_xits_tl
{
- \fontspec { XITS-Regular.otf }
+ \fontspec { \g__fdu_font_name_xits_tl .otf }
\__fdu_fn_symbol_xits:n {#1}
}
\c__fdu_fn_style_xits_sans_tl
{
- \fontspec { XITS-Regular.otf }
+ \fontspec { \g__fdu_font_name_xits_tl .otf }
\__fdu_fn_symbol_xits_sans:n {#1}
}
\c__fdu_fn_style_xits_sans_neg_tl
{
- \fontspec { XITS-Regular.otf }
+ \fontspec { \g__fdu_font_name_xits_tl .otf }
\__fdu_fn_symbol_xits_sans_neg:n {#1}
}
}
@@ -1256,9 +1319,9 @@
authorization-decl-sig / content =
\__fdu_cover_signature:N \c__fdu_auth_decl_sign_clist,
originality-decl-name / format =
- \__fdu_line_spread:n { 1.2 } \zihao { -2 } \sffamily,
+ \__fdu_line_spread:n { 1.2 } \zihao { -2 } \bfseries,
authorization-decl-name / format =
- \__fdu_line_spread:n { 1.2 } \zihao { -2 } \sffamily,
+ \__fdu_line_spread:n { 1.2 } \zihao { -2 } \bfseries,
originality-decl-name / bottom-skip = 0.4 cm,
originality-decl-text / bottom-skip = 0.4 cm,
originality-decl-sig / bottom-skip = 0 pt plus 2.5 fill,
@@ -1288,7 +1351,6 @@
{ \bool_if:NT \l__fdu_auto_make_cover_bool { \makecoveriii } }
\keys_set:nn { ctex }
{
- contentsname = \c__fdu_name_toc_en_tl,
chapter / tocline =
{
\bfseries
@@ -1307,10 +1369,24 @@
\__fdu_patch_cmd:Nnn \tableofcontents
{
\chapter*{\contentsname
- \@mkboth{%
- \MakeUppercase\contentsname}{\MakeUppercase\contentsname}}%
+ \@mkboth{\MakeUppercase\contentsname}
+ {\MakeUppercase\contentsname}}
}
{ \__fdu_chapter_no_toc:V \contentsname }
+\__fdu_patch_cmd:Nnn \listoffigures
+ {
+ \chapter*{\listfigurename}
+ \@mkboth{\MakeUppercase\listfigurename}
+ {\MakeUppercase\listfigurename}
+ }
+ { \__fdu_chapter:V \listfigurename }
+\__fdu_patch_cmd:Nnn \listoftables
+ {
+ \chapter*{\listtablename}
+ \@mkboth{\MakeUppercase\listtablename}
+ {\MakeUppercase\listtablename}
+ }
+ { \__fdu_chapter:V \listtablename }
\__fdu_patch_cmd:Nnn \@starttoc
{ \begingroup }
{
@@ -1424,13 +1500,13 @@
{
\tl_if_eq:VnTF \l__fdu_bib_gb_style_tl { numerical }
{
- \bibliographystyle { gbt7714-unsrt }
+ \bibliographystyle { gbt7714-numerical }
\__fdu_set_cite_style_numerical:
}
{
\tl_if_eq:VnT \l__fdu_bib_gb_style_tl { author-year }
{
- \bibliographystyle { gbt7714-plain }
+ \bibliographystyle { gbt7714-author-year }
\__fdu_set_cite_style_author_year:
\cs_set_eq:NN \cite \citep
}
@@ -1561,6 +1637,8 @@
\hypersetup
{
bookmarksnumbered = true,
+ psdextra = true,
+ unicode = true,
pdftitle = \l__fdu_info_title_en_tl,
pdfauthor = \l__fdu_info_author_en_tl,
pdfkeywords = \l__fdu_info_keywords_en_clist,
Modified: trunk/Master/texmf-dist/tex/latex/fduthesis/fduthesis.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fduthesis/fduthesis.cls 2020-08-30 21:12:39 UTC (rev 56215)
+++ trunk/Master/texmf-dist/tex/latex/fduthesis/fduthesis.cls 2020-08-30 21:12:56 UTC (rev 56216)
@@ -6,7 +6,7 @@
%%
%% fduthesis.dtx (with options: `class')
%%
-%% Copyright (C) 2017--2019 by Xiangdong Zeng <xdzeng96 at gmail.com>
+%% Copyright (C) 2017--2020 by Xiangdong Zeng <xdzeng96 at gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -45,7 +45,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo $Id: fduthesis.dtx 0.7d 2019-04-03 12:00:00Z Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo $Id: fduthesis.dtx 0.7e 2020-08-30 12:00:00Z Xiangdong Zeng <xdzeng96 at gmail.com> $
{Thesis template for Fudan University}
\ProvidesExplClass{\ExplFileName}
{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -251,19 +251,19 @@
headheight = 15 pt
}
\bool_if:NT \g__fdu_draft_bool { \geometry { showframe } }
-\tl_new:N \g__fdu_font_set_tl
-\tl_new:N \g__fdu_cjk_font_set_tl
+\tl_new:N \g__fdu_fontset_tl
+\tl_new:N \g__fdu_cjk_fontset_tl
\keys_define:nn { fdu / style }
{
font .choices:nn =
{ garamond, libertinus, lm, palatino, times, times*, none }
- { \tl_set_eq:NN \g__fdu_font_set_tl \l_keys_choice_tl }
+ { \tl_set_eq:NN \g__fdu_fontset_tl \l_keys_choice_tl }
}
\keys_define:nn { fdu / style }
{
cjk-font .choices:nn =
{ adobe, fandol, founder, mac, sinotype, sourcehan, windows, none }
- { \tl_set_eq:NN \g__fdu_cjk_font_set_tl \l_keys_choice_tl }
+ { \tl_set_eq:NN \g__fdu_cjk_fontset_tl \l_keys_choice_tl }
}
\cs_new_protected:Npn \__fdu_setmainfont:nn #1#2
{ \__fontspec_main_setmainfont:nn {#2} {#1} }
@@ -312,6 +312,72 @@
}
\clist_map_inline:nn { main, sans, mono, math } { \__fdu_set_font_helper:n {#1} }
\clist_map_inline:nn { CJKmain, CJKsans, CJKmono } { \__fdu_set_font_helper:n {#1} }
+\tl_new:N \g__fdu_font_family_libertinus_serif_tl
+\tl_new:N \g__fdu_font_family_libertinus_sans_tl
+\tl_new:N \g__fdu_font_style_libertinus_rm_tl
+\tl_new:N \g__fdu_font_style_libertinus_bf_tl
+\tl_new:N \g__fdu_font_style_libertinus_it_tl
+\tl_new:N \g__fdu_font_style_libertinus_bfit_tl
+\tl_new:N \g__fdu_font_style_libertinus_bfsl_tl
+\tl_new:N \g__fdu_font_family_xits_tl
+\tl_new:N \g__fdu_font_style_xits_rm_tl
+\tl_new:N \g__fdu_font_style_xits_bf_tl
+\tl_new:N \g__fdu_font_style_xits_it_tl
+\tl_new:N \g__fdu_font_style_xits_bfit_tl
+\tl_new:N \g__fdu_font_name_libertinus_serif_tl
+\tl_new:N \g__fdu_font_name_libertinus_sans_tl
+\tl_new:N \g__fdu_font_name_libertinus_math_tl
+\tl_new:N \g__fdu_font_name_xits_tl
+\tl_new:N \g__fdu_font_name_xits_math_rm_tl
+\tl_new:N \g__fdu_font_name_xits_math_bf_tl
+\fontspec_font_if_exist:nTF { LibertinusSerif-Regular.otf }
+ {
+ \tl_set:Nn \g__fdu_font_family_libertinus_serif_tl { LibertinusSerif }
+ \tl_set:Nn \g__fdu_font_family_libertinus_sans_tl { LibertinusSans }
+ \tl_set:Nn \g__fdu_font_family_libertinus_math_tl { LibertinusMath }
+ \tl_set:Nn \g__fdu_font_style_libertinus_rm_tl { Regular }
+ \tl_set:Nn \g__fdu_font_style_libertinus_bf_tl { Bold }
+ \tl_set:Nn \g__fdu_font_style_libertinus_it_tl { Italic }
+ \tl_set:Nn \g__fdu_font_style_libertinus_bfit_tl { BoldItalic }
+ \tl_set:Nn \g__fdu_font_style_libertinus_bfsl_tl { BoldOblique }
+ }
+ {
+ \tl_set:Nn \g__fdu_font_family_libertinus_serif_tl { libertinusserif }
+ \tl_set:Nn \g__fdu_font_family_libertinus_sans_tl { libertinussans }
+ \tl_set:Nn \g__fdu_font_family_libertinus_math_tl { libertinusmath }
+ \tl_set:Nn \g__fdu_font_style_libertinus_rm_tl { regular }
+ \tl_set:Nn \g__fdu_font_style_libertinus_bf_tl { bold }
+ \tl_set:Nn \g__fdu_font_style_libertinus_it_tl { italic }
+ \tl_set:Nn \g__fdu_font_style_libertinus_bfit_tl { bolditalic }
+ \tl_set:Nn \g__fdu_font_style_libertinus_bfsl_tl { bolditalic }
+ }
+\fontspec_font_if_exist:nTF { XITS-Regular.otf }
+ {
+ \tl_set:Nn \g__fdu_font_family_xits_tl { XITS }
+ \tl_set:Nn \g__fdu_font_style_xits_rm_tl { Regular }
+ \tl_set:Nn \g__fdu_font_style_xits_bf_tl { Bold }
+ \tl_set:Nn \g__fdu_font_style_xits_it_tl { Italic }
+ \tl_set:Nn \g__fdu_font_style_xits_bfit_tl { BoldItalic }
+ \tl_set:Nn \g__fdu_font_name_xits_math_rm_tl { XITSMath-Regular }
+ \tl_set:Nn \g__fdu_font_name_xits_math_bf_tl { XITSMath-Bold }
+ }
+ {
+ \tl_set:Nn \g__fdu_font_family_xits_tl { xits }
+ \tl_set:Nn \g__fdu_font_style_xits_rm_tl { regular }
+ \tl_set:Nn \g__fdu_font_style_xits_bf_tl { bold }
+ \tl_set:Nn \g__fdu_font_style_xits_it_tl { italic }
+ \tl_set:Nn \g__fdu_font_style_xits_bfit_tl { bolditalic }
+ \tl_set:Nn \g__fdu_font_name_xits_math_rm_tl { xits-math }
+ \tl_set:Nn \g__fdu_font_name_xits_math_bf_tl { xits-mathbold }
+ }
+\tl_set:Nx \g__fdu_font_name_libertinus_serif_tl
+ { \g__fdu_font_family_libertinus_serif_tl - \g__fdu_font_style_libertinus_rm_tl }
+\tl_set:Nx \g__fdu_font_name_libertinus_sans_tl
+ { \g__fdu_font_family_libertinus_sans_tl - \g__fdu_font_style_libertinus_rm_tl }
+\tl_set:Nx \g__fdu_font_name_libertinus_math_tl
+ { \g__fdu_font_family_libertinus_math_tl - \g__fdu_font_style_libertinus_rm_tl }
+\tl_set:Nx \g__fdu_font_name_xits_tl
+ { \g__fdu_font_family_xits_tl - \g__fdu_font_style_xits_rm_tl }
\cs_new_protected:Npn \__fdu_load_font_garamond:
{
\__fdu_setmainfont:nn { EBGaramond }
@@ -322,13 +388,13 @@
ItalicFont = *-Italic,
BoldItalicFont = *-BoldItalic
}
- \__fdu_setsansfont:nn { libertinussans }
+ \__fdu_setsansfont:nn { \g__fdu_font_family_libertinus_sans_tl }
{
Extension = .otf,
- UprightFont = *-regular,
- BoldFont = *-bold,
- ItalicFont = *-italic,
- BoldItalicFont = *-bolditalic
+ UprightFont = *-\g__fdu_font_style_libertinus_rm_tl,
+ BoldFont = *-\g__fdu_font_style_libertinus_bf_tl,
+ ItalicFont = *-\g__fdu_font_style_libertinus_it_tl,
+ BoldItalicFont = *-\g__fdu_font_style_libertinus_bfsl_tl
}
\__fdu_setmonofont:nn { lmmonolt10 }
{
@@ -342,21 +408,21 @@
}
\cs_new_protected:Npn \__fdu_load_font_libertinus:
{
- \__fdu_setmainfont:nn { libertinusserif }
+ \__fdu_setmainfont:nn { \g__fdu_font_family_libertinus_serif_tl }
{
Extension = .otf,
- UprightFont = *-regular,
- BoldFont = *-bold,
- ItalicFont = *-italic,
- BoldItalicFont = *-bolditalic
+ UprightFont = *-\g__fdu_font_style_libertinus_rm_tl,
+ BoldFont = *-\g__fdu_font_style_libertinus_bf_tl,
+ ItalicFont = *-\g__fdu_font_style_libertinus_it_tl,
+ BoldItalicFont = *-\g__fdu_font_style_libertinus_bfit_tl
}
- \__fdu_setsansfont:nn { libertinussans }
+ \__fdu_setsansfont:nn { \g__fdu_font_family_libertinus_sans_tl }
{
Extension = .otf,
- UprightFont = *-regular,
- BoldFont = *-bold,
- ItalicFont = *-italic,
- BoldItalicFont = *-bolditalic
+ UprightFont = *-\g__fdu_font_style_libertinus_rm_tl,
+ BoldFont = *-\g__fdu_font_style_libertinus_bf_tl,
+ ItalicFont = *-\g__fdu_font_style_libertinus_it_tl,
+ BoldItalicFont = *-\g__fdu_font_style_libertinus_bfsl_tl
}
\__fdu_setmonofont:nn { lmmonolt10 }
{
@@ -366,7 +432,7 @@
ItalicFont = *-oblique,
BoldItalicFont = *-boldoblique
}
- \__fdu_setmathfont:nn { libertinusmath-regular.otf } { }
+ \__fdu_setmathfont:nn { \g__fdu_font_name_libertinus_math_tl .otf } { }
}
\cs_new_protected:Npn \__fdu_load_font_lm:
{ \__fdu_setmathfont:nn { latinmodern-math.otf } { } }
@@ -380,13 +446,13 @@
ItalicFont = *-italic,
BoldItalicFont = *-bolditalic
}
- \__fdu_setsansfont:nn { libertinussans }
+ \__fdu_setsansfont:nn { \g__fdu_font_family_libertinus_sans_tl }
{
Extension = .otf,
- UprightFont = *-regular,
- BoldFont = *-bold,
- ItalicFont = *-italic,
- BoldItalicFont = *-bolditalic,
+ UprightFont = *-\g__fdu_font_style_libertinus_rm_tl,
+ BoldFont = *-\g__fdu_font_style_libertinus_bf_tl,
+ ItalicFont = *-\g__fdu_font_style_libertinus_it_tl,
+ BoldItalicFont = *-\g__fdu_font_style_libertinus_bfsl_tl,
Scale = MatchUppercase
}
\__fdu_setmonofont:nn { lmmonolt10 }
@@ -401,17 +467,13 @@
}
\cs_new_protected:Npn \__fdu_load_font_times:
{
- \__fdu_setmainfont:nn { XITS }
+ \__fdu_setmainfont:nn { \g__fdu_font_family_xits_tl }
{
Extension = .otf,
- UprightFont = *-Regular,
- BoldFont = *-Bold,
- ItalicFont = *-Italic,
- BoldItalicFont = *-BoldItalic,
- UprightFeatures = { SmallCapsFont = *-Regular },
- BoldFeatures = { SmallCapsFont = *-Bold },
- ItalicFeatures = { SmallCapsFont = *-Italic },
- BoldItalicFeatures = { SmallCapsFont = *-BoldItalic }
+ UprightFont = *-\g__fdu_font_style_xits_rm_tl,
+ BoldFont = *-\g__fdu_font_style_xits_bf_tl,
+ ItalicFont = *-\g__fdu_font_style_xits_it_tl,
+ BoldItalicFont = *-\g__fdu_font_style_xits_bfit_tl
}
\__fdu_setsansfont:nn { texgyreheros }
{
@@ -430,7 +492,8 @@
BoldItalicFont = *-bolditalic,
Ligatures = CommonOff
}
- \__fdu_setmathfont:nn { XITSMath-Regular.otf }{ BoldFont = XITSMath-Bold.otf }
+ \__fdu_setmathfont:nn { \g__fdu_font_name_xits_math_rm_tl .otf }
+ { BoldFont = \g__fdu_font_name_xits_math_bf_tl .otf }
}
\cs_new_protected:cpn { __fdu_load_font_ times* : }
{
@@ -437,7 +500,8 @@
\__fdu_setmainfont:nn { Times~ New~ Roman } { }
\__fdu_setsansfont:nn { Arial } { }
\__fdu_setmonofont:nn { Courier~ New } { }
- \__fdu_setmathfont:nn { XITSMath-Regular.otf }{ BoldFont = XITSMath-Bold.otf }
+ \__fdu_setmathfont:nn { \g__fdu_font_name_xits_math_rm_tl .otf }
+ { BoldFont = \g__fdu_font_name_xits_math_bf_tl .otf }
}
\cs_new_protected:Npn \__fdu_load_cjk_font_adobe:
{
@@ -549,8 +613,8 @@
}
\cs_new_protected:Npn \__fdu_load_font:
{
- \use:c { __fdu_load_font_ \g__fdu_font_set_tl : }
- \use:c { __fdu_load_cjk_font_ \g__fdu_cjk_font_set_tl : }
+ \use:c { __fdu_load_font_ \g__fdu_fontset_tl : }
+ \use:c { __fdu_load_cjk_font_ \g__fdu_cjk_fontset_tl : }
}
\ctex_at_end_preamble:n { \__fdu_load_font: }
\keys_set:nn { unicode-math }
@@ -733,8 +797,7 @@
{ \__fdu_symbol:n { \int_eval:n { "24EB - 11 + #1 } } }
{ \__fdu_symbol:n { \int_eval:n { "2776 - 1 + #1 } } }
}
-\cs_new_eq:NN \__fdu_fn_symbol_libertinus_sans:n
- \__fdu_fn_symbol_libertinus:n
+\cs_new_eq:NN \__fdu_fn_symbol_libertinus_sans:n \__fdu_fn_symbol_libertinus:n
\cs_new:Npn \__fdu_fn_symbol_pifont:n #1
{ \ding { \int_eval:n { 171 + #1 } } }
\cs_new:Npn \__fdu_fn_symbol_pifont_neg:n #1
@@ -766,17 +829,17 @@
{ \int_use:N #1 }
\c__fdu_fn_style_libertinus_tl
{
- \fontspec { libertinusserif-regular.otf }
+ \fontspec { \g__fdu_font_name_libertinus_serif_tl .otf }
\__fdu_fn_symbol_libertinus:n {#1}
}
\c__fdu_fn_style_libertinus_neg_tl
{
- \fontspec { libertinusserif-regular.otf }
+ \fontspec { \g__fdu_font_name_libertinus_serif_tl .otf }
\__fdu_fn_symbol_libertinus_neg:n {#1}
}
\c__fdu_fn_style_libertinus_sans_tl
{
- \fontspec { libertinussans-regular.otf }
+ \fontspec { \g__fdu_font_name_libertinus_sans_tl .otf }
\__fdu_fn_symbol_libertinus_sans:n {#1}
}
\c__fdu_fn_style_pifont_tl
@@ -789,17 +852,17 @@
{ \__fdu_fn_symbol_pifont_sans_neg:n {#1} }
\c__fdu_fn_style_xits_tl
{
- \fontspec { XITS-Regular.otf }
+ \fontspec { \g__fdu_font_name_xits_tl .otf }
\__fdu_fn_symbol_xits:n {#1}
}
\c__fdu_fn_style_xits_sans_tl
{
- \fontspec { XITS-Regular.otf }
+ \fontspec { \g__fdu_font_name_xits_tl .otf }
\__fdu_fn_symbol_xits_sans:n {#1}
}
\c__fdu_fn_style_xits_sans_neg_tl
{
- \fontspec { XITS-Regular.otf }
+ \fontspec { \g__fdu_font_name_xits_tl .otf }
\__fdu_fn_symbol_xits_sans_neg:n {#1}
}
}
@@ -1319,9 +1382,9 @@
authorization-decl-sig / content =
\__fdu_cover_signature:N \c__fdu_auth_decl_sign_clist,
originality-decl-name / format =
- \__fdu_line_spread:n { 1.2 } \zihao { -2 } \sffamily,
+ \__fdu_line_spread:n { 1.2 } \zihao { -2 } \bfseries,
authorization-decl-name / format =
- \__fdu_line_spread:n { 1.2 } \zihao { -2 } \sffamily,
+ \__fdu_line_spread:n { 1.2 } \zihao { -2 } \bfseries,
originality-decl-name / bottom-skip = 0.4 cm,
originality-decl-text / bottom-skip = 0.4 cm,
originality-decl-sig / bottom-skip = 0 pt plus 2.5 fill,
@@ -1351,7 +1414,9 @@
{ \bool_if:NT \l__fdu_auto_make_cover_bool { \makecoveriii } }
\keys_set:nn { ctex }
{
- contentsname = \c__fdu_name_toc_tl,
+ contentsname = \c__fdu_name_toc_tl,
+ listfigurename = \c__fdu_name_lof_tl,
+ listtablename = \c__fdu_name_lot_tl,
chapter / tocline =
{
\normalfont \sffamily
@@ -1370,10 +1435,24 @@
\__fdu_patch_cmd:Nnn \tableofcontents
{
\chapter*{\contentsname
- \@mkboth{%
- \MakeUppercase\contentsname}{\MakeUppercase\contentsname}}%
+ \@mkboth{\MakeUppercase\contentsname}
+ {\MakeUppercase\contentsname}}
}
{ \__fdu_chapter_no_toc:V \contentsname }
+\__fdu_patch_cmd:Nnn \listoffigures
+ {
+ \chapter*{\listfigurename}
+ \@mkboth{\MakeUppercase\listfigurename}
+ {\MakeUppercase\listfigurename}
+ }
+ { \__fdu_chapter:V \listfigurename }
+\__fdu_patch_cmd:Nnn \listoftables
+ {
+ \chapter*{\listtablename}
+ \@mkboth{\MakeUppercase\listtablename}
+ {\MakeUppercase\listtablename}
+ }
+ { \__fdu_chapter:V \listtablename }
\NewDocumentEnvironment { abstract } { }
{ \__fdu_abstract_begin: } { \__fdu_abstract_end: }
\NewDocumentEnvironment { abstract* } { }
@@ -1493,13 +1572,13 @@
{
\tl_if_eq:VnTF \l__fdu_bib_gb_style_tl { numerical }
{
- \bibliographystyle { gbt7714-unsrt }
+ \bibliographystyle { gbt7714-numerical }
\__fdu_set_cite_style_numerical:
}
{
\tl_if_eq:VnT \l__fdu_bib_gb_style_tl { author-year }
{
- \bibliographystyle { gbt7714-plain }
+ \bibliographystyle { gbt7714-author-year }
\__fdu_set_cite_style_author_year:
\cs_set_eq:NN \cite \citep
}
@@ -1633,6 +1712,8 @@
\hypersetup
{
bookmarksnumbered = true,
+ psdextra = true,
+ unicode = true,
pdftitle = \l__fdu_info_title_tl,
pdfauthor = \l__fdu_info_author_tl,
pdfkeywords = \l__fdu_info_keywords_clist,
Modified: trunk/Master/texmf-dist/tex/latex/fduthesis/fduthesis.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fduthesis/fduthesis.def 2020-08-30 21:12:39 UTC (rev 56215)
+++ trunk/Master/texmf-dist/tex/latex/fduthesis/fduthesis.def 2020-08-30 21:12:56 UTC (rev 56216)
@@ -6,7 +6,7 @@
%%
%% fduthesis.dtx (with options: `definition')
%%
-%% Copyright (C) 2017--2019 by Xiangdong Zeng <xdzeng96 at gmail.com>
+%% Copyright (C) 2017--2020 by Xiangdong Zeng <xdzeng96 at gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -43,7 +43,7 @@
%% fduthesis-code.pdf,
%% and README.md.
%%
-\GetIdInfo $Id: fduthesis.dtx 0.7d 2019-04-03 12:00:00Z Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo $Id: fduthesis.dtx 0.7e 2020-08-30 12:00:00Z Xiangdong Zeng <xdzeng96 at gmail.com> $
{Definition file for fduthesis}
\ProvidesExplFile{\ExplFileName.def}
{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -102,6 +102,9 @@
{ author_sign } { 作者签名 },
{ supervisor_sign } { 导师签名 },
{ sign_date } { 日期 },
+ { toc } { 目 \quad 录 },
+ { lof } { 插图目录 },
+ { lot } { 表格目录 },
{ bib_en } { Bibliography },
{ pdf_creator } { LaTeX~ with~ fduthesis~ class },
{ orig_decl } { \c__fdu_name_simp_tl \\ 学位论文独创性声明 },
@@ -113,7 +116,6 @@
{ abstract } { 摘 \quad 要 } { Abstract },
{ keywords } { 关键字 } { Keywords: },
{ clc } { 中图分类号 } { CLC~ number: },
- { toc } { 目 \quad 录 } { Contents },
{ notation } { 符号表 } { List~ of~ Symbols }
}
{ \__fdu_define_name:nnn #1 }
More information about the tex-live-commits
mailing list.