summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2024-07-13 03:01:41 +0000
committerNorbert Preining <norbert@preining.info>2024-07-13 03:01:41 +0000
commit6d99d1d1b202753303b6430d12763206fb734a97 (patch)
treed9643d768369248b42869a33e099e417955853bd /macros
parent6acdb29f8e417bf7ff4e2fe6d048811f448e1269 (diff)
CTAN sync 202407130301HEADmaster
Diffstat (limited to 'macros')
-rw-r--r--macros/latex/contrib/easybook/README.md2
-rw-r--r--macros/latex/contrib/easybook/easybook.dtx40
-rw-r--r--macros/latex/contrib/easybook/easybook.pdfbin625902 -> 626026 bytes
-rw-r--r--macros/latex/contrib/easybook/easybook.tex11
-rw-r--r--macros/luatex/latex/tango/README (renamed from macros/latex/contrib/tango/README)16
-rw-r--r--macros/luatex/latex/tango/doc/tango-en.pdf (renamed from macros/latex/contrib/tango/doc/tango-en.pdf)bin160161 -> 160181 bytes
-rw-r--r--macros/luatex/latex/tango/doc/tango-en.tex (renamed from macros/latex/contrib/tango/doc/tango-en.tex)2
-rw-r--r--macros/luatex/latex/tango/doc/tango-fr.pdf (renamed from macros/latex/contrib/tango/doc/tango-fr.pdf)bin170120 -> 170145 bytes
-rw-r--r--macros/luatex/latex/tango/doc/tango-fr.tex (renamed from macros/latex/contrib/tango/doc/tango-fr.tex)2
-rw-r--r--macros/luatex/latex/tango/examples/Ch-1-15.tex (renamed from macros/latex/contrib/tango/examples/Ch-1-15.tex)0
-rw-r--r--macros/luatex/latex/tango/examples/Ch-16-30.tex (renamed from macros/latex/contrib/tango/examples/Ch-16-30.tex)0
-rw-r--r--macros/luatex/latex/tango/examples/book-mathematics.tex (renamed from macros/latex/contrib/tango/examples/book-mathematics.tex)0
-rw-r--r--macros/luatex/latex/tango/examples/candide.tex (renamed from macros/latex/contrib/tango/examples/candide.tex)0
-rw-r--r--macros/luatex/latex/tango/examples/euler.tex (renamed from macros/latex/contrib/tango/examples/euler.tex)0
-rw-r--r--macros/luatex/latex/tango/examples/handout-euler.tex (renamed from macros/latex/contrib/tango/examples/handout-euler.tex)0
-rw-r--r--macros/luatex/latex/tango/examples/handout-polynomes-deg2.tex (renamed from macros/latex/contrib/tango/examples/handout-polynomes-deg2.tex)0
-rw-r--r--macros/luatex/latex/tango/examples/polynome-deg2.tex (renamed from macros/latex/contrib/tango/examples/polynome-deg2.tex)0
-rw-r--r--macros/luatex/latex/tango/examples/puissance-cercle.tex (renamed from macros/latex/contrib/tango/examples/puissance-cercle.tex)0
-rw-r--r--macros/luatex/latex/tango/examples/recurrence.tex (renamed from macros/latex/contrib/tango/examples/recurrence.tex)0
-rw-r--r--macros/luatex/latex/tango/examples/rel-bin.tex (renamed from macros/latex/contrib/tango/examples/rel-bin.tex)0
-rw-r--r--macros/luatex/latex/tango/examples/schoolwork.tex (renamed from macros/latex/contrib/tango/examples/schoolwork.tex)0
-rw-r--r--macros/luatex/latex/tango/latex/tango.cls (renamed from macros/latex/contrib/tango/latex/tango.cls)9
22 files changed, 49 insertions, 33 deletions
diff --git a/macros/latex/contrib/easybook/README.md b/macros/latex/contrib/easybook/README.md
index b0b9fb9ac9..6d523ef4c6 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 (v2024cp)
+Easily typesetting Chinese theses or books (v2024cq)
## 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 0436584b62..0ff31af280 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/07/09}{2024cp}
+\ProvidesExplClass{easybook}{2024/07/12}{2024cq}
{Easily typesetting Chinese theses or books}
\bool_new:N \l__eb_compile_draft_bool
@@ -301,7 +301,7 @@
%</class>
%<*package>
\RequirePackage{etoolbox}
-\ProvidesExplPackage{easybase}{2024/07/09}{2024cp}
+\ProvidesExplPackage{easybase}{2024/07/12}{2024cq}
{Easily typesetting Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -1338,22 +1338,22 @@
\skip_if_eq:nnF { \eb@toc@lol@skip } { \c_zero_skip }
{ \addtocontents{lol}{\protect\addvspace{\skip_use:N \eb@toc@lol@skip}} }
}
-\cs_new_protected:Npn \eb_title_base_set_eq:nn #1#2
- {
- \tl_set_eq:cc { CTEX@#2@beforeskip } { CTEX@#1@beforeskip }
- \tl_set_eq:cc { CTEX@#2@afterskip } { CTEX@#1@afterskip }
- \bool_set_eq:cc { CTEX@#2@numbering } { CTEX@#1@numbering }
- \bool_set_eq:cc { CTEX@#2@fixskip } { CTEX@#1@fixskip }
- \bool_set_eq:cc { CTEX@#2@hang } { CTEX@#1@hang }
- \bool_set_eq:cc { CTEX@#2@runin } { CTEX@#1@runin }
- \cs_set_eq:cc { CTEX@#2@tocline } { CTEX@#1@tocline }
- \tl_set_eq:cc { CTEX@#2@break } { CTEX@#1@break }
- \tl_set_eq:cc { CTEX@#2@format } { CTEX@#1@format }
- \tl_set_eq:cc { CTEX@#2@nameformat } { CTEX@#1@nameformat }
- \tl_set_eq:cc { CTEX@#2@numberformat } { CTEX@#1@numberformat }
- \tl_set_eq:cc { CTEX@#2@titleformat } { CTEX@#1@titleformat }
- \tl_set_eq:cc { CTEX@#2@aftername } { CTEX@#1@aftername }
- \tl_set_eq:cc { CTEX@#2@aftertitle } { CTEX@#1@aftertitle }
+\cs_new_protected:Npn \CopyTitleFormat #1#2
+ {
+ \tl_set_eq:cc { CTEX@#1@beforeskip } { CTEX@#2@beforeskip }
+ \tl_set_eq:cc { CTEX@#1@afterskip } { CTEX@#2@afterskip }
+ \bool_set_eq:cc { CTEX@#1@numbering } { CTEX@#2@numbering }
+ \bool_set_eq:cc { CTEX@#1@fixskip } { CTEX@#2@fixskip }
+ \bool_set_eq:cc { CTEX@#1@hang } { CTEX@#2@hang }
+ \bool_set_eq:cc { CTEX@#1@runin } { CTEX@#2@runin }
+ \cs_set_eq:cc { CTEX@#1@tocline } { CTEX@#2@tocline }
+ \tl_set_eq:cc { CTEX@#1@break } { CTEX@#2@break }
+ \tl_set_eq:cc { CTEX@#1@format } { CTEX@#2@format }
+ \tl_set_eq:cc { CTEX@#1@nameformat } { CTEX@#2@nameformat }
+ \tl_set_eq:cc { CTEX@#1@numberformat } { CTEX@#2@numberformat }
+ \tl_set_eq:cc { CTEX@#1@titleformat } { CTEX@#2@titleformat }
+ \tl_set_eq:cc { CTEX@#1@aftername } { CTEX@#2@aftername }
+ \tl_set_eq:cc { CTEX@#1@aftertitle } { CTEX@#2@aftertitle }
}
\NewDocumentCommand{\NewTitleCommand}{omm}
{
@@ -1375,7 +1375,7 @@
{ \CTEXnumberline{##1}##2 }
\exp_args:Nc \providecommand { ttll@#2 }{#3}
\exp_args:Nc \providecommand { toclevel@#2 }{#3}
- \IfValueT{#1}{\eb_title_base_set_eq:nn {#1} {#2}}
+ \IfValueT{#1}{\CopyTitleFormat{#2}{#1}}
}
\NewDocumentCommand{\NewTitleEntryCommand}{O{toc}m}
{
@@ -2665,7 +2665,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2024/07/09}{2024cp}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/07/12}{2024cq}
{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
index 063fb7cd4c..f13ae4dde9 100644
--- a/macros/latex/contrib/easybook/easybook.pdf
+++ b/macros/latex/contrib/easybook/easybook.pdf
Binary files differ
diff --git a/macros/latex/contrib/easybook/easybook.tex b/macros/latex/contrib/easybook/easybook.tex
index 78a2bf0f49..04af78defe 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 = v2024cp,
- date = 2024/07/09,
+ version = v2024cq,
+ date = 2024/07/12,
authors = 瞿毅,
info = 简便地排版中文学位论文或书籍,
email = toquyi@163.com,
@@ -1052,6 +1052,12 @@ $\blacktriangleright$需要注意正确\textbf{编译索引}要增加 \code{-she
\lchapter{正常标题}
\lchapterentry{加入目录的标题}
\end{ctexexam}
+ \command{CopyTitleFormat}[\marg{条目名1}\marg{条目名2}]\newtagv{2024cq}%
+ 将名为 \meta{条目名2} 的章节标题命令除了编号/名字外的格式复制给名为 \meta{条目名1} 的标题命令。
+ \begin{ctexexam}
+ \ctexset{section/format = \sffamily\color{blue}}
+ \CopyTitleFormat{subsection}{section}
+ \end{ctexexam}
\end{cnltxlist}
\subsection[上标和下标]{上标和下标}
@@ -1451,6 +1457,7 @@ $\blacktriangleright$需要注意正确\textbf{编译索引}要增加 \code{-she
\end{version}
\shortversion{v = 2024ci,date = 2024/06/22,changes = 修复使用 \code{flush} 类型脚注报错。}
\shortversion{v = 2024co,date = 2024/07/06,changes = 目录命令的可选参数支持 \CTeX 键值列表所有路径的章节标题样式选项。}
+ \shortversion{v = 2024cq,date = 2024/07/12,changes = 新增章节标题格式复制命令 \cs{CopyTitleFormat}。}
\end{changelog}
\nocite{*}
% \AddToHook{cmd/printindex/before}{\clearpage}
diff --git a/macros/latex/contrib/tango/README b/macros/luatex/latex/tango/README
index e24d7a85ec..1d62186710 100644
--- a/macros/latex/contrib/tango/README
+++ b/macros/luatex/latex/tango/README
@@ -1,9 +1,14 @@
Tango is a LaTeX document class for use by mathematics teachers. It requires lualatex, some LaTeX packages (see the complete documentation for details), and a recent version of LaTeX (see paragraph 4 below).
-1 Version
-This version number is 0.7.1
+1 Versions history
+This version number is 0.7.2
+New in this version
+• correction of the countername in subparagraph definition for titlesec.
+• fix incorrect vertical space in the \exo command.
-2 Licence
+0.7.1 First release
+
+2 License
Tango is released under Latex public project licence (LPPL), version 1.3c
See https://www.latex-project.org/lppl/lppl-1-3c/
@@ -24,4 +29,7 @@ book-mathematics.tex
handout-euler.tex
handout-polynomes-deg2.tex
schoolwork.tex
-candide.tex (the result is best in the two-pages mode of your pdf viewer). \ No newline at end of file
+candide.tex (the result is best in the two-pages mode of your pdf viewer).
+
+6 Internet website (new french only for now)
+https://tango.mathriochka.net \ No newline at end of file
diff --git a/macros/latex/contrib/tango/doc/tango-en.pdf b/macros/luatex/latex/tango/doc/tango-en.pdf
index 17dd66dc4e..3447817ff1 100644
--- a/macros/latex/contrib/tango/doc/tango-en.pdf
+++ b/macros/luatex/latex/tango/doc/tango-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/tango/doc/tango-en.tex b/macros/luatex/latex/tango/doc/tango-en.tex
index ad6693fc5e..99a6399dce 100644
--- a/macros/latex/contrib/tango/doc/tango-en.tex
+++ b/macros/luatex/latex/tango/doc/tango-en.tex
@@ -27,7 +27,7 @@
\renewcommand{\arraystretch}{1.1}
\title{\textcolor{ColorOne}{\floweroneleft}\,The tango document class\,\textcolor{ColorOne}{\floweroneright}}
\author{\href{mailto:michel.bovani@icloud.com}{Michel \textsc{Bovani}}}
-\date{\today\\v. 0.7.1}
+\date{\today\\v. 0.7.2}
{\sffamily
\maketitle
diff --git a/macros/latex/contrib/tango/doc/tango-fr.pdf b/macros/luatex/latex/tango/doc/tango-fr.pdf
index 491f9742e7..08767d9155 100644
--- a/macros/latex/contrib/tango/doc/tango-fr.pdf
+++ b/macros/luatex/latex/tango/doc/tango-fr.pdf
Binary files differ
diff --git a/macros/latex/contrib/tango/doc/tango-fr.tex b/macros/luatex/latex/tango/doc/tango-fr.tex
index eb65bff081..06cd61f378 100644
--- a/macros/latex/contrib/tango/doc/tango-fr.tex
+++ b/macros/luatex/latex/tango/doc/tango-fr.tex
@@ -27,7 +27,7 @@
\renewcommand{\arraystretch}{1.1}
\title{\textcolor{ColorOne}{\floweroneleft}\,La classe de documents tango\,\textcolor{ColorOne}{\floweroneright}}
\author{\href{mailto:michel.bovani@icloud.com}{Michel \textsc{Bovani}}}
-\date{\today\\v. 0.7.1}
+\date{\today\\v. 0.7.2}
{\sffamily
\maketitle
diff --git a/macros/latex/contrib/tango/examples/Ch-1-15.tex b/macros/luatex/latex/tango/examples/Ch-1-15.tex
index 4f3d7984d1..4f3d7984d1 100644
--- a/macros/latex/contrib/tango/examples/Ch-1-15.tex
+++ b/macros/luatex/latex/tango/examples/Ch-1-15.tex
diff --git a/macros/latex/contrib/tango/examples/Ch-16-30.tex b/macros/luatex/latex/tango/examples/Ch-16-30.tex
index ca52af53a8..ca52af53a8 100644
--- a/macros/latex/contrib/tango/examples/Ch-16-30.tex
+++ b/macros/luatex/latex/tango/examples/Ch-16-30.tex
diff --git a/macros/latex/contrib/tango/examples/book-mathematics.tex b/macros/luatex/latex/tango/examples/book-mathematics.tex
index cbcebe1ae4..cbcebe1ae4 100644
--- a/macros/latex/contrib/tango/examples/book-mathematics.tex
+++ b/macros/luatex/latex/tango/examples/book-mathematics.tex
diff --git a/macros/latex/contrib/tango/examples/candide.tex b/macros/luatex/latex/tango/examples/candide.tex
index bd3432e7bf..bd3432e7bf 100644
--- a/macros/latex/contrib/tango/examples/candide.tex
+++ b/macros/luatex/latex/tango/examples/candide.tex
diff --git a/macros/latex/contrib/tango/examples/euler.tex b/macros/luatex/latex/tango/examples/euler.tex
index 4d3ea54571..4d3ea54571 100644
--- a/macros/latex/contrib/tango/examples/euler.tex
+++ b/macros/luatex/latex/tango/examples/euler.tex
diff --git a/macros/latex/contrib/tango/examples/handout-euler.tex b/macros/luatex/latex/tango/examples/handout-euler.tex
index 533d96b904..533d96b904 100644
--- a/macros/latex/contrib/tango/examples/handout-euler.tex
+++ b/macros/luatex/latex/tango/examples/handout-euler.tex
diff --git a/macros/latex/contrib/tango/examples/handout-polynomes-deg2.tex b/macros/luatex/latex/tango/examples/handout-polynomes-deg2.tex
index 3e260be4a9..3e260be4a9 100644
--- a/macros/latex/contrib/tango/examples/handout-polynomes-deg2.tex
+++ b/macros/luatex/latex/tango/examples/handout-polynomes-deg2.tex
diff --git a/macros/latex/contrib/tango/examples/polynome-deg2.tex b/macros/luatex/latex/tango/examples/polynome-deg2.tex
index bf91400a55..bf91400a55 100644
--- a/macros/latex/contrib/tango/examples/polynome-deg2.tex
+++ b/macros/luatex/latex/tango/examples/polynome-deg2.tex
diff --git a/macros/latex/contrib/tango/examples/puissance-cercle.tex b/macros/luatex/latex/tango/examples/puissance-cercle.tex
index 0263bcb20f..0263bcb20f 100644
--- a/macros/latex/contrib/tango/examples/puissance-cercle.tex
+++ b/macros/luatex/latex/tango/examples/puissance-cercle.tex
diff --git a/macros/latex/contrib/tango/examples/recurrence.tex b/macros/luatex/latex/tango/examples/recurrence.tex
index ee823068c4..ee823068c4 100644
--- a/macros/latex/contrib/tango/examples/recurrence.tex
+++ b/macros/luatex/latex/tango/examples/recurrence.tex
diff --git a/macros/latex/contrib/tango/examples/rel-bin.tex b/macros/luatex/latex/tango/examples/rel-bin.tex
index ae2633e9d5..ae2633e9d5 100644
--- a/macros/latex/contrib/tango/examples/rel-bin.tex
+++ b/macros/luatex/latex/tango/examples/rel-bin.tex
diff --git a/macros/latex/contrib/tango/examples/schoolwork.tex b/macros/luatex/latex/tango/examples/schoolwork.tex
index 9ea9f9a2f0..9ea9f9a2f0 100644
--- a/macros/latex/contrib/tango/examples/schoolwork.tex
+++ b/macros/luatex/latex/tango/examples/schoolwork.tex
diff --git a/macros/latex/contrib/tango/latex/tango.cls b/macros/luatex/latex/tango/latex/tango.cls
index d80d9bab10..7fad8c30d8 100644
--- a/macros/latex/contrib/tango/latex/tango.cls
+++ b/macros/luatex/latex/tango/latex/tango.cls
@@ -1,6 +1,6 @@
\NeedsTeXFormat{LaTeX2e}%
\ProvidesClass{tango}%
-[2024/07/08 v0.7.1 tango document class. Michel Bovani]% %
+[2024/07/11 v0.7.2 tango document class. Michel Bovani]% %
%
% Ensure luatex engine
\RequirePackage{iftex}[2019/10/24]
@@ -1022,7 +1022,7 @@ labelwidth=0.75\TgoStandardMargin, labelsep=0.25\TgoStandardMargin, itemindent=!
\titleformat{\subsection}{\color{ColorOne}\sffamily\fontseries{sb}\selectfont\large}{\thesubsection}{1em}{}%
\titleformat{\subsubsection}{\color{ColorOne}\sffamily\fontseries{sb}\selectfont}{\thesubsubsection}{0.7em}{}%
\titleformat{\paragraph}[runin]{\itshape}{\theparagraph.}{0.5em}{}[. — ]%
-\titleformat{\subparagraph}[runin]{}{\theparagraph.}{0.5em}{}[. — ]%
+\titleformat{\subparagraph}[runin]{}{\thesubparagraph.}{0.5em}{}[. — ]%
\titlespacing{\chapter}{\TgoTitleIndent}{0pt}{6ex}%
\titlespacing{\section}{\TgoTitleIndent}{12pt plus 5pt minus 4pt}{6pt plus 3pt minus 2pt}%
\titlespacing{\subsection}{\TgoTitleIndent}{12pt plus 5pt minus 4pt}{6pt plus 3pt minus 2pt}%
@@ -1505,8 +1505,9 @@ headheight=14pt,headsep=10pt,footskip=17pt}
{%
\renewcommand\TgoTempc{\TgoTempb}%
}%
-\par\indent
-\vspace{5pt plus 2pt minus 2pt}\par%
+\@afterindenttrue
+\vspace{5pt plus 2pt minus 2pt}
+\par%
\textsf{\fontseries{sb}\selectfont\TgoTempc}%
\par\nobreak\vspace{0pt plus 1pt}\par%
}%