texlive[73206] Master/texmf-dist: njuthesis (25dec24)
commits+karl at tug.org
commits+karl at tug.org
Wed Dec 25 21:55:27 CET 2024
Revision: 73206
https://tug.org/svn/texlive?view=revision&revision=73206
Author: karl
Date: 2024-12-25 21:55:27 +0100 (Wed, 25 Dec 2024)
Log Message:
-----------
njuthesis (25dec24)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/njuthesis/njuthesis.pdf
trunk/Master/texmf-dist/source/latex/njuthesis/njuthesis.dtx
trunk/Master/texmf-dist/tex/latex/njuthesis/njuthesis-doc.cls
trunk/Master/texmf-dist/tex/latex/njuthesis/njuthesis-graduate.def
trunk/Master/texmf-dist/tex/latex/njuthesis/njuthesis-postdoctoral.def
trunk/Master/texmf-dist/tex/latex/njuthesis/njuthesis-undergraduate.def
trunk/Master/texmf-dist/tex/latex/njuthesis/njuthesis.cls
Modified: trunk/Master/texmf-dist/doc/latex/njuthesis/njuthesis.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/njuthesis/njuthesis.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/njuthesis/njuthesis.dtx 2024-12-25 12:03:54 UTC (rev 73205)
+++ trunk/Master/texmf-dist/source/latex/njuthesis/njuthesis.dtx 2024-12-25 20:55:27 UTC (rev 73206)
@@ -112,7 +112,7 @@
%
%<class>\NeedsTeXFormat{LaTeX2e}
%<*!(driver|install)>
-%<+!driver>\GetIdInfo $Id: njuthesis.dtx 1.4.1 2024-04-22 00:30:00
+%<+!driver>\GetIdInfo $Id: njuthesis.dtx 1.4.2 2024-11-08 15:30:00
%<+!driver> +0800 NJU LUG <git+nju-lug-email-3104-issue- at yaoge123.cn>$
%<class> {Thesis template for Nanjing University}
%<class>\ProvidesExplClass{njuthesis}
@@ -148,7 +148,7 @@
% \thanks{E-mail: \href{mailto:git+nju-lug-email-3104-issue- at yaoge123.cn}
% {git+nju-lug-email-3104-issue- at yaoge123.cn}}}
%
-% \date{v1.4.1 \quad 2024-04-22}
+% \date{v1.4.2 \quad 2024-11-08}
%
% \changes{v0.1}{2021/09/04}{开始开发。}
% \changes{v0.2}{2021/09/07}{初步搭建了可用的模板。}
@@ -477,7 +477,7 @@
% 题，不妨使用下一小节的\emph{即时安装方法}优先载入较新的格式文件。
%
% {\color{red}|[!]|} 如果您具备相关经验\footnote{譬如熟悉命令行操作、使用的是 \TL
-% 发行版等}，可以在下载仓库内全部文件后，于该目录下运行
+% 发行版等。}，可以在下载仓库内全部文件后，于该目录下运行
% \begin{shellexample}[morekeywords={l3build},emph={install}]
% l3build install
% \end{shellexample}
@@ -691,7 +691,7 @@
% 对于已知问题的修复补丁。每个版本的更新内容记录于 Git 仓库中的
% \file{CHANGELOG.md}。除非特别提到选项变化，升级时一般无需更改 \file{.tex}
% 文件内容\footnote{在确实发生了接口变动，例如选项名称发生了更改，
-% 一种稳妥做法是将论文内容迁移至新版的 \file{njuthesis-sample.tex}}。
+% 一种稳妥做法是将论文内容迁移至新版的 \file{njuthesis-sample.tex}。}。
% 基于安装和编译方式的差异，可以按照当前工作文件夹内是否有 \file{.cls}
% 文件分别进行更新操作。
%
@@ -1166,7 +1166,7 @@
% \end{syntax}
% 题目。由于封面上提供给中文题目的横线长度有限\footnote{单行最长约为15
% 个汉字，建议总长度不超过45字，当然你也可以对照 \ref{subsubsec:modify-length}
-% 节修改横线长度}，本模板默认会自动对标题进行换行。
+% 节修改横线长度。}，本模板默认会自动对标题进行换行。
% 如果需要手动指定换行位点，请使用换行控制符（ |\\| ）。
% \end{function}
%
@@ -1482,7 +1482,7 @@
%
% 本模板继承 \pkg{ctex} 宏集提供的字形字号设置，以备不时之需。换句话说，
% 除非你有十足的把握，认为某处字体产生了偏差\footnote{在此情况下也应当
-% 直接到 GitHub 仓库反馈}，否则无需动用这些命令处理样式问题。
+% 直接到模板的 GitHub 仓库反馈。}，否则无需动用这些命令处理样式问题。
%
% \begin{function}[added=2021-09-22]{\njuline}
% \begin{syntax}
@@ -1499,7 +1499,7 @@
% 模板默认载入 \pkg{enumitem} 宏包，对三个常用列表环境内的条目间距进行压缩。
% 可以通过第 \ref{subsubsec:optional-pkg} 节提供的选项禁用该宏包。
%
-% \subsubsection{图片}
+% \subsubsection{图表}
%
% \begin{function}[added=2022-08-06]{image/path}
% \begin{syntax}
@@ -1508,6 +1508,37 @@
% 图片搜索路径，等效于 \tn{graphicspath}。这个选项仅能设置一次。
% \end{function}
%
+% 图表的标题依赖 \pkg{caption} 包进行定制。按照习惯，图片的标题在底部，
+% 表格的标题在顶部，这是通过 \tn{caption} 命令和生成图表命令的相对位置决定的。
+% \footnote{当然了，我们可以用 \pkg{float} 或者 \pkg{floatrow} 包来强制标题位置，
+% 但 \url{https://tex.stackexchange.com/q/130825} 表明如无必要勿增实体。}
+%
+% \begin{minipage}{.5\textwidth}
+% \begin{latexexample}[moretexcs={\centering,\includegraphics,\caption,\label},
+% emph={[1]figure}]
+% \begin{figure}[htbp]
+% \centering
+% \includegraphics[
+% width=.6\textwidth]{foo.pdf}
+% \caption{Figure example}
+% \label{fig:foo}
+% \end{figure}
+% \end{latexexample}
+% \end{minipage}
+% \begin{minipage}{.5\textwidth}
+% \begin{latexexample}[moretexcs={\centering,\caption,\label},
+% emph={[1]table,tabular}]
+% \begin{table}[htbp]
+% \centering
+% \caption{Table example}
+% \label{tab:foo}
+% \begin{tabular}{cc}
+% a & b \\
+% \end{tabular}
+% \end{table}
+% \end{latexexample}
+% \end{minipage}
+%
% \subsubsection{脚注}
%
% \begin{function}[added=2022-05-01,updated=2022-10-16]{footnote/style}
@@ -1773,7 +1804,7 @@
% 宋体，定义了 \env{exercise} 和 \env{solution} 两种定理环境，后者没有编号。
%
% \begin{latexexample}[moretexcs={\njusetup,\normalfont},
-% emph={[2]theorem},emph={[3]define,body-font,type}]
+% emph={[2]theorem},emph={[3]share-counter,define,body-font,type}]
% \njusetup[theorem]{
% share-counter = true ,
% define ,
@@ -2021,7 +2052,7 @@
%
% \DescribeEnv{abstract}
% \DescribeEnv{abstract*}
-% 摘要。带星号的会生成英文摘要。
+% 摘要。带星号的环境会生成英文摘要。
%
% \begin{latexexample}[emph={[1]abstract,abstract*}]
% \begin{abstract}
@@ -4822,9 +4853,9 @@
\cs_new_protected:Npn \@@_loadfont_latin_macoffice:
{
\__fontspec_main_setmainfont:nn
- { \l_@@_name_macofficefeature_clist } { times }
+ { \c_@@_name_macofficefeature_clist } { times }
\__fontspec_main_setsansfont:nn
- { \l_@@_name_macofficefeature_clist } { arial }
+ { \c_@@_name_macofficefeature_clist } { arial }
\__fontspec_main_setmonofont:nn
{ Scale = MatchLowercase } { Menlo }
}
@@ -4831,7 +4862,7 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{variable}{\l_@@_name_macofficefeature_clist}
+% \begin{variable}{\c_@@_name_macofficefeature_clist}
% 用于 \pkg{fontspec} 的 mac Office 字体特性列表。
% \begin{macrocode}
\clist_const:Nn \c_@@_name_macofficefeature_clist
@@ -5644,6 +5675,8 @@
% \end{macrocode}
% \end{macro}
%
+% \changes{v1.4}{2024/11/08}{目录选项不再会影响插图清单和表格清单。}
+%
% \begin{macro}{
% \tableofcontents,\listoffigures,\listoftables,
% tableofcontents/toc-entry,
@@ -5663,18 +5696,6 @@
% \end{macrocode}
% \end{macro}
%
-% 如果不显示主目录的条目，则插图目录和表格目录一并不显示。
-% \begin{macrocode}
-\ctex_at_end_preamble:n
- {
- \bool_if:NF \g_@@_toc_showentry_bool
- {
- \bool_gset_false:N \g_@@_lof_showentry_bool
- \bool_gset_false:N \g_@@_lot_showentry_bool
- }
- }
-% \end{macrocode}
-%
% \begin{macro}{tableofcontents/dotline}
% \changes{v1.0}{2022/08/08}{可选择是否为目录中的章名添加引导线。}
% 修改 \cls{book} 文档类中的命令以添加引导线。
@@ -6098,19 +6119,28 @@
%
% \changes{v0.12}{2021/12/06}{删除了可能导致冲突的 \pkg{floatrow}。}
% \changes{v0.18}{2022/05/08}{图表标题使用粗体。}
+% \changes{v1.4}{2024/05/07}{图表标题区分单行多行设置。}
% 图表标题样式。文字设置为五号宋体，标签设置为粗体，间隔一个全角空格。
+% 我们在这里指定了长度不满一行的标题使用居中对齐，超过一行的按正常段落
+% 方式延伸至文字区域宽度。
% \begin{macrocode}
-\DeclareCaptionStyle{njucap}
+\DeclareCaptionStyle { njucap }
+ [ justification = centering ]
{
+ justification = justified,
font = {small, bf},
- labelsep = quad,
- justification = centering
+ labelsep = quad
}
-\captionsetup [ figure ] { style = njucap }
-\captionsetup [ table ] { style = njucap }
% \end{macrocode}
+% \changes{v1.4}{2024/05/07}{软性规定标题和图表本身的位置关系。}
+% \pkg{caption} 提供的接口软性规定了标题和图表本身的\emph{位置关系}，
+% 而并不会强制改变标题位置。
+% \begin{macrocode}
+\captionsetup [ figure ] { position = below, style = njucap }
+\captionsetup [ table ] { position = above, style = njucap }
+% \end{macrocode}
%
-% \begin{macro}{\ctex_patch_cmd:Nnn}
+% \begin{macro}{\ctex_patch_cmd:cnv}
% \begin{macrocode}
\cs_generate_variant:Nn \ctex_patch_cmd:Nnn { cnv }
% \end{macrocode}
Modified: trunk/Master/texmf-dist/tex/latex/njuthesis/njuthesis-doc.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/njuthesis/njuthesis-doc.cls 2024-12-25 12:03:54 UTC (rev 73205)
+++ trunk/Master/texmf-dist/tex/latex/njuthesis/njuthesis-doc.cls 2024-12-25 20:55:27 UTC (rev 73206)
@@ -23,7 +23,7 @@
%% To produce the documentation run the original source files ending with
%% `.dtx' through XeTeX.
%%
-\GetIdInfo $Id: njuthesis.dtx 1.4.1 2024-04-22 00:30:00
+\GetIdInfo $Id: njuthesis.dtx 1.4.2 2024-11-08 15:30:00
+0800 NJU LUG <git+nju-lug-email-3104-issue- at yaoge123.cn>$
{Documentation style for njuthesis}
\ProvidesExplFile{njuthesis-doc.cls}
Modified: trunk/Master/texmf-dist/tex/latex/njuthesis/njuthesis-graduate.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/njuthesis/njuthesis-graduate.def 2024-12-25 12:03:54 UTC (rev 73205)
+++ trunk/Master/texmf-dist/tex/latex/njuthesis/njuthesis-graduate.def 2024-12-25 20:55:27 UTC (rev 73206)
@@ -23,7 +23,7 @@
%% To produce the documentation run the original source files ending with
%% `.dtx' through XeTeX.
%%
-\GetIdInfo $Id: njuthesis.dtx 1.4.1 2024-04-22 00:30:00
+\GetIdInfo $Id: njuthesis.dtx 1.4.2 2024-11-08 15:30:00
+0800 NJU LUG <git+nju-lug-email-3104-issue- at yaoge123.cn>$
{Graduate definition file for njuthesis}
\ProvidesExplFile{njuthesis-graduate.def}
Modified: trunk/Master/texmf-dist/tex/latex/njuthesis/njuthesis-postdoctoral.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/njuthesis/njuthesis-postdoctoral.def 2024-12-25 12:03:54 UTC (rev 73205)
+++ trunk/Master/texmf-dist/tex/latex/njuthesis/njuthesis-postdoctoral.def 2024-12-25 20:55:27 UTC (rev 73206)
@@ -23,7 +23,7 @@
%% To produce the documentation run the original source files ending with
%% `.dtx' through XeTeX.
%%
-\GetIdInfo $Id: njuthesis.dtx 1.4.1 2024-04-22 00:30:00
+\GetIdInfo $Id: njuthesis.dtx 1.4.2 2024-11-08 15:30:00
+0800 NJU LUG <git+nju-lug-email-3104-issue- at yaoge123.cn>$
{Postdoctoral definition file for njuthesis}
\ProvidesExplFile{njuthesis-postdoctoral.def}
Modified: trunk/Master/texmf-dist/tex/latex/njuthesis/njuthesis-undergraduate.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/njuthesis/njuthesis-undergraduate.def 2024-12-25 12:03:54 UTC (rev 73205)
+++ trunk/Master/texmf-dist/tex/latex/njuthesis/njuthesis-undergraduate.def 2024-12-25 20:55:27 UTC (rev 73206)
@@ -23,7 +23,7 @@
%% To produce the documentation run the original source files ending with
%% `.dtx' through XeTeX.
%%
-\GetIdInfo $Id: njuthesis.dtx 1.4.1 2024-04-22 00:30:00
+\GetIdInfo $Id: njuthesis.dtx 1.4.2 2024-11-08 15:30:00
+0800 NJU LUG <git+nju-lug-email-3104-issue- at yaoge123.cn>$
{Undergraduate definition file for njuthesis}
\ProvidesExplFile{njuthesis-undergraduate.def}
Modified: trunk/Master/texmf-dist/tex/latex/njuthesis/njuthesis.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/njuthesis/njuthesis.cls 2024-12-25 12:03:54 UTC (rev 73205)
+++ trunk/Master/texmf-dist/tex/latex/njuthesis/njuthesis.cls 2024-12-25 20:55:27 UTC (rev 73206)
@@ -24,7 +24,7 @@
%% `.dtx' through XeTeX.
%%
\NeedsTeXFormat{LaTeX2e}
-\GetIdInfo $Id: njuthesis.dtx 1.4.1 2024-04-22 00:30:00
+\GetIdInfo $Id: njuthesis.dtx 1.4.2 2024-11-08 15:30:00
+0800 NJU LUG <git+nju-lug-email-3104-issue- at yaoge123.cn>$
{Thesis template for Nanjing University}
\ProvidesExplClass{njuthesis}
@@ -912,9 +912,9 @@
\cs_new_protected:Npn \__nju_loadfont_latin_macoffice:
{
\__fontspec_main_setmainfont:nn
- { \l__nju_name_macofficefeature_clist } { times }
+ { \c__nju_name_macofficefeature_clist } { times }
\__fontspec_main_setsansfont:nn
- { \l__nju_name_macofficefeature_clist } { arial }
+ { \c__nju_name_macofficefeature_clist } { arial }
\__fontspec_main_setmonofont:nn
{ Scale = MatchLowercase } { Menlo }
}
@@ -1371,14 +1371,6 @@
{ listoftables } { listtable } { lot }
}
{ \__nju_define_toc_cmd:nnn #1 }
-\ctex_at_end_preamble:n
- {
- \bool_if:NF \g__nju_toc_showentry_bool
- {
- \bool_gset_false:N \g__nju_lof_showentry_bool
- \bool_gset_false:N \g__nju_lot_showentry_bool
- }
- }
\keys_define:nn { nju / tableofcontents }
{
dotline .choice:,
@@ -1570,14 +1562,15 @@
\SetTblrStyle { note } { font = \normalfont \footnotesize }
\SetTblrStyle { remark } { font = \normalfont \footnotesize }
}
-\DeclareCaptionStyle{njucap}
+\DeclareCaptionStyle { njucap }
+ [ justification = centering ]
{
+ justification = justified,
font = {small, bf},
- labelsep = quad,
- justification = centering
+ labelsep = quad
}
-\captionsetup [ figure ] { style = njucap }
-\captionsetup [ table ] { style = njucap }
+\captionsetup [ figure ] { position = below, style = njucap }
+\captionsetup [ table ] { position = above, style = njucap }
\cs_generate_variant:Nn \ctex_patch_cmd:Nnn { cnv }
\clist_map_inline:nn { figure, table, equation }
{
More information about the tex-live-commits
mailing list.