summaryrefslogtreecommitdiff
path: root/macros/latex
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-12-14 03:00:49 +0000
committerNorbert Preining <norbert@preining.info>2021-12-14 03:00:49 +0000
commit829614e28f2055883ff74da11eb4e5e57d199be3 (patch)
treee05b47bf922b406e539af54628697bec5b77b4ed /macros/latex
parent8164c2be3b4849a9c77e44b9659a3de8af010bd7 (diff)
CTAN sync 202112140300
Diffstat (limited to 'macros/latex')
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-sbl/README.md2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-examples.pdfbin343541 -> 343605 bytes
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-examples.tex1
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-ibid.pdfbin60288 -> 60593 bytes
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl.def33
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl.pdfbin164804 -> 164907 bytes
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl-paper.pdfbin78804 -> 79185 bytes
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl.cbx3
-rw-r--r--macros/latex/contrib/easybook/easybook.dtx68
-rw-r--r--macros/latex/contrib/easybook/easybook.pdfbin594571 -> 594412 bytes
-rw-r--r--macros/latex/contrib/easybook/easybook.tex32
11 files changed, 83 insertions, 56 deletions
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/README.md b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/README.md
index fefcb07149..17cfc6527b 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/README.md
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/README.md
@@ -50,7 +50,7 @@ The following packages are required:
## Licence
```
-Copyright 2015-2020 David Purton
+Copyright 2015-2021 David Purton
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-examples.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-examples.pdf
index 00501af9d4..97c42c2f86 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-examples.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-examples.pdf
Binary files differ
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-examples.tex b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-examples.tex
index c7cbc4bcd4..042384d0ad 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-examples.tex
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-examples.tex
@@ -1516,7 +1516,6 @@ Than the Author}
title = {The Great Hymn to the Aten},
shorttitle = {Great Hymn to the Aten},
translator = {Lichtheim, Miriam},
- volume = {1},
part = {26},
pages = {44-46},
related = {hallo:1997},
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-ibid.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-ibid.pdf
index 62d82711bd..c67a65780b 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-ibid.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-ibid.pdf
Binary files differ
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl.def b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl.def
index 0f8ece1b0d..65bc3e8e81 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl.def
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl.def
@@ -15,8 +15,8 @@
% VERSION STRINGS
% ------------------------------------------------------------------
-\def\sbl@abx@date{2020/11/04}
-\def\sbl@abx@version{0.12}
+\def\sbl@abx@date{2021/12/13}
+\def\sbl@abx@version{0.13}
\def\sbl@abx@bbxid{\sbl@abx@date\space v\sbl@abx@version\space biblatex-sbl bibliography style (DCP)}
\def\sbl@abx@cbxid{\sbl@abx@date\space v\sbl@abx@version\space biblatex-sbl citation style (DCP)}
\def\sbl@abx@lbxid{\sbl@abx@date\space v\sbl@abx@version\space biblatex-sbl localization (DCP)}
@@ -2682,7 +2682,34 @@
{\printfield{prenote}%
\setunit{\prenotedelim}}}
-\DeclareFieldFormat{altpostnote}{\mkcomprange{#1}}
+% sections and parts of ancient works shouldn't be compressed
+% See SBLHS2 §4.2.6
+\DeclareFieldFormat{altpostnote}{\mknormrange{#1}}
+
+% page ranges beginning with a multiple of 100 shouldn't be compressed
+\def\blx@comprange@check#1#2{%
+ \blx@imc@ifinteger{#1}
+ {\blx@imc@ifinteger{#2}
+ {\@firstoftwo}
+ {\@secondoftwo}}
+ {\@secondoftwo}
+ {\blx@tempcnta=#1
+ \divide\blx@tempcnta by 100
+ \multiply\blx@tempcnta by 100
+ \multiply\blx@tempcnta by -1
+ \advance\blx@tempcnta by #1\relax
+ \ifnum\blx@tempcnta=0
+ \blx@normrange@process{#1}{#2}%
+ \else
+ \blx@comprange@comp{#1}{#2}%
+ \fi}
+ {\begingroup
+ \protected@edef\blx@tempc{\endgroup
+ \blx@range@out@value{%
+ \blx@range@out@item@process{\unexpanded{#1}}%
+ \noexpand\bibrangedash
+ \blx@range@out@item@process{\unexpanded{#2}}}}%
+ \blx@tempc}}
% ------------------------------------------------------------------
% BIBLIOGRAPHY REPEATED AUTHOR MACROS
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl.pdf
index 2d7f40a15e..7f13d1f78e 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl.pdf
Binary files differ
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl-paper.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl-paper.pdf
index 91e1112207..c35bb5fe82 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl-paper.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl-paper.pdf
Binary files differ
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl.cbx
index 6e67fb24f4..037ffc9621 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl.cbx
@@ -306,7 +306,8 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-\newrobustcmd*{\Citefullauthor}{%
+\providecommand\Citefullauthor{}
+\renewrobustcmd*{\Citefullauthor}{%
\@ifstar{\bibsentence\citefullauthor*}{\bibsentence\citefullauthor}}
\DeclareCiteCommand{\citefullauthor}
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx
index 86168e7329..169e50a8a7 100644
--- a/macros/latex/contrib/easybook/easybook.dtx
+++ b/macros/latex/contrib/easybook/easybook.dtx
@@ -15,7 +15,7 @@
%<*class>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/12/12}{1.41Q}
+\ProvidesExplClass{easybook}{2021/12/12}{1.41S}
{Typeset Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
@@ -34,7 +34,7 @@
scheme .code:n = \eb_put_ctexbook:n { scheme = #1 },
enmode .meta:n = { newline,scheme = plain },
font .choices:nn =
- { noto,garamond,times,times*,libertine,palatino,auto }
+ { noto,times,times*,ebgaramond,libertine,palatino,auto }
{ \tl_set:Nn \l__eb_font_value_tl {#1} },
font .value_required:n = true,
font .initial:n = auto,
@@ -79,6 +79,7 @@
\cs_new_eq:NN \eb_set_family:nnn \ctex_ltj_set_family:nnn
\cs_new_eq:NN \eb_switch_family:n \ctex_ltj_switch_family:n
}
+\cs_generate_variant:Nn \eb_switch_family:n { V }
\cs_new_protected:Npn \eb_setmainfont:nn #1#2
{ \__fontspec_main_setmainfont:nn {#2} {#1} }
\cs_new_protected:Npn \eb_setsansfont:nn #1#2
@@ -102,7 +103,7 @@
\tl_set:Nx \l_tmpa_tl
{ \tl_if_novalue:nTF {#1} { \cs_to_str:N #2 } {#1} }
\cs_new_protected:Npx #2
- { \eb_switch_family:n { \l_tmpa_tl } }
+ { \eb_switch_family:V \l_tmpa_tl }
\eb_set_family:nnn { \l_tmpa_tl } {#3,#5} {#4}
}
@@ -184,7 +185,7 @@
BoldItalicFont = *-boldoblique
}
}
-\cs_new_protected:Npn \eb@font@load@garamond
+\cs_new_protected:Npn \eb@font@load@ebgaramond
{
\eb_setmainfont:nn { EBGaramond }
{
@@ -309,7 +310,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/12/12}{1.41Q}
+\ProvidesExplPackage{easybase}{2021/12/12}{1.41S}
{Typeset Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -567,8 +568,6 @@
withpart .bool_set:N = \l__eb_chap_counter_withpart_bool,
withpart .default:n = true,
withpart .initial:n = false,
- rulewidth .dim_set:N = \l__eb_rule_width_dim,
- rulewidth .initial:n = 0.5pt,
uppercase .bool_set:N = \l__eb_mark_uppercase_bool,
uppercase .default:n = true,
uppercase .initial:n = true,
@@ -658,24 +657,28 @@
}
\ctex_define:nn { hdrset }
{
- chap-mark .cs_set:Np = \eb_fancyhf_chapter_mark:n #1,
- chap-mark .initial:n = \CTEXifname{\eb@mark@chapter@label}{}#1,
- sec-mark .cs_set:Np = \eb_fancyhf_section_mark:n #1,
- sec-mark .initial:n = \CTEXifname{\eb@mark@section@label}{}#1,
- subsec-mark .cs_set:Np = \eb_fancyhf_subsection_mark:n #1,
- subsec-mark .initial:n = \CTEXifname{\eb@mark@subsection@label}{}#1,
- chap-label .code:n = \eb_mark_chapter_name_parse:n {#1},
- chap-label .initial:n = \hspace{1em},
- sec-label .code:n = \eb_mark_section_name_parse:n {#1},
- sec-label .initial:n = \hspace{0.5em},
- subsec-label .code:n = \eb_mark_subsection_name_parse:n {#1},
- subsec-label .initial:n = \hspace{0.5em},
- headrule .tl_gset:N = \headrule,
- headrule .initial:n = \markrule{\l__eb_rule_width_dim},
- footrule .tl_gset:N = \footrule,
- footrule .initial:n = { },
- footnoterule .tl_gset:N = \footnoterule,
- footnoterule .initial:n = \markrule[0.35\textwidth]{\l__eb_rule_width_dim}[|2.6pt]
+ chap-mark .cs_set:Np = \eb_fancyhf_chapter_mark:n #1,
+ chap-mark .initial:n = \CTEXifname{\eb@mark@chapter@label}{}#1,
+ sec-mark .cs_set:Np = \eb_fancyhf_section_mark:n #1,
+ sec-mark .initial:n = \CTEXifname{\eb@mark@section@label}{}#1,
+ subsec-mark .cs_set:Np = \eb_fancyhf_subsection_mark:n #1,
+ subsec-mark .initial:n = \CTEXifname{\eb@mark@subsection@label}{}#1,
+ chap-label .code:n = \eb_mark_chapter_name_parse:n {#1},
+ chap-label .initial:n = \hspace{1em},
+ sec-label .code:n = \eb_mark_section_name_parse:n {#1},
+ sec-label .initial:n = \hspace{0.5em},
+ subsec-label .code:n = \eb_mark_subsection_name_parse:n {#1},
+ subsec-label .initial:n = \hspace{0.5em},
+ headrulewd .dim_set:N = \eb@head@rule@wd,
+ headrulewd .initial:n = 0.5pt,
+ footnoterulewd .dim_set:N = \eb@footnote@rule@wd,
+ footnoterulewd .initial:n = 0.5pt,
+ headrule .tl_gset:N = \headrule,
+ headrule .initial:n = \markrule{\eb@head@rule@wd},
+ footrule .tl_gset:N = \footrule,
+ footrule .initial:n = { },
+ footnoterule .tl_gset:N = \footnoterule,
+ footnoterule .initial:n = \markrule[0.35\textwidth]{\eb@footnote@rule@wd}[|2.6pt]
}
\cs_set_eq:NN \eb_mark_uppercase:n \text_uppercase:n
@@ -2223,11 +2226,11 @@
belowcaptionskip = 1.5ex,
keepspaces = true,
escapeinside = {(*}{*)},
- framerule = \l__eb_rule_width_dim,
+ frame = single,
+ framerule = 0.5pt,
+ framesep = 4.5pt,
xleftmargin = 5pt,
xrightmargin = 5pt,
- framesep = \dimexpr(5pt - \l__eb_rule_width_dim),
- frame = single,
rulecolor = \color{ctex@frame},
commentstyle = \color{SlateGray},
emphstyle = \color{ctex@emph}
@@ -2430,7 +2433,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/12/12}{1.41Q}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/12/12}{1.41S}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \setexercise #1
@@ -2520,21 +2523,20 @@
{
standard~jigsaw,on~line,
top = 1.5pt,bottom = 1.5pt,left = 1.5pt,right = 1.5pt,
- boxrule = 0.5pt,arc = 1pt,
- opacityback = 0.2
+ arc = 1pt,opacityback = 0.2
}
\deftcbstyle{tc-ebfbox}
{
on~line,sharpish~corners,
top = 1.5pt,bottom = 1.5pt,left = 1pt,right = 1pt,
- boxrule = 0.5pt,leftrule = 0pt,rightrule = 0pt
+ leftrule = 0pt,rightrule = 0pt
}
\tcbset
{
breakable,
boxsep = 0pt,
fonttitle = \sffamily,
- boxrule = \l__eb_rule_width_dim
+ boxrule = 0.5pt
}
\tl_new:N \p@eb@exercise
diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf
index 9dd7f78c37..1b28eb05a9 100644
--- a/macros/latex/contrib/easybook/easybook.pdf
+++ b/macros/latex/contrib/easybook/easybook.pdf
Binary files differ
diff --git a/macros/latex/contrib/easybook/easybook.tex b/macros/latex/contrib/easybook/easybook.tex
index 1d20eef952..6231c55c10 100644
--- a/macros/latex/contrib/easybook/easybook.tex
+++ b/macros/latex/contrib/easybook/easybook.tex
@@ -20,7 +20,7 @@
name = easybook,
color-scheme = blue,
title = EASYBOOK 使用手册,
- version = v1.41Q,
+ version = v1.41S,
date = 2021/12/12,
authors = 瞿毅,
info = 排版简体中文学位论文和书籍,
@@ -246,7 +246,7 @@
\subsection{英文字体}
\begin{options}
- \keychoice{font}{noto,garamond,times,times*,libertine,palatino,auto}\Default{auto}
+ \keychoice{font}{noto,times,times*,ebgaramond,libertine,palatino,auto}\Default{auto}
预置的英文字体相关配置方案如下表所示,这些字体已经包含在了 \TeX Live 发行版中,所以通常不需要再专门安装。如果您想使用其他英文字体,可以使用 \pkg*{fontspec} 宏包的相关命令进行设置。
\insertblr
{
@@ -257,11 +257,11 @@
}{
& 正文字体 & 无衬线字体 & 等宽字体 \\
noto & Noto Serif & Noto Sans & Noto Sans Mono \\
- garamond & EB Garamond & Libertinus Sans & LM Mono \\
- palatino & TG Pagella & Libertinus Sans & LM Mono \\
- libertine & Libertinus Serif & Libertinus Sans & LM Mono \\
times & XITS & TG Heros & TG Cursor \\
- times* & Times New Roman & Arial & Courier New
+ times* & Times New Roman & Arial & Courier New \\
+ ebgaramond & EB Garamond & Libertinus Sans & LM Mono \\
+ palatino & TG Pagella & Libertinus Sans & LM Mono \\
+ libertine & Libertinus Serif & Libertinus Sans & LM Mono
}
\end{options}
@@ -391,7 +391,7 @@
style/color = seaside,
style =
{
- rulewidth = 0.5pt,
+ color = seaside,
uppercase = false
}
}
@@ -418,12 +418,6 @@
使章标题跟随每一部分编号,开启新的一部分时章编号从 1 开始,默认不跟随。
\keychoice{footwith}{part,chapter,page}\Default{chapter}
使脚注跟随编号的计数器,默认跟随章,当开启新的一章时脚注编号从 1 开始。
- \keyval-{rulewidth}{刚性长度}\Default{0.5pt}
- 统一调整页眉、定理盒子以及代码等边框线条的粗细。需要单独设置代码和定理盒子边框线条的粗细时可用它们的宏包自带命令:
- \begin{ctexexam}
- \lstset{framerule = 0.5pt}
- \tcbset{boxrule = 0.5pt}
- \end{ctexexam}
\keybool{uppercase}\Default{true}
使用 \cs*{rightmark} 及 \cs*{leftmark} 等标题标记命令获取标题内容时英文是否大写。
\kvsplit{brackets}{左括号,右括号}\Default{\Carg{(\black{,})}}
@@ -646,7 +640,7 @@
定理环境定义命令 \cs{deftheorem} 更便捷,\meta{键值列表} 中支持的选项与命令 \cs{declaretheorem} 完全相同。但它与后者命令有以下几个区别:
\begin{itemize}
\item 可以重复定义已存在的定理环境而不会报错。
- \item 中英文模式下定理标题自动切换,\meta{英文标题} 默认为首字母大写的 \meta{环境名}。
+ \item 中英文模式下定理标题自动切换。针对中文定理标题的特点将 \meta{中文标题} 设计为必选参数,\meta{英文标题} 则默认为首字母大写的 \meta{环境名}。
\item 自动定义交叉引用的格式,引用标签前缀为相应定理名。
\item 定理盒子选项 \option{thmframe} 仍然生效,\meta{盒子风格} 可以使用 \cs{deftcbstyle} 命令创建。
\item 新建定理环境默认使用的 \meta{定理样式} 为 \code{eb-theorem},而不是 \pkg*{thmtools} 的默认样式。
@@ -712,11 +706,15 @@
\kvsplit-{subsec-label}{\oarg{数字输出命令}\marg{距离命令}}\Default{\cs*{hspace}\Carg{0.5em}}
标题标记命令内容 \cs*{subsectionmark} 的标签,用法与 \option{chap-label} 类似。
\keyval-{headrule}{横线命令}
- 绘制页眉横线的选项,可以使用 \cs*{hrule} 或下述 \cs{markrule} 等画线命令来绘制横线。手动绘制横线时线条粗细选项 \option{rulewidth} 会失效。
+ 绘制页眉横线的选项,可以使用 \cs*{hrule} 或下述 \cs{markrule} 等画线命令来绘制横线。
\keyval-{footrule}{横线命令}\Default
绘制页脚横线的选项,可以使用 \cs*{hrule} 或下述 \cs{markrule} 等画线命令来绘制横线。
\keyval-{footnoterule}{横线命令}
绘制脚注横线的选项,可以使用 \cs*{hrule} 或下述 \cs{markrule} 等画线命令来绘制横线。
+ \keyval-{headrulewd}{刚性长度}\Default{0.5pt}
+ 页眉横线默认的粗细。
+ \keyval-{footnoterulewd}{刚性长度}\Default{0.5pt}
+ 脚注横线默认的粗细。
\end{options}
\begin{commands}\noitemsep
@@ -734,7 +732,7 @@
\begin{commands}
\command{markrule}[\oarg{长度}\darg{颜色名}\marg{线宽}\spemcoarg{上间距,下间距}]
- 命令 \cs{markrule} 既可在 \meta{横线命令} 中用于绘制页眉页脚横线,也可以在正文中使用。\meta{长度} 默认为页面文本区的宽度,上下间距为横线与上下方部件的间距,带有长度单位,上下间距之间用 \code{|} 符号分开,若只有一部分则表示 \meta{上间距}。下面举一个设置页眉内容的例子:
+ 实线命令 \cs{markrule} 既可在 \meta{横线命令} 中用于绘制页眉页脚横线,也可以在正文中使用。\meta{长度} 默认为页面文本区的宽度,上下间距为横线与上下方部件的间距,带有长度单位,上下间距之间用符号 \code{|} 分开,若只有一部分则表示 \meta{上间距}。下面举一个设置页眉内容的例子:
\begin{ctexexam}
\ebhdrset{headrule = \markrule(DarkOrchid){0.5pt}[2pt|2pt]}
\fancyhead[ER]{\leftmark}
@@ -829,7 +827,7 @@
引导线选项 \option{tocrule} 中一般应当使用 \cs{tocrule} 命令绘制引导线,将会在下面介绍。
\keyval-{tocafter}{距离命令}\Default{\cs*{hspace}\Carg{1em}}
在各级别目录中标签与标题间的代码,默认为插入 \code{1em} 横向距离。
- \keyval-{tocline}{目录标签}
+ \keyval-{tocline}{目录中的标题}
这个选项扩展了图片、表格或代码加入目录的题注。选项中参数 \code{\#1} 代表相应题注编号 \cs*{the}\meta{计数器} 的值,参数 \code{\#2} 代表相应题注内容。
\begin{ctexexam}[labelref = exam:list command usage]
\ctexset