summaryrefslogtreecommitdiff
path: root/macros/latex
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-05-22 03:00:53 +0000
committerNorbert Preining <norbert@preining.info>2021-05-22 03:00:53 +0000
commit58aa1ac09b1d9e4769d0a0661cf12e2b2db41b14 (patch)
tree366a7a5e1310dc291fa9969ce6ed1af604bb8d89 /macros/latex
parent6a52d8839d334ac56f36195aa404fac667862830 (diff)
CTAN sync 202105220300
Diffstat (limited to 'macros/latex')
-rw-r--r--macros/latex/contrib/acmart/README8
-rw-r--r--macros/latex/contrib/acmart/acmart.dtx71
-rw-r--r--macros/latex/contrib/acmart/acmart.pdfbin838066 -> 842246 bytes
-rw-r--r--macros/latex/contrib/acmart/acmguide.pdfbin413166 -> 414201 bytes
-rw-r--r--macros/latex/contrib/acmart/samples/sample-acmlarge.pdfbin586356 -> 586372 bytes
-rw-r--r--macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdfbin1030676 -> 1030499 bytes
-rw-r--r--macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdfbin598701 -> 598702 bytes
-rw-r--r--macros/latex/contrib/acmart/samples/sample-acmsmall.pdfbin596222 -> 596225 bytes
-rw-r--r--macros/latex/contrib/acmart/samples/sample-acmtog.pdfbin543920 -> 543905 bytes
-rw-r--r--macros/latex/contrib/acmart/samples/sample-authordraft.pdfbin1022847 -> 1022861 bytes
-rw-r--r--macros/latex/contrib/acmart/samples/sample-lualatex.pdfbin768548 -> 768566 bytes
-rw-r--r--macros/latex/contrib/acmart/samples/sample-manuscript.pdfbin598262 -> 598279 bytes
-rw-r--r--macros/latex/contrib/acmart/samples/sample-sigconf.pdfbin1019039 -> 1019048 bytes
-rw-r--r--macros/latex/contrib/acmart/samples/sample-sigplan.pdfbin1028132 -> 1028143 bytes
-rw-r--r--macros/latex/contrib/acmart/samples/sample-xelatex.pdfbin653950 -> 653971 bytes
-rw-r--r--macros/latex/contrib/acmart/samples/samples.dtx15
-rw-r--r--macros/latex/contrib/easybook/easybook.dtx73
-rw-r--r--macros/latex/contrib/easybook/easybook.pdfbin312209 -> 312353 bytes
-rw-r--r--macros/latex/contrib/fontsize/fontsize.dtx56
-rw-r--r--macros/latex/contrib/fontsize/fontsize.pdfbin405591 -> 378517 bytes
-rw-r--r--macros/latex/contrib/projlib/ProjLib-doc-cn.pdfbin222025 -> 222934 bytes
-rw-r--r--macros/latex/contrib/projlib/ProjLib-doc-cn.tex16
-rw-r--r--macros/latex/contrib/projlib/ProjLib-doc-en.pdfbin145010 -> 143188 bytes
-rw-r--r--macros/latex/contrib/projlib/ProjLib-doc-en.tex24
-rw-r--r--macros/latex/contrib/projlib/ProjLib.dtx94
-rw-r--r--macros/latex/contrib/siunitx/CHANGELOG.md12
-rw-r--r--macros/latex/contrib/siunitx/siunitx-code.pdfbin1441368 -> 1441845 bytes
-rw-r--r--macros/latex/contrib/siunitx/siunitx-number.dtx35
-rw-r--r--macros/latex/contrib/siunitx/siunitx-table.dtx14
-rw-r--r--macros/latex/contrib/siunitx/siunitx.dtx2
-rw-r--r--macros/latex/contrib/siunitx/siunitx.pdfbin605429 -> 605308 bytes
-rw-r--r--macros/latex/contrib/siunitx/siunitx.tex15
-rw-r--r--macros/latex/contrib/tiscreen/README5
-rw-r--r--macros/latex/contrib/tiscreen/doc/tiscreen-doc.pdfbin122211 -> 121968 bytes
-rw-r--r--macros/latex/contrib/tiscreen/doc/tiscreen-doc.tex2
-rw-r--r--macros/latex/contrib/tiscreen/tex/tiscreen.sty5
36 files changed, 330 insertions, 117 deletions
diff --git a/macros/latex/contrib/acmart/README b/macros/latex/contrib/acmart/README
index 9b623902ff..40cbff3a83 100644
--- a/macros/latex/contrib/acmart/README
+++ b/macros/latex/contrib/acmart/README
@@ -286,4 +286,10 @@ Version 1.76. Added many journal abbreviations to the bst.
New experimental option: pbalance
ORCID linking code
-Version 1.77. Changed the way to typset multiple affiliations (Christoph Sommer) \ No newline at end of file
+Version 1.77. Changed the way to typeset multiple affiliations (Christoph Sommer)
+
+Version 1.78. Documentation update.
+ Magic texcount comments for samples.
+ Title page now is split if there are too many authors
+ Bug fixes.
+ \ No newline at end of file
diff --git a/macros/latex/contrib/acmart/acmart.dtx b/macros/latex/contrib/acmart/acmart.dtx
index c0e62e554c..d113dd5043 100644
--- a/macros/latex/contrib/acmart/acmart.dtx
+++ b/macros/latex/contrib/acmart/acmart.dtx
@@ -1679,6 +1679,36 @@
% uppercasing.
%
%
+%\subsection{Counting words}
+%\label{sec:ug_counting}
+%
+% Some ACM conferences use word count limits for papers. The
+% calculation of word number for a paper with math, tables and figures
+% is not a trivial task. Currently the authoritative word count is
+% done by translating the PDF to text and using |wc -w| on the
+% output. Authors can use the package |texcount| (used by Overleaf)
+% to get an estimate of the word count. To faciliate this one adds to the
+% beginning of the package metacomments
+% \begin{verbatim}
+% %TC:macro \cite [option:text,text]
+% %TC:macro \citep [option:text,text]
+% %TC:macro \citet [option:text,text]
+% %TC:envir table 0 1
+% %TC:envir table* 0 1
+% %TC:envir tabular [ignore] word
+% %TC:envir displaymath 0 word
+% %TC:envir math 0 word
+% %TC:envir comment 0 0
+% \end{verbatim}
+% and uses |\begin{math}...\end{math}| instead of dollar signs for
+% math. Note that the count is in any case approximate, and the final
+% decision of editors is based on PDF count.
+%
+% The script |texcount| provides a report of word count in the
+% document.
+%
+%
+%
%
%\subsection{Disabled or forbidden commands}
%\label{sec:ug_disabled}
@@ -1907,7 +1937,7 @@
\ProvidesFile{acmart.dtx}
%</gobble>
%<class>\ProvidesClass{acmart}
-[2021/04/16 v1.77 Typesetting articles for the Association for Computing Machinery]
+[2021/05/01 v1.78 Typesetting articles for the Association for Computing Machinery]
% \end{macrocode}
%
% \changes{v1.00}{2016/04/14}{First released version}
@@ -2014,6 +2044,7 @@
% \changes{1.71}{2020/05/02}{LuaTeX now uses the OTF versions of
% fonts}
% \changes{1.75}{2020/10/29}{Documentation update}
+% \changes{1.78}{2021/05/01}{Documentation update: Word count}
%
% And the driver code:
% \begin{macrocode}
@@ -4669,8 +4700,11 @@
% \begin{macrocode}
\AtEndDocument{\if@ACM@nonacm\else\if@ACM@printacmref\else
\ifnum\getrefnumber{TotPages}>1\relax
- \ClassWarningNoLine{\@classname}{ACM reference format is mandatory
- for papers over one page}%
+ \ClassWarningNoLine{\@classname}{%
+ ACM reference format is mandatory \MessageBreak
+ for papers over one page. \MessageBreak
+ Please add printacmref=true to the \MessageBreak
+ \string\settopmatter\space command.}%
\fi\fi\fi}
% \end{macrocode}
%
@@ -5417,9 +5451,12 @@
% its argument. Added a bugfix}
% \changes{v1.68}{2020/01/19}{Deleted grouping altogether}
% \changes{v1.69}{2020/02/02}{Changed dot to colon for sigplan}
+% \changes{v1.78}{2021/05/02}{Again suppressed \cs{vspace} warning}
% This macro starts sections for proceedings and uses \cs{small} for journals
% \begin{macrocode}
\def\@specialsection#1{%
+ \let\@vspace\@vspace@orig
+ \let\@vspacer\@vspacer@orig
\ifcase\ACM@format@nr
\relax % manuscript
\par\medskip\small\noindent#1: %
@@ -5440,6 +5477,8 @@
\or % sigchi-a
\section*{#1}%
\fi
+ \let\@vspace\@vspace@acm
+ \let\@vspacer\@vspacer@acm
}
% \end{macrocode}
%
@@ -5449,9 +5488,14 @@
% \begin{macro}{\@printtopmatter}
% \changes{v1.06}{2016/05/01}{Added processing badges}
% \changes{v1.46}{2017/08/29}{Deleted rule}
+% \changes{v1.78}{2021/05/16}{Added processing the overflowing title box}
% The printing of top matter starts a new page and uses the given
% title box. Note that for |sigchi-a| we print badges here rather
% than in \cs{mktitle} since we want them in the margins.
+%
+% Note that if there are too many authors, |\mktitle@bx| might
+% overflow the page. Therefore we start with checking this and if
+% this happens, we split the box and print it page by page.
% \begin{macrocode}
\def\@printtopmatter{%
\ifx\@startPage\@empty
@@ -5459,6 +5503,18 @@
\else
\setcounter{page}{\@startPage}%
\fi
+ \@tempdima=\ht\mktitle@bx
+ \advance\@tempdima by \dp\mktitle@bx
+ \ifdim\@tempdima>0.9\textheight
+ \loop
+ \setbox\@tempboxa=\vsplit \mktitle@bx to 0.9\textheight
+ \thispagestyle{firstpagestyle}%
+ \noindent\unvbox\@tempboxa
+ \clearpage
+ \@tempdima=\ht\mktitle@bx
+ \advance\@tempdima by \dp\mktitle@bx
+ \ifdim\@tempdima>0.9\textheight\repeat
+ \fi
\thispagestyle{firstpagestyle}%
\noindent
\ifcase\ACM@format@nr
@@ -5954,6 +6010,7 @@
% \changes{v1.40}{2017/06/04}{Switched to MakeTextUppercase}
% \changes{v1.73}{2020/09/07}{Check the presence of required elements
% for affiliations}
+% \changes{v1.78}{2021/05/16}{Unboxing \cs{mktitle@bx}}
% This version is used in most journal formats. Note that \cs{and} between
% authors with the same affiliation becomes \verb*| and |:
% \begin{macrocode}
@@ -5985,7 +6042,7 @@
\fi
\fi
\global\let\and\@typeset@author@line}%
- \global\setbox\mktitle@bx=\vbox{\noindent\box\mktitle@bx\par\medskip
+ \global\setbox\mktitle@bx=\vbox{\noindent\unvbox\mktitle@bx\par\medskip
\noindent\addresses\@typeset@author@line
\par\medskip}%
}
@@ -6050,6 +6107,7 @@
% \changes{v1.36}{2017/05/12}{Added authorsperrow overrride}
% \changes{v1.73}{2020/09/07}{Check the presence of required elements
% for affiliations}
+% \changes{v1.78}{2021/05/16}{Unboxing \cs{mktitle@bx}}
% The |sigconf| version. Here we use a centered design with each
% author in a separate box.
% \begin{macrocode}
@@ -6116,7 +6174,7 @@
% \begin{macrocode}
\hsize=\textwidth
\global\setbox\mktitle@bx=\vbox{\noindent
- \box\mktitle@bx\par\medskip\leavevmode
+ \unvbox\mktitle@bx\par\medskip\leavevmode
\lineskip=1pc\relax\centering\hspace*{-1em}%
\addresses\let\and\@typeset@author@bx\and\par\bigskip}}
% \end{macrocode}
@@ -6261,12 +6319,13 @@
% \begin{macro}{\@mkteasers}
% Typesetting the teasers
% \changes{v1.56}{2018/11/1}{Added check for description}
+% \changes{v1.78}{2021/05/16}{Unboxing \cs{mktitle@bx}}
% \begin{macrocode}
\def\@mkteasers{%
\ifx\@teaserfigures\@empty\else
\def\@teaser##1{\par\bigskip\bgroup
\captionsetup{type=figure}##1\egroup\par}
- \global\setbox\mktitle@bx=\vbox{\noindent\box\mktitle@bx\par
+ \global\setbox\mktitle@bx=\vbox{\noindent\unvbox\mktitle@bx\par
\noindent\@Description@presentfalse
\@teaserfigures\par\if@Description@present\else
\global\@undescribed@imagestrue
diff --git a/macros/latex/contrib/acmart/acmart.pdf b/macros/latex/contrib/acmart/acmart.pdf
index c6d2536d6a..263327bbc5 100644
--- a/macros/latex/contrib/acmart/acmart.pdf
+++ b/macros/latex/contrib/acmart/acmart.pdf
Binary files differ
diff --git a/macros/latex/contrib/acmart/acmguide.pdf b/macros/latex/contrib/acmart/acmguide.pdf
index b78e8dc8b5..88691decd5 100644
--- a/macros/latex/contrib/acmart/acmguide.pdf
+++ b/macros/latex/contrib/acmart/acmguide.pdf
Binary files differ
diff --git a/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf b/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf
index d82e7482eb..97525d134e 100644
--- a/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf
Binary files differ
diff --git a/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf b/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf
index 113cc1abbd..d92aacd297 100644
--- a/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf
Binary files differ
diff --git a/macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdf b/macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdf
index 1906e776a7..76848b87b3 100644
--- a/macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdf
Binary files differ
diff --git a/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf b/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf
index 27aae47e2d..a7310de528 100644
--- a/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf
Binary files differ
diff --git a/macros/latex/contrib/acmart/samples/sample-acmtog.pdf b/macros/latex/contrib/acmart/samples/sample-acmtog.pdf
index 91359df33c..c192a9190f 100644
--- a/macros/latex/contrib/acmart/samples/sample-acmtog.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-acmtog.pdf
Binary files differ
diff --git a/macros/latex/contrib/acmart/samples/sample-authordraft.pdf b/macros/latex/contrib/acmart/samples/sample-authordraft.pdf
index c2c9075ba6..f53ec3d520 100644
--- a/macros/latex/contrib/acmart/samples/sample-authordraft.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-authordraft.pdf
Binary files differ
diff --git a/macros/latex/contrib/acmart/samples/sample-lualatex.pdf b/macros/latex/contrib/acmart/samples/sample-lualatex.pdf
index 0b4fbd4d3d..2f5d4eb0e8 100644
--- a/macros/latex/contrib/acmart/samples/sample-lualatex.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-lualatex.pdf
Binary files differ
diff --git a/macros/latex/contrib/acmart/samples/sample-manuscript.pdf b/macros/latex/contrib/acmart/samples/sample-manuscript.pdf
index effe8aa896..d2dc2faf4e 100644
--- a/macros/latex/contrib/acmart/samples/sample-manuscript.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-manuscript.pdf
Binary files differ
diff --git a/macros/latex/contrib/acmart/samples/sample-sigconf.pdf b/macros/latex/contrib/acmart/samples/sample-sigconf.pdf
index 5a9c0f6cf8..43c162e86c 100644
--- a/macros/latex/contrib/acmart/samples/sample-sigconf.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-sigconf.pdf
Binary files differ
diff --git a/macros/latex/contrib/acmart/samples/sample-sigplan.pdf b/macros/latex/contrib/acmart/samples/sample-sigplan.pdf
index 2237485dcc..81112ed95d 100644
--- a/macros/latex/contrib/acmart/samples/sample-sigplan.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-sigplan.pdf
Binary files differ
diff --git a/macros/latex/contrib/acmart/samples/sample-xelatex.pdf b/macros/latex/contrib/acmart/samples/sample-xelatex.pdf
index 74fcfe089f..928edaf286 100644
--- a/macros/latex/contrib/acmart/samples/sample-xelatex.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-xelatex.pdf
Binary files differ
diff --git a/macros/latex/contrib/acmart/samples/samples.dtx b/macros/latex/contrib/acmart/samples/samples.dtx
index d826fd4e4a..1599f8670e 100644
--- a/macros/latex/contrib/acmart/samples/samples.dtx
+++ b/macros/latex/contrib/acmart/samples/samples.dtx
@@ -1,4 +1,19 @@
%<*manuscript|acmsmall|acmsmall-submission|acmlarge|acmtog|sigconf|authordraft|sigplan|sigchi|sigchi-a|acmsmall-conf>
+%%
+%%
+%% Commands for TeXCount
+%<<TCMACROS
+%TC:macro \cite [option:text,text]
+%TC:macro \citep [option:text,text]
+%TC:macro \citet [option:text,text]
+%TC:envir table 0 1
+%TC:envir table* 0 1
+%TC:envir tabular [ignore] word
+%TC:envir displaymath 0 word
+%TC:envir math 0 word
+%TC:envir comment 0 0
+%TCMACROS
+%%
%%
%% The first command in your LaTeX source must be the \documentclass command.
%<manuscript>\documentclass[manuscript,screen,review]{acmart}
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx
index c9295ed617..b990509cef 100644
--- a/macros/latex/contrib/easybook/easybook.dtx
+++ b/macros/latex/contrib/easybook/easybook.dtx
@@ -23,11 +23,11 @@
%
% \changes{v1.20}{2021/01/09}{修改和完善用户文档。}
% \changes{v1.20}{2021/01/09}{模板更改为使用 CC-BY 许可协议。}
-% \changes{v1.25m}{2021/05/03}{取消附带的示例文件,可查看历史版本及其它来源的使用样例。}
+% \changes{v1.25n}{2021/05/03}{取消附带的示例文件,可查看历史版本及其它来源的使用样例。}
%
% \title{\sffamily easybook 文档类手册}
% \author{瞿毅}
-% \date{2021/05/19\hskip\ccwd\relax v1.25m\thanks{\url{https://gitee.com/texl3/easybook}}}
+% \date{2021/05/21\hskip\ccwd\relax v1.25n\thanks{\url{https://gitee.com/texl3/easybook}}}
%
% \maketitle
% \begin{abstract}
@@ -117,7 +117,7 @@
% \end{syntax}
% 传递给 \cls{ctexbook} 设置字体,最好不要使用原有的 \opt{fontset} 选项,默认情况下使用自定义字体而不开启这个选项,可根据安装的字体及电脑系统选取。\opt{noto} 与 \opt{none} 选项的相关描述见小节 \ref{subsec:font settings},\opt{overleaf} 是一个各系统通用选项,会检测系统环境选取对应字体。
% \changes{v1.21}{2021/01/12}{默认字体与 \CTeX 一致,不再是自定义字体。}
-% \changes{v1.25m}{2021/05/04}{修复使用 \pkg{xeCJK} 与 \pkg{fontspec} 宏包的字体设置命令在 \hologo{LuaLaTeX} 下失效的问题。}
+% \changes{v1.25n}{2021/05/04}{修复使用 \pkg{xeCJK} 与 \pkg{fontspec} 宏包的字体设置命令在 \hologo{LuaLaTeX} 下失效的问题。}
% \end{function}
%
% \begin{function}[rEXP,added = 2021-01-05,updated = 2021-01-13]{paper}
@@ -168,7 +168,7 @@
% \tn{listoflistings*+}\oarg{键值列表}
% \end{syntax}
% \tn{listoffigures} 命令输出图片目录,\tn{listoftables} 输出表格目录,\tn{listoflistings} 输出代码目录。带有星号的目录命令不将标题添加进主文档目录,带有+号的目录命令可以使当前标题编号。\tn{tableofcontents+} 与其它命令不同是用于输出双语目录,需要与双语目录标题命令 \tn{bichapter} 等或设置图片、表格和代码等英文目录的标题配合使用,附加代码是中文与英文目录之间的代码,可以插入文本和换页命令等。目录的键值列表选项如下
-% \changes{v1.25m}{2021/05/05}{命令 \tn{tableofcontents} 可以输出双语目录。}
+% \changes{v1.25n}{2021/05/05}{命令 \tn{tableofcontents} 可以输出双语目录。}
% \end{function}
%
% \begin{function}{multoc,title,format,aftertitle,pagestyle,book,article}
@@ -199,7 +199,7 @@
% 双语目录的标题命令目前设置了常用的三个级别,它们将中文标题正常输出,并使中英文标题加入双语目录,这个功能是为国内一些大学的学位论文模板的要求设计,在一般情况和英文模式下不需要使用。
%
% 它们的星号变体命令使文中标题不编号,但是仍然加入双语目录,若英文标题参数空置那么仅加入中文目录而不加入英文目录,这一特点与 \tn{chapter*} 等命令的行为不太一样,在一些情况下会用到。可选参数是目录中的中文标题,默认与中文标题一致,正文标题过长时可用它设置在目录中显示的标题。双语目录的格式是一致的,共享使用 \tn{tocset} 的设置,英文目录的章级别标题名及编号的修改方式如下
-% \changes{v1.25m}{2021/05/05}{增加与双语目录配合的标题命令。}
+% \changes{v1.25n}{2021/05/05}{增加与双语目录配合的标题命令。}
% \end{function}
%
% \begin{function}{biname,binmuber}
@@ -299,7 +299,7 @@
% \changes{v1.10}{2021/01/08}{修复了 \opt{linktopage} 选项关闭时目录中标题编号无超链接的问题。}
% \changes{v1.23}{2021/03/19}{修复在 \pkg{ctex} v2.5.6 更新后 \cls{easybook} 与 \pkg{hyperref} 冲突问题。}
% \changes{v1.24}{2021/04/05}{增加 \pkg{hyperref} 超链接选项完整的支持。}
-% \changes{v1.25m}{2021/05/06}{模块名 \opt{link} 改为 \opt{refset},\opt{link} 作为兼容性保留。}
+% \changes{v1.25n}{2021/05/06}{模块名 \opt{link} 改为 \opt{refset},\opt{link} 作为兼容性保留。}
% \end{function}
%
% \begin{optdesc}
@@ -356,7 +356,7 @@
% \ding{229} 以上选项路径为 \opt{subfont/...}
% \changes{v1.10}{2021/01/08}{加入自定义非正文字体选项。}
% \changes{v1.23}{2021/02/08}{修复使用 \tn{zihao} 命令设置字体失效的问题。}
-% \changes{v1.25m}{2021/05/19}{其它字体模块名由 \opt{elsefont} 改为 \opt{subfont},并增加数学字体的选项 \opt{subfont/math}。}
+% \changes{v1.25n}{2021/05/21}{其它字体模块名由 \opt{elsefont} 改为 \opt{subfont},并增加数学字体的选项 \opt{subfont/math}。}
% \end{function}
%
% \begin{optdesc}
@@ -381,7 +381,7 @@
% \changes{v1.21}{2021/01/11}{增加 \opt{bibset} 选项,可以使用 \hologo{BibTeX} 或 \hologo{biber} 编译参考文献。}
% \changes{v1.23}{2021/02/23}{使用 \opt{bibset} 选项时可设置标注风格。}
% \changes{v1.24}{2021/04/09}{可以不载入参考文献包手动配置参考文献格式。}
-% \changes{v1.25m}{2021/05/12}{取消 \opt{bib-loadpkg} 选项,由是否设置参考文献数据库来决定载入宏包。}
+% \changes{v1.25n}{2021/05/12}{取消 \opt{bib-loadpkg} 选项,由是否设置参考文献数据库来决定载入宏包。}
% \end{function}
%
% \begin{optdesc}
@@ -574,8 +574,8 @@
% \ding{229} 以上选项路径为 \opt{hdrset/...} \\
% 上面几个选项用于设置脚注格式,\opt{fnparskip} 和 \opt{fnparindent} 选项仅在 \opt{fnhang = true} 时有效。\opt{fnhang} 用于将脚注设置为悬挂缩进的格式,\opt{fnmark-pos} 选项设置脚注编号的位置,正常文本或是上标形式。\opt{fnmark-num} 选项设置脚注编号的格式,默认为原生样式 \opt{plain},还可以改为 \opt{pifont} 的各个版本,从左往右依次为普通版、阴文衬线版、阳文无衬线版和阴文无衬线版,缺点是它们的编号仅包括1-10。
%
-% \opt{fnmark-form} 是脚注标记的格式,默认为空,在此设置字体命令会覆盖 \opt{subfont/footnote} 的设置,最后一个格式命令可以带有一个参数,这个参数接受脚注编号,一般配合 \opt{fnmark-num = plain} 使用。\opt{afterfnmark} 是脚注标记后的代码,一般用于设置标记与文本间的距离。
-% \changes{v1.25m}{2021/05/12}{增加脚注样式设置选项。}
+% \opt{fnmark-form} 是脚注标记的格式,在此设置字体命令会覆盖 \opt{subfont/footnote} 的设置,最后一个格式命令可以带有一个参数,这个参数接受脚注编号,一般配合 \opt{fnmark-num = plain} 使用。\opt{afterfnmark} 是脚注标记后的代码,一般用于设置标记与文本间的距离。
+% \changes{v1.25n}{2021/05/12}{增加脚注样式设置选项。}
% \end{function}
%
% \subsection{目录样式}
@@ -594,7 +594,7 @@
% \opt{format} 是目录中标题的格式,可以设置字体和加入垂直间距等,垂直间距最好使用无间距重合的 \tn{addvspace} 命令,带有加号的 \opt{format+} 选项用于在已有的格式命令后附加内容。\opt{indent} 是目录中标题在页面左侧的缩进距离,应该有长度单位。\opt{rule} 选项中一般应当使用 \tn{tocrule} 命令,将会在接下来介绍。\opt{numsep} 是有编号的标题在目录中编号与标题的间距。
% \changes{v1.21}{2021/01/13}{增加配置目录样式的选项。}
% \changes{v1.24}{2021/04/20}{增加目录中编号与标题的间距选项 \opt{numsep}。}
-% \changes{v1.25m}{2021/05/14}{可以分别设置图片、表格和代码目录的格式。}
+% \changes{v1.25n}{2021/05/14}{可以分别设置图片、表格和代码目录的格式。}
% \end{function}
%
% \begin{function}[added = 2021-01-13,updated = 2021-04-20]{\tocrule,\EbNumberLine}
@@ -642,7 +642,7 @@
%
% \begin{optdesc}
% \item[lolskip] \opt{lolskip} 是代码目录中章之间的代码标题的距离,与 \CTeX 的表格目录和图片目录中章之间的标题距离选项 \opt{lotskip} 和 \opt{lofskip} 类似,它们的值均默认0.8 pc,在 \opt{article} 模式中此选项失效。
-% \item[belowoffset] \opt{belowoffset} 选项为主目录标题 \tn{contentsname} 后的间距补偿,一般为负值,用于抵消 \opt{format} 中设置的垂直间距。\opt{(level)} 中的 \opt{belowoffset} 与之意义类似,代表 figure、table 和 lstlisting 三个级别,也可以使用 \opt{list} 统一设置,一般为正值。建议距离 \opt{lolskip(0.8pc) + (level)/format/addvspace(0.2pc) + (level)/belowoffset(0pc) = belowoffset(-1pc)}。
+% \item[belowoffset] \opt{belowoffset} 选项为主文档目录标题下方的间距补偿,一般为负值,用于抵消 \opt{format} 中额外的垂直间距。\opt{(level)} 中的 \opt{belowoffset} 与之意义类似,代表 figure、table 和 lstlisting 三个级别,也可以使用 \opt{list} 统一设置,一般为正值。
% \item[tocline] 目录标签整体使用 \opt{tocline} 设置,在图表标签的参数中 \#1 代表编号,代码标签中则是 \tn{thelstlisting} 代表编号,标签中还可包含标签名称,默认标签名称与图、表和代码环境的标题名称一致。下面举个设置标签的例子
% \begin{ctexexam}
% \tocset
@@ -679,7 +679,7 @@
% \tn{end}\marg{环境名}
% \end{syntax}
% \pkg{tabularray} 是一个较新的宏包,不仅提供了 \pkg{tabularx}、\pkg{multirow}、和 \pkg{booktabs} 宏包的功能,并且不依赖其它宏包与它们同时使用不会产生冲突,还实现了用简便的键值列表方式设置表格样式。目前除了表头斜线以及跨页功能存在不足,其它方面已满足对表格绝大多数格式的需求,具体用法可见宏包的说明文档。
-% \changes{v1.25m}{2021/05/17}{使用功能更便捷齐全的 \pkg{tabularray} 宏包设置表格样式。}
+% \changes{v1.25n}{2021/05/17}{使用功能更便捷齐全的 \pkg{tabularray} 宏包设置表格样式。}
% \end{function}
%
% \subsection{列表}
@@ -744,13 +744,13 @@
%
% \subsection{习题}
% \label{subsec:exercise}
-% \begin{function}[added = 2021-01-05,updated = 2021-04-19]{exercise}
+% \begin{function}[added = 2021-01-05,updated = 2021-05-21]{exercise}
% \begin{syntax}
% \tn{begin}\marg{exercise}*+\oarg{颜色名|(LightSkyBlue)}\oarg{编号|(1.)}\parg{标题|(习题)}\oarg{配置选项}\oarg{序言}
% \ \tn{item} <习题内容>
% \tn{end}\marg{exercise}
% \end{syntax}
-% 习题环境 \env{exercise} 的标题紧接上一节编号并加入目录与页眉,当使用星号参数时不进行编号,使用+号参数启用 \pkg{tcolorbox} 支持生成标题。\meta{颜色名} 选项在使用+号参数时有效,其中颜色为自定义或 \pkg{xcolor} 包含的颜色名称。题目编号格式与小节 \ref{subsec:sort list} 排序列表相同,标题名默认为习题。
+% 习题环境 \env{exercise} 的标题紧接上一节编号并加入目录与页眉,当使用星号参数时不进行编号,使用+号参数独立编号并启用 \pkg{tcolorbox} 支持生成标题。\meta{颜色名} 选项在使用+号参数时有效,其中颜色为自定义或 \pkg{xcolor} 包含的颜色名称。题目编号格式与小节 \ref{subsec:sort list} 排序列表相同,标题名默认为习题。
%
% 配置选项在是否使用+号参数时用法不同,使用+号参数时为 \pkg{tcolorbox} 的盒子选项,例如 \opt{boxrule} 和 \opt{fontupper}。不使用+号参数时相当于设置 \tn{ctexset}\{section = {\#1}\} 键值选项列表,例如 \opt{format} 和 \opt{beforeskip}。\meta{序言} 选项用于在习题环境开始前插入一段内容,可以是文本或者代码。注意,环境具有相同定界符的可选参数只能\textbf{从右往左}省略,省略的参数使用默认值。
% \changes{v1.23}{2021/02/08}{增加准确的习题盒子标题目录锚点。}
@@ -843,7 +843,7 @@
% \tn{qtyrange}\oarg{键值列表}\marg{数字1}\marg{数字2}\marg{单位}
% \end{syntax}
% \pkg{siunitx} 宏包的 \tn{num} 命令可以输出以科学计数法表示的数值,单位格式化命令 \tn{unit} 包含文字项目(例如字母或数字)时,使用 . 和 \~{} 放置在单元乘积中间,并使用 \_ 和 \^{} 正确放置指定的下标和上标。格式化方法可在数学和文本模式下使用。而 \tn{qty} 命令可用来输出带有单位的量,\tn{qtyrange} 可以输出带有范围和单位的量。
-% \changes{v1.25m}{2021/05/18}{\pkg{siunitx} 宏包 v3.0.0 更新后用法改变,修改相关配置选项。}
+% \changes{v1.25n}{2021/05/18}{\pkg{siunitx} 宏包 v3.0.0 更新后用法改变,修改相关配置选项。}
% \end{function}
%
% \begin{ctexexam}
@@ -980,7 +980,7 @@
%<*class>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplClass{easybook}{2021/05/19}{1.25m}{beta}
+\ProvidesExplClass{easybook}{2021/05/21}{1.25n}{beta}
\cs_generate_variant:Nn \eb_ctex_define:nn { nx }
\cs_generate_variant:Nn \int_to_arabic:n { v }
@@ -1953,10 +1953,10 @@
\ifbool{@twocolumn}
{
\booltrue{@restonecol}
- \bool_if:NTF \l__eb_multoc_bool { \twocolumn } { \onecolumn }
+ \bool_if:NF \l__eb_multoc_bool { \onecolumn }
}{
\boolfalse{@restonecol}
- \bool_if:NTF \l__eb_multoc_bool { \twocolumn } { \onecolumn }
+ \bool_if:NT \l__eb_multoc_bool { \twocolumn }
}
}
{ \tl_set:Nn \l__eb_toc_type_tl { article } }
@@ -2294,8 +2294,8 @@
itemsep = .75ex plus .1ex,topsep = .75ex plus .1ex,
partopsep = 0ex,parsep = 0ex
}
-\newlist{outlinelist}{itemize}{1}
-\setlist[outlinelist]{label = outline,itemsep = .5ex plus .1ex}
+\newlist{eb@outline@list}{itemize}{1}
+\setlist[eb@outline@list]{label = outline,itemsep = .5ex plus .1ex}
\setlist[itemize,1]{label = bullet}
\setlist[itemize,2]{label = endash}
\setlist[itemize,3]{label = asterisk}
@@ -2517,12 +2517,13 @@
fonttitle = \sffamily,
boxrule = \l__eb_rule_width_dim
}
+ \newtcbox[auto~counter]{\eb@exercise@box}[1]{tc-exercise,#1}
\NewDocumentEnvironment{outline}{O{}D(){\abstractname}o+b}
{
\begin{tcolorbox}[tc-outline,title = #2,IfValueT = {#3}{#3}]
- \begin{outlinelist}[#1]
+ \begin{eb@outline@list}[#1]
#4
- \end{outlinelist}
+ \end{eb@outline@list}
\end{tcolorbox}
}{}
\NewDocumentEnvironment{exercise}
@@ -2530,19 +2531,19 @@
{
\IfBooleanTF{#2}
{
- \tcbox[
- tc-exercise,
- fuzzy~halo = 5pt~with~#3,
- IfValueT = {#6}{#6},
- phantom =
- \IfBooleanF{#1}
- {
- \CTEX@ifnametrue
- \refstepcounter{section}
- \markright{\CTEXthesection\hspace{0.5\ccwd}#5}
- \CTEX@addtocline{section}{#5}
- }
- ]{\IfBooleanF{#1}{\CTEXthesection\hspace{0.5\ccwd}}#5}
+ \eb@exercise@box
+ {
+ fuzzy~halo = 5pt~with~#3,
+ IfValueT = {#6}{#6},
+ phantom =
+ \IfBooleanF{#1}
+ {
+ \markright{\thetcbcounter\hspace{0.5\ccwd}#5}
+ \addcontentsline{toc}{section}
+ {\thetcbcounter\hspace{\eb@toc@section@numsep}#5}
+ }
+ }
+ {\IfBooleanF{#1}{\thetcbcounter\hspace{0.5\ccwd}}#5}
}{
\group_begin:
\ctex_set:nn { section } { format += \centering }
diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf
index 8e42cef60f..2e2c1c01c6 100644
--- a/macros/latex/contrib/easybook/easybook.pdf
+++ b/macros/latex/contrib/easybook/easybook.pdf
Binary files differ
diff --git a/macros/latex/contrib/fontsize/fontsize.dtx b/macros/latex/contrib/fontsize/fontsize.dtx
index 9c9c7fdeb5..53dab90cc0 100644
--- a/macros/latex/contrib/fontsize/fontsize.dtx
+++ b/macros/latex/contrib/fontsize/fontsize.dtx
@@ -56,7 +56,7 @@ This work has the LPPL maintenance status "author-maintained".
%<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
%<package>\ProvidesPackage{fontsize}
%<*package>
- [2021/04/18 v0.8.3 'fontsize' package. Set main font sizes (Ivan Valbusa)]
+ [2021/05/21 v0.8.4 'fontsize' package. Set main font sizes (Ivan Valbusa)]
%</package>
%<*driver>
\documentclass[12pt]{ltxdoc}
@@ -287,6 +287,7 @@ This work has the LPPL maintenance status "author-maintained".
% Right brace \} Tilde \~}
%
%
+% \changes{v0.8.4}{2021/05/21}{Maintenance release.}
% \changes{v0.8.3}{2021/04/18}{Corrected a bug in the \cmd{parindent} option.
% Updated documentation.}
% \changes{v0.8.2}{2021/04/17}{New \cmd{parindent} option. Updated documentation.}
@@ -741,16 +742,30 @@ This work has the LPPL maintenance status "author-maintained".
%
%^^A---------------------------------------------------------------------
%
-% \section{Some text samples}\label{sec:example}
+% \subsection{Some text samples}\label{sec:example}
%
%^^A--------------------------------------------------------------------
% 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]
+% \printsamples{12.6pt}{10.6pt}[normalsize,normalsizer,normalsizerr,
+% normalsizerrr,large,larger,largerr,largerr]
%\end{verbatim}
+% \printsamples{12.6pt}{10.6pt}[%
+% normalsize,normalsizer,normalsizerr,
+% normalsizerrr,large,larger,largerr,largerr]
%
-% \printsamples{12.6pt}{10.6pt}[normalsizerr,normalsizerrr,large,larger,largerr]
+%^^A---------------------------------------------------------------------
+%
+% \section{Known issues}
+%
+%^^A--------------------------------------------------------------------
+%
+% The \opt{parindent} option does not work with classes and packages which sets \cmd{parindent}
+% inside the \cmd{AtBeginDocument} hook (and other hooks). Among these is the \sty{tufte}
+% class \parencite{tufte}. In such cases you can set the default
+% indentation, for example, with \cmd{setlength}|{parindent}|\arm{dimen}
+% declared \textit{after} |\begin{document}|.
%
% \StopEventually{%
% \printbibliography[heading=bibintoc]
@@ -877,7 +892,8 @@ This work has the LPPL maintenance status "author-maintained".
% the maximum dimension that may be stored in plain
% \TeX\ and \LaTeX.
% The problem, which is probably more theoretical than practical,
-% can be solved (thanks to Claudio Beccari) simply by changing it to this:
+% can be solved simply by replacing
+% the above code with this (thanks to Claudio Beccari):
% \baddition
% \begin{macrocode}
\setlength{\@tempdimc}{\fpeval{100*\@tempdimb/\@tempdima}pt}%
@@ -1295,13 +1311,16 @@ This work has the LPPL maintenance status "author-maintained".
% \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
-% in lengths affected by \sty{fontsize} inside the \file{bk*.clo} files only concern
+% in the 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@}%
-\setlength\medskipamount{\fpeval{1.090909091\@tempdimb/2}pt \@plus 2\p@ \@minus 2\p@}%
-\setlength\bigskipamount{\fpeval{1.090909091\@tempdimb}pt \@plus 4\p@ \@minus 4\p@}%
+\setlength\smallskipamount{
+ \fpeval{1.090909091\@tempdimb/4}pt \@plus 1\p@ \@minus 1\p@}%
+\setlength\medskipamount{
+ \fpeval{1.090909091\@tempdimb/2}pt \@plus 2\p@ \@minus 2\p@}%
+\setlength\bigskipamount{
+ \fpeval{1.090909091\@tempdimb}pt \@plus 4\p@ \@minus 4\p@}%
% \end{macrocode}
% \eaddition
% \def\tabfontsize{\fontsize{10.5}{12.5}\selectfont}
@@ -1456,7 +1475,7 @@ This work has the LPPL maintenance status "author-maintained".
%
% 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
+% There are no reserved names for the \file{.clo} files. The name of the command is
% a new name for the KOMA \cmd{generatefontfile}. In fact what the command
% generates is a \file{.clo} file.
% \begin{macrocode}
@@ -2058,7 +2077,7 @@ This work has the LPPL maintenance status "author-maintained".
LARGE,LARGEr,LARGErr,LARGErrr,
huge,huger,hugerr,hugerrr,
Huge,Huger,Hugerr,Hugerrr,
- HGE,HUGEr,HUGErr,HUGErrr,
+ HUGE,HUGEr,HUGErr,HUGErrr,
}
}
{
@@ -2103,7 +2122,7 @@ This work has the LPPL maintenance status "author-maintained".
% \iffalse
%<*bib>
@manual{xkeyval,
- title = {The \textsf{xkeyval} package},
+ title = {The \sty{xkeyval} package},
subtitle = {Extension of the keyval package},
author = {Adriaens, Hendri},
url = {http://www.ctan.org/pkg/xkeyval},
@@ -2150,12 +2169,23 @@ This work has the LPPL maintenance status "author-maintained".
}
@manual{xfp,
- title = {The \textit{xfp} package Floating Point Unit},
+ title = {The \sty{xfp} package Floating Point Unit},
author = {{The \LaTeX\ Project}},
url = {https://www.ctan.org/pkg/xfp},
urldate = {2021-03-14},
date = {2021-03-12},
}
+
+@manual{tufte,
+ title = {\sty{tufte-latex} – Document classes inspired by the work of Edward Tufte},
+ author = {Kevin Godby},
+ url = {https://www.ctan.org/pkg/tufte-latex},
+ urldate = {2021-05-18},
+ date = {2015},
+ version = {3.5.2}
+}
+
+
%</bib>
% \fi
% \Finale
diff --git a/macros/latex/contrib/fontsize/fontsize.pdf b/macros/latex/contrib/fontsize/fontsize.pdf
index 7dd7a0d45b..adfe679760 100644
--- a/macros/latex/contrib/fontsize/fontsize.pdf
+++ b/macros/latex/contrib/fontsize/fontsize.pdf
Binary files differ
diff --git a/macros/latex/contrib/projlib/ProjLib-doc-cn.pdf b/macros/latex/contrib/projlib/ProjLib-doc-cn.pdf
index 760b4b99c8..090fa0463b 100644
--- a/macros/latex/contrib/projlib/ProjLib-doc-cn.pdf
+++ b/macros/latex/contrib/projlib/ProjLib-doc-cn.pdf
Binary files differ
diff --git a/macros/latex/contrib/projlib/ProjLib-doc-cn.tex b/macros/latex/contrib/projlib/ProjLib-doc-cn.tex
index dfbedaf726..65c2f0ac2c 100644
--- a/macros/latex/contrib/projlib/ProjLib-doc-cn.tex
+++ b/macros/latex/contrib/projlib/ProjLib-doc-cn.tex
@@ -78,7 +78,7 @@
\title{\ProjLib{} 工具集\\[.3\baselineskip]\normalsize 使用指南}
\author{许锦文}
-\thanks{对应版本.~~\texttt{\ProjLib{}~2021/05/19}}
+\thanks{对应版本.~~\texttt{\ProjLib{}~2021/05/20}}
\date{2021年5月,北京}
\maketitle
@@ -124,9 +124,9 @@
\begin{itemize}
\item 加载 \PJLamssim{}。关于其详细功能,请参阅有关这一宏包的小节。
\end{itemize}
- \item \texttt{nothms}
+ \item \texttt{nothms}、\texttt{regionalref}
\begin{itemize}
- \item 不设定定理类环境。如果你希望使用自己的定理样式,可以使用这一选项。
+ \item 来自 \PJLthm{} 的选项,详细信息请参阅有关这一宏包的小节。
\end{itemize}
\end{itemize}
另外,还有一些组件的参数可以作为文档类的全局参数传递,例如 \PJLpaper{} 的 \texttt{paperstyle} 和 \texttt{preview} 等。详细信息可以参阅对应的小节。
@@ -271,6 +271,10 @@
\begin{itemize}
\item 不设定定理类环境。如果你希望使用自己的定理样式,可以使用这一选项。
\end{itemize}
+ \item \texttt{regionalref}
+ \begin{itemize}
+ \item 在智能引用时,定理类环境的名称随当前语言而变化(默认情况下,引用时会始终采用定理类环境所处语境下的名称;例如,在英文语境中书写的定理,即使稍后在中文语境下引用时,仍将显示为 Theorem)。在 \texttt{fast} 模式下,这一选项默认启用。
+ \end{itemize}
\end{itemize}
预设的定理类环境包括:\texttt{assumption}、\texttt{axiom}、\texttt{conjecture}、\texttt{convention}、\texttt{corollary}、\texttt{definition}、\texttt{definition-proposition}、\texttt{definition-theorem}、\texttt{example}、\texttt{exercise}、\texttt{fact}、\texttt{hypothesis}、\texttt{lemma}、\texttt{notation}、\texttt{problem}、\texttt{property}、\texttt{proposition}、\texttt{question}、\texttt{remark}、\texttt{theorem},以及相应的带有星号 \lstinline|*| 的无编号版本。这些定理类环境在显示时会依据当前语言而相应变化,例如在中文模式下 \texttt{theorem} 会显示为“定理”,而在英文模式下则会显示为“Theorem”。关于如何选定语言,请参阅关于 \PJLlang{} 的小节。
@@ -346,17 +350,17 @@
\end{proofidea}
-\bigskip
+\medskip
\section{目前存在的问题}
-\begin{itemize}[itemsep=1em]
+\begin{itemize}[itemsep=.6em]
\item \PJLauthor{} 仍然处于初步阶段,在很多方面还远远比不上相对成熟的 \textsf{authblk}。
\item \PJLlang{}:针对 \textsf{polyglossia} 的设置仍然存在许多问题,因此现在主要功能都是通过 \textsf{babel} 实现的。
\item \PJLpaper{} 的 \texttt{preview} 功能主要是通过 \textsf{geometry} 宏包实现的,因此在 \textsc{\textsf{Koma}} 文档类中效果不好。
\item \PJLthm{} 对于定理类环境的编号与样式设定目前还无法由用户更改。
\item \PJLthm{}:智能引用针对所有 \PJLlang{} 已支持语言的本地化尚不完整,主要是中文、日文与俄文。
\item 错误处理功能不完善,在出现一些问题时没有相应的错误提示。
- \item 代码中有许多可优化之处,有些部分耗时过长,特别是 \PJLthm{} 对定理类环境的定义。
+ \item 代码中仍有许多可优化之处,有些部分耗时过长,特别是 \PJLthm{} 对定理类环境的定义。
\end{itemize}
diff --git a/macros/latex/contrib/projlib/ProjLib-doc-en.pdf b/macros/latex/contrib/projlib/ProjLib-doc-en.pdf
index 9f651971aa..f4ebb70a96 100644
--- a/macros/latex/contrib/projlib/ProjLib-doc-en.pdf
+++ b/macros/latex/contrib/projlib/ProjLib-doc-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/projlib/ProjLib-doc-en.tex b/macros/latex/contrib/projlib/ProjLib-doc-en.tex
index 82a1aeda3b..b89c62a660 100644
--- a/macros/latex/contrib/projlib/ProjLib-doc-en.tex
+++ b/macros/latex/contrib/projlib/ProjLib-doc-en.tex
@@ -76,7 +76,7 @@
\title{\ProjLib{}~~Toolkit\\[.3\baselineskip]\normalsize User Manual}
\author{Jinwen Xu}
-\thanks{Corresponding to: \texttt{\ProjLib{}~2021/05/19}}
+\thanks{Corresponding to: \texttt{\ProjLib{}~2021/05/20}}
\date{May 2021, Beijing}
\maketitle
@@ -110,7 +110,7 @@ Just add the following line to your preamble:
\begin{itemize}
\item Fast mode. The functionality is appropriately reduced to get faster compilation speed, recommended to use during the writing phase.
\end{itemize}
- \item \texttt{palatino}、\texttt{times}、\texttt{garamond}、\texttt{biolinum}
+ \item \texttt{palatino}, \texttt{times}, \texttt{garamond}, \texttt{biolinum}
\begin{itemize}
\item Font options. As the name suggest, font with corresponding name will be loaded.
\end{itemize}
@@ -122,9 +122,9 @@ Just add the following line to your preamble:
\begin{itemize}
\item Load \PJLamssim{}. For more information about its functionality, see the section on this package.
\end{itemize}
- \item \texttt{nothms}
+ \item \texttt{nothms}, \texttt{regionalref}
\begin{itemize}
- \item The theorem-like environments will not be defined. You should use this option if you wish to apply your own theorem styles.
+ \item Options from \PJLthm{}, please refer to the section on this package for details.
\end{itemize}
\end{itemize}
In addition, there are also some options of the components that can (and should) be passed as global options of the document class, such as \texttt{paperstyle} and \texttt{preview} of \PJLpaper{}. For more information, please refer to the corresponding section.
@@ -246,7 +246,7 @@ For example, \lstinline|\AddLanguageSetting(German){\color{orange}}| can make al
\begin{itemize}
\item Set the paper color style. The options available for \meta{paper style name} are: \texttt{yellow}, \texttt{dark} and \texttt{nord}.
\end{itemize}
- \item \texttt{yellowpaper}、\texttt{darkpaper}、\texttt{nordpaper}
+ \item \texttt{yellowpaper}, \texttt{darkpaper}, \texttt{nordpaper}
\begin{itemize}
\item Set the paper color style. The effect is the same as \texttt{paperstyle} with the corresponding \meta{paper style name} specified.
\end{itemize}
@@ -261,11 +261,15 @@ It is recommended to pass these options as global options of the document class.
\subsection{PJLthm}
\PJLthm{} offers the configuration of theorem-like environments. It has the following option:
-% \vspace{-.3\baselineskip}
+
\begin{itemize}
\item \texttt{nothms}
\begin{itemize}
- \item The theorem-like environments will not be defined. You should use this option if you wish to apply your own theorem styles.
+ \item The theorem-like environments will not be defined. You may use this option if you wish to apply your own theorem styles.
+ \end{itemize}
+ \item \texttt{regionalref}
+ \begin{itemize}
+ \item When referencing, the name of the theorem-like environment changes with the current language (by default, the name will always remain the same; for example, when referencing a theorem written in the French context, even if one is currently in the English context, it will still be displayed as ``Théorème''). In \texttt{fast} mode, this option is automatically enabled.
\end{itemize}
\end{itemize}
@@ -287,7 +291,7 @@ If you need to define a new theorem-like environment, you must first define the
If you want to define an environment with an asterisk \lstinline|*| after the name, you don't need to write an asterisk in the \meta{name of environment} above. See the example below.
\end{remind}
-\medskip
+\clearpage% \medskip
And then define this environment in one of following five ways:
\begin{itemize}
\item \lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}|
@@ -354,11 +358,11 @@ defines an unnumbered environment \lstinline|proofidea*| and a numbered environm
\item \PJLthm{}: The numbering and theorem-style settings of the theorem-like environments cannot be accessed by the user at present.
\item \PJLthm{}: The localization of \textsf{cleveref} is not yet complete for all supported languages of \PJLlang{}, especially for Chinese, Japanese and Russian.
\item The error handling mechanism is incomplete: there is no corresponding error prompt when some problems occur.
- \item There are many things that can be optimized in the code. Some codes take too long to run, especially the definition of theorem-like environments in \PJLthm{}.
+ \item There are still many things that can be optimized in the code. Some takes too long to run, especially the definition of theorem-like environments in \PJLthm{}.
\end{itemize}
-\clearpage
+\medskip % \clearpage
\section{Usage example}
\subsection{Standard classes}
diff --git a/macros/latex/contrib/projlib/ProjLib.dtx b/macros/latex/contrib/projlib/ProjLib.dtx
index 94e4aa5d8e..12abe0328e 100644
--- a/macros/latex/contrib/projlib/ProjLib.dtx
+++ b/macros/latex/contrib/projlib/ProjLib.dtx
@@ -18,47 +18,47 @@
%
%<*PJLamssim>
\ProvidesPackage{PJLamssim}
- [2021/05/19 Simulate some features of amsart]
+ [2021/05/20 Simulate some features of amsart]
%</PJLamssim>
%
%<*PJLauthor>
\ProvidesPackage{PJLauthor}
- [2021/05/19 Enhanced author information block]
+ [2021/05/20 Enhanced author information block]
%</PJLauthor>
%
%<*PJLdate>
\ProvidesPackage{PJLdate}
- [2021/05/19 Convert yyyy-mm-dd to normal datetime format]
+ [2021/05/20 Convert yyyy-mm-dd to normal datetime format]
%</PJLdate>
%
%<*PJLdraft>
\ProvidesPackage{PJLdraft}
- [2021/05/19 Some useful macros for the draft stage]
+ [2021/05/20 Some useful macros for the draft stage]
%</PJLdraft>
%
%<*PJLlang>
\ProvidesPackage{PJLlang}
- [2021/05/19 Multi-language configuration]
+ [2021/05/20 Multi-language configuration]
%</PJLlang>
%
%<*PJLlogo>
\ProvidesPackage{PJLlogo}
- [2021/05/19 The ProjLib logo]
+ [2021/05/20 The ProjLib logo]
%</PJLlogo>
%
%<*PJLpaper>
\ProvidesPackage{PJLpaper}
- [2021/05/19 Paper style configuration]
+ [2021/05/20 Paper style configuration]
%</PJLpaper>
%
%<*PJLthm>
\ProvidesPackage{PJLthm}
- [2021/05/19 Theorem setup and configuration]
+ [2021/05/20 Theorem setup and configuration]
%</PJLthm>
%
%<*PJLtoolkit>
\ProvidesPackage{PJLtoolkit}
- [2021/05/19 Collective interface of ProjLib Toolkit]
+ [2021/05/20 Collective interface of ProjLib Toolkit]
%</PJLtoolkit>
%
\RequirePackage{kvoptions}
@@ -764,7 +764,12 @@
prefix = @PJLthm@
}
\DeclareBoolOption[false]{nothms}
+\DeclareBoolOption[false]{fast}
+\DeclareBoolOption[false]{regionalref}
\ProcessKeyvalOptions*\relax
+\if@PJLthm@fast
+ \@PJLthm@regionalreftrue
+\fi
\RequirePackage{PJLlang}
\RequirePackage{amsmath,amsthm}
@@ -787,6 +792,69 @@
{\expandafter\PassFirstToSecond%
\expandafter{\temp}{\endgroup\InnerCreateTheorem{#1}}}%
}%
+\if@PJLthm@regionalref
+\NewDocumentCommand{\InnerCreateTheorem}{mmmod<>d()}{%
+% #1 = star or no star
+% #2 = name of environment
+% #3 = emptiness or star to append to name of environment
+% #4 = numbered like
+% #5 = numbered within
+% #6 = existed environment
+ \IfBooleanTF{#1}{%
+ \IfValueTF{#4}
+ {\@firstoftwo}
+ {\IfValueTF{#5}{\@firstoftwo}{\@secondoftwo}}%
+ }{%
+ \IfValueTF{#4}
+ {\IfValueTF{#5}{\@firstoftwo}{\@secondoftwo}}{
+ \@secondoftwo}
+ }%
+ {%
+ \GenericError{}%
+ {\string\CreateTheorem\space syntax error\on@line}{%
+ You cannot call the starred variant with optional argument,\MessageBreak
+ nor call the unstarred variant with several optional arguments.}%
+ {}%
+ }{%
+ \IfValueTF{#6}{%
+ \IfBooleanTF{#1}{%
+ \ifcsmacro{#2#3}%
+ {\renewenvironment{#2#3}{\begin{#6*}}{\end{#6*}}}%
+ {\newenvironment{#2#3}{\begin{#6*}}{\end{#6*}}}%
+ }{%
+ \ifcsmacro{#2#3}%
+ {\renewenvironment{#2#3}{\begin{#6}}{\end{#6}}}%
+ {\newenvironment{#2#3}{\begin{#6}}{\end{#6}}}%
+ }
+ }{%
+ \IfBooleanTF{#1}{%
+ \newtheorem*{#2#3}{\csname#2name\csname\languagename ABBR\endcsname\endcsname}
+ }{%
+ \IfValueTF{#5}{%
+ \newtheorem{PJL#2#3}{\csname#2name\csname\languagename ABBR\endcsname\endcsname}[#5]%
+ \newaliascnt{#2#3}{PJL#2#3}%
+ }{%
+ \IfValueTF{#4}{%
+ \newtheorem{PJL#2#3}[#4]{\csname#2name\csname\languagename ABBR\endcsname\endcsname}
+ }{%
+ \newtheorem{PJL#2#3}{\csname#2name\csname\languagename ABBR\endcsname\endcsname}
+ \newaliascnt{#2#3}{PJL#2#3}%
+ }%
+ }%
+ \crefname{PJL#2#3}%
+ {\csname#2name\csname\languagename ABBR\endcsname\endcsname}%
+ {\csname#2name\csname\languagename ABBR\endcsname\endcsname}%
+ \Crefname{PJL#2#3}%
+ {\csname#2name\csname\languagename ABBR\endcsname\endcsname}%
+ {\csname#2name\csname\languagename ABBR\endcsname\endcsname}%
+ \NewDocumentEnvironment{#2#3}{}
+ {\begin{PJL#2#3}}
+ {\end{PJL#2#3}}
+ }%
+ }%
+ }%
+}%
+\else
\NewDocumentCommand{\InnerCreateTheorem}{mmmod<>d()}{%
% #1 = star or no star
% #2 = name of environment
@@ -853,7 +921,7 @@
\NewDocumentEnvironment{#2#3}{}
{\csname#2\csname\languagename ABBR\endcsname#3\endcsname}%
{\csname end#2\csname\languagename ABBR\endcsname#3\endcsname}%
- }
+ }%
}%
}%
\NewDocumentCommand{\CreateTheoremNumberedLikeAliasCounter}{mmm}{%
@@ -867,6 +935,7 @@
{\csname#1name#2\endcsname}%
{\csname#1name#2\endcsname}%
}%
+\fi
%% English theorems names
\def\theoremnameEN{Theorem}
@@ -1158,6 +1227,7 @@
\DeclareBoolOption[false]{author}
\DeclareBoolOption[false]{amssim}
\DeclareBoolOption[false]{nothms}
+\DeclareBoolOption[false]{regionalref}
\DeclareBoolOption[false]{palatino}
\DeclareBoolOption[false]{times}
\DeclareBoolOption[false]{garamond}
@@ -1170,10 +1240,14 @@
\PassOptionsToPackage{fast}{PJLdate}
\PassOptionsToPackage{fast}{PJLdraft}
\PassOptionsToPackage{fast}{PJLlogo}
+ \PassOptionsToPackage{fast}{PJLthm}
\fi
\if@PJLtoolkit@nothms
\PassOptionsToPackage{nothms}{PJLthm}
\fi
+\if@PJLtoolkit@regionalref
+ \PassOptionsToPackage{regionalref}{PJLthm}
+\fi
\if@PJLtoolkit@author
\RequirePackage{PJLauthor}
diff --git a/macros/latex/contrib/siunitx/CHANGELOG.md b/macros/latex/contrib/siunitx/CHANGELOG.md
index 3215c8926b..093b87bada 100644
--- a/macros/latex/contrib/siunitx/CHANGELOG.md
+++ b/macros/latex/contrib/siunitx/CHANGELOG.md
@@ -7,6 +7,15 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
## [Unreleased]
+## [v3.0.4]
+
+### Changed
+- Standardise and document the position of `\color` in negative values
+ within the code-level API
+
+### Fixed
+- Alignment of integers in tables when `parse-numbers = tables` (issue #442)
+
## [v3.0.3]
### Changed
@@ -1280,7 +1289,8 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
### Added
- First public testing release (as `si`)
-[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.0.3...HEAD
+[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.0.4...HEAD
+[v3.0.4]: https://github.com/josephwright/siunitx/compare/v3.0.3...v3.0.4
[v3.0.3]: https://github.com/josephwright/siunitx/compare/v3.0.2...v3.0.3
[v3.0.2]: https://github.com/josephwright/siunitx/compare/v3.0.1...v3.0.2
[v3.0.1]: https://github.com/josephwright/siunitx/compare/v3.0.0...v3.0.1
diff --git a/macros/latex/contrib/siunitx/siunitx-code.pdf b/macros/latex/contrib/siunitx/siunitx-code.pdf
index 16510233a4..718aeef446 100644
--- a/macros/latex/contrib/siunitx/siunitx-code.pdf
+++ b/macros/latex/contrib/siunitx/siunitx-code.pdf
Binary files differ
diff --git a/macros/latex/contrib/siunitx/siunitx-number.dtx b/macros/latex/contrib/siunitx/siunitx-number.dtx
index 3bedf3794c..dec433df02 100644
--- a/macros/latex/contrib/siunitx/siunitx-number.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-number.dtx
@@ -68,7 +68,9 @@
% \cs{color} is assumed to be available. Where the latter may apply, numbers
% should be printed inside a group: note that \TeX{} grouping is not added
% \emph{within} formatted numbers as they may need to be decomposed into parts
-% (see \cs{siunitx_number_output:NN}).
+% (see \cs{siunitx_number_output:NN}). Such a color will be the \emph{first}
+% part of the result, meaning that a test for an initial |\color| and following
+% brace group may be used to detect/remove/adjust this part.
%
% \section{Formatting numbers}
%
@@ -3008,6 +3010,7 @@
}
\cs_new:Npn \@@_output:nnnnnnn #1#2#3#4#5#6#7#8
{
+ \@@_output_color:n {#2}
\@@_output_comparator:nn {#1} {#8}
\@@_output_bracket:nn {#5} {#7}
\@@_output_sign:nnn {#1} {#2} {#8}
@@ -3045,6 +3048,17 @@
\@@_output_exponent:nnnn
}
% \end{macrocode}
+% As color for negative values applies to the \emph{whole} output, we have
+% to deal with it before anything else.
+% \begin{macrocode}
+\cs_new:Npn \@@_output_color:n #1
+ {
+ \bool_lazy_and:nnT
+ { \str_if_eq_p:nn {#1} { - } }
+ { ! \tl_if_empty_p:N \l_@@_negative_color_tl }
+ { \exp_not:N \color { \exp_not:V \l_@@_negative_color_tl } }
+ }
+% \end{macrocode}
% To get the spacing correct this needs to be an ordinary math character.
% \begin{macrocode}
\cs_new:Npn \@@_output_comparator:nn #1#2
@@ -3055,11 +3069,11 @@
}
% \end{macrocode}
% Formatting signs has to deal with some additional formatting requirements
-% for negative numbers. Both making such numbers a fixed color and bracketing
-% them needs some rearrangement of the order of tokens, which is set up in
-% the main formatting macro by the dedicated do-nothing end function. We
-% also have the comparator passed here: if it is present, we need to deal
-% with tighter spacing.
+% for negative numbers. Making such numbers by bracketing them needs some
+% rearrangement of the order of tokens, which is set up in the main
+% formatting macro by the dedicated do-nothing end function. We also have
+% the comparator passed here: if it is present, we need to deal with
+% tighter spacing.
% \begin{macrocode}
\cs_new:Npn \@@_output_sign:nnn #1#2#3
{
@@ -3071,8 +3085,6 @@
{
\str_if_eq:nnTF {#2} { - }
{
- \tl_if_empty:NF \l_@@_negative_color_tl
- { \@@_output_sign_color:w }
\bool_if:NTF \l_@@_bracket_negative_bool
{ \@@_output_sign_brackets:w }
{ \@@_output_sign:nN {#1} #2 }
@@ -3094,13 +3106,6 @@
{ \exp_not:n {#1} }
}
\cs_new:Npn
- \@@_output_sign_color:w #1 \@@_output_end:
- {
- \exp_not:N \color { \exp_not:V \l_@@_negative_color_tl }
- #1
- \@@_output_end:
- }
-\cs_new:Npn
\@@_output_sign_brackets:w #1 \@@_output_end:
{
\exp_not:V \l_@@_bracket_open_tl
diff --git a/macros/latex/contrib/siunitx/siunitx-table.dtx b/macros/latex/contrib/siunitx/siunitx-table.dtx
index f4ca1ec529..3f8673c2fc 100644
--- a/macros/latex/contrib/siunitx/siunitx-table.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-table.dtx
@@ -671,10 +671,11 @@
% \end{macrocode}
% \end{variable}
%
-% \begin{macro}{\@@_fil:}
-% A primitive renamed.
+% \begin{macro}{\@@_fil:, \@@_fill:}
+% Primitives renamed.
% \begin{macrocode}
\cs_new_eq:NN \@@_fil: \tex_hfil:D
+\cs_new_eq:NN \@@_fill: \tex_hfill:D
% \end{macrocode}
% \end{macro}
%
@@ -695,10 +696,10 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_color_check:N #1
{ \exp_after:wN \@@_color_check:w #1 \q_stop }
-\cs_new_protected:Npn \@@_color_check:w #1 \q_nil #2 \q_nil #3 \q_stop
+\cs_new_protected:Npn \@@_color_check:w #1 \q_nil #2 \q_stop
{
- \tl_if_head_eq_meaning:nNT {#2} \color
- { \@@_color_check:Nnw #2 \q_stop }
+ \tl_if_head_eq_meaning:nNT {#1} \color
+ { \@@_color_check:Nnw #1 \q_stop }
}
\cs_new_protected:Npn \@@_color_check:Nnw #1#2#3 \q_stop
{ \keys_set:nn { siunitx } { number-color = #2 } }
@@ -958,7 +959,6 @@
{
\tl_set:Nx \l_@@_tmp_tl
{ \siunitx_number_output:NN \l_@@_model_tl \q_nil }
- \@@_color_check:N \l_@@_tmp_tl
\exp_after:wN \@@_direct_format_aux:w
\l_@@_tmp_tl \q_stop
}
@@ -979,7 +979,7 @@
\char_set_active_eq:NN ##1 \@@_direct_format_switch:
\char_set_mathcode:nn { `##1 } { "8000 }
}
- \@@_fil:
+ \@@_fill:
}
\cs_new_protected:Npn \@@_direct_format_switch:
{
diff --git a/macros/latex/contrib/siunitx/siunitx.dtx b/macros/latex/contrib/siunitx/siunitx.dtx
index b8b6b79b02..40ba293d81 100644
--- a/macros/latex/contrib/siunitx/siunitx.dtx
+++ b/macros/latex/contrib/siunitx/siunitx.dtx
@@ -121,7 +121,7 @@
%
% Identify the package and give the over all version information.
% \begin{macrocode}
-\ProvidesExplPackage {siunitx} {2021-05-20} {3.0.3}
+\ProvidesExplPackage {siunitx} {2021-05-21} {3.0.4}
{A comprehensive (SI) units package}
% \end{macrocode}
%
diff --git a/macros/latex/contrib/siunitx/siunitx.pdf b/macros/latex/contrib/siunitx/siunitx.pdf
index 2c3c742c94..3a8e7d0277 100644
--- a/macros/latex/contrib/siunitx/siunitx.pdf
+++ b/macros/latex/contrib/siunitx/siunitx.pdf
Binary files differ
diff --git a/macros/latex/contrib/siunitx/siunitx.tex b/macros/latex/contrib/siunitx/siunitx.tex
index 191e619490..857a1569a6 100644
--- a/macros/latex/contrib/siunitx/siunitx.tex
+++ b/macros/latex/contrib/siunitx/siunitx.tex
@@ -1693,7 +1693,7 @@ There are certain combinations of numerical input which can be ambiguous. This
can be corrected by adding brackets in the appropriate place, and is controlled
by the \opt{bracket-ambiguous-numbers} switch. This option only applies to pure
numbers: when formatting quantities, the need for brackets also depends on the
-placement of units, so is controlled by \opt{seperate-uncertainty-units}.
+placement of units, so is controlled by \opt{separate-uncertainty-units}.
\begin{LaTeXdemo}
\sisetup{separate-uncertainty}
\num{1.2(3)e4} \\
@@ -3147,7 +3147,6 @@ also be done using \pkg{siunitx} (Table~\ref{tbl:xmpl:unrel}).
S[
table-format = 5.0,
parse-numbers = false,
- input-digits = .0123456789,
input-decimal-markers = x
]
@{}
@@ -3393,9 +3392,9 @@ these units, needing no others and with no redundancy.
All other units within the \acro{SI} system are regarded as \enquote{derived}
from the seven base units. At the most basic, all other \acro{SI} units can be
expressed as combinations of the base units. However, many units (listed in
-Tables~\ref{tab:unit:derived} and~\ref{tab:unit:accepted}) have a special name
-and symbol. Most of these units are simple combinations of one or more base
-units (raised to powers as appropriate).
+Table~\ref{tab:unit:derived}) have a special name and symbol. Most of these
+units are simple combinations of one or more base units (raised to powers as
+appropriate).
A series of \acro{SI} prefixes for decimal multiples and sub-multiples are
provided, and can be used as modifiers for any \acro{SI} unit (either base or
@@ -3525,7 +3524,7 @@ but mathematically poor.\footnote{For example, for an acceleration \(a\), the
expression $[a]$ is the dimensions of $a$, \foreign{i.e.}~length per time
squared in this case.} Much better is to show division of all quantities by the
unit, which leaves the entries as unitless ratios. This is illustrated in
-Tables~\ref{tab:xmpl:unitless} and~\ref{fig:xmpl:unitless}.
+Table~\ref{tab:xmpl:unitless} and Figure~\ref{fig:xmpl:unitless}.
\begin{LaTeXdemo}[code and float]
\begin{table}
\caption{An example of table labelling.%
@@ -3580,7 +3579,7 @@ Tables~\ref{tab:xmpl:unitless} and~\ref{fig:xmpl:unitless}.
the titles are followed by \enquote{\unit{\kilo\gram}}!
\begin{LaTeXdemo}[code and float]
\begin{table}
- \caption{Good and bad columns.%
+ \caption{Bad and good columns.%
\label{tab:good}}
\sisetup{table-number-alignment = center}
\begin{tabular}{
@@ -3618,7 +3617,7 @@ unzip this in your local \path{texmf} directory.
The package requires \LaTeX3 support as provided in the \pkg{l3kernel} and
\pkg{l3packages} bundles. Both of these are included in \TeX{} Live and
-MiK\TeX{}, or are again available in ready-to-install from \acro{CTAN}.
+MiK\TeX{}, or are again available in ready-to-install form from \acro{CTAN}.
\section{Thanks}
diff --git a/macros/latex/contrib/tiscreen/README b/macros/latex/contrib/tiscreen/README
index 23693c804f..55292264d4 100644
--- a/macros/latex/contrib/tiscreen/README
+++ b/macros/latex/contrib/tiscreen/README
@@ -1,15 +1,16 @@
tiscreen (TI calculator screen)
-v1.0
+v1.0.1
This package mimics the screen of older Texas instruments dot matrix display
calculators, specifically the TI-82 STATS.
Changes:
+- 2021/05/21 Minor README and documentation issues
- 2021/05/17 Initial version
For more information, please see the documentation.
-Copyright 2021
+Copyright (C) 2021 Mustafa Ibrahim
This work may be distributed and/or modified under the conditions of the LaTeX
Project Public License, either version 1.3c or higher. The latest version the
license is at: http://www.latex-project.org/lppl.txt
diff --git a/macros/latex/contrib/tiscreen/doc/tiscreen-doc.pdf b/macros/latex/contrib/tiscreen/doc/tiscreen-doc.pdf
index 4c0f4f9f05..de6991dc04 100644
--- a/macros/latex/contrib/tiscreen/doc/tiscreen-doc.pdf
+++ b/macros/latex/contrib/tiscreen/doc/tiscreen-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/tiscreen/doc/tiscreen-doc.tex b/macros/latex/contrib/tiscreen/doc/tiscreen-doc.tex
index f959f56640..22baf4949b 100644
--- a/macros/latex/contrib/tiscreen/doc/tiscreen-doc.tex
+++ b/macros/latex/contrib/tiscreen/doc/tiscreen-doc.tex
@@ -1,4 +1,5 @@
\documentclass[a4paper,12pt]{article}
+\usepackage[iso,english]{isodate}
\usepackage[margin=1in]{geometry}
\usepackage[english]{babel}
\usepackage{parskip}
@@ -18,7 +19,6 @@
\title{TI calculator display\\{\small(TI-82 STATS)}}
\author{Mustafa Ibrahim}
-\date{2021/05/17}
\begin{document}
diff --git a/macros/latex/contrib/tiscreen/tex/tiscreen.sty b/macros/latex/contrib/tiscreen/tex/tiscreen.sty
index 2d911d6b2e..45c2b46292 100644
--- a/macros/latex/contrib/tiscreen/tex/tiscreen.sty
+++ b/macros/latex/contrib/tiscreen/tex/tiscreen.sty
@@ -1,3 +1,8 @@
+% Copyright (C) 2021 Mustafa Ibrahim
+% This work may be distributed and/or modified under the conditions of the LaTeX
+% Project Public License, either version 1.3c or higher. The latest version the
+% license is at: http://www.latex-project.org/lppl.txt
+
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{tiscreen}[2021/05/17 Ti calculator screen]