summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/fduthesis
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-05-06 21:43:19 +0000
committerKarl Berry <karl@freefriends.org>2018-05-06 21:43:19 +0000
commitfb14462cfe35d61f907e883323450f54025fd11e (patch)
treef21f18cf07bc99929acc92daa61ed65bc2a27ad8 /Master/texmf-dist/source/latex/fduthesis
parent6984c854c8c804b5554284accd834f535d0a6931 (diff)
fduthesis (6may18)
git-svn-id: svn://tug.org/texlive/trunk@47628 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/fduthesis')
-rw-r--r--Master/texmf-dist/source/latex/fduthesis/fduthesis-doc.dtx75
-rw-r--r--Master/texmf-dist/source/latex/fduthesis/fduthesis.dtx81
-rw-r--r--Master/texmf-dist/source/latex/fduthesis/fduthesis.ins6
3 files changed, 108 insertions, 54 deletions
diff --git a/Master/texmf-dist/source/latex/fduthesis/fduthesis-doc.dtx b/Master/texmf-dist/source/latex/fduthesis/fduthesis-doc.dtx
index 54e7ab74558..e3f667ad3ef 100644
--- a/Master/texmf-dist/source/latex/fduthesis/fduthesis-doc.dtx
+++ b/Master/texmf-dist/source/latex/fduthesis/fduthesis-doc.dtx
@@ -96,22 +96,24 @@
\RequirePackage[UTF8, heading, sub3section, fontset = none]{ctex}
% \end{macrocode}
% 与 \pkg{hypdoc}(由 \cls{l3doc} 调用)冲突,导致脚注超链接
-% 无法正常跳转。临时禁用。
+% 无法正常跳转。暂时禁用。
% \begin{macrocode}
% \RequirePackage[stable, bottom]{footmisc}
-\RequirePackage{graphicx}
-\RequirePackage{caption}
-\RequirePackage{geometry}
-\RequirePackage{listings}
-\RequirePackage{makecell}
-\RequirePackage[toc]{multitoc}
-\RequirePackage{siunitx}
-\RequirePackage{tabularx}
-\RequirePackage{threeparttable}
-\RequirePackage{unicode-math}
-\RequirePackage{xcolor}
-\RequirePackage{xcolor-material}
-\RequirePackage{zref-base}
+\RequirePackage{%
+ caption,
+ geometry,
+ graphicx,
+ listings,
+ makecell,
+ siunitx,
+ tabularx,
+ threeparttable,
+ unicode-math,
+ xcolor,
+ xcolor-material,
+ xunicode,
+ zref-base
+}
% \end{macrocode}
%
% \subsubsection{\env{macrocode} 环境}
@@ -129,12 +131,12 @@
% \end{macrocode}
% 调整前后间距,禁止 \env{macrocode} 环境前的分页。
% \begin{macrocode}
- \topsep \MacrocodeTopsep
- \@beginparpenalty \predisplaypenalty
+ \topsep \MacrocodeTopsep
+ \@beginparpenalty \predisplaypenalty
% \end{macrocode}
% 将列表前后的附加垂直空白设为 0。根据 \cls{ctxdoc} 修改。
% \begin{macrocode}
- \partopsep \z@skip
+ \partopsep \z@skip
% \if@inlabel\leavevmode\fi
% \end{macrocode}
% 构建 \env{trivlist} 环境,设置段间距为 0。
@@ -143,35 +145,35 @@
% \tn{macro@font} 用来在不同模块见切换字体。本文档类不使用
% \tn{AltMacroFont},因此这里改用 \tn{MacroFont} 代替。
% \begin{macrocode}
- \trivlist \parskip \z@ \item[]%
+ \trivlist \parskip \z@ \item[]%
% \macro@font
- \MacroFont
- \leftskip\@totalleftmargin \advance\leftskip\MacroIndent
- \rightskip\z@ \parindent\z@ \parfillskip\@flushglue
+ \MacroFont
+ \leftskip\@totalleftmargin \advance\leftskip\MacroIndent
+ \rightskip\z@ \parindent\z@ \parfillskip\@flushglue
% \end{macrocode}
% 按照 \LaTeXe{} 中 \tn{verbatim} 环境中定义 \tn{par},使得空行
% 可以原样输出,否则空行会被吃掉。
% \begin{macrocode}
- \blank@linefalse \def\par{\ifblank@line
- \leavevmode\fi
- \blank@linetrue\@@par
- \penalty\interlinepenalty}
+ \blank@linefalse \def\par{\ifblank@line
+ \leavevmode\fi
+ \blank@linetrue\@@par
+ \penalty\interlinepenalty}
% \end{macrocode}
% \tn{obeylines} 将把回车符 |^^M| 变成 \tn{par}。
% 接下来将所有特殊符号的类别码设为 12,即“其他”类。
% \begin{macrocode}
- \obeylines
- \let\do\do@noligs \verbatim@nolig@list
- \let\do\@makeother \dospecials
+ \obeylines
+ \let\do\do@noligs \verbatim@nolig@list
+ \let\do\@makeother \dospecials
% \end{macrocode}
% 相当于退出 |\begin{list}| 和 |\begin{minipage}|。
% \begin{macrocode}
- \global\@newlistfalse
- \global\@minipagefalse
+ \global\@newlistfalse
+ \global\@minipagefalse
% \end{macrocode}
% 初始化交叉引用功能。
% \begin{macrocode}
- \init@crossref}
+ \init@crossref}
% \end{macrocode}
% \end{macro}
%
@@ -1656,6 +1658,17 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}[int]{\@multitoc@starttoc,\@starttoc}
+% 目录分栏,相当于调用 \pkg{multitoc} 宏包。
+% \begin{macrocode}
+\let\@multitoc@starttoc\@starttoc
+\renewcommand*\@starttoc[1]{%
+ \begin{multicols}{2}%
+ \@multitoc@starttoc{#1}%
+ \end{multicols}}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}[int]{\@makefntext}
% 调整脚注文本缩进。
% \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/fduthesis/fduthesis.dtx b/Master/texmf-dist/source/latex/fduthesis/fduthesis.dtx
index 15e14f125fb..86ee5ea6342 100644
--- a/Master/texmf-dist/source/latex/fduthesis/fduthesis.dtx
+++ b/Master/texmf-dist/source/latex/fduthesis/fduthesis.dtx
@@ -31,6 +31,9 @@
% fdulogo-example.tex,
% fduthesis-cover.tex,
% fduthesis-en.tex,
+% fudan-emblem.pdf,
+% fudan-emblem-new.pdf,
+% fudan-name.pdf,
% fduthesis.pdf,
% fduthesis-en.pdf,
% fduthesis-code.pdf,
@@ -46,43 +49,53 @@
The `fduthesis` Class
=====================
-*LaTeX thesis template for Fudan University, v0.7a*
+*LaTeX thesis template for Fudan University, v0.7b*
Overview
--------
-`fduthesis` is a thesis template for Fudan University. This template
-is mostly written in LaTeX3, with a simple interface for users.
+This template supports doctoral or master dissertion and undergraduate
+thesis, both in Chinese or English. With the help of modern LaTeX
+technology, `fduthesis` aims to create a simple interface, a normative
+format, as well as a hackable class for the users.
-At present, only XeTeX, LuaTeX and [ApTeX](https://github.com/clerkma/ptex-ng)
-(experimental) are supported.
+At present, `fduthesis` only supports XeTeX and LuaTeX engines.
+Support for pdfTeX and [ApTeX](https://github.com/clerkma/ptex-ng) is
+still under development. `fduthesis` only allows UTF-8 encoding.
The documentation can be found in
-[fduthesis.pdf](https://github.com/Stone-Zeng/fduthesis/releases/download/v0.7a/fduthesis.pdf)
+[fduthesis.pdf](http://mirrors.ctan.org/macros/latex/contrib/fduthesis/fduthesis.pdf)
(in Chinese) or
-[fduthesis-en.pdf](https://github.com/Stone-Zeng/fduthesis/releases/download/v0.7a/fduthesis-en.pdf)
+[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>.
+
Installation
------------
To install `fduthesis`, you can use one of the following methods:
+- If you are running TeX Live, the simplest way is to run
+
+ tlmgr install fduthesis
+
- Download
- [fduthesis.tds.zip](https://github.com/Stone-Zeng/fduthesis/releases/download/v0.7a/fduthesis.tds.zip)
- from GitHub, extract it in the root of one of your TDS trees, and
+ [fduthesis.tds.zip](http://mirror.ctan.org/install/macros/latex/contrib/fduthesis.tds.zip)
+ from CTAN, extract it in the root of one of your TDS trees, and
update the filename database.
-- Get the source (`fduthesis.zip`) from GitHub:
+- Get the source from GitHub:
git clone https://github.com/Stone-Zeng/fduthesis.git
- Run
-
- xetex fduthesis.dtx
+ Run `install-win.bat` (on Windows) or `install-linux.sh` (on Linux)
+ to generate the templates and configuration files. These files would
+ be found in a new-created `thesis` folder. You can enjoy `fduthesis`
+ here at once.
- to generate the templates and configuration files. Then move the
- following files into a directory where LaTeX will find them (e.g.
+ For permanent installation, you may move the following files into a
+ directory where LaTeX will find them (e.g.
`TEXMF/tex/latex/fduthesis/`):
- `fduthesis.cls`
@@ -90,6 +103,9 @@ To install `fduthesis`, you can use one of the following methods:
- `fduthesis.def`
- `fdudoc.cls`
- `fdulogo.sty`
+ - `fudan-emblem.pdf`
+ - `fudan-emblem-new.pdf`
+ - `fudan-name.pdf`
Do not forget to update the filename database afterwards.
@@ -157,6 +173,9 @@ Copyright (C) 2017, 2018 by Xiangdong Zeng <xdzeng96@gmail.com>.
fdulogo-example.tex,
fduthesis-cover.tex,
fduthesis-en.tex,
+ fudan-emblem.pdf,
+ fudan-emblem-new.pdf,
+ fudan-name.pdf,
fduthesis.pdf,
fduthesis-en.pdf,
fduthesis-code.pdf,
@@ -225,7 +244,7 @@ Copyright (C) 2017, 2018 by Xiangdong Zeng <xdzeng96@gmail.com>.
%<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.7a 2018-04-09 12:00:00Z Xiangdong Zeng <xdzeng96@gmail.com> $
+%<!readme>\GetIdInfo $Id: fduthesis.dtx 0.7b 2018-05-06 12:00:00Z Xiangdong Zeng <xdzeng96@gmail.com> $
%<class> {Thesis template for Fudan University}
%<class>\ProvidesExplClass{\ExplFileName}
%<class-en> {Thesis template for Fudan University (English version)}
@@ -286,6 +305,8 @@ Copyright (C) 2017, 2018 by Xiangdong Zeng <xdzeng96@gmail.com>.
% \changes{v0.7}{2018/01/31}{不再需要 \file{fduthesis-user.def}。}
% \changes{v0.7}{2018/03/04}{所有选项更改为用连字符隔开的形式。}
% \changes{v0.7a}{2018/04/09}{更新文档,发布至 CTAN。}
+% \changes{v0.7b}{2018/04/29}{支持 \TeXLive{} 2018。}
+% \changes{v0.7b}{2018/05/06}{将校名、校徽图片添加至发行版。}
%
% \CheckSum{0}
%
@@ -335,13 +356,13 @@ Copyright (C) 2017, 2018 by Xiangdong Zeng <xdzeng96@gmail.com>.
% \textbf{fduthesis: 复旦大学论文^^A
% \xpinyin[font=\sffamily]{模}{mu2}板}}}
% \author{曾祥东}
-% \date{\today \quad v0.7a^^A
+% \date{\today \quad v0.7b^^A
% \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{\today \quad v0.7a%
+%^^A! \date{\today \quad v0.7b%
%^^A! \thanks{\url{https://github.com/Stone-Zeng/fduthesis}.}}
%^^A!
%^^A! \begin{document}
@@ -541,19 +562,19 @@ Copyright (C) 2017, 2018 by Xiangdong Zeng <xdzeng96@gmail.com>.
%^^A! \subsubsection{Install manually}
%^^A!
%
-% 如果您需要从 GitHub 上自行下载并手动安装,较好的方法是使用 TDS
+% 如果您需要从 CTAN 上自行下载并手动安装,较好的方法是使用 TDS
% 安装包:
% \begin{itemize}
-% \item 从 GitHub 上下载 \cls{fduthesis} 的
-% \href{https://github.com/Stone-Zeng/fduthesis/releases/download/v0.7a/fduthesis.tds.zip}{TDS 安装包};
+% \item 从 CTAN 上下载 \cls{fduthesis} 的
+% \href{http://mirror.ctan.org/install/macros/latex/contrib/fduthesis.tds.zip}{TDS 安装包};
% \item 按目录结构将 \file{fduthesis.tds.zip} 中的文件复制到 \TeX{}
% 发行版的本地 TDS 根目录;
% \item 执行 \bashcmd{mktexlsr} 刷新文件名数据库以完成安装。
% \end{itemize}
-%^^A! If you want to download the template from GitHub and install it
+%^^A! If you want to download the template from CTAN and install it
%^^A! manually, the recommended way is to use the TDS ZIP file:
%^^A! \begin{itemize}
-%^^A! \item Download the \href{https://github.com/Stone-Zeng/fduthesis/releases/download/v0.7a/fduthesis.tds.zip}%
+%^^A! \item Download the \href{http://mirror.ctan.org/install/macros/latex/contrib/fduthesis.tds.zip}%
%^^A! {TDS ZIP file} for \cls{fduthesis};
%^^A! \item Copy all the files in \file{fduthesis.tds.zip} into the
%^^A! local TDS directory of \TeX{} distribution.
@@ -579,6 +600,9 @@ Copyright (C) 2017, 2018 by Xiangdong Zeng <xdzeng96@gmail.com>.
% 参数配置文件(\file{.def})复制到 \TeX{} 发行版本地 TDS 树
% 的 \path{texmf-local/tex/latex/fduthesis/} 目录下,并执行
% \bashcmd{mktexlsr} 刷新文件名数据库,方可完成安装。
+% \item 使用 \cls{fduthesis} 撰写论文时,您还需要从代码仓库下的
+% \file{testfiles/support} 目录中复制 \file{fudan-name.pdf}
+% 文件至工作目录,以确保封面中的校名图片可以正确显示。
% \end{itemize}
%^^A! Although not recommended, you may generate the whole template
%^^A! from source code as well:
@@ -602,6 +626,11 @@ Copyright (C) 2017, 2018 by Xiangdong Zeng <xdzeng96@gmail.com>.
%^^A! into \path{texmf-local/tex/latex/fduthesis/} under the local
%^^A! TDS tree of \TeX{} distribution. Then run \bashcmd{mktexlsr}
%^^A! to update the ls-R database.
+%^^A! \item When writing your thesis with \cls{fduthesis}, you need
+%^^A! to copy the file \file{fudan-name.pdf} (can be found in the
+%^^A! \file{testfiles/support} directory of the Git repository) to
+%^^A! your working directory, to make sure that the logo in the
+%^^A! cover can be displayed correctly.
%^^A! \end{itemize}
%^^A!
%
@@ -646,6 +675,9 @@ Copyright (C) 2017, 2018 by Xiangdong Zeng <xdzeng96@gmail.com>.
% \cls{fduthesis} 的初始参数,不建议您自行改动 \\
% \file{fdudoc.cls} & 用户手册文档类 \\
% \file{fdulogo.sty} & 复旦大学视觉识别系统 \\
+% \file{fudan-emblem.pdf} & 校徽 \\
+% \file{fudan-emblem-new.pdf} & 校徽(重修版) \\
+% \file{fudan-name.pdf} & 校名图片 \\
% \file{README.md} & 简要自述 \\
% \ifdefined\FDUCODEDOC
% \file{fduthesis.pdf} & 中文用户手册 \\
@@ -675,6 +707,9 @@ Copyright (C) 2017, 2018 by Xiangdong Zeng <xdzeng96@gmail.com>.
%^^A! for \cls{fduthesis}. Please do \emph{not} modify it. \\
%^^A! \file{fdudoc.cls} & Document class for user guides. \\
%^^A! \file{fdulogo.sty} & Fudan University's visual identity. \\
+%^^A! \file{fudan-emblem.pdf} & University emblem. \\
+%^^A! \file{fudan-emblem-new.pdf} & University emblem (revised version). \\
+%^^A! \file{fudan-name.pdf} & Figure of university name. \\
%^^A! \file{README.md} & The brief introduction. \\
%^^A! \file{fduthesis.pdf} & User's guide in Chinese. \\
%^^A! \file{fduthesis-en.pdf} & User's guide in English (this
diff --git a/Master/texmf-dist/source/latex/fduthesis/fduthesis.ins b/Master/texmf-dist/source/latex/fduthesis/fduthesis.ins
index e311d716b54..4ca66da8426 100644
--- a/Master/texmf-dist/source/latex/fduthesis/fduthesis.ins
+++ b/Master/texmf-dist/source/latex/fduthesis/fduthesis.ins
@@ -35,6 +35,9 @@
%% fdulogo-example.tex,
%% fduthesis-cover.tex,
%% fduthesis-en.tex,
+%% fudan-emblem.pdf,
+%% fudan-emblem-new.pdf,
+%% fudan-name.pdf,
%% fduthesis.pdf,
%% fduthesis-en.pdf,
%% fduthesis-code.pdf,
@@ -77,6 +80,9 @@
fdulogo-example.tex,
fduthesis-cover.tex,
fduthesis-en.tex,
+ fudan-emblem.pdf,
+ fudan-emblem-new.pdf,
+ fudan-name.pdf,
fduthesis.pdf,
fduthesis-en.pdf,
fduthesis-code.pdf,