From e77721e3571e9341ee83577f574128a9f4e37c38 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 24 Apr 2023 03:04:10 +0000 Subject: CTAN sync 202304240304 --- macros/latex/contrib/preview/preview.dtx | 27 ++- macros/latex/contrib/preview/preview.pdf | Bin 332076 -> 343676 bytes macros/unicodetex/latex/bithesis/bithesis.dtx | 243 ++++++++++++++++++++++++-- macros/unicodetex/latex/bithesis/bithesis.pdf | Bin 1122629 -> 1175792 bytes 4 files changed, 237 insertions(+), 33 deletions(-) (limited to 'macros') diff --git a/macros/latex/contrib/preview/preview.dtx b/macros/latex/contrib/preview/preview.dtx index 6b21ace38e..c68ea26425 100644 --- a/macros/latex/contrib/preview/preview.dtx +++ b/macros/latex/contrib/preview/preview.dtx @@ -3,7 +3,7 @@ %% Developed as part of AUCTeX . % % Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, -% 2010, 2017-2022 Free Software Foundation +% 2010, 2017-2023 Free Software Foundation % % This program is free software; you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -20,7 +20,7 @@ % Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, % Boston, MA 02110-1301 USA % \fi -% \CheckSum{1794} +% \CheckSum{1758} % \GetFileInfo{preview.sty} % \date{\filedate} % \author{David Kastrup\thanks{\texttt{bug-auctex@gnu.org}}} @@ -429,27 +429,20 @@ % % \StopEventually{} % \section{The Implementation} -% Here we go: the start is somewhat obtuse since we figure out version -% number and date from RCS strings. This should really be done at +% We provide version and date manually. This should really be done at % docstrip time instead. Takers? % \begin{macro}{\pr@version} +% \begin{macro}{\pr@date} % \begin{macrocode} %<*style> %<*!active> -\NeedsTeXFormat{LaTeX2e} \def\reserved@a #1#2$#3: -#4${\xdef#1{\reserved@c #2#4 $}} \def\reserved@c #1 #2${#1} -\begingroup \catcode`\_=12 -\reserved@a\pr@version $Name: release_13_1 $ \ifx\pr@version\@empty -\reserved@a\pr@version CVS-$Revision: 1.126 $ \endgroup \else - \def\next release_{} \lccode`\_=`. - \edef\next{\lowercase{\endgroup - \def\noexpand\pr@version{\expandafter\next\pr@version}}} \next \fi -\reserved@a\next $Date: 2017/04/24 13:20:00 $ -\edef\next{\noexpand\ProvidesPackage{preview}% - [\next\space \pr@version\space (AUCTeX/preview-latex)]} -\next +\NeedsTeXFormat{LaTeX2e} +\def\pr@version{13.2} +\def\pr@date{2023/01/17} +\ProvidesPackage{preview}[\pr@date\space \pr@version\space (AUCTeX/preview-latex)] % \end{macrocode} % \end{macro} +% \end{macro} % Since many parts here will not be needed as long as the package is % inactive, we will include them enclosed with |<*active>| and % || guards. That way, we can append all of this stuff at a @@ -1676,7 +1669,7 @@ Please complain to your document class author}% % 7{currentfile token not{stop}if 65781.76 div })) pop} % \end{macrocode} % The ``userdict'' at the start of the last special is also there to -% avoid an unknown special in dvipng<=1.6. This is the end of the +% avoid an unknown special in dvipng$<=1.6$. This is the end of the % backwards-compatibility code. % \begin{macrocode} % \special{!userdict begin/bop-hook{% diff --git a/macros/latex/contrib/preview/preview.pdf b/macros/latex/contrib/preview/preview.pdf index 6c8c2d1446..294804eae8 100644 Binary files a/macros/latex/contrib/preview/preview.pdf and b/macros/latex/contrib/preview/preview.pdf differ diff --git a/macros/unicodetex/latex/bithesis/bithesis.dtx b/macros/unicodetex/latex/bithesis/bithesis.dtx index 22a8da4f86..45f675c4f2 100644 --- a/macros/unicodetex/latex/bithesis/bithesis.dtx +++ b/macros/unicodetex/latex/bithesis/bithesis.dtx @@ -21,7 +21,7 @@ %\ProvidesExplClass{bithesis} %\ProvidesExplClass{bitreport} %\ProvidesExplClass{bitbeamer} -%{2023-04-14}{3.5.2}{BIT Thesis Templates} +%{2023-04-23}{3.5.3}{BIT Thesis Templates} % %\NeedsTeXFormat{LaTeX2e}[2020/10/01] %\ProvidesClass{bitbook} @@ -30,7 +30,7 @@ % [2022/05/09 v2.1.1 BIT Thesis Templates] % %<*driver> -\ProvidesFile{bithesis.dtx}[2023/04/14 3.5.2 BIT Thesis Templates] +\ProvidesFile{bithesis.dtx}[2023/04/23 3.5.3 BIT Thesis Templates] \documentclass[letterpaper]{l3doc} \usepackage{dtx-style} @@ -163,7 +163,7 @@ % TeX Live、MiKTeX 等。 % \item[文档类] 文档类指代一类以 |.cls| 结尾的文件,它们定义了文档的基本结构, % 通常包括文档的标题、作者、日期、页眉、页脚、正文样式等等。 -% 你可以通过 \cs{documentclass} 命令来指定文档类。 +% 你可以通过 \tn{documentclass} 命令来指定文档类。 % 没错,|bithesis| 为你提供的模板功能就是通过数个文档类实现的。 % \end{description} % @@ -1163,6 +1163,110 @@ % (Windows 和 MacOS 自带,Linux 需要用户自行安装) % \end{function} % +% \begin{function}[added=2023-04-22]{misc/tabularFontSize} +% \begin{bitsyntax}[emph={[1]tabularFontSize}] +% tabularFontSize = (*(5)|其他字号*) +% \end{bitsyntax} +% +% \textit{此选项一般不需要用户自行修改。} +% +% 此选项用于调整表格中的字号。默认值为 5 号字。 +% +% 如果你需要临时调整表格中的字号,可以使用 |\BITSetup| 命令 +% 在局部范围内覆盖此选项(注意使用大括号)。 +% +% \begin{latex} +% { +% \BITSetup{ misc / tabularFontSize = -4} +% +% \begin{table}[hbt] +% \centering +% \caption{水系聚氨酯分类} \label{tab:category} +% \begin{tabular*}{0.9\textwidth}{@{\extracolsep{\fill}}cccc} +% \toprule +% 类别 &水溶型 &胶体分散型 &乳液型 \\ +% \midrule +% 状态 &溶解$\sim$胶束 &分散 &白浊 \\ +% 外观 &水溶型 &胶体分散型 &乳液型 \\ +% 粒径$/\mu m$ &$<0.001$ &$0.001-0.1$ &$>0.1$ \\ +% 重均分子量 &$1000\sim 10000$ &数千$\sim 20$万 &$>5000$ \\ +% \bottomrule +% \end{tabular*} +% \end{table} +% } +% \end{latex} +% \end{function} +% +% \begin{function}[added=2023-04-22]{misc/autoref/algo, misc/autoref/them, misc/autoref/lem, +% misc/autoref/prop, misc/autoref/cor, misc/autoref/axi, misc/autoref/defn, misc/autoref/conj, +% misc/autoref/exmp, misc/autoref/case, misc/autoref/rem} +% \begin{bitsyntax}[emph={[1]tabularFontSize}] +% autoref = { +% algo = (*(算法)|\marg{字符串}*), +% them = (*(定理)|\marg{字符串}*), +% lem = (*(引理)|\marg{字符串}*), +% prop = (*(命题)|\marg{字符串}*), +% cor = (*(推论)|\marg{字符串}*), +% axi = (*(公理)|\marg{字符串}*), +% defn = (*(定义)|\marg{字符串}*), +% conj = (*(猜想)|\marg{字符串}*), +% exmp = (*(例)|\marg{字符串}*), +% case = (*(情形)|\marg{字符串}*), +% rem = (*(备注)|\marg{字符串}*), +% } +% \end{bitsyntax} +% +% \textit{此选项一般不需要用户自行修改。} +% +% 此选项用于定义 |autoref| 命令的输出格式。英文模板中, +% 默认值会自动变成相应的英文格式(如|Figure|)。 +% +% \textit{此选项的默认值实际上是受到 \autoref{sec:const} 中 |const/autoref/xxx| \\ +% (如 \cmd{misc/autoref/algo})选项的影响。} +% +% \end{function} +% +% \subsubsection{常量名称覆盖} +% \label{sec:const} +% +% 在\BIThesis{} 中,模板定义了很多常量字符串,如页眉文字、章节名称等。 +% 你可以通过修改这里的选项来覆盖这些常量。 +% +% \begin{function}{const} +% \begin{bitsyntax}[emph={[1]const}] +% const = (*\marg{键值列表}*) +% const/(*\meta{key}*) = (*\meta{value}*) +% \end{bitsyntax} +% +% 该选项包含许多子项目,用于调整其他选项。具体内容见下: +% \end{function} +% +% \begin{variable}[added=2023-04-22]{const/autoref/algo,const/autoref/them, +% const/autoref/lem,const/autoref/prop,const/autoref/cor,const/autoref/axi, +% const/autoref/defn,const/autoref/conj,const/autoref/exmp, +% const/autoref/case,const/autoref/rem} +% \begin{bitsyntax}[emph={[1]tabularFontSize}] +% autoref = { +% algo = (*(算法)|\marg{字符串}*), +% them = (*(定理)|\marg{字符串}*), +% lem = (*(引理)|\marg{字符串}*), +% prop = (*(命题)|\marg{字符串}*), +% cor = (*(推论)|\marg{字符串}*), +% axi = (*(公理)|\marg{字符串}*), +% defn = (*(定义)|\marg{字符串}*), +% conj = (*(猜想)|\marg{字符串}*), +% exmp = (*(例)|\marg{字符串}*), +% case = (*(情形)|\marg{字符串}*), +% rem = (*(备注)|\marg{字符串}*), +% } +% \end{bitsyntax} +% +% \textit{此选项一般不需要用户自行修改。} +% +% 此选项用于定义 |autoref| 命令的输出格式。英文模板中, +% 默认值会自动变成相应的英文格式(如|Figure|)。 +% +% \end{variable} % \section{正文编写} % % 请注意,请在\env{document} 之内使用以下命令 。 @@ -1523,6 +1627,31 @@ % \item 在 Windows 系统下编译最终的 PDF 文件。 % \end{itemize} % +% \subsection{列表项的间距过大该如何解决?} +% +% 相比 Word,$\LaTeX$ 的列表项间距会比行间距更大一些。 +% 这样做在一个列表项中包含多行时,可以更好地区分不同的列表项。 +% 但是,如果你只是想要一个简单的列表,这种间距可能会显得过大。 +% 想要\textbf{临时}取消这种间距,可以在环境中添加选项 |nosep|: +% +% \begin{latex} +% \begin{itemize}[nosep] +% \item 选项一 +% \item 选项二 +% \end{itemize} +% \end{latex} +% +% 想要\textbf{永久}取消这种间距,可以在导言区添加如下代码: +% +% \begin{latex} +% \setlist{nosep} +% \end{latex} +% +% 详见:https://github.com/BITNP/BIThesis/issues/293 +% +% \textit{以上功能由 \pkg{enumitem} 宏包支持。通过导入 \pkg{bithesis} +% ,该宏包已经被自动导入。} +% % \section{\cls{bitreport.cls} 使用与配置} % \label{sec:bitreport} % @@ -2168,6 +2297,17 @@ % TODO: Not so sure about the translation. {resume} {作者简介} {Author~Biography}, {symbols} {主要符号对照表} {Nomenclature}, + {algo} {算法} {Algorithm}, + {them} {定理} {Theorem}, + {lem} {引理} {Lemma}, + {prop} {命题} {Proposition}, + {cor} {推论} {Corollary}, + {axi} {公理} {Axiom}, + {defn} {定义} {Definition}, + {conj} {猜想} {Conjecture}, + {exmp} {例} {Example}, + {case} {情形} {Case}, + {rem} {注} {Remark}, } {\@@_define_label:nnn #1} % \end{macrocode} @@ -2205,6 +2345,7 @@ TOC .meta:nn = { bithesis / TOC } {#1}, appendices .meta:nn = { bithesis / appendices } {#1}, publications .meta:nn = { bithesis / publications } {#1}, + const .meta:nn = { bithesis / const } {#1}, } % \end{macrocode} % @@ -2333,7 +2474,61 @@ % \begin{macrocode} \keys_define:nn { bithesis / misc } { + % 表格字体大小,默认为 5 号字体。 + tabularFontSize .tl_set:N = \l_@@_misc_tabular_font_size_tl, + tabularFontSize .initial:n = {5}, arialFont .tl_set:N = \l_@@_misc_arial_font_path_tl, + autoref / algo .tl_set:N = \algoautorefname, + autoref / algo .initial:n = {\g_@@_const_autoref_algo_tl}, + autoref / them .tl_set:N = \themautorefname, + autoref / them .initial:n = {\g_@@_const_autoref_them_tl}, + autoref / lem .tl_set:N = \lemautorefname, + autoref / lem .initial:n = {\g_@@_const_autoref_lem_tl}, + autoref / prop .tl_set:N = \propautorefname, + autoref / prop .initial:n = {\g_@@_const_autoref_prop_tl}, + autoref / cor .tl_set:N = \corautorefname, + autoref / cor .initial:n = {\g_@@_const_autoref_cor_tl}, + autoref / axi .tl_set:N = \axiautorefname, + autoref / axi .initial:n = {\g_@@_const_autoref_axi_tl}, + autoref / defn .tl_set:N = \defnautorefname, + autoref / defn .initial:n = {\g_@@_const_autoref_defn_tl}, + autoref / conj .tl_set:N = \conjautorefname, + autoref / conj .initial:n = {\g_@@_const_autoref_conj_tl}, + autoref / exmp .tl_set:N = \exmpautorefname, + autoref / exmp .initial:n = {\g_@@_const_autoref_exmp_tl}, + autoref / case .tl_set:N = \caseautorefname, + autoref / case .initial:n = {\g_@@_const_autoref_case_tl}, + autoref / rem .tl_set:N = \remautorefname, + autoref / rem .initial:n = {\g_@@_const_autoref_rem_tl}, + } +% \end{macrocode} +% +% 定义 |bithesis/const| 键值对类。 +% \begin{macrocode} +\keys_define:nn { bithesis / const } + { + autoref / algo .tl_set:N = \g_@@_const_autoref_algo_tl, + autoref / algo .initial:n = {\@@_get_const:N {algo}}, + autoref / them .tl_set:N = \g_@@_const_autoref_them_tl, + autoref / them .initial:n = {\@@_get_const:N {them}}, + autoref / lem .tl_set:N = \g_@@_const_autoref_lem_tl, + autoref / lem .initial:n = {\@@_get_const:N {lem}}, + autoref / prop .tl_set:N = \g_@@_const_autoref_prop_tl, + autoref / prop .initial:n = {\@@_get_const:N {prop}}, + autoref / cor .tl_set:N = \g_@@_const_autoref_cor_tl, + autoref / cor .initial:n = {\@@_get_const:N {cor}}, + autoref / axi .tl_set:N = \g_@@_const_autoref_axi_tl, + autoref / axi .initial:n = {\@@_get_const:N {axi}}, + autoref / defn .tl_set:N = \g_@@_const_autoref_defn_tl, + autoref / defn .initial:n = {\@@_get_const:N {defn}}, + autoref / conj .tl_set:N = \g_@@_const_autoref_conj_tl, + autoref / conj .initial:n = {\@@_get_const:N {conj}}, + autoref / exmp .tl_set:N = \g_@@_const_autoref_exmp_tl, + autoref / exmp .initial:n = {\@@_get_const:N {exmp}}, + autoref / case .tl_set:N = \g_@@_const_autoref_case_tl, + autoref / case .initial:n = {\@@_get_const:N {case}}, + autoref / rem .tl_set:N = \g_@@_const_autoref_rem_tl, + autoref / rem .initial:n = {\@@_get_const:N {rem}}, } % \end{macrocode} @@ -2956,6 +3151,17 @@ } \setstretch{1.53} \pagestyle{BIThesis} + + % 表格内容默认使用五号字。 + % + % 由于这种方式会影响所有的表格, + % 所以我们尽可能延迟这种影响。 + % + % 不过,在目前的代码实现中没有在封面 + % 之类的地方使用表格,所以目前即使放在 + % preamble 中也不会有影响。 + \AtBeginEnvironment{tabular}{\zihao{\l_@@_misc_tabular_font_size_tl}} + \AtBeginEnvironment{tabular*}{\zihao{\l_@@_misc_tabular_font_size_tl}} } % \end{macrocode} % \end{macro} @@ -3040,11 +3246,11 @@ % \begin{macro}{\thefigure,\thetable,\theequation,\thelstlisting,\lstlistingname} % 定义各种计数器的格式。 % \begin{macrocode} -% figure +% 图片:五号字。 \cs_set:Npn \thefigure {\thechapter\g_@@_label_divide_char_tl\arabic{figure}} \captionsetup[figure]{font=small,labelsep=space} -% table +% 表格:五号字。 \cs_set:Npn \thetable {\thechapter\g_@@_label_divide_char_tl\arabic{table}} \captionsetup[table]{font=small,labelsep=space} @@ -3103,19 +3309,19 @@ % 预定义用户常用的证明环境。 % \begin{macrocode} \theoremstyle{plain} - \newtheorem{algo}{算法}[chapter] - \newtheorem{them}{定理}[chapter] - \newtheorem{lem}[them]{引理} - \newtheorem{prop}[them]{命题} - \newtheorem{cor}[them]{推论} - \newtheorem{axi}[them]{公理} + \newtheorem{algo}{\@@_get_const:N {algo}}[chapter] + \newtheorem{them}{\@@_get_const:N {them}}[chapter] + \newtheorem{lem}{\@@_get_const:N {lem}}[chapter] + \newtheorem{prop}{\@@_get_const:N {prop}}[chapter] + \newtheorem{cor}{\@@_get_const:N {cor}}[chapter] + \newtheorem{axi}{\@@_get_const:N {axi}}[chapter] \theoremstyle{definition} - \newtheorem{defn}{定义}[chapter] - \newtheorem{conj}{猜想}[chapter] - \newtheorem{exmp}{例}[chapter] - \newtheorem{case}{情形} + \newtheorem{defn}{\@@_get_const:N {defn}}[chapter] + \newtheorem{conj}{\@@_get_const:N {conj}}[chapter] + \newtheorem{exmp}{\@@_get_const:N {exmp}}[chapter] + \newtheorem{case}{\@@_get_const:N {case}} \theoremstyle{remark} - \newtheorem{rem}{注} + \newtheorem{rem}{\@@_get_const:N {rem}} \renewcommand{\qedsymbol}{\ensuremath{\blacksquare}} % \end{macrocode} % @@ -6541,6 +6747,11 @@ footskip=0.7cm% 页脚 1.8cm % pdfdisplaydoctitle = true }% +\renewcommand{\subsectionautorefname}{小节} +\renewcommand{\subsubsectionautorefname}{小节} +\renewcommand{\sectionautorefname}{节} +\renewcommand{\chapterautorefname}{章} + \newcommand{\BIThesisLaTeX}{{\BIThesis}北京理工大学学位论文及报告{\LaTeX}模板} \newcommand{\BIThesisMacroPackage}{{\BIThesis}宏包} \newcommand{\BIThesisWiki}{{\BIThesis}在线文档} diff --git a/macros/unicodetex/latex/bithesis/bithesis.pdf b/macros/unicodetex/latex/bithesis/bithesis.pdf index bfd522ef65..aff4f4217e 100644 Binary files a/macros/unicodetex/latex/bithesis/bithesis.pdf and b/macros/unicodetex/latex/bithesis/bithesis.pdf differ -- cgit v1.2.3