diff options
author | Norbert Preining <norbert@preining.info> | 2021-04-18 03:01:04 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2021-04-18 03:01:04 +0000 |
commit | 1cb659efaeb0261c3f5267df4f47b6ad4d673f48 (patch) | |
tree | ff0f0a7727b3caa205f65e211239de226d5398d3 /macros/latex/contrib | |
parent | 8ca7af6e140fdaee415715e4a537d8f1a9305198 (diff) |
CTAN sync 202104180301
Diffstat (limited to 'macros/latex/contrib')
25 files changed, 113 insertions, 66 deletions
diff --git a/macros/latex/contrib/acmart/README b/macros/latex/contrib/acmart/README index d5850e46f7..9b623902ff 100644 --- a/macros/latex/contrib/acmart/README +++ b/macros/latex/contrib/acmart/README @@ -285,4 +285,5 @@ Version 1.75. \country is now obligatory for addresses. Version 1.76. Added many journal abbreviations to the bst. New experimental option: pbalance ORCID linking code -
\ No newline at end of file + +Version 1.77. Changed the way to typset multiple affiliations (Christoph Sommer)
\ No newline at end of file diff --git a/macros/latex/contrib/acmart/acmart.dtx b/macros/latex/contrib/acmart/acmart.dtx index e8089a3910..c0e62e554c 100644 --- a/macros/latex/contrib/acmart/acmart.dtx +++ b/macros/latex/contrib/acmart/acmart.dtx @@ -140,6 +140,7 @@ % David Shamma, % Gabriel Scherer, % Kartik Singhal, +% Christoph Sommer, % Stephen Spencer, % Shin Hwei Tan, % Daniel Thomas, @@ -1906,7 +1907,7 @@ \ProvidesFile{acmart.dtx} %</gobble> %<class>\ProvidesClass{acmart} -[2021/02/21 v1.76 Typesetting articles for the Association for Computing Machinery] +[2021/04/16 v1.77 Typesetting articles for the Association for Computing Machinery] % \end{macrocode} % % \changes{v1.00}{2016/04/14}{First released version} @@ -6195,6 +6196,7 @@ % \begin{macro}{\@mkauthorsaddresses} % \changes{v1.46}{2017/08/27}{Introduced macro} % \changes{v1.65}{2019/10/13}{Deleted cs{@addpunct}} +% \changes{v1.77}{2021/04/16}{New separator of institutions} % Typesetting authors' addresses in the footnote style % \begin{macrocode} \def\@mkauthorsaddresses{% @@ -6206,12 +6208,13 @@ \def\streetaddress##1{\unskip, ##1}% \def\postcode##1{\unskip, ##1}% \def\position##1{\unskip\ignorespaces}% - \def\institution##1{\unskip, ##1}% + \gdef\@ACM@institution@separator{, }% + \def\institution##1{\unskip\@ACM@institution@separator ##1\gdef\@ACM@institution@separator{ and }}% \def\city##1{\unskip, ##1}% \def\state##1{\unskip, ##1}% \renewcommand\department[2][0]{\unskip\@addpunct, ##2}% \def\country##1{\unskip, ##1}% - \def\and{\unskip; }% + \def\and{\unskip; \gdef\@ACM@institution@separator{, }}% \def\@author##1{##1}% \def\email##1##2{\unskip, \nolinkurl{##2}}% \addresses diff --git a/macros/latex/contrib/acmart/acmart.pdf b/macros/latex/contrib/acmart/acmart.pdf Binary files differindex 778ee57b72..c6d2536d6a 100644 --- a/macros/latex/contrib/acmart/acmart.pdf +++ b/macros/latex/contrib/acmart/acmart.pdf diff --git a/macros/latex/contrib/acmart/acmguide.pdf b/macros/latex/contrib/acmart/acmguide.pdf Binary files differindex 5f74086d59..b78e8dc8b5 100644 --- a/macros/latex/contrib/acmart/acmguide.pdf +++ b/macros/latex/contrib/acmart/acmguide.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf b/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf Binary files differindex e451d810ee..d82e7482eb 100644 --- a/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf +++ b/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf b/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf Binary files differindex b7450c8fd5..113cc1abbd 100644 --- a/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf +++ b/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdf b/macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdf Binary files differindex 255345f4d8..1906e776a7 100644 --- a/macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdf +++ b/macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf b/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf Binary files differindex 878ff72cea..27aae47e2d 100644 --- a/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf +++ b/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-acmtog.pdf b/macros/latex/contrib/acmart/samples/sample-acmtog.pdf Binary files differindex 2c88ef5a4a..91359df33c 100644 --- a/macros/latex/contrib/acmart/samples/sample-acmtog.pdf +++ b/macros/latex/contrib/acmart/samples/sample-acmtog.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-authordraft.pdf b/macros/latex/contrib/acmart/samples/sample-authordraft.pdf Binary files differindex 6a4d4115cb..c2c9075ba6 100644 --- a/macros/latex/contrib/acmart/samples/sample-authordraft.pdf +++ b/macros/latex/contrib/acmart/samples/sample-authordraft.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-lualatex.pdf b/macros/latex/contrib/acmart/samples/sample-lualatex.pdf Binary files differindex 20b03c985e..0b4fbd4d3d 100644 --- a/macros/latex/contrib/acmart/samples/sample-lualatex.pdf +++ b/macros/latex/contrib/acmart/samples/sample-lualatex.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-manuscript.pdf b/macros/latex/contrib/acmart/samples/sample-manuscript.pdf Binary files differindex 03cca1589c..effe8aa896 100644 --- a/macros/latex/contrib/acmart/samples/sample-manuscript.pdf +++ b/macros/latex/contrib/acmart/samples/sample-manuscript.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-sigconf.pdf b/macros/latex/contrib/acmart/samples/sample-sigconf.pdf Binary files differindex e1b6a010d9..5a9c0f6cf8 100644 --- a/macros/latex/contrib/acmart/samples/sample-sigconf.pdf +++ b/macros/latex/contrib/acmart/samples/sample-sigconf.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-sigplan.pdf b/macros/latex/contrib/acmart/samples/sample-sigplan.pdf Binary files differindex 830baea1a8..2237485dcc 100644 --- a/macros/latex/contrib/acmart/samples/sample-sigplan.pdf +++ b/macros/latex/contrib/acmart/samples/sample-sigplan.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-xelatex.pdf b/macros/latex/contrib/acmart/samples/sample-xelatex.pdf Binary files differindex a4cc1f8f39..74fcfe089f 100644 --- a/macros/latex/contrib/acmart/samples/sample-xelatex.pdf +++ b/macros/latex/contrib/acmart/samples/sample-xelatex.pdf diff --git a/macros/latex/contrib/easybook/doc/chapter1.tex b/macros/latex/contrib/easybook/doc/chapter1.tex index 2a64571f75..d6c964f4eb 100644 --- a/macros/latex/contrib/easybook/doc/chapter1.tex +++ b/macros/latex/contrib/easybook/doc/chapter1.tex @@ -48,10 +48,10 @@ \begin{figure}[htbp] \centering \subcaptionbox{并排子图1} - {\includegraphics[width=0.4\textwidth]{example-image-4x3}} + {\includegraphics[width = 0.4\textwidth]{example-image-4x3}} \hspace{1.2em} \subcaptionbox{并排子图2} - {\includegraphics[width=0.4\textwidth]{example-image-4x3}} + {\includegraphics[width = 0.4\textwidth]{example-image-4x3}} \bicaption[使用 subcaption 排版子图]{使用 subcaption 宏包的 subcaptionbox 命令排版子图}[Use subcaption to typeset subgraphs]{Use the subcaptionbox command of the subcaption package to typeset sub-pictures}\label{fig:example} \end{figure} diff --git a/macros/latex/contrib/easybook/doc/easybook-demo.pdf b/macros/latex/contrib/easybook/doc/easybook-demo.pdf Binary files differindex d643457c98..9d626ff452 100644 --- a/macros/latex/contrib/easybook/doc/easybook-demo.pdf +++ b/macros/latex/contrib/easybook/doc/easybook-demo.pdf diff --git a/macros/latex/contrib/easybook/doc/easybook-demo.tex b/macros/latex/contrib/easybook/doc/easybook-demo.tex index c1f6df2024..8940bd758d 100644 --- a/macros/latex/contrib/easybook/doc/easybook-demo.tex +++ b/macros/latex/contrib/easybook/doc/easybook-demo.tex @@ -104,7 +104,7 @@ \url{https://latexstudio.net} \\ \url{https://gitee.com/texl3/easybook}\thanks{Gitee为项目的主要发布地址。} } -\date{2021/04/12\hskip\ccwd\relax v1.24l} +\date{2021/04/17\hskip\ccwd\relax v1.24m} \frontmatter[roman] \maketitle diff --git a/macros/latex/contrib/easybook/doc/easybook.pdf b/macros/latex/contrib/easybook/doc/easybook.pdf Binary files differindex 02a75ebd24..07582b235b 100644 --- a/macros/latex/contrib/easybook/doc/easybook.pdf +++ b/macros/latex/contrib/easybook/doc/easybook.pdf diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx index 05282d5c78..09fa1194ae 100644 --- a/macros/latex/contrib/easybook/easybook.dtx +++ b/macros/latex/contrib/easybook/easybook.dtx @@ -55,7 +55,7 @@ The latest version of this license is in % % \title{\sffamily easybook 书籍文档类} % \author{瞿毅} -% \date{2021/04/12\hskip\ccwd\relax v1.24l\thanks{\url{https://gitee.com/texl3/easybook}}} +% \date{2021/04/17\hskip\ccwd\relax v1.24m\thanks{\url{https://gitee.com/texl3/easybook}}} % \maketitle % \begin{abstract} % \cls{easybook} 是基于 \cls{ctexbook} 书籍文档类创建以极简为风格的模板,可以看作对 \cls{ctexbook} 的进一步包装。虽然\CTeX 文档类提供了较好的中文支持,但想实现个性化功能一般需要在其基础上载入更多宏包来定制。\cls{easybook} 考虑了一些细节并载入一些常用宏包实现一般的排版需求,它适用于排版中英文书籍或笔记,甚至可稍加调整成为学位论文模板。 @@ -174,7 +174,7 @@ The latest version of this license is in % \end{syntax} % \opt{multoc} 与 \opt{style/multoc} 选项具有相同的效果,但是具有优先性且可单独设置不同目录是否双栏排版。已经预置了中英文的目录标题,可以使用 \opt{title} 选项更改目录标题的名称。\opt{book} 选项使目录标题按照 \opt{chapter} 级别输出,\opt{article} 选项使目录标题按照 \opt{article} 级别输出,默认为 \opt{chapter} 级别。 % \changes{v1.23}{2021/03/15}{为几个目录增加键值列表的选项,可设置标题输出级别以及是否加入主目录。} -% \changes{v1.24l}{2021/04/04}{目录命令的可选参数增加标题键值。} +% \changes{v1.24m}{2021/04/04}{目录命令的可选参数增加标题键值。} % \end{function} % % \section{接口选项} @@ -265,7 +265,7 @@ The latest version of this license is in % \ding{229} 以上选项路径为 \opt{link/...} \\ % \opt{link} 将超链接选项(包括以上选项)交给 \pkg{hyperref} 处理,除了一些关于 pdf 书签的选项可能会失效,其它由键值选项命令 \tn{hypersetup} 支持的多数选项可用。 % \changes{v1.10}{2021/01/08}{修复了 \opt{linktopage} 选项关闭时目录中标题编号无超链接的问题。} -% \changes{v1.24l}{2021/04/05}{增加 \pkg{hyperref} 超链接选项完整的支持。} +% \changes{v1.24m}{2021/04/05}{增加 \pkg{hyperref} 超链接选项完整的支持。} % \end{function} % % \begin{optdesc} @@ -342,7 +342,7 @@ The latest version of this license is in % \ding{229} 以上选项路径为 \opt{bibset/...} % \changes{v1.21}{2021/01/11}{增加 \opt{bibset} 选项,可以使用 \hologo{BibTeX} 或 \hologo{biber} 编译参考文献。} % \changes{v1.23}{2021/02/23}{使用 \opt{bibset} 选项时可设置标注风格。} -% \changes{v1.24l}{2021/04/09}{可以不载入参考文献包手动配置参考文献格式。} +% \changes{v1.24m}{2021/04/09}{可以不载入参考文献包手动配置参考文献格式。} % \end{function} % % \begin{optdesc} @@ -398,8 +398,8 @@ The latest version of this license is in % \item[within] 定理编号跟随的计数器,默认跟随章的编号,也可以跟随其它定理环境的编号,当计数器增加时定理编号会从零开始,空置时不跟随其它计数器。 % \item[headpunct] 定理标题末尾后的标记,在换行符或第一段内容的间隔之前。 % \item[bodyfont] 定理内容部分的字体。 -% \item[notefont] 定理副标题内容的字体。 -% \item[headfont] 定理种类标题名的字体。 +% \item[notefont] 定理题注部分的字体。 +% \item[headfont] 定理标题部分的字体。 % \item[headindent] 定理标题的缩进,默认无缩进,可用 \tn{parindent} 命令设置为段落缩进。 % \item[spaceabove] 定理环境前的间距。 % \item[spacebelow] 定理环境后的间距。 @@ -490,7 +490,7 @@ The latest version of this license is in % \changes{v1.21}{2021/01/13}{增加配置页眉页脚的选项。} % \changes{v1.23}{2021/03/08}{优化页眉页脚设置,增加 \opt{chap-mark} 和 \opt{sec-mark} 标志选项。} % \changes{v1.23}{2021/03/14}{可以手动绘制页眉、页脚和脚注的横线。} -% \changes{v1.24l}{2021/04/09}{增加 \opt{subsec-mark} 标志选项,仅在 \opt{article} 模式生效。} +% \changes{v1.24m}{2021/04/09}{增加 \opt{subsec-mark} 标志选项,仅在 \opt{article} 模式生效。} % \end{function} % % \begin{function}[added = 2021-01-13,updated = 2021-03-14]{\easyhead,\easyfoot} @@ -560,8 +560,8 @@ The latest version of this license is in % line-align = <(true)|false> % \end{syntax} % \opt{lolskip} 是代码目录中章之间的代码标题的距离,与\CTeX 的表格目录和图片目录中章之间的标题距离选项 \opt{lotskip} 和 \opt{lofskip} 类似,它们的值均默认0.8 pc,在 \opt{article} 模式中此选项失效。目录标签整体使用 \opt{tocline} 设置,也可使用小节 \ref{subsec:page margins} 的 \opt{list-labelsep} 选项只设置编号与标题的间距。在图表标签的参数中,\#1与\#2分别代表编号和标题,代码标签的编号和标题则是 \tn{thelstlisting} 和 \tn{lstcaption},标签中还可包含标签名称,默认标签名称与图、表和代码环境的标题名称一致。下面举个设置标签的例子 -% \changes{v1.24l}{2021/04/05}{可以设置图、表和代码目录的标签。} -% \changes{v1.24l}{2021/04/06}{增加目录引导线右边对齐方式。} +% \changes{v1.24m}{2021/04/05}{可以设置图、表和代码目录的标签。} +% \changes{v1.24m}{2021/04/06}{增加目录引导线右边对齐方式。} % \end{function} % % \begin{ctexexam} @@ -594,7 +594,7 @@ The latest version of this license is in % \tn{end}\marg{环境名} % \end{syntax} % \pkg{enumitem} 宏包为系统预置的列表环境 \env{enumerate}、\env{itemize}和 \env{description} 提供了更灵活的标签以及间距的控制,可使用 \tn{setlist} 命令设置原有的三种列表格式。已为三种列表预置了三个级别的格式可相互嵌套,默认标签与 \cls{book} 文档类相同,若自定义标签可例如 -% \changes{v1.24l}{2021/04/08}{重新优化列表环境的配置。} +% \changes{v1.24m}{2021/04/08}{重新优化列表环境的配置。} % \end{function} % % \begin{ctexexam} @@ -631,7 +631,7 @@ The latest version of this license is in % \label{subsec:theorem} % \begin{function}[added = 2021-01-05,updated = 2021-01-08]{theorem,definition,lemma,corollary,proposition,example,remark,proof} % \begin{syntax} -% \tn{begin}\marg{环境名} +% \tn{begin}\marg{环境名}\oarg{定理题注} % \ <定理内容> % \tn{end}\marg{环境名} % \end{syntax} @@ -760,7 +760,7 @@ The latest version of this license is in % \tn{labelformat}\marg{计数器}\marg{标签引用格式} % \end{syntax} % 使用 \tn{ref} 命令进行引用将会自动检测环境并添加相应的前缀,\tn{labelformat} 可以设置标签引用格式,第二个参数中\#1代表 \tn{the}\meta{计数器},可以设置引用序号的前缀和后缀。 -% \changes{v1.24l}{2021/04/11}{取消载入 \pkg{cleveref} 宏包来交叉引用。} +% \changes{v1.24m}{2021/04/11}{取消载入 \pkg{cleveref} 宏包来交叉引用。} % \end{function} % % \subsubsection{索引} @@ -856,6 +856,7 @@ The latest version of this license is in % \item[booktabs] 为表格提供三线表式的命令。 % \item[enumitem] 提供列表环境的布局控制。 % \item[listings] 可以在\LaTeX 中排版程序/编程代码。 +% \item[hyperref] 处理交叉引用命令以及在文档中生成超文本链接。 % \item[\ding{75} tcolorbox] 为带有标题线的彩色和带框文本框提供了一个环境。 % \item[\ding{75} tasks] 将练习题组织成水平而不是垂直计数的列。 % \item[\ding{75} imakeidx] 可以让文档同时生成和排版一个或多个索引。 @@ -869,7 +870,7 @@ The latest version of this license is in %<*class> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplClass{easybook}{2021/04/12}{1.24l}{beta} +\ProvidesExplClass{easybook}{2021/04/17}{1.24m}{beta} \cs_generate_variant:Nn \__ctex_define:nn {nx} \cs_generate_variant:Nn \int_to_arabic:n {v} diff --git a/macros/latex/contrib/fancypar/fancypar.dtx b/macros/latex/contrib/fancypar/fancypar.dtx index 68a8e6926c..6335941e49 100644 --- a/macros/latex/contrib/fancypar/fancypar.dtx +++ b/macros/latex/contrib/fancypar/fancypar.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright (C) 2010, 2019 by Gonzalo Medina +% Copyright (C) 2010, 2019, 2021 by Gonzalo Medina % % -------------------------------------------------------------------------- % @@ -117,6 +117,7 @@ % % \changes{v 1.1}{2010/04/25}{First revision} % \changes{v 1.2}{2019/01/18}{Second revision} +% \changes{v 1.3}{2021/04/17}{Third revision} % % \GetFileInfo{fancypar.sty} % @@ -584,7 +585,7 @@ % Standard identification: % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fancypar}[2019/01/18 v1.2 fancy paragraphs] +\ProvidesPackage{fancypar}[2021/04/17 v1.3 fancy paragraphs] % \end{macrocode} % @@ -944,6 +945,7 @@ % styles (and must be used in newly defined ones). A description can be found in % \cite{eijk}. % \changes{v 1.2}{2019/01/18}{Now all other styles also admit more than one paragraph. Thanks to Frank Mittelbach} +% \changes{v 1.3}{2021/04/17}{An additional unskip was added since the 2021 release of LaTeX adds an extra glue in the material between paragraphs. Thanks to Frank Mittelbach} % \begin{macrocode} \newsavebox\linebox% \def\add@fancy@format{% @@ -952,6 +954,7 @@ \unskip \unpenalty \unskip %Allows more than one paragraph in MarkedPar, DashedPar, ZebraPar, and UnderlinedPar. Thanks to Frank Mittelbach + \unskip %Required after the 2021 LaTeX release to handle an additional glue in the material between paragraphs. Thanks to Frank Mittelbach {\add@fancy@format}% \FancyFormat \fi diff --git a/macros/latex/contrib/fancypar/fancypar.ins b/macros/latex/contrib/fancypar/fancypar.ins index 95b8490394..e98c9f0a42 100644 --- a/macros/latex/contrib/fancypar/fancypar.ins +++ b/macros/latex/contrib/fancypar/fancypar.ins @@ -2,7 +2,7 @@ \keepsilent \preamble -Copyright (C) 2010, 2019 Gonzalo Medina (gmedinaar@unal.edu.co) +Copyright (C) 2010, 2019, 2021 Gonzalo Medina (gmedinaar@unal.edu.co) -------------------------------------------------------------------------- diff --git a/macros/latex/contrib/fancypar/fancypar.pdf b/macros/latex/contrib/fancypar/fancypar.pdf Binary files differindex 8fcfe3e5c1..16753185d6 100644 --- a/macros/latex/contrib/fancypar/fancypar.pdf +++ b/macros/latex/contrib/fancypar/fancypar.pdf diff --git a/macros/latex/contrib/fontsize/fontsize.dtx b/macros/latex/contrib/fontsize/fontsize.dtx index a471f4c5ca..cde1960fad 100644 --- a/macros/latex/contrib/fontsize/fontsize.dtx +++ b/macros/latex/contrib/fontsize/fontsize.dtx @@ -56,14 +56,13 @@ This work has the LPPL maintenance status "author-maintained". %<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01] %<package>\ProvidesPackage{fontsize} %<*package> - [2021/03/14 v0.8.1 'fontsize' package. Set main font sizes (Ivan Valbusa)] + [2021/04/17 v0.8.2 'fontsize' package. Set main font sizes (Ivan Valbusa)] %</package> %<*driver> \documentclass[12pt]{ltxdoc} \usepackage[T1]{fontenc} \usepackage[utf8]{inputenc} -\usepackage{fontsize} - \changefontsize[13.7]{11.7} +\usepackage[fontsize=12]{fontsize} %-------------------------------------------------------- % GRAPHICS %-------------------------------------------------------- @@ -176,6 +175,7 @@ This work has the LPPL maintenance status "author-maintained". % % Commands for table 1 and 2 % +\def\tabonefontsize{\fontsize{12}{14.2}\selectfont} \ExplSyntaxOn \NewExpandableDocumentCommand{\getsize}{O{5}m} { @@ -268,7 +268,7 @@ This work has the LPPL maintenance status "author-maintained". %</driver> % \fi % -% \CheckSum{3064} +% \CheckSum{3067} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -287,8 +287,9 @@ This work has the LPPL maintenance status "author-maintained". % Right brace \} Tilde \~} % % +% \changes{v0.8.2}{2021/04/17}{New \cmd{parindent} option. Updated documentation.} % \changes{v0.8.1}{2021/03/14}{New \cmd{sampletext} command. -% Some lengths are now defined via \sty{xfp} package. Removed \cmd{headheight} definition. Updated documentation.} + % Some lengths are now defined via \sty{xfp} package. Removed \cmd{headheight} definition. Updated documentation.} % \changes{v0.8}{2021/03/04}{Corrected a bug occuring when the line spacing is grater than \SI{163.84}{pt}.} % \changes{v0.7}{2021/02/10}{New font sizing commands \cmd{HUGE}, \cmd{HUGEr}, \cmd{HUGErr}, \cmd{HUGErrr}. Changed default name for the \file{.clo} file to \opt{fontsize}. Updated documentation.} % \changes{v0.6}{2021/02/06}{New font sizing commands from \cmd{small} down. Updated documentation.} @@ -324,16 +325,19 @@ This work has the LPPL maintenance status "author-maintained". % \DoNotIndex{\huge,\large,\makebox,\ProcessOptions,\renewcommand} % % \thispagestyle{empty} +% % \begin{tikzpicture}[overlay,remember picture] -% \draw[circular drop shadow,draw=none,fill=white] (current page.center) circle (6cm) node[align=center,anchor=center] {% +% \draw[circular drop shadow,draw=none,fill=white] (current page.center) circle (6cm) +% node[align=center,anchor=center] {% % Ivan Valbusa\\[1cm] % -%\Huge\color{gray}\bfseries \parbox{10cm}{\centering The \\{{\color{philA}\fontsize{30}{32}\textsf{fontsize}}\\ package}}\\[1cm] +% \Huge\color{gray}\bfseries \parbox{10cm}{\centering The +% \\{{\color{philA}\fontsize{30}{32}\textsf{fontsize}}\\ package}}\\[1cm] % \color{black!60!Goldenrod} % -%\normalsize \fileversion{} -- \filedate +% \normalsize \fileversion{} -- \filedate % -%}; +% }; % \end{tikzpicture} % \clearpage\thispagestyle{empty} % \null\vspace{1cm} @@ -406,7 +410,9 @@ This work has the LPPL maintenance status "author-maintained". % % The code is an excerpt of the \sty{scrextend} and % \sty{scrfontsizes} packages \parencite{koma}, with few minor -% changes to make it completely independent of the KOMA-script bundle and with a couple of new features. The package is updated to version |3390 2019-11-18 17:09:35Z| of the \file{scrkernel-fonts.dtx} file. +% changes to make it completely independent of the KOMA-script bundle and with +% a couple of new features. The package is updated to version +%|3390 2019-11-18 17:09:35Z| of the \file{scrkernel-fonts.dtx} file. % %^^A--------------------------------------------------------------------- % \section*{Caveat} @@ -415,11 +421,13 @@ This work has the LPPL maintenance status "author-maintained". % Although effective with any value of the font size (as long as the font % is scalable), the package is meant for small font size changes. % For truly optimal results you should (re)define your own \file{.clo} file. -% In fact note that the file generated with \cmd{generateclofile}, as well as the macros redefined via \cmd{changefontsize}, are a subset of the standard \file{.clo} files. +% In fact note that the file generated with \cmd{generateclofile}, +% as well as the macros redefined via \cmd{changefontsize}, +% are a subset of the standard \file{.clo} files. %^^A--------------------------------------------------------------------- % \section{Usage} %^^A--------------------------------------------------------------------- -%^^A \enlargethispage{\baselineskip} +% \enlargethispage{\baselineskip} % % The package can be loaded, as usual, with: % \begin{ttquote} @@ -443,12 +451,14 @@ This work has the LPPL maintenance status "author-maintained". % You can use any unit recognized by \TeX\ and you can % omit the unit as well (in which case it defaults to \texttt{pt}). % -% \begin{footnotesize} -% As \sty{fontsize} takes effect after the class is loaded, you should -% set a font size class option that comes close to the font size passed -% to \sty{fontsize}. For example, -% if you set \opt{fontsize=12.2pt} you should load the class option \opt{12pt}. -% \end{footnotesize} +%^^A \begin{footnotesize} +% +%^^A As \sty{fontsize} takes effect after the class is loaded, you should +%^^A set a font size class option (if available) that comes close to the one +%^^A loaded by the package. For example, +%^^A if you set \opt{fontsize=12.2pt} you should load the class option \opt{12pt}. +% +%^^A \end{footnotesize} % % \optitem[fontsize]{cloname}{\meta{name}} % @@ -463,6 +473,11 @@ This work has the LPPL maintenance status "author-maintained". %^^A \file{fontsize-std11pt.clo} or %^^A \file{fontsize-std11pt.clo} will be used, % +% \optitem[1.5em]{parindent}{\meta{dimen}} +% +% Sets the value of \cmd{parindent}. You can use any unit recognized by +% \TeX\ but for consistency it is preferable to use a +% font-dependent unit such as em. % % \end{optionlist*} % @@ -534,7 +549,8 @@ This work has the LPPL maintenance status "author-maintained". % \subsection{New font sizing commands}\label{sec:sizingcmd} %^^A-------------------------------------------------------------------- % -% The package provides three additional font sizing commands for each standard size (plus the new \cmd{HUGE} command). +% The package provides three additional font sizing commands +% for each standard size (plus the new \cmd{HUGE} command). % See table \ref{tab:sizes} for details. % \medskip % @@ -593,7 +609,6 @@ This work has the LPPL maintenance status "author-maintained". % } %\medskip % -% \begin{small} %\alert If you want these commands to work as expected, the font must be % smoothly scalable. % This is the case of many Type 1 and Open Type fonts such as Cochineal @@ -633,11 +648,9 @@ This work has the LPPL maintenance status "author-maintained". %^^A \cmd{RequirePackage}|{fix-cm}| just before \cmd{documentclass}. % % -% \end{small} -% -%\newgeometry{top=2cm,bottom=3cm} +%^^A\newgeometry{top=2cm,bottom=3cm} % -%\begin{smallrrr} +%^^A\begin{smallrrr} % %\def\grayrule{\\\tabucline[0.4pt black!40 off 2pt]{-}\\[-2ex]\rowfont{\color{philA}}} % @@ -706,16 +719,17 @@ This work has the LPPL maintenance status "author-maintained". % \tabrowone{HUGErrr}\\ %\end{longtabu} % -%\end{smallrrr} +%^^A\end{smallrrr} % -%\restoregeometry +%^^A\restoregeometry % %^^A--------------------------------------------------------------------- % % \section{Some text samples}\label{sec:example} % %^^A-------------------------------------------------------------------- -% The following samples are obtained with the \cmd{printsamples} command (see section \ref{sec:commands}): +% The following samples are obtained with the \cmd{printsamples} +% command (see section \ref{sec:commands}): %\begin{verbatim} %\printsamples{12.6pt}{10.6pt}[normalsizerr,normalsizerrr,large,larger,largerr] %\end{verbatim} @@ -732,17 +746,21 @@ This work has the LPPL maintenance status "author-maintained". %^^A--------------------------------------------------------------------- % \section{The Code} %^^A--------------------------------------------------------------------- -%\textcolor{DarkBlue}{The parts added to the basic code of \file{scrextend} and \file{scrfontsizes} are highlighted in blue.} +% \textcolor{DarkBlue}{The parts added to the basic code of \file{scrextend} +% and \file{scrfontsizes} are highlighted in blue.} % -%\noindent All the options of the package are defined via \sty{xkeyval} \parencite{xkeyval}, +% \noindent All the options of the package are defined via +% \sty{xkeyval} \parencite{xkeyval}, % while the \sty{xfp} package \parencite{xfp} provides the \cmd{fpeval} command % to use instead of \cmd{dimexpr} for some size calculations. -% Only a new package option called \opt{cloname} is defined. +% Only two new package options, called \opt{cloname} and \opt{parindent} +% are defined. % \baddition % \begin{macrocode} \@ifpackageloaded{xkeyval}{}{\RequirePackage{xkeyval}} \@ifpackageloaded{xfp}{}{\RequirePackage{xfp}} \DeclareOptionX{cloname}[fontsize]{\def\@fontsizefilebase{#1}} +\DeclareOptionX{parindent}[1.5em]{\def\@fontsizeparindent{#1}} % \end{macrocode} % \eaddition % @@ -750,7 +768,8 @@ This work has the LPPL maintenance status "author-maintained". % % Here the \sty{scrextend} code begins. All the KOMA related codes have % been removed and only a few names have been changed. -% The value of \cmd{|@|fontsizefilebase} is set to \texttt{fontsize} instead of \texttt{scrsize}. +% The value of \cmd{|@|fontsizefilebase} is set to \texttt{fontsize} +% instead of \texttt{scrsize}. % \begin{macrocode} \DeclareOptionX{fontsize}[10]{% \expandafter\@defaultunits\expandafter\@tempdima#1 pt\relax\@nnil @@ -779,11 +798,15 @@ This work has the LPPL maintenance status "author-maintained". \expandafter\AtEndOfPackage\expandafter{\@tempa}% } % \end{macrocode} -% Now we can execute and process the new options defined above. As \opt{cloname} is responsible for defining \cmd{|@|fontsizefilebase} it must precede \opt{fontsize} which uses this command. -% The \cmd{ctm@setlength} and \cmd{changefontsize} commands are simply new names, respectively, for \cmd{scr@setlength} and \cmd{changefontsizes} used in \file{scrextend.sty}. +% Now we can execute and process the new options defined above. +% As \opt{cloname} is responsible for defining \cmd{|@|fontsizefilebase} +% it must precede \opt{fontsize} which uses this command. +% The \cmd{ctm@setlength} and \cmd{changefontsize} commands +% are simply new names, respectively, for \cmd{scr@setlength} +% and \cmd{changefontsizes} used in \file{scrextend.sty}. % \baddition % \begin{macrocode} -\ExecuteOptionsX{cloname,fontsize} +\ExecuteOptionsX{cloname,fontsize,parindent} \ProcessOptionsX*\relax % \end{macrocode} % \eaddition @@ -993,7 +1016,8 @@ This work has the LPPL maintenance status "author-maintained". \let\noexpand\@listi\noexpand\@listi@small }% % \end{macrocode} -% {\color{black}Definition of \cmd{footnotesizer}, \cmd{footnotesizerr}, \cmd{footnotesizerrr}.\\ +% {\color{black}Definition of \cmd{footnotesizer}, \cmd{footnotesizerr}, +% \cmd{footnotesizerrr}.\\ % Scale factor: 0.01979.} % \begin{macrocode} \setlength{\@tempdima}{0.85313\@tempdimc}% @@ -1024,7 +1048,8 @@ This work has the LPPL maintenance status "author-maintained". \let\noexpand\@listi\noexpand\@listi@footnotesize }% % \end{macrocode} -% {\color{black}Definition of \cmd{scriptsizer}, \cmd{scriptsizerr}, \cmd{scriptsizerrr}.\\ +% {\color{black}Definition of \cmd{scriptsizer}, \cmd{scriptsizerr}, +% \cmd{scriptsizerrr}.\\ % Scale factor: 0,0416675.} % \begin{macrocode} \setlength{\@tempdima}{0.7083375\@tempdimc}% @@ -1068,7 +1093,8 @@ This work has the LPPL maintenance status "author-maintained". {\the\@tempdima}{\the\@tempdimb}% }% % \end{macrocode} -% {\color{black}Definition of \cmd{normalsizer}, \cmd{normalsizerr}, \cmd{normalsizerrr}.\\ +% {\color{black}Definition of \cmd{normalsizer}, \cmd{normalsizerr}, +% \cmd{normalsizerrr}.\\ % Scale factor: 0.05.} % \begin{macrocode} \setlength{\@tempdima}{1.05\@tempdimc}% @@ -1209,7 +1235,8 @@ This work has the LPPL maintenance status "author-maintained". {\the\@tempdima}{\the\@tempdimb}% }% % \end{macrocode} -% {\color{black}Definition of \cmd{HUGE}, \cmd{HUGER}, \cmd{HUGERR}, \cmd{HUGERRR}.\\ +% {\color{black}Definition of \cmd{HUGE}, \cmd{HUGER}, \cmd{HUGERR}, +% \cmd{HUGERRR}.\\ % Scale factor: 0,149.} % \begin{macrocode} \setlength{\@tempdima}{3.006\@tempdimc}% @@ -1242,13 +1269,21 @@ This work has the LPPL maintenance status "author-maintained". \normalsize% % \end{macrocode} % The KOMA files do not define \cmd{parindent} and other lengths that are -% are strictly linked to the font rather than to the dimensions of the page and the text. So first we set \cmd{parindent} to \cmd{normalsize}: +% are strictly linked to the font rather than to the dimensions of the page +% and the text. So we first define \cmd{parindent}. +% The value of \cmd{@fontsizeparindent} is controlled by the +% \opt{parindent} option which defaults to +% \SI{1.5}{em} and corresponds approximately to the values adopted +% in the \file{bk*.clo} files for one-column documents: % \baddition % \begin{macrocode} -\setlength\parindent{\@tempdimb}% +\setlength\parindent{\@fontsizeparindent}% % \end{macrocode} % \eaddition -% For the following lengths, all values are calculated proportionally to the main font. I took the \file{bk11.clo} file as a reference point. Note that the differences of the lengths in the files \file{bk*.clo} not affected by \sty{fontsize} only concern \cmd{headheight}, \cmd{headsep}, \cmd{topskip} and \cmd{footskip}. +% For the following lengths, all values are calculated proportionally to the main font. +% I took the \file{bk11.clo} file as a reference point. Note that the differences +% in lengths affected by \sty{fontsize} inside the \file{bk*.clo} files only concern +% \cmd{headheight}, \cmd{headsep}, \cmd{topskip} and \cmd{footskip}. % \baddition % \begin{macrocode} \setlength\smallskipamount{\fpeval{1.090909091\@tempdimb/4}pt \@plus 1\p@ \@minus 1\p@}% @@ -1406,7 +1441,11 @@ This work has the LPPL maintenance status "author-maintained". % % \paragraph{Excerpt from \file{scrfontsizes.sty}} % -% Here is a portion of the \sty{scrfontsizes} package. It simply provides the \cmd{generateclofile} command, without the KOMA related definitions. There are no reserved names for the \file{.clo} files. The command name is a new name for the KOMA \cmd{generatefontfile}. In fact what the command generates is a \file{.clo} file. +% Here is a portion of the \sty{scrfontsizes} package. It simply provides the +% \cmd{generateclofile} command, without the KOMA related definitions. +% There are no reserved names for the \file{.clo} files. The command name is +% a new name for the KOMA \cmd{generatefontfile}. In fact what the command +% generates is a \file{.clo} file. % \begin{macrocode} \newcommand*{\generateclofile}[1]{% \kernel@ifnextchar [{\@generatefontfile{#1}}{\@@generatefontfile{#1}}% @@ -1975,7 +2014,7 @@ This work has the LPPL maintenance status "author-maintained". % \end{macrocode} % We will now define some internal commands to test the package functions. % Since version 0.6 I have been using the \LaTeX 3 solution provided by -% Enrico Gregorio in place of the previous macros based on +% Enrico Gregorio in place of the old macros based on % \sty{etoolbox} \parencite{etoolbox}. % \baddition % \begin{macrocode} diff --git a/macros/latex/contrib/fontsize/fontsize.pdf b/macros/latex/contrib/fontsize/fontsize.pdf Binary files differindex 37a1db0cfa..5afc85d3dc 100644 --- a/macros/latex/contrib/fontsize/fontsize.pdf +++ b/macros/latex/contrib/fontsize/fontsize.pdf |