From f6b069c5441e2ba598b97c269ac8d00977606ef6 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sat, 30 Oct 2021 03:00:57 +0000 Subject: CTAN sync 202110300300 --- macros/latex/contrib/biblatex2bibitem/README.md | 8 +- .../biblatex2bibitem/biblatex2bibitem-examples.bib | 3 +- .../biblatex2bibitem-hyperref-result.pdf | Bin 0 -> 126889 bytes .../biblatex2bibitem-hyperref-result.tex | 80 ++++ .../biblatex2bibitem/biblatex2bibitem-hyperref.pdf | Bin 0 -> 132428 bytes .../biblatex2bibitem/biblatex2bibitem-hyperref.tex | 43 +++ .../biblatex2bibitem-mwe-result.pdf | Bin 0 -> 125439 bytes .../biblatex2bibitem-mwe-result.tex | 60 +++ .../biblatex2bibitem/biblatex2bibitem-mwe.pdf | Bin 121133 -> 130518 bytes .../biblatex2bibitem-new-result.pdf | Bin 0 -> 127158 bytes .../biblatex2bibitem/biblatex2bibitem-new.pdf | Bin 0 -> 132428 bytes .../contrib/biblatex2bibitem/biblatex2bibitem.sty | 26 +- macros/latex/contrib/ccref/LICENSE | 416 +++++++++++++++++++++ macros/latex/contrib/ccref/README.md | 59 +++ macros/latex/contrib/ccref/ccref-doc.pdf | Bin 0 -> 95346 bytes macros/latex/contrib/ccref/ccref-doc.tex | 210 +++++++++++ macros/latex/contrib/ccref/ccref.sty | 136 +++++++ macros/latex/contrib/easybook/easybook.dtx | 6 +- macros/latex/contrib/easybook/easybook.pdf | Bin 584984 -> 581908 bytes macros/latex/contrib/easybook/easybook.tex | 59 ++- macros/latex/contrib/spbmark/spbmark.pdf | Bin 66032 -> 67357 bytes macros/latex/contrib/spbmark/spbmark.sty | 47 ++- macros/latex/contrib/spbmark/spbmark.tex | 14 +- macros/latex/contrib/unicodefonttable/TODO.md | 9 + macros/latex/contrib/unicodefonttable/changes.txt | 5 + .../unicodefonttable/unicodefonttable-code.pdf | Bin 890196 -> 1032003 bytes .../unicodefonttable/unicodefonttable-doc.pdf | Bin 707853 -> 851938 bytes .../unicodefonttable/unicodefonttable-samples.pdf | Bin 742559 -> 742583 bytes .../contrib/unicodefonttable/unicodefonttable.dtx | 75 +++- 29 files changed, 1178 insertions(+), 78 deletions(-) create mode 100644 macros/latex/contrib/biblatex2bibitem/biblatex2bibitem-hyperref-result.pdf create mode 100644 macros/latex/contrib/biblatex2bibitem/biblatex2bibitem-hyperref-result.tex create mode 100644 macros/latex/contrib/biblatex2bibitem/biblatex2bibitem-hyperref.pdf create mode 100644 macros/latex/contrib/biblatex2bibitem/biblatex2bibitem-hyperref.tex create mode 100644 macros/latex/contrib/biblatex2bibitem/biblatex2bibitem-mwe-result.pdf create mode 100644 macros/latex/contrib/biblatex2bibitem/biblatex2bibitem-mwe-result.tex create mode 100644 macros/latex/contrib/biblatex2bibitem/biblatex2bibitem-new-result.pdf create mode 100644 macros/latex/contrib/biblatex2bibitem/biblatex2bibitem-new.pdf create mode 100644 macros/latex/contrib/ccref/LICENSE create mode 100644 macros/latex/contrib/ccref/README.md create mode 100644 macros/latex/contrib/ccref/ccref-doc.pdf create mode 100644 macros/latex/contrib/ccref/ccref-doc.tex create mode 100644 macros/latex/contrib/ccref/ccref.sty (limited to 'macros') diff --git a/macros/latex/contrib/biblatex2bibitem/README.md b/macros/latex/contrib/biblatex2bibitem/README.md index 7358a0e7de..22fd526d8e 100644 --- a/macros/latex/contrib/biblatex2bibitem/README.md +++ b/macros/latex/contrib/biblatex2bibitem/README.md @@ -24,7 +24,8 @@ At the very end of document: The desired `bibitem`s will be written directly to the PDF file. When it's time to switch to `bibitem`s (e.g. before sending the paper to the journal), -just copy them to the to your `.tex` file, remove `biblatex` commands and load `cite` package. +just copy them directly from the pdf into your `.tex` file, remove +`biblatex` commands and (probably) load the `cite` package. ### Disclaimer @@ -59,10 +60,10 @@ If you really want to have a space after the title of an e.g. an article, just ### `bibitem` separators -By default, generated `bibitem`s are separated by a line with a percent sign on it to make the readng of the cde easier. +By default, generated `bibitem`s are separated by a line with an empty pair of curly braces on it to make the reading of the code easier. You can tweak this by e.g. ```latex -\renewcommand{\printgeneratedbibitemseparator}{\ttfamily\%\\} +\renewcommand{\printgeneratedbibitemseparator}{\ttfamily\{\}\\} ``` (for putting all the `bibitem`s into monotype font) or e.g. ```latex @@ -78,6 +79,7 @@ Don't forget about `\makeatletter` and `\makeatother`! + `\print@end@thebibliography` - default: `\textbackslash end\{thebibliography\} ` ++ `\print@bibitem@command` - default: `\textbackslash bibitem` ## See also diff --git a/macros/latex/contrib/biblatex2bibitem/biblatex2bibitem-examples.bib b/macros/latex/contrib/biblatex2bibitem/biblatex2bibitem-examples.bib index c07dcbbbf9..fa00467eb2 100644 --- a/macros/latex/contrib/biblatex2bibitem/biblatex2bibitem-examples.bib +++ b/macros/latex/contrib/biblatex2bibitem/biblatex2bibitem-examples.bib @@ -2,13 +2,14 @@ title={On a question\relax ~of Erd\H{o}s and Ulam}, author={Solymosi, Jozsef and De Zeeuw, Frank}, archivePrefix = {arXiv}, - eprint = {0806.3095}, + eprint = {0806.3095_}, journal={Discrete \& Computational Geometry}, volume={43}, number={2}, pages={393--401}, year={2010}, publisher={Springer}, + url={https://example.com/@рус_}, } @article{halbeisen2019geometric, diff --git a/macros/latex/contrib/biblatex2bibitem/biblatex2bibitem-hyperref-result.pdf b/macros/latex/contrib/biblatex2bibitem/biblatex2bibitem-hyperref-result.pdf new file mode 100644 index 0000000000..fbb6ba40da Binary files /dev/null and b/macros/latex/contrib/biblatex2bibitem/biblatex2bibitem-hyperref-result.pdf differ diff --git a/macros/latex/contrib/biblatex2bibitem/biblatex2bibitem-hyperref-result.tex b/macros/latex/contrib/biblatex2bibitem/biblatex2bibitem-hyperref-result.tex new file mode 100644 index 0000000000..eb083b2bf3 --- /dev/null +++ b/macros/latex/contrib/biblatex2bibitem/biblatex2bibitem-hyperref-result.tex @@ -0,0 +1,80 @@ +\documentclass[british]{article} +\usepackage[T1]{fontenc} +\usepackage[utf8]{inputenc} +\usepackage{babel} +\usepackage{csquotes} + +\usepackage{amssymb} % Just for \mathbb + + +\usepackage{xcolor} +\usepackage[colorlinks]{hyperref} +\makeatletter +\Hy@AtBeginDocument{% + \def\@pdfborder{0 0 1}% Overrides border definition set with colorlinks=true + \def\@pdfborderstyle{/S/U/W 1}% Overrides border style set with colorlinks=true + % Hyperlink border style will be underline of width 1pt +} +\makeatother +\hypersetup{% + colorlinks=true,% hyperlinks will be coloured + linkcolor=blue,% hyperlink text will be blue + urlcolor=blue,% hyperlink text will be blue + linkbordercolor=red,% hyperlink border will be red + urlbordercolor=red,% hyperlink border will be red +} + +%%\usepackage[backend=biber,style=alphabetic,citestyle=alphabetic,backref]{biblatex} +%%\addbibresource{biblatex-examples.bib} +%%\addbibresource{biblatex2bibitem-examples.bib} + +%%\usepackage{biblatex2bibitem} +\usepackage{cite} + +\begin{document} +\cite{sigfridsson,knuth:ct:e}. + +See also \cite{solymosi2010question,halbeisen2019geometric,Kohnert2006IntegralPS}. + +\newpage + +\begin{thebibliography}{99} +{} +\bibitem{halbeisen2019geometric} +Lorenz Halbeisen and Norbert Hungerbühler. ‘A geometric +representation of integral solutions of $x^2+ xy+ y^2= m^2$’. In: +\emph{Quaestiones Mathematicae} (2019), pp. 1–15 (cit. on +p. \hyperlink {page.1} {1}). +{} +\bibitem{Kohnert2006IntegralPS} +Axel Kohnert and Sascha Kurz. ‘Integral point sets over {$\mathbb +{Z}^m_n$}’. In: \emph{Discrete Applied Mathematics} 157 (2006), +pp. 2105–2117 (cit. on p. \hyperlink {page.1} {1}). +{} +\bibitem{knuth:ct:e} +Donald E. Knuth. \emph{Computers \& Typesetting}. Vol. E: +\emph{{Computer Modern} Typefaces}. Reading, Mass.: +Addison-Wesley, 1986 (cit. on p. \hyperlink {page.1} {1}).{} +\bibitem{solymosi2010question} +Jozsef Solymosi and Frank De Zeeuw. ‘On a question\relax ~of Erdős +and Ulam’. In: \emph{Discrete \& Computational Geometry} 43.2 +(2010), pp. 393–401. arXiv: \href {http://arxiv.org/abs/0806.3095_} +{\nolinkurl {0806.3095_}}. \textsc{url}: \url +{https://example.com/@%D1%80%D1%83%D1%81_} (cit. on +p. \hyperlink {page.1} {1}). +{} +\bibitem{sigfridsson} +Emma Sigfridsson and Ulf Ryde. ‘Comparison of methods for deriving +atomic charges from the electrostatic potential and moments’. In: +\emph{Journal of Computational Chemistry} 19.4 (1998), pp. 377–395. +\textsc{doi}: \href +{https://doi.org/10.1002/(SICI)1096-987X(199803)19:4<377::AID-JCC1>3.0.CO;2-P} +{\nolinkurl +{10.1002/(SICI)1096-987X(199803)19:4<377::AID-JCC1>3.0.CO;2-P}} +(cit. on p. \hyperlink {page.1} {1}). +\end{thebibliography} + +%%\printbibliography +%%\printbibitembibliography + +\end{document} diff --git a/macros/latex/contrib/biblatex2bibitem/biblatex2bibitem-hyperref.pdf b/macros/latex/contrib/biblatex2bibitem/biblatex2bibitem-hyperref.pdf new file mode 100644 index 0000000000..106bfb2723 Binary files /dev/null and b/macros/latex/contrib/biblatex2bibitem/biblatex2bibitem-hyperref.pdf differ diff --git a/macros/latex/contrib/biblatex2bibitem/biblatex2bibitem-hyperref.tex b/macros/latex/contrib/biblatex2bibitem/biblatex2bibitem-hyperref.tex new file mode 100644 index 0000000000..ff139a9af2 --- /dev/null +++ b/macros/latex/contrib/biblatex2bibitem/biblatex2bibitem-hyperref.tex @@ -0,0 +1,43 @@ +\documentclass[british]{article} +\usepackage[T1]{fontenc} +\usepackage[utf8]{inputenc} +\usepackage{babel} +\usepackage{csquotes} + +\usepackage{amssymb} % Just for \mathbb + + +\usepackage{xcolor} +\usepackage[colorlinks]{hyperref} +\makeatletter +\Hy@AtBeginDocument{% + \def\@pdfborder{0 0 1}% Overrides border definition set with colorlinks=true + \def\@pdfborderstyle{/S/U/W 1}% Overrides border style set with colorlinks=true + % Hyperlink border style will be underline of width 1pt +} +\makeatother +\hypersetup{% + colorlinks=true,% hyperlinks will be coloured + linkcolor=blue,% hyperlink text will be blue + urlcolor=blue,% hyperlink text will be blue + linkbordercolor=red,% hyperlink border will be red + urlbordercolor=red,% hyperlink border will be red +} + +\usepackage[backend=biber,style=alphabetic,citestyle=alphabetic,backref]{biblatex} +\addbibresource{biblatex-examples.bib} +\addbibresource{biblatex2bibitem-examples.bib} + +\usepackage{biblatex2bibitem} + +\begin{document} +\cite{sigfridsson,knuth:ct:e}. + +See also \cite{solymosi2010question,halbeisen2019geometric,Kohnert2006IntegralPS}. + +\newpage + +\printbibliography + +\printbibitembibliography +\end{document} diff --git a/macros/latex/contrib/biblatex2bibitem/biblatex2bibitem-mwe-result.pdf b/macros/latex/contrib/biblatex2bibitem/biblatex2bibitem-mwe-result.pdf new file mode 100644 index 0000000000..abc7102b73 Binary files /dev/null and b/macros/latex/contrib/biblatex2bibitem/biblatex2bibitem-mwe-result.pdf differ diff --git a/macros/latex/contrib/biblatex2bibitem/biblatex2bibitem-mwe-result.tex b/macros/latex/contrib/biblatex2bibitem/biblatex2bibitem-mwe-result.tex new file mode 100644 index 0000000000..36d5d232fd --- /dev/null +++ b/macros/latex/contrib/biblatex2bibitem/biblatex2bibitem-mwe-result.tex @@ -0,0 +1,60 @@ +\documentclass[british]{article} +\usepackage[T1]{fontenc} +\usepackage[utf8]{inputenc} +\usepackage{babel} +\usepackage{csquotes} + +%These two are needed because biblatex provides \nolinkurl and \url +\usepackage{url} +\providecommand*{\nolinkurl}{\url} + +\usepackage{amssymb} % Just for \mathbb +\usepackage{cite} +%% \usepackage[style=numeric, backend=biber]{biblatex} +%% \usepackage{biblatex2bibitem} +%% +%% \addbibresource{biblatex-examples.bib} +%% +%% \addbibresource{biblatex2bibitem-examples.bib} + +\begin{document} +\cite{sigfridsson,knuth:ct:e}. + +See also \cite{solymosi2010question,halbeisen2019geometric,Kohnert2006IntegralPS}. + +\begin{thebibliography}{99} +{} +\bibitem{halbeisen2019geometric} +Lorenz Halbeisen and Norbert Hungerbühler. ‘A geometric +representation of integral solutions of $x^2+ xy+ y^2= m^2$’. In: +\emph{Quaestiones Mathematicae} (2019), pp. 1–15. +{} +\bibitem{knuth:ct:e} +Donald E. Knuth. \emph{Computers \& Typesetting}. Vol. E: +\emph{{Computer Modern} Typefaces}. Reading, Mass.: +Addison-Wesley, 1986. +{} +\bibitem{Kohnert2006IntegralPS} +Axel Kohnert and Sascha Kurz. ‘Integral point sets over {$\mathbb +{Z}^m_n$}’. In: \emph{Discrete Applied Mathematics} 157 (2006), +pp. 2105–2117. +{} +\bibitem{sigfridsson} + +Emma Sigfridsson and Ulf Ryde. ‘Comparison of methods for deriving +atomic charges from the electrostatic potential and moments’. In: +\emph{Journal of Computational Chemistry} 19.4 (1998), pp. 377–395. +\textsc{doi}: \nolinkurl +{10.1002/(SICI)1096-987X(199803)19:4<377::AID-JCC1>3.0.CO;2-P}. +{} +\bibitem{solymosi2010question} +Jozsef Solymosi and Frank De Zeeuw. ‘On a question\relax ~of Erdős +and Ulam’. In: \emph{Discrete \& Computational Geometry} 43.2 +(2010), pp. 393–401. arXiv: \nolinkurl {0806.3095_}. \textsc{url}: \url +{https://example.com/@%D1%80%D1%83%D1%81_}. +\end{thebibliography} + +%% \printbibliography +%% +%% \printbibitembibliography +\end{document} diff --git a/macros/latex/contrib/biblatex2bibitem/biblatex2bibitem-mwe.pdf b/macros/latex/contrib/biblatex2bibitem/biblatex2bibitem-mwe.pdf index 26eb8348c0..f1448bfbfd 100644 Binary files a/macros/latex/contrib/biblatex2bibitem/biblatex2bibitem-mwe.pdf and b/macros/latex/contrib/biblatex2bibitem/biblatex2bibitem-mwe.pdf differ diff --git a/macros/latex/contrib/biblatex2bibitem/biblatex2bibitem-new-result.pdf b/macros/latex/contrib/biblatex2bibitem/biblatex2bibitem-new-result.pdf new file mode 100644 index 0000000000..380b22a018 Binary files /dev/null and b/macros/latex/contrib/biblatex2bibitem/biblatex2bibitem-new-result.pdf differ diff --git a/macros/latex/contrib/biblatex2bibitem/biblatex2bibitem-new.pdf b/macros/latex/contrib/biblatex2bibitem/biblatex2bibitem-new.pdf new file mode 100644 index 0000000000..a97926d469 Binary files /dev/null and b/macros/latex/contrib/biblatex2bibitem/biblatex2bibitem-new.pdf differ diff --git a/macros/latex/contrib/biblatex2bibitem/biblatex2bibitem.sty b/macros/latex/contrib/biblatex2bibitem/biblatex2bibitem.sty index 6065032d98..1099f7728c 100644 --- a/macros/latex/contrib/biblatex2bibitem/biblatex2bibitem.sty +++ b/macros/latex/contrib/biblatex2bibitem/biblatex2bibitem.sty @@ -1,24 +1,26 @@ % A workaround to convert biblatex-generated bibliography to bibitems -% +% % (c) Nikolai Avdeev aka @nickkolok, and @odomanov % % See also https://github.com/odomanov/biblatex-gost/issues/20 % %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN archives -%% in directory macros/latex/base/lppl.txt. -% +%% https://ctan.org/license/lppl1.3c +% \NeedsTeXFormat{LaTeX2e}[1994/06/01] \ProvidesPackage{biblatex2bibitem} - [2020/03/03 v0.2.0 LaTeX package to convert biblatex-generated bibliography to bibitem commands] + [2021/10/26 v0.2.1 LaTeX package to convert biblatex-generated bibliography to bibitem commands] \RequirePackage{biblatex} -\newcommand{\printgeneratedbibitemseparator}{\%\\} +\newcommand{\printgeneratedbibitemseparator}{\{\}\\} \newcommand{\print@begin@thebibliography}{\textbackslash begin\{thebibliography\}\{99\}} \newcommand{\print@end@thebibliography }{\textbackslash end\{thebibliography\} } +\newcommand{\print@bibitem@command}{\textbackslash bibitem} + \defbibenvironment{bibitembibliography} { @@ -38,6 +40,18 @@ \renewcommand*{\textsc}[1]{\textbackslash textsc\{##1\}}% \renewcommand*{\emph}[1]{\textbackslash emph\{##1\}}% % + \providecommand*{\nolinkurl}{\url} + \renewcommand*{\nolinkurl}[1]{\textbackslash nolinkurl \{##1\}}% + \renewcommand*{\url}[1]{\textbackslash url \{##1\}}% + % + \ifcsname href\endcsname% Sometimes it is not defined + \renewcommand*{\href}[2]{\textbackslash href \{##1\} \{##2\}}% + \fi + % + \ifcsname hyperlink\endcsname% Sometimes it is not defined + \renewcommand*{\hyperlink}[2]{\textbackslash hyperlink \{##1\} \{##2\}}% + \fi + % \renewcommand*{\mkbibemph}[1]{\textbackslash emph\{##1\}}% \renewcommand*{\mkbibitalic}[1]{\textbackslash textit\{##1\}}% \renewcommand*{\mkbibbold}[1]{\textbackslash textbf\{##1\}}% @@ -49,7 +63,7 @@ \thispagestyle{empty} \pagestyle{empty} } - {\item\printgeneratedbibitemseparator\textbackslash bibitem\{\printfield{entrykey}\}\\} + {\item\printgeneratedbibitemseparator\print@bibitem@command\{\printfield{entrykey}\}\\} \newcommand{\utffriendlydetokenize}[1]{% \scantokens{% diff --git a/macros/latex/contrib/ccref/LICENSE b/macros/latex/contrib/ccref/LICENSE new file mode 100644 index 0000000000..2244313901 --- /dev/null +++ b/macros/latex/contrib/ccref/LICENSE @@ -0,0 +1,416 @@ +The LaTeX Project Public License +=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- + +LPPL Version 1.3c 2008-05-04 + +Copyright 1999 2002-2008 LaTeX3 Project + Everyone is allowed to distribute verbatim copies of this + license document, but modification of it is not allowed. + + +PREAMBLE +======== + +The LaTeX Project Public License (LPPL) is the primary license under +which the LaTeX kernel and the base LaTeX packages are distributed. + +You may use this license for any work of which you hold the copyright +and which you wish to distribute. This license may be particularly +suitable if your work is TeX-related (such as a LaTeX package), but +it is written in such a way that you can use it even if your work is +unrelated to TeX. + +The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE', +below, gives instructions, examples, and recommendations for authors +who are considering distributing their works under this license. + +This license gives conditions under which a work may be distributed +and modified, as well as conditions under which modified versions of +that work may be distributed. + +We, the LaTeX3 Project, believe that the conditions below give you +the freedom to make and distribute modified versions of your work +that conform with whatever technical specifications you wish while +maintaining the availability, integrity, and reliability of +that work. If you do not see how to achieve your goal while +meeting these conditions, then read the document `cfgguide.tex' +and `modguide.tex' in the base LaTeX distribution for suggestions. + + +DEFINITIONS +=========== + +In this license document the following terms are used: + + `Work' + Any work being distributed under this License. + + `Derived Work' + Any work that under any applicable law is derived from the Work. + + `Modification' + Any procedure that produces a Derived Work under any applicable + law -- for example, the production of a file containing an + original file associated with the Work or a significant portion of + such a file, either verbatim or with modifications and/or + translated into another language. + + `Modify' + To apply any procedure that produces a Derived Work under any + applicable law. + + `Distribution' + Making copies of the Work available from one person to another, in + whole or in part. Distribution includes (but is not limited to) + making any electronic components of the Work accessible by + file transfer protocols such as FTP or HTTP or by shared file + systems such as Sun's Network File System (NFS). + + `Compiled Work' + A version of the Work that has been processed into a form where it + is directly usable on a computer system. This processing may + include using installation facilities provided by the Work, + transformations of the Work, copying of components of the Work, or + other activities. Note that modification of any installation + facilities provided by the Work constitutes modification of the Work. + + `Current Maintainer' + A person or persons nominated as such within the Work. If there is + no such explicit nomination then it is the `Copyright Holder' under + any applicable law. + + `Base Interpreter' + A program or process that is normally needed for running or + interpreting a part or the whole of the Work. + + A Base Interpreter may depend on external components but these + are not considered part of the Base Interpreter provided that each + external component clearly identifies itself whenever it is used + interactively. Unless explicitly specified when applying the + license to the Work, the only applicable Base Interpreter is a + `LaTeX-Format' or in the case of files belonging to the + `LaTeX-format' a program implementing the `TeX language'. + + + +CONDITIONS ON DISTRIBUTION AND MODIFICATION +=========================================== + +1. Activities other than distribution and/or modification of the Work +are not covered by this license; they are outside its scope. In +particular, the act of running the Work is not restricted and no +requirements are made concerning any offers of support for the Work. + +2. You may distribute a complete, unmodified copy of the Work as you +received it. Distribution of only part of the Work is considered +modification of the Work, and no right to distribute such a Derived +Work may be assumed under the terms of this clause. + +3. You may distribute a Compiled Work that has been generated from a +complete, unmodified copy of the Work as distributed under Clause 2 +above, as long as that Compiled Work is distributed in such a way that +the recipients may install the Compiled Work on their system exactly +as it would have been installed if they generated a Compiled Work +directly from the Work. + +4. If you are the Current Maintainer of the Work, you may, without +restriction, modify the Work, thus creating a Derived Work. You may +also distribute the Derived Work without restriction, including +Compiled Works generated from the Derived Work. Derived Works +distributed in this manner by the Current Maintainer are considered to +be updated versions of the Work. + +5. If you are not the Current Maintainer of the Work, you may modify +your copy of the Work, thus creating a Derived Work based on the Work, +and compile this Derived Work, thus creating a Compiled Work based on +the Derived Work. + +6. If you are not the Current Maintainer of the Work, you may +distribute a Derived Work provided the following conditions are met +for every component of the Work unless that component clearly states +in the copyright notice that it is exempt from that condition. Only +the Current Maintainer is allowed to add such statements of exemption +to a component of the Work. + + a. If a component of this Derived Work can be a direct replacement + for a component of the Work when that component is used with the + Base Interpreter, then, wherever this component of the Work + identifies itself to the user when used interactively with that + Base Interpreter, the replacement component of this Derived Work + clearly and unambiguously identifies itself as a modified version + of this component to the user when used interactively with that + Base Interpreter. + + b. Every component of the Derived Work contains prominent notices + detailing the nature of the changes to that component, or a + prominent reference to another file that is distributed as part + of the Derived Work and that contains a complete and accurate log + of the changes. + + c. No information in the Derived Work implies that any persons, + including (but not limited to) the authors of the original version + of the Work, provide any support, including (but not limited to) + the reporting and handling of errors, to recipients of the + Derived Work unless those persons have stated explicitly that + they do provide such support for the Derived Work. + + d. You distribute at least one of the following with the Derived Work: + + 1. A complete, unmodified copy of the Work; + if your distribution of a modified component is made by + offering access to copy the modified component from a + designated place, then offering equivalent access to copy + the Work from the same or some similar place meets this + condition, even though third parties are not compelled to + copy the Work along with the modified component; + + 2. Information that is sufficient to obtain a complete, + unmodified copy of the Work. + +7. If you are not the Current Maintainer of the Work, you may +distribute a Compiled Work generated from a Derived Work, as long as +the Derived Work is distributed to all recipients of the Compiled +Work, and as long as the conditions of Clause 6, above, are met with +regard to the Derived Work. + +8. The conditions above are not intended to prohibit, and hence do not +apply to, the modification, by any method, of any component so that it +becomes identical to an updated version of that component of the Work as +it is distributed by the Current Maintainer under Clause 4, above. + +9. Distribution of the Work or any Derived Work in an alternative +format, where the Work or that Derived Work (in whole or in part) is +then produced by applying some process to that format, does not relax or +nullify any sections of this license as they pertain to the results of +applying that process. + +10. a. A Derived Work may be distributed under a different license + provided that license itself honors the conditions listed in + Clause 6 above, in regard to the Work, though it does not have + to honor the rest of the conditions in this license. + + b. If a Derived Work is distributed under a different license, that + Derived Work must provide sufficient documentation as part of + itself to allow each recipient of that Derived Work to honor the + restrictions in Clause 6 above, concerning changes from the Work. + +11. This license places no restrictions on works that are unrelated to +the Work, nor does this license place any restrictions on aggregating +such works with the Work by any means. + +12. Nothing in this license is intended to, or may be used to, prevent +complete compliance by all parties with all applicable laws. + + +NO WARRANTY +=========== + +There is no warranty for the Work. Except when otherwise stated in +writing, the Copyright Holder provides the Work `as is', without +warranty of any kind, either expressed or implied, including, but not +limited to, the implied warranties of merchantability and fitness for a +particular purpose. The entire risk as to the quality and performance +of the Work is with you. Should the Work prove defective, you assume +the cost of all necessary servicing, repair, or correction. + +In no event unless required by applicable law or agreed to in writing +will The Copyright Holder, or any author named in the components of the +Work, or any other party who may distribute and/or modify the Work as +permitted above, be liable to you for damages, including any general, +special, incidental or consequential damages arising out of any use of +the Work or out of inability to use the Work (including, but not limited +to, loss of data, data being rendered inaccurate, or losses sustained by +anyone as a result of any failure of the Work to operate with any other +programs), even if the Copyright Holder or said author or said other +party has been advised of the possibility of such damages. + + +MAINTENANCE OF THE WORK +======================= + +The Work has the status `author-maintained' if the Copyright Holder +explicitly and prominently states near the primary copyright notice in +the Work that the Work can only be maintained by the Copyright Holder +or simply that it is `author-maintained'. + +The Work has the status `maintained' if there is a Current Maintainer +who has indicated in the Work that they are willing to receive error +reports for the Work (for example, by supplying a valid e-mail +address). It is not required for the Current Maintainer to acknowledge +or act upon these error reports. + +The Work changes from status `maintained' to `unmaintained' if there +is no Current Maintainer, or the person stated to be Current +Maintainer of the work cannot be reached through the indicated means +of communication for a period of six months, and there are no other +significant signs of active maintenance. + +You can become the Current Maintainer of the Work by agreement with +any existing Current Maintainer to take over this role. + +If the Work is unmaintained, you can become the Current Maintainer of +the Work through the following steps: + + 1. Make a reasonable attempt to trace the Current Maintainer (and + the Copyright Holder, if the two differ) through the means of + an Internet or similar search. + + 2. If this search is successful, then enquire whether the Work + is still maintained. + + a. If it is being maintained, then ask the Current Maintainer + to update their communication data within one month. + + b. If the search is unsuccessful or no action to resume active + maintenance is taken by the Current Maintainer, then announce + within the pertinent community your intention to take over + maintenance. (If the Work is a LaTeX work, this could be + done, for example, by posting to comp.text.tex.) + + 3a. If the Current Maintainer is reachable and agrees to pass + maintenance of the Work to you, then this takes effect + immediately upon announcement. + + b. If the Current Maintainer is not reachable and the Copyright + Holder agrees that maintenance of the Work be passed to you, + then this takes effect immediately upon announcement. + + 4. If you make an `intention announcement' as described in 2b. above + and after three months your intention is challenged neither by + the Current Maintainer nor by the Copyright Holder nor by other + people, then you may arrange for the Work to be changed so as + to name you as the (new) Current Maintainer. + + 5. If the previously unreachable Current Maintainer becomes + reachable once more within three months of a change completed + under the terms of 3b) or 4), then that Current Maintainer must + become or remain the Current Maintainer upon request provided + they then update their communication data within one month. + +A change in the Current Maintainer does not, of itself, alter the fact +that the Work is distributed under the LPPL license. + +If you become the Current Maintainer of the Work, you should +immediately provide, within the Work, a prominent and unambiguous +statement of your status as Current Maintainer. You should also +announce your new status to the same pertinent community as +in 2b) above. + + +WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE +====================================================== + +This section contains important instructions, examples, and +recommendations for authors who are considering distributing their +works under this license. These authors are addressed as `you' in +this section. + +Choosing This License or Another License +---------------------------------------- + +If for any part of your work you want or need to use *distribution* +conditions that differ significantly from those in this license, then +do not refer to this license anywhere in your work but, instead, +distribute your work under a different license. You may use the text +of this license as a model for your own license, but your license +should not refer to the LPPL or otherwise give the impression that +your work is distributed under the LPPL. + +The document `modguide.tex' in the base LaTeX distribution explains +the motivation behind the conditions of this license. It explains, +for example, why distributing LaTeX under the GNU General Public +License (GPL) was considered inappropriate. Even if your work is +unrelated to LaTeX, the discussion in `modguide.tex' may still be +relevant, and authors intending to distribute their works under any +license are encouraged to read it. + +A Recommendation on Modification Without Distribution +----------------------------------------------------- + +It is wise never to modify a component of the Work, even for your own +personal use, without also meeting the above conditions for +distributing the modified component. While you might intend that such +modifications will never be distributed, often this will happen by +accident -- you may forget that you have modified that component; or +it may not occur to you when allowing others to access the modified +version that you are thus distributing it and violating the conditions +of this license in ways that could have legal implications and, worse, +cause problems for the community. It is therefore usually in your +best interest to keep your copy of the Work identical with the public +one. Many works provide ways to control the behavior of that work +without altering any of its licensed components. + +How to Use This License +----------------------- + +To use this license, place in each of the components of your work both +an explicit copyright notice including your name and the year the work +was authored and/or last substantially modified. Include also a +statement that the distribution and/or modification of that +component is constrained by the conditions in this license. + +Here is an example of such a notice and statement: + + %% pig.dtx + %% Copyright 2005 M. Y. Name + % + % This work may be distributed and/or modified under the + % conditions of the LaTeX Project Public License, either version 1.3 + % 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 + % version 2005/12/01 or later. + % + % This work has the LPPL maintenance status `maintained'. + % + % The Current Maintainer of this work is M. Y. Name. + % + % This work consists of the files pig.dtx and pig.ins + % and the derived file pig.sty. + +Given such a notice and statement in a file, the conditions +given in this license document would apply, with the `Work' referring +to the three files `pig.dtx', `pig.ins', and `pig.sty' (the last being +generated from `pig.dtx' using `pig.ins'), the `Base Interpreter' +referring to any `LaTeX-Format', and both `Copyright Holder' and +`Current Maintainer' referring to the person `M. Y. Name'. + +If you do not want the Maintenance section of LPPL to apply to your +Work, change `maintained' above into `author-maintained'. +However, we recommend that you use `maintained', as the Maintenance +section was added in order to ensure that your Work remains useful to +the community even when you can no longer maintain and support it +yourself. + +Derived Works That Are Not Replacements +--------------------------------------- + +Several clauses of the LPPL specify means to provide reliability and +stability for the user community. They therefore concern themselves +with the case that a Derived Work is intended to be used as a +(compatible or incompatible) replacement of the original Work. If +this is not the case (e.g., if a few lines of code are reused for a +completely different task), then clauses 6b and 6d shall not apply. + + +Important Recommendations +------------------------- + + Defining What Constitutes the Work + + The LPPL requires that distributions of the Work contain all the + files of the Work. It is therefore important that you provide a + way for the licensee to determine which files constitute the Work. + This could, for example, be achieved by explicitly listing all the + files of the Work near the copyright notice of each file or by + using a line such as: + + % This work consists of all files listed in manifest.txt. + + in that place. In the absence of an unequivocal list it might be + impossible for the licensee to determine what is considered by you + to comprise the Work and, in such a case, the licensee would be + entitled to make reasonable conjectures as to which files comprise + the Work. + diff --git a/macros/latex/contrib/ccref/README.md b/macros/latex/contrib/ccref/README.md new file mode 100644 index 0000000000..513140e90c --- /dev/null +++ b/macros/latex/contrib/ccref/README.md @@ -0,0 +1,59 @@ + + +# ccref - cleveref with proper definite articles + +"ccref" is a LaTeX package aimed at helping `\cref` addressing the definite articles properly (especially for the article contractions in many European languages). + +## Motivation + +By default, when using cleveref's `\cref` to reference theorem-like environments, the names do not contain definite articles. This may be acceptable for English, but certainly not good enough for languages such as French, Italian, Portuguese, Spanish, etc. -- in these cases there shall be grammatical errors and would give you a strong feeling that it is machine-generated. + +As an example, if we define the French names to be: +```latex +\crefname{theorem}{le théorème}{les théorème} +\crefname{proposition}{la proposition}{les propositions} +``` +Then when one writes +```latex +On peut le déduire de \cref{thm1,thm2,prop3}. +``` +(which means "*We can deduce this from ...*") the result would be +> On peut le déduire **de les** théorèmes 1 et 2 et **la** proposition 3. + +which is wrong, as the correct result should be: +> On peut le déduire **des** théorèmes 1 et 2 et **de la** proposition 3. + +`\cref` would not be able to handle such cases correctly. + +## The solution + +Thus, it would be better to have a new command `\ccref[]{}`, and to use it like +``` +\ccref*[de]{thm1,thm2,prop3} +``` +in order to get "*des théorèmes 1 et 2 et de la proposition 3*". +> The asterisk `*` here indicates that the preposition "de" will act on every definite article. + +# Usage + +Just load the package with +```latex +\usepackage{ccref} +``` +> "ccref" uses "cleveref" internally, thus it should usually be placed at the last of your preamble. + +And then you can use the command `\ccref` as follows: + - `\ccref[]{}` + - This will pass the `` to the first definite article. + - `\ccref*[]{}` + - This will pass the `` to every definite article. + +However, before using it, you should first define the `\crefname`s carefully. The definite article in `\crefname`s needs to be marked manually using `\ccmarkart`, for example: +```latex +\crefname{theorem}{\ccmarkart{le} théorème}{\ccmarkart{les} théorème} +``` + + +# License + +This work is released under the LaTeX Project Public License, v1.3c or later. diff --git a/macros/latex/contrib/ccref/ccref-doc.pdf b/macros/latex/contrib/ccref/ccref-doc.pdf new file mode 100644 index 0000000000..85d435a9f6 Binary files /dev/null and b/macros/latex/contrib/ccref/ccref-doc.pdf differ diff --git a/macros/latex/contrib/ccref/ccref-doc.tex b/macros/latex/contrib/ccref/ccref-doc.tex new file mode 100644 index 0000000000..992ff0f181 --- /dev/null +++ b/macros/latex/contrib/ccref/ccref-doc.tex @@ -0,0 +1,210 @@ +%! TEX program = xelatex +\documentclass[classical]{einfart} + +\linenumbers + +\usepackage{ProjLib} + +%%================================ +%% For typesetting code +%%================================ +\usepackage{listings} +\definecolor{maintheme}{RGB}{70,130,180} +\definecolor{forestgreen}{RGB}{21,122,81} +\definecolor{lightergray}{gray}{0.99} +\lstset{language=[LaTeX]TeX, + keywordstyle=\color{maintheme}, + basicstyle=\ttfamily, + commentstyle=\color{forestgreen}\ttfamily, + stringstyle=\rmfamily, + showstringspaces=false, + breaklines=true, + frame=lines, + backgroundcolor=\color{lightergray}, + flexiblecolumns=true, + escapeinside={(*}{*)}, + % numbers=left, + numberstyle=\scriptsize, stepnumber=1, numbersep=5pt, + % firstnumber=last, +} +\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$} +\lstset{moretexcs=% + { + cref,crefname, + ccref,ccmarkart, + } +} +\lstnewenvironment{code}% +{\setstretch{1.07}\LocallyStopLineNumbers% +\setkeys{lst}{columns=fullflexible,keepspaces=true}% +} +{\ResumeLineNumbers\vspace{-.5\baselineskip}} +\lstnewenvironment{code*}% +{\setstretch{1.07}\LocallyStopLineNumbers% +\setkeys{lst}{numbers=left,columns=fullflexible,keepspaces=true}% +} +{\ResumeLineNumbers} + +%%================================ +%% tip +%%================================ +\usepackage[many]{tcolorbox} +\newenvironment{tip}[1][Tip]{% + \LocallyStopLineNumbers% + \begin{tcolorbox}[breakable, + enhanced, + width = \textwidth, + colback = paper, colbacktitle = paper, + colframe = gray!50, boxrule=0.2mm, + coltitle = black, + fonttitle = \sffamily, + attach boxed title to top left = {yshift=-\tcboxedtitleheight/2, xshift=.5cm}, + boxed title style = {boxrule=0pt, colframe=paper}, + before skip = 0.3cm, + after skip = 0.3cm, + top = 3mm, + bottom = 3mm, + title={\scshape\sffamily #1}]% +}{\end{tcolorbox}\ResumeLineNumbers} + +\newenvironment{demo}{% + \LocallyStopLineNumbers% + \begin{tcolorbox}[enhanced jigsaw,pad at break*=1mm,breakable, + left=4mm,right=4mm,top=1mm,bottom=1mm, + colback=gray!5!paper,boxrule=0pt,frame hidden, + borderline west={1.5mm}{0mm}{gray!55!paper},arc=.7mm]% +}{\end{tcolorbox}\ResumeLineNumbers} + + + +\newcommand{\ccrefpackage}{\textsf{ccref}} + +\begin{document} + +\title{\ccrefpackage{} - cleveref with proper definite articles} +\author{Jinwen XU} +\date{October 2021, in Paris} + +\maketitle + +\begin{abstract} + \raggedleft + The package \ccrefpackage{} is aimed at helping \lstinline|\cref| addressing the definite articles properly (especially for the article contractions in many European languages). +\end{abstract} + +\section{The motivation} + +By default, when using \textsf{cleveref}'s \lstinline|\cref| to reference theorem-like environments, the names do not contain definite articles. This may be acceptable for English, but certainly not good enough for languages such as French, Italian, Portuguese, Spanish, etc. -- in these cases there shall be grammatical errors and would give you a strong feeling that it is machine-generated. + +As an example, if we define the French names to be: + +\begin{code} +\crefname{theorem}{le théorème}{les théorème} +\crefname{proposition}{la proposition}{les propositions} +\end{code} + +then when one writes (which means ``\emph{We can deduce this from ...}'' in French) + +\begin{code} +On peut le déduire de \cref{thm1,thm2,prop3}. +\end{code} + +the result would be + +\begin{demo} + On peut le déduire \textbf{de les} théorèmes 1 et 2 et \textbf{la} proposition 3. +\end{demo} + +which is wrong, as the correct result should be: + +\begin{demo} + On peut le déduire \textbf{des} théorèmes 1 et 2 et \textbf{de la} proposition 3. +\end{demo} + +\lstinline|\cref| cannot handle such cases correctly --- and that is when \lstinline|\ccref| comes into play. + + +\section{The usage} + +\subsection[How to load it]{How to load it\,?} + +Simply load the package with + +\begin{code} +\usepackage{ccref} +\end{code} + +\begin{tip} + \begin{itemize}\small + \item \ccrefpackage{} uses \textsf{cleveref} internally, thus it should usually be placed at the last of your preamble. + \item To handle article contractions correctly, \lstinline|\ccref| shall detect the current language, thus you need to use packages such as \textsf{babel} or \textsf{polyglossia} to set your languages appropriately. + \end{itemize} +\end{tip} + +\subsection[How to use it]{How to use it\,?} + +Then you can use the command \lstinline|\ccref| as follows: +\begin{itemize} + \item \lstinline|\ccref[|\meta{prep}\lstinline|]{|\meta{labels}\lstinline|}| + \begin{itemize} + \item This will pass the preposition \meta{prep} to the first definite article. + \end{itemize} + \item \lstinline|\ccref*[|\meta{prep}\lstinline|]{|\meta{labels}\lstinline|}| + \begin{itemize} + \item This will pass the preposition \meta{prep} to every definite article. + \end{itemize} +\end{itemize} + +However, before using it, you should first define the \lstinline|\crefname|s carefully. The definite article in \lstinline|\crefname|s needs to be marked manually using \lstinline|\ccmarkart|, for example: + +\begin{code} +\crefname{theorem}{\ccmarkart{le} théorème}{\ccmarkart{les} théorème} +\end{code} + + +\section{Example} + +Let us come back to the example at the beginning, now you can do this: + +\begin{code} +\crefname{theorem}{\ccmarkart{le} théorème} + {\ccmarkart{les} théorème} +\crefname{proposition}{\ccmarkart{le} proposition} + {\ccmarkart{les} propositions} +\end{code} + +And the sentence shall be written as\footnote{Here the stared version is used because we want the preposition ``de'' to be passed to every definite article.}: + +\begin{code} +On peut le déduire \ccref*[de]{thm1,thm2,prop3}. +\end{code} + +which would result in: + +\begin{demo} + On peut le déduire \textbf{des} théorèmes 1 et 2 et \textbf{de la} proposition 3. +\end{demo} + +As another example, with + +\begin{code} +Pensez \ccref*[à]{thm1,thm2,prop3}. +\end{code} + +one would get something like: + +\begin{demo} + Pensez \textbf{aux} théorèmes 1 et 2 et \textbf{à la} proposition 3. +\end{demo} + + + +\section{Known issues} +\begin{itemize} + \item \ccrefpackage{} currently only works for French, Italian, Portuguese (both European and Brazilian) and Spanish, certainly more would be added to this list. + \item In the case that the initial letter of \meta{prep} is capitalized, \ccrefpackage{} cannot yet handle the case changes automatically. However, this should be a rare occurrence. + \item The names of theorem-like environments are not provided --- for the moment you need to define them all by yourself. However, users are encouraged to use the \ProjLib{} toolkit, which already handles everything for you. +\end{itemize} + + +\end{document} diff --git a/macros/latex/contrib/ccref/ccref.sty b/macros/latex/contrib/ccref/ccref.sty new file mode 100644 index 0000000000..a507a2652c --- /dev/null +++ b/macros/latex/contrib/ccref/ccref.sty @@ -0,0 +1,136 @@ +%% +%% Copyright (C) 2021 by Jinwen XU +%% ------------------------------- +%% +%% This file may be distributed and/or modified under the 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 +%% +\NeedsTeXFormat{LaTeX2e}[2020-10-01] +\ProvidesExplPackage + {ccref} + {2021/10/29} + {} + {cleveref with article contraction} +\RequirePackage{cleveref} + +\tl_gset:Nn \g_ccref_prepf_tl {} +\tl_gset:Nn \g_ccref_prep_tl {} + +\NewDocumentCommand{\ccref}{sO{}m}{ + \IfBooleanTF{ #1 }{ + \tl_gset:Nn \g_ccref_prep_tl { #2 } + }{ + \tl_gset:Nn \g_ccref_prepf_tl { #2 } + } + \cref {#3} + \tl_gset:Nn \g_ccref_prep_tl {} +} + +\NewDocumentCommand{\ccmarkart}{m}{ + \ccref_contraction:nn { \tl_use:N \g_ccref_prep_tl }{ + \ccref_contraction:nn { \tl_use:N \g_ccref_prepf_tl }{#1} + } + \tl_gset:Nn \g_ccref_prepf_tl {} +} + +\cs_set:Npn \ccref_contraction:nn #1#2 { + \str_case_e:nn { \languagename } + { + {french}{ + \str_case_e:nnF {#1~#2} { + {à~le} {au} + {à~la} {à~la} + {à~l'} {à~l'} + {à~les} {aux} + {de~le} {du} + {de~la} {de~la} + {de~l'} {de~l'} + {de~les} {des} + }{#2} + } + {italian}{ + \str_case_e:nnF {#1~#2} { + {a~il} {al} + {a~lo} {allo} + {a~l'} {all'} + {a~la} {alla} + {di~il} {del} + {di~lo} {dello} + {di~l'} {dell'} + {di~la} {della} + {da~il} {dal} + {da~lo} {dallo} + {da~l'} {dall'} + {da~la} {dalla} + {in~il} {nel} + {in~lo} {nello} + {in~l'} {nell'} + {in~la} {nella} + {su~il} {sul} + {su~lo} {sullo} + {su~l'} {sull'} + {su~la} {sulla} + {a~i} {ai} + {a~gli} {agli} + {a~le} {alle} + {di~i} {dei} + {di~gli} {degli} + {di~le} {delle} + {da~i} {dai} + {da~gli} {dagli} + {da~le} {dalle} + {in~i} {nei} + {in~gli} {negli} + {in~le} {nelle} + {su~i} {sui} + {su~gli} {sugli} + {su~le} {sulle} + }{#2} + } + {portuguese}{ + \str_case_e:nnF {#1~#2} { + {a~o} {ao} + {a~a} {à} + {a~os} {aos} + {a~as} {às} + {de~o} {do} + {de~a} {da} + {de~os} {dos} + {de~as} {das} + {em~o} {no} + {em~a} {na} + {em~os} {nos} + {em~as} {nas} + }{#2} + } + {brazilian}{ + \str_case_e:nnF {#1~#2} { + {a~o} {ao} + {a~a} {à} + {a~os} {aos} + {a~as} {às} + {de~o} {do} + {de~a} {da} + {de~os} {dos} + {de~as} {das} + {em~o} {no} + {em~a} {na} + {em~os} {nos} + {em~as} {nas} + }{#2} + } + {spanish}{ + \str_case_e:nnF {#1~#2} { + {a~el} {al} + {de~el} {del} + }{#2} + } + } +} +\endinput +%% +%% End of file `ccref.sty'. diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx index 429803c886..fb8203e55f 100644 --- a/macros/latex/contrib/easybook/easybook.dtx +++ b/macros/latex/contrib/easybook/easybook.dtx @@ -15,7 +15,7 @@ %<*class> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2021/10/25}{1.40F} +\ProvidesExplClass{easybook}{2021/10/25}{1.40H} {Typeset Chinese theses or books} \bool_set_false:N \l__eb_compile_draft_bool @@ -325,7 +325,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2021/10/25}{1.40F} +\ProvidesExplPackage{easybase}{2021/10/25}{1.40H} {Typeset Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -2445,7 +2445,7 @@ } % %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2021/10/25}{1.40F} +\ProvidesExplFile{eb-tcolorbox.cfg}{2021/10/25}{1.40H} {Customization of tcolorbox for easybook} \tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip } diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf index be07e63f1a..c0fe946ad0 100644 Binary files a/macros/latex/contrib/easybook/easybook.pdf and b/macros/latex/contrib/easybook/easybook.pdf differ diff --git a/macros/latex/contrib/easybook/easybook.tex b/macros/latex/contrib/easybook/easybook.tex index 9544f2f830..a97dfc7c4b 100644 --- a/macros/latex/contrib/easybook/easybook.tex +++ b/macros/latex/contrib/easybook/easybook.tex @@ -20,7 +20,7 @@ name = easybook, color-scheme = blue, title = EASYBOOK 使用手册, - version = v1.40F, + version = v1.40H, date = 2021/10/28, authors = 瞿毅, info = 排版简体中文学位论文和书籍, @@ -86,9 +86,9 @@ \setlength{\labelwidth}{2em} \setlength{\itemindent}{-1em} \setlength{\labelsep}{0em} - \setlength{\topsep}{0.75ex} - \setlength{\itemsep}{0.75ex} \setlength{\listparindent}{2em} + \setlength{\topsep}{0.75ex plus .1ex} + \setlength{\itemsep}{0.75ex plus .1ex} \setlength{\partopsep}{0ex} \setlength{\parsep}{0ex} } @@ -292,9 +292,10 @@ \command{listoftables}[\sarg\parg\oarg{键值列表}] 输出表格目录命令。带有星号的目录命令不将目录标题添加进文档主目录,带有 \parg{} 号的目录命令可以使当前标题编号。 \command{listoflstlistings}[\sarg\parg\oarg{键值列表}] - 输出代码目录命令。带有星号的目录命令不将目录标题添加进文档主目录,带有 \parg{} 号的目录命令可以使当前标题编号。以上命令可选参数 \meta{键值列表} 的选项如下: + 输出代码目录命令。带有星号的目录命令不将目录标题添加进文档主目录,带有 \parg{} 号的目录命令可以使当前标题编号。 \end{commands} +上面目录命令的可选参数改进了原本单一的功能,其中 \meta{键值列表} 的选项如下: \begin{options} \opt{chapter}\Default! 使当前目录标题按照 \code{chapter} 章级别输出。 @@ -545,22 +546,22 @@ \keyval*-{filter}{过滤器名}\Default 使用由 \cs*{defbibfilter} 定义的 \option*{filter} 来过滤条目。 \end{options} -\end{commands} -可能在一些情况下您希望更加灵活地设置参考文献或有更多需求,下面举一个在导言区手动配置 \pkg*{biblatex} 宏包的例子: -\begin{ctexexam} + 可能在一些情况下您希望更加灵活地设置参考文献或有更多需求,下面举一个在导言区手动配置 \pkg*{biblatex} 宏包的例子: + \begin{ctexexam} \usepackage[style = numeric]{biblatex} \addbibresource{myrefs.bib} \defbibheading{bibliography}[参考文献] % 定义参考文献标题 {\chapter*{#1}\markboth{#1}{#1}} -\end{ctexexam} + \end{ctexexam} +\end{commands} \subsection{定理样式} \label{subsec:theorem of style} 文档类已预置 8 个定理环境,环境名及对应的定理名见小节 \ref{subsec:theorem},它们均使用预置的定理样式 \code{easy-theorem}。下面 \module*{thmset} 模块的选项仅对这个定理样式生效,由 \pkg*{thmtools} 宏包提供支持。如果下面的选项不满足需求,可使用支持完整选项的相关命令新建定理环境。 \begin{options} \keybool{thmframe}\Module{thmset}\Default{false} - 给定理环境使用彩色盒子。这个特殊选项在 \module*{thmset} 模块中使用 \pkg*{tcolorbox} 宏包来支持,\meta{盒子风格} 默认为 \code{tc-theorem}。\pkg*{thmtools} 具有类似的选项 \option*{thmbox},可在新建定理样式的命令中使用。 + 给定理环境使用彩色盒子。这个特殊选项在本模块中使用 \pkg*{tcolorbox} 宏包来支持,\meta{盒子风格} 默认为 \code{tc-theorem}。\pkg*{thmtools} 具有类似的选项 \option*{thmbox},可在新建定理样式的命令中使用。 \keychoice{within}{chapter,section,env,empty}\Default{chapter} 定理编号跟随的计数器,默认跟随章的编号,也可以跟随其它定理环境的编号,当计数器增加时定理编号会从零开始,空置时不跟随其它计数器编号。 \keyval-{headpunct}{代码}\Default @@ -588,7 +589,7 @@ \subsubsection{新建定理环境} \begin{commands} \command{declaretheorem}[\oarg{键值列表1}\marg{定理环境}\oarg{键值列表2}] - 声明新的定理环境命令,\cs{newtheorem} 命令与它等效。可选参数的 \meta{键值列表1} 与 \meta{键值列表2} 等效,用法与原来的同名命令一致。键值列表中常用的选项如下: + 声明新的定理环境命令,命令 \cs{newtheorem} 与它等效。可选参数的 \meta{键值列表1} 与 \meta{键值列表2} 等效,用法与原来的同名命令一致。键值列表中常用的选项如下: \begin{options} \keyval*-{name}{定理名} 定理名的默认值是首字母大写的环境名称(英文标题)。 @@ -599,35 +600,29 @@ \keyval*-{style}{定理样式} 选项的值为使用 \cs{declaretheoremstyle} 命令新定义的定理样式。 \end{options} + + 使用 \cs{declaretheorem} 命令以例 \ref{exam:new theorem sty} 中的定理样式 \code{mythm} 新建一个定理环境猜想,这个命令新建的环境如果需要盒子边框可以手动添加: + \begin{ctexexam}[labelref = exam:new theorem env] + \declaretheorem[style = mythm,name = 猜想]{caixiang} + \tcolorboxenvironment{caixiang}{tc-theorem} + \end{ctexexam} \command{deftheorem}[\marg{环境名}\oarg{英文标题}\marg{中文标题}\darg{盒子风格}\oarg{键值列表}] - 定理声明命令 \cs{deftheorem} 更加便捷,同样定义一个新的定理环境,\meta{键值列表} 中支持的选项与命令 \cs{declaretheorem} 相同,但与这个命令有以下区别: + 定理声明命令 \cs{deftheorem} 更加便捷,同样定义一个新的定理环境,\meta{键值列表} 中支持的选项与命令 \cs{declaretheorem} 相同。但与后者命令有以下几个区别: \begin{itemize} \item 中英文模式下标题不同,英文标题为可选项,默认为首字母大写的 \meta{环境名}。 - \item 自动定义交叉引用的格式,引用标签前缀为定理名。 - \item 模块 \module*{thmset} 的定理盒子选项 \keyis-{thmframe}{true} 仍然生效,其中 \meta{盒子风格} 可以使用新建盒子风格命令 \cs{newtcbstyle} 定义。 - \item 新建定理环境默认使用的 \meta{定理样式} 为 \code{easy-theorem},而不是 \pkg*{thmtools} 默认样式。 + \item 自动定义交叉引用的格式,引用标签前缀为相应定理名。 + \item 定理盒子选项 \option{thmframe} 仍然生效,\meta{盒子风格} 可以使用 \cs{newtcbstyle} 命令创建。 + \item 新建定理环境默认使用的 \meta{定理样式} 为 \code{easy-theorem},而不是 \pkg*{thmtools} 的默认样式。 \end{itemize} - \command{declaretheoremstyle}[\oarg{键值列表1}\marg{定理样式}\oarg{键值列表2}] - 声明新的定理样式命令,键值列表支持上述 \module*{thmset} 模块中以及 \cs{declaretheorem} 的所有选项。可选参数的 \meta{键值列表1} 与 \meta{键值列表2} 等效,用法与原来的同名命令一致。 - - 下面简单列举几个定理命令的用法,例如使用预置样式新建一个定理环境猜想: - \begin{ctexexam} - \deftheorem{caixiang}{猜想}[style = easy-theorem] % 不需要指定预置样式 - \declaretheorem[style = easy-theorem,name = 猜想]{caixiang} - \end{ctexexam} - 命令 \cs{declaretheorem} 定义的定理环境需要手动增加盒子边框: - \begin{ctexexam} - \tcolorboxenvironment{caixiang}{tc-theorem} - \end{ctexexam} - - 使用 \cs{addtcbstyle} 命令调整开启定理盒子时默认的样式,第一个参数为 \code{tc-theorem},关于命令的介绍在小节 \ref{subsec:box}。 + 下面新建一个与例 \ref{exam:new theorem env} 相同的定理环境猜想,并使用 \cs{addtcbstyle} 命令调整 \keyis-{thmframe}{true} 时默认的盒子风格。它的第一个参数为 \code{tc-theorem},关于命令的介绍在小节 \ref{subsec:box}。 \begin{ctexexam} + \deftheorem{caixiang}{猜想}[style = mythm] \addtcbstyle{tc-theorem}{colback = GreenYellow} \end{ctexexam} - - 定义一个名为 \code{mythm} 的定理样式用于 \cs{declaretheorem} 的 \option*{style} 选项: - \begin{ctexexam} + \command{declaretheoremstyle}[\oarg{键值列表1}\marg{定理样式}\oarg{键值列表2}] + 声明新的定理样式命令,键值列表支持上述 \module*{thmset} 模块中以及 \cs{declaretheorem} 的所有选项。可选参数的 \meta{键值列表1} 与 \meta{键值列表2} 等效,用法与原来的同名命令一致。下面定义一个名为 \code{mythm} 的定理样式用于 \cs{declaretheorem} 的 \option*{style} 选项: + \begin{ctexexam}[labelref = exam:new theorem sty] \declaretheoremstyle[bodyfont = \rmfamily,spacepost = 0.5em]{mythm} \end{ctexexam} \end{commands} @@ -973,7 +968,7 @@ \label{subsec:exercise} \begin{environments} \environment{exercise}[\sarg\parg\oarg{键值列表1}\darg{键值列表2}\oarg{键值列表3}] - 习题环境的标题使用 \cs*{tcbox} 行内盒子包装样式,内容则使用 \env*{enumerate} 列表环境。它有 5 个可选参数,应当注意用法。当使用星号参数时标题不进行编号,使用 \parg{} 号参数时不使用预置标题,此时 \meta{键值列表1} 除了 \option{label} 选项失效。 + 习题环境的标题使用 \cs*{tcbox} 行内盒子包装样式,内容则使用 \env*{enumerate} 列表环境。它有 5 个可选参数,应当注意用法。当使用星号参数时标题不进行编号,使用 \parg{} 号参数时不显示标题,此时 \meta{键值列表1} 除了 \option{label} 选项失效。 \meta{键值列表2} 包括 \pkg*{tcolorbox} 的盒子样式选项,例如 \option*{boxsep} 和 \option*{fontupper} 等,也可以使用下述 \option{tcolorbox} 选项。在这里可以使用 \cs{addtcbstyle} 命令设置标题选项 \meta{键值列表2} 的值,第一个参数为 \code{tc-exercise}。 \begin{ctexexam} diff --git a/macros/latex/contrib/spbmark/spbmark.pdf b/macros/latex/contrib/spbmark/spbmark.pdf index f42d42ea4a..6031d8553b 100644 Binary files a/macros/latex/contrib/spbmark/spbmark.pdf and b/macros/latex/contrib/spbmark/spbmark.pdf differ diff --git a/macros/latex/contrib/spbmark/spbmark.sty b/macros/latex/contrib/spbmark/spbmark.sty index 5a887c2f99..8ed460d1b8 100644 --- a/macros/latex/contrib/spbmark/spbmark.sty +++ b/macros/latex/contrib/spbmark/spbmark.sty @@ -9,21 +9,27 @@ % https://creativecommons.org/licenses/by/4.0/legalcode \NeedsTeXFormat{LaTeX2e}[2018/12/31] \RequirePackage{xparse,l3keys2e} -\ProvidesExplPackage{spbmark}{2021/10/16}{1.1D} +\ProvidesExplPackage{spbmark}{2021/10/29}{1.1F} {Customize superscripts and subscripts} \cs_new_protected:Npn \spb_define:n { \keys_define:nn { spbmark } } \cs_new_protected:Npn \spbset { \keys_set:nn { spbmark } } +\bool_new:N \l_spb_newsupb_text_bool +\bool_new:N \l_spb_newsupb_math_bool +\bool_new:N \l_spb_newsupb_foot_bool +\bool_new:N \l_spb_newsupb_all_bool + \keys_define:nn { spbmark/option } { - ctex .code:n = + ctex .code:n = { \cs_set:Npn \spb_define:n { \keys_define:nn { ctex/style } } \cs_set:Npn \spbset { \keys_set:nn { ctex/style } } }, - newsupb .bool_set:N = \l__spb_new_supersub_bool, - newsupb .default:n = true, - newsupb .initial:n = true + newsupb .multichoices:nn = + { text,math,foot,all } + { \bool_set_true:c { l_spb_newsupb_#1_bool } }, + newsupb .default:n = all } \ProcessKeysOptions{spbmark/option} @@ -254,21 +260,28 @@ The~l~parameter~will~be~used~by~default. } -\bool_if:NT \l__spb_new_supersub_bool +\bool_if:NT \l_spb_newsupb_all_bool { - \clist_map_inline:nn - { - { sp,sb }, - { textsuperscript,textsubscript } - } - { - \cs_set_eq:cN { \clist_item:nn {#1} { 1 } } \super - \cs_set_eq:cN { \clist_item:nn {#1} { 2 } } \sub - } + \bool_set_true:N \l_spb_newsupb_text_bool + \bool_set_true:N \l_spb_newsupb_math_bool + \bool_set_true:N \l_spb_newsupb_foot_bool + } +\bool_if:NT \l_spb_newsupb_text_bool + { + \cs_set_eq:NN \textsuperscript \super + \cs_set_eq:NN \textsubscript \sub + } +\bool_if:NT \l_spb_newsupb_math_bool + { + \cs_set_eq:NN \sp \super + \cs_set_eq:NN \sb \sub + } +\bool_if:NT \l_spb_newsupb_foot_bool + { + \cs_set:Npn \@makefnmark + { \hbox:n { \fnmarkfont\super{\@thefnmark} } } } \cs_set_eq:NN \spb \supersub -\cs_set:Npn \@makefnmark - { \hbox:n { \fnmarkfont\super{\@thefnmark}[0pt] } } \tl_if_exist:NTF \ftntm@font { \tl_set_eq:NN \fnmarkfont \ftntm@font } { \tl_set_eq:NN \fnmarkfont \normalfont } diff --git a/macros/latex/contrib/spbmark/spbmark.tex b/macros/latex/contrib/spbmark/spbmark.tex index fc6071aedd..73019e147e 100644 --- a/macros/latex/contrib/spbmark/spbmark.tex +++ b/macros/latex/contrib/spbmark/spbmark.tex @@ -6,8 +6,8 @@ { package = spbmark, title = the spbmark package, - version = v1.1D, - date = 2021/10/16, + version = v1.1F, + date = 2021/10/29, authors = Qu Yi, info = Customize superscript and subscript, email = q1jx@foxmail.com, @@ -44,8 +44,12 @@ \begin{options} \opt{ctex}\Default! This option works with the C\TeX{} document class used by simplified Chinese users, there's actually no functional change. Adding path \module*{style} to \cs*{ctexset} command, which is equivalent to using \cs{spbset}. - \keybool{newsupb}\Default{true} - \option{newsupb} is a boolean option with a default value of true that redefines the \LaTeX{} kernel commands to cause \cs{sp} and \cs{textsuperscript} are equivalent to \cs{super} command, and \cs{sb} and \cs{textsubscript} are equivalent to \cs{sub} command. + \keychoice{newsupb}{text,math,foot,all}\Default + \option{newsupb} is a compound option that can select multiple values and will redefine the subscript commands of the \LaTeX{} kernel. \code{text} stands for \cs{textsuperscript} and \cs{textsubscript} are equivalent to the \cs{super} and \cs{sub} commands. \code{math} indicates that \cs{sp} and \cs{sb} are equivalent to the \cs{super} and \cs{sub} commands. \code{foot} will make the format of the footnote mark match the superscript offsets and format of the \cs{spbset} global setting. \code{all} will selects all previous three values at the same time. + \begin{example}[code-only] + \usepackage[newsupb = {text,math,foot}]{spbmark} + \usepackage[newsupb = all]{spbmark} + \end{example} \end{options} \section{User commands} @@ -130,7 +134,7 @@ It can also be used with the \pkg*{siunitx} package to output superscript and su \begin{example} \unit[mode = math]{kg.m/s\super*[-1pt]{2}} \\ \qty[mode = text]{30}{A\supersub{b}{c}[1pt](\color{red})} \\ -\spbset{sub-hshift = 2pt}\unit[mode = text]{A_b} +\spbset{sub-hshift = 2pt}\unit[mode = text]{A\sub{b}} \end{example} \pkg*{spbmark} also patches the footer markers for standard document class and \cls*{KOMA-Script}. You can format the footer markers by redefining the \cs{fnmarkfont} command. Note that extra horizontal shift does not work with footnote markers. diff --git a/macros/latex/contrib/unicodefonttable/TODO.md b/macros/latex/contrib/unicodefonttable/TODO.md index 6cee8ebf49..8093fdc8fc 100644 --- a/macros/latex/contrib/unicodefonttable/TODO.md +++ b/macros/latex/contrib/unicodefonttable/TODO.md @@ -17,4 +17,13 @@ These are an unsorted collection of thoughts by others or myself and may or may points?), I'd suggest trying an open box (cf. the shaded box for second-font-only). +- KB suggests to use a special default title when comparing showing both font names + + +## Standalone + +- implement the question "Mathfont? (default no)" and make it + automatically set the range-end to a large value + + diff --git a/macros/latex/contrib/unicodefonttable/changes.txt b/macros/latex/contrib/unicodefonttable/changes.txt index a632e273f8..f263869602 100644 --- a/macros/latex/contrib/unicodefonttable/changes.txt +++ b/macros/latex/contrib/unicodefonttable/changes.txt @@ -1,3 +1,8 @@ +2021-10-29 Frank Mittelbach + + * unicodefonttable.dtx (subsection{The overall table layout}): + Make documentation and code match: it should be title-format-cont. + 2021-10-19 Frank Mittelbach * unicodefonttable.dtx diff --git a/macros/latex/contrib/unicodefonttable/unicodefonttable-code.pdf b/macros/latex/contrib/unicodefonttable/unicodefonttable-code.pdf index 17a9c6bc61..e664caa49a 100644 Binary files a/macros/latex/contrib/unicodefonttable/unicodefonttable-code.pdf and b/macros/latex/contrib/unicodefonttable/unicodefonttable-code.pdf differ diff --git a/macros/latex/contrib/unicodefonttable/unicodefonttable-doc.pdf b/macros/latex/contrib/unicodefonttable/unicodefonttable-doc.pdf index 87914ad496..ac2835f67e 100644 Binary files a/macros/latex/contrib/unicodefonttable/unicodefonttable-doc.pdf and b/macros/latex/contrib/unicodefonttable/unicodefonttable-doc.pdf differ diff --git a/macros/latex/contrib/unicodefonttable/unicodefonttable-samples.pdf b/macros/latex/contrib/unicodefonttable/unicodefonttable-samples.pdf index b5a4d6399a..735199f552 100644 Binary files a/macros/latex/contrib/unicodefonttable/unicodefonttable-samples.pdf and b/macros/latex/contrib/unicodefonttable/unicodefonttable-samples.pdf differ diff --git a/macros/latex/contrib/unicodefonttable/unicodefonttable.dtx b/macros/latex/contrib/unicodefonttable/unicodefonttable.dtx index 67cb3a8d64..8374b8d279 100644 --- a/macros/latex/contrib/unicodefonttable/unicodefonttable.dtx +++ b/macros/latex/contrib/unicodefonttable/unicodefonttable.dtx @@ -17,8 +17,8 @@ % for those people who are interested or want to report an issue. % -\def\unicodefonttabledate {2021/10/19} -\def\unicodefonttableversion{v1.0e} +\def\unicodefonttabledate {2021/10/29} +\def\unicodefonttableversion{v1.0f} %<*driver> @@ -90,10 +90,11 @@ % To produce a one-off table, a standalone version is available as well. % \end{abstract} % +% \vspace*{\medskipamount} % % \tableofcontents % -% +% \vspace*{\bigskipamount} % % \section{Introduction} % @@ -133,8 +134,10 @@ % hexadecimal digits. For example, \texttt{U+0041} represents the letter % ``A'' and \texttt{U+20AC} the Euro currency symbol ``\texteuro''. % We use this convention by showing a Unicode range of sixteen -% characters at the left of each table row, e.g., \texttt{U+0040 - +% characters at the left of each table row, +% e.g., \texttt{U+0040 - % 004F}, followed by the sixteen glyphs in the range. Thus that +% \IfImplementationShownTF{}{\pagebreak}\ignorespaces % particular table row from the ``Basic Latin'' block would show % something like % @@ -504,7 +507,7 @@ % is the normal space, \texttt{U+00A0} is a non-breaking space, % \texttt{U+00AD} is a soft-hyphen (what \LaTeX{} users would % indicate with \cs{-}), and so forth. Especially the row -% \texttt{U+2000-200F} in Table~1 looks strange as it appears to be totally +% \texttt{U+2000-200F} in Table~6 looks strange as it appears to be totally % empty, but in fact most of its slots contain spaces of different % width. % @@ -552,9 +555,11 @@ % places, but for \TUB{} this is not practical, so we % use black and gray. % -% \subsection{Computer Modern Sans --- 8-bit font} +% \subsection{Computer Modern Sans --- 7-bit font} % -% Our first example is an 8-bit font which gives a concise table. +% Our first example is the original Computer Modern Sans, with +% character codes $\le 127$. +% % Command used: \begin{verbatim} % \displayfonttable*[color=none, range-end=7F]{cmss10} % \end{verbatim} @@ -562,7 +567,44 @@ % \displayfonttable*[color=none, range-end=7F]{cmss10} % % -% \iffalse +% \iftrue +% +%\subsection{\TeX\ Gyre Heros --- 8-bit font} +% +% This example shows the \TeX\ Gyre Heros 8-bit font, +% in the T1 encoding, with character codes $\le 255$. +% Command used: +%\begin{verbatim} +% \displayfonttable*[color=none]{ec-qhvr} +%\end{verbatim} +% +%\displayfonttable*[color=none]{ec-qhvr} +% +% \fi +% +% +% \iftrue +%\subsection{Latin Modern Math --- 8-bit fonts} +% +% The traditional Latin Modern Math Italic, Symbol and Extension fonts. +% The symbol font (\texttt{lmsy10}) has two characters added to the +% Computer Modern symbol repertoire, seen in the last row of the table. +% Commands used: +% +%\begin{verbatim} +% \displayfonttable*[color=none]{lmmi10} +% \displayfonttable*[color=none]{lmsy10} +% \displayfonttable*[color=none]{lmex10} +%\end{verbatim} +% +%\displayfonttable*[color=none]{lmmi10} +%\displayfonttable*[color=none]{lmsy10} +%\displayfonttable*[color=none]{lmex10} +% +% \fi +% +% +% \iffalse % 5pp % %\subsection{\TeX{} Gyre Pagella (Palatino) oldstyle figures --- OTF font} % @@ -577,6 +619,7 @@ % \fi % % +% \IfImplementationShownTF{}{\newpage} % % \subsection{Latin Modern Math compared to New Computer Modern Math} % @@ -587,6 +630,10 @@ %\begin{verbatim} % \displayfonttable[hex-digits=head+foot, range-end=1FFFF, % compare-with=New Computer Modern Math, +% title-format=\caption{Latin Modern Math compared to +% New Computer Modern Math}, +% title-format-cont=\caption{LM Math vs.\ NewCM Math, +% \emph{cont.}}, % compare-color=black, compare-bgcolor=black!5, % missing-glyph-color=black!50, color=black!75] % {Latin Modern Math} @@ -599,6 +646,10 @@ % % \displayfonttable[hex-digits=head+foot, range-end=1FFFF, % compare-with=New Computer Modern Math, +% title-format=\caption{Latin Modern Math compared to +% New Computer Modern Math}, +% title-format-cont=\caption{LM Math vs.\ NewCM Math, +% \emph{cont.}}, % compare-color=black, compare-bgcolor=black!5, % missing-glyph-color=black!50, color=black!75] % {Latin Modern Math} @@ -956,9 +1007,11 @@ % The default continuation title ignores the given features, so the % formatting is somewhat simpler. It uses \verb=\caption[]{...}= to % make a caption that doesn't alter the table number. +% \changes{v1.0f}{2021/10/29}{Make documentation and code match: +% it should be \texttt{title-format-cont}} % \begin{macrocode} - ,title-cont-format .cs_set:Np = \@@_format_table_cont:nn #1#2 - ,title-cont-format .initial:n = \caption[]{#1~ \emph{cont.}} + ,title-format-cont .cs_set:Np = \@@_format_table_cont:nn #1#2 + ,title-format-cont .initial:n = \caption[]{#1~ \emph{cont.}} % \end{macrocode} % The key \key{hex-digits} is implemented as a choice, where each % allowed value sets different booleans that are then used in the code. @@ -2263,7 +2316,7 @@ % display-block = rules, % missing-glyph = \tiny\setlength\fboxsep{0pt}\fbox{$\times$}, hex-digits = block, - title-cont-format = \caption[]{\emph{continued}}, + title-format-cont = \caption[]{\emph{continued}}, ]{Latin Modern Sans} \newpage -- cgit v1.2.3