texlive[57980] Master/texmf-dist: easybook (27feb21)
commits+karl at tug.org
commits+karl at tug.org
Sat Feb 27 22:42:56 CET 2021
Revision: 57980
http://tug.org/svn/texlive?view=revision&revision=57980
Author: karl
Date: 2021-02-27 22:42:56 +0100 (Sat, 27 Feb 2021)
Log Message:
-----------
easybook (27feb21)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/easybook/chapter3.tex
trunk/Master/texmf-dist/doc/latex/easybook/easybook-demo.pdf
trunk/Master/texmf-dist/doc/latex/easybook/easybook-demo.tex
trunk/Master/texmf-dist/doc/latex/easybook/easybook.pdf
trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex
trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls
Modified: trunk/Master/texmf-dist/doc/latex/easybook/chapter3.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/easybook/chapter3.tex 2021-02-27 21:42:43 UTC (rev 57979)
+++ trunk/Master/texmf-dist/doc/latex/easybook/chapter3.tex 2021-02-27 21:42:56 UTC (rev 57980)
@@ -33,7 +33,7 @@
\clearpage
\section{引用}
\index{y@引用}
-\zhlipsum[8][name = aspirin]
+
\subsection{索引}
\index{y@引用!s@索引}
\zhlipsum[8][name = aspirin]
Modified: trunk/Master/texmf-dist/doc/latex/easybook/easybook-demo.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/easybook/easybook-demo.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/easybook/easybook-demo.tex 2021-02-27 21:42:43 UTC (rev 57979)
+++ trunk/Master/texmf-dist/doc/latex/easybook/easybook-demo.tex 2021-02-27 21:42:56 UTC (rev 57980)
@@ -16,7 +16,8 @@
% perpart = true,
perpage = true,
% notomath = false,
- rulewidth = 0.75pt
+ rulewidth = 0.75pt,
+ % uppercase = false
},
link =
{
@@ -57,9 +58,9 @@
},
hdrset =
{
- \easyhead[EC]{\color{DarkViolet}\kaishu\leftmark}
- \easyhead[OC]{\color{DarkViolet}\kaishu\rightmark}
- \easyhead[EL,OR]{\color{DarkViolet}\thepage}
+ \easyhead[EC]{\color{SeaGreen}\kaishu\leftmark}
+ \easyhead[OC]{\color{SeaGreen}\kaishu\rightmark}
+ \easyhead[EL,OR]{\color{SeaGreen}\thepage}
},
tocset =
{
@@ -85,20 +86,17 @@
% tocdepth = 2
}
-\AfterPreamble
+\begin{document}
+\title{\sffamily easybook书籍文档类}
+\author
{
- \title{\sffamily easybook书籍文档类}
- \author
- {
- 瞿毅\thanks{texeasybook at foxmail.com.} \\
- \git~\url{https://gitee.com/texl3/easybook}\thanks{Gitee为项目的主要发布地址。} \\
- \github~\url{https://github.com/texl3/easybook} \\
- \edge~\url{https://latexstudio.net}
- }
- \date{2021/02/23\hskip\ccwd\relax v1.23g}
+ 瞿毅\thanks{texeasybook at foxmail.com.} \\
+ \git~\url{https://gitee.com/texl3/easybook}\thanks{Gitee为项目的主要发布地址。} \\
+ \github~\url{https://github.com/texl3/easybook} \\
+ \edge~\url{https://latexstudio.net}
}
+\date{2021/02/27\hskip\ccwd\relax v1.23h}
-\begin{document}
\frontmatter[roman]
\maketitle
\tableofcontents
Modified: trunk/Master/texmf-dist/doc/latex/easybook/easybook.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex 2021-02-27 21:42:43 UTC (rev 57979)
+++ trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex 2021-02-27 21:42:56 UTC (rev 57980)
@@ -3,7 +3,7 @@
\title{\sffamily easybook书籍文档类}
\author{瞿毅}
-\date{2021/02/23\hskip\ccwd\relax v1.23g\thanks{\url{https://gitee.com/texl3/easybook}}}
+\date{2021/02/27\hskip\ccwd\relax v1.23h\thanks{\url{https://gitee.com/texl3/easybook}}}
\begin{document}
\maketitle
@@ -98,7 +98,7 @@
\tn{frontmatter}\oarg{编号格式|(Roman)}
\tn{printindex}\oarg{索引名}
\end{syntax}
-\changes{v1.23g}{2021/02/20}{重新定义文档结构划分命令。}
+\changes{v1.23h}{2021/02/20}{重新定义文档结构划分命令。}
\tn{frontmatter} 为前言区命令，章标题不编号，页码可设置为例如 \opt{roman}、\opt{Alph} 等格式，带有星号的命令 \tn{frontmatter*} 不使用 \tn{cleardoublepage}。\tn{mainmatter} 为主文区命令，章标题正常编号且页码为从1开始计数的阿拉伯数字，\tn{mainmatter*} 命令不使用 \tn{cleardoublepage}。\tn{backmatter} 为后记区命令，页码格式与编号保持不变，章标题不编号。\tn{listoffigures} 命令输出图片目录，\tn{listoftables} 命令输出表格目录，\tn{listoflistings} 命令输出代码目录。
\end{function}
@@ -119,7 +119,7 @@
\end{function}
\subsection{风格}
-\begin{function}[EXP,added = 2021-01-05,updated = 2021-02-09]{style/color,style/capdash,style/multoc,style/withpart,style/perpart,style/perpage,style/notomath,style/rulewidth}
+\begin{function}[EXP,added = 2021-01-05,updated = 2021-02-27]{style/color,style/capdash,style/multoc,style/withpart,style/perpart,style/perpage,style/notomath,style/rulewidth,style/uppercase}
\begin{syntax}
color = <(none)|seaside|energy|cyberpunk>
capdash = <true|(false)>
@@ -129,10 +129,11 @@
perpage = <true|(false)>
notomath = <(true)|false>
rulewidth = <(0.75pt)>
+ uppercase = <(true)|false>
\end{syntax}
\changes{v1.10}{2021/01/08}{更改颜色实现方式与选项名。}
-\changes{v1.23g}{2021/02/02}{noto风格的数学字体独立出来，可自定义设置。}
-\changes{v1.23g}{2021/02/09}{增加控制页面横线粗细的选项。}
+\changes{v1.23h}{2021/02/02}{noto风格的数学字体独立出来，可自定义设置。}
+\changes{v1.23h}{2021/02/09}{增加控制页面横线粗细的选项。}
\opt{style} 选项控制文章的风格。
\end{function}
@@ -152,6 +153,7 @@
\item[perpage] 使脚注跟随每一页编号，默认不跟随。
\item[notomath] 使用 \opt{noto} 风格的数学字体，将会加载 \pkg{newtxmath} 宏包。
\item[rulewidth] 调整页眉、定理盒子以及代码框线条的粗细。
+ \item[uppercase] 使用 \tn{rightmark} 及 \tn{leftmark} 获取标题内容设置页眉页脚时英文是否大小写。
\end{optdesc}
\subsection{超链接}
@@ -188,7 +190,7 @@
footnote = <(1)>
\end{syntax}
\changes{v1.21}{2021/01/12}{增加脚注线间的距离选项。}
-\changes{v1.23g}{2021/02/09}{取消使用 \pkg{zhlineskip} 宏包设置数学间距。}
+\changes{v1.23h}{2021/02/09}{取消使用 \pkg{zhlineskip} 宏包设置数学间距。}
行距因子用于设置各种行距倍数，只能是浮点数，不能带有长度单位。\tn{ctexset} 原有的行距选项\opt{linespread}失效。各行距既可在导言区全局设置也可正文中设置对后面生效，行距的意义为
\end{function}
@@ -210,7 +212,7 @@
marginpart = <\tn{rmfamily}\tn{footnotesize}>
\end{syntax}
\changes{v1.10}{2021/01/08}{加入自定义非正文字体选项。}
-\changes{v1.23g}{2021/02/08}{修复使用 \tn{zihao} 命令设置字体失效的问题。}
+\changes{v1.23h}{2021/02/08}{修复使用 \tn{zihao} 命令设置字体失效的问题。}
\end{function}
\begin{optdesc}
@@ -231,7 +233,7 @@
\tn{printbibliography}\oarg{选项列表}
\end{syntax}
\changes{v1.21}{2021/01/11}{增加 \opt{bibset} 选项，可以使用 \hologo{BibTeX} 或 \hologo{biber} 编译参考文献。}
-\changes{v1.23g}{2021/02/23}{使用 \opt{bibset} 选项时可设置标注风格。}
+\changes{v1.23h}{2021/02/23}{使用 \opt{bibset} 选项时可设置标注风格。}
\end{function}
\begin{optdesc}
@@ -430,7 +432,7 @@
\tn{item} <习题内容>
\tn{end}\marg{exercise}
\end{syntax}
-\changes{v1.23g}{2021/02/08}{增加准确的习题盒子标题目录锚点。}
+\changes{v1.23h}{2021/02/08}{增加准确的习题盒子标题目录锚点。}
习题环境 \opt{exercise} 的标题紧接上一节编号并加入目录与页眉，当使用星号环境时不进行编号。三个可选参数中颜色为自定义或 \pkg{xcolor} 包含的颜色名称，正文编号格式与小节 \ref{sort list} 排序列表相同，标题名默认为摘要，参数只能\textbf{从右往左}省略。
\begin{ctexexam}
\begin{exercise}[LightYellow][1.][习题]
Modified: trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls 2021-02-27 21:42:43 UTC (rev 57979)
+++ trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls 2021-02-27 21:42:56 UTC (rev 57980)
@@ -9,7 +9,7 @@
%% https://creativecommons.org/licenses/by/4.0/legalcode
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/02/23}{1.23g}{}
+\ProvidesExplClass{easybook}{2021/02/27}{1.23h}{}
\cs_generate_variant:Nn \keys_define:nn {nx}
\cs_generate_variant:Nn \int_to_arabic:n {v}
@@ -91,6 +91,7 @@
\bool_new:N \l__foot_perpart_bool
\bool_new:N \l__foot_perpage_bool
\bool_new:N \l__notomath_bool
+\bool_new:N \l__uppercase_bool
\tl_new:N \g__config_tl
\ctex_define:n
@@ -128,7 +129,10 @@
notomath .default:n = true,
notomath .initial:n = true,
rulewidth .dim_set:N = \l__rule_width_dim,
- rulewidth .initial:n = 0.75pt
+ rulewidth .initial:n = 0.75pt,
+ uppercase .bool_set:N = \l__uppercase_bool,
+ uppercase .default:n = true,
+ uppercase .initial:n = true
}
\clist_map_inline:nn
@@ -338,7 +342,7 @@
{
\markboth
{
- \MakeUppercase
+ \bool_if:NT \l__uppercase_bool{\MakeUppercase}
{
\ifnum\c at secnumdepth>\m at ne
\if at mainmatter
@@ -349,7 +353,7 @@
\fi#1
}
}{
- \MakeUppercase
+ \bool_if:NT \l__uppercase_bool{\MakeUppercase}
{
\ifnum\c at secnumdepth>\m at ne
\if at mainmatter
@@ -368,7 +372,7 @@
{
\markboth
{
- \MakeUppercase
+ \bool_if:NT \l__uppercase_bool{\MakeUppercase}
{
\ifnum\c at secnumdepth>\m at ne
\if at mainmatter
@@ -387,11 +391,14 @@
{
\markright
{
- \ifnum\c at secnumdepth>\z@
- \ifodd\CTEX at section@numbering
- \CTEXthesection\hspace{0.5\ccwd}
- \fi
- \fi#1
+ \bool_if:NT \l__uppercase_bool{\MakeUppercase}
+ {
+ \ifnum\c at secnumdepth>\z@
+ \ifodd\CTEX at section@numbering
+ \CTEXthesection\hspace{0.5\ccwd}
+ \fi
+ \fi#1
+ }
}
}
\cs_gset:Npn \headrule
@@ -989,7 +996,7 @@
\refstepcounter{section}
\markright{\CTEXthesection\hspace{0.5\ccwd}#4}
\CTEX at addtocline{section}{#4}
- },
+ }
]{\IfBooleanF{#1}{\CTEXthesection\hspace{0.5\ccwd}}#4}
}{
\sffamily\Large
@@ -1167,7 +1174,7 @@
{
language = [LaTeX]TeX,
texcsstyle =
- *\lst at ifdisplaystyle\bfseries\color{ctex at emph}\else\color{ctex at verb}\fi,
+ *\lst at ifdisplaystyle\bfseries\color{ctex at verb}\else\color{ctex at verb}\fi,
basicstyle =
\ttfamily\lst at ifdisplaystyle\small\else\color{ctex at verb}\fi,
framexleftmargin = 0pt,
@@ -1182,7 +1189,7 @@
emphstyle = \color{ctex at emph},
emph = {caption,makecell,subcaption,tabularx},
keywordstyle =
- \lst at ifdisplaystyle\bfseries\color{ctex at emph}\else\color{ctex at verb}\fi,
+ \lst at ifdisplaystyle\bfseries\color{ctex at verb}\else\color{ctex at verb}\fi,
morekeywords =
{
includegraphics,setmainfont,setsansfont,setmonofont,setCJKmainfont,setCJKsansfont,setCJKmonofont,setCJKfamilyfont,RequirePackage
@@ -1284,7 +1291,7 @@
\clist_map_function:nN
{
{none, 000000,000000,000000},
- {seaside, 1381b2,004986,a40000},
+ {seaside, 4682B4,004986,a40000},
{energy, f39800,00a0e9,893895},
{cyberpunk, 601986,eb6877,a4005b}
}
More information about the tex-live-commits
mailing list.