diff options
author | Norbert Preining <norbert@preining.info> | 2024-12-11 03:03:11 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2024-12-11 03:03:11 +0000 |
commit | cdc6e712c35005727bb3f617f6ee88ddfdc07123 (patch) | |
tree | 2cb1c95d67dff5545937653bb37922952c4ffc0e /macros/latex/contrib | |
parent | 4b8f9bbab70d3795b3fca6c333d0287c83187a3a (diff) |
CTAN sync 202412110303
Diffstat (limited to 'macros/latex/contrib')
-rw-r--r-- | macros/latex/contrib/babel-contrib/german/germanb.dtx | 7 | ||||
-rw-r--r-- | macros/latex/contrib/babel-contrib/german/germanb.pdf | bin | 410715 -> 410702 bytes | |||
-rw-r--r-- | macros/latex/contrib/babel-contrib/german/ngermanb.dtx | 43 | ||||
-rw-r--r-- | macros/latex/contrib/babel-contrib/german/ngermanb.pdf | bin | 388947 -> 389579 bytes | |||
-rw-r--r-- | macros/latex/contrib/easybook/README.md | 2 | ||||
-rw-r--r-- | macros/latex/contrib/easybook/easybook.dtx | 8 | ||||
-rw-r--r-- | macros/latex/contrib/easybook/easybook.pdf | bin | 652058 -> 651922 bytes | |||
-rw-r--r-- | macros/latex/contrib/easybook/easybook.tex | 6 |
8 files changed, 47 insertions, 19 deletions
diff --git a/macros/latex/contrib/babel-contrib/german/germanb.dtx b/macros/latex/contrib/babel-contrib/german/germanb.dtx index ef510a14fc..fa2ac5811d 100644 --- a/macros/latex/contrib/babel-contrib/german/germanb.dtx +++ b/macros/latex/contrib/babel-contrib/german/germanb.dtx @@ -39,7 +39,7 @@ %<germanb>\ProvidesLanguage{germanb} %\fi %\ProvidesFile{germanb.dtx} - [2024/01/19 v2.14 German support for babel (pre-1996 orthography)] + [2024/12/10 v2.15 German support for babel (pre-1996 orthography)] %\iffalse % %<*filedriver> @@ -51,7 +51,6 @@ \usepackage{array} \usepackage{booktabs} \usepackage[tableposition=top,skip=5pt]{caption} -\usepackage{marginnote} \usepackage[svgnames]{xcolor} \usepackage[pdfusetitle]{hyperref} \hypersetup{% @@ -68,7 +67,9 @@ \newcommand*\note[1]{} \newcommand*\Lopt[1]{\texttt{#1}} \newcommand*\file[1]{\texttt{#1}} -\newcommand*\newfeature[1]{\marginnote{\footnotesize New feature\\in v.\,#1!}} +\newcommand*\newfeature[1]{% + \leavevmode\vadjust{\smash{\llap{\parbox[t]{\marginparwidth}{\raggedleft\footnotesize New feature\\in v.\,#1!}\kern\marginparsep\hspace{3em}}}}% +} \GlossaryMin = .33\textheight \begin{document} diff --git a/macros/latex/contrib/babel-contrib/german/germanb.pdf b/macros/latex/contrib/babel-contrib/german/germanb.pdf Binary files differindex 5ca9a0fcad..5ef8af1882 100644 --- a/macros/latex/contrib/babel-contrib/german/germanb.pdf +++ b/macros/latex/contrib/babel-contrib/german/germanb.pdf diff --git a/macros/latex/contrib/babel-contrib/german/ngermanb.dtx b/macros/latex/contrib/babel-contrib/german/ngermanb.dtx index 98b9d2063a..e572ef155d 100644 --- a/macros/latex/contrib/babel-contrib/german/ngermanb.dtx +++ b/macros/latex/contrib/babel-contrib/german/ngermanb.dtx @@ -29,7 +29,7 @@ % by Bernd Raichle, Hubert Partl et.al. % % \fi -% \CheckSum{505} +% \CheckSum{544} % % \iffalse % Tell the \LaTeX\ system who we are and write an entry on the @@ -43,7 +43,7 @@ %<ngermanb>\ProvidesLanguage{ngermanb} %\fi %\ProvidesFile{ngermanb.dtx} - [2024/01/19 v2.14 German support for babel (post-1996 orthography)] + [2024/12/10 v2.15 German support for babel (post-1996 orthography)] %\iffalse % %<*filedriver> @@ -55,7 +55,6 @@ \usepackage{array} \usepackage{booktabs} \usepackage[tableposition=top,skip=5pt]{caption} -\usepackage{marginnote} \usepackage[svgnames]{xcolor} \usepackage[pdfusetitle]{hyperref} \hypersetup{% @@ -72,7 +71,9 @@ \newcommand*\note[1]{} \newcommand*\Lopt[1]{\texttt{#1}} \newcommand*\file[1]{\texttt{#1}} -\newcommand*\newfeature[1]{\marginnote{\footnotesize New feature\\in v.\,#1!}} +\newcommand*\newfeature[1]{% + \leavevmode\vadjust{\smash{\llap{\parbox[t]{\marginparwidth}{\raggedleft\footnotesize New feature\\in v.\,#1!}\kern\marginparsep\hspace{3em}}}}% +} \GlossaryMin = .33\textheight \begin{document} @@ -280,6 +281,10 @@ % Note that this requires a font which actually contains the glyph (otherwise, you still get \graph{SS}) % and \LaTeX\ kernel 2023/06 at least. % +% Note\newfeature{2.15} that you can also set the casing via |\babelprovide[casing=eszett]{<lang>}|. +% This is adhered to. If you want to disable such a global setting, you can do so by means of the +% modifier \Lopt{nocapsz}. +% % \subsection{Handling of \texttt{"s} and \texttt{"z} in Swiss German}\label{sec:toss} % % In\newfeature{2.10} Swiss (and Liechtensteinian) German writing, the use of \graph{\ss} is rather uncommon. @@ -607,20 +612,38 @@ % \begin{macro}{capsz} % \changes{Version 2.9e=Version 2.14}{2024/01/19}{Implement modifier \Lopt{capsz} % to use capital eszett letter in Austrian and German varieties if possible.} +% \changes{Version 2.9f=Version 2.15}{2024/12/10}{Implement modifier \Lopt{nocapsz} +% to deactivate global capital eszett casing in Austrian and German varieties. +% Global settings are now adhered to if no modifier is used.} % For German and Austrian Standard German, we allow optionally to uppercase \graph{\ss} % with the capital eszett letter rather as \graph{SS} if the font provides the glyph % (if the modifier \Lopt{capsz} is used). % \begin{macrocode} \newif\ifcapsz\capszfalse +\newif\ifnocapsz\nocapszfalse \newif\ifbbl@capsz\bbl@capszfalse +\ifdefined\casing@ngerman + \let\save@casing@ngerman\casing@ngerman +\else + \xdef\save@casing@naustrian{de} +\fi +\ifdefined\casing@naustrian + \let\save@casing@naustrian\casing@naustrian +\else + \xdef\save@casing@naustrian{de} +\fi \ifx\bbl@mod@ngerman\@undefined\else \@expandtwoargs\in@{,capsz,}{,\bbl@mod@ngerman,} \ifin@ \capsztrue \fi + \@expandtwoargs\in@{,nocapsz,}{,\bbl@mod@ngerman,} + \ifin@ + \nocapsztrue + \fi \addto\extrasngerman{% \ifcapsz\bbl@capsztrue\bbl@csarg\xdef{casing@ngerman}{de-x-eszett}% - \else\bbl@csarg\xdef{casing@ngerman}{de}\bbl@capszfalse\fi} + \else\ifnocapsz\bbl@csarg\xdef{casing@ngerman}{de}\fi\bbl@capszfalse\fi} \fi \newif\if@at@capsz\@at@capszfalse \ifx\bbl@mod@naustrian\@undefined\else @@ -628,9 +651,13 @@ \ifin@ \@at@capsztrue \fi + \@expandtwoargs\in@{,nocapsz,}{,\bbl@mod@naustrian,} + \ifin@ + \nocapsztrue + \fi \addto\extrasnaustrian{% \if@at@capsz\bbl@capsztrue\bbl@csarg\xdef{casing@naustrian}{de-x-eszett}% - \else\bbl@csarg\xdef{casing@naustrian}{de}\bbl@capszfalse\fi} + \else\ifnocapsz\bbl@csarg\xdef{casing@naustrian}{de}\fi\bbl@capszfalse\fi} \fi % \end{macrocode} % \end{macro} @@ -656,12 +683,12 @@ \fi \ifx\CurrentOption\bbl@opt@ngerman \ifbbl@capsz - \addto\noextrasngerman{\bbl@capszfalse\bbl@csarg\xdef{casing@ngerman}{de}} + \addto\noextrasngerman{\bbl@capszfalse\bbl@csarg\xdef{casing@ngerman}{\save@casing@ngerman}} \fi \fi \ifx\CurrentOption\bbl@opt@naustrian \ifbbl@capsz - \addto\noextrasnaustrian{\bbl@capszfalse\bbl@csarg\xdef{casing@naustrian}{de}} + \addto\noextrasnaustrian{\bbl@capszfalse\bbl@csarg\xdef{casing@naustrian}{\save@casing@naustrian}} \fi \fi % \end{macrocode} diff --git a/macros/latex/contrib/babel-contrib/german/ngermanb.pdf b/macros/latex/contrib/babel-contrib/german/ngermanb.pdf Binary files differindex 5de8fa8cf2..03b05cdeed 100644 --- a/macros/latex/contrib/babel-contrib/german/ngermanb.pdf +++ b/macros/latex/contrib/babel-contrib/german/ngermanb.pdf diff --git a/macros/latex/contrib/easybook/README.md b/macros/latex/contrib/easybook/README.md index 36050f869d..fb0f5658a7 100644 --- a/macros/latex/contrib/easybook/README.md +++ b/macros/latex/contrib/easybook/README.md @@ -1,5 +1,5 @@ # The `easybook` document class -Easily typesetting Chinese theses or books (v2024hq) +Easily typesetting Chinese theses or books (v2024hs) ## Abstract `easybook` is a pure academic template created based on the `ctexbook` book document class. It also has the functions of `book` and `article` document class. Combined with the general framework design of the theses of many universities in China, providing multiple commands and interfaces allows users to easily customize the theses templates. Its basic macro package `easybase` can also be used with `ctex` and standard document classes. diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx index 8d9da7c392..e2e1525f27 100644 --- a/macros/latex/contrib/easybook/easybook.dtx +++ b/macros/latex/contrib/easybook/easybook.dtx @@ -14,7 +14,7 @@ % This work has the LPPL maintenance status `maintained'. %<class|package>\NeedsTeXFormat{LaTeX2e}[2021/11/15] %<*class> -\ProvidesExplClass{easybook}{2024/12/09}{2024hq} +\ProvidesExplClass{easybook}{2024/12/10}{2024hs} {Easily typesetting Chinese theses or books} \bool_new:N \l__eb_compile_draft_bool @@ -302,7 +302,7 @@ %</class> %<*package> \RequirePackage{etoolbox} -\ProvidesExplPackage{easybase}{2024/12/09}{2024hq} +\ProvidesExplPackage{easybase}{2024/12/10}{2024hs} {Easily typesetting Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -785,7 +785,7 @@ { 9 } { $\ddagger\ddagger$ } { 10 } { \@ctrerr } } -\UseFntSymbsList{fnsymbol} +\UseFntSymbsList{empty} \cs_set_eq:NN \DefineFntSymbols \SetFntSymbsList \cs_set_eq:NN \setfntsymbol \UseFntSymbsList \tl_new:N \l__eb_fnnormal_tmpa_tl @@ -2996,7 +2996,7 @@ } %</package> %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2024/12/09}{2024hq} +\ProvidesExplFile{eb-tcolorbox.cfg}{2024/12/10}{2024hs} {Customization of tcolorbox for easybook} \cs_set_protected:Npn \addtotcbstyle #1#2 diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf Binary files differindex 2b5d93283f..0f19be0626 100644 --- a/macros/latex/contrib/easybook/easybook.pdf +++ b/macros/latex/contrib/easybook/easybook.pdf diff --git a/macros/latex/contrib/easybook/easybook.tex b/macros/latex/contrib/easybook/easybook.tex index 42ac0b08e9..c01217389e 100644 --- a/macros/latex/contrib/easybook/easybook.tex +++ b/macros/latex/contrib/easybook/easybook.tex @@ -23,8 +23,8 @@ name = easybook, color-scheme = blue, title = EASYBOOK使用手册, - version = v2024hq, - date = 2024/12/09, + version = v2024hs, + date = 2024/12/10, authors = 瞿毅, info = 简便地排版中文学位论文或书籍, email = toquyi@163.com, @@ -825,7 +825,7 @@ $\blacktriangleright$需要注意正确\textbf{编译索引}要增加 \code{-she \begin{cnltxlist}[itemsep = 0ex] \command{SetFntSymbsList}[\marg{符号表名}\marg{符号数量}\marg{符号列表}]\nonl \command{UseFntSymbsList}[\marg{符号表名}] - 这两个命令用于设置自定义符号型脚注短编号标记 \code{s} 的符号列表。\cs{SetFntSymbsList} 命令用于定义名为 \meta{符号表名} 的符号列表,\cs{UseFntSymbsList} 命令用于启用已定义的符号列表。默认的脚注符号列表名为 \code{fnsymbol},只支持9个编号。注意使用符号型标记的脚注时计数器 \code{footnote} 的值仍然递增,以及定义新列表时 \meta{符号列表} 的写法和命令顺序: + 这两个命令用于设置自定义符号型脚注短编号 \code{s} 的符号列表。\cs{SetFntSymbsList} 命令用于定义名为 \meta{符号表名} 的符号列表,\cs{UseFntSymbsList} 命令用于启用已定义的符号列表。预置了一个脚注符号列表 \code{fnsymbol},与 \hologo{LaTeX} 的数字转换命令 \cs{fnsymbol} 一致,只支持9个编号。注意使用符号型标记的脚注时计数器 \code{footnote} 的值仍然递增,以及定义新列表时 \meta{符号列表} 的写法和命令顺序: \begin{ctexexam} \SetFntSymbsList{fancy}{2}{{1}{*}{2}{\P}} \UseFntSymbsList{fancy} |