summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-04-25 03:01:27 +0000
committerNorbert Preining <norbert@preining.info>2023-04-25 03:01:27 +0000
commit800f3919ea46f82dc11cbfb51f08d2f3a1c43a70 (patch)
tree0071bb5d56e0551b532c2828c29ebd2ad2d7e340 /macros
parente77721e3571e9341ee83577f574128a9f4e37c38 (diff)
CTAN sync 202304250301
Diffstat (limited to 'macros')
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/README.md5
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.pdfbin1711461 -> 1711489 bytes
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.tex151
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-css.bbx391
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-css.cbx71
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-erj.cbx46
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-jmw.bbx821
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-jmw.cbx183
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.bbx42
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.bbx36
-rw-r--r--macros/latex/contrib/koma-script/MANIFEST.md1
-rw-r--r--macros/latex/contrib/koma-script/README.md68
-rw-r--r--macros/latex/contrib/koma-script/doc/common-dictum-de.tex22
-rw-r--r--macros/latex/contrib/koma-script/doc/common-dictum-en.tex30
-rw-r--r--macros/latex/contrib/koma-script/doc/common-lists-de.tex20
-rw-r--r--macros/latex/contrib/koma-script/doc/common-lists-en.tex19
-rw-r--r--macros/latex/contrib/koma-script/doc/common-textmarkup-de.tex15
-rw-r--r--macros/latex/contrib/koma-script/doc/common-textmarkup-en.tex22
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-00-de.pdfbin15210 -> 15081 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-00-en.pdfbin16099 -> 16127 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-01-de.pdfbin17614 -> 17489 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-01-en.pdfbin18856 -> 18886 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-02-de.pdfbin17869 -> 17733 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-02-en.pdfbin19155 -> 19190 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-03-de.pdfbin17904 -> 17769 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-03-en.pdfbin19188 -> 19224 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-04-de.pdfbin17958 -> 17823 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-04-en.pdfbin19229 -> 19266 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-05-de.pdfbin18053 -> 17914 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-05-en.pdfbin19248 -> 19283 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-06-de.pdfbin18059 -> 17919 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-06-en.pdfbin19246 -> 19282 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-07-de.pdfbin17934 -> 17798 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-07-en.pdfbin19204 -> 19242 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-08-de.pdfbin30698 -> 29121 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-08-en.pdfbin32389 -> 30752 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-09-de.pdfbin30680 -> 29103 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-09-en.pdfbin32367 -> 30731 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-10-de.pdfbin30698 -> 29121 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-10-en.pdfbin32389 -> 30752 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-11-de.pdfbin30699 -> 29125 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-11-en.pdfbin32391 -> 30752 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-12-de.pdfbin30698 -> 29121 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-12-en.pdfbin32389 -> 30752 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-13-de.pdfbin31442 -> 30006 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-13-en.pdfbin33659 -> 31986 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-14-de.pdfbin31416 -> 29980 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-14-en.pdfbin33630 -> 31954 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-15-de.pdfbin31442 -> 30004 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-15-en.pdfbin33658 -> 31986 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-16-de.pdfbin32439 -> 31001 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-16-en.pdfbin34650 -> 32974 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-17-de.pdfbin32464 -> 31028 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-17-en.pdfbin34683 -> 33007 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-18-de.pdfbin32462 -> 31025 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-18-en.pdfbin34675 -> 33000 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-19-de.pdfbin32958 -> 31519 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-19-en.pdfbin34954 -> 33277 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-20-de.pdfbin32937 -> 31498 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-20-en.pdfbin34966 -> 33284 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-21-de.pdfbin44230 -> 42786 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-21-en.pdfbin46083 -> 44408 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-22-de.pdfbin44537 -> 43094 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-22-en.pdfbin46388 -> 44706 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-23-de.pdfbin44537 -> 43094 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/letter-example-23-en.pdfbin46388 -> 44706 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/scrbookreportarticle-de.tex23
-rw-r--r--macros/latex/contrib/koma-script/doc/scrbookreportarticle-en.tex13
-rw-r--r--macros/latex/contrib/koma-script/doc/scrguide-de.pdfbin3303507 -> 3255624 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/scrguide-en.pdfbin3217575 -> 3163249 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/scrjura-example-de.pdfbin62562 -> 56780 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/scrjura-example-en.pdfbin61102 -> 57967 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-de.pdfbin161997 -> 137423 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-en.pdfbin159442 -> 135451 bytes
-rw-r--r--macros/latex/contrib/koma-script/doc/scrlttr2-de.tex20
-rw-r--r--macros/latex/contrib/koma-script/doc/scrlttr2-en.tex21
-rw-r--r--macros/latex/contrib/koma-script/doc/scrlttr2-examples.dtx12
-rw-r--r--macros/latex/contrib/koma-script/japanlco.dtx12
-rw-r--r--macros/latex/contrib/koma-script/koma-script-source-doc.dtx6
-rw-r--r--macros/latex/contrib/koma-script/scraddr.dtx8
-rw-r--r--macros/latex/contrib/koma-script/scrextend.dtx12
-rw-r--r--macros/latex/contrib/koma-script/scrhack.dtx10
-rw-r--r--macros/latex/contrib/koma-script/scrjura.dtx12
-rw-r--r--macros/latex/contrib/koma-script/scrkernel-addressfiles.dtx13
-rw-r--r--macros/latex/contrib/koma-script/scrkernel-basics.dtx14
-rw-r--r--macros/latex/contrib/koma-script/scrkernel-bibliography.dtx11
-rw-r--r--macros/latex/contrib/koma-script/scrkernel-compatibility.dtx15
-rw-r--r--macros/latex/contrib/koma-script/scrkernel-floats.dtx20
-rw-r--r--macros/latex/contrib/koma-script/scrkernel-fonts.dtx15
-rw-r--r--macros/latex/contrib/koma-script/scrkernel-footnotes.dtx13
-rw-r--r--macros/latex/contrib/koma-script/scrkernel-index.dtx13
-rw-r--r--macros/latex/contrib/koma-script/scrkernel-language.dtx13
-rw-r--r--macros/latex/contrib/koma-script/scrkernel-letterclassoptions.dtx13
-rw-r--r--macros/latex/contrib/koma-script/scrkernel-listsandtabulars.dtx11
-rw-r--r--macros/latex/contrib/koma-script/scrkernel-listsof.dtx13
-rw-r--r--macros/latex/contrib/koma-script/scrkernel-miscellaneous.dtx11
-rw-r--r--macros/latex/contrib/koma-script/scrkernel-notepaper.dtx11
-rw-r--r--macros/latex/contrib/koma-script/scrkernel-pagestyles.dtx13
-rw-r--r--macros/latex/contrib/koma-script/scrkernel-paragraphs.dtx13
-rw-r--r--macros/latex/contrib/koma-script/scrkernel-pseudolengths.dtx13
-rw-r--r--macros/latex/contrib/koma-script/scrkernel-sections.dtx11
-rw-r--r--macros/latex/contrib/koma-script/scrkernel-title.dtx13
-rw-r--r--macros/latex/contrib/koma-script/scrkernel-tocstyle.dtx13
-rw-r--r--macros/latex/contrib/koma-script/scrkernel-typearea.dtx11
-rw-r--r--macros/latex/contrib/koma-script/scrkernel-variables.dtx13
-rw-r--r--macros/latex/contrib/koma-script/scrkernel-version.dtx13
-rw-r--r--macros/latex/contrib/koma-script/scrlayer-notecolumn.dtx14
-rw-r--r--macros/latex/contrib/koma-script/scrlayer-scrpage.dtx14
-rw-r--r--macros/latex/contrib/koma-script/scrlayer.dtx14
-rw-r--r--macros/latex/contrib/koma-script/scrlfile.dtx29
-rw-r--r--macros/latex/contrib/koma-script/scrlogo.dtx10
-rw-r--r--macros/latex/contrib/koma-script/scrtime.dtx13
-rw-r--r--macros/latex/contrib/koma-script/tocbasic.dtx12
-rw-r--r--macros/latex/contrib/photobook/photobook.cls41
-rw-r--r--macros/latex/contrib/photobook/photobook.pdfbin143331 -> 143821 bytes
-rw-r--r--macros/unicodetex/latex/textcsc/README3
-rw-r--r--macros/unicodetex/latex/textcsc/textcsc-documentation.pdfbin48462 -> 49161 bytes
-rw-r--r--macros/unicodetex/latex/textcsc/textcsc-documentation.tex26
-rw-r--r--macros/unicodetex/latex/textcsc/textcsc.sty8
119 files changed, 2102 insertions, 473 deletions
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/README.md b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/README.md
index a2335e41c9..91f89dbfdf 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/README.md
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/README.md
@@ -1,4 +1,4 @@
-<b>Date of last change: 2023-03-31 to version v1.1l</b>
+<b>Date of last change: 2023-04-24 to version v1.1m</b>
# biblatex-gb7714-2015: a biblatex style package
@@ -1313,6 +1313,8 @@ biblatex中处理顺序数字编码压缩的代码默认从3个连续编码开
- ![codeopt-gbcodegbk.tex](example/codeopt-gbcodegbk.tex) 测试gb7714-2015、ay样式,对于GBK编码文档的兼容性
- ![teststyleerj.tex](example/teststyleerj.tex) 测试chinese-erj样式
- ![teststylecss.tex](example/teststylecss.tex) 测试chinese-css样式
+ - ![teststylecss.tex](example/teststylecssorg.tex) 测试chinese-css样式
+ - ![teststylecss.tex](example/teststylejmw.tex) 测试chinese-jmw样式
- ![eg-opt-gbstyle.tex](example/eg-opt-gbstyle.tex) 测试gb7714-2015ms样式一篇文档中中英文两种格式设置,多语言对照,多语言混合文献表
- ![testallformat.tex](example/testallformat.tex) 测试全面的类型、格式
- ![egtest.tex](example/egtest.tex) 测试示例
@@ -1597,6 +1599,7 @@ please see the file 'biblatex-gb7714-2015.pdf' for further information!
* 2022/08/29 v1.1j,ctan,github
* 2022/11/07 v1.1k,ctan,github
* 2023/03/31 v1.1l,ctan,github
+* 2023/04/24 v1.1m,ctan,github
---------------------------------------------------------
## Update history:
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf
index 96d3e9a725..462c1f0409 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf
Binary files differ
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.tex b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.tex
index 45cea13bd6..f2aabef29f 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.tex
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.tex
@@ -6,6 +6,9 @@
\documentclass[11pt]{article} %用draft选项找到badbox的位置 twoside,
\input{biblatex-gb7714-2015-preamble} %宏包和一些格式设置
\usepackage{microtype}
+\usepackage{datetime}
+\renewcommand{\dateseparator}{-}
+\yyyymmdddate
%\usepackage[russian,french,english]{babel}
%\DefineHyphenationExceptions{english}{conf-erence}
\begin{document}
@@ -22,18 +25,19 @@
\pagenumbering{Roman}
\titleformanual{符合GB/T 7714-2015标准的biblatex参考文献样式
-\footnote{This Manual was created with biblatex v\versionofbiblatex, last revised at \today;\\%
+\footnote{This Manual was first created at 2016-07-01 and revised at \today ~with biblatex v\versionofbiblatex;\\%
Style Files (gb7714-2015*.*) have version number: \versionofgbtstyle.}
\footnote{repository address: \url{https://github.com/hushidong/biblatex-gb7714-2015}}}
\authorformanual{胡振震\setcounter{footnote}{0}\footnote{Email: hzzmail@163.com}}
-\dateformanual{2016-07-01}
+\dateformanual{\today}
\titleandauthor
\begin{quotation}
-biblatex-gb7714-2015 宏包是为满足《GB/T 7714-2015~~信息与文献~~参考文献著录规则》要求而开发的 biblatex 样式包。宏包提供两种编制样式: 一、顺序编码制(gb7714-2015);二、著者-出版年制(gb7714-2015ay),能够精确地实现国标提出的著录和标注格式,且具备易用、兼容、灵活等特点,能为国内\LaTeX{}用户提供一个可靠的参考文献生成工具。
+biblatex-gb7714-2015 宏包是为满足《GB/T 7714-2015~~信息与文献~~参考文献著录规则》要求而开发的 biblatex 样式包。宏包主要提供两种编制样式: 一、顺序编码制(gb7714-2015);二、著者-出版年制(gb7714-2015ay),能够精确地实现国标提出的著录和标注格式。另外提供gb7714-2005和gb7714-1987两个老版本的国标样式,和经济学研究(chinese-erj)、社会科学(chinese-css)、管理世界(chinese-jmw)等期刊的文献样式,以及西北农林(gb7714-NWAFU)、华中师范(gb7714-CCNU)、东南大学(gb7714-SEU)等几个明显有别于国标的特殊学位论文文献样式。
+具备灵活、易用、兼容性好等特点,能为国内\LaTeX{}用户提供一个可靠的参考文献生成工具。
%old:
%biblatex-gb7714-2015 样式宏包提供了符合《GB/T 7714-2015 信息与文献 参考文献
%著录规则》要求的 biblatex 参考文献样式。分为两种编制方式: 一、顺序编码制;二、著
@@ -152,7 +156,7 @@ GB/T 7714标准的理解和解释(\ref{sec:gbt:std}节)、
\zd{gb7714-2015ms.bbx/cbx}是混合样式,支持区分中英文语言分设不同标准的著录格式。
\zd{gb7714-2015mx.bbx/cbx}是混合样式,支持在不同的参考文献分节中使用不同的编制样式,比如有的节使用顺序编码制,有的节使用著者年份制。
\zd{gb7715-2015-gbk.def}为GBK编码文档编译所需的支撑文件。
-\zd{chinese-erj.bbx/cbx} 是经济学研究期刊的文献样式。后三者仅支持较新的biblatex版本。
+\zd{chinese-erj.bbx/cbx}、\zd{chinese-css.bbx/cbx}、\zd{chinese-jmw.bbx/cbx} 是经济学研究、社会科学、管理世界期刊的文献样式。%后三者仅支持较新的biblatex版本。
\zd{biblatex-gb7714-2015.tex} 为宏包说明文档,\zd{example}目录下为各种选项的测试用例,
\zd{egfigure}目录下为说明文档中的图例文档,\zd{egthesis}为国内一些大学学位论文文献样式的测试用例,包括完全按照国标的BUPT、CAU、ECNU、FDU、SJTU、THU、USTC、XJTU、ZJU,与国标略有差异的UCAS,以及与国标有较大差异的NWAFU、SEU等。\zd{*.bat}、\zd{*.sh}分别为windows和linux下说明文档的编译脚本。\zd{*.pl}为gb7714格式著录文献表到bib文件的perl转换脚本,\zd{*.dat}为转换测试文献表。
@@ -174,13 +178,13 @@ GB/T 7714标准的理解和解释(\ref{sec:gbt:std}节)、
\draw[color=cyan,thick] (script.north) -- ($(script.north)+(0mm,3mm)$) ;
\draw[color=cyan,thick] ($(style.north)+(0mm,3mm)$) -- ($(script.north)+(0mm,3mm)$);
-\node[below of=style,fill=gbgrey!20,yshift=0.5cm,xshift=2mm,text width=2cm] (numcbbx) {\tiny \textcolor{black}{gb7715-2015/ay.c/bbx}};
-\node[below of=numcbbx,fill=gbgrey!20,yshift=8mm,text width=2cm] (aycbbx) {\tiny \textcolor{black}{gb7715-1987/ay.c/bbx}};
-\node[below of=aycbbx,fill=gbgrey!20,yshift=8mm,text width=2cm] (mscbbx) {\tiny \textcolor{black}{gb7715-2015ms.c/bbx}};
-\node[below of=mscbbx,fill=gbgrey!20,yshift=8mm,text width=2cm] (mxcbbx) {\tiny \textcolor{black}{gb7715-2015mx.c/bbx}};
-\node[below of=mxcbbx,fill=gbgrey!20,yshift=8mm,text width=2cm] (gbkdef) {\tiny \textcolor{black}{gb7715-2005/ay.c/bbx}};
-\node[below of=gbkdef,fill=gbgrey!20,yshift=8mm,text width=2cm] (erjcbbx) {\tiny \textcolor{black}{chinese-erj.c/bbx}};
-\node[below of=erjcbbx,fill=gbgrey!20,yshift=8mm,text width=2cm] (csscbbx) {\tiny \textcolor{black}{chinese-css.c/bbx}};
+\node[below of=style,fill=gbgrey!20,yshift=0.5cm,xshift=2mm,text width=2.5cm] (numcbbx) {\tiny \textcolor{black}{gb7715-2015/ay.c/bbx}};
+\node[below of=numcbbx,fill=gbgrey!20,yshift=8mm,text width=2.5cm] (aycbbx) {\tiny \textcolor{black}{gb7715-1987/ay.c/bbx}};
+\node[below of=aycbbx,fill=gbgrey!20,yshift=8mm,text width=2.5cm] (mscbbx) {\tiny \textcolor{black}{gb7715-2015ms.c/bbx}};
+\node[below of=mscbbx,fill=gbgrey!20,yshift=8mm,text width=2.5cm] (mxcbbx) {\tiny \textcolor{black}{gb7715-2015mx.c/bbx}};
+\node[below of=mxcbbx,fill=gbgrey!20,yshift=8mm,text width=2.5cm] (gbkdef) {\tiny \textcolor{black}{gb7715-2005/ay.c/bbx}};
+\node[below of=gbkdef,fill=gbgrey!20,yshift=8mm,text width=2.5cm] (erjcbbx) {\tiny \textcolor{black}{chinese-erj.c/bbx}};
+\node[below of=erjcbbx,fill=gbgrey!20,yshift=8mm,text width=2.5cm] (csscbbx) {\tiny \textcolor{black}{chinese-css.c/bbx等}};
%\node[below of=msbbx,fill=gbgrey!20,yshift=8mm,text width=2cm] (mscbx) {\tiny \textcolor{black}{gb7715-2015ms.cbx}};
\draw[color=blue,semithick] (numcbbx.west) -- ($(numcbbx.west)+(-3mm,0mm)$) ;
@@ -192,7 +196,7 @@ GB/T 7714标准的理解和解释(\ref{sec:gbt:std}节)、
\draw[color=blue,semithick] (csscbbx.west) -- ($(csscbbx.west)+(-3mm,0mm)$) ;
%\draw[color=blue,semithick] (mscbx.west) -- ($(mscbx.west)+(-3mm,0mm)$) ;
-\draw[color=blue,semithick] ($(csscbbx.west)+(-3mm,0mm)$) -- ($(style.center)+(-12mm,-2.5mm)$);
+\draw[color=blue,semithick] ($(csscbbx.west)+(-3mm,0mm)$) -- ($(style.center)+(-14.5mm,-2.5mm)$);
\node[below of=manual,fill=gbsteelblue!15,yshift=0.5cm,xshift=2mm,text width=2.8cm] (mtex) {\tiny \textcolor{black}{biblatex-gb7714-2015.tex}};
\node[below of=mtex,fill=gbsteelblue!15,yshift=8mm,text width=2.8cm] (mpdf) {\tiny \textcolor{black}{biblatex-gb7714-2015.pdf}};
@@ -227,16 +231,7 @@ GB/T 7714标准的理解和解释(\ref{sec:gbt:std}节)、
\subsection{最小示例}
基于biblatex宏包的参考文献生成方法非常简单,例 \ref{code:doc:structrue} 是一个最小工作示例。示例代码中给出了详细注释,介绍了使用biblatex 的tex源文档基本结构,其中gb7714-2015 样式随biblatex宏包加载,
-参考文献数据文件example.bib(bib文件需另外准备,详见\ref{sec:bib:bibtex}节)利用 \verb|\addbibresource|加载,文献表利用 \verb|\printbibliography| 命令输出(可在正文任意位置)。所有基于 biblatex 生成参考文献的文档无论大小万变不离其宗。
-若需更全面了解biblatex及参考文献生成高级功能另可参考:
-\href{https://github.com/plk/biblatex}{biblatex宏包手册}
-\footnote{地址:\url{https://github.com/plk/biblatex}}、
-\href{https://github.com/hushidong/biblatex-zh-cn}{中文版}
-\footnote{地址:\url{https://github.com/hushidong/biblatex-zh-cn}}
-或者
-\href{https://github.com/hushidong/biblatex-solution-to-latex-bibliography}{LaTeX 文档中文参考文献的biblatex解决方案}
-\footnote{地址:%
-\url{https://github.com/hushidong/biblatex-solution-to-latex-bibliography}}。
+参考文献数据文件example.bib利用 \verb|\addbibresource|加载 (注意:bib文件需另外准备,详见\ref{sec:bib:bibtex}节),文献表利用 \verb|\printbibliography| 命令输出(可在正文任意位置)。
\begin{example}{biblatex参考文献生成的最小工作示例}{code:doc:structrue}
\begin{texlist}
@@ -260,29 +255,8 @@ GB/T 7714标准的理解和解释(\ref{sec:gbt:std}节)、
\end{texlist}
\end{example}
-
-
-\subsection{编译方式}
-
-与基于bibtex传统方法的四步编译不同,基于biblatex生成参考文献一般只需三步编译,第一遍xelatex,第二遍biber,第三遍xelatex。如若需要后向超链接,则除设置backref 选项外,还需第四遍 xelatex 编译。例\ref{eg:compile:cmd} 给出编译命令,其中\verb|--synctex=-1| 选项也可以是-synctex=1。另外四步命令可以用一条 latexmk 命令代替。
-关于非utf-8编码文档和使用pdflatex命令编译的细节另见第\ref{sec:pkg:hints}节。
-
-\begin{example}{文档编译命令}{eg:compile:cmd}
-\begin{texlist}
-%四步编译命令
-xelatex --synctex=-1 jobname.tex
-biber jobname
-xelatex --synctex=-1 jobname.tex
-xelatex --synctex=-1 jobname.tex
-%或采用latexmk,则仅需一条命令
-latexmk -xelatex jobname.tex
-\end{texlist}
-\end{example}
-
-前述的最小工作示例的编译结果如图\ref{fig:eg:ref}所示。
-
-\begin{refsection}
-\begin{figure}[!htb]
+%\begin{refsection}
+\begin{figure}[!h]
\centering
%\begin{tcolorbox}[left skip=0pt,right skip=0pt,%
%width=\linewidth,colframe=gblabelcolor,colback=white,arc=0pt,%
@@ -305,7 +279,36 @@ latexmk -xelatex jobname.tex
%\end{tcolorbox}
\caption{最小工作示例编译生成的PDF文档}\label{fig:eg:ref}
\end{figure}
-\end{refsection}
+%\end{refsection}
+
+上述最小工作示例的编译结果如图\ref{fig:eg:ref}所示。所有基于 biblatex 生成参考文献的文档无论大小万变不离其宗,
+若需更全面了解biblatex及参考文献生成高级功能另可参考:
+\href{https://github.com/plk/biblatex}{biblatex宏包手册}
+\footnote{地址:\url{https://github.com/plk/biblatex}}、
+\href{https://github.com/hushidong/biblatex-zh-cn}{中文版}
+\footnote{地址:\url{https://github.com/hushidong/biblatex-zh-cn}}
+或者
+\href{https://github.com/hushidong/biblatex-solution-to-latex-bibliography}{LaTeX 文档中文参考文献的biblatex解决方案}
+\footnote{地址:%
+\url{https://github.com/hushidong/biblatex-solution-to-latex-bibliography}}。
+
+
+\subsection{编译方式}
+
+与基于bibtex传统方法的四步编译不同,基于biblatex生成参考文献一般只需三步编译,第一遍xelatex,第二遍biber,第三遍xelatex。如若需要后向超链接,则除设置backref 选项外,还需第四遍 xelatex 编译。例\ref{eg:compile:cmd} 给出编译命令,其中\verb|--synctex=-1| 选项也可以是-synctex=1。另外四步命令可以用一条 latexmk 命令代替。
+关于非utf-8编码文档和使用pdflatex命令编译的细节另见第\ref{sec:pkg:hints}节。
+
+\begin{example}{文档编译命令}{eg:compile:cmd}
+\begin{texlist}
+%四步编译命令
+xelatex --synctex=-1 jobname.tex
+biber jobname
+xelatex --synctex=-1 jobname.tex
+xelatex --synctex=-1 jobname.tex
+%或采用latexmk,则仅需一条命令
+latexmk -xelatex jobname.tex
+\end{texlist}
+\end{example}
\section{使用说明}
@@ -370,9 +373,38 @@ perl gb7714texttobib.pl in=textfilename out=bibfilename
\end{texlist}
\end{example}
-其中,v1.0m版本增加的gb7714-2015ms样式文件,主要是为了在一个文献表中针对不同语言使用不同多种样式,比如中文文献使用GB/T 7714-2015规定的著录格式,而其它语言文献使用biblatex提供的标准样式。v1.0r版本增加了gb7714-2015mx样式,主要是为了在一个文档中针对不同参考文献分节使用不同的参考文献样式,比如某些节使用著者年份制,某些节使用顺序编码制。尽管这些方式不常用,但偶尔也有需求,所以都做了实现。
+其中,
+v1.0m版本增加的gb7714-2015ms样式文件,主要是为了在一个文献表中针对不同语言使用不同的样式,比如中文文献使用GB/T 7714-2015规定的著录格式,而其它语言文献使用biblatex提供的标准样式。
+v1.0r版本增加了gb7714-2015mx样式,主要是为了在一个文档中针对不同参考文献分节使用不同的参考文献样式,比如某些节使用著者年份制,某些节使用顺序编码制。
+%尽管这些方式不常用,但偶尔也有需求,所以都做了实现。
+
+尽管国标1987和2005版本已经过时,但仍然有些地方还在使用,所以1.0z版本增加了gb7714-1987和gb7714-2005两个版本的样式,也分顺序编码和著者年份制:
+
+\pdfbookmark[4]{gb7714-1987}{gb7714-1987}
+\pdfbookmark[4]{gb7714-1987ay}{gb7714-1987ay}
+\pdfbookmark[4]{gb7714-2005}{gb7714-2005}
+\pdfbookmark[4]{gb7714-2005ay}{gb7714-2005ay}
+\begin{example}{1987和2005版的国标样式}{eg:gb87and2005}
+\begin{texlist}
+%国标1987顺序编码制
+\usepackage[backend=biber,style=gb7714-1987]{biblatex}
+%国标1987著者年份制
+\usepackage[backend=biber,style=gb7714-1987ay]{biblatex}
+%国标2005顺序编码制
+\usepackage[backend=biber,style=gb7714-2005]{biblatex}
+%国标2005著者年份制
+\usepackage[backend=biber,style=gb7714-2005ay]{biblatex}
+\end{texlist}
+\end{example}
+
+
+另外,根据国内大学的学位论文的文献生成需求,增加了几个与国标有明显区别的样式,包括:西北农林(gb7714-NWAFU)、华中师范(gb7714-CCNU)、东南大学(gb7714-SEU)等。其他大学的文献样式与国标基本一致,比如上海交大、浙大、复旦等,直接使用即可。另外一些大学与国标略有差别,可以通过简单的设置满足要求,比如清华、科学院大学、中科大、国防科大等,通常在学位论文模板中实现,在egthesis文件夹内,针对一些大学的学位论文参考文献做了测试。
-另外根据需求,v1.0r版本增加了chinese-erj样式用于生成经济研究期刊的文献,v1.1l版本增加了chinese-css样式用于生成社会科学期刊的脚注注释。且在egthesis文件夹内,针对国内一些大学的学位论文文献要求,基于国标样式做了一些定制和测试。
+此外,根据期刊文献生成需求,为文科类期刊增加了如下样式:
+v1.0r版本增加了chinese-erj样式用于生成经济研究期刊的文献;
+v1.1l版本增加了chinese-css样式用于生成社会科学期刊的脚注注释;
+v1.1m版本增加了chinese-jmw样式用于生成管理世界期刊的文献。
+而理工类期刊文献通常与国标差别不大,部分期刊与国标的最大的差异主要是在双语对照文献中,比如计算机学报等,可以通过简单的设置来满足要求,具体可以参考github上的问题。
\pdfbookmark[4]{chinese-erj}{chinese-erj}
\begin{example}{经济研究期刊文献样式(chinese-erj)}{eg:gbchineseerj}
@@ -390,26 +422,17 @@ perl gb7714texttobib.pl in=textfilename out=bibfilename
\end{texlist}
\end{example}
-尽管国标1987和2005版本已经过时,但仍然有些地方还在使用,所以1.0z版本增加了gb7714-1987和gb7714-2005两个版本的样式,也分顺序编码和著者年份制:
-\pdfbookmark[4]{gb7714-1987}{gb7714-1987}
-\pdfbookmark[4]{gb7714-1987ay}{gb7714-1987ay}
-\pdfbookmark[4]{gb7714-2005}{gb7714-2005}
-\pdfbookmark[4]{gb7714-2005ay}{gb7714-2005ay}
-\begin{example}{1987和2005版的国标样式}{eg:gb87and2005}
+\pdfbookmark[4]{chinese-jmw}{chinese-jmw}
+\begin{example}{管理世界期刊文献样式(chinese-jmw)}{eg:gbchinesejmw}
\begin{texlist}
-%国标1987顺序编码制
-\usepackage[backend=biber,style=gb7714-1987]{biblatex}
-%国标1987著者年份制
-\usepackage[backend=biber,style=gb7714-1987ay]{biblatex}
-%国标2005顺序编码制
-\usepackage[backend=biber,style=gb7714-2005]{biblatex}
-%国标2005著者年份制
-\usepackage[backend=biber,style=gb7714-2005ay]{biblatex}
+%使用社会科学期刊文献样式
+\usepackage[backend=biber,style=chinese-jmw]{biblatex}
\end{texlist}
\end{example}
+
\subsubsection{新增选项}\label{sec:added:opt}
样式包新增了一些选项和命令,新增选项更常用一些,所以在本节集中介绍,而新增命令往往涉及更细节的修改,所以在后面介绍各类格式调整的内容中介绍。
新增选项用于标签对齐方式、出版项缺省处理、责任者(作者)缺省处理等功能的控制,其使用方式与biblatex宏包选项完全相同:
@@ -980,9 +1003,9 @@ leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
\pdfbookmark[4]{gbfootbibfmt}{gbfootbibfmt}
\item[gbfootbibfmt]=true,\textbf{false}. \hfill default is false
- 如果要实现脚注文献表,但不想要国标要求的脚注符号和缩进,但要求相同文献用标签替代,则可使用gbfootbibfmt代替上面的gbfootbib选项。
+ 如果不想要默认的脚注符号和缩进,但要实现脚注文献表且脚注中相同文献用标签替代等国标要求,则可使用gbfootbibfmt代替上面的gbfootbib选项。
\begin{itemize}
- \item gbfootbibfmt=true,处理使脚注文献表中的相同的文献用标签代替。
+ \item gbfootbibfmt=true,实现脚注文献表及相同文献用标签代替等国标要求,但不设置脚注符号和缩进,用户可自行通过其它方式或宏包设置需要的符号和缩进形式。
\item gbfootbibfmt=false,不做任何附加处理。
\end{itemize}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-css.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-css.bbx
index 8d160a44fe..88d963c2bc 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-css.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-css.bbx
@@ -38,6 +38,7 @@
doi=false,
url=false,
gbfieldtype=true,
+ dateabbrev=false,
%datezeros=false,
}
@@ -73,13 +74,14 @@
%为标注和文献表中标点格式,重设and本地化字符串
%==================================================
\DefineBibliographyStrings{english}{
-% and = { and},%and后面的空格在finalnamedelim已经加过了,所以这里去掉20191009
+ and = {\ifcitation{ and}{\addcomma\addspace}},%and后面的空格在finalnamedelim已经加过了,所以这里去掉20191009
% andcn = {\gbpunctmark\unspace},%\gbpunctmark
% andincitecn = {和},%将标注中的分开,便于与文献表中的区分
-% andincite = {\&},
+ %andincite = { and },
%andotherscn={等},
mathesiscn={硕士学位论文},
phdthesiscn={博士学位论文},
+ bytranslator= {\ifcitation{trans\adddot\space}{trans\adddot\ \lbx@sfromlang\ by}},
}
@@ -92,11 +94,15 @@
%\DeclareFieldFormat*{booktitle}{\gbpunctttl#1\gbpunctttr}
\DeclareFieldFormat*{title}{%
\ifcitation{\iffieldequalstr{userd}{chinese}{\gbpunctttl#1\gbpunctttr}{\textit{#1}\isdot}}{#1\isdot}}
-\DeclareFieldFormat[article]{title}{%
+\DeclareFieldFormat[archive]{title}{%
+\ifcitation{\iffieldequalstr{userd}{chinese}{\gbpunctttl#1\gbpunctttr}{#1\isdot}}{#1\isdot}}
+\DeclareFieldFormat[article,incollection,inbook,inproceedings]{title}{%
\ifcitation{\iffieldequalstr{userd}{chinese}{\gbpunctttl#1\gbpunctttr}{\mkbibquote{#1}\isdot}}%
{#1\adddot\addthinspace}}
\DeclareFieldFormat*{journaltitle}{%
\ifcitation{\iffieldequalstr{userd}{chinese}{\gbpunctttl#1\gbpunctttr}{\textit{#1}}}{#1\isdot}}%
+\DeclareFieldFormat{booktitle}{%
+\ifcitation{\iffieldequalstr{userd}{chinese}{\gbpunctttl#1\gbpunctttr}{\textit{#1}}}{#1}}
\renewcommand*{\revsdnamepunct}{%
\ifcitation{\iffieldequalstr{userd}{chinese}{\gbpunctcomma}{\gbpunctcommalanen}}{}}
\DeclareDelimFormat{multinamedelim}{%
@@ -196,37 +202,160 @@
\DeclareDelimFormat{finalpunct}{\iffieldequalstr{userd}{chinese}{\gbpunctdot}{\adddot}}
\DeclareDelimFormat[fullinnercite]{finalpunct}{}
-\DeclareFieldFormat{booktitle}{%
-\ifcitation{\iffieldequalstr{userd}{chinese}{\gbpunctttl#1\gbpunctttr}{#1}}{#1}}
-
%出版项中:出版社地址后面的标点
\renewcommand{\publocpunct}{%
\ifcitation{\iffieldequalstr{userd}{chinese}{\gbpunctcolon}{\addcolon\addspace}}{\addcolon\addspace}%
}
%调整出版社与年份之间的标点
\renewcommand{\pubdatadelim}{%
-\ifcitation{\iffieldequalstr{userd}{chinese}{\gbpunctcomma}{\setunit*{\addcomma\space}}}%
+\ifcitation{\iffieldequalstr{userd}{chinese}{\iffieldundef{year}{}{\setunit*{\gbpunctcomma}}}{\setunit*{\addcomma\space}}}%
{\setunit*{\addcomma\space}}%
}
+\renewcommand{\locnopubdelim}{%
+\ifcitation{\iffieldequalstr{userd}{chinese}{\iffieldundef{year}{}{\setunit*{\gbpunctcomma}}}{\setunit*{\addcomma\space}}}%
+{\setunit*{\addcomma\space}}%
+}
+
+%编者与编者类型之间的标点
+\DeclareDelimFormat{editortypedelim}{\iffieldequalstr{userd}{chinese}{}{\addcomma\space}}
+
+%子标题前的标点
+\renewcommand*{\subtitlepunct}{%
+\ifcitation{\iffieldequalstr{userd}{chinese}{}{\addcolon\addspace}}{\addcolon\addspace}}
%==================================================
%调整部分域的输出格式
%==================================================
+%重新调整输出编者的类型
+\renewbibmacro*{editor+others}{%
+ \ifcitation{\ifboolexpr{
+ test \ifuseeditor
+ and
+ not test {\ifnameundef{editor}}
+ }
+ {\printnames{editor}%
+ \setunit{\printdelim{editortypedelim}}%
+ \usebibmacro{editor+othersstrg}%
+ \clearname{editor}}%
+ {}}%
+ {\ifboolexpr{%
+ test \ifuseeditor
+ and
+ not test {\ifnameundef{editor}}
+ }%
+ {\printnames{editor}%
+ \clearname{editor}}
+ {}}%
+ }
+
+\renewbibmacro*{editor+othersstrg}{%
+ \iffieldundef{editortype}
+ {\ifboolexpr{
+ test {\ifnumgreater{\value{editor}}{1}}
+ or
+ test {\ifandothers{editor}}
+ }
+ {\def\abx@tempa{editors}}
+ {\def\abx@tempa{editor}}}
+ {\ifboolexpr{
+ test {\ifnumgreater{\value{editor}}{1}}
+ or
+ test {\ifandothers{editor}}
+ }
+ {\edef\abx@tempa{\thefield{editortype}s}}
+ {\edef\abx@tempa{\thefield{editortype}}}}%
+ \let\abx@tempb=\empty
+ \ifnamesequal{editor}{translator}
+ {\appto\abx@tempa{tr}%
+ \appto\abx@tempb{\clearname{translator}}}
+ {}%
+ \ifnamesequal{editor}{commentator}
+ {\appto\abx@tempa{co}%
+ \appto\abx@tempb{\clearname{commentator}}}
+ {\ifnamesequal{editor}{annotator}
+ {\appto\abx@tempa{an}%
+ \appto\abx@tempb{\clearname{annotator}}}
+ {}}%
+ \ifnamesequal{editor}{introduction}
+ {\appto\abx@tempa{in}%
+ \appto\abx@tempb{\clearname{introduction}}}
+ {\ifnamesequal{editor}{foreword}
+ {\appto\abx@tempa{fo}%
+ \appto\abx@tempb{\clearname{foreword}}}
+ {\ifnamesequal{editor}{afterword}
+ {\appto\abx@tempa{af}%
+ \appto\abx@tempb{\clearname{afterword}}}
+ {}}}%
+ \ifbibxstring{\abx@tempa}
+ {\printtext[editortype]{%
+ \iffieldequalstr{userd}{chinese}{\bibstring{\abx@tempa cn}}{\bibstring{\abx@tempa}}%
+ }\abx@tempb}
+ {\usebibmacro{editorstrg}}}
+
+%去掉译前的标点
+\renewbibmacro*{name:andothers}{\bibauthorfont%
+\ifcitation{\ifboolexpr{test {\ifnumequal{\value{listcount}}{\value{liststop}}}
+ and test \ifmorenames}
+ {\ifnumgreater{\value{liststop}}{1}%注意这里试图去区分姓名总数大于1的情况,当姓名总数大于1时,最后一个姓名后面先加入一个\finalandcomma
+ {}{}%\finalandcomma,目前国标没有这样的区分要求,如果有需要也是可以这么去做的。
+ \printdelim{andothersdelim}\printdelim{strandothersdelim}}%
+ {}}%
+{\ifboolexpr{test {\ifnumequal{\value{listcount}}{\value{liststop}}}
+ and test \ifmorenames}
+ {\ifnumgreater{\value{liststop}}{1}%注意这里试图去区分姓名总数大于1的情况,当姓名总数大于1时,最后一个姓名后面先加入一个\finalandcomma
+ {}%\finalandcomma,目前国标没有这样的区分要求,如果有需要也是可以这么去做的。
+ {}%
+ \printdelim{andothersdelim}\printdelim{strandothersdelim}%
+ }%
+ {%当是译者的时候需要特殊处理:从7.2节看等,译前面加逗号,但从示例看等和译同时出现时,译前的逗号没有,比如:
+ %袁训来, 陈哲, 肖书海, 等.
+ %胡泳, 范海燕, 译.
+ %潘惠霞, 魏婧, 杨艳, 等译.
+ \ifnumequal{\value{listcount}}{\value{liststop}}%
+ {\ifcurrentname{translator}{\iffieldequalstr{usere}{chinese}{\aftertransdelim}{}}{}}{}%为了实现上述第二个示例情况做的处理
+ }}%
+}
+
+
+
%增加年字
\renewbibmacro*{date}{%
-\ifcitation{\iffieldequalstr{userd}{chinese}{\printdate 年}{\printdate}}%
+\ifcitation{%
+ \iffieldequalstr{userd}{chinese}{%
+ \ifboolexpr{test {\ifentrytype{article}} or test {\ifentrytype{inproceedings}}
+ or test {\ifentrytype{archive}} or test {\ifentrytype{online}}}
+ {\printtext{\blx@gbdatecn{}{}}}%
+ {\printdate\iffieldundef{year}{}{年}}%
+ }{\ifentrytype{archive}{\printtext{\blx@gbdateen{}{}}}{\printdate}}%
+}%
{\printdate}%
}
-
-
\newrobustcmd*{\blx@gbdatecn}[3][]{%
\dateeraprintpre{#2#3year}%
- \blx@imc@forcezerosy{\thefield{#2#3year}年}\ifblank{#1}{}{\printfield{#1}}%
+ \iffieldundef{#2#3year}{}{\blx@imc@forcezerosy{\thefield{#2#3year}年}}\ifblank{#1}{}{\printfield{#1}}%
\iffieldundef{#2#3month}{}{{\thefield{#2#3month}}月}%
\iffieldundef{#2#3day}{}{{\thefield{#2#3day}}日}}
+\newrobustcmd*{\blx@gbdateen}[3][]{%
+\mkbibdateen{#2#3year}{#2#3month}{#2#3day}%
+}
+
+\newrobustcmd*{\mkbibdateen}[3]{%
+ \iffieldundef{#2}
+ {}
+ {\mkbibmonth{\thefield{#2}}%
+ \iffieldundef{#1}{}{\space}}%
+ \iffieldundef{#3}
+ {}
+ {{\thefield{#3}}%
+ \iffieldundef{#2}{}{\addcomma\space}}%
+ \iffieldbibstring{#1}
+ {\bibstring{\thefield{#1}}}
+ {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}
+
+
\renewbibmacro*{newsdate}{%%
\ifboolexpr{%
test{\ifcitation} and test{\iffieldequalstr{userd}{chinese}}%
@@ -257,6 +386,18 @@ test{\ifcitation} and test{\iffieldequalstr{userd}{chinese}}%
}}%
+\renewbibmacro*{url+urldate}{%
+\ifcitation{\newunit\usebibmacro{url}\newunit%
+ \printtext{\blx@gbdatecn{}{url}}%
+ }%
+ {\iffieldundef{urlyear}%
+ {}{%\setunit*{\addspace}%
+ \usebibmacro{urldate}}%
+ \setunit{\addperiod\addspace}%
+ \usebibmacro{url}}%
+}
+
+
\DeclareFieldFormat{type}%
{\ifcitation{\iffieldequalstr{userd}{chinese}%
{\ifbibxstring{#1cn}{\bibxstring{#1cn}}{#1}}%
@@ -280,30 +421,57 @@ test{\ifcitation} and test{\iffieldequalstr{userd}{chinese}}%
\DeclareFieldFormat[newspaper,article,periodical]{number}%
{\ifcitation{%
\iffieldequalstr{userd}{chinese}{%
- \iffieldequalstr{entrysubtype}{news}{\printtext{\gbpunctcomma\bibstring{serialcn} #1 版}}
+ \iffieldequalstr{entrysubtype}{news}{%
+ \iffieldint{number}%
+ {\printtext{\gbpunctcomma\bibstring{serialcn} #1 版}}%
+ {\printtext{\gbpunctcomma #1}}%
+ }%
{\iffieldint{number}{\setcounter{numberwithoutzero}{#1}%
- \printtext{\bibstring{serialcn}\addthinspace\arabic{numberwithoutzero}\addthinspace\bibstring{numbercn}}}%
- {\printtext{\bibstring{serialcn}\addthinspace #1\addthinspace\bibstring{numbercn}}}%
+ \printtext{\bibstring{serialcn}\addthinspace\arabic{numberwithoutzero} 期}}%
+ {\printtext{\bibstring{serialcn}\addthinspace #1 期}}%
}}%
- {\setcounter{numberwithoutzero}{#1}\printtext{(}\arabic{numberwithoutzero}\printtext{)}}%
+ {\newunit\setcounter{numberwithoutzero}{#1}\printtext{\bibstring{number}}\arabic{numberwithoutzero}}%
+ }%
+ {\iffieldint{number}{\setcounter{numberwithoutzero}{#1}\arabic{numberwithoutzero}}{#1}}%
+}
+
+\DeclareFieldFormat[book,inbook,incollection]{number}%
+{\iffieldequalstr{userd}{chinese}{\iffieldint{number}%
+ {%
+ \bibstring{serialcn}#1\bibstring{numbercn}%
+ }{#1}%
}%
- {\setcounter{numberwithoutzero}{#1}\arabic{numberwithoutzero}}%
+ {\bibstring{number}~#1}%
}
-\DeclareFieldFormat[article,periodical]{volume}%
+\DeclareFieldFormat[article,periodical,newspaper]{volume}%
{\ifcitation{%
-\iffieldequalstr{userd}{chinese}{\bibstring{serialcn}#1\bibstring{volumecn}}%
- {\bibstring{volume}~#1}}%
+\iffieldequalstr{userd}{chinese}{%
+ \iffieldint{volume}%
+ {\bibstring{serialcn}#1\bibstring{volumecn}}%
+ {#1}%
+ }%
+ {\bibstring{volume}~#1}}%
{#1}%
}
-\DeclareFieldFormat[book]{volume}%
+\DeclareFieldFormat[book,inbook,incollection]{volume}%
{\iffieldequalstr{userd}{chinese}{\iffieldint{volume}%
- {\bibstring{serialcn}#1\bibstring{volumecn}}{#1}%
+ {\iffieldequalstr{entrysubtype}{classic}{\bibstring{volumecn}#1}%
+ {\bibstring{serialcn}#1\bibstring{volumecn}}%
+ }{#1}%
}%
{\bibstring{volume}~#1}%
}
+\DeclareListFormat[article,newspaper]{location}{%
+\iffieldequalstr{userd}{chinese}{\gbpunctprl#1\gbpunctprr}{#1}%
+}
+
+\DeclareListFormat[article]{series}{%
+\iffieldequalstr{userd}{chinese}{\gbpunctprl#1\gbpunctprr}{#1}%
+}
+
%
% 调整期刊名的格式
%
@@ -312,15 +480,15 @@ test{\ifcitation} and test{\iffieldequalstr{userd}{chinese}}%
\renewbibmacro*{journal+issuetitle}{%
\ifcitation{\bibpubfont%
\usebibmacro{journal}%
+ \iflistundef{location}{}{\printlist{location}}%
\iffieldundef{series}%
{}%
- {\printfield{series}%
- \setunit{\addspace}}%
+ {\printfield{series}}%
\iffieldundef{volume}%
{\ifciteseen{}{\usebibmacro{issue+date}%
\usebibmacro{volume+number+eid}}}%
{\ifciteseen{}{\usebibmacro{volume+number+eid}%
- \newunit%
+ \iffieldundef{year}{}{\newunit}%
\usebibmacro{issue+date}}}%
}%
{\bibpubfont%源来自standard.bbx
@@ -446,22 +614,18 @@ test{\ifcitation} and test{\iffieldequalstr{userd}{chinese}}%
test{\iffieldundef{subtitle}}%
}%
{}%
- {\setunit{\iffieldequalstr{userd}{chinese}{\gbpunctcolon}{\gbpunctcolonlanen}}%
+ {\setunit*{\iffieldequalstr{userd}{chinese}{\gbpunctcolon}{\gbpunctcommalanen}}%
+ \ifboolexpr{not test {\iffieldundef{origyear}} and test{\iffieldequalstr{entrysubtype}{classic}}}%
+ {\printorigdate}{}%
\printtext[title]{\bibtitlefont%增加字体控制命令%增加了标点:
\printfield[titlecase]{title}%
\ifboolexpr{test {\iffieldundef{subtitle}}}%这里增加了对子标题的判断,解决不判断多一个点的问题
{}{\setunit{\subtitlepunct}%
\printfield[titlecase]{subtitle}}%
\iffieldundef{titleaddon}{}%判断一下titleaddon,否则直接加可能多一个空格
- {\setunit{\subtitlepunct}\printfield{titleaddon}}%
- \iftoggle{bbx:gbtype}{%
- \iffieldundef{entrysubtype}{\printfield[gbtypeflag]{usera}}%在标题后直接给出文献标识字母,判断一下,是否是报纸和标准
- {\iffieldequalstr{entrysubtype}{standard}{\printfield[gbtypeflags]{usera}}%判断是否为标准
- {\iffieldequalstr{entrysubtype}{news}{\printfield[gbtypeflagn]{usera}}% 判断是否为报纸
- {\printfield[gbtypeflag]{usera}}}% 其它
- }}{}%
- }\ifboolexpr{test{\ifentrytype{book}} and (not test{\iffieldundef{volume}})}%判断一下book类有没有volume
- {\ifcitation{}{\setunit{\subtitlepunct}}\printfield{volume}}{}%%
+ {\setunit{\subtitlepunct}\printfield{titleaddon}}}%
+ \ifboolexpr{test{\ifentrytype{book}} and (not test{\iffieldundef{volume}})}%判断一下book类有没有volume
+ {\printfield{volume}}{}%%
}}{\ifboolexpr{%
test{\iffieldundef{title}}%
and
@@ -600,6 +764,7 @@ test{\ifcitation} and test{\iffieldequalstr{userd}{chinese}}%
}{\printdelim{authotitledelim}}%
\iffieldundef{series}{}{\usebibmacro{series+number}\setunit{\addcolon\addspace}}%为处理一些存在series的情况而增加
\usebibmacro{maintitle+booktitle}%
+ \usebibmacro{inbook:volume+number}%
}
%
@@ -626,6 +791,44 @@ test{\ifcitation} and test{\iffieldequalstr{userd}{chinese}}%
\ifcitation{\iffieldequalstr{userd}{chinese}{\gbpunctcolon}{\addperiod\space}}{\addperiod\space}%
}
+\renewbibmacro*{maintitle+booktitle}{%
+\ifcitation{%
+ \iffieldundef{maintitle}
+ {}
+ {\usebibmacro{maintitle}%
+ \newunit\newblock
+ \iffieldundef{volume}
+ {}
+ {\printfield{volume}%
+ \printfield{part}%
+ \setunit{\addcolon\space}}}%
+ \usebibmacro{booktitle}%
+ }%
+ {\iffieldundef{maintitle}
+ {}
+ {\usebibmacro{maintitle}%
+ \newunit\newblock
+ \iffieldundef{volume}
+ {}
+ {\printfield{volume}%
+ \printfield{part}%
+ \setunit{\addcolon\space}}}%
+ \usebibmacro{booktitle}%
+ \newunit}%
+}
+
+
+\newbibmacro*{inbook:volume+number}{%
+\ifcitation{%
+ \iffieldundef{volume}{}{\printfield{volume}}%
+ \iffieldundef{number}{}{\printfield{number}}%
+ }%
+ {\iffieldundef{volume}{}{\setunit{\addcolon\addspace}\printfield{volume}}%
+ \iffieldundef{number}{}{\setunit{\addcolon\addspace}\printfield{number}}%增加卷和册信息
+ }%
+}
+
+
%
% 增加inbook:parent用于辅助crossref传统功能的实现
@@ -636,12 +839,122 @@ test{\ifcitation} and test{\iffieldequalstr{userd}{chinese}}%
\ifnameundef{bookauthor}{%
\ifnameundef{editor}{}{\printdelim{authotitledelim}}%
}{\printdelim{authotitledelim}}%
-\iffieldundef{series}{}{\usebibmacro{series+number}\setunit{\addcolon\addspace}}%为处理一些存在series的情况而增加
+\ifboolexpr{test {\ifcitation} and test{\iffieldequalstr{entrysubtype}{classic}}}{}
+{\iffieldundef{series}{}{\usebibmacro{series+number}\setunit{\addcolon\addspace}}}%为处理一些存在series的情况而增加
\usebibmacro{maintitle+booktitle}%
-\iffieldundef{volume}{}{\setunit{\addcolon\addspace}\printfield{volume}}%
-\iffieldundef{number}{}{\setunit{\addcolon\addspace}\printfield{number}}%增加卷和册信息
+ \usebibmacro{inbook:volume+number}%
+\ifboolexpr{test {\ifcitation} and test{\iffieldequalstr{entrysubtype}{classic}}}%
+{\iffieldundef{series}{}{\newunit\usebibmacro{series+number}}}{}%
\newunit\newblock%
- \printfield{edition}%
+\ifboolexpr{test {\ifcitation} and test{\iffieldequalstr{entrysubtype}{classic}}}{}{\printfield{edition}}%
\newunit
\newunit\newblock
- \usebibmacro{publisher+location+date}}
+ \usebibmacro{publisher+location+date}%
+\ifboolexpr{test {\ifcitation} and test{\iffieldequalstr{entrysubtype}{classic}}}{\printfield{edition}}{}%
+}
+
+
+\DeclareBibliographyDriver{book}{%源来自standard.bbx文件
+\usebibmacro{bibindex}%
+\usebibmacro{begentry}%
+\usebibmacro{author/editor+others/translator+others}%
+\ifnameundef{namea}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者不存在时多出的标点
+\usebibmacro{maintitle+title}%
+\iftoggle{bbx:gbstrict}{}{%
+\newunit
+\printlist{language}%
+\newunit\newblock%
+\usebibmacro{byauthor}%
+\newunit\newblock}%
+\usebibmacro{byeditor+others}%
+\newunit%
+\ifboolexpr{test {\ifcitation} and test{\iffieldequalstr{entrysubtype}{classic}}}{}{\printfield{edition}}%
+\newunit\newblock%%
+\iftoggle{bbx:gbstrict}{}{%
+\iffieldundef{maintitle}%
+{\printfield{volume}%
+\printfield{part}}%
+{}%
+\newunit%
+\printfield{volumes}%
+\newunit\newblock%
+\usebibmacro{series+number}}%
+\newunit\newblock%
+%\printfield{note}%
+%\newunit\newblock%
+\usebibmacro{publisher+location+date}%
+\ifboolexpr{test {\ifcitation} and test{\iffieldequalstr{entrysubtype}{classic}}}{\printfield{edition}}{}%
+%\newunit\newblock %这里标点去掉
+\usebibmacro{chapter+pages}%
+ \iffieldundef{url}{}{%当没有网址时也不输出
+ \usebibmacro{modifydate}}%带括号的修改或更新日期,
+\usebibmacro{doi+eprint+url}%从下面移动到上面来,因为gbt2015的url需直接放在页码后面。
+ \newunit\newblock%
+ \printfield{pagetotal}%
+ \newunit\newblock%
+ \iftoggle{bbx:isbn}
+ {\printfield{isbn}}
+ {}%
+ \newunit\newblock
+ %\usebibmacro{doi+eprint+url}%
+ %\newunit\newblock
+ \usebibmacro{addendum+pubstate}%
+ \setunit{\bibpagerefpunct}\newblock
+ \usebibmacro{pageref}%
+ \newunit\newblock
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
+ \usebibmacro{annotation}\usebibmacro{finentry}}
+
+
+
+\DeclareBibliographyDriver{manual}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{author/editor+others/translator+others}%
+\ifnameundef{namea}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者不存在时多出的标点
+ \usebibmacro{title}%
+ \iftoggle{bbx:gbstrict}{}{%
+ \newunit%
+ \printlist{language}%
+ \newunit\newblock
+ \usebibmacro{byauthor}}%
+ \newunit\newblock
+ \usebibmacro{byeditor+others}%增加的译者信息
+ \newunit\newblock
+ \iftoggle{bbx:gbfieldtype}{%
+ \printfield{type}%
+ \setunit*{\addspace}}{}%
+ \ifboolexpr{test {\ifcitation} and test{\ifentrytype{archive}}}%
+ {}{\printfield{number}}%
+ \newunit\newblock
+ \printfield{version}%
+ \newunit
+ \printfield{note}%
+ \newunit\newblock
+ \usebibmacro{institution+location+date}%
+ \ifboolexpr{test {\ifcitation} and test{\ifentrytype{archive}}}%
+ {\newunit\printfield{number}}{}%
+ %\newunit\newblock
+ \usebibmacro{chapter+pages}%
+ \iffieldundef{url}{}{%当没有网址时也不输出修改或更新日期
+ \usebibmacro{modifydate}}%修改或更新日期为带括号的时间
+ \usebibmacro{doi+eprint+url}%
+ \newunit
+ \printfield{pagetotal}%
+ \newunit\newblock
+ \iftoggle{bbx:isbn}
+ {\printfield{isrn}}
+ {}%
+ \newunit\newblock
+ \usebibmacro{addendum+pubstate}%
+ \setunit{\bibpagerefpunct}\newblock
+ \usebibmacro{pageref}%
+ \newunit\newblock
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
+ \usebibmacro{annotation}\usebibmacro{finentry}}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-css.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-css.cbx
index a0fa1dc004..56bf057f01 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-css.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-css.cbx
@@ -10,7 +10,7 @@
%%用法:类似于标准的样式在biblatex加载时设置样式
%%文献表正常处理,标注命令主要用cite和textcite
-\ProvidesFile{chinese-css.cbx}[2023/03/31 v1.0a a biblatex citation style for CSS]
+\ProvidesFile{chinese-css.cbx}[v1.0a a biblatex citation style for CSS]
%==================================================
%加载gb样式
@@ -21,10 +21,10 @@
%==================================================
%选项设置
%==================================================
-%\ExecuteBibliographyOptions{
-% maxcitenames=2,
-% mincitenames=1,
-%}
+\ExecuteBibliographyOptions{
+ maxcitenames=2,
+ mincitenames=1,
+}
%==================================================
%引用命令设置,主要用cite和textcite
@@ -35,6 +35,20 @@
\renewcommand{\bibfootnotewrapper}[1]{%
\bibsentence#1}%
+%避免去除前面的空白
+\renewrobustcmd{\blx@mkbibfootnote}[2]{%
+ \iftoggle{blx@footnote}
+ {\blx@warning{Nested notes}%
+ \addspace\mkbibparens{#2}}
+ {%\unspace
+ \ifnum\blx@notetype=\tw@
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+ {\csuse{blx@theendnote#1}{\protecting{\blxmkbibnote{end}{#2}}}}
+ {\csuse{footnote#1}{\protecting{\blxmkbibnote{foot}{#2}}}}}}
+
%修改脚注注释的实现
\def\execgbfootbib%
{%
@@ -44,8 +58,8 @@
%
%重定义\footfullcite使完成css的脚注文献要求
\DeclareCiteCommand{\footfullcite}[\mkbibfootnote]%
- {\defcounter{maxnames}{\blx@maxbibnames}%局部定义maxnames和minnames计数器
- \defcounter{minnames}{\blx@minbibnames}%使footfullcite内的作者输出与正文文献表中的一致。
+ {\defcounter{maxnames}{\blx@maxcitenames}%局部定义maxnames和minnames计数器
+ \defcounter{minnames}{\blx@mincitenames}%使footfullcite内的作者输出与正文文献表中的一致。
\usebibmacro{prenote}%
\renewbibmacro*{postnote}{%
\iffieldundef{postnote}%
@@ -59,8 +73,14 @@
{\multicitedelim}%
{\usebibmacro{postnote}\usebibmacro{finentry}}
+
\DeclareCiteCommand{\fullcite}
- {\usebibmacro{prenote}}
+ {\usebibmacro{prenote}%
+ \renewbibmacro*{postnote}{%
+ \iffieldundef{postnote}%
+ {}{\setunit{\iffieldequalstr{userd}{chinese}{\unspace\gbpunctcomma}{\addcolon\addspace}}%
+ \printfield{postnote}}}%与ay样式不同,由于已修改postnote域格式,直接用printfield
+ }
{\ifciteseen%
{\usedriver{\DeclareNameAlias{sortname}{default}}{citeseen:\thefield{entrytype}}}%\nopunct
{\usedriver{\DeclareNameAlias{sortname}{default}}{\thefield{entrytype}}}%
@@ -68,8 +88,14 @@
{\multicitedelim}
{\usebibmacro{postnote}\usebibmacro{finentry}}
+
\DeclareCiteCommand{\fullinnercite}
- {\usebibmacro{prenote}}
+ {\usebibmacro{prenote}%
+ \renewbibmacro*{postnote}{%
+ \iffieldundef{postnote}%
+ {}{\setunit{\iffieldequalstr{userd}{chinese}{\unspace\gbpunctcomma}{\addcolon\addspace}}%
+ \printfield{postnote}}}%与ay样式不同,由于已修改postnote域格式,直接用printfield
+ }
{\ifciteseen%
{\usedriver{\DeclareNameAlias{sortname}{default}}{citeseen:\thefield{entrytype}}}%\nopunct
{\usedriver{\DeclareNameAlias{sortname}{default}}{\thefield{entrytype}}}%
@@ -93,3 +119,30 @@
\printfield[citejz]{labeltitle}}
{\multicitedelim}
{\usebibmacro{postnote}}
+
+
+\DeclareFieldFormat{citetitle}{%
+\iffieldequalstr{userd}{chinese}{\gbpunctttl#1\gbpunctttr}%
+{\mkbibemph{#1}}%
+}
+
+\DeclareFieldFormat
+ [article,inbook,incollection,inproceedings,patent,thesis,unpublished]
+ {citetitle}{%
+ \iffieldequalstr{userd}{chinese}{\gbpunctttl#1\gbpunctttr}%
+ {\mkbibquote{#1\isdot}}%
+ }
+
+
+%为文献输出出版信息
+\DeclareCiteCommand{\citepub}
+ {\boolfalse{citetracker}%
+ \boolfalse{pagetracker}%
+ \usebibmacro{prenote}}
+ {\ifciteindex
+ {\indexfield{indextitle}}
+ {}%
+ \ifentrytype{online}{\usebibmacro{institution+location+date}}{\usebibmacro{publisher+location+date}}%
+ }
+ {\multicitedelim}
+ {\usebibmacro{postnote}}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-erj.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-erj.cbx
index 4244717642..d0300a9b10 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-erj.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-erj.cbx
@@ -10,7 +10,7 @@
%%用法:类似于标准的样式在biblatex加载时设置样式
%%文献表正常处理,标注命令主要用cite和textcite
-\ProvidesFile{chinese-erj.cbx}[2022/02/22 v1.0a a biblatex citation style for ERJ]
+\ProvidesFile{chinese-erj.cbx}[v1.0a a biblatex citation style for ERJ]
%==================================================
%加载gb样式
@@ -22,17 +22,17 @@
% 增加一个控制标注中标点是英文还是中文的选项
% 20220222,v1.0a,hzz
\DeclareBibliographyOption{gbcitepunctcn}[true]{%biblatex低版本
- \ifstrequal{#1}{false}{\execerjpunctencite}{}}
-
-\def\erjpunctmarkcite{、}%
-\def\erjpunctsemicoloncite{;}%
-\def\erjpunctparenlcite{(}%
-\def\erjpunctparenrcite{)}
-\def\execerjpunctencite{%
-\def\erjpunctmarkcite{\addcomma\addspace}%
-\def\erjpunctsemicoloncite{\addsemicolon\addspace}%
-\def\erjpunctparenlcite{(}%
-\def\erjpunctparenrcite{)}
+ \ifstrequal{#1}{false}{\exegbpunctencite}{}}
+
+\def\gbpunctmarkcite{、}%
+\def\gbpunctsemicoloncite{;}%
+\def\gbpunctparenlcite{(}%
+\def\gbpunctparenrcite{)}
+\def\exegbpunctencite{%
+\def\gbpunctmarkcite{\addcomma\addspace}%
+\def\gbpunctsemicoloncite{\addsemicolon\addspace}%
+\def\gbpunctparenlcite{(}%
+\def\gbpunctparenrcite{)}
}
%==================================================
@@ -47,13 +47,13 @@
%引用命令设置,主要用cite和textcite
%包括标点设置
%==================================================
-\renewcommand*{\multicitedelim}{\erjpunctsemicoloncite}%\addsemicolon\addspace;
+\renewcommand*{\multicitedelim}{\gbpunctsemicoloncite}%\addsemicolon\addspace;
\renewcommand*{\textcitedelim}{%
\iffinalcitedelim
{\ifnumgreater{\value{textcitetotal}}{2}
{}{}%\iftextcitepunct{\finalandsemicolon}{\finalandcomma}
- \addspace\erjpunctmarkcite}%\addspace\bibstring{andincitecn}
- {\iftextcitepunct{\addsemicolon\space}{\addspace\erjpunctmarkcite}}%\addcomma
+ \addspace\gbpunctmarkcite}%\addspace\bibstring{andincitecn}
+ {\iftextcitepunct{\addsemicolon\space}{\addspace\gbpunctmarkcite}}%\addcomma
}%\space
\DeclareDelimFormat[textcite]{nameyeardelim}{\addspace}%\addcomma\space
@@ -67,7 +67,7 @@
}
%标注压缩时,直接用date+extradate代替extradate实现2006a,2006b的效果
-%\DeclareDelimFormat*{compcitedelim}{\erjpunctmarkcite}%\addcomma\addspace
+%\DeclareDelimFormat*{compcitedelim}{\gbpunctmarkcite}%\addcomma\addspace
\newbibmacro*{cite:extradate}{%
\iffieldundef{extradate}
{}
@@ -81,12 +81,12 @@
%添加前后空格
\DeclareCiteCommand{\cite}%[\mkbibparens]
{\usebibmacro{cite:init}%
- \unspace\printtext{\erjpunctparenlcite}\usebibmacro{prenote}}%\addspace
+ \unspace\printtext{\gbpunctparenlcite}\usebibmacro{prenote}}%\addspace
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
{}
{\usebibmacro{postnote}%
- \erjpunctparenrcite}%\addspace
+ \gbpunctparenrcite}%\addspace
%原版
%\DeclareCiteCommand{\cite}[\mkbibparens]
@@ -124,7 +124,7 @@
{\usebibmacro{cite:label}%
\setunit{%
\global\booltrue{cbx:parens}%
- \printdelim{nonameyeardelim}\unspace\erjpunctparenlcite}%\bibopenparen
+ \printdelim{nonameyeardelim}\unspace\gbpunctparenlcite}%\bibopenparen
\ifnumequal{\value{citecount}}{1}
{\usebibmacro{prenote}}
{}%
@@ -133,7 +133,7 @@
{\printnames{labelname}%
\setunit{%
\global\booltrue{cbx:parens}%
- \printdelim{nameyeardelim}\unspace\erjpunctparenlcite}%\bibopenparen
+ \printdelim{nameyeardelim}\unspace\gbpunctparenlcite}%\bibopenparen
\ifnumequal{\value{citecount}}{1}
{\usebibmacro{prenote}}
{}%
@@ -148,7 +148,7 @@
\savefield{namehash}{\cbx@lasthash}}%
\setunit{%
\ifbool{cbx:parens}
- {\erjpunctparenrcite\global\boolfalse{cbx:parens}}%\bibcloseparen
+ {\gbpunctparenrcite\global\boolfalse{cbx:parens}}%\bibcloseparen
{}%
\textcitedelim}}
@@ -158,11 +158,11 @@
{\setunit{}%
\printtext{%
\ifbool{cbx:parens}
- {\erjpunctparenrcite\global\boolfalse{cbx:parens}}%\bibcloseparen
+ {\gbpunctparenrcite\global\boolfalse{cbx:parens}}%\bibcloseparen
{}}}
{\setunit{%
\ifbool{cbx:parens}
- {\erjpunctparenrcite\global\boolfalse{cbx:parens}}%\bibcloseparen
+ {\gbpunctparenrcite\global\boolfalse{cbx:parens}}%\bibcloseparen
{}%
\textcitedelim}}}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-jmw.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-jmw.bbx
new file mode 100644
index 0000000000..cba4e06459
--- /dev/null
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-jmw.bbx
@@ -0,0 +1,821 @@
+%%
+%% ---------------------------------------------------------------
+%% css.bbx --- A citation style of journal of management world in china
+%% modified from gb7714-2015
+%% Maintained by huzhenzhen
+%% E-mail: hzzmail@163.com
+%% Released under the LaTeX Project Public License v1.3c or later
+%% history
+%% 2019/03/28 v1.0
+%% 2022/02/22 v1.0a
+%% ---------------------------------------------------------------
+%%
+%%用法:类似于标准的样式在biblatex加载时设置样式
+%%文献表正常处理,标注命令主要用cite和textcite
+\ProvidesFile{chinese-jmw.bbx}[2023/04/24 v1.0a a biblatex bibliography style for JMW]
+
+
+%==================================================
+%加载gb样式
+%==================================================
+\RequireBibliographyStyle{gb7714-2015}
+
+
+%
+% 增加一个控制标点是英文还是中文的选项
+% 20220222,v1.0a,hzz
+\DeclareBibliographyOption{gbpunctcn}[true]{%biblatex低版本
+ \ifstrequal{#1}{false}{\execgbpuncten}{}}
+
+\newbibmacro*{bbx:ifmergeddate}{\@secondoftwo}
+
+\newbibmacro*{date+extradate}{}
+
+% merge date with date label
+\def\bbx@opt@mergedate@true{%
+ \renewbibmacro*{date+extradate}{%
+ \iffieldundef{labelyear}
+ {}
+ {\printtext{%
+ \iflabeldateisdate
+ {\printdateextra}
+ {\printlabeldateextra}}}}%
+ \renewbibmacro*{bbx:ifmergeddate}{\iflabeldateisdate}%
+% \renewbibmacro*{issue+date}{%
+% \ifboolexpr{test {\usebibmacro{bbx:ifmergeddate}}
+% and
+% test {\iffieldundef{issue}}}
+% {}
+% {\printtext[parens]{%
+% \printfield{issue}%
+% \setunit*{\addspace}%
+% \usebibmacro{bbx:ifmergeddate}
+% {}
+% {\printdate}}}%
+% \newunit}
+}
+
+
+\renewbibmacro*{author}{%
+ \ifboolexpr{
+ test \ifuseauthor
+ and
+ not test {\ifnameundef{author}}
+ }
+ {\printnames{author}%
+ \iffieldundef{authortype}
+ {\setunit{\printdelim{nameyeardelim}}}
+ {\setunit{\printdelim{authortypedelim}}}%
+ \iffieldundef{authortype}
+ {}
+ {\usebibmacro{authorstrg}%
+ \setunit{\printdelim{nameyeardelim}}}}%
+ {\global\undef\bbx@lasthash
+ \usebibmacro{labeltitle}%
+ \setunit*{\printdelim{nonameyeardelim}}}%
+\iffieldequalstr{userd}{chinese}{}{\usebibmacro{date+extradate}\clearfield{year}}%
+}
+
+
+%==================================================
+%选项设置
+%==================================================
+\ExecuteBibliographyOptions{
+ gbnamefmt=familyahead,
+ gbbiblabel=parens,
+ gbtype=false,
+ gbpub=false,
+ doi=false,
+ url=false,
+ gbfieldtype=true,
+ dateabbrev=false,
+ maxbibnames=99,
+ mergedate=true,
+ %datezeros=false,
+ }
+
+%==================================================
+%定义一些标点为中文全角标点
+%==================================================
+\def\gbpunctdot{。}%
+\def\gbpunctmark{、}%
+\def\gbpunctcomma{,}%
+\def\gbpunctcommalanen{,}%\addcomma\addspace
+\def\gbpunctcolon{:}%
+\def\gbpunctcolonlanen{\addcolon\addspace}%
+\def\gbpunctsemicolon{;}%
+\def\gbpunctttl{《}%
+\def\gbpunctttr{》}
+\def\gbpunctprl{(}%
+\def\gbpunctprr{)}
+
+
+\def\execgbpuncten{%
+\def\gbpunctdot{\adddot}%
+\def\gbpunctmark{\addcomma\addspace}%
+\def\gbpunctcomma{\addcomma\addspace}%
+\def\gbpunctcommalanen{\addcomma\addspace}%
+\def\gbpunctcolon{\addcolon\addspace}%
+\def\gbpunctcolonlanen{\addcolon\addspace}%
+\def\gbpunctsemicolon{\addsemicolon\addspace}%
+\def\gbpunctttl{《}%
+\def\gbpunctttr{》}%
+}
+
+\DefineBibliographyExtras{english}{\renewcommand*{\bibrangedash}{$\sim$}}%将页码间隔符替换会英文的短横线
+
+%==================================================
+%为标注和文献表中标点格式,重设and本地化字符串
+%==================================================
+\DefineBibliographyStrings{english}{
+ and = { and},%and后面的空格在finalnamedelim已经加过了,所以这里去掉20191009
+ andcn = {\gbpunctmark\unspace},%\gbpunctmark
+ %andotherscn={等},
+ mathesiscn={硕士学位论文},
+ phdthesiscn={博士学位论文},
+ bytranslator= {trans\adddot\ \lbx@sfromlang\ by},
+}
+
+
+
+
+%==================================================
+%设置一些标点格式为中文的标点
+%==================================================
+%\DeclareFieldFormat{titlecase}{\iffieldequalstr{userd}{chinese}{#1}{\capitalisewords{#1}}}
+%\DeclareFieldFormat*{booktitle}{\gbpunctttl#1\gbpunctttr}
+\DeclareFieldFormat*{title}{%
+\iffieldequalstr{userd}{chinese}{\gbpunctttl#1\gbpunctttr}{\textit{#1}\isdot}}
+\DeclareFieldFormat[book]{title}{%
+\iffieldequalstr{userd}{chinese}{\gbpunctttl#1\gbpunctttr}{\textbf{\textit{#1}}\isdot}}
+\DeclareFieldFormat[archive]{title}{%
+\iffieldequalstr{userd}{chinese}{\gbpunctttl#1\gbpunctttr}{#1\isdot}}
+\DeclareFieldFormat[article,incollection,inbook,inproceedings,misc]{title}{%
+\iffieldequalstr{userd}{chinese}{\gbpunctttl#1\gbpunctttr}{\mkbibquote{#1}\isdot}}
+\DeclareFieldFormat*{journaltitle}{%
+\iffieldequalstr{userd}{chinese}{\gbpunctttl#1\gbpunctttr}{\textbf{\textit{#1}}}}%
+\DeclareFieldFormat{booktitle}{%
+\iffieldequalstr{userd}{chinese}{\gbpunctttl#1\gbpunctttr}{\textbf{\textit{#1}}}}
+\renewcommand*{\revsdnamepunct}{%
+\iffieldequalstr{userd}{chinese}{\gbpunctcomma}{\gbpunctcommalanen}}
+\DeclareDelimFormat{multinamedelim}{%
+\iffieldequalstr{userd}{chinese}{\gbpunctmark}{\gbpunctcommalanen}}
+\DeclareDelimFormat{finalnamedelim}{%
+ %\ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}%
+ %\addspace%
+ \edef\userfieldabcde{userd}%
+ \ifcurrentname{translator}{\edef\userfieldabcde{usere}}{}%
+ \ifcurrentname{editor}{\edef\userfieldabcde{userc}}{}%
+ \ifcurrentname{author}{\edef\userfieldabcde{userf}}{}%
+ \ifcurrentname{bookauthor}{\edef\userfieldabcde{userb}}{}%
+ \ifcase\value{gbcitelocalcase}%
+ \iffieldequalstr{\userfieldabcde}{chinese}{\bibstring{andincitecn}}{}%
+ \iffieldequalstr{\userfieldabcde}{korean}{\bibstring{andkr}}{}%
+ \iffieldequalstr{\userfieldabcde}{japanese}{\bibstring{andjp}}{}%
+ \iffieldequalstr{\userfieldabcde}{english}{\space\bibstring{andincite}\space}{}%
+ \iffieldequalstr{\userfieldabcde}{french}{\bibstring{and}}{}%
+ \iffieldequalstr{\userfieldabcde}{russian}{\bibstring{and}}{}%
+%\space%
+ \or%
+ \bibstring{andincitecn}\space%
+ \or%
+ \bibstring{andincite}\space%
+ \fi}
+\DeclareDelimFormat[bib,biblist]{finalnamedelim}{%
+% \ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}%
+ \edef\userfieldabcde{userd}%
+ \ifcurrentname{translator}{\edef\userfieldabcde{usere}}{}%
+ \ifcurrentname{editor}{\edef\userfieldabcde{userc}}{}%
+ \ifcurrentname{author}{\edef\userfieldabcde{userf}}{}%
+ \ifcurrentname{bookauthor}{\edef\userfieldabcde{userb}}{}%
+ \ifcase\value{gbbiblocalcase}%
+ \iffieldequalstr{\userfieldabcde}{chinese}{\bibstring{andcn}}{}%
+ \iffieldequalstr{\userfieldabcde}{korean}{\bibstring{andkr}}{}%
+ \iffieldequalstr{\userfieldabcde}{japanese}{\bibstring{andjp}}{}%
+ \iffieldequalstr{\userfieldabcde}{english}{\bibstring{and}}{}%
+ \iffieldequalstr{\userfieldabcde}{french}{\bibstring{and}}{}%
+ \iffieldequalstr{\userfieldabcde}{russian}{\bibstring{and}}{}%
+\space%
+ \or%
+\bibstring{andcn}\space%
+ \or%
+ \bibstring{and}\space%
+ \fi}
+\DeclareDelimFormat{nameyeardelim}{%
+\iffieldequalstr{userd}{chinese}{\gbpunctcomma}{\gbpunctcommalanen}}
+\DeclareDelimFormat[bib,biblist]{nameyeardelim}{%
+\iffieldequalstr{userd}{chinese}{\gbpunctcomma}{\gbpunctcommalanen}}
+\DeclareDelimFormat{bibpagespunct}{%
+\iffieldequalstr{userd}{chinese}{\unspace\gbpunctcomma}{\unspace\gbpunctcommalanen}}
+\DeclareFieldFormat{pages}{%%前面引导页码的pp.等字符
+\iffieldequalstr{userd}{chinese}{%
+\printtext{\bibstring{serialcn} #1\addthinspace 页}}%
+{\mkpageprefix[bookpagination]{#1}}}
+
+%
+% 调整页码前的标点和去掉期刊文章等页码后面的标点
+%
+\renewbibmacro*{note+pages}{%源来自standard.bbx
+% \iffieldundef{postnote}{\iffieldundef{pages}{}{%
+% \setunit{\bibpagespunct}%
+% \printfield{pages}}}{}%
+}
+
+
+%
+% 调整页码的格式,即chapter+pages格式
+%
+\renewbibmacro*{chapter+pages}{%
+\iffieldundef{postnote}{\iffieldundef{pages}{}{%
+ \setunit{\bibpagespunct}%
+ \printfield{pages}}}{}%
+}
+
+
+\renewcommand*{\newunitpunct}{%
+\iffieldequalstr{userd}{chinese}{\gbpunctcomma}{\gbpunctcommalanen}%
+}
+\renewcommand*{\finentrypunct}{%
+\printdelim{finalpunct}}
+%调整标注的注释中的条目结尾标点
+\DeclareDelimFormat{finalpunct}{\iffieldequalstr{userd}{chinese}{\gbpunctdot}{\adddot}}
+\DeclareDelimFormat[fullinnercite]{finalpunct}{}
+
+%出版项中:出版社地址后面的标点
+\renewcommand{\publocpunct}{%
+\iffieldequalstr{userd}{chinese}{\gbpunctcolon}{\addcolon\addspace}%
+}
+%调整出版社与年份之间的标点
+\renewcommand{\pubdatadelim}{%
+\iffieldequalstr{userd}{chinese}%
+ {\iffieldundef{year}{}{\setunit*{\gbpunctcomma}}}{\setunit*{\addcomma\space}}}
+\renewcommand{\locnopubdelim}{%
+\iffieldequalstr{userd}{chinese}
+ {\iffieldundef{year}{}{\setunit*{\gbpunctcomma}}}{\setunit*{\addcomma\space}}}
+
+%编者与编者类型之间的标点
+\DeclareDelimFormat{editortypedelim}{\iffieldequalstr{userd}{chinese}{}{\addcomma\space}}
+
+%子标题前的标点
+\renewcommand*{\subtitlepunct}{%
+\iffieldequalstr{userd}{chinese}{}{\addcolon\addspace}}
+
+%==================================================
+%调整部分域的输出格式
+%==================================================
+
+%重新调整输出编者的类型
+\renewbibmacro*{editor+others}{%
+ \ifboolexpr{
+ test \ifuseeditor
+ and
+ not test {\ifnameundef{editor}}
+ }
+ {\printnames{editor}%
+ \setunit{\printdelim{editortypedelim}}%
+ \usebibmacro{editor+othersstrg}%
+ \clearname{editor}}%
+ {}%
+ }
+
+\renewbibmacro*{editor+othersstrg}{%
+ \iffieldundef{editortype}
+ {\ifboolexpr{
+ test {\ifnumgreater{\value{editor}}{1}}
+ or
+ test {\ifandothers{editor}}
+ }
+ {\def\abx@tempa{editors}}
+ {\def\abx@tempa{editor}}}
+ {\ifboolexpr{
+ test {\ifnumgreater{\value{editor}}{1}}
+ or
+ test {\ifandothers{editor}}
+ }
+ {\edef\abx@tempa{\thefield{editortype}s}}
+ {\edef\abx@tempa{\thefield{editortype}}}}%
+ \let\abx@tempb=\empty
+ \ifnamesequal{editor}{translator}
+ {\appto\abx@tempa{tr}%
+ \appto\abx@tempb{\clearname{translator}}}
+ {}%
+ \ifnamesequal{editor}{commentator}
+ {\appto\abx@tempa{co}%
+ \appto\abx@tempb{\clearname{commentator}}}
+ {\ifnamesequal{editor}{annotator}
+ {\appto\abx@tempa{an}%
+ \appto\abx@tempb{\clearname{annotator}}}
+ {}}%
+ \ifnamesequal{editor}{introduction}
+ {\appto\abx@tempa{in}%
+ \appto\abx@tempb{\clearname{introduction}}}
+ {\ifnamesequal{editor}{foreword}
+ {\appto\abx@tempa{fo}%
+ \appto\abx@tempb{\clearname{foreword}}}
+ {\ifnamesequal{editor}{afterword}
+ {\appto\abx@tempa{af}%
+ \appto\abx@tempb{\clearname{afterword}}}
+ {}}}%
+ \ifbibxstring{\abx@tempa}
+ {\printtext[editortype]{%
+ \iffieldequalstr{userd}{chinese}{\bibstring{\abx@tempa cn}}{\bibstring{\abx@tempa}}%
+ }\abx@tempb}
+ {\usebibmacro{editorstrg}}}
+
+%去掉译前的标点
+\renewbibmacro*{name:andothers}{\bibauthorfont%
+ \ifboolexpr{test {\ifnumequal{\value{listcount}}{\value{liststop}}}
+ and test \ifmorenames}
+ {\ifnumgreater{\value{liststop}}{1}%注意这里试图去区分姓名总数大于1的情况,当姓名总数大于1时,最后一个姓名后面先加入一个\finalandcomma
+ {}{}%\finalandcomma,目前国标没有这样的区分要求,如果有需要也是可以这么去做的。
+ \printdelim{andothersdelim}\printdelim{strandothersdelim}}%
+ {}%
+}
+
+
+
+%增加年字
+\renewbibmacro*{date}{%
+ \iffieldequalstr{userd}{chinese}{%
+ \ifboolexpr{test {\ifentrytype{article}} or test {\ifentrytype{inproceedings}}
+ or test {\ifentrytype{archive}} or test {\ifentrytype{online}}}
+ {\printtext{\blx@gbdatecn{}{}}}%
+ {\printdate\iffieldundef{year}{}{年}}%
+ }{\ifentrytype{archive}{\printtext{\blx@gbdateen{}{}}}{\printdate}}%
+}
+
+\newrobustcmd*{\blx@gbdatecn}[3][]{%
+ \dateeraprintpre{#2#3year}%
+ \iffieldundef{#2#3year}{}{\blx@imc@forcezerosy{\thefield{#2#3year}年}}\ifblank{#1}{}{\printfield{#1}}%
+ \iffieldundef{#2#3month}{}{{\thefield{#2#3month}}月}%
+ \iffieldundef{#2#3day}{}{{\thefield{#2#3day}}日}}
+
+\newrobustcmd*{\blx@gbdateen}[3][]{%
+\mkbibdateen{#2#3year}{#2#3month}{#2#3day}%
+}
+
+\newrobustcmd*{\mkbibdateen}[3]{%
+ \iffieldundef{#2}
+ {}
+ {\mkbibmonth{\thefield{#2}}%
+ \iffieldundef{#1}{}{\space}}%
+ \iffieldundef{#3}
+ {}
+ {{\thefield{#3}}%
+ \iffieldundef{#2}{}{\addcomma\space}}%
+ \iffieldbibstring{#1}
+ {\bibstring{\thefield{#1}}}
+ {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}
+
+
+\renewbibmacro*{newsdate}{%%
+\iffieldequalstr{userd}{chinese}
+ {\printtext{\blx@gbdatecn{}{}}}%
+ {\printtext{\blx@gbdate{}{}}}%%
+}
+
+
+%
+\renewbibmacro*{modifydate}{%新增加一个带括号的日期,用于表示电子资源的更新和修改日期,而公告日期则按日期格式
+\iffieldequalstr{userd}{chinese}
+ {%
+ \printtext{\blx@gbdatecn{}{}}%
+ }%
+ {\ifboolexpr{%
+ test{\iffieldundef{day}} and test{\iffieldundef{endday}} and test{\iffieldundef{eventday}}%
+ }%
+ {}%更新或修改日期通常有day信息
+ {\iffieldundef{year}{%
+ \iffieldundef{endyear}{\iffieldundef{eventyear}{}{\printtext{\gbleftparen}\printeventdate\printtext{\gbrightparen}}}%
+ {\printtext{\gbleftparen}\printenddate\printtext{\gbrightparen}}%
+ }{\iffieldequalstr{year}{}{%因为year存在,但为空
+ }{\printtext{\gbleftparen}\blx@gbdate{}{}\printtext{\gbrightparen}}%
+ }}%
+}}%
+
+
+\renewbibmacro*{url+urldate}{%
+ \newunit\usebibmacro{url}\newunit%
+ \printtext{\blx@gbdatecn{}{url}}%
+}
+
+
+\DeclareFieldFormat{type}%
+{\iffieldequalstr{userd}{chinese}%
+ {\ifbibxstring{#1cn}{\bibxstring{#1cn}}{#1}}%
+ {\ifbibstring{#1}{\bibstring{#1}}{#1}}%
+}
+
+
+\renewbibmacro*{in:}{%
+\iftoggle{bbx:gbpunctin}{\gbpunctcomma}%\addthinspace
+ {\setunit{\adddot\addspace}%
+ \iffieldequalstr{userd}{chinese}%
+ {\gbpunctcomma}%
+ {\printtext{\bibstring{in}}}%
+ }}%\newunit\newblock\intitlepunct
+
+
+%
+% 修改number和volume的格式
+%
+\newcounter{numberwithoutzero}
+\DeclareFieldFormat[newspaper,article,periodical]{number}%
+{\iffieldequalstr{userd}{chinese}{%
+ \iffieldequalstr{entrysubtype}{news}{%
+ \iffieldint{number}%
+ {\printtext{\gbpunctcomma\bibstring{serialcn} #1 版}}%
+ {\printtext{\gbpunctcomma #1}}%
+ }%
+ {\iffieldint{number}{\setcounter{numberwithoutzero}{#1}%
+ \printtext{\bibstring{serialcn}\addthinspace\arabic{numberwithoutzero} 期}}%
+ {\printtext{\bibstring{serialcn}\addthinspace #1 期}}%
+ }}%
+ {\newunit\setcounter{numberwithoutzero}{#1}\printtext{\bibstring{number}}\arabic{numberwithoutzero}}%
+}
+
+\DeclareFieldFormat[book,inbook,incollection,misc]{number}%
+{\iffieldequalstr{userd}{chinese}{\iffieldint{number}%
+ {%
+ \bibstring{serialcn}#1\bibstring{numbercn}%
+ }{#1}%
+ }%
+ {\bibstring{number}~#1}%
+}
+
+\DeclareFieldFormat[article,periodical,newspaper]{volume}%
+{\iffieldequalstr{userd}{chinese}{%
+ \iffieldint{volume}%
+ {\bibstring{serialcn}#1\bibstring{volumecn}}%
+ {#1}%
+ }%
+ {\bibstring{volume}~#1}%
+}
+
+\DeclareFieldFormat[book,inbook,incollection]{volume}%
+{\iffieldequalstr{userd}{chinese}{\iffieldint{volume}%
+ {\iffieldequalstr{entrysubtype}{classic}{\bibstring{volumecn}#1}%
+ {\bibstring{serialcn}#1\bibstring{volumecn}}%
+ }{#1}%
+ }%
+ {\bibstring{volume}~#1}%
+}
+
+\DeclareListFormat[article,newspaper]{location}{%
+\iffieldequalstr{userd}{chinese}{\gbpunctprl#1\gbpunctprr}{#1}%
+}
+
+\DeclareListFormat[article]{series}{%
+\iffieldequalstr{userd}{chinese}{\gbpunctprl#1\gbpunctprr}{#1}%
+}
+
+%
+% 调整期刊名的格式
+%
+% v1.0k,20180425,增加了字体控制命令,hzz
+% v1.1j,20220527,修复期刊名不存在时多余的标点
+\renewbibmacro*{journal+issuetitle}{%
+ \bibpubfont%
+ \usebibmacro{journal}\newunit%
+ \iflistundef{location}{}{\printlist{location}}%
+ \iffieldundef{series}%
+ {}%
+ {\printfield{series}}%
+ \iffieldundef{volume}%
+ {\usebibmacro{issue+date}%
+ \usebibmacro{volume+number+eid}}%
+ {\usebibmacro{volume+number+eid}%
+ \iffieldundef{year}{}{\newunit}%
+ \usebibmacro{issue+date}}%
+}
+
+
+%去掉期刊名后的标点
+\renewbibmacro*{journal}{%
+ \ifboolexpr{
+ test {\iffieldundef{journaltitle}}
+ and
+ test {\iffieldundef{journalsubtitle}}
+ }
+ {}
+ {\printtext[journaltitle]{%
+ \printfield[titlecase]{journaltitle}%
+ \printfield[titlecase]{journalsubtitle}}%
+ }%
+ \iffieldundef{journaltitleaddon}
+ {}
+ {\printfield{journaltitleaddon}}}
+
+
+
+
+%
+% 调整期刊卷和期的格式
+%
+\renewbibmacro*{volume+number+eid}{%源来自standard.bbx
+\iffieldequalstr{userd}{chinese}%
+ {\iffieldundef{volume}{}{\printfield{volume}}%
+ \iffieldundef{number}{}{\printfield{number}}}%区别于顺序编码制
+ {\newunit\printfield{volume}%
+ \printfield{number}%
+ \setunit{\addcomma\space}%
+ \printfield{eid}}%
+}
+
+
+%
+% 期刊的标题做修改
+%
+\renewbibmacro*{title+issuetitle}{%源来自standard.BBX
+ \usebibmacro{periodical}%
+ \iffieldequalstr{userd}{chinese}{\setunit*{\gbpunctcomma}}{\setunit*{\adddot\addspace}}%
+ \iffieldundef{series}%
+ {}%
+ {\newunit%
+ \printfield{series}%
+ \setunit{\addspace}}%
+ \usebibmacro{periodical+issue}%将issue调整到上面来,并修改
+ \usebibmacro{issue+date}%
+ \usebibmacro{issue}%
+ \usebibmacro{volume+number+eid}
+}
+
+
+
+
+%
+% 重设title的输出
+%
+% 20180425,v1.0k,为标题增加字体控制命令,Hu Zhenzhen
+% 原理方法:将文献类型标识符输出出去,原输出来自biblatex.def文件
+% 利用toggle做标识符是否输出的判断
+\renewbibmacro*{title}{%
+ \ifboolexpr{%
+ test{\iffieldundef{title}}%
+ and
+ test{\iffieldundef{subtitle}}%
+ }%
+ {}%
+ {\setunit*{\iffieldequalstr{userd}{chinese}{\gbpunctcolon}{\gbpunctcommalanen}}%
+ \ifboolexpr{not test {\iffieldundef{origyear}} and test{\iffieldequalstr{entrysubtype}{classic}}}%
+ {\printorigdate}{}%
+ \printtext[title]{\bibtitlefont%增加字体控制命令%增加了标点:
+ \printfield[titlecase]{title}%
+ \ifboolexpr{test {\iffieldundef{subtitle}}}%这里增加了对子标题的判断,解决不判断多一个点的问题
+ {}{\setunit{\subtitlepunct}%
+ \printfield[titlecase]{subtitle}}%
+ \iffieldundef{titleaddon}{}%判断一下titleaddon,否则直接加可能多一个空格
+ {\setunit{\subtitlepunct}\printfield{titleaddon}}}%
+ \ifboolexpr{test{\ifentrytype{book}} and (not test{\iffieldundef{volume}})}%判断一下book类有没有volume
+ {\printfield{volume}}{}%%
+ }%
+}
+
+
+%=====================================================================
+%设置驱动格式
+%=====================================================================
+
+\DeclareDelimFormat{authotitledelim}
+{%
+\iffieldequalstr{userd}{chinese}{\gbpunctcolon}{\addperiod\space}%
+}
+
+\renewbibmacro*{maintitle+booktitle}{%
+ \iffieldundef{maintitle}
+ {}
+ {\usebibmacro{maintitle}%
+ \newunit\newblock
+ \iffieldundef{volume}
+ {}
+ {\printfield{volume}%
+ \printfield{part}%
+ \setunit{\addcolon\space}}}%
+ \usebibmacro{booktitle}%
+}
+
+
+\newbibmacro*{inbook:volume+number}{%
+ \iffieldundef{volume}{}{\printfield{volume}}%
+ \iffieldundef{number}{}{\printfield{number}}%
+}
+
+
+\renewbibmacro*{thesis:institution+location+date}{\bibpubfont%当没有institution时不处理。
+{\printlist{location}%%加了一个编组避免\usebibmacro{date}把month和day信息去掉
+ \iflistundef{institution}
+ {\setunit*{\addcomma\space}}
+ {\setunit*{\publocpunct}}%
+ \printlist{institution}%
+ \iftoggle{bbx:gbfieldtype}{%
+ \printfield{type}%
+ \setunit*{\addspace}}{}%
+ \pubdatadelim%
+ \usebibmacro{date}%
+ %\newunit
+ }}
+
+
+%
+% 增加inbook:parent用于辅助crossref传统功能的实现
+% 用在{crosscite}宏中
+% 20210216,v1.0w,hzz
+\newbibmacro*{inbook:parent}{%
+\usebibmacro{bybookauthor}%
+\ifnameundef{bookauthor}{%
+ \ifnameundef{editor}{}{\printdelim{authotitledelim}}%
+ }{\printdelim{authotitledelim}}%
+{\iffieldundef{series}{}{\usebibmacro{series+number}\setunit{\addcolon\addspace}}}%为处理一些存在series的情况而增加
+ \usebibmacro{maintitle+booktitle}%
+ \usebibmacro{inbook:volume+number}%
+ \newunit\newblock%
+ {\printfield{edition}}%
+ \newunit
+ \newunit\newblock
+ \usebibmacro{publisher+location+date}%
+}
+
+
+\DeclareBibliographyDriver{book}{%源来自standard.bbx文件
+\usebibmacro{bibindex}%
+\usebibmacro{begentry}%
+\usebibmacro{author/editor+others/translator+others}%
+\ifnameundef{namea}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者不存在时多出的标点
+\usebibmacro{maintitle+title}%
+\iftoggle{bbx:gbstrict}{}{%
+\newunit
+\printlist{language}%
+\newunit\newblock%
+\usebibmacro{byauthor}%
+\newunit\newblock}%
+\usebibmacro{byeditor+others}%
+\newunit%
+{\printfield{edition}}%
+\newunit\newblock%%
+\iftoggle{bbx:gbstrict}{}{%
+\iffieldundef{maintitle}%
+{\printfield{volume}%
+\printfield{part}}%
+{}%
+\newunit%
+\printfield{volumes}%
+\newunit\newblock%
+\usebibmacro{series+number}}%
+\newunit\newblock%
+%\printfield{note}%
+%\newunit\newblock%
+\usebibmacro{publisher+location+date}%
+%\newunit\newblock %这里标点去掉
+\usebibmacro{chapter+pages}%
+% \iffieldundef{url}{}{%当没有网址时也不输出
+% \usebibmacro{modifydate}}%带括号的修改或更新日期,
+\usebibmacro{doi+eprint+url}%从下面移动到上面来,因为gbt2015的url需直接放在页码后面。
+ \newunit\newblock%
+ \printfield{pagetotal}%
+ \newunit\newblock%
+ \iftoggle{bbx:isbn}
+ {\printfield{isbn}}
+ {}%
+ \newunit\newblock
+ %\usebibmacro{doi+eprint+url}%
+ %\newunit\newblock
+ \usebibmacro{addendum+pubstate}%
+ \setunit{\bibpagerefpunct}\newblock
+ \usebibmacro{pageref}%
+ \newunit\newblock
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
+ \usebibmacro{annotation}\usebibmacro{finentry}}
+
+
+\DeclareBibliographyDriver{thesis}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{author/editor+others/translator+others}%
+\ifnameundef{namea}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者不存在时多出的标点
+ \usebibmacro{title}%
+ \iftoggle{bbx:gbstrict}{}{%
+ \newunit%
+ \printlist{language}%
+ \newunit\newblock
+ \usebibmacro{byauthor}}%
+ \newunit\newblock
+ \usebibmacro{byeditor+others}%增加的译者信息
+ \newunit\newblock
+ {\printfield{number}}%
+ \newunit\newblock
+ \printfield{version}%
+ \newunit
+ \printfield{note}%
+ \newunit\newblock
+ \usebibmacro{thesis:institution+location+date}%
+ %\newunit\newblock
+ \usebibmacro{chapter+pages}%
+ \iffieldundef{url}{}{%当没有网址时也不输出修改或更新日期
+ \usebibmacro{modifydate}}%修改或更新日期为带括号的时间
+ \usebibmacro{doi+eprint+url}%
+ \newunit
+ \printfield{pagetotal}%
+ \newunit\newblock
+ \iftoggle{bbx:isbn}
+ {\printfield{isrn}}
+ {}%
+ \newunit\newblock
+ \usebibmacro{addendum+pubstate}%
+ \setunit{\bibpagerefpunct}\newblock
+ \usebibmacro{pageref}%
+ \newunit\newblock
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
+ \usebibmacro{annotation}\usebibmacro{finentry}}
+
+
+\DeclareBibliographyDriver{manual}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{author/editor+others/translator+others}%
+\ifnameundef{namea}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者不存在时多出的标点
+ \usebibmacro{title}%
+ \iftoggle{bbx:gbstrict}{}{%
+ \newunit%
+ \printlist{language}%
+ \newunit\newblock
+ \usebibmacro{byauthor}}%
+ \newunit\newblock
+ \usebibmacro{byeditor+others}%增加的译者信息
+ \newunit\newblock
+ \iftoggle{bbx:gbfieldtype}{%
+ \printfield{type}%
+ \setunit*{\addspace}}{}%
+ {\printfield{number}}%
+ \newunit\newblock
+ \printfield{version}%
+ \newunit
+ \printfield{note}%
+ \newunit\newblock
+ \usebibmacro{institution+location+date}%
+ %\newunit\newblock
+ \usebibmacro{chapter+pages}%
+ \iffieldundef{url}{}{%当没有网址时也不输出修改或更新日期
+ \usebibmacro{modifydate}}%修改或更新日期为带括号的时间
+ \usebibmacro{doi+eprint+url}%
+ \newunit
+ \printfield{pagetotal}%
+ \newunit\newblock
+ \iftoggle{bbx:isbn}
+ {\printfield{isrn}}
+ {}%
+ \newunit\newblock
+ \usebibmacro{addendum+pubstate}%
+ \setunit{\bibpagerefpunct}\newblock
+ \usebibmacro{pageref}%
+ \newunit\newblock
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
+ \usebibmacro{annotation}\usebibmacro{finentry}}
+
+
+\DeclareBibliographyDriver{misc}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{author/editor+others/translator+others}%
+\ifnameundef{namea}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者不存在时多出的标点
+ \usebibmacro{title}%
+\iftoggle{bbx:gbstrict}{}{%
+ \newunit
+ \printlist{language}%
+ \newunit\newblock
+ \usebibmacro{byauthor}%
+ \newunit\newblock
+ \usebibmacro{byeditor+others}}%
+ \newunit\newblock
+ \printfield{howpublished}%
+ \newunit\newblock
+ \printfield{type}%
+ \newunit
+ \printfield{version}%
+ \newunit
+ \printfield{note}%
+ \newunit\newblock
+ \usebibmacro{institution+location+date}%
+ \newunit%
+ \printfield{number}%
+ %\usebibmacro{organization+location+date}%
+ %\newunit\newblock
+ \usebibmacro{doi+eprint+url}%
+ \newunit\newblock
+ \usebibmacro{addendum+pubstate}%
+ \setunit{\bibpagerefpunct}\newblock
+ \usebibmacro{pageref}%
+ \newunit\newblock
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
+ \usebibmacro{annotation}\usebibmacro{finentry}}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-jmw.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-jmw.cbx
new file mode 100644
index 0000000000..d8a89fb535
--- /dev/null
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-jmw.cbx
@@ -0,0 +1,183 @@
+%%
+%% ---------------------------------------------------------------
+%% css.cbx --- A citation style of journal of management world in china
+%% modified from gb7714-2015
+%% Maintained by huzhenzhen
+%% E-mail: hzzmail@163.com
+%% Released under the LaTeX Project Public License v1.3c or later
+%% ---------------------------------------------------------------
+%%
+%%用法:类似于标准的样式在biblatex加载时设置样式
+%%文献表正常处理,标注命令主要用cite和textcite
+
+\ProvidesFile{chinese-jmw.cbx}[v1.0a a biblatex citation style for jmw]
+
+%==================================================
+%加载gb样式
+%==================================================
+\RequireCitationStyle{gb7714-2015ay} %
+
+
+%
+% 增加一个控制标注中标点是英文还是中文的选项
+% 20220222,v1.0a,hzz
+\DeclareBibliographyOption{gbcitepunctcn}[true]{%biblatex低版本
+ \ifstrequal{#1}{false}{\execgbpunctencite}{}}
+
+\def\gbpunctcommacite{,}%
+\def\gbpunctmarkcite{、}%
+\def\gbpunctsemicoloncite{;}%
+\def\gbpunctparenlcite{(}%
+\def\gbpunctparenrcite{)}
+\def\execgbpunctencite{%
+\def\gbpunctcommacite{\addcomma\addspace}%
+\def\gbpunctmarkcite{\addcomma\addspace}%
+\def\gbpunctsemicoloncite{\addsemicolon\addspace}%
+\def\gbpunctparenlcite{(}%
+\def\gbpunctparenrcite{)}
+}
+
+%==================================================
+%选项设置
+%==================================================
+\ExecuteBibliographyOptions{
+ maxcitenames=2,
+ mincitenames=1,
+}
+
+\DeclareDelimFormat[textcite]{delimandincitecn}{和}%\addcomma\space
+\DeclareDelimFormat[parencite]{delimandincitecn}{\gbpunctmarkcite}%\addcomma\space
+\DeclareDelimFormat[textcite]{delimandincite}{和}%\addcomma\space
+\DeclareDelimFormat[parencite]{delimandincite}{ and }%\addcomma\space
+\DeclareDelimFormat[textcite]{delimandothersincite}{\str@andotherscn}%\addcomma\space
+\DeclareDelimFormat[parencite]{delimandothersincite}{et al\adddot}%\addcomma\space
+
+\DefineBibliographyStrings{english}{
+ andincitecn = {\printdelim{delimandincitecn}},
+ andincite = {\printdelim{delimandincite}},
+ %andothersincitecn={\str@andotherscn},
+ andothersincite={\printdelim{delimandothersincite}},
+}
+
+%==================================================
+%引用命令设置,主要用cite和textcite
+%包括标点设置
+%==================================================
+\renewcommand*{\multicitedelim}{\gbpunctsemicoloncite}%\addsemicolon\addspace;
+\renewcommand*{\textcitedelim}{%
+ \iffinalcitedelim
+ {\ifnumgreater{\value{textcitetotal}}{2}
+ {}{}%\iftextcitepunct{\finalandsemicolon}{\finalandcomma}
+ \addspace\gbpunctmarkcite}%\addspace\bibstring{andincitecn}
+ {\iftextcitepunct{\addsemicolon\space}{\addspace\gbpunctmarkcite}}%\addcomma
+}%\space
+
+\DeclareDelimFormat[textcite]{nameyeardelim}{\addspace}%\addcomma\space
+\DeclareDelimFormat[parencite]{nameyeardelim}{\gbpunctcommacite}
+\DeclareDelimFormat[textcite]{andothersdelim}{\addspace}%
+\DeclareDelimFormat[parencite]{andothersdelim}{\iffieldequalstr{userf}{chinese}{}{\addspace}}%
+
+
+%标注压缩时,直接用date+extradate代替extradate实现2006a,2006b的效果
+%\DeclareDelimFormat*{compcitedelim}{\gbpunctmarkcite}%\addcomma\addspace
+\newbibmacro*{cite:extradate}{%
+ \iffieldundef{extradate}
+ {}
+ {\printtext[bibhyperref]{\addspace\printlabeldateextra}}}%\printfield{extradate}\printlabeldateextra \printfield{labelyear}\printfield{extradate}
+
+%\AtEveryCite{%
+%\let\parentext=\parentexttrack%
+%\let\bibopenparen=(%
+%\let\bibcloseparen=)}
+
+%添加前后空格
+\DeclareCiteCommand{\parencite}%[\mkbibparens]
+ {\usebibmacro{cite:init}%
+ \unspace\printtext{\gbpunctparenlcite}\usebibmacro{prenote}}%\addspace
+ {\usebibmacro{citeindex}%
+ \usebibmacro{cite}}
+ {}
+ {\usebibmacro{postnote}%
+ \gbpunctparenrcite}%\addspace
+
+%原版
+%\DeclareCiteCommand{\cite}[\mkbibparens]
+% {\usebibmacro{cite:init}%
+% \usebibmacro{prenote}}%)
+% {\usebibmacro{citeindex}%
+% \usebibmacro{cite}}
+% {}
+% {\usebibmacro{postnote}}
+
+%
+%添加后面空格
+%\DeclareCiteCommand{\cbx@textcite}
+% {\usebibmacro{cite:init}}
+% {\usebibmacro{citeindex}%
+% \usebibmacro{textcite}}
+% {}
+% {\usebibmacro{textcite:postnote}\addspace}
+
+\newbibmacro*{textcite}{%
+ \iffieldequals{namehash}{\cbx@lasthash}
+ {\iffieldundef{shorthand}
+ {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
+ \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
+ {\setunit{\addcomma}%
+ \usebibmacro{cite:extradate}}
+ {\setunit{\compcitedelim}%
+ \usebibmacro{cite:labeldate+extradate}%
+ \savefield{labelyear}{\cbx@lastyear}}}
+ {\setunit{\compcitedelim}%
+ \usebibmacro{cite:shorthand}%
+ \global\undef\cbx@lastyear}}
+ {\ifnameundef{labelname}
+ {\iffieldundef{shorthand}
+ {\usebibmacro{cite:label}%
+ \setunit{%
+ \global\booltrue{cbx:parens}%
+ \printdelim{nonameyeardelim}\unspace\gbpunctparenlcite}%\bibopenparen
+ \ifnumequal{\value{citecount}}{1}
+ {\usebibmacro{prenote}}
+ {}%
+ \usebibmacro{cite:labeldate+extradate}}
+ {\usebibmacro{cite:shorthand}}}
+ {\printnames{labelname}%
+ \setunit{%
+ \global\booltrue{cbx:parens}%
+ \printdelim{nameyeardelim}\unspace\gbpunctparenlcite}%\bibopenparen
+ \ifnumequal{\value{citecount}}{1}
+ {\usebibmacro{prenote}}
+ {}%
+ \iffieldundef{shorthand}
+ {\iffieldundef{labelyear}
+ {\usebibmacro{cite:label}}
+ {\usebibmacro{cite:labeldate+extradate}}%
+ \savefield{labelyear}{\cbx@lastyear}}
+ {\usebibmacro{cite:shorthand}%
+ \global\undef\cbx@lastyear}}%
+ \stepcounter{textcitecount}%
+ \savefield{namehash}{\cbx@lasthash}}%
+ \setunit{%
+ \ifbool{cbx:parens}
+ {\gbpunctparenrcite\global\boolfalse{cbx:parens}}%\bibcloseparen
+ {}%
+ \textcitedelim}}
+
+\newbibmacro*{textcite:postnote}{%
+ \usebibmacro{postnote}%
+ \ifthenelse{\value{multicitecount}=\value{multicitetotal}}
+ {\setunit{}%
+ \printtext{%
+ \ifbool{cbx:parens}
+ {\gbpunctparenrcite\global\boolfalse{cbx:parens}}%\bibcloseparen
+ {}}}
+ {\setunit{%
+ \ifbool{cbx:parens}
+ {\gbpunctparenrcite\global\boolfalse{cbx:parens}}%\bibcloseparen
+ {}%
+ \textcitedelim}}}
+
+\let\citet=\textcite
+\let\citep=\parencite
+\let\cite=\parencite
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.bbx
index aa44a3870f..b5233fc1f9 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.bbx
@@ -11,7 +11,7 @@
%
% 版本和时间信息
%
-\def\versionofgbtstyle{2023/03/31 v1.1l}
+\def\versionofgbtstyle{2023/04/24 v1.1m}
\def\versionofbiblatex{\abx@version}
\ProvidesFile{gb7714-2015.bbx}[\versionofgbtstyle biblatex bibliography style]
%\RequireBiber[3]%显式指定用biber后端,当用bibtex时会报错,但其实不会影响编译,只是采用bibtex后无法达成格式需求
@@ -543,6 +543,13 @@
\def\str@mathesiscn{硕士学位论文}
\def\str@phdthesiscn{博士学位论文}
\def\str@editorcn{主编}
+ \def\str@editorscn{主编}
+ \def\str@compilerscn{整理}
+ \def\str@compilercn{整理}
+ \def\str@revisercn{编}
+ \def\str@reviserscn{编}
+ \def\str@foundercn{编著}
+ \def\str@founderscn{编著}
\AtEndOfPackage{%
\iftoggle{bbx:codegbk}{%
@@ -919,6 +926,13 @@
\NewBibliographyString{editorcn}
\NewBibliographyString{editorscn}
\NewBibliographyString{bytranslatorcn}
+ \NewBibliographyString{compilercn}
+ \NewBibliographyString{compilerscn}
+ \NewBibliographyString{revisercn}
+ \NewBibliographyString{reviserscn}
+ \NewBibliographyString{foundercn}
+ \NewBibliographyString{founderscn}
+
@@ -956,6 +970,12 @@
phdthesiscn={\str@phdthesiscn},
editorscn={\str@editorcn},
editorcn={\str@editorcn},
+ compilerscn={\str@compilerscn},
+ compilercn={\str@compilercn},
+ reviserscn={\str@reviserscn},
+ revisercn={\str@revisercn},
+ founderscn={\str@founderscn},
+ foundercn={\str@foundercn},
}
%
@@ -2670,7 +2690,8 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7
{\namepartgiven}
{\namepartprefix}
{\namepartsuffix}}%
-\or
+\or%
+\renewrobustcmd*{\bibinithyphendelim}{.\mbox{-}}%
\ifgiveninits
{\usebibmacro{name:given-family}
{\namepartfamily}
@@ -2682,7 +2703,8 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7
{\namepartgiven}
{\namepartprefix}
{\namepartsuffix}}%
-\or
+\or%
+\renewrobustcmd*{\bibinithyphendelim}{.\mbox{-}}%
\ifgiveninits
{\usebibmacro{name:family-given}
{\namepartfamily}
@@ -2700,7 +2722,8 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7
{\namepartgiven}
{\namepartprefix}
{\namepartsuffix}%
-\or
+\or%
+\renewrobustcmd*{\bibinithyphendelim}{.\mbox{-}}%
\ifnumequal{\value{listcount}}{1}
{\ifgiveninits
{\usebibmacro{name:family-given}
@@ -3298,6 +3321,7 @@ test{\iftoggle{iftlnine}}
%定义出版社与年份之间的标点便于后面重定义
\newcommand{\pubdatadelim}{\setunit*{\addcomma\space}}
+\newcommand{\locnopubdelim}{\setunit*{\addcomma\space}}
% 新增一个样式用于输出连续出版物的地址,单位,时间,
% 用于periodical连续出版物的出版社和地址的处理
@@ -3327,7 +3351,7 @@ test {\iflistundef{location}} and test {\iflistundef{institution}}%
\newunit}%
{\printlist{location}%
\iflistundef{institution}%
- {\setunit*{\addcomma\space}}
+ {\locnopubdelim}
{\setunit*{\publocpunct}}%
\printlist{institution}%
\pubdatadelim%
@@ -3362,7 +3386,7 @@ test {\iflistundef{location}} and test {\iflistundef{institution}}%
}%
{\printlist{location}%
\iflistundef{publisher}
- {\setunit*{\addcomma\space}}
+ {\locnopubdelim}
{\setunit*{\publocpunct}}%
\printlist{publisher}%
\pubdatadelim%
@@ -3396,6 +3420,12 @@ test {\iflistundef{location}} and test {\iflistundef{institution}}%
{\bibstring{serialcn}#1\bibstring{volumecn}}%
{\bibstring{volume}~#1}%
}% volume of a book
+\DeclareFieldFormat[book,inbook,incollection]{volume}%
+{\iffieldequalstr{userd}{chinese}{\iffieldint{volume}%
+ {\bibstring{serialcn}#1\bibstring{volumecn}%
+ }{#1}}%
+ {\bibstring{volume}~#1}%
+}
\DeclareFieldFormat[article,periodical]{volume}{#1}% volume of a journal
%
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.bbx
index e6a1ae9e41..a1f7a23492 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.bbx
@@ -10,7 +10,7 @@
%
% 版本和时间信息
%
-\def\versionofgbtstyle{2023/03/31 v1.1l}
+\def\versionofgbtstyle{2023/04/24 v1.1m}
\def\versionofbiblatex{\abx@version}
\ProvidesFile{gb7714-2015ay.bbx}[\versionofgbtstyle biblatex bibliography style]
%\RequireBiber[3]%显式指定用biber后端,当用bibtex时会报错,但其实不会影响编译,只是采用bibtex后无法达成格式需求
@@ -492,6 +492,13 @@
\def\str@mathesiscn{硕士学位论文}
\def\str@phdthesiscn{博士学位论文}
\def\str@editorcn{主编}
+ \def\str@editorscn{主编}
+ \def\str@compilerscn{整理}
+ \def\str@compilercn{整理}
+ \def\str@revisercn{编}
+ \def\str@reviserscn{编}
+ \def\str@foundercn{编著}
+ \def\str@founderscn{编著}
\AtEndOfPackage{%
\iftoggle{bbx:codegbk}{%
@@ -876,6 +883,12 @@
\NewBibliographyString{editorcn}
\NewBibliographyString{editorscn}
\NewBibliographyString{bytranslatorcn}
+ \NewBibliographyString{compilercn}
+ \NewBibliographyString{compilerscn}
+ \NewBibliographyString{revisercn}
+ \NewBibliographyString{reviserscn}
+ \NewBibliographyString{foundercn}
+ \NewBibliographyString{founderscn}
%
% 修改一些当地化字符串
@@ -910,6 +923,12 @@
phdthesiscn={\str@phdthesiscn},
editorscn={\str@editorcn},
editorcn={\str@editorcn},
+ compilerscn={\str@compilerscn},
+ compilercn={\str@compilercn},
+ reviserscn={\str@reviserscn},
+ revisercn={\str@revisercn},
+ founderscn={\str@founderscn},
+ foundercn={\str@foundercn},
}
%
@@ -2526,7 +2545,8 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7
{\namepartgiven}
{\namepartprefix}
{\namepartsuffix}}%
-\or
+\or%
+\renewrobustcmd*{\bibinithyphendelim}{.\mbox{-}}%
\ifgiveninits
{\usebibmacro{name:given-family}
{\namepartfamily}
@@ -2538,7 +2558,8 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7
{\namepartgiven}
{\namepartprefix}
{\namepartsuffix}}%
-\or
+\or%
+\renewrobustcmd*{\bibinithyphendelim}{.\mbox{-}}%
\ifgiveninits
{\usebibmacro{name:family-given}
{\namepartfamily}
@@ -2556,7 +2577,8 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7
{\namepartgiven}
{\namepartprefix}
{\namepartsuffix}%
-\or
+\or%
+\renewrobustcmd*{\bibinithyphendelim}{.\mbox{-}}%
\ifnumequal{\value{listcount}}{1}
{\ifgiveninits
{\usebibmacro{name:family-given}
@@ -3217,6 +3239,12 @@ test {\iflistundef{location}} and test {\iflistundef{institution}}%
{\bibstring{serialcn}#1\bibstring{volumecn}}%
{\bibstring{volume}~#1}%
}% volume of a book
+\DeclareFieldFormat[book,inbook,incollection]{volume}%
+{\iffieldequalstr{userd}{chinese}{\iffieldint{volume}%
+ {\bibstring{serialcn}#1\bibstring{volumecn}%
+ }{#1}}%
+ {\bibstring{volume}~#1}%
+}
\DeclareFieldFormat[article,periodical]{volume}{#1}% volume of a journal
%
diff --git a/macros/latex/contrib/koma-script/MANIFEST.md b/macros/latex/contrib/koma-script/MANIFEST.md
index 1b469356ff..7089f6be08 100644
--- a/macros/latex/contrib/koma-script/MANIFEST.md
+++ b/macros/latex/contrib/koma-script/MANIFEST.md
@@ -211,6 +211,7 @@ of the KOMA-Script bundle of LaTeX classes and packages.
* `README.scrletter.cls`
* `README.scrletter.sty`
* `README.scrlfile-hook.sty`
+* `README.scrlfile-hook-3.34.sty`
* `README.scrlfile-patcholdlatex.sty`
* `README.scrlfile.sty`
* `README.scrlogo.sty`
diff --git a/macros/latex/contrib/koma-script/README.md b/macros/latex/contrib/koma-script/README.md
index 56045e3135..d4c05adc89 100644
--- a/macros/latex/contrib/koma-script/README.md
+++ b/macros/latex/contrib/koma-script/README.md
@@ -1,4 +1,4 @@
-# KOMA-Script 2023/04/17 v3.39
+# KOMA-Script 2023/04/24 v3.40
Copyright [Markus Kohm](mailto:komascript@gmx.info) 1994–2023
This material is subject to the LaTeX Project Public License Version 1.3c. See [`lppl.txt`](lppl.txt) (English) or [`lppl-de.txt`](lppl-de.txt) (German) for the details of that license.
@@ -68,7 +68,7 @@ Requires: scrkbase - internal KOMA-Script package
Recommended: scrlayer-scrpage - KOMA-Script package
License: LPPL 1.3c or later
State: Author maintained
-Version: 2023/04/17 v3.39
+Version: 2023/04/24 v3.40
</pre>
***
@@ -85,7 +85,7 @@ Abstract: scrreport is a very simple wrapper class to scrartcl. It has
Requires: scrartcl.cls - KOMA-Script class
License: LPPL 1.3c or later
State: Author maintained
-Version: 2023/04/17 v3.39
+Version: 2023/04/24 v3.40
</pre>
***
@@ -126,7 +126,7 @@ Requires: keyval - key=value package from the graphics bundle
manipulation
License: LPPL 1.3c or later
State: Author maintained
-Version: 2023/04/17 v3.39
+Version: 2023/04/24 v3.40
</pre>
***
@@ -148,7 +148,7 @@ Requires: scrkbase - internal KOMA-Script package
typearea - KOMA-Script package
License: LPPL 1.3c or later
State: Author maintained
-Version: 2023/04/17 v3.39
+Version: 2023/04/24 v3.40
</pre>
***
@@ -169,7 +169,7 @@ Requires: scrkbase - KOMA-Script package for some basic features.
manipulation
License: LPPL 1.3c or later
State: Author maintained
-Version: 2023/04/17 v3.39
+Version: 2023/04/24 v3.40
</pre>
***
@@ -200,7 +200,7 @@ Requires: scrkbase - internal package with some basics of KOMA-Script
etoolbox - tool-box for LaTeX programming using e-TeX
License: LPPL 1.3c or later
State: Author maintained
-Version: 2023/04/17 v3.39
+Version: 2023/04/24 v3.40
</pre>
***
@@ -214,7 +214,7 @@ Abstract: scrfontsizes is a LaTeX package of the KOMA-Script bundle.
Requires: scrextend - some KOMA-Script features for other classes
License: LPPL 1.3c or later
State: Author maintained
-Version: 2023/04/17 v3.39
+Version: 2023/04/24 v3.40
</pre>
***
@@ -234,7 +234,7 @@ Requires: scrkbase - internal KOMA-Script package with basics
xpatch - extending etoolbox patching commands
License: LPPL 1.3c or later
State: Author maintained
-Version: 2023/04/17 v3.39
+Version: 2023/04/24 v3.40
</pre>
***
@@ -252,7 +252,7 @@ Requires: scrkbase - internal KOMA-Script package with basics
tocbasic - features for helper files and float environments
License: LPPL 1.3c or later
State: Author maintained
-Version: 2023/04/17 v3.39
+Version: 2023/04/24 v3.40
</pre>
***
@@ -269,7 +269,7 @@ Requires: scrbase - KOMA-Script package for some basic features.
manipulation
License: LPPL 1.3c or later
State: Author maintained
-Version: 2023/04/17 v3.39
+Version: 2023/04/24 v3.40
</pre>
***
@@ -292,7 +292,7 @@ Abstract: scrlayer-notecolumn is a LaTeX package of the KOMA-Script
Requires: scrlayer.sty
License: LPPL 1.3c or later
State: Author maintained, proof of concept
-Version: 2022/06/29 v0.3.3915
+Version: 2023/04/17 v0.3.4032
</pre>
***
@@ -314,7 +314,7 @@ Abstract: scrlayer-scrpage is a LaTeX package of the KOMA-Script
Requires: scrlayer.sty
License: LPPL 1.3c or later
State: Author maintained
-Version: 2023/04/17 v3.39
+Version: 2023/04/24 v3.40
</pre>
***
@@ -341,7 +341,7 @@ Abstract: scrlayer is a LaTeX package of the KOMA-Script bundle.
Requires: scrkbase.sty
License: LPPL 1.3c or later
State: Author maintained
-Version: 2023/04/17 v3.39
+Version: 2023/04/24 v3.40
</pre>
***
@@ -356,7 +356,7 @@ Requires: scrartcl.cls – KOMA-Script class
scrletter.sty – KOMA-Script package
License: LPPL 1.3c or later
State: Author maintained
-Version: 2023/04/17 v3.39
+Version: 2023/04/24 v3.40
</pre>
***
@@ -373,7 +373,21 @@ Requires: scrkbase - internal KOMA-Script package
Recommended: marvosym - package by Martin Vogel providing symbols
License: LPPL 1.3c or later
State: Author maintained
-Version: 2023/04/17 v3.39
+Version: 2023/04/24 v3.40
+</pre>
+***
+
+###scrlfile-hook-3.34 - internal subpackage of scrlfile
+<pre>
+Maintainer: Markus Kohm
+E-Mail: komascript@gmx.info
+Abstract: scrlfile-hook-3.34 is an internal subpackage of scrlfile to
+ be used with LaTeX from version 2020-10-01, but before
+ version 2021-11-15.
+Requires: scrlogo.sty
+License: LPPL 1.3c or later
+State: Author maintained
+Version: 2023/04/24 v3.40
</pre>
***
@@ -382,11 +396,11 @@ Version: 2023/04/17 v3.39
Maintainer: Markus Kohm
E-Mail: komascript@gmx.info
Abstract: scrlfile-hook is an internal subpackage of scrlfile to be
- be used with LaTeX from version 2010-10-01 on.
+ be used with LaTeX from version 2021-11-15 on.
Requires: scrlogo.sty
License: LPPL 1.3c or later
State: Author maintained
-Version: 2023/04/17 v3.39
+Version: 2023/04/24 v3.40
</pre>
***
@@ -399,7 +413,7 @@ Abstract: scrlfile-patcholdlatex is an internal subpackage of scrlfile
Requires: scrlogo.sty
License: LPPL 1.3c or later
State: Author maintained
-Version: 2023/04/17 v3.39
+Version: 2023/04/24 v3.40
</pre>
***
@@ -419,7 +433,7 @@ Abstract: scrlfile is a LaTeX package of the KOMA-Script bundle. It
Requires: scrlfile-hook.sty, scrlfile-patcholdlatex.sty, scrlogo.sty
License: LPPL 1.3c or later
State: Author maintained
-Version: 2023/04/17 v3.39
+Version: 2023/04/24 v3.40
</pre>
***
@@ -433,7 +447,7 @@ Abstract: scrlogo is a LaTeX package of the KOMA-Script bundle. It
Requires:
License: LPPL 1.3c or later
State: Author maintained
-Version: 2023/04/17 v3.39
+Version: 2023/04/24 v3.40
</pre>
***
@@ -468,7 +482,7 @@ Requires: scrkbase - internal KOMA-Script package
Recommended: marvosym - package by Martin Vogel providing symbols
License: LPPL 1.3c or later
State: Author maintained
-Version: 2023/04/17 v3.39
+Version: 2023/04/24 v3.40
</pre>
***
@@ -485,7 +499,7 @@ Abstract: scrreport is a very simple wrapper class to scrreprt. It has
Requires: scrreprt.cls - KOMA-Script class
License: LPPL 1.3c or later
State: Author maintained
-Version: 2023/04/17 v3.39
+Version: 2023/04/24 v3.40
</pre>
***
@@ -507,7 +521,7 @@ Requires: scrkbase - internal KOMA-Script package
typearea - KOMA-Script package
License: LPPL 1.3c or later
State: Author maintained
-Version: 2023/04/17 v3.39
+Version: 2023/04/24 v3.40
</pre>
***
@@ -521,7 +535,7 @@ Abstract: scrtime is a LaTeX package of the KOMA-Script bundle. It
Requires: scrkbase - internal package with some basics of KOMA-Script
License: LPPL 1.3c or later
State: Author maintained
-Version: 2023/04/17 v3.39
+Version: 2023/04/24 v3.40
</pre>
***
@@ -548,7 +562,7 @@ Abstract: tocbasic is a LaTeX package of the KOMA-Script bundle. The
Requires: scrbase - KOMA-Script package for some basic features.
License: LPPL 1.3c or later
State: Author maintained
-Version: 2023/04/17 v3.39
+Version: 2023/04/24 v3.40
</pre>
***
@@ -571,7 +585,7 @@ Abstract: Many LaTeX classes, including the standard classes, present
Requires: scrkbase - internal basic features for KOMA-Script packages
License: LPPL 1.3c or later
State: Autor maintained
-Version: 2023/04/17 v3.39
+Version: 2023/04/24 v3.40
</pre>
***
diff --git a/macros/latex/contrib/koma-script/doc/common-dictum-de.tex b/macros/latex/contrib/koma-script/doc/common-dictum-de.tex
index 488ffe9502..9951b25bbb 100644
--- a/macros/latex/contrib/koma-script/doc/common-dictum-de.tex
+++ b/macros/latex/contrib/koma-script/doc/common-dictum-de.tex
@@ -1,6 +1,6 @@
% ======================================================================
% common-dictum-de.tex
-% Copyright (c) Markus Kohm, 2001-2022
+% Copyright (c) Markus Kohm, 2001-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -24,7 +24,7 @@
% ======================================================================
\KOMAProvidesFile{common-dictum-de.tex}
- [$Date: 2022-06-05 12:40:11 +0200 (So, 05. Jun 2022) $
+ [$Date: 2023-04-20 10:04:17 +0200 (Do, 20. Apr 2023) $
KOMA-Script guide (common paragraphs)]
\section{Schlauer Spruch}
@@ -141,8 +141,22 @@ Voreinstellung entnehmen Sie bitte
\toprule
Element & Voreinstellung \\
\midrule
- \DescRef{\ThisCommonLabelBase.fontelement.dictum} &
- \Macro{normalfont}\Macro{normalcolor}\Macro{sffamily}\Macro{small}\\
+ \IfThisCommonLabelBase{maincls}{%
+ \ChangedAt{v3.39}{\Class{scrbook}\and \Class{scrreprt}\and
+ \Class{scrartcl}}%
+ }{%
+ \IfThisCommonLabelBase{scrextend}{%
+ \ChangedAt{v3.39}{\Package{screxend}}%
+ }{%
+ \IfThisCommonLabelBase{scrlttr2}{%
+ \ChangedAt{v3.39}{\Class{scrlttr2}}%
+ }{}%
+ }%
+ }%
+ \DescRef{\ThisCommonLabelBase.fontelement.dictum}
+ & \Macro{normalfont}\Macro{normalcolor}%
+ \DescRef{\LabelBase.cmd.maybesffamily}\IndexCmd{maybesffamily}%
+ \Macro{small}\\
\DescRef{\ThisCommonLabelBase.fontelement.dictumauthor} &
\Macro{itshape}\\
\bottomrule
diff --git a/macros/latex/contrib/koma-script/doc/common-dictum-en.tex b/macros/latex/contrib/koma-script/doc/common-dictum-en.tex
index f8cee03811..940a7ca1a8 100644
--- a/macros/latex/contrib/koma-script/doc/common-dictum-en.tex
+++ b/macros/latex/contrib/koma-script/doc/common-dictum-en.tex
@@ -1,6 +1,6 @@
% ======================================================================
% common-dictum-en.tex
-% Copyright (c) Markus Kohm, 2001-2022
+% Copyright (c) Markus Kohm, 2001-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -24,7 +24,7 @@
% ======================================================================
\KOMAProvidesFile{common-dictum-en.tex}
- [$Date: 2022-06-05 12:40:11 +0200 (So, 05. Jun 2022) $
+ [$Date: 2023-04-20 10:04:17 +0200 (Do, 20. Apr 2023) $
KOMA-Script guide (common paragraphs)]
\translator{Gernot Hassenpflug\and Markus Kohm\and Krickette Murabayashi\and
Karl Hagen}
@@ -76,10 +76,10 @@
\end{Declaration}%
You can set such a saying with the help of the \Macro{dictum} command. %
\IfThisCommonLabelBase{maincls}{%
- This\textnote{Hint!} macro can be included in the mandatory argument of
- either the \DescRef{maincls.cmd.setchapterpreamble} or the
- \DescRef{maincls.cmd.setpartpreamble} command. However, this is not
- obligatory.\par%
+ This\textnote{Hint!} macro can be included in the mandatory argument of
+ either the \DescRef{maincls.cmd.setchapterpreamble} or the
+ \DescRef{maincls.cmd.setpartpreamble} command. However, this is not
+ obligatory.\par%
}{}%
The dictum, along with an optional \PName{author}, is inserted in a
\Macro{parbox}\IndexCmd{parbox} (see \cite{latex:usrguide}) of width
@@ -118,8 +118,22 @@ listed in \autoref{tab:maincls.dictumfont}%
\toprule
Element & Default \\
\midrule
- \DescRef{\LabelBase.fontelement.dictum} &
- \Macro{normalfont}\Macro{normalcolor}\Macro{sffamily}\Macro{small}\\
+ \IfThisCommonLabelBase{maincls}{%
+ \ChangedAt{v3.39}{\Class{scrbook}\and \Class{scrreprt}\and
+ \Class{scrartcl}}%
+ }{%
+ \IfThisCommonLabelBase{scrextend}{%
+ \ChangedAt{v3.39}{\Package{screxend}}%
+ }{%
+ \IfThisCommonLabelBase{scrlttr2}{%
+ \ChangedAt{v3.39}{\Class{scrlttr2}}%
+ }{}%
+ }%
+ }%
+ \DescRef{\LabelBase.fontelement.dictum}
+ & \Macro{normalfont}\Macro{normalcolor}%
+ \DescRef{\LabelBase.cmd.maybesffamily}\IndexCmd{maybesffamily}%
+ \Macro{small}\\
\DescRef{\LabelBase.fontelement.dictumauthor} &
\Macro{itshape}\\
\bottomrule
diff --git a/macros/latex/contrib/koma-script/doc/common-lists-de.tex b/macros/latex/contrib/koma-script/doc/common-lists-de.tex
index 0fbb070153..972c8fc0da 100644
--- a/macros/latex/contrib/koma-script/doc/common-lists-de.tex
+++ b/macros/latex/contrib/koma-script/doc/common-lists-de.tex
@@ -1,6 +1,6 @@
% ======================================================================
% common-lists-de.tex
-% Copyright (c) Markus Kohm, 2001-2022
+% Copyright (c) Markus Kohm, 2001-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -24,7 +24,7 @@
% ======================================================================
\KOMAProvidesFile{common-lists-de.tex}%
- [$Date: 2022-06-05 12:40:11 +0200 (So, 05. Jun 2022) $
+ [$Date: 2023-04-20 10:04:17 +0200 (Do, 20. Apr 2023) $
KOMA-Script guide (common paragraphs)]
\section{Listen}
@@ -326,7 +326,21 @@
\FontElement{descriptionlabel}\important{\FontElement{descriptionlabel}}
(siehe \autoref{tab:\ThisCommonLabelBase.fontelements},
\autopageref{tab:\ThisCommonLabelBase.fontelements}) geändert werden. In der
- Voreinstellung wird \Macro{sffamily}""\Macro{bfseries} verwendet.%
+ Voreinstellung wird
+ \IfThisCommonLabelBase{maincls}{%
+ \ChangedAt{v3.39}{\Class{scrbook}\and \Class{scrreprt}\and
+ \Class{scrartcl}}%
+ }{%
+ \IfThisCommonLabelBase{scrextend}{%
+ \ChangedAt{v3.39}{\Package{screxend}}%
+ }{%
+ \IfThisCommonLabelBase{scrlttr2}{%
+ \ChangedAt{v3.39}{\Class{scrlttr2}}%
+ }{}%
+ }%
+ }%
+ \DescRef{\LabelBase.cmd.maybesffamily}\IndexCmd{maybesffamily}""%
+ \Macro{bfseries} verwendet.%
\IfThisCommonFirstRun{\iftrue}{%
\ In \autoref{sec:maincls.lists} auf \PageRefxmpl{maincls.env.description}
finden Sie ein Beispiel für die Anwendung.%
diff --git a/macros/latex/contrib/koma-script/doc/common-lists-en.tex b/macros/latex/contrib/koma-script/doc/common-lists-en.tex
index 4a2c64b798..329ee2801c 100644
--- a/macros/latex/contrib/koma-script/doc/common-lists-en.tex
+++ b/macros/latex/contrib/koma-script/doc/common-lists-en.tex
@@ -1,6 +1,6 @@
% ======================================================================
% common-lists-en.tex
-% Copyright (c) Markus Kohm, 2001-2022
+% Copyright (c) Markus Kohm, 2001-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -24,7 +24,7 @@
% ======================================================================
\KOMAProvidesFile{common-lists-en.tex}
- [$Date: 2022-06-05 12:40:11 +0200 (So, 05. Jun 2022) $
+ [$Date: 2023-04-20 10:04:17 +0200 (Do, 20. Apr 2023) $
KOMA-Script guide (common paragraphs)]
\translator{Gernot Hassenpflug\and Markus Kohm\and Krickette Murabayashi\and
Karl Hagen}
@@ -302,7 +302,20 @@
\FontElement{descriptionlabel}\important{\FontElement{descriptionlabel}}
element (see \autoref{tab:\ThisCommonLabelBase.fontelements},
\autopageref{tab:\ThisCommonLabelBase.fontelements}). The default is
- \Macro{sffamily}\linebreak[1]\Macro{bfseries}.%
+ \IfThisCommonLabelBase{maincls}{%
+ \ChangedAt{v3.39}{\Class{scrbook}\and \Class{scrreprt}\and
+ \Class{scrartcl}}%
+ }{%
+ \IfThisCommonLabelBase{scrextend}{%
+ \ChangedAt{v3.39}{\Package{screxend}}%
+ }{%
+ \IfThisCommonLabelBase{scrlttr2}{%
+ \ChangedAt{v3.39}{\Class{scrlttr2}}%
+ }{}%
+ }%
+ }%
+ \DescRef{\LabelBase.cmd.maybesffamily}\IndexCmd{maybesffamily}\linebreak[1]%
+ \Macro{bfseries}.%
\IfThisCommonFirstRun{\iftrue}{\csname iffalse\endcsname}
\begin{Example}
\phantomsection\xmpllabel{env.description}%
diff --git a/macros/latex/contrib/koma-script/doc/common-textmarkup-de.tex b/macros/latex/contrib/koma-script/doc/common-textmarkup-de.tex
index 100cfeac87..7b638a1df5 100644
--- a/macros/latex/contrib/koma-script/doc/common-textmarkup-de.tex
+++ b/macros/latex/contrib/koma-script/doc/common-textmarkup-de.tex
@@ -1,6 +1,6 @@
% ======================================================================
% common-textmarkup-de.tex
-% Copyright (c) Markus Kohm, 2001-2022
+% Copyright (c) Markus Kohm, 2001-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -24,7 +24,7 @@
% ======================================================================
\KOMAProvidesFile{common-textmarkup-de.tex}
- [$Date: 2023-04-04 13:29:59 +0200 (Di, 04. Apr 2023) $
+ [$Date: 2023-04-20 10:04:17 +0200 (Do, 20. Apr 2023) $
KOMA-Script guide (common paragraphs)]
\section{Textauszeichnungen}
@@ -183,8 +183,9 @@
\PName{Ein-Aus-Wert} kann dabei einer der Standardwerte für einfache
Schalter aus \autoref{tab:truefalseswitch} verwendet werden. Nur bei
aktivierter Option führt \Macro{maybesffamily} zu \Macro{sffamily} und
- \Macro{textmaybesf} zu \Macro{textsf}. \KOMAScript{} selbst verwendet
- \Macro{maybesffamily} in der Voreinstellung der Elemente
+ \Macro{textmaybesf} zu \Macro{textsf}. Dies ist auch die Voreinstellung.
+ \KOMAScript{} selbst verwendet \Macro{maybesffamily} in der Voreinstellung
+ der Elemente
\IfThisCommonLabelBase{scrextend}{}{%
\DescRef{\LabelBase.fontelement.descriptionlabel}, %
}%
@@ -197,9 +198,11 @@
\DescRef{maincls.fontelement.disposition}%
}{%
\DescRef{\LabelBase.fontelement.disposition}%
- } %
+ } %
und \DescRef{\LabelBase.fontelement.dictum}%
- }.%
+ }. \Macro{maybesffamily} darf also auch als Teil der \PName{Befehle} der
+ nachfolgend erklärten Anweisungen \DescRef{\LabelBase.cmd.setkomafont} und
+ \DescRef{\LabelBase.cmd.addtokomafont} verwendet werden.%
\EndIndexGroup%
\fi
diff --git a/macros/latex/contrib/koma-script/doc/common-textmarkup-en.tex b/macros/latex/contrib/koma-script/doc/common-textmarkup-en.tex
index 8b81bfbbb2..b2874ed8be 100644
--- a/macros/latex/contrib/koma-script/doc/common-textmarkup-en.tex
+++ b/macros/latex/contrib/koma-script/doc/common-textmarkup-en.tex
@@ -1,6 +1,6 @@
% ======================================================================
% common-textmarkup-en.tex
-% Copyright (c) Markus Kohm, 2001-2022
+% Copyright (c) Markus Kohm, 2001-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -24,7 +24,7 @@
% ======================================================================
\KOMAProvidesFile{common-textmarkup-en.tex}
- [$Date: 2023-04-04 13:29:59 +0200 (Di, 04. Apr 2023) $
+ [$Date: 2023-04-20 10:04:17 +0200 (Do, 20. Apr 2023) $
KOMA-Script guide (common paragraphs)]
\translator{Gernot Hassenpflug\and Markus Kohm\and Krickette Murabayashi\and
Karl Hagen}
@@ -179,25 +179,27 @@
depending on the setting of option \Option{sfdefaults}. One of the default
values for simple switches from \autoref{tab:truefalseswitch} can be used
here. Only if this option is enabled will \Macro{maybesffamily} result in
- \Macro{sffamily} and \Macro{textmaybesf} use \Macro{textsf}. KOMA-Script
- itself uses \Macro{maybesffamily} in the default settings of elements
- \IfThisCommonLabelBase{scrextend}{}{%
+ \Macro{sffamily} and \Macro{textmaybesf} use \Macro{textsf}. This is also
+ the default setting. KOMA-Script itself uses \Macro{maybesffamily} in the
+ default settings of elements \IfThisCommonLabelBase{scrextend}{}{%
\DescRef{\LabelBase.fontelement.descriptionlabel}, %
- }%
+ }%
\IfThisCommonLabelBase{scrlttr2}{%
\DescRef{\LabelBase.fontelement.backaddress}, %
\DescRef{\LabelBase.fontelement.refname}, %
and \DescRef{\LabelBase.fontelement.lettertitle}%
}{%
\IfThisCommonLabelBase{scrextend}{%
- \DescRef{maincls.fontelement.disposition}%
+ \DescRef{maincls.fontelement.disposition} %
}{%
\DescRef{\LabelBase.fontelement.disposition}, %
- }%
+ }%
and \DescRef{\LabelBase.fontelement.dictum}%
- }.%
+ }. \Macro{maybesffamily} may thus also be used as part of the
+ \PName{commands} of the \DescRef{\LabelBase.cmd.setkomafont} and
+ \DescRef{\LabelBase.cmd.addtokomafont} statements explained below.%
\EndIndexGroup%
-\fi
+ \fi
\begin{Declaration}
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-00-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-00-de.pdf
index bf2ad91537..88b1b56266 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-00-de.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-00-de.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-00-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-00-en.pdf
index cceedc4657..c6e38544fe 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-00-en.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-00-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-01-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-01-de.pdf
index 7b235fa7db..0d1331814c 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-01-de.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-01-de.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-01-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-01-en.pdf
index df28d5d708..3b61a9bfe8 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-01-en.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-01-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-02-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-02-de.pdf
index 72cb97f417..d6a18ca342 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-02-de.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-02-de.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-02-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-02-en.pdf
index 8c32102d1b..94f25768c4 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-02-en.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-02-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-03-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-03-de.pdf
index 68c17bb8db..fac8cf3af2 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-03-de.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-03-de.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-03-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-03-en.pdf
index 7c0e47913c..f332391e62 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-03-en.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-03-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-04-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-04-de.pdf
index 4f72d91356..08921f8a13 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-04-de.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-04-de.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-04-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-04-en.pdf
index fea4f82e13..27325ac5dc 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-04-en.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-04-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-05-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-05-de.pdf
index 04f77cb7d5..5345b63a61 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-05-de.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-05-de.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-05-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-05-en.pdf
index 99ac87b961..37d4e98a57 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-05-en.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-05-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-06-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-06-de.pdf
index b207def49a..881cf067f7 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-06-de.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-06-de.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-06-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-06-en.pdf
index 2ea196f2b0..a3c0546088 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-06-en.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-06-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-07-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-07-de.pdf
index c4806624d5..7415897736 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-07-de.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-07-de.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-07-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-07-en.pdf
index 453d96f15c..6724f248b9 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-07-en.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-07-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-08-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-08-de.pdf
index 35dd6e5095..47b926ea7c 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-08-de.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-08-de.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-08-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-08-en.pdf
index 1543cf5eca..afb0b752aa 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-08-en.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-08-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-09-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-09-de.pdf
index 4879a525b8..06a2758bb3 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-09-de.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-09-de.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-09-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-09-en.pdf
index f15d3ed842..fdc0534cf7 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-09-en.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-09-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-10-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-10-de.pdf
index e98de9d690..5643a04421 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-10-de.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-10-de.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-10-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-10-en.pdf
index 1cb5b1f34d..ed972856a8 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-10-en.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-10-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-11-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-11-de.pdf
index eea9f33be8..503f9e7005 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-11-de.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-11-de.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-11-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-11-en.pdf
index d16b5b1ad2..1b0452406b 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-11-en.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-11-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-12-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-12-de.pdf
index 4a7a1aee52..b6efd75f32 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-12-de.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-12-de.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-12-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-12-en.pdf
index 995d7ada77..3e7854f27d 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-12-en.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-12-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-13-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-13-de.pdf
index 0f10aad58b..dd3e44a94c 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-13-de.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-13-de.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-13-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-13-en.pdf
index 0d75113def..bbcef17343 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-13-en.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-13-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-14-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-14-de.pdf
index bc8c78a39d..faae3c8c59 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-14-de.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-14-de.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-14-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-14-en.pdf
index 63c0ed97ed..215b0336f0 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-14-en.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-14-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-15-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-15-de.pdf
index d7a7021cc0..66f7bb08f5 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-15-de.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-15-de.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-15-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-15-en.pdf
index 94c8221b79..64413646ef 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-15-en.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-15-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-16-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-16-de.pdf
index 07c725b509..76365f7445 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-16-de.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-16-de.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-16-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-16-en.pdf
index 9a836451af..486b17b603 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-16-en.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-16-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-17-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-17-de.pdf
index 39ebc382d7..0f571d2d46 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-17-de.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-17-de.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-17-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-17-en.pdf
index 026232663f..fd8cb4f061 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-17-en.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-17-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-18-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-18-de.pdf
index 282c02c3bd..0b8fbb2159 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-18-de.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-18-de.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-18-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-18-en.pdf
index 1cbdc9dc9d..3c6d326fdf 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-18-en.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-18-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-19-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-19-de.pdf
index beff2c403a..40a27e9eac 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-19-de.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-19-de.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-19-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-19-en.pdf
index 78a55e595d..8effd9c436 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-19-en.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-19-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-20-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-20-de.pdf
index dbd12bef9a..be00931b93 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-20-de.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-20-de.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-20-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-20-en.pdf
index e39a1a32e4..110d513bfd 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-20-en.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-20-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-21-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-21-de.pdf
index 4c4a9606e7..4a50318990 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-21-de.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-21-de.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-21-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-21-en.pdf
index a892448d61..ea7b248e54 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-21-en.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-21-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-22-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-22-de.pdf
index 072952e220..f47b606f33 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-22-de.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-22-de.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-22-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-22-en.pdf
index 1926717703..30f4d55d5f 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-22-en.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-22-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-23-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-23-de.pdf
index 9bda41d035..89c53da25c 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-23-de.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-23-de.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/letter-example-23-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-23-en.pdf
index 27a27eed8b..336ee89b06 100644
--- a/macros/latex/contrib/koma-script/doc/letter-example-23-en.pdf
+++ b/macros/latex/contrib/koma-script/doc/letter-example-23-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/scrbookreportarticle-de.tex b/macros/latex/contrib/koma-script/doc/scrbookreportarticle-de.tex
index 7054166a7e..276d201a38 100644
--- a/macros/latex/contrib/koma-script/doc/scrbookreportarticle-de.tex
+++ b/macros/latex/contrib/koma-script/doc/scrbookreportarticle-de.tex
@@ -1,6 +1,6 @@
% ======================================================================
% scrbookreportarticle-de.tex
-% Copyright (c) Markus Kohm, 2001-2022
+% Copyright (c) Markus Kohm, 2001-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -24,7 +24,7 @@
% ============================================================================
\KOMAProvidesFile{scrbookreportarticle-de.tex}
- [$Date: 2022-07-17 12:37:12 +0200 (So, 17. Jul 2022) $
+ [$Date: 2023-04-20 10:04:17 +0200 (Do, 20. Apr 2023) $
KOMA-Script guide (chapter: scrbook, scrreprt, scrartcl)]
\chapter{Die Hauptklassen \Class{scrbook}, \Class{scrreprt}, \Class{scrartcl}}
@@ -2148,7 +2148,10 @@ Teile-Überschrift wird zusätzlich das Element \FontElement{partnumber}
verwendet, für die optionale Präfixzeile der Kapitelüberschriften das Element
\FontElement{chapterprefix}. Die Schriftart für das Element
\FontElement{disposition} ist als
-\Macro{normalcolor}""\Macro{sffamily}""\Macro{bfseries} vordefiniert. Die
+\ChangedAt{v3.39}{\Class{scrbook}\and \Class{scrartcl}\and \Class{scrreprt}}%
+\Macro{normalcolor}""%
+\DescRef{\LabelBase.cmd.maybesffamily}\IndexCmd{maybesffamily}""%
+\Macro{bfseries} vordefiniert. Die
Voreinstellungen für die spezifischen Elemente sind mit einer Schriftgröße
vorbelegt und daher von den Einstellungen \PValue{big}, \PValue{normal} und
\PValue{small} für die Option
@@ -2229,7 +2232,7 @@ vorbelegt und daher von den Einstellungen \PValue{big}, \PValue{normal} und
für Abhilfe sorgen:%
\fi
\begin{lstcode}
- \setkomafont{disposition}{\normalcolor\sffamily}
+ \setkomafont{disposition}{\normalcolor\maybesffamily}
\part{\appendixname}
\addtokomafont{disposition}{\bfseries}
\end{lstcode}
@@ -2239,17 +2242,18 @@ vorbelegt und daher von den Einstellungen \PValue{big}, \PValue{normal} und
\Macro{part}-Überschriften eine entsprechende Änderung vorzunehmen.
Das ist wahlweise mit:
\begin{lstcode}
- \addtokomafont{part}{\normalfont\sffamily}
- \addtokomafont{partnumber}{\normalfont\sffamily}
+ \addtokomafont{part}{\normalfont\maybesffamily}
+ \addtokomafont{partnumber}{\normalfont\maybesffamily}
\end{lstcode}
oder einfach mit:
\begin{lstcode}
\addtokomafont{part}{\mdseries}
\addtokomafont{partnumber}{\mdseries}
\end{lstcode}
- möglich. Die Verwendung von \DescRef{\LabelBase.cmd.setkomafont} wäre zwar grundsätzlich
- möglich, müsste aber auch die Auswahl der Schriftgröße enthalten und würde
- damit die Größenänderung über die Option \DescRef{\LabelBase.option.headings} verhindern.
+ möglich. Die Verwendung von \DescRef{\LabelBase.cmd.setkomafont} wäre zwar
+ grundsätzlich möglich, müsste aber auch die Auswahl der Schriftgröße
+ enthalten und würde damit die Größenänderung über die Option
+ \DescRef{\LabelBase.option.headings} verhindern.
Die zweite Version mit \Macro{mdseries} ist vorzuziehen, da diese auch dann
noch zum gewünschten Ergebnis führt, wenn Sie später das Element
@@ -5150,3 +5154,4 @@ zuständig.%
% LocalWords: Nummerierungsstil Eingangskommentar Nummerierungsstils
% LocalWords: Standardanweisung Einstellmöglichkeiten Umbruchkorrekturtext
% LocalWords: Inhaltsverzeichniseintrag Formatierungsänderungen Präfixzeile
+% LocalWords: voreinzustellen
diff --git a/macros/latex/contrib/koma-script/doc/scrbookreportarticle-en.tex b/macros/latex/contrib/koma-script/doc/scrbookreportarticle-en.tex
index 9994aa9738..5bff239c30 100644
--- a/macros/latex/contrib/koma-script/doc/scrbookreportarticle-en.tex
+++ b/macros/latex/contrib/koma-script/doc/scrbookreportarticle-en.tex
@@ -24,7 +24,7 @@
% ============================================================================
\KOMAProvidesFile{scrbookreportarticle-en.tex}
- [$Date: 2023-04-06 09:05:58 +0200 (Do, 06. Apr 2023) $
+ [$Date: 2023-04-20 10:04:17 +0200 (Do, 20. Apr 2023) $
KOMA-Script guide (chapter: scrbook, scrreprt, scrartcl)]
\translator{Jens-Uwe Morawski\and Gernot Hassenpflug\and Markus Kohm\and
@@ -1975,7 +1975,10 @@ first, followed by the specific element\important{%
\FontElement{partnumber}, for the number of the part heading, and
\FontElement{chapterprefix}, for the optional prefix line of chapter headings.
The initial definition for the \FontElement{disposition} element is
-\Macro{normalcolor}\linebreak[2]\Macro{sffamily}\linebreak[2]\Macro{bfseries}.
+\ChangedAt{v3.39}{\Class{scrbook}\and \Class{scrartcl}\and \Class{scrreprt}}%
+\Macro{normalcolor}\linebreak[2]%
+\DescRef{\LabelBase.cmd.maybesffamily}\IndexCmd{maybysffamily}\linebreak[2]%
+\Macro{bfseries}.
The default font sizes for the specific elements depends on the options
\OptionValueRef{\LabelBase}{headings}{big},
\OptionValueRef{\LabelBase}{headings}{normal}, and
@@ -2053,7 +2056,7 @@ The default font sizes for the specific elements depends on the options
and notice that the very large headings of the document parts are too bold.
You could change this as follows:
\begin{lstcode}
- \setkomafont{disposition}{\normalcolor\sffamily}
+ \setkomafont{disposition}{\normalcolor\maybesffamily}
\part{Appendices}
\addtokomafont{disposition}{\bfseries}
\end{lstcode}
@@ -2062,8 +2065,8 @@ Using the command above you only switch off the font attribute
and elegant solution is to change all \Macro{part} headings at once.
This is done either by:
\begin{lstcode}
- \addtokomafont{part}{\normalfont\sffamily}
- \addtokomafont{partnumber}{\normalfont\sffamily}
+ \addtokomafont{part}{\normalfont\maybesffamily}
+ \addtokomafont{partnumber}{\normalfont\maybesffamily}
\end{lstcode}
or simply:
\begin{lstcode}
diff --git a/macros/latex/contrib/koma-script/doc/scrguide-de.pdf b/macros/latex/contrib/koma-script/doc/scrguide-de.pdf
index db536b8340..7ecb7978c8 100644
--- a/macros/latex/contrib/koma-script/doc/scrguide-de.pdf
+++ b/macros/latex/contrib/koma-script/doc/scrguide-de.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/scrguide-en.pdf b/macros/latex/contrib/koma-script/doc/scrguide-en.pdf
index 78a67052de..3bcd49b7ab 100644
--- a/macros/latex/contrib/koma-script/doc/scrguide-en.pdf
+++ b/macros/latex/contrib/koma-script/doc/scrguide-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/scrjura-example-de.pdf b/macros/latex/contrib/koma-script/doc/scrjura-example-de.pdf
index 1fa785aa8f..37237fef5c 100644
--- a/macros/latex/contrib/koma-script/doc/scrjura-example-de.pdf
+++ b/macros/latex/contrib/koma-script/doc/scrjura-example-de.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/scrjura-example-en.pdf b/macros/latex/contrib/koma-script/doc/scrjura-example-en.pdf
index 67ce42a47b..341f44e9d8 100644
--- a/macros/latex/contrib/koma-script/doc/scrjura-example-en.pdf
+++ b/macros/latex/contrib/koma-script/doc/scrjura-example-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-de.pdf b/macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-de.pdf
index 91280bf2b8..a800e99fda 100644
--- a/macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-de.pdf
+++ b/macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-de.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-en.pdf b/macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-en.pdf
index 89fd3d7413..3039687b56 100644
--- a/macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-en.pdf
+++ b/macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/koma-script/doc/scrlttr2-de.tex b/macros/latex/contrib/koma-script/doc/scrlttr2-de.tex
index 0f701ada8c..5ab46d4813 100644
--- a/macros/latex/contrib/koma-script/doc/scrlttr2-de.tex
+++ b/macros/latex/contrib/koma-script/doc/scrlttr2-de.tex
@@ -1,6 +1,6 @@
% ======================================================================
% scrlttr2-de.tex
-% Copyright (c) Markus Kohm, 2002-2022
+% Copyright (c) Markus Kohm, 2002-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -24,7 +24,7 @@
% ============================================================================
\KOMAProvidesFile{scrlttr2-de.tex}%
- [$Date: 2022-10-12 08:12:27 +0200 (Mi, 12. Okt 2022) $
+ [$Date: 2023-04-20 10:04:17 +0200 (Do, 20. Apr 2023) $
KOMA-Script guide (chapter: scrlttr2)]
\chapter{Briefe mit Klasse \Class{scrlttr2} oder Paket \Package{scrletter}}
@@ -2487,7 +2487,9 @@ der Variablen \Variable{backaddress} wird von \KOMAScript{} nicht genutzt.
\LabelFontElement{backaddress}%
Die Schriftart der Rücksendeadresse ist über das Element
\FontElement{backaddress}\important{\FontElement{backaddress}}
-konfigurierbar. Voreingestellt ist hierbei \Macro{sffamily} (siehe
+konfigurierbar. Voreingestellt ist hierbei
+\ChangedAt{v3.39}{\Class{scrlttr2}}%
+\DescRef{\LabelBase.cmd.maybesffamily}\IndexCmd{maybesffamily} (siehe
\autoref{tab:\LabelBase.AddresseeElements}). Vor der Anwendung der
konfigurierten Schriftumschaltung wird noch \Macro{scriptsize} ausgeführt.%
\EndIndexGroup
@@ -2519,8 +2521,9 @@ verfügbaren Platz gesetzt.
\midrule
\DescRef{\LabelBase.fontelement.addressee}\IndexFontElement{addressee} &
\\
+ \ChangedAt{v3.39}{\Class{scrlttr2}}%
\DescRef{\LabelBase.fontelement.backaddress}\IndexFontElement{backaddress} &
- \Macro{sffamily}%
+ \DescRef{\LabelBase.cmd.maybesffamily}\IndexCmd{maybesffamily}%
\\
\DescRef{\LabelBase.fontelement.PPdata}\IndexFontElement{PPdata} &
\Macro{sffamily}%
@@ -3213,7 +3216,10 @@ verwendet. Die Voreinstellungen der \iffree{beiden }{}Elemente sind
\toprule
Element & Voreinstellung \\
\midrule
- \FontElement{refname} & \Macro{sffamily}\Macro{scriptsize} \\
+ \ChangedAt{v3.39}{\Class{scrlttr2}}%
+ \FontElement{refname}
+ & \DescRef{\LabelBase.cmd.maybesffamily}\IndexCmd{maybesffamily}%
+ \Macro{scriptsize} \\
\FontElement{refvalue} & \\
\bottomrule
\end{tabular}
@@ -3425,7 +3431,9 @@ Die Schriftart für das Element\ChangedAt{v3.17}{\Class{scrlttr2}\and
Größenangaben erlaubt. Die Größe \Macro{LARGE} wird der Schriftauswahl
innerhalb von \KOMAScript{} immer vorangestellt und ist daher auch nicht
Teil\textnote{Voreinstellung} der Voreinstellung
-\Macro{normalcolor}\Macro{sffamily}\Macro{bfseries}. Bei
+\ChangedAt{v3.39}{\Class{scrlttr2}}\Macro{normalcolor}""%
+\DescRef{\LabelBase.cmd.maybesffamily}\IndexCmd{maybesffamily}""%
+\Macro{bfseries}. Bei
\Class{scrlttr2}\OnlyAt{\Class{scrlttr2}} kann als Alias für
\FontElement{lettertitle} auch
\FontElement{title}\important{\FontElement{title}} verwendet werden. Bei
diff --git a/macros/latex/contrib/koma-script/doc/scrlttr2-en.tex b/macros/latex/contrib/koma-script/doc/scrlttr2-en.tex
index 6aa27c2c59..8af84810a4 100644
--- a/macros/latex/contrib/koma-script/doc/scrlttr2-en.tex
+++ b/macros/latex/contrib/koma-script/doc/scrlttr2-en.tex
@@ -24,7 +24,7 @@
% ============================================================================
\KOMAProvidesFile{scrlttr2-en.tex}%
- [$Date: 2023-03-20 09:42:36 +0100 (Mo, 20. Mär 2023) $
+ [$Date: 2023-04-20 10:04:17 +0200 (Do, 20. Apr 2023) $
KOMA-Script guide (chapter: scrlttr2)]
\translator{Harald Bongartz\and Georg Grandke\and Raimund Kohl\and Jens-Uwe
@@ -2198,9 +2198,10 @@ variable. The default separator is a comma followed by a non-breaking space.
\LabelFontElement{backaddress}%
You can configure the font style of the return address via the
\FontElement{backaddress}\important{\FontElement{backaddress}} element. The
-default is \Macro{sffamily} (see \autoref{tab:\LabelBase.AddresseeElements}).
-Before applying the element's font style \KOMAScript{} switches to
-\Macro{scriptsize}.%
+default is \ChangedAt{v3.39}{\Class{scrlttr2}}%
+\DescRef{\LabelBase.cmd.maybesffamily}\IndexCmd{maybesffamily} (see
+\autoref{tab:\LabelBase.AddresseeElements}). Before applying the element's
+font style \KOMAScript{} switches to \Macro{scriptsize}.%
\EndIndexGroup
The default \OptionValue{addrfield}{true}, centres the address vertically
@@ -2225,8 +2226,9 @@ but place it flush with the top of the available space.%
\midrule
\DescRef{\LabelBase.fontelement.addressee}\IndexFontElement{addressee} &
\\
+ \ChangedAt{v3.39}{\Class{scrlttr2}}%
\DescRef{\LabelBase.fontelement.backaddress}\IndexFontElement{backaddress} &
- \Macro{sffamily}%
+ \DescRef{\LabelBase.cmd.maybesffamily}\IndexCmd{maybesffamily}%
\\
\DescRef{\LabelBase.fontelement.PPdata}\IndexFontElement{PPdata} &
\Macro{sffamily}%
@@ -2836,7 +2838,10 @@ listed in \autoref{tab:\LabelBase.refnamerefvalue}.%
\toprule
element & default configuration \\
\midrule
- \DescRef{\LabelBase.fontelement.refname} & \Macro{sffamily}\Macro{scriptsize} \\
+ \ChangedAt{v3.39}{\Class{scrlttr2}}%
+ \DescRef{\LabelBase.fontelement.refname}
+ & \DescRef{\LabelBase.cmd.maybesffamily}\IndexCmd{maybesffamily}%
+ \Macro{scriptsize} \\
\DescRef{\LabelBase.fontelement.refvalue} & \\
\bottomrule
\end{tabular}
@@ -3001,7 +3006,9 @@ the \DescRef{\LabelBase.cmd.setkomafont} and
\DescPageRef{\LabelBase.cmd.setkomafont}). Font size declarations are
allowed. The \Macro{LARGE} font size always precedes the font selection in
\KOMAScript{}, and is therefore not part of the default setting
-\Macro{normalcolor}\Macro{sffamily}\Macro{bfseries}. With \Class{scrlttr2},
+\ChangedAt{v3.39}{\Class{scrlttr2}}\Macro{normalcolor}\linebreak[2]%
+\DescRef{\LabelBase.cmd.maybesffamily}\IndexCmd{maybesffamily}\linebreak[2]%
+\Macro{bfseries}. With \Class{scrlttr2},
you can also use \FontElement{title}\important{\FontElement{title}} as an
alias for \FontElement{lettertitle}. This is not possible when using
\Package{scrletter} with a \KOMAScript{} class because these classes already
diff --git a/macros/latex/contrib/koma-script/doc/scrlttr2-examples.dtx b/macros/latex/contrib/koma-script/doc/scrlttr2-examples.dtx
index c56aa1bcca..0fe87d8574 100644
--- a/macros/latex/contrib/koma-script/doc/scrlttr2-examples.dtx
+++ b/macros/latex/contrib/koma-script/doc/scrlttr2-examples.dtx
@@ -1,7 +1,7 @@
% \iffalse
% ======================================================================
% scrlttr2-examples.dtx
-% Copyright (c) Markus Kohm, 2008-2022
+% Copyright (c) Markus Kohm, 2008-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -227,7 +227,7 @@
}%
}
%</label>
-%<0|1|2|3|4|5>\documentclass[version=last]{scrlttr2}
+%<0|1|2|3|4|5|23|label>\documentclass[version=last]{scrlttr2}
%<6>\documentclass[version=last,fontsize=14pt]{scrlttr2}
%<!0&!1&!2&!3&!4&!5&!6&!23&!label&!nipponA&!nipponB>\documentclass[foldmarks=true,foldmarks=blmtP,
%<nipponA|nipponB>\documentclass[foldmarks=true,locfield=wide,
@@ -244,12 +244,12 @@
%<nipponA|nipponB> fromphone=false,fromemail=false,
%<21|22> subject=titled,
%<!0&!1&!2&!3&!4&!5&!6&!23&!label> version=last]{scrlttr2}
-%<23&ngerman>\documentclass[version=last,ich]{scrlttr2}
-%<23&english>\documentclass[version=last,me]{scrlttr2}
+%<23&ngerman>\LoadLetterOption{ich}
+%<23&english>\LoadLetterOption{me}
%<nipponA>\LoadLetterOption{NipponLL}
%<nipponB>\LoadLetterOption{NipponEL}
-%<label&ngerman>\documentclass[version=last,ich,settleford600label]{scrlttr2}
-%<label&english>\documentclass[version=last,me,settleford600label]{scrlttr2}
+%<label&ngerman>\LoadLetterOptions{ich,settleford600label}
+%<label&english>\LoadLetterOptions{me,settleford600label}
%<ngerman>\usepackage[ngerman]{babel}
%<english>\usepackage[british]{babel}
%<16|17|18|19|20|21|22|23|label>\usepackage{graphics}
diff --git a/macros/latex/contrib/koma-script/japanlco.dtx b/macros/latex/contrib/koma-script/japanlco.dtx
index 03fd447e7a..8a79d4cdfc 100644
--- a/macros/latex/contrib/koma-script/japanlco.dtx
+++ b/macros/latex/contrib/koma-script/japanlco.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
% ======================================================================
% japanlco.dtx
-% Copyright (c) Markus Kohm, 2008-2022
+% Copyright (c) Markus Kohm, 2008-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: japanlco.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: japanlco.dtx 4032 2023-04-17 09:45:11Z kohm $
%<Ni&EARLY&LOW&head>%%% (run: Ni,EARLY,LOW,head)
%<Ni&EARLY&LOW&body>%%% (run: Ni,EARLY,LOW,body)
%<Ni&EARLY&HIGH&head>%%% (run: Ni,EARLY,HIGH,head)
@@ -35,9 +35,9 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2022-06-09 14:11:14 +0200 (Do, 09. Jun 2022) $
+ \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3889 $
+ \filerevision$Revision: 4032 $
\endgroup
\ProvidesFile{japanlco.dtx}[\filedate\space\filerevision\space
KOMA-Script (letter class options)]
@@ -101,6 +101,7 @@
% instead of \cs{@setplength} and \cs{@addtoplength}}
% \changes{v3.36}{2022/02/02}{self-extracting}
% \changes{v3.36}{2022/02/02}{extended documentation}
+% \changes{v3.40}{2023/04/17}{guide names changed}
%
% \GetFileInfo{japanlco.dtx}
% \title{\href{https://komascript.de}{\KOMAScript} \partname\
@@ -152,7 +153,8 @@
%
% \iftrue
% The following pages show images of example envelopes. For more information
-% see the English \file{scrguien.pdf} or the German \file{scrguide.pdf}.
+% see the English \file{scrguide-en.pdf} or the German
+% \file{scrguide-de.pdf}.
%
% \newcommand\japanenvelope[7]{%
% \begingroup
diff --git a/macros/latex/contrib/koma-script/koma-script-source-doc.dtx b/macros/latex/contrib/koma-script/koma-script-source-doc.dtx
index 2cad321e5d..6fd9804d8c 100644
--- a/macros/latex/contrib/koma-script/koma-script-source-doc.dtx
+++ b/macros/latex/contrib/koma-script/koma-script-source-doc.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
% ==========================================================================
% komascript-source.doc.dtx
-% Copyright (c) Markus Kohm, 2022
+% Copyright (c) Markus Kohm, 2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -224,9 +224,9 @@
% \cs{cls}|[https://koma-script.de]{koma-script-source-doc}|
% \textrightarrow{} \cls[https://koma-script.de]{koma-script-source-doc}\\
% \cs{pkg}|[]{scrlayer}| \textrightarrow{} \pkg[]{scrlayer} \\
-% \cs{href}|{http://mirrors.ctan.org/macros/latex/contrib/koma-script/doc/scrguien.pdf#cha:typearea}{\pkg*{typearea}}|
+% \cs{href}|{http://mirrors.ctan.org/macros/latex/contrib/koma-script/doc/scrguide-de.pdf#cha:typearea}{\pkg*{typearea}}|
% \textrightarrow{}
-% \href{http://mirrors.ctan.org/macros/latex/contrib/koma-script/doc/scrguien.pdf#chapter.2}{\pkg*{typearea}}
+% \href{http://mirrors.ctan.org/macros/latex/contrib/koma-script/doc/scrguide-en.pdf#chapter.2}{\pkg*{typearea}}
% \end{center}
%
% \MaybeStop{\PrintIndex}
diff --git a/macros/latex/contrib/koma-script/scraddr.dtx b/macros/latex/contrib/koma-script/scraddr.dtx
index 3a599a3e7e..78027dfaf3 100644
--- a/macros/latex/contrib/koma-script/scraddr.dtx
+++ b/macros/latex/contrib/koma-script/scraddr.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
% ======================================================================
% scraddr.dtx
-% Copyright (c) Markus Kohm, 2006-2022
+% Copyright (c) Markus Kohm, 2006-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scraddr.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scraddr.dtx 4032 2023-04-17 09:45:11Z kohm $
%<*dtx>
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\ProvidesFile{scraddr.dtx}
@@ -64,6 +64,7 @@
% \changes{v1.1d}{2022/01/24}{switched from \cls{scrdoc} to
% \cls{koma-script-source-doc}}
% \changes{v1.1d}{2022/01/24}{whole implementation documentation in English}
+% \changes{v3.40}{2023/04/17}{guide names changed}
%
% \GetFileInfo{scraddr.dtx}
% \title{Parsing Address Files \\
@@ -85,7 +86,8 @@
% \section{User Manual}
%
% You can find the user manual of \pkg*{scraddr} in the \KOMAScript{} manual,
-% either the German \file{scrguide} or the English \file{scrguien}.
+% either the German \file{scrguide-de.pdf} or the English
+% \file{scrguide-en.pdf}.
%
% \MaybeStop{\PrintIndex}
%
diff --git a/macros/latex/contrib/koma-script/scrextend.dtx b/macros/latex/contrib/koma-script/scrextend.dtx
index 0e4600090e..fa15f36a87 100644
--- a/macros/latex/contrib/koma-script/scrextend.dtx
+++ b/macros/latex/contrib/koma-script/scrextend.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
% ======================================================================
% scrextend.dtx
-% Copyright (c) Markus Kohm, 2002-2022
+% Copyright (c) Markus Kohm, 2002-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrextend.dtx 3985 2022-11-11 11:24:31Z kohm $
+%%% From File: $Id: scrextend.dtx 4032 2023-04-17 09:45:11Z kohm $
%<preidentify>%%% (run: preidentify)
%<prepare>%%% (run: prepare)
%<option>%%% (run: option)
@@ -26,9 +26,9 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2022-11-11 12:24:31 +0100 (Fr, 11. Nov 2022) $
+ \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3985 $
+ \filerevision$Revision: 4032 $
\endgroup
\ProvidesFile{scrextend.dtx}[\filedate\space\filerevision\space
KOMA-Script package source
@@ -46,6 +46,7 @@
% \changes{v3.36}{2022/01/31}{switched from \cls*{scrdoc} to
% \cls*{koma-script-source-doc}}
% \changes{v3.36}{2022/01/31}{whole implementation documentation in English}
+% \changes{v3.40}{2023/04/17}{guide names changed}
%
% \GetFileInfo{scrextend.dtx}
% \title{Extending Non-\href{https://komascript.de}{\KOMAScript} Classes by
@@ -66,7 +67,8 @@
% \section{User Manual}
%
% You can find the user manual of \pkg{scrextend} in the \KOMAScript{} manual,
-% either the German \file{scrguide} or the English \file{scrguien}.
+% either the German \file{scrguide-de.pdf} or the English
+% \file{scrguide-en.pdf}.
%
% \MaybeStop{\PrintIndex}
%
diff --git a/macros/latex/contrib/koma-script/scrhack.dtx b/macros/latex/contrib/koma-script/scrhack.dtx
index 3d4f0358a2..a8cb84e062 100644
--- a/macros/latex/contrib/koma-script/scrhack.dtx
+++ b/macros/latex/contrib/koma-script/scrhack.dtx
@@ -21,7 +21,7 @@
% To create `scrhack.sty' run `tex scrhack.dtx'. Using LaTeX instead
% of TeX would generate the implementation documentation.
% ======================================================================
-%%% From File: $Id: scrhack.dtx 4015 2023-03-15 16:09:39Z kohm $
+%%% From File: $Id: scrhack.dtx 4032 2023-04-17 09:45:11Z kohm $
%<package&identify>%%% using: package,identify
%<package&option>%%% using: package,option
%<package&body>%%% using: package,body
@@ -30,9 +30,9 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2023-03-15 17:09:39 +0100 (Mi, 15. Mär 2023) $
+ \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 4015 $
+ \filerevision$Revision: 4032 $
\endgroup
\ProvidesFile{scrhack.dtx}[\filedate\space\filerevision\space
%</dtx>
@@ -143,6 +143,7 @@
% \changes{v3.36}{2022/02/08}{require package \pkg*{scrlogo} instead of
% defining \cs{KOMAScript}}
% \changes{v3.36}{2022/02/08}{whole implementation documentation in English}
+% \changes{v3.40}{2023/04/17}{guide names changed}
%
% \GetFileInfo{scrhack.dtx}
% \title{Patching Third-Party Packages using
@@ -166,7 +167,8 @@
% \section{User Manual}
%
% You can find the user manuals of \pkg*{scrhack} in the \KOMAScript{} manual,
-% either the German \file{scrguide} or the English \file{scrguien}.
+% either the German \file{scrguide-de.pdf} or the English
+% \file{scrguide-en.pdf}.
%
% \MaybeStop{\PrintIndex}
%
diff --git a/macros/latex/contrib/koma-script/scrjura.dtx b/macros/latex/contrib/koma-script/scrjura.dtx
index b94ccbcf3b..a7c05c5427 100644
--- a/macros/latex/contrib/koma-script/scrjura.dtx
+++ b/macros/latex/contrib/koma-script/scrjura.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
% ======================================================================
% scrjura.dtx
-% Copyright (c) Markus Kohm, 2007-2022
+% Copyright (c) Markus Kohm, 2007-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
%
% The KOMA-Script bundle consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrjura.dtx 3991 2022-11-16 07:13:45Z kohm $
+%%% From File: $Id: scrjura.dtx 4032 2023-04-17 09:45:11Z kohm $
%<identify>%%% (run: identify)
%<init>%%% (run: init)
%<options>%%% (run: options)
@@ -28,9 +28,9 @@
%<*dtx>
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2022-11-16 08:13:45 +0100 (Mi, 16. Nov 2022) $
+ \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3991 $
+ \filerevision$Revision: 4032 $
\endgroup
\expandafter\ifx\csname ProvidesFile\endcsname\relax
\def\ProvidesFile#1[#2]{}
@@ -92,6 +92,7 @@
%
% \changes{v3.36}{2022/01/25}{switch over from \cls*{scrdoc} to
% \cls*{koma-script-source-doc}}
+% \changes{v3.40}{2023/04/17}{guide names changed}
%
% \GetFileInfo{scrjura.dtx}
% \title{\KOMAScript{} in the Law Office\\
@@ -112,7 +113,8 @@
% \section{User Manual}
%
% You can find the user manual of \pkg*{scrjura} in the \KOMAScript{} manual,
-% either the German \file{scrguide} or the English \file{scrguien}.
+% either the German \file{scrguide-de.pdf} or the English
+% \file{scrguide-en.pdf}.
%
% \MaybeStop{\PrintIndex}
%
diff --git a/macros/latex/contrib/koma-script/scrkernel-addressfiles.dtx b/macros/latex/contrib/koma-script/scrkernel-addressfiles.dtx
index c04f5ba2fb..eb9a2f4fcf 100644
--- a/macros/latex/contrib/koma-script/scrkernel-addressfiles.dtx
+++ b/macros/latex/contrib/koma-script/scrkernel-addressfiles.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
% ======================================================================
% scrkernel-addressfiles.dtx
-% Copyright (c) Markus Kohm, 2006-2022
+% Copyright (c) Markus Kohm, 2006-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,16 +18,16 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-addressfiles.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-addressfiles.dtx 4032 2023-04-17 09:45:11Z kohm $
%<option>%%% (run: option)
%<body>%%% (run: body)
%<*dtx>
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2022-06-05 12:38:02 +0200 (So, 05. Jun 2022) $
+ \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3874 $
+ \filerevision$Revision: 4032 $
\edef\reserved@a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-addressfiles.dtx}%
@@ -49,6 +49,7 @@
% \changes{v3.36}{2022/02/11}{switch over from \cls*{scrdoc} to
% \cls*{koma-script-source-doc}}
% \changes{v3.36}{2022/02/11}{whole implementation documentation in English}
+% \changes{v3.40}{2023/04/17}{guide names changed}
%
% \GetFileInfo{scrkernel-addressfiles.dtx}
% \title{Circular Letters and Address Files as Part of
@@ -67,8 +68,8 @@
% \section{User Manual}
%
% You can find the user documentation of the commands implemented here in the
-% \KOMAScript{} manual, either the German \file{scrguide} or the English
-% \file{scrguien}.
+% \KOMAScript{} manual, either the German \file{scrguide-de.pdf} or the English
+% \file{scrguide-en.pdf}.
%
% \MaybeStop{\PrintIndex}
%
diff --git a/macros/latex/contrib/koma-script/scrkernel-basics.dtx b/macros/latex/contrib/koma-script/scrkernel-basics.dtx
index a498e28eee..3b205f7ff1 100644
--- a/macros/latex/contrib/koma-script/scrkernel-basics.dtx
+++ b/macros/latex/contrib/koma-script/scrkernel-basics.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
% ======================================================================
% scrkernel-basics.dtx
-% Copyright (c) Markus Kohm, 2002-2022
+% Copyright (c) Markus Kohm, 2002-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-basics.dtx 4004 2022-11-16 10:43:42Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 4032 2023-04-17 09:45:11Z kohm $
%<prepare>%%% (run: prepare)
%<option>%%% (run: option)
%<body>%%% (run: body)
@@ -28,9 +28,9 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\def\filedate{#2/#3/#4}}
- \filedate$Date: 2022-11-16 11:43:42 +0100 (Mi, 16. Nov 2022) $
+ \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $
\def\filerevision$#1: #2 ${\def\filerevision{r#2}}
- \filerevision$Revision: 4004 $
+ \filerevision$Revision: 4032 $
\edef\reserved@a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-basics.dtx}%
@@ -92,6 +92,7 @@
% \changes{v3.36}{2022/02/16}{switch over from \cls*{scrdoc} to
% \cls*{koma-script-source-doc}}
% \changes{v3.36}{2022/02/21}{whole implementation documentation in English}
+% \changes{v3.40}{2023/04/17}{guide names changed}
%
% \GetFileInfo{scrkernel-basics.dtx}
% \title{Basic Funktionality Used by Almost all
@@ -121,10 +122,11 @@
%
% You can find the user documentation of package \pkg*{scrbase} and the
% commands implemented in \file{scrkernel-basics.dtx} in the \KOMAScript{}
-% manual, either the German \file{scrguide} or the English \file{scrguien}.
+% manual, either the German \file{scrguide-de.pdf} or the English
+% \file{scrguide-en.pdf}.
%
%
-% \subsection{Functions not yet in the Manual}
+% \subsection{Features not yet in the user manuals}
%
% Some user commands are not documented in the \KOMAScript{} manuals, e.g.,
% because they are not stable enough to be used by average users or more or
diff --git a/macros/latex/contrib/koma-script/scrkernel-bibliography.dtx b/macros/latex/contrib/koma-script/scrkernel-bibliography.dtx
index 4a63727af9..74cefca290 100644
--- a/macros/latex/contrib/koma-script/scrkernel-bibliography.dtx
+++ b/macros/latex/contrib/koma-script/scrkernel-bibliography.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
% ======================================================================
% scrkernel-bibliography.dtx
-% Copyright (c) Markus Kohm, 2002-2022
+% Copyright (c) Markus Kohm, 2002-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,16 +18,16 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-bibliography.dtx 3990 2022-11-16 07:11:05Z kohm $
+%%% From File: $Id: scrkernel-bibliography.dtx 4032 2023-04-17 09:45:11Z kohm $
%<option>%%% (run: option)
%<body>%%% (run: body)
%<*dtx>
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2022-11-16 08:11:05 +0100 (Mi, 16. Nov 2022) $
+ \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3990 $
+ \filerevision$Revision: 4032 $
\edef\reserved@a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-bibliography.dtx}%
@@ -50,6 +50,7 @@
% \changes{v3.36}{2022/02/21}{switch over from \cls*{scrdoc} to
% \cls*{koma-script-source-doc}}
% \changes{v3.36}{2022/02/21}{whole implementation documentation in English}
+% \changes{v3.40}{2023/04/17}{guide names changed}
%
% \GetFileInfo{scrkernel-bibliography.dtx}
% \title{Bibliography and References with
@@ -69,7 +70,7 @@
%
% You can find the user documentation of the commands implemented in
% \file{scrkernel-bibliography.dtx} in the \KOMAScript{} manual, either the
-% German \file{scrguide} or the English \file{scrguien}.
+% German \file{scrguide-de.pdf} or the English \file{scrguide-en.pdf}.
%
%
% \MaybeStop{\PrintIndex}
diff --git a/macros/latex/contrib/koma-script/scrkernel-compatibility.dtx b/macros/latex/contrib/koma-script/scrkernel-compatibility.dtx
index 877b41e17f..b3042ab133 100644
--- a/macros/latex/contrib/koma-script/scrkernel-compatibility.dtx
+++ b/macros/latex/contrib/koma-script/scrkernel-compatibility.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
% ======================================================================
% scrkernel-compatibility.dtx
-% Copyright (c) Markus Kohm, 2006-2022
+% Copyright (c) Markus Kohm, 2006-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-compatibility.dtx 3985 2022-11-11 11:24:31Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 4032 2023-04-17 09:45:11Z kohm $
%<identify>%%% (run: identify)
%<init>%%% (run: init)
%<option>%%% (run: option)
@@ -27,9 +27,9 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\def\filedate{#2/#3/#4}}
- \filedate$Date: 2022-11-11 12:24:31 +0100 (Fr, 11. Nov 2022) $
+ \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $
\def\filerevision$#1: #2 ${\def\filerevision{r#2}}
- \filerevision$Revision: 3985 $
+ \filerevision$Revision: 4032 $
\edef\reserved@a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-compatibility.dtx}%
@@ -52,6 +52,7 @@
% \changes{v3.36}{2022/02/21}{switch over from \cls*{scrdoc} to
% \cls*{koma-script-source-doc}}
% \changes{v3.36}{2022/02/21}{whole implementation documentation in English}
+% \changes{v3.40}{2023/04/17}{guide names changed}
%
% \GetFileInfo{scrkernel-compatibility.dtx}
% \title{Compatibility with prior Versions of
@@ -81,7 +82,7 @@
%
% You can find the user documentation of the commands implemented in
% \file{scrkernel-compatibility.dtx} in the \KOMAScript{} manual, either the
-% German \file{scrguide} or the English \file{scrguien}.
+% German \file{scrguide-de.pdf} or the English \file{scrguide-en.pdf}.
%
%
% \MaybeStop{\PrintIndex}
@@ -455,6 +456,8 @@
% \changes{v3.38}{2022/07/06}{added}
% \begin{macro}{\scr@v@3.39}
% \changes{v3.39}{2022/10/13}{added}
+% \begin{macro}{\scr@v@3.40}
+% \changes{v3.40}{2023/04/17}{added}
% \begin{macro}{\scr@v@last}
% \changes{v2.9u}{2005/03/05}{added}
% Nun die unterschiedlichen möglichen Werte (|\scr@v@last| ist jeweils die
@@ -543,6 +546,7 @@
\@namedef{scr@v@3.37}{20}
\@namedef{scr@v@3.38}{20}
\@namedef{scr@v@3.39}{20}
+\@namedef{scr@v@3.40}{20}
\@namedef{scr@v@last}{20}
% \end{macrocode}
% \end{macro}
@@ -630,6 +634,7 @@
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
% \end{option}
% \begin{macrocode}
%</init>
diff --git a/macros/latex/contrib/koma-script/scrkernel-floats.dtx b/macros/latex/contrib/koma-script/scrkernel-floats.dtx
index 3ffac19b8a..f7c1a126d6 100644
--- a/macros/latex/contrib/koma-script/scrkernel-floats.dtx
+++ b/macros/latex/contrib/koma-script/scrkernel-floats.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
% ======================================================================
% scrkernel-floats.dtx
-% Copyright (c) Markus Kohm, 2002-2022
+% Copyright (c) Markus Kohm, 2002-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,16 +18,16 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-floats.dtx 3992 2022-11-16 07:14:51Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 4032 2023-04-17 09:45:11Z kohm $
%<option>%%% (run: option)
%<body>%%% (run: body)
%<*dtx>
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2022-11-16 08:14:51 +0100 (Mi, 16. Nov 2022) $
+ \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3992 $
+ \filerevision$Revision: 4032 $
\edef\reserved@a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-floats.dtx}%
@@ -49,6 +49,7 @@
% \changes{v3.36}{2022/02/22}{switch over from \cls*{scrdoc} to
% \cls*{koma-script-source-doc}}
% \changes{v3.36}{2022/02/22}{implementation documentation in English}
+% \changes{v3.40}{2023/04/17}{guide names changed}
%
% \GetFileInfo{scrkernel-floats.dtx}
% \title{Code for the Foats of the
@@ -69,8 +70,15 @@
% \section{User Manual}
%
% You can find the user documentation the commands implemented here in the
-% \KOMAScript{} manual, either the German \file{scrguide} or the English
-% \file{scrguien}.
+% \KOMAScript{} manual, either the German \file{scrguide-de.pdf} or the English
+% \file{scrguide-en.pdf}.
+%
+% \subsection{Features not yet in the user manuals}
+%
+% \DescribeEnv{figure-,table-}
+% These are non floating versions of \env{figure} and \env{table} defined
+% using \cs{DeclareNewTOC}. See the description of this command in the
+% \KOMAScript{} manuals for more information.
%
%
% \MaybeStop{\PrintIndex}
diff --git a/macros/latex/contrib/koma-script/scrkernel-fonts.dtx b/macros/latex/contrib/koma-script/scrkernel-fonts.dtx
index ebbe889e2f..a990563f64 100644
--- a/macros/latex/contrib/koma-script/scrkernel-fonts.dtx
+++ b/macros/latex/contrib/koma-script/scrkernel-fonts.dtx
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-fonts.dtx 4021 2023-04-04 11:29:59Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 4034 2023-04-20 08:03:46Z kohm $
%<identify>%%% (run: identify)
%<option>%%% (run: option)
%<body>%%% (run: body)
@@ -29,9 +29,9 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2023-04-04 13:29:59 +0200 (Di, 04. Apr 2023) $
+ \filedate$Date: 2023-04-20 10:03:46 +0200 (Do, 20. Apr 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 4021 $
+ \filerevision$Revision: 4034 $
\edef\reserved@a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-fonts.dtx}%
@@ -63,6 +63,7 @@
% \changes{v3.36}{2022/02/22}{switch over from \cls*{scrdoc} to
% \cls*{koma-script-source-doc}}
% \changes{v3.36}{2022/02/22}{implementation documentation in English}
+% \changes{v3.40}{2023/04/17}{guide names changed}
%
% \GetFileInfo{scrkernel-fonts.dtx}
% \title{Code for the Foats of the
@@ -81,9 +82,9 @@
% \section{User Manual}
%
% You can find the user documentation the commands implemented here in the
-% \KOMAScript{} manual, either the German \file{scrguide} or the English
-% \file{scrguien}. The user documentation of alpha package \pkg*{scrfontsizes}
-% is still missing.
+% \KOMAScript{} manual, either the German \file{scrguide-de.pdf} or the
+% English \file{scrguide-en.pdf}. The user documentation of alpha package
+% \pkg*{scrfontsizes} is still missing.
%
%
% \MaybeStop{\PrintIndex}
@@ -1711,9 +1712,11 @@
% \changes{v3.39}{2023/04/04}{\cs{@gr@gsffamily} renamed to \cs{maybesffamily}}
% \changes{v3.39}{2023/04/04}{\cs{if@egregdoesnotlikesansseriftitles} replaced
% by \cs{if@sfdefaults}}
+% \changes{v3.40}{2023/04/20}{default to true}
% Used to switch on or off all the sans-serif defaults.
% \begin{macrocode}
%<*(class|extend)&option>
+\newif\if@sfdefaults\@sfdefaultstrue
\KOMA@ifkey{sfdefaults}{@sfdefaults}
\newcommand*{\maybesffamily}{\if@sfdefaults \sffamily \fi}
\newcommand*{\textmaybesf}{%
diff --git a/macros/latex/contrib/koma-script/scrkernel-footnotes.dtx b/macros/latex/contrib/koma-script/scrkernel-footnotes.dtx
index 41a36d2531..f38458b6d8 100644
--- a/macros/latex/contrib/koma-script/scrkernel-footnotes.dtx
+++ b/macros/latex/contrib/koma-script/scrkernel-footnotes.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
% ======================================================================
% scrkernel-footnotes.dtx
-% Copyright (c) Markus Kohm, 2002-2022
+% Copyright (c) Markus Kohm, 2002-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,16 +18,16 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-footnotes.dtx 3985 2022-11-11 11:24:31Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 4032 2023-04-17 09:45:11Z kohm $
%<option>%%% (run: option)
%<body>%%% (run: body)
%<*dtx>
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2022-11-11 12:24:31 +0100 (Fr, 11. Nov 2022) $
+ \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3985 $
+ \filerevision$Revision: 4032 $
\edef\reserved@a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-footnotes.dtx}%
@@ -49,6 +49,7 @@
% \changes{v3.36}{2022/02/16}{switch over from \cls*{scrdoc} to
% \cls*{koma-script-source-doc}}
% \changes{v3.36}{2022/02/16}{whole implementation documentation in English}
+% \changes{v3.40}{2023/04/17}{guide names changed}
%
% \GetFileInfo{scrkernel-footnotes.dtx}
% \title{Index Code of the
@@ -69,8 +70,8 @@
% \section{User Manual}
%
% You can find the user documentation the commands implemented here in the
-% \KOMAScript{} manual, either the German \file{scrguide} or the English
-% \file{scrguien}.
+% \KOMAScript{} manual, either the German \file{scrguide-de.pdf} or the
+% English \file{scrguide-en.pdf}.
%
% \MaybeStop{\PrintIndex}
%
diff --git a/macros/latex/contrib/koma-script/scrkernel-index.dtx b/macros/latex/contrib/koma-script/scrkernel-index.dtx
index 7216042469..9e298cbb63 100644
--- a/macros/latex/contrib/koma-script/scrkernel-index.dtx
+++ b/macros/latex/contrib/koma-script/scrkernel-index.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
% ======================================================================
% scrkernel-index.dtx
-% Copyright (c) Markus Kohm, 2002-2022
+% Copyright (c) Markus Kohm, 2002-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,16 +18,16 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-index.dtx 3993 2022-11-16 07:17:09Z kohm $
+%%% From File: $Id: scrkernel-index.dtx 4032 2023-04-17 09:45:11Z kohm $
%<option>%%% (run: option)
%<body>%%% (run: body)
%<*dtx>
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2022-11-16 08:17:09 +0100 (Mi, 16. Nov 2022) $
+ \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3993 $
+ \filerevision$Revision: 4032 $
\edef\reserved@a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-index.dtx}%
@@ -49,6 +49,7 @@
% \changes{v3.36}{2022/02/15}{switch over from \cls*{scrdoc} to
% \cls*{koma-script-source-doc}}
% \changes{v3.36}{2022/02/15}{whole implementation documentation in English}
+% \changes{v3.40}{2023/04/17}{guide names changed}
%
% \GetFileInfo{scrkernel-index.dtx}
% \title{Index Code of the
@@ -66,8 +67,8 @@
% \section{User Manual}
%
% You can find the user documentation the commands implemented here in the
-% \KOMAScript{} manual, either the German \file{scrguide} or the English
-% \file{scrguien}.
+% \KOMAScript{} manual, either the German \file{scrguide-de.pdf} or the
+% English \file{scrguide-en.pdf}.
%
% \MaybeStop{\PrintIndex}
%
diff --git a/macros/latex/contrib/koma-script/scrkernel-language.dtx b/macros/latex/contrib/koma-script/scrkernel-language.dtx
index 76ff58d7fb..75060afa91 100644
--- a/macros/latex/contrib/koma-script/scrkernel-language.dtx
+++ b/macros/latex/contrib/koma-script/scrkernel-language.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
% ======================================================================
% scrkernel-language.dtx
-% Copyright (c) Markus Kohm, 2002-2022
+% Copyright (c) Markus Kohm, 2002-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,16 +18,16 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-language.dtx 3994 2022-11-16 07:18:05Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 4032 2023-04-17 09:45:11Z kohm $
%<option>%%% (run: option)
%<body>%%% (run: body)
%<*dtx>
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2022-11-16 08:18:05 +0100 (Mi, 16. Nov 2022) $
+ \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3994 $
+ \filerevision$Revision: 4032 $
\edef\reserved@a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-language.dtx}
@@ -48,6 +48,7 @@
% \changes{v3.36}{2022/02/25}{switch over from \cls*{scrdoc} to
% \cls*{koma-script-source-doc}}
% \changes{v3.36}{2022/02/25}{whole implementation documentation in English}
+% \changes{v3.40}{2023/04/17}{guide names changed}
%
% \GetFileInfo{scrkernel-language.dtx}
% \title{Easy Changing of Language-Depending Terms with
@@ -66,8 +67,8 @@
% \section{User Manual}
%
% You can find the user documentation the commands implemented here in the
-% \KOMAScript{} manual, either the German \file{scrguide} or the English
-% \file{scrguien}.
+% \KOMAScript{} manual, either the German \file{scrguide-de.pdf} or the
+% English \file{scrguide-en.pdf}.
%
% \MaybeStop{\PrintIndex}
%
diff --git a/macros/latex/contrib/koma-script/scrkernel-letterclassoptions.dtx b/macros/latex/contrib/koma-script/scrkernel-letterclassoptions.dtx
index 7ad80a3a64..db6fe71cbe 100644
--- a/macros/latex/contrib/koma-script/scrkernel-letterclassoptions.dtx
+++ b/macros/latex/contrib/koma-script/scrkernel-letterclassoptions.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
% ======================================================================
% scrkernel-letterclassoptions.dtx
-% Copyright (c) Markus Kohm, 2006-2022
+% Copyright (c) Markus Kohm, 2006-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 4032 2023-04-17 09:45:11Z kohm $
%<option>%%% (run: option)
%<head>%%% (run: head)
%<body>%%% (run: body)
@@ -26,9 +26,9 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2022-11-09 11:07:16 +0100 (Mi, 09. Nov 2022) $
+ \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3981 $
+ \filerevision$Revision: 4032 $
\endgroup
\ProvidesFile{scrkernel-letterclassoptions.dtx}
[\filedate\space \filerevision\space
@@ -49,6 +49,7 @@
% \changes{v3.36}{2022/02/26}{\cs{@addtoplength} replaced by \cs{addtoplength}}
% \changes{v3.36}{2022/02/26}{\cs{@newplength} replaced by \cs{newplength}}
% \changes{v3.36}{2022/02/26}{whole implementation documentation in English}
+% \changes{v3.40}{2023/04/17}{guide names changed}
%
%
% \GetFileInfo{scrkernel-letterclassoptions.dtx}
@@ -70,8 +71,8 @@
% \section{User Manual}
%
% You can find the user documentation the commands and files implemented here
-% in the \KOMAScript{} manual, either the German \file{scrguide} or the
-% English \file{scrguien}.
+% in the \KOMAScript{} manual, either the German \file{scrguide-de.pdf} or the
+% English \file{scrguide-en.pdf}.
%
% \MaybeStop{\PrintIndex}
%
diff --git a/macros/latex/contrib/koma-script/scrkernel-listsandtabulars.dtx b/macros/latex/contrib/koma-script/scrkernel-listsandtabulars.dtx
index dea9ef8e49..93427fcc7e 100644
--- a/macros/latex/contrib/koma-script/scrkernel-listsandtabulars.dtx
+++ b/macros/latex/contrib/koma-script/scrkernel-listsandtabulars.dtx
@@ -18,16 +18,16 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 4021 2023-04-04 11:29:59Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 4032 2023-04-17 09:45:11Z kohm $
%<option>%%% (run: option)
%<body>%%% (run: body)
%<*dtx>
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2023-04-04 13:29:59 +0200 (Di, 04. Apr 2023) $
+ \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 4021 $
+ \filerevision$Revision: 4032 $
\edef\reserved@a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-listsandtabulars.dtx}%
@@ -50,6 +50,7 @@
% \changes{v3.36}{2022/02/15}{switch over from \cls*{scrdoc} to
% \cls*{koma-script-source-doc}}
% \changes{v3.36}{2022/02/15}{whole implementation documentation in English}
+% \changes{v3.40}{2023/04/17}{guide names changed}
%
% \GetFileInfo{scrkernel-listsandtabulars.dtx}
% \title{Code of Lists, Tabulars and Similar Objects of the
@@ -69,8 +70,8 @@
% \section{User Manual}
%
% You can find the user documentation the commands implemented here in the
-% \KOMAScript{} manual, either the German \file{scrguide} or the English
-% \file{scrguien}.
+% \KOMAScript{} manual, either the German \file{scrguide-de.pdf} or the
+% English \file{scrguide-en.pdf}.
%
% \MaybeStop{\PrintIndex}
%
diff --git a/macros/latex/contrib/koma-script/scrkernel-listsof.dtx b/macros/latex/contrib/koma-script/scrkernel-listsof.dtx
index b6d7f2f432..9c8b7d2171 100644
--- a/macros/latex/contrib/koma-script/scrkernel-listsof.dtx
+++ b/macros/latex/contrib/koma-script/scrkernel-listsof.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
% ======================================================================
% scrkernel-listsof.dtx
-% Copyright (c) Markus Kohm, 2002-2022
+% Copyright (c) Markus Kohm, 2002-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-listsof.dtx 3995 2022-11-16 07:20:20Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 4032 2023-04-17 09:45:11Z kohm $
%<prepare>%%% (run: prepare)
%<option>%%% (run: option)
%<body>%%% (run: body)
@@ -26,9 +26,9 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2022-11-16 08:20:20 +0100 (Mi, 16. Nov 2022) $
+ \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3995 $
+ \filerevision$Revision: 4032 $
\edef\reserved@a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-listsof.dtx}%
@@ -51,6 +51,7 @@
% \changes{v3.36}{2022/02/28}{switch over from \cls*{scrdoc} to
% \cls*{koma-script-source-doc}}
% \changes{v3.36}{2022/02/28}{whole implementation documentation in English}
+% \changes{v3.40}{2023/04/17}{guide names changed}
%
% \GetFileInfo{scrkernel-listsof.dtx}
% \title{Table of Contents, List of Figures, and List of Tables Within
@@ -71,8 +72,8 @@
% \section{User Manual}
%
% You can find the user documentation the commands implemented here in the
-% \KOMAScript{} manual, either the German \file{scrguide} or the English
-% \file{scrguien}.
+% \KOMAScript{} manual, either the German \file{scrguide-de.pdf} or the
+% English \file{scrguide-en.pdf}.
%
% \MaybeStop{\PrintIndex}
%
diff --git a/macros/latex/contrib/koma-script/scrkernel-miscellaneous.dtx b/macros/latex/contrib/koma-script/scrkernel-miscellaneous.dtx
index 4cee33e13c..aa68d0175f 100644
--- a/macros/latex/contrib/koma-script/scrkernel-miscellaneous.dtx
+++ b/macros/latex/contrib/koma-script/scrkernel-miscellaneous.dtx
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-miscellaneous.dtx 4021 2023-04-04 11:29:59Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 4032 2023-04-17 09:45:11Z kohm $
%<init>%%% (run: init)
%<option>%%% (run: option)
%<execoption>%%% (run: execoption)
@@ -27,9 +27,9 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2023-04-04 13:29:59 +0200 (Di, 04. Apr 2023) $
+ \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 4021 $
+ \filerevision$Revision: 4032 $
\edef\reserved@a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-miscellaneous.dtx}%
@@ -51,6 +51,7 @@
% \changes{v3.36}{2022/03/01}{switch over from \cls*{scrdoc} to
% \cls*{koma-script-source-doc}}
% \changes{v3.36}{2022/03/01}{whole implementation documentation in English}
+% \changes{v3.40}{2023/04/17}{guide names changed}
%
% \GetFileInfo{scrkernel-miscellaneous.dtx}
% \title{All the Code of
@@ -67,8 +68,8 @@
% \section{User Manual}
%
% You can find the user documentation the commands implemented here in the
-% \KOMAScript{} manual, either the German \file{scrguide} or the English
-% \file{scrguien}.
+% \KOMAScript{} manual, either the German \file{scrguide-de.pdf} or the
+% English \file{scrguide-en.pdf}.
%
% \MaybeStop{\PrintIndex}
%
diff --git a/macros/latex/contrib/koma-script/scrkernel-notepaper.dtx b/macros/latex/contrib/koma-script/scrkernel-notepaper.dtx
index 76689b6e55..bb47ebe2a6 100644
--- a/macros/latex/contrib/koma-script/scrkernel-notepaper.dtx
+++ b/macros/latex/contrib/koma-script/scrkernel-notepaper.dtx
@@ -18,16 +18,16 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-notepaper.dtx 4021 2023-04-04 11:29:59Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 4032 2023-04-17 09:45:11Z kohm $
%<option>%%% (run: option)
%<body>%%% (run: body)
%<*dtx>
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2023-04-04 13:29:59 +0200 (Di, 04. Apr 2023) $
+ \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 4021 $
+ \filerevision$Revision: 4032 $
\edef\reserved@a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-notepaper.dtx}
@@ -52,6 +52,7 @@
% \changes{v3.36}{2022/03/02}{switch over from \cls*{scrdoc} to
% \cls*{koma-script-source-doc}}
% \changes{v3.36}{2022/03/02}{whole implementation documentation in English}
+% \changes{v3.40}{2023/04/17}{guide names changed}
%
% \GetFileInfo{scrkernel-notepaper.dtx}
% \title{Specific Code for Letters and Especially the Notepaper with
@@ -69,8 +70,8 @@
% \section{User Manual}
%
% You can find the user documentation the commands implemented here in the
-% \KOMAScript{} manual, either the German \file{scrguide} or the English
-% \file{scrguien}.
+% \KOMAScript{} manual, either the German \file{scrguide-de.pdf} or the
+% English \file{scrguide-en.pdf}.
%
% \MaybeStop{\PrintIndex}
%
diff --git a/macros/latex/contrib/koma-script/scrkernel-pagestyles.dtx b/macros/latex/contrib/koma-script/scrkernel-pagestyles.dtx
index 981f93fafb..4681df436b 100644
--- a/macros/latex/contrib/koma-script/scrkernel-pagestyles.dtx
+++ b/macros/latex/contrib/koma-script/scrkernel-pagestyles.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
% ======================================================================
% scrkernel-pagestyles.dtx
-% Copyright (c) Markus Kohm, 2002-2022
+% Copyright (c) Markus Kohm, 2002-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,16 +18,16 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-pagestyles.dtx 3997 2022-11-16 07:24:11Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 4032 2023-04-17 09:45:11Z kohm $
%<option>%%% (run: option)
%<body>%%% (run: body)
%<*dtx>
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2022-11-16 08:24:11 +0100 (Mi, 16. Nov 2022) $
+ \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3997 $
+ \filerevision$Revision: 4032 $
\edef\reserved@a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-pagestyles.dtx}%
@@ -49,6 +49,7 @@
% \changes{v3.36}{2022/03/05}{switch over from \cls*{scrdoc} to
% \cls*{koma-script-source-doc}}
% \changes{v3.36}{2022/03/05}{whole implementation documentation in English}
+% \changes{v3.40}{2023/04/17}{guide names changed}
%
% \GetFileInfo{scrkernel-pagestyles.dtx}
% \title{The Code of the Default Page Styles of the
@@ -67,8 +68,8 @@
% \section{User Manual}
%
% You can find the user documentation the commands implemented here in the
-% \KOMAScript{} manual, either the German \file{scrguide} or the English
-% \file{scrguien}.
+% \KOMAScript{} manual, either the German \file{scrguide-de.pdf} or the
+% English \file{scrguide-en.pdf}.
%
% \MaybeStop{\PrintIndex}
%
diff --git a/macros/latex/contrib/koma-script/scrkernel-paragraphs.dtx b/macros/latex/contrib/koma-script/scrkernel-paragraphs.dtx
index f2756ade06..28ef1b3364 100644
--- a/macros/latex/contrib/koma-script/scrkernel-paragraphs.dtx
+++ b/macros/latex/contrib/koma-script/scrkernel-paragraphs.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
% ======================================================================
% scrkernel-paragraphs.dtx
-% Copyright (c) Markus Kohm, 2002-2022
+% Copyright (c) Markus Kohm, 2002-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,16 +18,16 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-paragraphs.dtx 3998 2022-11-16 07:25:23Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 4032 2023-04-17 09:45:11Z kohm $
%<option>%%% (run: option)
%<body>%%% (run: body)
%<*dtx>
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2022-11-16 08:25:23 +0100 (Mi, 16. Nov 2022) $
+ \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3998 $
+ \filerevision$Revision: 4032 $
\edef\reserved@a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-paragraphs.dtx}%
@@ -49,6 +49,7 @@
% \changes{v3.36}{2022/03/07}{switch over from \cls*{scrdoc} to
% \cls*{koma-script-source-doc}}
% \changes{v3.36}{2022/03/07}{whole implementation documentation in English}
+% \changes{v3.40}{2023/04/17}{guide names changed}
%
% \GetFileInfo{scrkernel-paragraphs.dtx}
% \title{The Code Related to Paragraph Building and Page Building of
@@ -66,8 +67,8 @@
% \section{User Manual}
%
% You can find the user documentation the commands implemented here in the
-% \KOMAScript{} manual, either the German \file{scrguide} or the English
-% \file{scrguien}.
+% \KOMAScript{} manual, either the German \file{scrguide-de.pdf} or the
+% English \file{scrguide-en.pdf}.
%
% \MaybeStop{\PrintIndex}
%
diff --git a/macros/latex/contrib/koma-script/scrkernel-pseudolengths.dtx b/macros/latex/contrib/koma-script/scrkernel-pseudolengths.dtx
index d18e064d20..6a4fd7a3ca 100644
--- a/macros/latex/contrib/koma-script/scrkernel-pseudolengths.dtx
+++ b/macros/latex/contrib/koma-script/scrkernel-pseudolengths.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
% ======================================================================
% scrkernel-pseudolengths.dtx
-% Copyright (c) Markus Kohm, 2002-2022
+% Copyright (c) Markus Kohm, 2002-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,16 +18,16 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-pseudolengths.dtx 3981 2022-11-09 10:07:16Z kohm $
+%%% From File: $Id: scrkernel-pseudolengths.dtx 4032 2023-04-17 09:45:11Z kohm $
%<option>%%% (run: option)
%<body>%%% (run: body)
%<*dtx>
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2022-11-09 11:07:16 +0100 (Mi, 09. Nov 2022) $
+ \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3981 $
+ \filerevision$Revision: 4032 $
\edef\reserved@a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-pseudolengths.dtx}%
@@ -50,6 +50,7 @@
% \changes{v3.36}{2022/02/14}{switch over from \cls*{scrdoc} to
% \cls*{koma-script-source-doc}}
% \changes{v3.36}{2022/02/14}{whole implementation documentation in English}
+% \changes{v3.40}{2023/04/17}{guide names changed}
%
% \GetFileInfo{scrkernel-pseudolengths.dtx}
% \title{Handling of Lengths Stored in Macros for
@@ -75,8 +76,8 @@
% \section{User Manual}
%
% You can find the user documentation the commands implemented here in the
-% \KOMAScript{} manual, either the German \file{scrguide} or the English
-% \file{scrguien}.
+% \KOMAScript{} manual, either the German \file{scrguide-de.pdf} or the
+% English \file{scrguide-en.pdf}.
%
% \MaybeStop{\PrintIndex}
%
diff --git a/macros/latex/contrib/koma-script/scrkernel-sections.dtx b/macros/latex/contrib/koma-script/scrkernel-sections.dtx
index 3b803cbb56..af0bc89389 100644
--- a/macros/latex/contrib/koma-script/scrkernel-sections.dtx
+++ b/macros/latex/contrib/koma-script/scrkernel-sections.dtx
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-sections.dtx 4022 2023-04-04 11:38:26Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 4032 2023-04-17 09:45:11Z kohm $
% The runs of run-time file generation:
%<preidentify>%%% (run: preidentify)
% - everything that is needed before selfidentification of resulting files
@@ -40,9 +40,9 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2023-04-04 13:38:26 +0200 (Di, 04. Apr 2023) $
+ \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 4022 $
+ \filerevision$Revision: 4032 $
\edef\reserved@a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-sections.dtx}%
@@ -65,6 +65,7 @@
% \changes{v3.36}{2022/03/08}{switch over from \cls*{scrdoc} to
% \cls*{koma-script-source-doc}}
% \changes{v3.36}{2022/03/21}{the whole implementation documentation in English}
+% \changes{v3.40}{2023/04/17}{guide names changed}
%
% \GetFileInfo{scrkernel-sections.dtx}
% \title{The Code for Parts, Chapters, Sections etc.\@ of
@@ -81,8 +82,8 @@
% \section{User Manual}
%
% You can find the user documentation the commands implemented here in the
-% \KOMAScript{} manual, either the German \file{scrguide} or the English
-% \file{scrguien}.
+% \KOMAScript{} manual, either the German \file{scrguide-de.pdf} or the
+% English \file{scrguide-en.pdf}.
%
% \MaybeStop{\PrintIndex}
%
diff --git a/macros/latex/contrib/koma-script/scrkernel-title.dtx b/macros/latex/contrib/koma-script/scrkernel-title.dtx
index 7683fea726..ae566ac3c7 100644
--- a/macros/latex/contrib/koma-script/scrkernel-title.dtx
+++ b/macros/latex/contrib/koma-script/scrkernel-title.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
% ======================================================================
% scrkernel-title.dtx
-% Copyright (c) Markus Kohm, 2002-2022
+% Copyright (c) Markus Kohm, 2002-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,16 +18,16 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-title.dtx 4000 2022-11-16 07:32:52Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 4032 2023-04-17 09:45:11Z kohm $
%<option>%%% (run: option)
%<body>%%% (run: body)
%<*dtx>
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2022-11-16 08:32:52 +0100 (Mi, 16. Nov 2022) $
+ \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 4000 $
+ \filerevision$Revision: 4032 $
\edef\reserved@a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-title.dtx}%
@@ -48,6 +48,7 @@
% \changes{v3.36}{2022/03/08}{switch over from \cls*{scrdoc} to
% \cls*{koma-script-source-doc}}
% \changes{v3.36}{2022/03/08}{whole implementation documentation in English}
+% \changes{v3.40}{2023/04/17}{guide names changed}
%
% \GetFileInfo{scrkernel-title.dtx}
% \title{The Code to Implement the Extended Titles of
@@ -64,8 +65,8 @@
% \section{User Manual}
%
% You can find the user documentation the commands implemented here in the
-% \KOMAScript{} manual, either the German \file{scrguide} or the English
-% \file{scrguien}.
+% \KOMAScript{} manual, either the German \file{scrguide-de.pdf} or the
+% English \file{scrguide-en.pdf}.
%
% \MaybeStop{\PrintIndex}
%
diff --git a/macros/latex/contrib/koma-script/scrkernel-tocstyle.dtx b/macros/latex/contrib/koma-script/scrkernel-tocstyle.dtx
index d4944b1556..443d21593b 100644
--- a/macros/latex/contrib/koma-script/scrkernel-tocstyle.dtx
+++ b/macros/latex/contrib/koma-script/scrkernel-tocstyle.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
% ======================================================================
% scrkernel-tocstyle.dtx
-% Copyright (c) Markus Kohm, 2015-2022
+% Copyright (c) Markus Kohm, 2015-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 4032 2023-04-17 09:45:11Z kohm $
% The runs of run-time file generation:
%<preidentify>%%% (run: preidentify)
% - everything that is needed before selfidentification of resulting files
@@ -42,9 +42,9 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2022-10-24 10:08:05 +0200 (Mo, 24. Okt 2022) $
+ \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3972 $
+ \filerevision$Revision: 4032 $
\edef\reserved@a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-tocstyle.dtx}%
@@ -65,6 +65,7 @@
% \changes{v3.36}{2022/02/14}{switch over from \cls*{scrdoc} to
% \cls*{koma-script-source-doc}}
% \changes{v3.36}{2022/02/14}{whole implementation documentation in English}
+% \changes{v3.40}{2023/04/17}{guide names changed}
%
% \GetFileInfo{scrkernel-tocstyle.dtx}
% \title{The Predifined Directory Styles of
@@ -84,8 +85,8 @@
% \section{User Manual}
%
% You can find the user documentation the commands implemented here in the
-% \KOMAScript{} manual, either the German \file{scrguide} or the English
-% \file{scrguien}.
+% \KOMAScript{} manual, either the German \file{scrguide-de.pdf} or the
+% English \file{scrguide-en.pdf}.
%
% \MaybeStop{\PrintIndex}
%
diff --git a/macros/latex/contrib/koma-script/scrkernel-typearea.dtx b/macros/latex/contrib/koma-script/scrkernel-typearea.dtx
index 5afbb67a54..42a1934b49 100644
--- a/macros/latex/contrib/koma-script/scrkernel-typearea.dtx
+++ b/macros/latex/contrib/koma-script/scrkernel-typearea.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
% ======================================================================
% scrkernel-typearea.dtx
-% Copyright (c) Markus Kohm, 2002-2022
+% Copyright (c) Markus Kohm, 2002-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-typearea.dtx 4014 2023-02-10 10:25:25Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 4032 2023-04-17 09:45:11Z kohm $
%<identify>%%% (run: identify)
%<init>%%% (run: init)
%<options>%%% (run: options)
@@ -29,9 +29,9 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2023-02-10 11:25:25 +0100 (Fr, 10. Feb 2023) $
+ \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 4014 $
+ \filerevision$Revision: 4032 $
\edef\reserved@a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-typearea.dtx}[%
@@ -89,6 +89,7 @@
% \changes{v3.36}{2022/02/11}{switch over from \cls*{scrdoc} to
% \cls*{koma-script-source-doc}}
% \changes{v3.36}{2022/02/11}{whole implementation documentation in English}
+% \changes{v3.40}{2023/04/17}{guide names changed}
%
% \GetFileInfo{scrkernel-typearea.dtx}
% \title{Calculation of the Typeing Area with
@@ -109,7 +110,7 @@
%
% You can find the user documentation of package \pkg*{typearea} and the
% commands implemented here in the \KOMAScript{} manual, either the German
-% \file{scrguide} or the English \file{scrguien}.
+% \file{scrguide-de.pdf} or the English \file{scrguide-en.pdf}.
%
% \subsection{Options not yet in the Manual}
% Some options commands are not documented in the \KOMAScript{} manuals, e.g.,
diff --git a/macros/latex/contrib/koma-script/scrkernel-variables.dtx b/macros/latex/contrib/koma-script/scrkernel-variables.dtx
index 0ca620349d..8896055ebc 100644
--- a/macros/latex/contrib/koma-script/scrkernel-variables.dtx
+++ b/macros/latex/contrib/koma-script/scrkernel-variables.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
% ======================================================================
% scrkernel-variables.dtx
-% Copyright (c) Markus Kohm, 2006-2022
+% Copyright (c) Markus Kohm, 2006-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,16 +18,16 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-variables.dtx 3981 2022-11-09 10:07:16Z kohm $
+%%% From File: $Id: scrkernel-variables.dtx 4032 2023-04-17 09:45:11Z kohm $
%<option>%%% (run: option)
%<body>%%% (run: body)
%<*dtx>
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\def\filedate{#2/#3/#4}}
- \filedate$Date: 2022-11-09 11:07:16 +0100 (Mi, 09. Nov 2022) $
+ \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $
\def\filerevision$#1: #2 ${\def\filerevision{r#2}}
- \filerevision$Revision: 3981 $
+ \filerevision$Revision: 4032 $
\xdef\fileinfo{\filedate\space\filerevision\space}
\edef\reserved@a{%
\noexpand\endgroup
@@ -49,6 +49,7 @@
% \changes{v3.36}{2022/02/15}{switch over from \cls*{scrdoc} to
% \cls*{koma-script-source-doc}}
% \changes{v3.36}{2022/02/15}{whole implementation documentation in English}
+% \changes{v3.40}{2023/04/17}{guide names changed}
%
% \GetFileInfo{scrkernel-variables.dtx}
% \title{Using Variables in
@@ -69,8 +70,8 @@
% \section{User Manual}
%
% You can find the user documentation the commands implemented here in the
-% \KOMAScript{} manual, either the German \file{scrguide} or the English
-% \file{scrguien}.
+% \KOMAScript{} manual, either the German \file{scrguide-de.pdf} or the
+% English \file{scrguide-en.pdf}.
%
% \MaybeStop{\PrintIndex}
%
diff --git a/macros/latex/contrib/koma-script/scrkernel-version.dtx b/macros/latex/contrib/koma-script/scrkernel-version.dtx
index 4fe0b81e5f..87b499e706 100644
--- a/macros/latex/contrib/koma-script/scrkernel-version.dtx
+++ b/macros/latex/contrib/koma-script/scrkernel-version.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
% ======================================================================
% scrkernel-version.dtx
-% Copyright (c) Markus Kohm, 2002-2022
+% Copyright (c) Markus Kohm, 2002-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
%
% ATTENTION: In this file parts of the code and documentation are before the
% driver. This must be, because this part of the code is needed by the driver
@@ -34,6 +34,7 @@
% \cls*{koma-script-source-doc}}
% \changes{v3.36}{2022/02/11}{whole implementation documentation in English}
% \changes{v3.99}{2022/10/25}{prepared to generate experimental \KOMAScript~4}
+% \changes{v3.40}{2023/04/17}{guide names changed}
%
% \GetFileInfo{scrkernel-version.dtx}
% \title{The Version of the \href{https://komascript.de}{\KOMAScript} Kernel
@@ -53,8 +54,8 @@
% \section{User Manual}
%
% You can find the user documentation of the commands implemented here in the
-% \KOMAScript{} manual, either the German \file{scrguide} or the English
-% \file{scrguien}.
+% \KOMAScript{} manual, either the German \file{scrguide-de.pdf} or the
+% English \file{scrguide-en.pdf}.
%
% \MaybeStop{\PrintIndex}
%
@@ -140,9 +141,9 @@
% therefore the syntax or general structure of the line must not be changed!
% \begin{macrocode}
%<*!v4>
- \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
%</!v4>
-%<v4> \@nameuse{@CheckKOMAScriptVersion}{2023/04/17 v3.39 KOMA-Script}%
+%<v4> \@nameuse{@CheckKOMAScriptVersion}{2023/04/24 v3.40 KOMA-Script}%
\endgroup
% \end{macrocode}
% \end{macro}
diff --git a/macros/latex/contrib/koma-script/scrlayer-notecolumn.dtx b/macros/latex/contrib/koma-script/scrlayer-notecolumn.dtx
index f523537238..e1a5fd4ae5 100644
--- a/macros/latex/contrib/koma-script/scrlayer-notecolumn.dtx
+++ b/macros/latex/contrib/koma-script/scrlayer-notecolumn.dtx
@@ -1,7 +1,7 @@
% \iffalse^^A meta-comment
% ======================================================================
% scrlayer-notecolumn.dtx
-% Copyright (c) Markus Kohm, 2013-2022
+% Copyright (c) Markus Kohm, 2013-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -19,7 +19,7 @@
% This work consists of all files listed in MANIFEST.md.
% ----------------------------------------------------------------------
% ======================================================================
-%%% From File: $Id: scrlayer-notecolumn.dtx 3915 2022-06-29 07:09:48Z kohm $
+%%% From File: $Id: scrlayer-notecolumn.dtx 4032 2023-04-17 09:45:11Z kohm $
%<identify>%%% (run: identify)
%<init>%%% (run: init)
%<options>%%% (run: options)
@@ -29,9 +29,9 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2022-06-29 09:09:48 +0200 (Mi, 29. Jun 2022) $
+ \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{v0.3.#2}}
- \filerevision$Revision: 3915 $
+ \filerevision$Revision: 4032 $
\edef\reserved@a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrlayer-notecolumn.dtx}%
@@ -100,6 +100,7 @@
% \cls*{koma-script-source-doc}}
% \changes{v3.36}{2022/02/10}{require package \pkg*{scrlogo} instead of
% defining \cs{KOMAScript}}
+% \changes{v3.40}{2023/04/17}{guide names changed}
%
% \GetFileInfo{scrlayer-notecolumn.dtx}
% \title{Providing Note Columns Similar to \cs{marginpar} with
@@ -120,8 +121,9 @@
%
% \section{User Manual}
%
-% You can find the user manuals of \pkg*{scrlayer-notecolumn} in the \KOMAScript{}
-% manual, either the German \file{scrguide} or the English \file{scrguien}.
+% You can find the user manuals of \pkg*{scrlayer-notecolumn} in the
+% \KOMAScript{} manual, either the German \file{scrguide-de.pdf} or the
+% English \file{scrguide-en.pdf}.
%
% \MaybeStop{\PrintIndex}
%
diff --git a/macros/latex/contrib/koma-script/scrlayer-scrpage.dtx b/macros/latex/contrib/koma-script/scrlayer-scrpage.dtx
index b181e142cc..33ae92d1d4 100644
--- a/macros/latex/contrib/koma-script/scrlayer-scrpage.dtx
+++ b/macros/latex/contrib/koma-script/scrlayer-scrpage.dtx
@@ -1,7 +1,7 @@
% \iffalse^^A meta-comment
% ======================================================================
% scrlayer-scrpage.dtx
-% Copyright (c) Markus Kohm, 2012-2022
+% Copyright (c) Markus Kohm, 2012-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrlayer-scrpage.dtx 4013 2023-02-02 11:11:34Z kohm $
+%%% From File: $Id: scrlayer-scrpage.dtx 4032 2023-04-17 09:45:11Z kohm $
%<identify>%%% (run: identify)
%<init>%%% (run: init)
%<options>%%% (run: options)
@@ -27,9 +27,9 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2023-02-02 12:11:34 +0100 (Do, 02. Feb 2023) $
+ \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 4013 $
+ \filerevision$Revision: 4032 $
\edef\reserved@a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrlayer-scrpage.dtx}%
@@ -91,6 +91,7 @@
% \changes{v3.36}{2022/02/09}{require package \pkg*{scrlogo} instead of
% defining \cs{KOMAScript}}
% \changes{v3.36}{2022/02/09}{whole implementation documentation in English}
+% \changes{v3.40}{2023/04/17}{guide names changed}
%
% \GetFileInfo{scrlayer-scrpage.dtx}
% \title{The \texttt{scrlayer} Interface of
@@ -108,8 +109,9 @@
%
% \section{User Manual}
%
-% You can find the user manuals of \pkg*{scrlayer-scrpage} in the \KOMAScript{}
-% manual, either the German \file{scrguide} or the English \file{scrguien}.
+% You can find the user manuals of \pkg*{scrlayer-scrpage} in the
+% \KOMAScript{} manual, either the German \file{scrguide-de.pdf} or the
+% English \file{scrguide-en.pdf}.
%
% \MaybeStop{\PrintIndex}
%
diff --git a/macros/latex/contrib/koma-script/scrlayer.dtx b/macros/latex/contrib/koma-script/scrlayer.dtx
index 6c581dca06..b790922380 100644
--- a/macros/latex/contrib/koma-script/scrlayer.dtx
+++ b/macros/latex/contrib/koma-script/scrlayer.dtx
@@ -1,7 +1,7 @@
% \iffalse^^A meta-comment
% ======================================================================
% scrlayer.dtx
-% Copyright (c) Markus Kohm, 2012-2022
+% Copyright (c) Markus Kohm, 2012-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrlayer.dtx 3985 2022-11-11 11:24:31Z kohm $
+%%% From File: $Id: scrlayer.dtx 4032 2023-04-17 09:45:11Z kohm $
%<identify>%%% (run: identify)
%<init>%%% (run: init)
%<options>%%% (run: options)
@@ -28,9 +28,9 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2022-11-11 12:24:31 +0100 (Fr, 11. Nov 2022) $
+ \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3985 $
+ \filerevision$Revision: 4032 $
\edef\reserved@a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrlayer.dtx}%
@@ -89,6 +89,7 @@
% \changes{v3.36}{2022/02/08}{require package \pkg*{scrlogo} instead of
% defining \cs{KOMAScript}}
% \changes{v3.36}{2022/02/08}{whole implementation documentation in English}
+% \changes{v3.40}{2023/04/17}{guide names changed}
%
% \GetFileInfo{scrlayer.dtx}
% \title{Layers and Page Styles with \href{https://komascript.de}{\KOMAScript}
@@ -105,8 +106,9 @@
%
% \section{User Manual}
%
-% You can find the user manuals of \pkg*{scrlayer} in the \KOMAScript{} manual,
-% either the German \file{scrguide} or the English \file{scrguien}.
+% You can find the user manuals of \pkg*{scrlayer} in the \KOMAScript{}
+% manual, either the German \file{scrguide-de.pdf} or the English
+% \file{scrguide-en.pdf}.
%
% \MaybeStop{\PrintIndex}
%
diff --git a/macros/latex/contrib/koma-script/scrlfile.dtx b/macros/latex/contrib/koma-script/scrlfile.dtx
index 027c998175..8e51c2e09b 100644
--- a/macros/latex/contrib/koma-script/scrlfile.dtx
+++ b/macros/latex/contrib/koma-script/scrlfile.dtx
@@ -1,7 +1,7 @@
% \iffalse^^A meta-comment
% ======================================================================
% scrlfile.dtx
-% Copyright (c) Markus Kohm, 2002-2022
+% Copyright (c) Markus Kohm, 2002-2023
%
% This file is part of the work `scrlfile' which is part of the LaTeX2e
% KOMA-Script bundle.
@@ -19,14 +19,14 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrlfile.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrlfile.dtx 4032 2023-04-17 09:45:11Z kohm $
%<*dtx>
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2022-06-05 12:38:02 +0200 (So, 05. Jun 2022) $
+ \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3874 $
+ \filerevision$Revision: 4032 $
\edef\reserved@a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrlfile.dtx}%
@@ -74,6 +74,7 @@
% \changes{v3.36}{2022/02/03}{switch over from \cls*{scrdoc} to
% \cls*{koma-script-source-doc}}
% \changes{v3.36}{2022/02/03}{using \file{scrlogo.dtx} to define the logo}
+% \changes{v3.40}{2023/04/17}{guide names changed}
%
% \GetFileInfo{scrlfile.dtx}
% \title{File Loading Hooks with \href{https://komascript.de}{\KOMAScript}
@@ -92,25 +93,9 @@
% \section{User Manual}
%
% You can find the user manual of \pkg*{scrlfile} in the \KOMAScript{} manual,
-% either the German \file{scrguide} or the English \file{scrguien}.
-% Here you can find interim documentation only (before it is added to the
-% \KOMAScript{} manual).
+% either the German \file{scrguide-de.pdf} or the English
+% \file{scrguide-en.pdf}.
%
-% \DescribeOption{withdeprecated}
-% Package option \opt{withdeprecated} enables the definition of deprecated
-% commands \cs{AfterClass+}, \cs{AfterPackage+}, \cs{AfterClass!} and
-% \cs{AfterPackage!}. All of them will be emulated by \cs{AfterAtEndOClass*}
-% and \cs{AfterAtEndOfPackage*} so they are not completely compatible with the
-% original deprecated commands.
-%
-% Users of classes or package, that use such deprecated commands can load
-% \pkg*{scrlfile} already before the class using:
-%\begin{verbatim}
-% \RequirePackage[withdeprecated]{scrlfile}
-%\end{verbatim}%
-% or adding option \opt{withdeprecated} to the global options of
-% \cs{documentclass}. Note, this is not a key-value option. It cannot be
-% changed after loading \pkg*{scrlfile}.
%
% \MaybeStop{\PrintIndex}
%
diff --git a/macros/latex/contrib/koma-script/scrlogo.dtx b/macros/latex/contrib/koma-script/scrlogo.dtx
index c2c05f1705..ff6a01c024 100644
--- a/macros/latex/contrib/koma-script/scrlogo.dtx
+++ b/macros/latex/contrib/koma-script/scrlogo.dtx
@@ -1,7 +1,7 @@
% \iffalse^^A meta-comment
% ======================================================================
% scrlogo.dtx
-% Copyright (c) Markus Kohm, 2002-2022
+% Copyright (c) Markus Kohm, 2002-2023
%
% This work may be distributed and/or modified under the conditions of
% the LaTeX Project Public License, version 1.3c of the license.
@@ -17,12 +17,12 @@
% This work consists of the file `scrlogo.dtx' at least.
% ======================================================================
%
-%%% From File: $Id: scrlogo.dtx 3688 2022-02-10 08:26:37Z kohm $
+%%% From File: $Id: scrlogo.dtx 4032 2023-04-17 09:45:11Z kohm $
%<*dtx>
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2022-02-10 09:26:37 +0100 (Do, 10. Feb 2022) $
+ \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
\filerevision$Revision: 2631 $
\edef\reserved@a{%
@@ -71,6 +71,7 @@
% \changes{v3.36}{2022/02/02}{switch over from \cls*{scrdoc} to
% \cls*{koma-script-source-doc}}
% \changes{v3.36}{2022/02/02}{whole implementation documentation in English}
+% \changes{v3.40}{2023/04/17}{guide names changed}
%
% \GetFileInfo{scrlogo.dtx}
% \title{\href{https://komascript.de}{\KOMAScript} \partname\ \file{\filename}}
@@ -87,7 +88,8 @@
% \section{User Manual}
%
% You can find the user manual of \pkg*{scrlogo} in the \KOMAScript{} manual,
-% either the German \file{scrguide} or the English \file{scrguien}.
+% either the German \file{scrguide-de.pdf} or the English
+% \file{scrguide-en.pdf}.
%
% \MaybeStop{\PrintIndex}
%
diff --git a/macros/latex/contrib/koma-script/scrtime.dtx b/macros/latex/contrib/koma-script/scrtime.dtx
index cff5cd706a..f5fdcb4919 100644
--- a/macros/latex/contrib/koma-script/scrtime.dtx
+++ b/macros/latex/contrib/koma-script/scrtime.dtx
@@ -1,7 +1,7 @@
% \iffalse
% ======================================================================
% scrtime.dtx
-% Copyright (c) Markus Kohm, 1995-2022
+% Copyright (c) Markus Kohm, 1995-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,15 +18,15 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrtime.dtx 3986 2022-11-16 06:52:39Z kohm $
+%%% From File: $Id: scrtime.dtx 4032 2023-04-17 09:45:11Z kohm $
%<package&identify>\NeedsTeXFormat{LaTeX2e}[1995/06/01]
%<*driver>
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2022-11-16 07:52:39 +0100 (Mi, 16. Nov 2022) $
+ \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3986 $
+ \filerevision$Revision: 4032 $
\endgroup
\ProvidesFile{scrtime.dtx}[\filedate\space\filerevision\space
%</driver>
@@ -87,6 +87,7 @@
% \cls*{koma-script-source-doc}}
% \changes{v3.36}{2022/02/07}{require package \pkg*{scrlogo} instead of
% defining \cs{KOMAScript}}
+% \changes{v3.40}{2023/04/17}{guide names changed}
%
% \GetFileInfo{scrtime.dtx}
% \title{The Current Time and Name of the Day with
@@ -108,8 +109,8 @@
% \section{User Manual}
%
% You can find the user manuals of \pkg*{scrtime} and \pkg*{scrdate} in the
-% \KOMAScript{} manual, either the German \file{scrguide} or the English
-% \file{scrguien}.
+% \KOMAScript{} manual, either the German \file{scrguide-de.pdf} or the
+% English \file{scrguide-en.pdf}.
%
% \MaybeStop{\PrintIndex}
%
diff --git a/macros/latex/contrib/koma-script/tocbasic.dtx b/macros/latex/contrib/koma-script/tocbasic.dtx
index 98a021a2d2..1dc1d7770f 100644
--- a/macros/latex/contrib/koma-script/tocbasic.dtx
+++ b/macros/latex/contrib/koma-script/tocbasic.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
% ======================================================================
% tocbasic.dtx
-% Copyright (c) Markus Kohm, 2008-2022
+% Copyright (c) Markus Kohm, 2008-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: tocbasic.dtx 3947 2022-07-22 05:59:41Z kohm $
+%%% From File: $Id: tocbasic.dtx 4032 2023-04-17 09:45:11Z kohm $
%<identify>%%% (run: identify)
%<prepare>%%% (run: prepare)
%<option>%%% (run: option)
@@ -29,9 +29,9 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2022-07-22 07:59:41 +0200 (Fr, 22. Jul 2022) $
+ \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3947 $
+ \filerevision$Revision: 4032 $
\endgroup
\ProvidesFile{tocbasic.dtx}[\filedate\space\filerevision\space
%</dtx>
@@ -95,6 +95,7 @@
% \cls*{koma-script-source-doc}}
% \changes{v3.36}{2022/02/10}{require package \pkg*{scrlogo} instead of
% defining \cs{KOMAScript}}
+% \changes{v3.40}{2023/04/17}{guide names changed}
%
% \GetFileInfo{tocbasic.dtx}
% \title{Handling of Tables and Lists of Contents with
@@ -121,7 +122,8 @@
% \section{User Manual}
%
% You can find the user manuals of \pkg*{tocbasic} in the \KOMAScript{}
-% manual, either the German \file{scrguide} or the English \file{scrguien}.
+% manual, either the German \file{scrguide-de.pdf} or the English
+% \file{scrguide-en.pdf}.
%
% \MaybeStop{\PrintIndex}
%
diff --git a/macros/latex/contrib/photobook/photobook.cls b/macros/latex/contrib/photobook/photobook.cls
index 14016662b4..09a8d9a8eb 100644
--- a/macros/latex/contrib/photobook/photobook.cls
+++ b/macros/latex/contrib/photobook/photobook.cls
@@ -38,10 +38,16 @@
%
% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
%
+% XXX should cliptocell offsets be tweakable???
+% XXX ASAP should cover/jacket/endpaper/spread template cells account
+% for bleeds as an option???
+% ...i.e. include cliptocell defaults???
% XXX ASAP should cover/jacket/endpaper/spread templates/cells account
% for \bindingoffset (likely no) and/or \gutteroffset ???
% ...especially relevant to endpaper/spread...
% XXX ASAP revise how bleeds are handled by cells...
+% ...all cells should ignore bleeds unless explicitly stated
+% otherwise -- needs testing...
%
% XXX captions behave in an odd way...
% the internal (macro) minipage for some reason does not affect text
@@ -79,8 +85,8 @@
%%% NOTE: \def\<module-name>@[A-Z]+ macros will be visible to both the
%%% code and the generated docs...
-\edef\photobook@FILEVERSION{v0.1.19}
-\edef\photobook@FILEDATE{2023-04-11}
+\edef\photobook@FILEVERSION{v0.1.20}
+\edef\photobook@FILEDATE{2023-04-22}
%% \documentclass{ltxdoc}
@@ -1962,19 +1968,31 @@
\end{inlinecell*}%
\end{turn}}
+
%% \DescribeEnv{cliptocell}
%
%% Clip content to parent cell.
%%
%% >> \begin{cliptocell} ... \end{cliptocell}
%%
-%% Clip content to cell adding bleeds
+%% Clip content to cell plus offsets (bleeds) from each side
%%
%% >> \begin{cliptocell}[<size>] ... \end{cliptocell}
%% >> \begin{cliptocell}[<horizontal> <vertical>] ... \end{cliptocell}
%% >> \begin{cliptocell}[<left> <bottom> <right> <top>] ... \end{cliptocell}
%%
-%% Clipping to bleeds will not affect the cell content positioning.
+%% Offset order, i.e. left-bottom-right-top is made consistent with
+%% \href{https://ctan.org/pkg/graphicx}{graphicx} and
+%% \href{https://ctan.org/pkg/trimclip}{trimclip} modules and represents
+%% the bottom-left and top-right viewport point offsets from the parent
+%% cell.
+%%
+%% |cliptocell| does not affect the cell content positioning in any way.
+%%
+%% This is designed to simplify filling template cells and adding bleeds
+%% to certain sides and clipping flush to others, for example for cells
+%% of a dust jacket or a foldout, but |cliptocell| is not limited to
+%% this one use-case.
%%
\newlength\photobook@cliptocell@left
\setlength\photobook@cliptocell@left{0mm}%
@@ -1990,7 +2008,7 @@
\setsepchar{ }%
\readlist*\photobook@cliptocell@bleeds{#1}%
%
- % bleed
+ % args: size
\ifnum \photobook@cliptocell@bleedslen = 1%
\setlength\photobook@cliptocell@left{%
\photobook@cliptocell@bleeds[1]}%
@@ -2000,7 +2018,7 @@
\photobook@cliptocell@bleeds[1]}%
\setlength\photobook@cliptocell@top{%
\photobook@cliptocell@bleeds[1]}\fi%
- % horizontal vertical
+ % args: horizontal vertical
\ifnum \photobook@cliptocell@bleedslen = 2%
\setlength\photobook@cliptocell@left{%
\photobook@cliptocell@bleeds[1]}%
@@ -2010,7 +2028,7 @@
\photobook@cliptocell@bleeds[1]}%
\setlength\photobook@cliptocell@top{%
\photobook@cliptocell@bleeds[2]}\fi%
- % left top right bottom
+ % args: left bottom right top
\ifnum \photobook@cliptocell@bleedslen = 4%
\setlength\photobook@cliptocell@left{%
\photobook@cliptocell@bleeds[1]}%
@@ -2021,7 +2039,7 @@
\setlength\photobook@cliptocell@top{%
\photobook@cliptocell@bleeds[4]}\fi%
%
- % XXX the spaces at the end of each line here are significant...
+ % NOTE: the spaces at the end of each line here are significant!!
\begin{trimbox}{{\photobook@cliptocell@left} %
{\photobook@cliptocell@bottom} %
{\photobook@cliptocell@right} %
@@ -2030,6 +2048,11 @@
{\height - \cellheight - \photobook@cliptocell@bottom} %
{\cellwidth + \photobook@cliptocell@right} %
{\height + \photobook@cliptocell@top}}%
+ % set defaults for nested cells...
+ \setlength\photobook@cliptocell@left{0mm}%
+ \setlength\photobook@cliptocell@top{0mm}%
+ \setlength\photobook@cliptocell@right{0mm}%
+ \setlength\photobook@cliptocell@bottom{0mm}%
\begin{minipage}[t][\cellheight][t]{\cellwidth}%
\ignorespaces%
}{%
@@ -2039,8 +2062,6 @@
\endgroup}
-
-
%% \DescribeMacro{\imagecell\{..\}}
%
%% Place image in cell.
diff --git a/macros/latex/contrib/photobook/photobook.pdf b/macros/latex/contrib/photobook/photobook.pdf
index 2dd314039c..f5969aa38f 100644
--- a/macros/latex/contrib/photobook/photobook.pdf
+++ b/macros/latex/contrib/photobook/photobook.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/textcsc/README b/macros/unicodetex/latex/textcsc/README
index 8959a63402..5ff7cb77ec 100644
--- a/macros/unicodetex/latex/textcsc/README
+++ b/macros/unicodetex/latex/textcsc/README
@@ -1,6 +1,6 @@
textcsc - caps-to-small-caps command
-version: 1.0.0
+version: 1.1.0
This package provides a simple command for caps-to-small-caps text, to allow for small caps acronyms to be presented as uppercase in text (useful for things like copying and pasting from a PDF).
@@ -12,4 +12,5 @@ For suggestions, feature requests, and bug reports, please use the project's
GitHub site: https://github.com/ezgranet/textcsc
Version history:
+24/04/2023 fixed letterspacing issue
10/09/2022 Package creation \ No newline at end of file
diff --git a/macros/unicodetex/latex/textcsc/textcsc-documentation.pdf b/macros/unicodetex/latex/textcsc/textcsc-documentation.pdf
index d2a5498b57..e18bc2b423 100644
--- a/macros/unicodetex/latex/textcsc/textcsc-documentation.pdf
+++ b/macros/unicodetex/latex/textcsc/textcsc-documentation.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/textcsc/textcsc-documentation.tex b/macros/unicodetex/latex/textcsc/textcsc-documentation.tex
index d0c7ec4040..12f1cdd871 100644
--- a/macros/unicodetex/latex/textcsc/textcsc-documentation.tex
+++ b/macros/unicodetex/latex/textcsc/textcsc-documentation.tex
@@ -102,16 +102,17 @@ breaklines,
firstnumber=last
]
{latex}
-\def\textcscversionnumber{1.0.0}
-\ProvidesPackage{textcsc}
-[2022/09/10\textcscversionnumber\
+
+\def\textcscversionnumber{1.1}
+\ProvidesPackage{textcsc-dev}
+[2023/04/24\textcscversionnumber\
Command for caps-to-small-caps-text]
% This work may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
+% conditions of the LaTeX Project Public License, either version 1.3c
% of this license or (at your option) any later version.
% The latest version of this license is in
% http://www.latex-project.org/lppl.txt
-% and version 1.3 or later is part of all distributions of LaTeX
+% and version 1.3c or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
%
% This work has the LPPL maintenance status `maintained'.
@@ -129,7 +130,7 @@ firstnumber=last
%%%%%%%%%%%%%%%%%%%%%%%%%%%
\RequirePackage{iftex}
\ifPDFTeX {
- \PackageError{swungdash}
+ \PackageError{textcsc}
{You are using pdfTeX but this package only works
\MessageBreak with XeTeX or LuaTeX}{}
}
@@ -146,7 +147,7 @@ firstnumber=last
% the switch
%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\newcommand{\cscshape}{\addfontfeature{RawFeature={+c2sc,+smcp}}}
+\newcommand{\cscshape}{\scshape\addfontfeature{RawFeature={+c2sc}}}
%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%
% the macro
@@ -164,6 +165,17 @@ firstnumber=last
\end{minted}
\section{Version History}
+
+
+
+\subsection{\texttt{1.1.0}}
+
+\ttfamily 24 April 2023: Update to fix issue with LetterSpace property not carrying over.
+
+
+
+
+
\subsection{\texttt{1.0.0}}
\ttfamily 22 September 2022: Package creation
diff --git a/macros/unicodetex/latex/textcsc/textcsc.sty b/macros/unicodetex/latex/textcsc/textcsc.sty
index d4421e7729..63c9e27680 100644
--- a/macros/unicodetex/latex/textcsc/textcsc.sty
+++ b/macros/unicodetex/latex/textcsc/textcsc.sty
@@ -1,6 +1,6 @@
-\def\textcscversionnumber{1.0.1}
-\ProvidesPackage{textcsc}
-[2022/09/10\textcscversionnumber\
+\def\textcscversionnumber{1.1}
+\ProvidesPackage{textcsc-dev}
+[2023/04/24\textcscversionnumber\
Command for caps-to-small-caps-text]
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -42,7 +42,7 @@
% the switch
%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\newcommand{\cscshape}{\addfontfeature{RawFeature={+c2sc,+smcp}}}
+\newcommand{\cscshape}{\scshape\addfontfeature{RawFeature={+c2sc}}}
%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%
% the macro