diff options
Diffstat (limited to 'macros')
59 files changed, 175 insertions, 146 deletions
diff --git a/macros/latex/contrib/easybook/doc/easybook-demo.pdf b/macros/latex/contrib/easybook/doc/easybook-demo.pdf Binary files differindex e844013e3c..0422aff967 100644 --- a/macros/latex/contrib/easybook/doc/easybook-demo.pdf +++ b/macros/latex/contrib/easybook/doc/easybook-demo.pdf diff --git a/macros/latex/contrib/easybook/doc/easybook-demo.tex b/macros/latex/contrib/easybook/doc/easybook-demo.tex index f98cbd1907..5a587d21c1 100644 --- a/macros/latex/contrib/easybook/doc/easybook-demo.tex +++ b/macros/latex/contrib/easybook/doc/easybook-demo.tex @@ -58,9 +58,12 @@ }, hdrset = { - \easyhead[EC]{\color{SeaGreen}\kaishu\leftmark} - \easyhead[OC]{\color{SeaGreen}\kaishu\rightmark} - \easyhead[EL,OR]{\color{SeaGreen}\thepage} + head-foot = + { + \easyhead[EC]{\color{SeaGreen}\kaishu\leftmark} + \easyhead[OC]{\color{SeaGreen}\kaishu\rightmark} + \easyhead[EL,OR]{\color{SeaGreen}\thepage} + } }, tocset = { @@ -80,7 +83,7 @@ bibset = { backend = bibtex, - bibstyle = numerical + bib-style = numerical }, % secnumdepth = 2, % tocdepth = 2 @@ -95,7 +98,7 @@ \github~\url{https://github.com/texl3/easybook} \\ \edge~\url{https://latexstudio.net} } -\date{2021/03/06\hskip\ccwd\relax v1.23j} +\date{2021/03/08\hskip\ccwd\relax v1.23k} \frontmatter[roman] \maketitle diff --git a/macros/latex/contrib/easybook/doc/easybook.pdf b/macros/latex/contrib/easybook/doc/easybook.pdf Binary files differindex 7d3e9a99db..200e2d1a96 100644 --- a/macros/latex/contrib/easybook/doc/easybook.pdf +++ b/macros/latex/contrib/easybook/doc/easybook.pdf diff --git a/macros/latex/contrib/easybook/doc/easybook.tex b/macros/latex/contrib/easybook/doc/easybook.tex index caa87380f7..a2660c7585 100644 --- a/macros/latex/contrib/easybook/doc/easybook.tex +++ b/macros/latex/contrib/easybook/doc/easybook.tex @@ -3,7 +3,7 @@ \title{\sffamily easybook书籍文档类} \author{瞿毅} -\date{2021/03/06\hskip\ccwd\relax v1.23j\thanks{\url{https://gitee.com/texl3/easybook}}} +\date{2021/03/08\hskip\ccwd\relax v1.23k\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.23j}{2021/02/20}{重新定义文档结构划分命令。} +\changes{v1.23k}{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} @@ -132,8 +132,8 @@ uppercase = <(true)|false> \end{syntax} \changes{v1.10}{2021/01/08}{更改颜色实现方式与选项名。} -\changes{v1.23j}{2021/02/02}{noto风格的数学字体独立出来，可自定义设置。} -\changes{v1.23j}{2021/02/09}{增加控制页面横线粗细的选项。} +\changes{v1.23k}{2021/02/02}{noto风格的数学字体独立出来，可自定义设置。} +\changes{v1.23k}{2021/02/09}{增加控制页面横线粗细的选项。} \opt{style} 选项控制文章的风格。 \end{function} @@ -190,7 +190,7 @@ footnote = <(1)> \end{syntax} \changes{v1.21}{2021/01/12}{增加脚注线间的距离选项。} -\changes{v1.23j}{2021/02/09}{取消使用 \pkg{zhlineskip} 宏包设置数学间距。} +\changes{v1.23k}{2021/02/09}{取消使用 \pkg{zhlineskip} 宏包设置数学间距。} 行距因子用于设置各种行距倍数，只能是浮点数，不能带有长度单位。\tn{ctexset} 原有的行距选项\opt{linespread}失效。各行距既可在导言区全局设置也可正文中设置对后面生效，行距的意义为 \end{function} @@ -212,7 +212,7 @@ marginpart = <\tn{rmfamily}\tn{footnotesize}> \end{syntax} \changes{v1.10}{2021/01/08}{加入自定义非正文字体选项。} -\changes{v1.23j}{2021/02/08}{修复使用 \tn{zihao} 命令设置字体失效的问题。} +\changes{v1.23k}{2021/02/08}{修复使用 \tn{zihao} 命令设置字体失效的问题。} \end{function} \begin{optdesc} @@ -224,22 +224,22 @@ \end{optdesc} \subsection{参考文献} -\begin{function}[EXP,added = 2021-01-11,updated = 2021-02-23]{bibset/backend,bibset/bibstyle,bibset/citestyle,bibset/bibfile,\printbibliography} +\begin{function}[EXP,added = 2021-01-11,updated = 2021-03-08]{bibset/backend,bibset/bib-style,bibset/cite-style,bibset/bibfile,\printbibliography} \begin{syntax} backend = <(bibtex)|biblatex> - bibstyle = <(numerical)|authoryear|其它格式> - citestyle = <引用格式> + bib-style = <(numerical)|authoryear|其它格式> + cite-style = <标注风格> bibfile = <ref/refs.bib> \tn{printbibliography}\oarg{选项列表} \end{syntax} \changes{v1.21}{2021/01/11}{增加 \opt{bibset} 选项，可以使用 \hologo{BibTeX} 或 \hologo{biber} 编译参考文献。} -\changes{v1.23j}{2021/02/23}{使用 \opt{bibset} 选项时可设置标注风格。} +\changes{v1.23k}{2021/02/23}{使用 \opt{bibset} 选项时可设置标注风格。} \end{function} \begin{optdesc} \item[backend] 参考文献处理后端，默认用传统的 \hologo{BibTeX} 处理参考文献。 - \item[bibstyle] 参考文献格式为中国的参考文献推荐标准GB/T 7714-2015，有顺序编码制和著者-出版年制两种风格，理工科类一般使用顺序编码制，文科类一般使用著者-出版年制。若使用其它格式，使用 \hologo{BibTeX} 处理时需确保正确的 \opt{bst} 文件，使用 \hologo{biber} 处理可使用 \pkg{biblatex} 宏包支持的参考文献风格名称。 - \item[citestyle] 标注参考文献的风格，\opt{backend = bibtex} 选项下可使用 \opt{super}（上标标注，默认）或 \opt{numbers}（普通标注）等 \pkg{natbib} 宏包带有的标注风格，\opt{backend = biblatex} 选项下可使用 \pkg{biblatex} 宏包支持的标注风格名称。 + \item[bib-style] 参考文献格式为中国的参考文献推荐标准GB/T 7714-2015，有顺序编码制和著者-出版年制两种风格，理工科类一般使用顺序编码制，文科类一般使用著者-出版年制。若使用其它格式，使用 \hologo{BibTeX} 处理时需确保正确的 \opt{bst} 文件，使用 \hologo{biber} 处理可使用 \pkg{biblatex} 宏包支持的参考文献风格名称。 + \item[cite-style] 标注参考文献的风格，\opt{backend = bibtex} 选项下可使用 \opt{super}（上标标注，默认）或 \opt{numbers}（普通标注）等 \pkg{natbib} 宏包带有的标注风格，\opt{backend = biblatex} 选项下可使用 \pkg{biblatex} 宏包支持的标注风格名称。 \item[bibfile] 参考文献的数据文件，使用 \hologo{biber} 处理时要带有 \opt{bib} 后缀，默认为一个在 \opt{ref} 文件夹中以 \opt{refs.bib} 命名的文件。 \item[\tn{printbibliography}] 两种方式\textbf{均使用}此命令打印参考文献，其中可选项仅在 \hologo{biber} 处理时有效。 \end{optdesc} @@ -307,23 +307,29 @@ \end{function} \subsection{页眉页脚} -\begin{function}[EXP,added = 2021-01-13,updated = 2021-02-08]{hdrset,\easyhead,\easyfoot,...} +\begin{function}[EXP,added = 2021-01-13,updated = 2021-03-08]{hdrset/head-foot,hdrset/chap-mark,hdrset/sec-mark,\easyhead,\easyfoot,...} \begin{syntax} - hdrset = <载入 \opt{fancyhdr} 的设置> + head-foot = <页眉页脚中的内容> + chap-mark = <\tn{chaptermark} 标志命令 \tn{markboth} 中的内容> + sec-mark = <\tn{sectionmark} 标志命令 \tn{markright} 中的内容> \tn{easyhead}\oarg{位置}\marg{内容} \tn{easyfoot}\oarg{位置}\marg{内容} \end{syntax} \changes{v1.21}{2021/01/11}{修复单面文档时页眉横线消失的问题。} \changes{v1.21}{2021/01/13}{增加配置页眉页脚的选项。} -\opt{hdrset} 设置的命令由 \pkg{fancyhdr} 宏包提供支持，命令 \tn{easyhead} 和 \tn{easyfoot} 的含义与 \tn{fancyhead} 和 \tn{fancyfoot} 相同，设置的是一个名为 \opt{fancy} 的页面风格。\pkg{fancyhdr} 将页眉页脚分成了左中右和奇数页（odd）、偶数页（even）共12个部分，可选参数中E、O代表偶数、奇数，L、C、R代表左、中、右部分。单面打印时，含有偶数的选项无效。 +\changes{v1.23k}{2021/03/08}{优化页眉页脚设置，增加 \opt{chap-mark} 和 \opt{sec-mark} 选项。} +\opt{hdrset} 设置的命令由 \pkg{fancyhdr} 宏包提供支持，命令 \tn{easyhead} 和 \tn{easyfoot} 的含义与 \tn{fancyhead} 和 \tn{fancyfoot} 相同，它们用于 \opt{head-foot} 选项中，设置的是一个名为 \opt{fancy} 的页面风格。\pkg{fancyhdr} 将页眉页脚分成了左中右和奇数页（odd）、偶数页（even）共12个部分，可选参数中E、O代表偶数、奇数，L、C、R代表左、中、右部分。单面打印时，含有偶数的选项无效。 \begin{ctexexam} \ctexset { hdrset = { - \easyhead[ER]{\leftmark} - \easyhead[OL]{\rightmark} - \easyhead[EL,OR]{\textbf{\thepage}} + head-foot = + { + \easyhead[ER]{\leftmark} + \easyhead[OL]{\rightmark} + \easyhead[EL,OR]{\textbf{\thepage}} + } } } \end{ctexexam} @@ -432,7 +438,7 @@ \tn{item} <习题内容> \tn{end}\marg{exercise} \end{syntax} -\changes{v1.23j}{2021/02/08}{增加准确的习题盒子标题目录锚点。} +\changes{v1.23k}{2021/02/08}{增加准确的习题盒子标题目录锚点。} 习题环境 \opt{exercise} 的标题紧接上一节编号并加入目录与页眉，当使用星号环境时不进行编号。三个可选参数中颜色为自定义或 \pkg{xcolor} 包含的颜色名称，正文编号格式与小节 \ref{sort list} 排序列表相同，标题名默认为摘要，参数只能\textbf{从右往左}省略。 \begin{ctexexam} \begin{exercise}[LightYellow][1.][习题] diff --git a/macros/latex/contrib/easybook/doc/pages/chapter1.tex b/macros/latex/contrib/easybook/doc/pages/chapter1.tex index aa0beaed73..fa4dfb8869 100644 --- a/macros/latex/contrib/easybook/doc/pages/chapter1.tex +++ b/macros/latex/contrib/easybook/doc/pages/chapter1.tex @@ -24,19 +24,19 @@ \zhlipsum*[56][name = aspirin] \begin{equation} \begin{split} - \iint_{A}E\rho(\bm{v}\cdot\bm{n})\mathrm{d}A+\frac{\partial}{\partial t}\iiint_{V}E\rho \mathrm{d}V & = \frac{\delta Q}{\mathrm{d}t}-\frac{\delta W}{\mathrm{d}t} + \iint_{A}E\rho(\bm{v}\cdot\bm{n})\mathrm{d}A + \frac{\partial}{\partial t}\iiint_{V}E\rho \mathrm{d}V &= \frac{\delta Q}{\mathrm{d}t} - \frac{\delta W}{\mathrm{d}t} \\ - \iint_{A}\left(U+\frac{v^{2}}{2}+gz+\frac{P}{\rho}\right)\rho(\bm{v}\cdot\bm{n})\mathrm{d}A+\frac{\partial}{\partial t}\iiint_{V}E\rho\mathrm{d}V & = \frac{\delta Q}{\mathrm{d}t}-\frac{\delta W_{s}}{\mathrm{d}t} + \iint_{A}\left(U + \frac{v^{2}}{2} + gz + \frac{P}{\rho}\right)\rho(\bm{v}\cdot\bm{n})\mathrm{d}A + \frac{\partial}{\partial t}\iiint_{V}E\rho\mathrm{d}V &= \frac{\delta Q}{\mathrm{d}t} - \frac{\delta W_{s}}{\mathrm{d}t} \end{split} \end{equation} \zhlipsum*[42][name = aspirin] \begin{subnumcases}{y =} - C_1e^{r_1x}+C_2e^{r_2x} & \quad $p^2-4q > 0$ + C_1e^{r_1x} + C_2e^{r_2x} & \quad $p^2 - 4q > 0$ \\ - \left(C_1+C_2\right)e^{r_1x} & \quad $p^2-4q = 0$ + \left(C_1 + C_2\right)e^{r_1x} & \quad $p^2 - 4q = 0$ \\ - e^{\alpha x}\left(C_1\cos\beta x+C_2\sin\beta x\right) & \quad $p^2-4q < 0$ + e^{\alpha x}\left(C_1\cos\beta x + C_2\sin\beta x\right) & \quad $p^2 - 4q < 0$ \end{subnumcases} \zhlipsum*[57][name = aspirin] diff --git a/macros/latex/contrib/easybook/doc/pages/chapter2.tex b/macros/latex/contrib/easybook/doc/pages/chapter2.tex index 6c094eb9f6..01bfdf7dc2 100644 --- a/macros/latex/contrib/easybook/doc/pages/chapter2.tex +++ b/macros/latex/contrib/easybook/doc/pages/chapter2.tex @@ -15,9 +15,9 @@ \index{d@定理!g@高斯公式} 设空间闭区域$\Omega$是由分片光滑的闭曲面$\Sigma$围成，若函数$P(x,y,z)$，$Q(x,y,z)$，$R(x,y,z)$在$\Omega$上具有一节连续偏导数，则有 \begin{align} - \iiint_\Omega\left(\frac{\partial P}{\partial x}+\frac{\partial Q}{\partial y}+\frac{\partial R}{\partial x}\right)\mathrm{d}V & =\oiint_\Sigma P\mathrm{d}y\mathrm{d}z+Q\mathrm{d}z\mathrm{d}x+R\mathrm{d}x\mathrm{d}y + \iiint_\Omega\left(\frac{\partial P}{\partial x} + \frac{\partial Q}{\partial y} + \frac{\partial R}{\partial x}\right)\mathrm{d}V & =\oiint_\Sigma P\mathrm{d}y\mathrm{d}z + Q\mathrm{d}z\mathrm{d}x + R\mathrm{d}x\mathrm{d}y \\ - & =\oiint_\Sigma \left(P\cos\alpha+Q\cos\beta+R\cos\gamma\right)\mathrm{d}S + & =\oiint_\Sigma \left(P\cos\alpha + Q\cos\beta + R\cos\gamma\right)\mathrm{d}S \end{align} 这里$\Sigma$是整个边界曲面$\Omega$的外侧，$\cos\alpha,\cos\beta,\cos\gamma$是$\Sigma$在点$(x,y,z)$处的法向量的方向余弦。引用这个公式如\cref{theorem:gauss formula}。 \end{theorem} @@ -26,9 +26,9 @@ \index{d@定理!s@Stokes formula} Let $\Gamma$ be a piecewise smooth directed closed curve, $\Sigma$ is a piecewise smooth directed surface bounded by $\Gamma$, the side of $\Gamma$ and the positive direction of $\Sigma$ According to the right-hand rule, if the function $P(x,y,z)$, $Q(x,y,z)$, $R(x,y,z)$ has a first-order continuous deviation on the curve $\Sigma$ Derivative, then \begin{multline} - \iint_\Sigma\left(\frac{\partial R}{\partial y}-\frac{\partial Q}{\partial z}\right)\mathrm{d}y\mathrm{d}z+\left(\frac{\partial P}{\partial z}-\frac{\partial R}{\partial x}\right)\mathrm{d}z\mathrm{d}x+\left(\frac{\partial Q}{\partial x}-\frac{\partial P}{\partial y}\right)\mathrm{d}x\mathrm{d}y + \iint_\Sigma\left(\frac{\partial R}{\partial y} - \frac{\partial Q}{\partial z}\right)\mathrm{d}y\mathrm{d}z + \left(\frac{\partial P}{\partial z} - \frac{\partial R}{\partial x}\right)\mathrm{d}z\mathrm{d}x + \left(\frac{\partial Q}{\partial x} - \frac{\partial P}{\partial y}\right)\mathrm{d}x\mathrm{d}y \\ - = \oint_\Gamma P\mathrm{d}x+Q\mathrm{d}y+R\mathrm{d}z + = \oint_\Gamma P\mathrm{d}x + Q\mathrm{d}y + R\mathrm{d}z \end{multline} The Stokes formula is an extension of the basic calculus formula in the case of surface integration. It is also an extension of the Green formula. This formula gives the second type of surface integral on the surface block and the second type of curve on the boundary curve Link between points. \end{definition} @@ -68,11 +68,11 @@ The Stokes formula is an extension of the basic calculus formula in the case of \zhlipsum*[3][name = aspirin] \begin{exercise}[LightYellow][1.][习题] \index{x@习题环境} - \item 设$w = f(x+y+z,xyz)$，$f$具有二阶连续偏导数，求$\dfrac{{\partial w}}{{\partial x}}$和$\dfrac{{{\partial ^2}w}}{{\partial x\partial z}}$。 - \item 已知$y = y(x)$在任意点$x$处的增量$\Delta y = \dfrac{y\Delta x}{1+x^2}+\alpha$，其中$\alpha$是$\Delta x$的高阶无穷小（$\Delta x\to 0$时），$y(0) = \pi$，则$y(1) = \uline{\mbox{\hspace{2em}}}$。 - \item 设函数$f(x)$在$(-\infty,+\infty)$上有定义，则下述命题中正确的是 \mbox{(\hspace{1.5em})} + \item 设$w = f(x + y + z,xyz)$，$f$具有二阶连续偏导数，求$\dfrac{{\partial w}}{{\partial x}}$和$\dfrac{{{\partial ^2}w}}{{\partial x\partial z}}$。 + \item 已知$y = y(x)$在任意点$x$处的增量$\Delta y = \dfrac{y\Delta x}{1 + x^2} + \alpha$，其中$\alpha$是$\Delta x$的高阶无穷小（$\Delta x\to 0$时），$y(0) = \pi$，则$y(1) = \uline{\mbox{\hspace{2em}}}$。 + \item 设函数$f(x)$在$( - \infty, + \infty)$上有定义，则下述命题中正确的是 \mbox{(\hspace{1.5em})} \begin{tasks} - \task 若$f(x)$在$(-\infty,+\infty)$上可导且单调增加，则对一切$x\in (-\infty,+\infty)$，都有$f'(x) > 0$。 + \task 若$f(x)$在$( - \infty, + \infty)$上可导且单调增加，则对一切$x\in ( - \infty, + \infty)$，都有$f'(x) > 0$。 \task 若$f(x)$在点$x_0$处取得极值，则$f'(x_0) = 0$。 \task 若$f''(x_0) = 0$，则$(x_0,f(x_0))$是曲线$y = f(x)$的拐点坐标。 \task 若$f'(x_0) = 0$, $f''(x_0) = 0$,$f'''(x_0)\ne 0$，则$x_0$一定不是$f(x)$的极值点。 diff --git a/macros/latex/contrib/easybook/easybook.cls b/macros/latex/contrib/easybook/easybook.cls index 29fce05d8a..29fb884d84 100644 --- a/macros/latex/contrib/easybook/easybook.cls +++ b/macros/latex/contrib/easybook/easybook.cls @@ -9,7 +9,7 @@ %% https://creativecommons.org/licenses/by/4.0/legalcode \NeedsTeXFormat{LaTeX2e} \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2021/03/06}{1.23j}{} +\ProvidesExplClass{easybook}{2021/03/08}{1.23k}{} \cs_generate_variant:Nn \keys_define:nn {nx} \cs_generate_variant:Nn \int_to_arabic:n {v} @@ -103,6 +103,7 @@ bibset .meta:nn = {ctex/bibset}{#1}, thmset .meta:nn = {ctex/thmset}{#1}, geoset .meta:nn = {ctex/geoset}{#1}, + hdrset .meta:nn = {ctex/hdrset}{#1}, tocset .meta:nn = {ctex/tocset}{#1}, config .tl_set:N = \g__config_tl, lstlistlistingname .tl_set:N = \lstlistlistingname, @@ -321,14 +322,36 @@ \cs_gset_eq:NN \easyhead\fancyhead \cs_gset_eq:NN \easyfoot\fancyfoot \cs_gset_eq:NN \easypagestyle\fancypagestyle -\ctex_define:n +\__ctex_define:nn {hdrset} { - hdrset .tl_set:N = \l__fancyhf_content_tl, - hdrset .initial:n = + head-foot .tl_set:N = \l__fancyhf_content_tl, + head-foot .initial:n = { \easyhead[EC]{\color{ctex@frame}\kaishu\leftmark} \easyhead[OC]{\color{ctex@frame}\kaishu\rightmark} \easyhead[EL,OR]{\color{ctex@frame}\thepage} + }, + chap-mark .tl_set:N = \l__fancyhf_chap_mark_tl, + chap-mark .initial:n = + { + \int_compare:nT {\c@secnumdepth > -1} + { + \if@mainmatter + \ifodd\CTEX@chapter@numbering + \CTEXthechapter\hspace{\ccwd} + \fi + \fi + } + }, + sec-mark .tl_set:N = \l__fancyhf_sec_mark_tl, + sec-mark .initial:n = + { + \int_compare:nT {\c@secnumdepth > 0} + { + \ifodd\CTEX@section@numbering + \CTEXthesection\hspace{0.5\ccwd} + \fi + } } } \ctex_at_end_preamble:n @@ -343,26 +366,10 @@ \markboth { \bool_if:NT \l__uppercase_bool{\MakeUppercase} - { - \ifnum\c@secnumdepth>\m@ne - \if@mainmatter - \ifodd\CTEX@chapter@numbering - \CTEXthechapter\hspace{\ccwd} - \fi - \fi - \fi#1 - } + {\l__fancyhf_chap_mark_tl#1} }{ \bool_if:NT \l__uppercase_bool{\MakeUppercase} - { - \ifnum\c@secnumdepth>\m@ne - \if@mainmatter - \ifodd\CTEX@chapter@numbering - \CTEXthechapter\hspace{\ccwd} - \fi - \fi - \fi#1 - } + {\l__fancyhf_chap_mark_tl#1} } } \l__fancyhf_content_tl @@ -373,15 +380,7 @@ \markboth { \bool_if:NT \l__uppercase_bool{\MakeUppercase} - { - \ifnum\c@secnumdepth>\m@ne - \if@mainmatter - \ifodd\CTEX@chapter@numbering - \CTEXthechapter\hspace{\ccwd} - \fi - \fi - \fi#1 - } + {\l__fancyhf_chap_mark_tl#1} }{} } \l__fancyhf_content_tl @@ -392,13 +391,7 @@ \markright { \bool_if:NT \l__uppercase_bool{\MakeUppercase} - { - \ifnum\c@secnumdepth>\z@ - \ifodd\CTEX@section@numbering - \CTEXthesection\hspace{0.5\ccwd} - \fi - \fi#1 - } + {\l__fancyhf_sec_mark_tl#1} } } \cs_gset:Npn \headrule @@ -522,19 +515,26 @@ \cs_new_protected:Npn \__markboth:n #1 { \bool_if:NTF \l__page_twoside_bool - {\markboth{\MakeUppercase#1}{\MakeUppercase#1}} - {\markboth{\MakeUppercase#1}{}} + { + \markboth + {\bool_if:NT \l__uppercase_bool{\MakeUppercase}#1} + {\bool_if:NT \l__uppercase_bool{\MakeUppercase}#1} + }{ + \markboth + {\bool_if:NT \l__uppercase_bool{\MakeUppercase}#1} + {} + } } \cs_new_protected:Npn \__title_mark_intoc:n #1 { \chapter*{\phantomsection#1} \CTEX@addtocline{chapter}{#1} - \__markboth:n #1 + \__markboth:n {#1} } \cs_new_protected:Npn \__title_mark:n #1 { \chapter*{\phantomsection#1} - \__markboth:n #1 + \__markboth:n {#1} } \cs_gset:Npn \tableofcontents { @@ -635,7 +635,7 @@ } \__patch_cmd:Nnn \imki@indexheaders {\@mkboth{\MakeUppercase\indexname}{\MakeUppercase\indexname}} - {\__markboth:n \indexname} + {\__markboth:n {\indexname}} \tl_new:N \l__table_font_tl \tl_new:N \l__figure_font_tl @@ -1046,31 +1046,31 @@ \__ctex_define:nn {bibset} { - backend .choice:, - backend/bibtex .code:n = {}, - backend/biblatex .code:n = + backend .choice:, + backend/bibtex .code:n = {}, + backend/biblatex .code:n = {\bool_set_false:N \l__backend_bibtex_bool}, - bibstyle .choice:, - bibstyle .value_required:n = true, - bibstyle/numerical .code:n = + bib-style .choice:, + bib-style .value_required:n = true, + bib-style/numerical .code:n = { \tl_set:Nn \l__bib_style_tl{#1} \tl_clear:N \l__bib_mysty_tl }, - bibstyle/authoryear .code:n = + bib-style/authoryear .code:n = { \tl_set:Nn \l__bib_style_tl{#1} \tl_clear:N \l__bib_mysty_tl }, - bibstyle/unknown .code:n = + bib-style/unknown .code:n = {\tl_set_eq:NN \l__bib_mysty_tl\l_keys_value_tl}, - bibstyle .initial:n = numerical, + bib-style .initial:n = numerical, - citestyle .code:n = + cite-style .code:n = {\tl_set:Nn \l__bib_citesty_tl{#1}}, - bibfile .tl_set:N = \l__bib_file_tl, - bibfile .initial:n = ref/refs.bib + bibfile .tl_set:N = \l__bib_file_tl, + bibfile .initial:n = ref/refs.bib } \cs_new_protected:Npn \__bibtex_set: @@ -1092,7 +1092,7 @@ {\exp_args:NV \setcitestyle\l__bib_citesty_tl} \cs_set:Npn \bibsection{\__title_mark_intoc:n \bibname} \skip_set:Nn \bibsep{0ex} - \NewDocumentCommand\printbibliography{o} + \NewDocumentCommand{\printbibliography}{o} {\exp_args:NV \bibliography\l__bib_file_tl} } \cs_new_protected:Npn \__put_biblatex:n #1 @@ -1101,7 +1101,7 @@ { \tl_if_empty:NTF \l__bib_mysty_tl { - \tl_if_eq:VnT \l__bib_style_tl{number} + \tl_if_eq:VnT \l__bib_style_tl{numerical} {\__put_biblatex:n {style = gb7714-2015}} \tl_if_eq:VnT \l__bib_style_tl{authoryear} {\__put_biblatex:n {style = gb7714-2015ay}} diff --git a/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf b/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf Binary files differindex 1c0587d73d..d6ddd45937 100644 --- a/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf +++ b/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf diff --git a/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf b/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf Binary files differindex ca23dc8bd2..55d142af2e 100644 --- a/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf +++ b/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf diff --git a/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf b/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf Binary files differindex 32c10b641a..52e10b2057 100644 --- a/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf +++ b/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf diff --git a/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf b/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf Binary files differindex 713ae63aad..998177959c 100644 --- a/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf +++ b/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf diff --git a/macros/latex/contrib/reledmac/examples/1-tabular.pdf b/macros/latex/contrib/reledmac/examples/1-tabular.pdf Binary files differindex 5333254fa4..aec8073b5c 100644 --- a/macros/latex/contrib/reledmac/examples/1-tabular.pdf +++ b/macros/latex/contrib/reledmac/examples/1-tabular.pdf diff --git a/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf b/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf Binary files differindex ab9862489a..cba0531af6 100644 --- a/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf +++ b/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf diff --git a/macros/latex/contrib/reledmac/examples/1-verses.pdf b/macros/latex/contrib/reledmac/examples/1-verses.pdf Binary files differindex 01d05a49aa..228b70627d 100644 --- a/macros/latex/contrib/reledmac/examples/1-verses.pdf +++ b/macros/latex/contrib/reledmac/examples/1-verses.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-antilabe.pdf b/macros/latex/contrib/reledmac/examples/2-antilabe.pdf Binary files differindex 5646fb5622..3544ca7255 100644 --- a/macros/latex/contrib/reledmac/examples/2-antilabe.pdf +++ b/macros/latex/contrib/reledmac/examples/2-antilabe.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf b/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf Binary files differindex 9ae77067ff..3fa62022e0 100644 --- a/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf +++ b/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf b/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf Binary files differindex a70f8388cc..3d41bd0ac4 100644 --- a/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf +++ b/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-glossaries.pdf b/macros/latex/contrib/reledmac/examples/2-glossaries.pdf Binary files differindex 85464b2a44..557a885e62 100644 --- a/macros/latex/contrib/reledmac/examples/2-glossaries.pdf +++ b/macros/latex/contrib/reledmac/examples/2-glossaries.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-glossaries.tex b/macros/latex/contrib/reledmac/examples/2-glossaries.tex index 28e88cc1ea..ccc8d0c165 100644 --- a/macros/latex/contrib/reledmac/examples/2-glossaries.tex +++ b/macros/latex/contrib/reledmac/examples/2-glossaries.tex @@ -9,7 +9,7 @@ \usepackage[nocritical,noend,noeledsec,series={A},nofamiliar]{reledmac} -\usepackage{glossaries} +\usepackage{glossaries, glossaries-extra} \glsSetCompositor{-} \makeglossaries \newglossaryentry{monistero}{name={monistero},description={monastero}} diff --git a/macros/latex/contrib/reledmac/examples/2-indexing.pdf b/macros/latex/contrib/reledmac/examples/2-indexing.pdf Binary files differindex 4a63998d9c..1c95904047 100644 --- a/macros/latex/contrib/reledmac/examples/2-indexing.pdf +++ b/macros/latex/contrib/reledmac/examples/2-indexing.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf b/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf Binary files differindex d5e06e6b93..95ec71c6ee 100644 --- a/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf +++ b/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf b/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf Binary files differindex d971e5f2a1..b7110f0191 100644 --- a/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf +++ b/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-linespacing.pdf b/macros/latex/contrib/reledmac/examples/2-linespacing.pdf Binary files differindex bf497aa468..08d1604edd 100644 --- a/macros/latex/contrib/reledmac/examples/2-linespacing.pdf +++ b/macros/latex/contrib/reledmac/examples/2-linespacing.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf b/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf Binary files differindex 63bd1d3ab6..8b53eef328 100644 --- a/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf +++ b/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-notes-width.pdf b/macros/latex/contrib/reledmac/examples/2-notes-width.pdf Binary files differindex be206bf8ed..edfe84f457 100644 --- a/macros/latex/contrib/reledmac/examples/2-notes-width.pdf +++ b/macros/latex/contrib/reledmac/examples/2-notes-width.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf b/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf Binary files differindex 2457cac597..50daaa32d1 100644 --- a/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf +++ b/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-performances.pdf b/macros/latex/contrib/reledmac/examples/2-performances.pdf Binary files differindex 422c0e60a0..562be32f2c 100644 --- a/macros/latex/contrib/reledmac/examples/2-performances.pdf +++ b/macros/latex/contrib/reledmac/examples/2-performances.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf b/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf Binary files differindex 636f3da098..f0925c078e 100644 --- a/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf +++ b/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf b/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf Binary files differindex 9c3429b96d..b8bd11a686 100644 --- a/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf +++ b/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf Binary files differindex 0a26c9593a..62e7f9392d 100644 --- a/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf +++ b/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf b/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf Binary files differindex ebd3bba1bb..c99fc42632 100644 --- a/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf +++ b/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf Binary files differindex 30a8d95f43..612aef36a8 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf Binary files differindex a0f7c03ae7..264c3127e7 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf Binary files differindex b62895763d..f7df44052b 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf Binary files differindex 6f700386cd..5008b620e6 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf Binary files differindex d2537e9a69..c80f407333 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf Binary files differindex 7000f32f27..9dc7c4876d 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf Binary files differindex fc91fe4efd..d441a59733 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf Binary files differindex 30522f74ab..1bf544a515 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf Binary files differindex 91eecc07a2..7b6e3d3829 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf Binary files differindex 281208f8f7..8c47ab4918 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf Binary files differindex ad963fb22b..5c192d4b1a 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf Binary files differindex aaa5b15071..3c85efd97f 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf Binary files differindex 9d6f76e19c..9d407600c2 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf Binary files differindex c915cf9fb4..75123ed947 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf Binary files differindex 096ca85817..ba289c1ab0 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf Binary files differindex d1c331140e..c09c66b4e2 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf Binary files differindex 03adf25176..e94e68bcab 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf Binary files differindex 5e48abecca..88c67bd0b9 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf Binary files differindex 31556cc621..5b8022b521 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf Binary files differindex 616cbd578d..e20e036604 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf Binary files differindex 2df6439270..2f8fd1a4aa 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf Binary files differindex a8b7028e9c..4250071048 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf Binary files differindex 021b564062..cea68e3072 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf diff --git a/macros/latex/contrib/reledmac/migration.pdf b/macros/latex/contrib/reledmac/migration.pdf Binary files differindex 04b799404a..0fa30756fd 100644 --- a/macros/latex/contrib/reledmac/migration.pdf +++ b/macros/latex/contrib/reledmac/migration.pdf diff --git a/macros/latex/contrib/reledmac/reledmac.dtx b/macros/latex/contrib/reledmac/reledmac.dtx index 7fe954be7f..7535c44e0e 100644 --- a/macros/latex/contrib/reledmac/reledmac.dtx +++ b/macros/latex/contrib/reledmac/reledmac.dtx @@ -156,7 +156,7 @@ % \my@changes#1.\@nil % }% %\makeatother -% \newcommand{\edmac}{\protect\package{edmac}\xspace} +% \newcommand{\edmac}{\protect\package{EDMAC}\xspace} % \newcommand{\tabmac}{\protect\package{tabmac}\xspace} % \newcommand{\edstanza}{\protect\package{edstanza}\xspace} @@ -577,16 +577,19 @@ % \changes{v2.37.0}{2021/02/28}{Fix incompatibility between \protect\cs{eledsection} (and related) and \protect\package{hyperref}. Incompatibility was introduced by some changes in \protect\package{hyperref} package.} % \changes{v2.37.0}{2021/02/28}{Fix bug with \protect\cs{Xnonote}} % \changes{v2.37.0}{2021/02/28}{Improve syntaxis check.} +% \changes{v2.37.1}{2021/03/08}{Fix bug with \protect\cs{edgls} and related in \protect\cs{edtext} argument. Require \protect\package{glossaries-extra} is \protect\package{glossaries} is loaded.} % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} % % \author{% % Ma\"ieul Rouquette\thanks{\texttt{maieul at maieul dot net}} \\ -% {\small based on the original \protect\package{ledmac} by} \\ +% {\small based on the \protect\package{ledmac} by} \\ % Peter Wilson \\ % Herries Press \\ -% {\small which was based on the original \edmac, \tabmac{} and \edstanza{} by} \\ -% John Lavagnino, Dominik Wujastyk, Herbert Breger and Wayne Sullivan. +% {\small with the \edmac\ plugins \tabmac{} and \edstanza{} by}\\ +% Herbert Breger and Wayne Sullivan, +% {\small all based on \edmac\ by} \\ +% John Lavagnino and Dominik Wujastyk % } % % \date{} @@ -3818,6 +3821,8 @@ % \section{Glossary} % \Macpackage\ provides mechanism to make glossaries with the \package{glossaries} package, refering not to the page, but to the page and line. % \subsection{Preamble setting} +% When using \macpackage\ with \package{glossaries}, you must use also \package{glossaries-extra}. +% % The standard compositor between page and line number in \macpackage\ is a dash, while \package{glossaries} uses, by default, a dot. % Consequently, you must: % \begin{itemize} @@ -4463,7 +4468,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2021/02/28 v2.37.0 typesetting critical editions]% +\ProvidesPackage{reledmac}[2021/03/08 v2.37.1 typesetting critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -5043,6 +5048,13 @@ }% % \end{macrocode} % \end{macro} +% \begin{macro}{\led@error@require@glossariesextra} +% \begin{macrocode} +\newcommand{\led@error@require@glossariesextra}{% + \reledmac@error{When using both reledmac and glossaries, you must also use glossaries-extra}{\@ehc}% +}% +% \end{macrocode} +% \end{macro} % \begin{macro}{\led@error@fail@patch@@makecol} % \begin{macrocode} \newcommand{\led@error@fail@patch@@makecol}{% @@ -18760,6 +18772,8 @@ % \begin{macrocode} \AtBeginDocument{% \@ifpackageloaded{glossaries}{% + \@ifpackageloaded{glossaries-extra}{}{\led@error@require@glossariesextra}% + \newif\ifl@noexpands@edgl%A boolean switched to true in \no@expands % \end{macrocode} % First those which arguments are \oarg{options}\marg{label}\oarg{insert}. % \begin{macrocode} @@ -18811,17 +18825,25 @@ \renewcommand{\do}[1]{% \expandafter\DeclareRobustCommandx\csname ed#1\endcsname[3][1,3,usedefault]{% \doedindexlabel% - \ifdef{\hypertarget}{% - \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% - }{}% - \csname#1\endcsname[counter=pageline,##1]{##2}[##3]% + \ifl@noexpands@edgl% + \csname#1\endcsname[counter=pageline,noindex,##1]{##2}[##3]% + \else% + \ifdef{\hypertarget}{% + \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% + }{}% + \csname#1\endcsname[counter=pageline,##1]{##2}[##3]% + \fi% }% \expandafter\WithSuffix\expandafter\DeclareRobustCommandx\csname ed#1\endcsname*[3][1,3,usedefault]{% \doedindexlabel% - \ifdef{\hypertarget}{% - \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% - }{}% - \csname#1\endcsname*[counter=pageline,##1]{##2}[##3]% + \ifl@noexpands@edgl% + \csname#1\endcsname*[counter=pageline,noindex,##1]{##2}[##3]% + \else% + \csname#1\endcsname*[counter=pageline,##1]{##2}[##3]% + \ifdef{\hypertarget}{% + \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% + }{}% + \fi% }% }% \dolistloop{\edglsomo}% @@ -18834,17 +18856,25 @@ \renewcommand{\do}[1]{% \expandafter\DeclareRobustCommandx\csname ed#1\endcsname[3][1,usedefault]{% \doedindexlabel% - \ifdef{\hypertarget}{% - \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% - }{}% - \csname#1\endcsname[counter=pageline,##1]{##2}{##3}% + \ifl@noexpands@edgl% + \csname#1\endcsname[counter=pageline,noindex,##1]{##2}{##3}% + \else% + \ifdef{\hypertarget}{% + \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% + }{}% + \csname#1\endcsname[counter=pageline,##1]{##2}{##3}% + \fi% }% \expandafter\WithSuffix\expandafter\DeclareRobustCommandx\csname ed#1\endcsname*[3][1,usedefault]{% \doedindexlabel% - \ifdef{\hypertarget}{% - \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% - }{}% - \csname#1\endcsname*[counter=pageline,##1]{##2}{##3}% + \ifl@noexpands@edgl% + \csname#1\endcsname*[counter=pageline,noindex,##1]{##2}{##3}% + \else% + \ifdef{\hypertarget}{% + \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% + }{}% + \csname#1\endcsname*[counter=pageline,##1]{##2}{##3}% + \fi% }% }% \dolistloop{\edglsomm}% @@ -18856,44 +18886,34 @@ \renewcommand{\do}[1]{% \expandafter\DeclareRobustCommandx\csname ed#1\endcsname[2][1,usedefault]{% \doedindexlabel% - \ifdef{\hypertarget}{% - \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% - }{}% - \csname#1\endcsname[counter=pageline,##1]{##2}% + \ifl@noexpands@edgl% + \csname#1\endcsname[counter=pageline,noindex,##1]{##2}% + \else% + \ifdef{\hypertarget}{% + \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% + }{}% + \csname#1\endcsname[counter=pageline,##1]{##2}% + \fi% }% \expandafter\WithSuffix\expandafter\DeclareRobustCommandx\csname ed#1\endcsname*[2][1,usedefault]{% \doedindexlabel% - \ifdef{\hypertarget}{% - \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% - }{}% - \csname#1\endcsname*[counter=pageline,##1]{##2}% + \ifl@noexpands@edgl% + \csname#1\endcsname*[counter=pageline,noindex,##1]{##2}% + \else% + \ifdef{\hypertarget}{% + \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% + }{}% + \csname#1\endcsname*[counter=pageline,##1]{##2}% + \fi% }% }% \dolistloop{\edglsom}% % \end{macrocode} -% \cs{l@noexpands@edgl} is a macro to avoid expanding glossaries macros in \cs{edtext} first argument. It is called by \cs{no@expands}. +% \cs{l@noexpands@edgl} is a macro to switch \cs{ifl@noexpands@edgl} to true in \cs{no@expands}. % Its definition is made dynamically. % \begin{macro}{\l@noexpands@edgl} % \begin{macrocode} - \def\l@noexpands@edgl{}% - \renewcommand\do[1]{% - \xappto\l@noexpands@edgl{% - \noexpand\RenewDocumentCommand\csname ed#1\endcsname{omos}{}% - }% - }% - \dolistloop{\edglsomo}% - \renewcommand\do[1]{% - \xappto\l@noexpands@edgl{% - \noexpand\RenewDocumentCommand\csname ed#1\endcsname{omms}{}% - }% - }% - \dolistloop{\edglsomm}% - \renewcommand\do[1]{% - \xappto\l@noexpands@edgl{% - \noexpand\RenewDocumentCommand\csname ed#1\endcsname{oms}{}% - }% - }% - \dolistloop{\edglsom}% + \def\l@noexpands@edgl{\l@noexpands@edgltrue}% }{\let\l@noexpands@edgl\relax}% }% % \end{macrocode} diff --git a/macros/latex/contrib/reledmac/reledmac.pdf b/macros/latex/contrib/reledmac/reledmac.pdf Binary files differindex b5df111969..26e04e5fd9 100644 --- a/macros/latex/contrib/reledmac/reledmac.pdf +++ b/macros/latex/contrib/reledmac/reledmac.pdf diff --git a/macros/latex/contrib/reledmac/reledpar.dtx b/macros/latex/contrib/reledmac/reledpar.dtx index b460ec7a22..4fe935f799 100644 --- a/macros/latex/contrib/reledmac/reledpar.dtx +++ b/macros/latex/contrib/reledmac/reledpar.dtx @@ -58,7 +58,7 @@ \CodelineIndex \RecordChanges \renewcommand{\MakeUppercase}[1]{#1} - \newcommand{\edmac}{\protect\package{edmac}\xspace} + \newcommand{\edmac}{\protect\package{EDMAC}\xspace} \newcommand{\tabmac}{\protect\package{tabmac}\xspace} \newcommand{\edstanza}{\protect\package{edstanza}\xspace} @@ -1405,7 +1405,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2021/01/21 v2.25.1 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2021/03/08 v2.25.1a reledmac extension for parallel texts]% % \end{macrocode} % \subsection{Package's requirement} diff --git a/macros/latex/contrib/reledmac/reledpar.pdf b/macros/latex/contrib/reledmac/reledpar.pdf Binary files differindex 325e3f8611..80a0afcce9 100644 --- a/macros/latex/contrib/reledmac/reledpar.pdf +++ b/macros/latex/contrib/reledmac/reledpar.pdf |