summaryrefslogtreecommitdiff
path: root/macros/latex
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-07-23 03:00:51 +0000
committerNorbert Preining <norbert@preining.info>2021-07-23 03:00:51 +0000
commit9e46b83b2d49ad6f5d4285266a81c9af1dd3d74e (patch)
tree85d1a98abf9163d7a939bcaf88ee7fc93b568c99 /macros/latex
parentc43a0b49bea6195daa6423809f4339d538b5c8d9 (diff)
CTAN sync 202107230300
Diffstat (limited to 'macros/latex')
-rw-r--r--macros/latex/contrib/easybook/easybook.dtx204
-rw-r--r--macros/latex/contrib/easybook/easybook.pdfbin591310 -> 598988 bytes
-rw-r--r--macros/latex/contrib/siunitx/CHANGELOG.md13
-rw-r--r--macros/latex/contrib/siunitx/siunitx-code.pdfbin1496050 -> 1497883 bytes
-rw-r--r--macros/latex/contrib/siunitx/siunitx-number.dtx4
-rw-r--r--macros/latex/contrib/siunitx/siunitx-table.dtx17
-rw-r--r--macros/latex/contrib/siunitx/siunitx.dtx8
-rw-r--r--macros/latex/contrib/siunitx/siunitx.pdfbin635529 -> 636251 bytes
-rw-r--r--macros/latex/contrib/siunitx/siunitx.tex21
-rw-r--r--macros/latex/contrib/spbmark/spbmark.dtx24
-rw-r--r--macros/latex/contrib/spbmark/spbmark.pdfbin68944 -> 68498 bytes
-rw-r--r--macros/latex/contrib/stackengine/stackengine.pdfbin385976 -> 385801 bytes
-rw-r--r--macros/latex/contrib/stackengine/stackengine.sty15
-rw-r--r--macros/latex/contrib/tiscreen/README1
-rw-r--r--macros/latex/contrib/tiscreen/doc/tiscreen-doc.pdfbin125338 -> 133505 bytes
-rw-r--r--macros/latex/contrib/tiscreen/doc/tiscreen-doc.tex84
-rw-r--r--macros/latex/contrib/tiscreen/tex/tiscreen.sty10
-rw-r--r--macros/latex/required/babel/base/README.md11
-rw-r--r--macros/latex/required/babel/base/babel.dtx74
-rw-r--r--macros/latex/required/babel/base/babel.ins2
-rw-r--r--macros/latex/required/babel/base/babel.pdfbin852005 -> 849481 bytes
-rw-r--r--macros/latex/required/babel/base/bbcompat.dtx2
22 files changed, 323 insertions, 167 deletions
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx
index 8d62a25c7d..6f1bd7bf07 100644
--- a/macros/latex/contrib/easybook/easybook.dtx
+++ b/macros/latex/contrib/easybook/easybook.dtx
@@ -28,7 +28,7 @@
%
% \title{\sffamily easybook 文档类手册}
% \author{瞿毅}
-% \date{2021/07/19\hskip\ccwd\relax v1.27K\thanks{\url{https://gitee.com/texl3/easybook}}}
+% \date{2021/07/22\hskip 1em\relax v1.27L\thanks{\url{https://gitee.com/texl3/easybook}}}
%
% \maketitle
% \begin{abstract}
@@ -148,7 +148,7 @@
% cjkfont = <adobe|fandol|founder|mac|macnew|macold|ubuntu|windows|none>
% \end{syntax}
% 中文字体采用 \CTeX 宏集包含的字库并与其一致,具体配置方案可以查看 \CTeX 使用手册。它与 \opt{fontset} 选项是等效的,如果没有指定 \opt{cjkfont} 的值,将会自动检测用户的操作系统并选择相应的字体。
-% \changes{v1.27K}{2021/07/12}{新增 \opt{cjkfont} 选项设置中文字体,原 \opt{font} 选项设置英文字体,中文字体使用 \CTeX 的字库。}
+% \changes{v1.27L}{2021/07/12}{新增 \opt{cjkfont} 选项设置中文字体,原 \opt{font} 选项设置英文字体,中文字体使用 \CTeX 的字库。}
% \end{function}
%
% 如果需要使用其它中文字体,可以在启用选项 \opt{cjkfont = none} 后,再使用 \pkg{xeCJK} 宏包的相关命令设置字体以及声明字体族:
@@ -535,10 +535,10 @@
% bodyfont = <(empty)>
% notefont = <(empty)>
% headfont = <(\tn{color}\{ctex@emph\}\tn{sffamily})>
-% headindent = <刚性长度|(0\tn{ccwd})>
+% headindent = <刚性长度|(0em)>
% spaceabove = <弹性长度|(0.75ex plus .1ex)>
% spacebelow = <弹性长度|(0.75ex plus .1ex)>
-% spacepost = <刚性长度|(\tn{ccwd})>
+% spacepost = <刚性长度|(1em)>
% headformat = <(\tn{NAME}\tn{space}\tn{NUMBER}\tn{NOTE})>
% brackets = \{<左括号>,<右括号>\}
% \end{syntax}
@@ -612,7 +612,7 @@
% \end{ctexexam}
% 定义一个新的定理样式可用于 \tn{declaretheorem} 的 \opt{style} 选项:
% \begin{ctexexam}
-% \declaretheoremstyle[bodyfont = \rmfamily,spacepost = 0.5\ccwd]{定理样式名}
+% \declaretheoremstyle[bodyfont = \rmfamily,spacepost = 0.5em]{定理样式名}
% \end{ctexexam}
%
% \subsection{页面尺寸}
@@ -672,7 +672,7 @@
% \begin{ctexexam}
% \hdrset
% {
-% chap-label = [\thechapter]{\hspace{\ccwd}},
+% chap-label = [\thechapter]{\hspace{1em}},
% sec-mark = \CTEXifname{\CTEXthesection——}{}#1
% }
% \end{ctexexam}
@@ -705,9 +705,9 @@
% \subsubsection{脚注格式}
% \begin{function}[EXP,added = 2021-05-12,updated = 2021-07-14]{fnmargin,fnparskip,fnparindent,footnotetype,fnmark-pos,fnmark-num,fnmark-num,fnmark-form,fntext-form,afterfnmark}
% \begin{syntax}
-% fnmargin = <刚性长度|(0.75\tn{ccwd})>
+% fnmargin = <刚性长度|(0.75em)>
% fnparskip = <弹性长度|(0ex)>
-% fnparindent = <刚性长度|(2\tn{ccwd})>
+% fnparindent = <刚性长度|(2em)>
% footnotetype = <(hang)|default|bottom>
% fnmark-pos = <normal|(super)>
% fnmark-num = <(plain)|pifont|pifont*|pifont-sans|pifont-sans*>
@@ -717,7 +717,7 @@
% \end{syntax}
% \ding{229} 以上选项路径为 \opt{hdrset/...} \\
% \changes{v1.25}{2021/05/12}{增加脚注样式设置选项。}
-% \changes{v1.27K}{2021/07/14}{增加脚注内容格式选项 \opt{fntext-form} 和脚注类型选项 \opt{footnotetype}。}
+% \changes{v1.27L}{2021/07/14}{增加脚注内容格式选项 \opt{fntext-form} 和脚注类型选项 \opt{footnotetype}。}
% \end{function}
%
% \begin{optdesc}
@@ -744,7 +744,7 @@
% format += <目录标题格式>
% indent = <目录标题左边缩进>
% rule = <目录引导线样式>
-% numsep = <编号后间距|(\tn{ccwd})>
+% numsep = <编号后间距|(1em)>
% \end{syntax}
% \ding{229} 以上选项路径为 \opt{tocset/(level)/...} \\
% \opt{tocset} 将目录样式交给 \pkg{titletoc} 处理,\opt{(level)} 代表 part、chapter、section、subsection、figure、table 和 lstlisting 级别的目录,而使用 list 级别可以统一设置图片、表格和代码目录的样式。
@@ -770,7 +770,7 @@
% chapter =
% {
% format = \addvspace{8pt}\large,
-% indent = 1.5\ccwd,
+% indent = 1.5em,
% rule = \tocrule[0.6pc](1.1){.}[\zihao{5}]
% }
% }
@@ -786,7 +786,7 @@
% belowoffset = <长度|(-1pc)>
% line-align = <(true)|false>
% hang = <true|(false)>
-% numsep-all = <编号后间距|(\tn{ccwd})>
+% numsep-all = <编号后间距|(1em)>
% indent-all = <目录标题左边缩进>
% rule-all = <目录引导线样式>
% \end{syntax}
@@ -805,8 +805,8 @@
% \tocset
% {
% hang = false,
-% tocline-fig = 图 #1\hspace{\ccwd},
-% tocline-lst = 代码\thelstlisting\hspace{\ccwd}
+% tocline-fig = 图 #1\hspace{1em},
+% tocline-lst = 代码\thelstlisting\hspace{1em}
% }
% \end{ctexexam}
% \item[line-align] \opt{line-align} 选项可以使目录引导线右边对齐并与页码保持一定间隙,否则会与页码连接。
@@ -905,7 +905,7 @@
% \tn{end}\{hangparas\}
% \end{syntax}
% \tn{hangpara} 命令使其后的一个段落保持悬挂缩进,\env{hangparas} 环境使其中的段落均保持悬挂缩进。缩进将以 \meta{缩进长度} 从每个段落的 \meta{缩进开始行数} 开始。
-% \changes{v1.27K}{2021/07/11}{增加悬挂缩进段落命令 \tn{hangpara} 和环境 \env{hangparas}。}
+% \changes{v1.27L}{2021/07/11}{增加悬挂缩进段落命令 \tn{hangpara} 和环境 \env{hangparas}。}
% \end{function}
%
% \subsection{代码}
@@ -936,7 +936,7 @@
% color = <标题背景颜色名|(DeepSkyBlue)>
% title = <环境标题>
% number = <习题编号格式|(1.)>
-% numsep = <编号与标题的间距|(0.5\tn{ccwd})>
+% numsep = <编号与标题的间距|(0.5em)>
% label = <标签内容>
% \end{syntax}
% 第二个 \meta{键值列表} 在是否使用 + 号参数时用法不同,使用 + 号参数时为 \pkg{tcolorbox} 的盒子选项,例如 \opt{boxrule} 和 \opt{fontupper}。不使用 + 号参数时相当于设置 \tn{ctexset}\{section = {\#1}\} 键值选项列表,例如 \opt{format} 和 \opt{beforeskip}。\opt{number} 为短编号形式,应当包含 A、a、I、i、或 1 其中一个符号。\opt{label} 选项用于设置习题环境的引用标签,它与标签格式命令 \tn{labelformat} 对应的计数器是 eb@exercise。
@@ -1056,7 +1056,7 @@
% \begin{ctexexam}
% \labelformat{eb@theorem}{定理 #1}
% \newcommand{\theoremhead}[1]
-% {定理 \UseCounter[chapter]{theorem}{\hspace{\ccwd}#1}}
+% {定理 \UseCounter[chapter]{theorem}{\hspace{1em}#1}}
% \theoremhead{定理标题}\label{thm:theorem}
% \end{ctexexam}
%
@@ -1069,6 +1069,43 @@
% 除了以普通公式的方式,化学式还可用 \pkg{chemformula} 实现,无机化学式使用 \tn{ch} 命令书写。有机化学式推荐在导言区载入 \pkg{chemfig} 宏包,使用 \tn{chemfig} 命令完成。
% \end{function}
%
+% \subsection{公式符号对照}
+% \begin{function}[added = 2021-07-22]{\seteqcomp,\symb,eqcomp}
+% \begin{syntax}
+% \tn{seteqcomp}\marg{键值列表}
+% \tn{symb*}\marg{符号}\oarg{引导符}
+% \tn{begin}\{eqcomp\}\oarg{键值列表}\parg{键值列表}
+% \ \tn{symb}\marg{符号}\oarg{引导符}<说明文字>
+% \tn{end}\{eqcomp\}
+% \end{syntax}
+% 一些公式之后可以使用基于列表环境的 \env{eqcomp} 进行符号对照。\tn{symb} 需要在环境内使用,带有星号的命令可单独在文本段落使用。对照列表第二个 \meta{键值列表} 与 \pkg{enumitem} 的选项相同,一般较少用到,可以用于设置垂直间距等。第一个 \meta{键值列表} 也可以使用 \tn{seteqcomp} 全局设置,选项如下:
+% \changes{v1.27L}{2021/07/22}{增加公式符号对照环境 \env{eqcomp} 和命令 \tn{symb}。}
+% \end{function}
+%
+% \begin{function}{width,delim,space,item-align,delim-align,intro,font,mode}
+% \begin{syntax}
+% width = <符号宽度|(2em)>
+% delim = <引导符|(——)>
+% space = <符号间隙|(0.25em)>
+% item-align = <l|c|(r)>
+% delim-align = <l|(c)|r>
+% intro = <首行文字>
+% font = <符号字体>
+% mode = <(math)|text>
+% \end{syntax}
+% \end{function}
+%
+% \begin{optdesc}
+% \item[width] 设置适当的符号宽度可以防止文字重叠和边界溢出等问题。
+% \item[delim] 符号对照的引导符,\tn{symb} 的 \meta{引导符} 和对齐方式是基于这个符号的宽度。
+% \item[space] 符号间隙为引导符两侧与符号和说明文字间的距离。
+% \item[item-align] 符号的对齐方式,分为左(l)、中(c)和右(r)三种对齐方式。
+% \item[delim-align] 引导符的对齐方式,分为左(l)、中(c)和右(r)三种对齐方式。
+% \item[intro] 符号对照的说明文字,应当为简短的几个字,只显示在第一行,其后为悬挂缩进的对照列表。
+% \item[font] 符号的字体,数学和文本符号模式应采用不同的字体命令,最后一个命令可以接受一个参数,这个参数为符号。
+% \item[mode] 符号字体模式,可以为数学字体或者文本字体。
+% \end{optdesc}
+%
% \subsection{引用}
% \begin{function}[added = 2021-01-05,updated = 2021-07-15]{\ref,\footref,\labelformat}
% \begin{syntax}
@@ -1290,7 +1327,7 @@
%<*class>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/07/19}{1.27K}
+\ProvidesExplClass{easybook}{2021/07/22}{1.27L}
{Typeset Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
@@ -1525,7 +1562,7 @@
{
\bool_if:NTF \l__eb_title_newline_bool
{ \par\nobreak }
- { \hspace{\ccwd} }
+ { \hspace{1em} }
}
},
chapter =
@@ -1540,7 +1577,7 @@
{
\bool_if:NTF \l__eb_title_newline_bool
{ \par\nobreak\vskip 1.5pc }
- { \hspace{\ccwd} }
+ { \hspace{1em} }
},
beforeskip = -1.5ex,
afterskip = 3ex,
@@ -1551,7 +1588,7 @@
{
hang = true,
format = \color{ctex@frame}\sffamily\Large,
- aftername = \hspace{0.5\ccwd},
+ aftername = \hspace{0.5em},
beforeskip = 1.5ex plus .2ex minus .1ex,
afterskip = 1.5ex plus .2ex minus .1ex
},
@@ -1559,7 +1596,7 @@
{
hang = true,
format = \color{ctex@frame}\sffamily\large,
- aftername = \hspace{0.5\ccwd},
+ aftername = \hspace{0.5em},
beforeskip = 1.3ex plus .2ex minus .1ex,
afterskip = 1.3ex plus .2ex minus .1ex
},
@@ -1567,7 +1604,7 @@
{
hang = true,
format = \color{ctex@frame}\sffamily,
- aftername = \hspace{0.5\ccwd},
+ aftername = \hspace{0.5em},
beforeskip = \parskip,
afterskip = \parskip
}
@@ -1584,7 +1621,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/07/19}{1.27K}
+\ProvidesExplPackage{easybase}{2021/07/22}{1.27L}
{Typeset Chinese theses or books}
\cs_generate_variant:Nn \int_to_arabic:n { v }
@@ -1834,7 +1871,7 @@
{
vmargin = 2.54cm,
hmargin = 3.17cm,
- columnsep = 2\ccwd,
+ columnsep = 2em,
headheight = 2.04cm,
headsep = 0.5cm,
footskip = 0.79cm,
@@ -1932,11 +1969,11 @@
subsec-mark .initial:n =
{ \CTEXifname{\eb@mark@subsection@label}{}#1 },
chap-label .code:n = \eb_mark_chapter_number_bool:n {#1},
- chap-label .initial:n = \hspace{\ccwd},
+ chap-label .initial:n = \hspace{1em},
sec-label .code:n = \eb_mark_section_number_bool:n {#1},
- sec-label .initial:n = \hspace{0.5\ccwd},
+ sec-label .initial:n = \hspace{0.5em},
subsec-label .code:n = \eb_mark_subsection_number_bool:n {#1},
- subsec-label .initial:n = \hspace{0.5\ccwd},
+ subsec-label .initial:n = \hspace{0.5em},
headrule .tl_gset:N = \headrule,
headrule .initial:n = \markrule{\l__eb_rule_width_dim},
@@ -2010,11 +2047,11 @@
\ctex_define:nn { hdrset }
{
fnmargin .dim_set:N = \footnoteindent,
- fnmargin .initial:n = 0.75\ccwd,
+ fnmargin .initial:n = 0.75em,
fnparskip .skip_set:N = \footparskip,
fnparskip .initial:n = 0ex,
fnparindent .dim_set:N = \footparindent,
- fnparindent .initial:n = 2\ccwd,
+ fnparindent .initial:n = 2em,
fntext-form .tl_set:N = \l__eb_fntext_format_tl,
fnmark-pos .tl_set:N = \l__eb_fnmark_position_tl,
@@ -2342,7 +2379,7 @@
subsection/numsep = #1,
list/numsep = #1
},
- numsep-all .initial:n = \ccwd,
+ numsep-all .initial:n = 1em,
indent-all .meta:n =
{
part/indent = #1,
@@ -2385,25 +2422,25 @@
\ctex_set:nn { tocset }
{
part/format = \addvspace{1pc}\sffamily\large,
- part/indent = 0\ccwd,
+ part/indent = 0em,
part/rule = \tocrule{}[\bfseries],
chapter/format = \addvspace{1pc}\sffamily\large,
- chapter/indent = 0\ccwd,
+ chapter/indent = 0em,
chapter/rule = \tocrule{$\cdot$}[\bfseries],
section/format = \addvspace{0.35pc},
section/indent =
- { \bool_if:NTF \l__eb_class_book_bool { 1.5\ccwd } { 0\ccwd } },
+ { \bool_if:NTF \l__eb_class_book_bool { 1.5em } { 0em } },
section/rule = \tocrule{$\cdot$},
subsection/format = \addvspace{0.35pc},
subsection/indent =
- { \bool_if:NTF \l__eb_class_book_bool { 3.8\ccwd } { 1.4\ccwd } },
+ { \bool_if:NTF \l__eb_class_book_bool { 3.8em } { 1.4em } },
subsection/rule = \tocrule{$\cdot$},
list/format = \addvspace{0.2pc},
- list/indent = 0\ccwd,
+ list/indent = 0em,
list/rule = \tocrule{$\cdot$},
list/belowoffset =
{ \bool_if:NTF \l__eb_class_book_bool { 0pc } { 0.15pc } }
@@ -2828,7 +2865,6 @@
unknown .code:n = \eb_msg_unknown_option:n { spread }
}
-\DeclareCaptionLabelSeparator{ccwd}{\hspace{\ccwd}}
\DeclareCaptionLabelFormat{parens}{\bothIfFirst{#1}{~}(#2)}
\DeclareCaptionFont{eb@table@font}{\l__eb_subfont_table_tl}
\DeclareCaptionFont{eb@figure@font}{\l__eb_subfont_figure_tl}
@@ -2838,7 +2874,7 @@
format = hang,
font = {stretch = \fp_use:N \l__eb_spread_caption_fp},
labelfont = {color = ctex@frame},
- labelsep = ccwd,
+ labelsep = quad,
singlelinecheck = true,
belowskip = 0pt,
aboveskip = 10pt
@@ -2935,21 +2971,91 @@
\SetEnumitemValue{ref}{enumiii}{\arabic{enumi}.\alph{enumii}.\roman*}
\setlist
{
- labelsep = 0.75\ccwd,listparindent = 2\ccwd,leftmargin = *,
+ labelsep = 0.75em,listparindent = 2em,leftmargin = *,
itemsep = 0.75ex plus .1ex,topsep = 0.75ex plus .1ex,
partopsep = 0ex,parsep = 0ex
}
\newlist{eb@outline@list}{itemize}{1}
\newlist{eb@exercise@list}{enumerate}{2}
+\newlist{eb@eqcomp@list}{description}{1}
\setlist[eb@outline@list]{label = outline,itemsep = 0.5ex plus .1ex}
-\setlist[eb@exercise@list]{labelsep = 0.5\ccwd}
+\setlist[eb@exercise@list]{labelsep = 0.5em}
+\setlist[eb@eqcomp@list]{labelsep = 0em,nosep}
\setlist[itemize,1]{label = bullet}
\setlist[itemize,2]{label = endash}
\setlist[itemize,3]{label = asterisk}
\setlist[enumerate,1]{label = arabic,ref = \arabic*}
\setlist[enumerate,2]{label = alph,ref = enumii}
\setlist[enumerate,3]{label = roman,ref = enumiii,labelwidth = *}
-\setlist[description]{font = sf,labelwidth = *,leftmargin = 2\ccwd}
+\setlist[description]{font = sf,labelwidth = *,leftmargin = 2em}
+
+\keys_define:nn { eb/eqcomp }
+ {
+ width .dim_set:N = \l__eb_eqsymb_width_dim,
+ width .initial:n = 2em,
+ delim .tl_set:N = \l__eb_eqsymb_delim_tl,
+ delim .initial:n = { —— },
+ space .dim_set:N = \l__eb_eqsymb_space_dim,
+ space .initial:n = 0.25em,
+ item-align .tl_set:N = \l__eb_eqsymb_item_align_tl,
+ item-align .initial:n = r,
+ delim-align .tl_set:N = \l__eb_eqsymb_delim_align_tl,
+ delim-align .initial:n = c,
+ intro .tl_set: = \l__eb_eqsymb_intro_tl,
+ font .tl_set:N = \l__eb_eqsymb_font_tl,
+ mode .tl_set:N = \l__eb_eqsymb_mode_tl,
+ mode .initial:n = math
+ }
+\cs_new_protected:Npn \seteqcomp #1
+ { \keys_set:nn { eb/eqcomp} {#1} }
+
+\cs_new:Npn \eb@itembox { \item\makebox }
+\cs_new:Npn \eb_eqsymb_left_margin_calc:
+ {
+ \hbox_set:Nn \l_tmpa_box { \l__eb_eqsymb_delim_tl }
+ \hbox_set:Nn \l_tmpb_box { \l__eb_eqsymb_intro_tl }
+ \dim_set:Nn \l_tmpa_dim
+ {
+ \box_wd:N \l_tmpb_box +
+ \l__eb_eqsymb_width_dim +
+ \l__eb_eqsymb_space_dim +
+ \box_wd:N \l_tmpa_box +
+ \l__eb_eqsymb_space_dim
+ }
+ }
+\NewDocumentEnvironment{eqcomp}{oD(){}+b}
+ {
+ \IfValueT{#1}{\keys_set:nn { eb/eqcomp } {#1}}
+ \eb_eqsymb_left_margin_calc:
+ \begin{eb@eqcomp@list}[#2]
+ #3
+ \end{eb@eqcomp@list}
+ }{}
+\NewDocumentCommand{\symb}{smO{\l__eb_eqsymb_delim_tl}}
+ {
+ \IfBooleanTF{#1}
+ {
+ \eb_eqsymb_left_margin_calc:
+ \makebox
+ }
+ {\eb@itembox}[\l_tmpa_dim]
+ {
+ \makebox[\box_wd:N \l_tmpb_box]{\l__eb_eqsymb_intro_tl}
+ \makebox[\l__eb_eqsymb_width_dim][\l__eb_eqsymb_item_align_tl]
+ {
+ \tl_use:N \l__eb_eqsymb_font_tl
+ {
+ \tl_if_eq:NnT \l__eb_eqsymb_mode_tl { math }
+ { \ensuremath }{#2}
+ }
+ }
+ \hspace{\l__eb_eqsymb_space_dim}
+ \makebox[\box_wd:N \l_tmpa_box][\l__eb_eqsymb_delim_align_tl]{#3}
+ \hspace{\l__eb_eqsymb_space_dim}
+ }
+ \tl_clear:N \l__eb_eqsymb_intro_tl
+ \ignorespaces
+ }
\cs_new_protected:Npn \eb_thm_name_set:nnn #1#2#3
{
@@ -3030,9 +3136,9 @@
{
spaceabove = 0.75ex plus .1ex,
spacebelow = 0.75ex plus .1ex,
- headindent = 0\ccwd,
+ headindent = 0em,
headfont = \color{ctex@emph}\sffamily,
- postheadspace = \ccwd,
+ postheadspace = 1em,
within = \bool_if:NT \l__eb_class_book_bool { chapter },
headformat = \NAME\space\NUMBER\NOTE
}
@@ -3059,7 +3165,7 @@
\setchemformula
{
math-scripts = false,
- charge-hshift = 0.25\ccwd,
+ charge-hshift = 0.25em,
subscript-vshift = -0.2ex
}
\IfPackageAtLeastTF{siunitx}{2021/06/22}
@@ -3121,7 +3227,7 @@
title .tl_set:N = \eb@tc@exercise@title,
title .initial:n = \c__eb_name_exercise_tl,
numsep .dim_set:N = \eb@toc@exercise@numsep,
- numsep .initial:n = 0.5\ccwd,
+ numsep .initial:n = 0.5em,
label .tl_set:N = \eb@tc@exercise@label
}
\cs_new_protected:Npn \setexercise #1
@@ -3431,9 +3537,9 @@
{
\keys_set_known:nn { ctex }
{
- contentsname = 目\hspace{\ccwd}录,
- indexname = 索\hspace{\ccwd}引,
- abstractname = 摘\hspace{\ccwd}要,
+ contentsname = 目\hspace{1em}录,
+ indexname = 索\hspace{1em}引,
+ abstractname = 摘\hspace{1em}要,
listfigurename = 图片索引,
listtablename = 表格索引,
lstlistlistingname = 代码索引,
@@ -3456,7 +3562,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/07/19}{1.27K}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/07/22}{1.27L}
{Customization of tcolorbox for easybook}
\cs_new_protected:Npn \eb_tcb_theorem_set:n #1
diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf
index 46474da34d..2462854b67 100644
--- a/macros/latex/contrib/easybook/easybook.pdf
+++ b/macros/latex/contrib/easybook/easybook.pdf
Binary files differ
diff --git a/macros/latex/contrib/siunitx/CHANGELOG.md b/macros/latex/contrib/siunitx/CHANGELOG.md
index 83907537c6..0c0c7545fa 100644
--- a/macros/latex/contrib/siunitx/CHANGELOG.md
+++ b/macros/latex/contrib/siunitx/CHANGELOG.md
@@ -7,6 +7,16 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
## [Unreleased]
+## [v3.0.22]
+
+### Changed
+- Support `table-text-alignment = none` for interoperation with
+ `tabularray` (issue #510)
+
+### Fixed
+- Support for `input-remove` (issue #511)
+- Interaction with `cellspace` package (issue #512)
+
## [v3.0.21]
### Fixed
@@ -1439,7 +1449,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.21...HEAD
+[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.0.22...HEAD
+[v3.0.22]: https://github.com/josephwright/siunitx/compare/v3.0.21...v3.0.22
[v3.0.21]: https://github.com/josephwright/siunitx/compare/v3.0.20...v3.0.21
[v3.0.20]: https://github.com/josephwright/siunitx/compare/v3.0.19...v3.0.20
[v3.0.19]: https://github.com/josephwright/siunitx/compare/v3.0.18...v3.0.19
diff --git a/macros/latex/contrib/siunitx/siunitx-code.pdf b/macros/latex/contrib/siunitx/siunitx-code.pdf
index 513b2d7da8..4327acc11e 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 59a6dd8129..61ca7af103 100644
--- a/macros/latex/contrib/siunitx/siunitx-number.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-number.dtx
@@ -514,6 +514,7 @@
\cs_generate_variant:Nn \tl_if_blank:nTF { f }
\cs_generate_variant:Nn \tl_if_blank_p:n { f }
\cs_generate_variant:Nn \tl_if_in:NnTF { NV }
+\cs_generate_variant:Nn \tl_remove_all:Nn { NV }
\cs_generate_variant:Nn \tl_replace_all:Nnn { NnV }
% \end{macrocode}
%
@@ -814,6 +815,9 @@
}
\tl_set_eq:NN \l_@@_input_tl \l_@@_arg_tl
\siunitx_number_normalize_symbols:N \l_@@_arg_tl
+ \protected@edef \l_@@_input_ignore_tl { \l_@@_input_ignore_tl }
+ \tl_if_empty:NF \l_@@_input_ignore_tl
+ { \tl_remove_all:NV \l_@@_arg_tl \l_@@_input_ignore_tl }
\tl_if_empty:NF \l_@@_arg_tl
{ \@@_parse_comparator: }
\@@_parse_check:
diff --git a/macros/latex/contrib/siunitx/siunitx-table.dtx b/macros/latex/contrib/siunitx/siunitx-table.dtx
index efd2c6bc9b..64ef013e17 100644
--- a/macros/latex/contrib/siunitx/siunitx-table.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-table.dtx
@@ -200,11 +200,12 @@
%
% \begin{function}{table-text-alignment}
% \begin{syntax}
-% |table-text-alignment| = |center|\verb"|"|left|\verb"|"|right|
+% |table-text-alignment| = |center|\verb"|"|left|\verb"|"|none|\verb"|"|right|
% \end{syntax}
% Selects the alignment of non-numerical content with the margins of the
% table cell (or other boundary). See also |table-alignment| and
-% |table-number-alignment|. The standard setting is |center|.
+% |table-number-alignment|. Notice the additional support for |none| here.
+% The standard setting is |center|.
% \end{function}
%
% \end{documentation}
@@ -599,7 +600,8 @@
% \end{macrocode}
% \end{variable}
%
-% \begin{macro}{\@@_align_center:n, \@@_align_left:n, \@@_align_right:n}
+% \begin{macro}
+% {\@@_align_center:n, \@@_align_left:n, \@@_align_right:n, \@@_align_none:n}
% \begin{macro}{\@@_align_auxi:nn, \@@_align_auxii:nn}
% The beginning and end of each table cell have to adjust the position of
% the content using glue. When \pkg{colortbl} is loaded the glue is done in
@@ -613,6 +615,13 @@
{ \@@_align_auxi:nn {#1} { 0pt } }
\cs_new_protected:Npn \@@_align_right:n #1
{ \@@_align_auxi:nn {#1} { 0pt~plus~1fill } }
+\cs_new_protected:Npn \@@_align_none:n #1
+ {
+ \bool_if:NTF \l_@@_fixed_width_bool
+ { \hbox_to_wd:nn \l_@@_column_width_dim }
+ { \use:n }
+ {#1}
+ }
\cs_new_protected:Npn \@@_align_auxi:nn #1#2
{
\bool_if:NTF \l_@@_fixed_width_bool
@@ -656,7 +665,7 @@
\keys_define:nn { siunitx }
{
table-text-alignment .choices:nn =
- { center , left , right }
+ { center , left , right , none }
{ \tl_set:Nn \l_@@_align_text_tl {#1} } ,
}
\tl_new:N \l_@@_align_text_tl
diff --git a/macros/latex/contrib/siunitx/siunitx.dtx b/macros/latex/contrib/siunitx/siunitx.dtx
index 8f9b2dab57..73f54d71eb 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-07-20} {3.0.21}
+\ProvidesExplPackage {siunitx} {2021-07-22} {3.0.22}
{A comprehensive (SI) units package}
% \end{macrocode}
%
@@ -472,14 +472,16 @@
% Creating numerical columns requires that these are declared before anything
% else in \cs{NC@list}: this is necessary to work with optional arguments.
% This means a bit of manual effort after the simple declaration of a new
-% column type. The token assigned to the column type is not fixed as this
-% allows the same code to be used in compatibility with version~$2$.
+% column type.
% \begin{macrocode}
\cs_new_protected:Npn \@@_declare_column:Nnn #1#2#3
{
\cs_if_exist:cT { NC@find@ #1 }
{
\cs_undefine:c { NC@find@ #1 }
+ \cs_set_protected:Npn \@@_tmp:w ##1 \NC@do #1 ##2 \q_stop
+ { \NC@list {##1##2} }
+ \exp_after:wN \@@_tmp:w \the \NC@list \q_stop
\msg_warning:nnn { siunitx } { column-overwritten } {#1}
}
\newcolumntype {#1} { }
diff --git a/macros/latex/contrib/siunitx/siunitx.pdf b/macros/latex/contrib/siunitx/siunitx.pdf
index 041c2f21c7..0d5c442a74 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 a97ab0bc58..c37e3682e0 100644
--- a/macros/latex/contrib/siunitx/siunitx.tex
+++ b/macros/latex/contrib/siunitx/siunitx.tex
@@ -2418,20 +2418,20 @@ to the layout of tabular material (Table~\ref{tab:opt:tables}).
\DescribeOption{table-alignment-mode}
The method used by \pkg{siunitx} to align numbers is selected using the
\opt{table-alignment-mode} option, which may be one of \opt{marker},
-\opt{format} or \meta{none}. With the standard setting, \meta{marker}, the
+\opt{format} or \meta{none}. With the standard setting, \opt{marker}, the
package centers the decimal marker in a tabular column, potentially leaving
-white space at the shorter end of a number. The \meta{format} mode uses
-information from the \meta{table-format} key to construct a model: this is then
+white space at the shorter end of a number. The \opt{format} mode uses
+information from the \opt{table-format} key to construct a model: this is then
used to define the space available to a number. For asymmetrical numbers, this
method is strongly preferable. Finally, \opt{none} disables alignment entirely:
numbers are simply parsed.
\DescribeOption{table-number-alignment}
-When \opt{table-alignment-mode} is set to \meta{format} or \meta{none}, the
+When \opt{table-alignment-mode} is set to \opt{format} or \opt{none}, the
placement of the number \enquote{block} within the cell as a whole is set by
-the \meta{table-number-alignment} option, which may be one of \meta{left},
-\meta{center} or \meta{right}. (When \opt{table-alignment-mode} is set to
-\meta{marker}, the decimal marker is always centered in the cell.) The
+the \opt{table-number-alignment} option, which may be one of \opt{left},
+\opt{center} or \opt{right}. (When \opt{table-alignment-mode} is set to
+\opt{marker}, the decimal marker is always centered in the cell.) The
different alignment choices are illustrated in Table~\ref{tab:S:align}, which
uses somewhat exaggerated column headings to show the relative position of the
cell contents.
@@ -2485,7 +2485,7 @@ Table~\ref{tab:S:parse}.
\DescribeOption{table-format}
When the \opt{table-alignment-mode} is set to \opt{format}, \pkg{siunitx} uses
-the information set in \meta{table-format} to construct a \enquote{model} which
+the information set in \opt{table-format} to construct a \enquote{model} which
defines the space to reserve for a number. The \opt{table-format} key is
interpreted in much the same way as a table cell. The numerical part should
consist of a number showing how many figures to reserve in each part of the
@@ -2805,7 +2805,10 @@ the numbers themselves right-aligned (Table~\ref{tab:width:special}).
Cell contents which are not part of a number can be protected using braces, as
illustrated. Cells which contain no numerical data at all are aligned using the
setting specified by the \opt{table-text-alignment} option, which recognises
-the values \opt{center}, \opt{left} and \opt{right} (Table~\ref{tab:S:text}).
+the values \opt{center}, \opt{left}, \opt{none} and \opt{right}
+(Table~\ref{tab:S:text}). The setting \opt{none} is intended for use with
+the package \pkg{tabularray}, which carries out its own alignment of textual
+values.
\begin{LaTeXdemo}[code and float]
\begin{table}
\caption{Aligning text in \texttt{S} columns.%
diff --git a/macros/latex/contrib/spbmark/spbmark.dtx b/macros/latex/contrib/spbmark/spbmark.dtx
index 87e40645db..33498e535e 100644
--- a/macros/latex/contrib/spbmark/spbmark.dtx
+++ b/macros/latex/contrib/spbmark/spbmark.dtx
@@ -21,9 +21,9 @@
%</driver>
% \fi
%
-% \title{\pkg{spbmark} -- Superscript and subscript of text}
+% \title{\pkg{spbmark} -- Customize superscripts and subscripts}
% \author{Qu Yi}
-% \date{2021/06/30\hskip 1em\relax v1.01\thanks{\url{https://github.com/texl3/spbmark}}}
+% \date{2021/07/22\hskip 1em\relax v1.02\thanks{\url{https://github.com/texl3/spbmark}}}
%
% \maketitle
% \begin{abstract}
@@ -60,7 +60,7 @@
% The \meta{code} is used to format superscripts and subscripts, and can insert commands such as fonts or colors. The last command in the code can take an argument, which is either a superscript or a subscript.
%
% \begin{function}[added = 2021-06-30]{\sp,\sb,\spb,\textsuperscript,\textsubscript}
-% Except for the \tn{spb} command which is equivalent to \tn{supersub}, the others are \LaTeX{} kernel commands. If you use the \texttt{newsupb} package options then they will be redefined to make the command shorter, see section \ref{sec:macro package options}.
+% Except for the \tn{spb} command which is equivalent to \tn{supersub}, the others are \LaTeX{} kernel commands. If you use the \texttt{newsupb} package option then they will be redefined to make the command shorter, see section \ref{sec:macro package options}.
%
% If you need to use the original definitions of \tn{textsuperscript} and \tn{textsubscript}, then \tn{spb@textsuperscript@save} and \tn{spb@textsubscript@save} will be available. If you need to use the original definitions of \tn{sp} and \tn{sb}, then \tn{spb@sp@save} and \tn{spb@sb@save} will be available.
% \end{function}
@@ -136,7 +136,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2018/12/31]
\RequirePackage{xparse,l3keys2e}
-\ProvidesExplPackage{spbmark}{2021/06/30}{1.01}
+\ProvidesExplPackage{spbmark}{2021/07/22}{1.02}
{Customize superscripts and subscripts}
\cs_new_protected:Npn \spb_define:n { \keys_define:nn { spbmark } }
@@ -222,12 +222,16 @@
}
{
\IfBooleanTF{##1}
- {\spb_tmp_hboxa_set:n { $##4{\spb_math:nn {#1} {##5}}$ }}
{
+ \spb_tmp_hboxa_set:n
+ { \ensuremath{##4{\spb_math:nn {#1} {##5}}} }
+ }{
\mode_if_math:TF
- { \spb_tmp_hboxa_set:n { $##4{\spb_math:nn {#1} {##5}}$ } }
{
\spb_tmp_hboxa_set:n
+ { \ensuremath{##4{\spb_math:nn {#1} {##5}}} }
+ }{
+ \spb_tmp_hboxa_set:n
{ ##4{\use:c { spb@text#1script@save }{##5}} }
}
}
@@ -245,13 +249,13 @@
{
\IfBooleanTF{#1}
{
- \spb_tmp_hboxa_set:n { $#4{\spb@sp@save{#5}}$ }
- \spb_tmp_hboxb_set:n { $#8{\spb@sb@save{#6}}$ }
+ \spb_tmp_hboxa_set:n { \ensuremath{#4{\spb@sp@save{#5}}} }
+ \spb_tmp_hboxb_set:n { \ensuremath{#8{\spb@sb@save{#6}}} }
}{
\mode_if_math:TF
{
- \spb_tmp_hboxa_set:n { $#4{\spb@sp@save{#5}}$ }
- \spb_tmp_hboxb_set:n { $#8{\spb@sb@save{#6}}$ }
+ \spb_tmp_hboxa_set:n { \ensuremath{#4{\spb@sp@save{#5}}} }
+ \spb_tmp_hboxb_set:n { \ensuremath{#8{\spb@sb@save{#6}}} }
}
{
\spb_tmp_hboxa_set:n { #4{\spb@textsuperscript@save{#5}} }
diff --git a/macros/latex/contrib/spbmark/spbmark.pdf b/macros/latex/contrib/spbmark/spbmark.pdf
index 7c108609cb..541ea467ed 100644
--- a/macros/latex/contrib/spbmark/spbmark.pdf
+++ b/macros/latex/contrib/spbmark/spbmark.pdf
Binary files differ
diff --git a/macros/latex/contrib/stackengine/stackengine.pdf b/macros/latex/contrib/stackengine/stackengine.pdf
index 829e001d2d..796a9e9cda 100644
--- a/macros/latex/contrib/stackengine/stackengine.pdf
+++ b/macros/latex/contrib/stackengine/stackengine.pdf
Binary files differ
diff --git a/macros/latex/contrib/stackengine/stackengine.sty b/macros/latex/contrib/stackengine/stackengine.sty
index d99282df7d..4e37b5e2dd 100644
--- a/macros/latex/contrib/stackengine/stackengine.sty
+++ b/macros/latex/contrib/stackengine/stackengine.sty
@@ -1,6 +1,6 @@
-\def\stackengineversionnumber{v4.1}
+\def\stackengineversionnumber{v4.11}
\ProvidesPackage{stackengine}
-[2021/07/15 \stackengineversionnumber\
+[2021/07/22 \stackengineversionnumber\
Stacking text and objects in convenient ways]
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -88,6 +88,9 @@
% -Introduce \lstackMath and \lstackText as local versions of
% \stackMath and \stackText (which are global).
% -Eliminated \usestackstrut (became internal \@usestackstrut)
+% V4.11 -Renamed \@backgroundbox to \se@backgroundbox, to avoid
+% conflict with adjustbox package. Thanks to
+% samuel.wein AT uni-tuebingen.de for the tip.
\RequirePackage{etoolbox}
\RequirePackage{listofitems}% REQUIRES listofitems.sty AND listofitems.tex
\usepackage{calc}
@@ -102,7 +105,7 @@
\newsavebox\@addedbox
\newsavebox\@anchorbox
\newsavebox\@insetbox
-\newsavebox\@backgroundbox
+\newsavebox\se@backgroundbox
\newsavebox\stackedbox
\newsavebox{\@centerbox}
\newcounter{ROWcellindex@}
@@ -363,13 +366,13 @@
%\stackinset{l/c/r}{x}{b/c/t}{y}{inset}{anchor}
\newcommand*\stackinset[6]{%
- \sbox\@backgroundbox{\stack@delim#6\stack@delim}%
+ \sbox\se@backgroundbox{\stack@delim#6\stack@delim}%
\sbox\@insetbox{\stack@delim#5\stack@delim}%
\ifstrequal{#4}{}%
{\setlength{\stack@tmplength}{0pt}}%
{\setlength{\stack@tmplength}{#4}}%
\if c#3%
- \setlength{\temp@stkl}{\ht\@backgroundbox+\dp\@backgroundbox%
+ \setlength{\temp@stkl}{\ht\se@backgroundbox+\dp\se@backgroundbox%
-\ht\@insetbox-\dp\@insetbox}%
\addtolength{\stack@tmplength}{.5\temp@stkl}%
\fi%
@@ -381,7 +384,7 @@
\else%
\def\conditioned@inset{\stack@lroffset\usebox{\@insetbox}\stack@lroffset}%
\fi%
- \stackengine{-\stack@tmplength}{\usebox{\@backgroundbox}}%
+ \stackengine{-\stack@tmplength}{\usebox{\se@backgroundbox}}%
{\conditioned@inset}{\inset@valign{#3}}{#1}{\quietstack}{T}{S}%
}
diff --git a/macros/latex/contrib/tiscreen/README b/macros/latex/contrib/tiscreen/README
index dd49e6c91b..b7e593c24e 100644
--- a/macros/latex/contrib/tiscreen/README
+++ b/macros/latex/contrib/tiscreen/README
@@ -4,6 +4,7 @@ This package mimics the screen of older Texas instruments dot matrix display
calculators, specifically the TI-82 STATS.
Changes:
+- 2021/07/22 Added bracket symbols
- 2021/06/10 Simplified example code in documentation
- 2021/06/07 Simplified characters table in documentation
- 2021/06/01 Added more characters
diff --git a/macros/latex/contrib/tiscreen/doc/tiscreen-doc.pdf b/macros/latex/contrib/tiscreen/doc/tiscreen-doc.pdf
index ff9ccf19b0..33e5b2d735 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 925cb809f8..dfe6216dc6 100644
--- a/macros/latex/contrib/tiscreen/doc/tiscreen-doc.tex
+++ b/macros/latex/contrib/tiscreen/doc/tiscreen-doc.tex
@@ -6,7 +6,6 @@
\usepackage[color]{tiscreen}
\usepackage{multicol}
\usepackage{hyperref}
-\usepackage{xspace}
\usepackage{array}
\usepackage{fancyvrb-ex}
\fvset{
@@ -18,8 +17,7 @@
}
\newcommand{\LCDsymb}[1]{\large \textLCD{1}|{#1}~|}
-\newcommand{\LCDcode}[1]{\texttt{\{#1\}}}
-\newcommand{\LCDcmd}{\textbackslash\texttt{LCD}\xspace}
+\newcommand{\LCDcmd}{\texttt{\textbackslash LCD}}
\title{TI calculator display\\{\small(TI-82 STATS)}}
\author{Mustafa Ibrahim}
@@ -27,6 +25,7 @@
\begin{document}
\maketitle
+
\begin{center}
\tiscreen
|10^6*(4^7+1){rarrow}X |
@@ -38,8 +37,8 @@
|{fcur} |
| |
\end{center}
-\tableofcontents
-\newpage
+
+\tableofcontents\newpage
\section{Quickstart}
@@ -57,10 +56,10 @@
| |
\end{SideBySideExample}
-
\section{Package option(s)}
\subsection{Color}
-Using the \texttt{color} option will change the colors used by the \LCDcmd
+
+Using the \texttt{color} option will change the colors used by the \LCDcmd{}
command. The colors are defined as \texttt{tiscreenfg} (foreground. i.e. font
color) and \texttt{tiscreenbg} (background). These colors can be redefined like
this:
@@ -72,10 +71,10 @@ this:
\end{Verbatim}
\section{LCD size}
-The default LCD size is $8\times 16$ (the size of the TI-82
-STATS). It can be changed by redefining the variables used to
-determine the size of the display or by using the original
-\LCDcmd command.
+
+The default LCD size is $8 \times 16$ (the size of the TI-82 STATS). It can be
+changed by redefining the variables used to determine the size of the display
+or by using the original \LCDcmd{} command.
\begin{Verbatim}
% First method (For entire document)
@@ -92,33 +91,40 @@ determine the size of the display or by using the original
\end{Verbatim}
\section{Additional defined characters} \LCDcolors{black}{white}
-\begin{tabular}{l|l|>{\ttfamily}l}
- \hline
- \multicolumn{3}{c}{\textbf{Added characters}} \\
- \hline \hline
- Name & Symbol &\normalfont{\LCDcmd Code} \\
- \hline
- E & \LCDsymb{sciE} & \{sciE\} \\
- $\sigma$ & \LCDsymb{sigma} & \{sigma\} \\
- $\bar x$ & \LCDsymb{barx} & \{barx\} \\
- $\bar y$ & \LCDsymb{bary} & \{bary\} \\
- $x^2$ & \LCDsymb{sq} & \{sq\} \\
- $x^{-1}$ & \LCDsymb{ar} & \{ar\} \\
- $x_1$ & \LCDsymb{sub1} & \{sub1\} \\
- $x_2$ & \LCDsymb{sub2} & \{sub2\} \\
- $x_3$ & \LCDsymb{sub3} & \{sub3\} \\
- $x_4$ & \LCDsymb{sub4} & \{sub4\} \\
- $x_5$ & \LCDsymb{sub5} & \{sub5\} \\
- $x_6$ & \LCDsymb{sub6} & \{sub6\} \\
- \hline
- \multicolumn{3}{c}{\textbf{Redefined characters}} \\
- \hline \hline
- ! & \LCDsymb{!} & \{!\} \\
- $\sqrt{x}$ & \LCDsymb{sqrt} & \{sqrt\} \\
- e & \LCDsymb{e} & e \\
- i & \LCDsymb{i} & i \\
- v & \LCDsymb{v} & v \\
- w & \LCDsymb{w} & w \\
-\end{tabular}
+\begin{center}
+ \begin{tabular}{|l|l|>{\ttfamily}l|}
+ \multicolumn{3}{c}{\textbf{Added characters}} \\
+ \hline
+ Name & Symbol &\textnormal{\LCDcmd{} Code} \\
+ \hline
+ E & \LCDsymb{sciE} & \{sciE\} \\
+ $\sigma$ & \LCDsymb{sigma} & \{sigma\} \\
+ $x^2$ & \LCDsymb{sq} & \{sq\} \\
+ $x^{-1}$ & \LCDsymb{ar} & \{ar\} \\
+ $y^x$ & \LCDsymb{cx} & \{cx\} \\
+ $x_1$ & \LCDsymb{sub1} & \{sub1\} \\
+ $x_2$ & \LCDsymb{sub2} & \{sub2\} \\
+ $x_3$ & \LCDsymb{sub3} & \{sub3\} \\
+ $x_4$ & \LCDsymb{sub4} & \{sub4\} \\
+ $x_5$ & \LCDsymb{sub5} & \{sub5\} \\
+ $x_6$ & \LCDsymb{sub6} & \{sub6\} \\
+ $\bar x$ & \LCDsymb{barx} & \{barx\} \\
+ $\bar y$ & \LCDsymb{bary} & \{bary\} \\
+ \hline
+ \multicolumn{3}{c}{\textbf{Redefined characters}} \\
+ \hline
+ ! & \LCDsymb{!} & \{!\} \\
+ \{ & \LCDsymb{lb} & \{lb\} \\
+ \} & \LCDsymb{rb} & \{rb\} \\
+ $[$ & \LCDsymb{rb} & \{rb\} \\
+ $]$ & \LCDsymb{rb} & \{rb\} \\
+ $\sqrt{x}$ & \LCDsymb{sqrt} & \{sqrt\} \\
+ e & \LCDsymb{e} & e \\
+ i & \LCDsymb{i} & i \\
+ v & \LCDsymb{v} & v \\
+ w & \LCDsymb{w} & w \\
+ \hline
+ \end{tabular}
+\end{center}
\end{document}
diff --git a/macros/latex/contrib/tiscreen/tex/tiscreen.sty b/macros/latex/contrib/tiscreen/tex/tiscreen.sty
index 3cc0136c8c..36cbdedfd4 100644
--- a/macros/latex/contrib/tiscreen/tex/tiscreen.sty
+++ b/macros/latex/contrib/tiscreen/tex/tiscreen.sty
@@ -4,10 +4,9 @@
% license is at: http://www.latex-project.org/lppl.txt
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tiscreen}[2021/06/10 Ti calculator screen]
+\ProvidesPackage{tiscreen}[2021/07/22 Ti calculator screen]
-% TODO
-% Scaling option
+% TODO: Scaling option
\def\tiscreenX{16}
\def\tiscreenY{8}
@@ -26,6 +25,7 @@
\DefineLCDchar{sub4}{00000000000100001010011100001000010}
\DefineLCDchar{sub5}{00000000000111001000011000001001100}
\DefineLCDchar{sub6}{00000000000011001000011100101001110}
+\DefineLCDchar{cx}{00101000100010100000000000000000000}
% Redefine
\DefineLCDchar{sqrt}{00111001000010000100101000110000100}
\DefineLCDchar{!}{00100001000010000100000000010000100}
@@ -33,6 +33,10 @@
\DefineLCDchar{i}{01000000001100001000010000101000100}
\DefineLCDchar{w}{00000000001000110001101011010101010}
\DefineLCDchar{v}{00000000001000110001100010101000100}
+\DefineLCDchar{[}{00110001000010000100001000010000110}
+\DefineLCDchar{]}{01100001000010000100001000010001100}
+\DefineLCDchar{lb}{00011001000010001000001000010000011}
+\DefineLCDchar{rb}{11000001000010000010001000010011000}
\RequirePackage{xcolor}
\definecolor{tiscreenfg}{HTML}{000000}
diff --git a/macros/latex/required/babel/base/README.md b/macros/latex/required/babel/base/README.md
index 777d19bd2b..93074fc20a 100644
--- a/macros/latex/required/babel/base/README.md
+++ b/macros/latex/required/babel/base/README.md
@@ -1,4 +1,4 @@
-## Babel 3.62
+## Babel 3.63
This package manages culturally-determined typographical (and other)
rules, and hyphenation patterns for a wide range of languages. Many
@@ -8,9 +8,9 @@ is a set of ini files for about 250 languages.
The latest stable version is available on <https://ctan.org/pkg/babel>.
-Changes in version 3.62 are described in:
+Changes in version 3.63 are described in:
-https://latex3.github.io/babel/news/whats-new-in-babel-3.62.html
+https://latex3.github.io/babel/news/whats-new-in-babel-3.63.html
Apart from the manual, you can find information on some aspects of babel at:
@@ -46,6 +46,9 @@ respective authors.
### Summary of Latest changes
```
+3.63 2021-07-22
+ * Fixes a severe bug with CJK and XeTeX introduced in 3.62.
+
3.62 2021-07-19
* No more errors with unknown languages in aux file.
* Preliminary support for \AddToHook.
@@ -57,4 +60,4 @@ respective authors.
### Previous changes
-See https://latex3.github.io/babel/
+See https://latex3.github.io/babel/#whats-new
diff --git a/macros/latex/required/babel/base/babel.dtx b/macros/latex/required/babel/base/babel.dtx
index e88326ebe2..28b1a76683 100644
--- a/macros/latex/required/babel/base/babel.dtx
+++ b/macros/latex/required/babel/base/babel.dtx
@@ -32,7 +32,7 @@
%
% \iffalse
%<*filedriver>
-\ProvidesFile{babel.dtx}[2021/07/19 v3.62 The Babel package]
+\ProvidesFile{babel.dtx}[2021/07/22 v3.63 The Babel package]
\documentclass{ltxdoc}
\GetFileInfo{babel.dtx}
\usepackage{fontspec}
@@ -1305,12 +1305,12 @@ be the same as the option name as set in |\usepackage|!).
\end{verbatim}
\end{example}
-\begin{note}
- With a recent version of \LaTeX, an alternative method to execute
- some code just after an |ldf| file is loaded is with |\AddToHook| and
- the hook |file/after/<language>.ldf|. \Babel{} does not predeclare
- it, and you have to do it yourself with |\NewHook| or |\ProvideHook|.
-\end{note}
+% \begin{note}
+% With a recent version of \LaTeX, an alternative method to execute
+% some code just after an |ldf| file is loaded is with |\AddToHook| and
+% the hook |file/after/<language>.ldf|. \Babel{} does not predeclare
+% it, and you have to do it yourself with |\NewHook| or |\ProvideHook|.
+% \end{note}
\begin{warning}
Currently this option is not compatible with languages loaded on the
@@ -3710,13 +3710,13 @@ options are also used (eg, |\ProsodicMarksOn| in \textsf{latin}).
events. Some hooks are predefined when \luatex{} and \xetex{} are
used.
-\New{3.62} This is not the only way to inject code at those points. The
-events listed below can be used as a hook name in |\AddToHook| in the
-form |babel/|\marg{name}, but there is a limitation, because the
-parameters passed with the \babel{} mechanism are not allowed. The
-|\AddToHook| mechanism does \textit{not} replace the current one in
-`babel`. Its main advantage is you can reconfigure `babel` even before
-loading it. See the example below.
+% \New{3.62} This is not the only way to inject code at those points. The
+% events listed below can be used as a hook name in |\AddToHook| in the
+% form |babel/|\marg{name}, but there is a limitation, because the
+% parameters passed with the \babel{} mechanism are not allowed. The
+% |\AddToHook| mechanism does \textit{not} replace the current one in
+% `babel`. Its main advantage is you can reconfigure `babel` even before
+% loading it. See the example below.
\Describe{\AddBabelHook}{\oarg{lang}\marg{name}\marg{event}\marg{code}}
@@ -3800,26 +3800,26 @@ ones, they only have a single hook and replace a default definition.
file. Used by \file{luababel.def}.
\end{description}
-\begin{example}
-The generic unlocalized \LaTeX{} hooks are predefined, so that you can
-write:
-\begin{verbatim}
-\AddToHook{babel/afterextras}{\frenchspacing}
-\end{verbatim}
-which is executed always after the extras for the language being
-selected (and just before the non-localized hooks defined with
-|\AddBabelHook|).
-
-In addition, locale-specific hooks in the form
-|babel/|\marg{hook-name}|/|\marg{language-name} are \textit{recognized}
-(executed just before the localized \babel{} hooks), but they are \textit{not
-predefined}. You have to do it yourself. For example, to set
-|\frenchspacing| only in |bengali|:
-\begin{verbatim}
-\ProvideHook{babel/afterextras/bengali}
-\AddToHook{babel/afterextras/bengali}{\frenchspacing}
-\end{verbatim}
-\end{example}
+% \begin{example}
+% The generic unlocalized \LaTeX{} hooks are predefined, so that you can
+% write:
+% \begin{verbatim}
+% \AddToHook{babel/afterextras}{\frenchspacing}
+% \end{verbatim}
+% which is executed always after the extras for the language being
+% selected (and just before the non-localized hooks defined with
+% |\AddBabelHook|).
+
+% In addition, locale-specific hooks in the form
+% |babel/|\marg{hook-name}|/|\marg{language-name} are \textit{recognized}
+% (executed just before the localized \babel{} hooks), but they are \textit{not
+% predefined}. You have to do it yourself. For example, to set
+% |\frenchspacing| only in |bengali|:
+% \begin{verbatim}
+% \ProvideHook{babel/afterextras/bengali}
+% \AddToHook{babel/afterextras/bengali}{\frenchspacing}
+% \end{verbatim}
+% \end{example}
\Describe{\BabelContentsFiles}{}
\New{3.9a} This macro contains a list of ``toc'' types
@@ -5024,8 +5024,8 @@ help from Bernd Raichle, for which I am grateful.
% \section{Tools}
%
% \begin{macrocode}
-%<<version=3.62>>
-%<<date=2021/07/19>>
+%<<version=3.63>>
+%<<date=2021/07/22>>
% \end{macrocode}
%
% \textbf{Do not use the following macros in \texttt{ldf} files. They
@@ -13081,7 +13081,7 @@ help from Bernd Raichle, for which I am grateful.
\ifx\AtBeginDocument\@notprerr
\expandafter\@secondoftwo % to execute right now
\fi
- \AtBeginDocument{\bbl@patchfont{\bbl@xenohyph}}%
+ \AtBeginDocument{\bbl@patchfont{\bbl@ispacesize}}%
\fi}%
\fi}
\ifx\DisableBabelHook\@undefined\endinput\fi
diff --git a/macros/latex/required/babel/base/babel.ins b/macros/latex/required/babel/base/babel.ins
index de98307cae..1a40cdc93a 100644
--- a/macros/latex/required/babel/base/babel.ins
+++ b/macros/latex/required/babel/base/babel.ins
@@ -26,7 +26,7 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%%
-\def\filedate{2021/07/19}
+\def\filedate{2021/07/22}
\def\batchfile{babel.ins}
\input docstrip.tex
diff --git a/macros/latex/required/babel/base/babel.pdf b/macros/latex/required/babel/base/babel.pdf
index 4ae4792afd..5ab700e806 100644
--- a/macros/latex/required/babel/base/babel.pdf
+++ b/macros/latex/required/babel/base/babel.pdf
Binary files differ
diff --git a/macros/latex/required/babel/base/bbcompat.dtx b/macros/latex/required/babel/base/bbcompat.dtx
index ef63539302..9ed2c3c322 100644
--- a/macros/latex/required/babel/base/bbcompat.dtx
+++ b/macros/latex/required/babel/base/bbcompat.dtx
@@ -30,7 +30,7 @@
%
% \iffalse
%<*dtx>
-\ProvidesFile{bbcompat.dtx}[2021/07/19 v3.62]
+\ProvidesFile{bbcompat.dtx}[2021/07/22 v3.63]
%</dtx>
%
%% File 'bbcompat.dtx'