diff options
Diffstat (limited to 'macros/latex')
27 files changed, 311 insertions, 239 deletions
diff --git a/macros/latex/contrib/colorist/colorart.cls b/macros/latex/contrib/colorist/colorart.cls index 4f2a247c67..446fa868ad 100644 --- a/macros/latex/contrib/colorist/colorart.cls +++ b/macros/latex/contrib/colorist/colorart.cls @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesClass{colorart} - [2021/08/08 A colorful article style] + [2021/08/09 A colorful article style] \def\colorclass@baseclass{article} \RequirePackage{kvoptions} \RequirePackage{etoolbox} diff --git a/macros/latex/contrib/colorist/colorbook.cls b/macros/latex/contrib/colorist/colorbook.cls index cefcb450bb..711916d899 100644 --- a/macros/latex/contrib/colorist/colorbook.cls +++ b/macros/latex/contrib/colorist/colorbook.cls @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesClass{colorbook} - [2021/08/08 A colorful book style] + [2021/08/09 A colorful book style] \def\colorclass@baseclass{book} \RequirePackage{kvoptions} \RequirePackage{etoolbox} diff --git a/macros/latex/contrib/colorist/colorist-doc.pdf b/macros/latex/contrib/colorist/colorist-doc.pdf Binary files differindex 365d097b77..bf1291a619 100644 --- a/macros/latex/contrib/colorist/colorist-doc.pdf +++ b/macros/latex/contrib/colorist/colorist-doc.pdf diff --git a/macros/latex/contrib/colorist/colorist-doc.tex b/macros/latex/contrib/colorist/colorist-doc.tex index d0782450d0..dfebcdfda3 100644 --- a/macros/latex/contrib/colorist/colorist-doc.tex +++ b/macros/latex/contrib/colorist/colorist-doc.tex @@ -93,7 +93,7 @@ \title{\colorist{}, write your articles or books in a colorful way} \author{Jinwen XU} -\thanks{Corresponding to: \texttt{\colorist{} 2021/08/08}} +\thanks{Corresponding to: \texttt{\colorist{} 2021/08/09}} \email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}} \date{August 2021, Beijing} @@ -136,7 +136,7 @@ With the help of the \ProjLib{} toolkit, also developed by the author, the class You can directly use \colorart{} or \colorbook{} as your document class. In this way, you can directly begin writing your document, without having to worry about the configurations. \begin{code} - \documentclass{colorart} (*{\normalfont or}*) \documentclass{colorbook} +\documentclass{colorart} (*{\normalfont or}*) \documentclass{colorbook} \end{code} \begin{tip} @@ -146,8 +146,8 @@ You can directly use \colorart{} or \colorbook{} as your document class. In this You can also use the default classes \textsf{article} or \textsf{book}, and load the \colorist{} package. This way, only the basic styles are set, and you can thus use your preferred fonts and page layout. All the features mentioned in this article are provided. \begin{code} - \documentclass{article} (*{\normalfont or}*) \documentclass{book} - \usepackage{colorist} +\documentclass{article} (*{\normalfont or}*) \documentclass{book} +\usepackage{colorist} \end{code} \LevelTwoTitle{Example - \colorart} @@ -169,7 +169,7 @@ Let's first look at a complete example of \colorart{} (the same works for \lebha \maketitle \begin{abstract} - Ceci est un résumé. \dnf<Plus de contenu est nécessaire.> + Ceci est un résumé. \dnf<(*\meta{some hint}*)> \end{abstract} \begin{keyword} AAA, BBB, CCC, DDD, EEE @@ -462,12 +462,12 @@ When referencing a theorem-like environment, it is recommended to use \lstinline \begin{tip}[Example] \begin{code} - \begin{definition}[Strange things] \label{def: strange} ... +\begin{definition}[Strange things] \label{def: strange} ... \end{code} will produce \begin{definition}[Strange things]\label{def: strange} - This is the definition of some strange objects. There is approximately an one-line space before and after the theorem environment, and there will be a symbol to mark the end of the environment. + This is the definition of some strange objects. There is approximately a one-line spacing before and after the theorem environment, and there will be a symbol to mark the end of the environment. \end{definition} \lstinline|\cref{def: strange}| will be displayed as: \cref{def: strange}. @@ -571,9 +571,9 @@ And then define this environment in one of following five ways: Here is an example. The following code: \begin{code} - \NameTheorem[EN]{proofidea}{Idea} - \CreateTheorem*{proofidea*} - \CreateTheorem{proofidea}<subsection> +\NameTheorem[EN]{proofidea}{Idea} +\CreateTheorem*{proofidea*} +\CreateTheorem{proofidea}<subsection> \end{code} defines an unnumbered environment \lstinline|proofidea*| and a numbered environment \lstinline|proofidea| (numbered within subsection) respectively. They can be used in English context. The effect is as follows: @@ -608,45 +608,45 @@ Similarly, there is \lstinline|\needgraph| : Therefore, the title part can either be written in the usual way, in accordance with the standard class \textsf{article}: \begin{code} - \title{(*\meta{title}*)} - \author{(*\meta{author}*)\thanks{(*\meta{text}*)}} - \date{(*\meta{date}*)} - \maketitle - \begin{abstract} - (*\meta{abstract}*) - \end{abstract} - \begin{keyword} - (*\meta{keywords}*) - \end{keyword} +\title{(*\meta{title}*)} +\author{(*\meta{author}*)\thanks{(*\meta{text}*)}} +\date{(*\meta{date}*)} +\maketitle +\begin{abstract} + (*\meta{abstract}*) +\end{abstract} +\begin{keyword} + (*\meta{keywords}*) +\end{keyword} \end{code} or written in the way of \AmS{} classes: \begin{code} - \title{(*\meta{title}*)} - \author{(*\meta{author}*)} - \thanks{(*\meta{text}*)} - \address{(*\meta{address}*)} - \email{(*\meta{email}*)} - \date{(*\meta{date}*)} - \keywords{(*\meta{keywords}*)} - \subjclass{(*\meta{subjclass}*)} - \begin{abstract} - (*\meta{abstract}*) - \end{abstract} - \maketitle +\title{(*\meta{title}*)} +\author{(*\meta{author}*)} +\thanks{(*\meta{text}*)} +\address{(*\meta{address}*)} +\email{(*\meta{email}*)} +\date{(*\meta{date}*)} +\keywords{(*\meta{keywords}*)} +\subjclass{(*\meta{subjclass}*)} +\begin{abstract} + (*\meta{abstract}*) +\end{abstract} +\maketitle \end{code} The author information can contain multiple groups, written as: \begin{code} - \author{(*\meta{author 1}*)} - \address{(*\meta{address 1}*)} - \email{(*\meta{email 1}*)} - \author{(*\meta{author 2}*)} - \address{(*\meta{address 2}*)} - \email{(*\meta{email 2}*)} - ... +\author{(*\meta{author 1}*)} +\address{(*\meta{address 1}*)} +\email{(*\meta{email 1}*)} +\author{(*\meta{author 2}*)} +\address{(*\meta{address 2}*)} +\email{(*\meta{email 2}*)} +... \end{code} Among them, the mutual order of \lstinline|\address|, \lstinline|\curraddr|, \lstinline|\email| is not important. diff --git a/macros/latex/contrib/colorist/colorist.sty b/macros/latex/contrib/colorist/colorist.sty index f5f9766e09..0374aec614 100644 --- a/macros/latex/contrib/colorist/colorist.sty +++ b/macros/latex/contrib/colorist/colorist.sty @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesPackage{colorist} - [2021/08/08 A colorful style for articles and books] + [2021/08/09 A colorful style for articles and books] \RequirePackage{kvoptions} \RequirePackage{etoolbox} \SetupKeyvalOptions{% @@ -109,14 +109,14 @@ \fancypagestyle{fancy}{ \fancyhf{} \if@twoside - \fancyfoot[RO]{\small\textcolor{maintext!30!paper}{\lastrightmark}% - ~~\rlap{\textcolor{maintext!27!paper}{$|$}~~\thepage}} - \fancyfoot[LE]{\small\leavevmode\llap{\thepage% - ~~\textcolor{maintext!27!paper}{$|$}}% - ~~\textcolor{maintext!30!paper}{\lastleftmark}} + \fancyfoot[RO]{\sffamily\textcolor{maintext!30!paper}{\small\lastrightmark}% + \rlap{~~~~\textcolor{maintext!75!paper}{\textbf{\thepage}}}} + \fancyfoot[LE]{\leavevmode\sffamily\llap{\textcolor{maintext!75!paper}{\textbf{\thepage}}% + ~~~~}% + \textcolor{maintext!30!paper}{\small\lastleftmark}} \else - \fancyfoot[R]{\small\textcolor{maintext!30!paper}{\lastrightmark}% - ~~\rlap{\textcolor{maintext!27!paper}{$|$}~~\thepage}} + \fancyfoot[R]{\sffamily\textcolor{maintext!30!paper}{\small\lastrightmark}% + \rlap{~~~~\textcolor{maintext!75!paper}{\textbf{\thepage}}}} \fi \renewcommand{\headrulewidth}{0pt} } @@ -125,13 +125,13 @@ \fancypagestyle{plain}{ \fancyhf{} \if@twoside - \fancyfoot[RO]{\small% - ~\rlap{\textcolor{maintext!27!paper}{$|$}~~\thepage}} - \fancyfoot[LE]{\small\leavevmode\llap{\thepage% - ~~\textcolor{maintext!27!paper}{$|$}}} + \fancyfoot[RO]{% + \sffamily~\rlap{~~~~\textcolor{maintext!75!paper}{\textbf{\thepage}}}} + \fancyfoot[LE]{\leavevmode\sffamily\llap{\textcolor{maintext!75!paper}{\textbf{\thepage}}% + ~~~}} \else - \fancyfoot[R]{\small% - ~\rlap{\textcolor{maintext!27!paper}{$|$}~~\thepage}} + \fancyfoot[R]{% + ~\rlap{~~~~\textcolor{maintext!75!paper}{\textbf{\thepage}}}} \fi \renewcommand{\headrulewidth}{0pt} } @@ -333,8 +333,8 @@ \RequirePackage{titletoc} \titlecontents{part} [0em] - {\addvspace{1.5pc}\filcenter\colorist@sffamily} - {{\normalfont\color{maintheme}\thecontentslabel}\nopagebreak\\\nopagebreak\uppercase} + {\addvspace{1.5pc}\large\filcenter\colorist@sffamily\conditionalbfseries} + {\textcolor{maintheme}{\bfseries\thecontentslabel}\nopagebreak\\\nopagebreak\uppercase} {} {} % without page number [\addvspace{.5pc}] @@ -343,45 +343,45 @@ [2em] % i.e., 0em (part) + 2em {\addvspace{1pc}\normalfont\color{maintheme}\colorist@sffamily\conditionalbfseries} {\contentslabel{2em}} - {\hspace*{-2em}} - {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\color{maintheme}\contentspage} + {\colorist@scshape\hspace*{-2em}} + {\titlerule*[10pt]{\parbox{2pt}{\hspace*{-.25pt}\textcolor{maintext!15!paper}{.}}}\color{maintheme}\contentspage} \titlecontents{section} [4em] % i.e., 2em (chapter) + 2em {\addvspace{.3pc}\normalfont\color{maintheme}\colorist@sffamily} {\contentslabel{1.75em}} {\hspace*{-1.75em}} - {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\color{maintheme}\contentspage} + {\titlerule*[10pt]{\parbox{2pt}{\textcolor{maintext!15!paper}{.}}}\color{maintheme}\contentspage} \titlecontents{subsection} [7em] % i.e., 4em (section) + 3em {\addvspace{.15pc}\normalfont\colorist@sffamily} {\contentslabel{2.75em}} {\hspace*{-2.75em}} - {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\color{maintext!45!paper}\contentspage} + {\titlerule*[10pt]{\parbox{2pt}{\textcolor{maintext!15!paper}{.}}}\color{maintext!45!paper}\contentspage} \titlecontents{subsubsection} [10em] % i.e., 7em (subsection) + 3em {\normalfont\colorist@sffamily} {\contentslabel{3.25em}} {\hspace*{-3.25em}} - {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\color{maintext!45!paper}\contentspage} + {\titlerule*[10pt]{\parbox{2pt}{\textcolor{maintext!15!paper}{.}}}\color{maintext!45!paper}\contentspage} }{ \titlecontents{section} [2em] % i.e., 0em (part) + 2em {\addvspace{.3pc}\normalfont\color{maintheme}\colorist@sffamily} {\contentslabel{1.75em}} {\hspace*{-1.75em}} - {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\color{maintheme}\contentspage} + {\titlerule*[10pt]{\parbox{2pt}{\textcolor{maintext!15!paper}{.}}}\color{maintheme}\contentspage} \titlecontents{subsection} - [5em] % i.e., 2em (section) + 3em + [4.5em] % i.e., 2em (section) + 2.5em {\addvspace{.15pc}\normalfont\colorist@sffamily} - {\contentslabel{2.25em}} - {\hspace*{-2.25em}} - {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\color{maintext!45!paper}\contentspage} + {\contentslabel{2.15em}} + {\hspace*{-2.15em}} + {\titlerule*[10pt]{\parbox{2pt}{\textcolor{maintext!15!paper}{.}}}\color{maintext!45!paper}\contentspage} \titlecontents{subsubsection} - [8em] % i.e., 5em (subsection) + 3em + [7.75em] % i.e., 5em (subsection) + 3.25em {\normalfont\colorist@sffamily} {\contentslabel{2.75em}} {\hspace*{-2.75em}} - {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\color{maintext!45!paper}\contentspage} + {\titlerule*[10pt]{\parbox{2pt}{\textcolor{maintext!15!paper}{.}}}\color{maintext!45!paper}\contentspage} } %%================================ diff --git a/macros/latex/contrib/cooltooltips/README b/macros/latex/contrib/cooltooltips/README index 4ba5967717..cb14656b6a 100644 --- a/macros/latex/contrib/cooltooltips/README +++ b/macros/latex/contrib/cooltooltips/README @@ -37,14 +37,14 @@ general information about installing packages. Copyright and license ===================== -Copyright (C) 2006 by Scott Pakin, scott+ctip@pakin.org +Copyright (C) 2006-2021 by Scott Pakin, scott+ctip@pakin.org This file may be distributed and/or modified under the conditions of -the LaTeX Project Public License, either version 1.3b of this license +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 -and version 1.3b or later is part of all distributions of LaTeX -version 2006/01/07 or later. +and version 1.3c or later is part of all distributions of LaTeX +version 2008/05/04 or later. diff --git a/macros/latex/contrib/cooltooltips/cooltooltips.dtx b/macros/latex/contrib/cooltooltips/cooltooltips.dtx index 7f3304d813..dcfd2a4d0d 100644 --- a/macros/latex/contrib/cooltooltips/cooltooltips.dtx +++ b/macros/latex/contrib/cooltooltips/cooltooltips.dtx @@ -1,17 +1,17 @@ % \iffalse meta-comment % -% Copyright (C) 2006 by Scott Pakin <scott+ctip@pakin.org> -% -------------------------------------------------------- +% Copyright (C) 2006-2021 by Scott Pakin <scott+ctip@pakin.org> +% ------------------------------------------------------------- % % This file may be distributed and/or modified under the -% conditions of the LaTeX Project Public License, either version 1.3b +% 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 % -% and version 1.3b or later is part of all distributions of LaTeX -% version 2006/01/07 or later. +% and version 1.3c or later is part of all distributions of LaTeX +% version 2008/05/04 or later. % % \fi % @@ -22,7 +22,7 @@ %<package>\NeedsTeXFormat{LaTeX2e}[2001/06/01] %<package>\ProvidesPackage{cooltooltips} %<*package> - [2006/03/07 v1.0 Cool PDF tooltips] + [2021/08/08 v1.1 Cool PDF tooltips] %</package> % %<*driver> @@ -37,13 +37,13 @@ \begin{document} \sloppy \DocInput{cooltooltips.dtx} -% \PrintChanges + \PrintChanges \PrintIndex \end{document} %</driver> % \fi % -% \CheckSum{204} +% \CheckSum{216} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -63,31 +63,19 @@ % % % \changes{v1.0}{2006/03/07}{Initial version} +% \changes{v1.1}{2021/08/08}{Enable support for Lua\string\LaTeX} % % \GetFileInfo{cooltooltips.dtx} % -% \DoNotIndex{\@ifundefined,\@tempboxa,\@tempcnta,\@tempcntb} -% \DoNotIndex{\@tempdima,\@tempdimb,\@tempdimc,\\} -% \DoNotIndex{\active,\addtolength,\advance} -% \DoNotIndex{\begingroup,\bgroup} -% \DoNotIndex{\catcode,\csname} -% \DoNotIndex{\DeclareRobustCommand,\def,\dp} -% \DoNotIndex{\edef,\egroup,\else,\endcsname,\endgroup,\expandafter} -% \DoNotIndex{\fi} -% \DoNotIndex{\gdef} -% \DoNotIndex{\hbox,\hspace,\ht} -% \DoNotIndex{\ifnum,\ifpdf,\immediate} -% \DoNotIndex{\let} -% \DoNotIndex{\makebox,\mbox,\MessageBreak} -% \DoNotIndex{\newcommand,\noexpand} -% \DoNotIndex{\paperwidth,\pdflastannot,\pdflastobj,\pdflastxform} -% \DoNotIndex{\renewcommand} -% \DoNotIndex{\savebox,\setbox,\setcounter,\setlength,\space} -% \DoNotIndex{\stepcounter,\strip@pt} -% \DoNotIndex{\the,\thepage} -% \DoNotIndex{\usebox} -% \DoNotIndex{\wd} -% \DoNotIndex{\xdef} +% \DoNotIndex{\@ifundefined,\@tempboxa,\@tempcnta,\@tempcntb,\@tempdima} +% \DoNotIndex{\@tempdimb,\@tempdimc,\DeclareRobustCommand,\MessageBreak,\\} +% \DoNotIndex{\active,\addtolength,\advance,\begingroup,\bgroup,\catcode} +% \DoNotIndex{\csname,\def,\dp,\edef,\egroup,\else,\endcsname,\endgroup} +% \DoNotIndex{\expandafter,\fi,\gdef,\hbox,\hspace,\ht,\ifnum,\immediate} +% \DoNotIndex{\let,\makebox,\mbox,\newcommand,\noexpand,\paperwidth} +% \DoNotIndex{\pdflastannot,\pdflastobj,\pdflastxform,\renewcommand} +% \DoNotIndex{\savebox,\setbox,\setcounter,\setlength,\space,\stepcounter} +% \DoNotIndex{\strip@pt,\the,\thepage,\usebox,\wd,\xdef} % % ^^A Define the document's metadata. % \title{The \cool\ package\thanks{This document @@ -142,11 +130,11 @@ % up a brief tooltip when the mouse moves over them and also open a % small window containing additional text. \cool\ works only with % pdf\LaTeX\@. Furthermore, the tooltips that \cool\ produces are much -% less cool when viewed under older versions of Acrobat~($<7.0$) or the -% current version of xpdf~(3.00) because they don't pop up the extra, -% small window. \cooltooltip[0 0 1]{Example}{This is an example of a -% cool tooltip. Pretty cool, eh?}{http://www.ctan.org/}{Visit CTAN on -% the Web}{This text\strut} is an example of a cool tooltip (assuming +% less cool when viewed under older versions of Acrobat~($<7.0$) or most +% other \acro{pdf} readers because they don't pop up the extra, small +% window. \cooltooltip[0 0 1]{Example}{This is an example of a cool +% tooltip. Pretty cool, eh?}{http://www.ctan.org/}{Visit CTAN on the +% Web}{This text\strut} is an example of a cool tooltip (assuming % you're viewing this document with a sufficiently capable \acro{pdf} % reader). Move your mouse pointer over it and watch what happens. % Then, click on the link. If your \acro{pdf} reader is properly @@ -156,8 +144,8 @@ % If the \cool\ popup mechanism causes problems with your browser you % can \cooltooltiptoggle{\fcolorbox{blue}{white}{click here}} to disable % popups. (Click again to re-enable them.) Regardless of whether -% popups are enabled the tooltip and hyperlink mechanisms continue to -% function. +% popups are enabled the tooltip and hyperlink mechanisms should continue +% to function. % % The cool tooltip shown above was created with the following code: % @@ -272,17 +260,17 @@ % \label{sec:license} % % \begin{center} -% Copyright \textcopyright{} 2006 +% Copyright \textcopyright{} 2006--2021 % by Scott Pakin \texttt{<scott+ctip@pakin.org>} % \end{center} % % \noindent % This file may be distributed and/or modified under the conditions of -% the \LaTeX{} Project Public License, either version~1.3b of this +% 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 \url{http://www.latex-project.org/lppl.txt} and -% version~1.3b or later is part of all distributions of \LaTeX{} version -% 2006/01/07 or later. +% version~1.3c or later is part of all distributions of \LaTeX{} version +% 2008/05/04 or later. % } % % \section{Implementation} @@ -314,12 +302,37 @@ % % \bigskip % -% Because \cool\ works only with pdf\LaTeX\ and only in \acro{pdf} mode, -% we load the \textsf{ifpdf} package up front to simplify testing for -% that case. +% Because \cool\ works only with pdf\LaTeX---or Lua\LaTeX\ with the +% \pkgname{luatex85} compatibility package---and only in \acro{pdf} +% mode, we load the \textsf{iftex} package up front to simplify testing +% for the execution environment. % \begin{macrocode} -\RequirePackage{ifpdf} +\RequirePackage{iftex} +\ifluatex + \RequirePackage{luatex85} +\fi +% \end{macrocode} +% +% \begin{macro}{\ifcoolpdf} +% \begin{macro}{\coolpdftrue} +% \begin{macro}{\coolpdffalse} +% We define a new test, |\ifcoolpdf|, which is true only when \TeX\ is +% in \acro{pdf} mode and only when pdf\LaTeX\ or Lua\LaTeX~+ +% \pkgname{luatex85} is being used to build the document. +% \begin{macrocode} +\newif\ifcoolpdf +\ifpdf + \ifluatex + \coolpdftrue + \fi + \ifpdftex + \coolpdftrue + \fi +\fi % \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} % % % \subsection{\pdfterm{AcroForm} construction} @@ -339,7 +352,7 @@ % At the end of the document we need to export the final value of % |\ctip@form@fields| as an \pdfterm{AcroForm}. % \begin{macrocode} -\ifpdf +\ifcoolpdf \AtEndDocument{% \immediate\pdfobj { << @@ -364,7 +377,7 @@ % Define an empty \pdfterm{XForm} object to use as an invisible icon for % the \pdfterm{Text} annotation. % \begin{macrocode} -\ifpdf +\ifcoolpdf \setbox\@tempboxa=\hbox{} \immediate\pdfxform\@tempboxa \edef\ctip@empty@icon{\the\pdflastxform} @@ -438,10 +451,10 @@ % % \begin{macro}{\ctip@update@pagenum} % We can't reliably use |\thepage| to get the current page number -% (cf.~\url{http://www.tex.ac.uk/cgi-bin/texfaq2html?label=wrongpn}). -% Hence, we exploit the |\label|\slash|\pageref| mechanism to get an -% accurate page number. |\ctip@update@pagenum| creates a label (based -% on Section~\ref{sec:text}'s |\ctip@tip@number|) then sets +% (cf.~\url{https://texfaq.org/FAQ-wrongpn}). Hence, we exploit the +% |\label|\slash|\pageref| mechanism to get an accurate page number. +% |\ctip@update@pagenum| creates a label (based on +% Section~\ref{sec:text}'s |\ctip@tip@number|) then sets % |\ctip@current@page| to the page on which the label occurs. % \begin{macrocode} \newcommand*{\ctip@update@pagenum}{% @@ -827,14 +840,13 @@ % \subsection{Sanity checks} % \label{sec:sanity-checks} % -% Complain---but attempt to continue---if we're not running pdf\LaTeX\ -% in \acro{pdf} mode. +% Complain---but attempt to continue---if we're not running +% pdf\LaTeX\ or Lua\LaTeX\ in \acro{pdf} mode. % \begin{macrocode} -\RequirePackage{ifpdf} -\ifpdf +\ifcoolpdf \else \PackageWarning{cooltooltips}{% - Not running pdfLaTeX in PDF mode; disabling cooltooltips% + Not running pdfLaTeX or LuaLaTeX in PDF mode; disabling cooltooltips% } \renewcommand*{\ctip@cooltooltip@i}[6][]{\mbox{#6}} \fi diff --git a/macros/latex/contrib/cooltooltips/cooltooltips.ins b/macros/latex/contrib/cooltooltips/cooltooltips.ins index 0156ff98d0..e0d7f2cf00 100644 --- a/macros/latex/contrib/cooltooltips/cooltooltips.ins +++ b/macros/latex/contrib/cooltooltips/cooltooltips.ins @@ -1,15 +1,15 @@ %% -%% Copyright (C) 2006 by Scott Pakin <scott+ctip@pakin.org> +%% Copyright (C) 2006-2021 by Scott Pakin <scott+ctip@pakin.org> %% %% This file may be distributed and/or modified under the conditions of -%% the LaTeX Project Public License, either version 1.3b of this license +%% 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 -%% -%% and version 1.3b or later is part of all distributions of LaTeX version -%% 2006/01/07 or later. +%% +%% and version 1.3c or later is part of all distributions of LaTeX version +%% 2008/05/04 or later. %% \input docstrip.tex @@ -21,17 +21,17 @@ This is a generated file. -Copyright (C) 2006 by Scott Pakin <scott+ctip@pakin.org> +Copyright (C) 2006-2021 by Scott Pakin <scott+ctip@pakin.org> This file may be distributed and/or modified under the conditions of -the LaTeX Project Public License, either version 1.3b of this license +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 -and version 1.3b or later is part of all distributions of LaTeX version -2006/01/07 or later. +and version 1.3c or later is part of all distributions of LaTeX version +2008/05/04 or later. \endpreamble diff --git a/macros/latex/contrib/cooltooltips/cooltooltips.pdf b/macros/latex/contrib/cooltooltips/cooltooltips.pdf Binary files differindex 61535382bd..d31a475fa3 100644 --- a/macros/latex/contrib/cooltooltips/cooltooltips.pdf +++ b/macros/latex/contrib/cooltooltips/cooltooltips.pdf diff --git a/macros/latex/contrib/cooltooltips/example.png b/macros/latex/contrib/cooltooltips/example.png Binary files differnew file mode 100644 index 0000000000..ac30a30696 --- /dev/null +++ b/macros/latex/contrib/cooltooltips/example.png diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx index b48cd00d3d..6a32dd2f6d 100644 --- a/macros/latex/contrib/easybook/easybook.dtx +++ b/macros/latex/contrib/easybook/easybook.dtx @@ -8,7 +8,7 @@ %<*class> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2021/08/06}{1.28F} +\ProvidesExplClass{easybook}{2021/08/09}{1.28H} {Typeset Chinese theses or books} \bool_set_false:N \l__eb_compile_draft_bool @@ -292,7 +292,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2021/08/06}{1.28F} +\ProvidesExplPackage{easybase}{2021/08/09}{1.28H} {Typeset Chinese theses or books} \cs_generate_variant:Nn \dim_add:Nn { NV,Nv } @@ -819,6 +819,8 @@ fnmark-code .initial:n = { ,\tl_if_eq:NnF \l__eb_fnmark_position_tl { super } { \space } }, fnmark-form .tl_set:N = \l__eb_fnmark_format_tl, + fncust-form .tl_set:N = \l__eb_fncust_format_tl, + fnboth-form .meta:n = { fnmark-form = #1,fncust-form = #1 }, footnotetype .multichoices:nn = { default,hang,bottom,para } @@ -957,8 +959,7 @@ \selectfont\ignorespaces \l__eb_subfont_footnote_tl } -\ProvideDocumentCommand{\super}{mo}{\textsuperscript{#1}} -\providecommand{\spb@textsuperscript@save}{\textsuperscript} +\ProvideDocumentCommand{\super}{d()mo}{\textsuperscript{#2}} \providecommand{\spbset}{\use_none:n} \cs_set_protected:Npn \footref #1 { @@ -1001,34 +1002,38 @@ \H@@footnotemark } } +\NewDocumentCommand{\eb@fnmark@super}{sm} + { + \IfBooleanTF{#1} + {\super{#2}[0pt]} + {\super(\l__eb_fnmark_format_tl){#2}[0pt]} + } +\cs_new_protected:Npn \eb_fnmark_format_initial: + { + \spbset{super-format = { },nohshift} + \tl_use:N \l__eb_subfont_footnote_tl + } \cs_set:Npn \@makefnmark { \hbox:n { - \spbset{super-format = { }} - \tl_use:N \l__eb_subfont_footnote_tl - \tl_use:N \l__eb_fnmark_format_tl - { - \tl_if_eq:NnTF \@mpfn { footnote } - { \super{\eb@thefnmark}[0pt] } - { \super{\@thefnmark}[0pt] } - } + \eb_fnmark_format_initial: + \tl_if_eq:NnTF \@mpfn { footnote } + { \eb@fnmark@super{\eb@thefnmark} } + { \eb@fnmark@super{\@thefnmark} } } } \cs_new:Npn \eb@makefnmark { \hbox:n { - \tl_use:N \l__eb_subfont_footnote_tl - \tl_use:N \l__eb_fnmark_format_tl + \eb_fnmark_format_initial: + \tl_if_eq:NnT \l__eb_fnmark_position_tl { super } + { \eb@fnmark@super* } { - \tl_if_eq:NnT \l__eb_fnmark_position_tl { super } - { \spb@textsuperscript@save } - { - \tl_use:N \l__eb_fnmark_before_tl - \@thefnmark - \tl_use:N \l__eb_fnmark_after_tl - } + \tl_use:N \l__eb_fnmark_before_tl + \l__eb_fnmark_format_tl{\@thefnmark} + \tl_use:N \l__eb_fnmark_after_tl } } } @@ -1044,16 +1049,35 @@ \group_end: } } -\NewDocumentCommand{\Footnote}{O{#2}m} +\cs_new_protected:Npn \eb_fncust_format_initial: + { + \hdrset{fnmark-code = { }} + \tl_set_eq:NN + \l__eb_fnmark_format_tl \l__eb_fncust_format_tl + } +\NewDocumentCommand{\Footnote}{O{#2}mm} { + \group_begin: + \eb_fncust_format_initial: \eb@@makefnmark{#2}{#1} \@footnotemark - \@footnotetext + \@footnotetext{#3} + \group_end: } \cs_new_protected:Npn \Footnotemark #1 - { \eb@@makefnmark{#1}{#1}\@footnotemark } -\cs_new_protected:Npn \Footnotetext #1 - { \eb@@makefnmark{#1}{#1}\@footnotetext } + { + \group_begin: + \eb_fncust_format_initial: + \eb@@makefnmark{#1}{#1}\@footnotemark + \group_end: + } +\cs_new_protected:Npn \Footnotetext #1#2 + { + \group_begin: + \eb_fncust_format_initial: + \eb@@makefnmark{#1}{#1}\@footnotetext{#2} + \group_end: + } \cs_new:Npn \eb@footmisc@ifvoid #1#2#3 { \ifvoid #1#2\else #3\fi } \cs_set:Npn \thempfootnote { \int_to_alph:n { \c@mpfootnote } } @@ -2372,7 +2396,7 @@ } %</package> %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2021/08/06}{1.28F} +\ProvidesExplFile{eb-tcolorbox.cfg}{2021/08/09}{1.28H} {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 Binary files differindex 2f7d0b55ac..3d0183b324 100644 --- a/macros/latex/contrib/easybook/easybook.pdf +++ b/macros/latex/contrib/easybook/easybook.pdf diff --git a/macros/latex/contrib/easybook/easybook.tex b/macros/latex/contrib/easybook/easybook.tex index fe2228bc1a..34b22931d2 100644 --- a/macros/latex/contrib/easybook/easybook.tex +++ b/macros/latex/contrib/easybook/easybook.tex @@ -11,8 +11,8 @@ { name = easybook, title = EASYBOOK 使用手册, - version = v1.28F, - date = 2021/08/06, + version = v1.28H, + date = 2021/08/09, authors = 瞿毅, info = 排版简体中文学位论文和书籍, email = quee123@foxmail.com, @@ -268,7 +268,7 @@ \keyval-{columns}{目录栏数}\Default{2} 设置目录的栏数，仅在 \keyis-{multoc}{true} 时有效，默认为双栏。 \kvsplit{title}{中文目录标题,英文目录标题}\newline - 用于更改目录的标题，标题之间用一个英文逗号分开，也可以只有一部分，表示中文目录的标题。当设置了英文目录标题时，英文目录标题将会自动加入主文档目录 \cs*{tableofcontents+} 命令。 + 用于更改目录的标题，标题之间用一个英文逗号分开，也可以只有一部分，表示中文目录的标题。当设置了英文目录标题时，英文目录标题将会自动加入主文档目录 \cs*{tableofcontents}\parg{} 命令。 \keyval-{format}{目录标题格式}\Default 在书籍模式且 \option{chapter} 选项开启或者文章模式的情况下，\option{format} 用于设置目录标题的格式。 \keyval-{aftertitle}{目录标题格式}\Default @@ -281,14 +281,14 @@ 双语目录标题命令目前设置了常用的三个级别，它们将中文标题正常输出，并使中英文标题加入双语目录。类似于标准文档类，这三个标题命令分别具有独立的计数器\footnote{默认情况下与普通标题命令共享使用计数器。}，并对应 \cs*{the}\meta{计数器} 的值，可以用于 \option{binumber} 选项更改英文目录中的编号。这个功能是为国内一些高校的学位论文模板的要求设计，在一般情况和英文模式下\textbf{不需要使用}。 \begin{commands} \command{bichapter}[\sarg\oarg{目录中文标题}\marg{中文标题}\marg{目录英文标题}] - \code{chapter} 级别的双语目录标题命令，具有独立的 \code{bichapter} 计数器。 + \code{chapter} 章级别的双语目录标题命令，具有独立的 \code{bichapter} 计数器。 \command{bisection}[\sarg\oarg{目录中文标题}\marg{中文标题}\marg{目录英文标题}] - \code{section} 级别的双语目录标题命令，具有独立的 \code{bisection} 计数器。 + \code{section} 节级别的双语目录标题命令，具有独立的 \code{bisection} 计数器。 \command{bisubsection}[\sarg\oarg{目录中文标题}\marg{中文标题}\marg{目录英文标题}] - \code{subsection} 级别的双语目录标题命令，具有独立的 \code{bisubsection} 计数器。 + \code{subsection} 小节级别的双语目录标题命令，具有独立的 \code{bisubsection} 计数器。 \end{commands} -它们的星号变体命令使文中标题不编号，但是仍然加入双语目录，若英文标题参数空置那么仅加入中文目录而不加入英文目录，这一特点与 \cs{chapter*} 等命令的行为不太一样，在一些情况下会用到。可选参数是目录中的中文标题，默认与中文标题一致，正文标题过长时可用它设置在目录中显示的标题。默认情况下双语目录的格式是一致的，共享使用 \module*{tocset} 的设置，英文目录的章级别标题名及编号的修改方式如下： +它们的星号变体命令使文中标题不编号，但是仍然加入双语目录，若英文标题参数空置那么仅加入中文目录而不加入英文目录，这一特点与 \cs*{chapter}\sarg{} 等命令的行为不太一样，在一些情况下会用到。可选参数是目录中的中文标题，默认与中文标题一致，正文标题过长时可用它设置在目录中显示的标题。默认情况下双语目录的格式是一致的，共享使用 \module*{tocset} 的设置，英文目录的章级别标题名及编号的修改方式如下： \begin{options} \kvsplit{biname}{英文目录前名字,英文目录后名字}\Module{chapter}\Default{Chapter\cs*{space}} 更改英文目录 \code{chapter} 级别的标题编号前后名字，类似 C\TeX 的 \option*{name} 选项。 @@ -304,7 +304,7 @@ \end{commands} \subsection{上标和下标} -上标和下标的功能来自 \pkg*{spbmark} 宏包，\cs{super}、\cs{sub} 和 \cs{supersub} 三个命令可以用于输出上标和下标。它们根据当前处于文本模式还是数学模式来匹配相应的模式，或者可以使用它们的星号变体命令来强制使用数学模式。也可以使用键值列表对偏移量进行全局设置，详情见小节 \ref{subsubsec:super-sub-script}。 +上标和下标的功能来自 \pkg*{spbmark} 宏包，\cs{super}、\cs{sub} 和 \cs{supersub} 三个命令可以用于输出上标和下标。它们根据当前处于文本还是数学模式来匹配相应的模式，或者可以使用它们的星号变体命令来强制使用数学模式。也可以使用键值列表对偏移量进行全局设置，详情见小节 \ref{subsubsec:super-sub-script}。 \begin{commands} \command{super}[\sarg\oarg{垂直偏移}\splitoarg{高度,深度}\darg{格式代码}\marg{内容}\oarg{水平偏移}] 上标命令，与简短命令 \cs{sp} 等效。水平和垂直偏移进行距离微调，可以为带有长度单位的正值或负值，为正值时代表向上或向右移动，否则相反，默认均为 \code{0pt}。\meta{格式代码} 可以插入字体或颜色等命令，代码中的最后一个命令可以接受一个为上标或下标的参数。 @@ -398,6 +398,10 @@ 下标垂直偏移量，对应 \cs{sub} 命令的参数 \meta{垂直偏移}。 \keyval-{sub-hshift}{刚性长度}\Default{0pt} 下标水平偏移量，对应 \cs{sub} 命令的参数 \meta{水平偏移}。 + \opt{nohshift}\Default! + 同时取消上标和下标的 \meta{水平偏移}，与 \keyis-{super-hshift}{0pt} 和 \keyis-{sub-hshift}{0pt} 等效。 + \opt{novshift}\Default! + 同时取消上标和下标的 \meta{垂直偏移}，与 \keyis-{super-vshift}{0pt} 和 \keyis-{sub-vshift}{0pt} 等效。 \keyval-{super-format}{上标格式}\Default 上标的格式，对应 \cs{super} 命令的参数 \meta{格式代码}。 \keyval-{sub-format}{下标格式}\Default @@ -676,13 +680,13 @@ \subsubsection{脚注格式} \begin{options} \keyval-{fnmargin}{刚性长度}\Module{hdrset}\Default{0.75em} - 脚注首段缩进距离，等于长度 \cs{footnoteindent} 的值. + 脚注首段缩进距离，等于长度 \cs{footnoteindent} 的值。 \keyval-{fnparskip}{弹性长度}\Default{0ex} 脚注段落间距，等于长度 \cs{footparskip} 的值。 \keyval-{fnparindent}{刚性长度}\Default{2em} 脚注段落缩进，等于长度 \cs{footparindent} 的值。 \keychoice{footnotetype}{hang,default,bottom}\Default{hang} - 脚注的类型，悬挂缩进 \code{hang} 是默认值，\code{default} 是原始的类型，在一些浮动体排版的情况下，脚注可能位于页面中间，\code{bottom} 使脚注始终位于页面底端。这是个复合选项，\option{bottom} 可以与前两种类型重复或复合使用： + 脚注的类型，悬挂缩进 \code{hang} 是默认值，\code{default} 是原始的类型，在一些浮动体排版的情况下，脚注可能位于页面中间，\code{bottom} 使脚注始终位于页面底端。这是个复合选项，\code{bottom} 可以与前两种类型重复或复合使用： \begin{ctexexam} \hdrset{footnotetype = default,footnotetype = bottom} \hdrset{footnotetype = {hang,bottom}} @@ -702,7 +706,19 @@ \keychoice{fnboth-num}{plain,pifont,pifont*,pifont-sans,pifont-sans*,短编号}\Default{plain} 同时设定脚注正文标记编号 \option{fnmark-num} 与脚注内容标记编号 \option{fntext-num} 的格式。目前脚注编号格式选项对于迷你页环境 \env*{minipage} 无效，其中的脚注保持默认英文字母的编号形式。 \keyval-{fnmark-form}{格式代码}\Default - 脚注标记的格式，在此设置字体命令会覆盖 \module*{subfont/}\option{footnote} 的设置，最后一个格式命令可以带有一个参数，这个参数接受脚注标记，一般配合 \keyis-{fnmark-num}{plain} 使用。 + 脚注标记的格式，一般配合选项 \keyis-{fnmark-num}{plain} 使用，例如配合 \pkg*{circledsteps} 宏包的带圈符号命令 \cs*{Circled} 给脚注标记添加圆圈： + \begin{ctexexam} + \usepackage{circledsteps} + \hdrset + { + fnmark-pos = normal, + fnmark-form = \tiny\Circled + } + \end{ctexexam} + \keyval-{fncust-form}{格式代码}\Default + 单独设定自定义脚注标记的格式，自定义脚注的命令与用法见小节 \ref{subsubsec:custom footnotes}。 + \keyval-{fnboth-form}{格式代码}\Default + 同时设定脚注标记 \option{fnmark-form} 和自定义脚注标记 \option{fncust-form} 的格式。标记格式选项含有字体命令会覆盖 \module*{subfont/}\option{footnote} 的设置，最后一个格式命令可以带有一个参数接受脚注标记。 \keyval-{fntext-form}{格式代码}\Default 脚注内容的格式，在此设置字体命令会覆盖 \module*{subfont/}\option{footnote} 的设置，最后一个格式命令可以带有一个参数，这个参数接受脚注内容。 \kvsplit{fnmark-code}{前代码,后代码}\newline @@ -1106,6 +1122,7 @@ \end{commands} \subsubsection{自定义脚注} +\label{subsubsec:custom footnotes} \begin{commands}\noitemsep \command{Footnote}[\oarg{内容标记}\marg{正文标记}\marg{脚注文本}]\default{} \command{Footnotetext}[\marg{内容标记}\marg{脚注文本}]\default{} diff --git a/macros/latex/contrib/minimalist/minimalist-doc.pdf b/macros/latex/contrib/minimalist/minimalist-doc.pdf Binary files differindex 51cb38acaf..151b45a41a 100644 --- a/macros/latex/contrib/minimalist/minimalist-doc.pdf +++ b/macros/latex/contrib/minimalist/minimalist-doc.pdf diff --git a/macros/latex/contrib/minimalist/minimalist-doc.tex b/macros/latex/contrib/minimalist/minimalist-doc.tex index bade46ae91..b3ead54ad1 100644 --- a/macros/latex/contrib/minimalist/minimalist-doc.tex +++ b/macros/latex/contrib/minimalist/minimalist-doc.tex @@ -98,7 +98,7 @@ \title{\minimalist{}, write your articles or books in a simple and clear way} \author{Jinwen XU} -\thanks{Corresponding to: \texttt{\minimalist{} 2021/08/08}} +\thanks{Corresponding to: \texttt{\minimalist{} 2021/08/08a}} \email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}} \date{August 2021, Beijing} @@ -141,7 +141,7 @@ With the help of the \ProjLib{} toolkit, also developed by the author, the class You can directly use \minimart{} or \minimbook{} as your document class. In this way, you can directly begin writing your document, without having to worry about the configurations. \begin{code} - \documentclass{minimart} (*{\normalfont or}*) \documentclass{minimbook} +\documentclass{minimart} (*{\normalfont or}*) \documentclass{minimbook} \end{code} \begin{tip} @@ -151,8 +151,8 @@ You can directly use \minimart{} or \minimbook{} as your document class. In this You can also use the default classes \textsf{article} or \textsf{book}, and load the \minimalist{} package. This way, only the basic styles are set, and you can thus use your preferred fonts and page layout. All the features mentioned in this article are provided. \begin{code} - \documentclass{article} (*{\normalfont or}*) \documentclass{book} - \usepackage{minimalist} +\documentclass{article} (*{\normalfont or}*) \documentclass{book} +\usepackage{minimalist} \end{code} \LevelTwoTitle{Example - \minimart} @@ -174,7 +174,7 @@ Let's first look at a complete example of \minimart{} (the same works for \einfa \maketitle \begin{abstract} - Ceci est un résumé. \dnf<Plus de contenu est nécessaire.> + Ceci est un résumé. \dnf<(*\meta{some hint}*)> \end{abstract} \begin{keyword} AAA, BBB, CCC, DDD, EEE @@ -474,12 +474,12 @@ When referencing a theorem-like environment, it is recommended to use \lstinline \begin{tip}[Example] \begin{code} - \begin{definition}[Strange things] \label{def: strange} ... +\begin{definition}[Strange things] \label{def: strange} ... \end{code} will produce \begin{definition}[Strange things]\label{def: strange} - This is the definition of some strange objects. There is approximately an one-line space before and after the theorem environment, and there will be a symbol to mark the end of the environment. + This is the definition of some strange objects. There is approximately a one-line spacing before and after the theorem environment, and there will be a symbol to mark the end of the environment. \end{definition} \lstinline|\cref{def: strange}| will be displayed as: \cref{def: strange}. @@ -548,9 +548,9 @@ And then define this environment in one of following five ways: Here is an example. The following code: \begin{code} - \NameTheorem[EN]{proofidea}{Idea} - \CreateTheorem*{proofidea*} - \CreateTheorem{proofidea}<subsection> +\NameTheorem[EN]{proofidea}{Idea} +\CreateTheorem*{proofidea*} +\CreateTheorem{proofidea}<subsection> \end{code} defines an unnumbered environment \lstinline|proofidea*| and a numbered environment \lstinline|proofidea| (numbered within subsection) respectively. They can be used in English context. @@ -586,45 +586,45 @@ Similarly, there is \lstinline|\needgraph| : Therefore, the title part can either be written in the usual way, in accordance with the standard class \textsf{article}: \begin{code} - \title{(*\meta{title}*)} - \author{(*\meta{author}*)\thanks{(*\meta{text}*)}} - \date{(*\meta{date}*)} - \maketitle - \begin{abstract} - (*\meta{abstract}*) - \end{abstract} - \begin{keyword} - (*\meta{keywords}*) - \end{keyword} +\title{(*\meta{title}*)} +\author{(*\meta{author}*)\thanks{(*\meta{text}*)}} +\date{(*\meta{date}*)} +\maketitle +\begin{abstract} + (*\meta{abstract}*) +\end{abstract} +\begin{keyword} + (*\meta{keywords}*) +\end{keyword} \end{code} or written in the way of \AmS{} classes: \begin{code} - \title{(*\meta{title}*)} - \author{(*\meta{author}*)} - \thanks{(*\meta{text}*)} - \address{(*\meta{address}*)} - \email{(*\meta{email}*)} - \date{(*\meta{date}*)} - \keywords{(*\meta{keywords}*)} - \subjclass{(*\meta{subjclass}*)} - \begin{abstract} - (*\meta{abstract}*) - \end{abstract} - \maketitle +\title{(*\meta{title}*)} +\author{(*\meta{author}*)} +\thanks{(*\meta{text}*)} +\address{(*\meta{address}*)} +\email{(*\meta{email}*)} +\date{(*\meta{date}*)} +\keywords{(*\meta{keywords}*)} +\subjclass{(*\meta{subjclass}*)} +\begin{abstract} + (*\meta{abstract}*) +\end{abstract} +\maketitle \end{code} The author information can contain multiple groups, written as: \begin{code} - \author{(*\meta{author 1}*)} - \address{(*\meta{address 1}*)} - \email{(*\meta{email 1}*)} - \author{(*\meta{author 2}*)} - \address{(*\meta{address 2}*)} - \email{(*\meta{email 2}*)} - ... +\author{(*\meta{author 1}*)} +\address{(*\meta{address 1}*)} +\email{(*\meta{email 1}*)} +\author{(*\meta{author 2}*)} +\address{(*\meta{address 2}*)} +\email{(*\meta{email 2}*)} +... \end{code} Among them, the mutual order of \lstinline|\address|, \lstinline|\curraddr|, \lstinline|\email| is not important. diff --git a/macros/latex/contrib/minimalist/minimalist.sty b/macros/latex/contrib/minimalist/minimalist.sty index 295019f1c9..04aba94b43 100644 --- a/macros/latex/contrib/minimalist/minimalist.sty +++ b/macros/latex/contrib/minimalist/minimalist.sty @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesPackage{minimalist} - [2021/08/08 A simple and clear style for articles and books] + [2021/08/08a A simple and clear style for articles and books] \RequirePackage{kvoptions} \RequirePackage{etoolbox} \SetupKeyvalOptions{% diff --git a/macros/latex/contrib/minimalist/minimart.cls b/macros/latex/contrib/minimalist/minimart.cls index 263639cc1b..11d6858055 100644 --- a/macros/latex/contrib/minimalist/minimart.cls +++ b/macros/latex/contrib/minimalist/minimart.cls @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesClass{minimart} - [2021/08/08 A simple and clear article style] + [2021/08/08a A simple and clear article style] \def\minimclass@baseclass{article} \RequirePackage{kvoptions} \RequirePackage{etoolbox} diff --git a/macros/latex/contrib/minimalist/minimbook.cls b/macros/latex/contrib/minimalist/minimbook.cls index 3a53bfbc8d..6a3caba3a8 100644 --- a/macros/latex/contrib/minimalist/minimbook.cls +++ b/macros/latex/contrib/minimalist/minimbook.cls @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesClass{minimbook} - [2021/08/08 A simple and clear book style] + [2021/08/08a A simple and clear book style] \def\minimclass@baseclass{book} \RequirePackage{kvoptions} \RequirePackage{etoolbox} diff --git a/macros/latex/contrib/projlib/ProjLib-doc-cn.pdf b/macros/latex/contrib/projlib/ProjLib-doc-cn.pdf Binary files differindex 9a561d6472..69dee3c60b 100644 --- a/macros/latex/contrib/projlib/ProjLib-doc-cn.pdf +++ b/macros/latex/contrib/projlib/ProjLib-doc-cn.pdf diff --git a/macros/latex/contrib/projlib/ProjLib-doc-en.pdf b/macros/latex/contrib/projlib/ProjLib-doc-en.pdf Binary files differindex d5d058f7a8..314e907b00 100644 --- a/macros/latex/contrib/projlib/ProjLib-doc-en.pdf +++ b/macros/latex/contrib/projlib/ProjLib-doc-en.pdf diff --git a/macros/latex/contrib/projlib/ProjLib-doc-fr.pdf b/macros/latex/contrib/projlib/ProjLib-doc-fr.pdf Binary files differindex ffdf43be50..fe6acb9c57 100644 --- a/macros/latex/contrib/projlib/ProjLib-doc-fr.pdf +++ b/macros/latex/contrib/projlib/ProjLib-doc-fr.pdf diff --git a/macros/latex/contrib/projlib/ProjLib-doc.dtx b/macros/latex/contrib/projlib/ProjLib-doc.dtx index 161f53b2cd..c228578a01 100644 --- a/macros/latex/contrib/projlib/ProjLib-doc.dtx +++ b/macros/latex/contrib/projlib/ProjLib-doc.dtx @@ -108,7 +108,7 @@ %<*ProjLib-doc-cn> \title{\ProjLib{} 工具集\\[.3\baselineskip]\normalsize 使用指南} \author{许锦文} -\thanks{对应版本.~~\texttt{\ProjLib{}~2021/08/07}} +\thanks{对应版本.~~\texttt{\ProjLib{}~2021/08/07a}} \email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}} \date{2021年8月，北京} %</ProjLib-doc-cn> @@ -116,7 +116,7 @@ %<*ProjLib-doc-en> \title{\ProjLib{}~\,Toolkit\\[.3\baselineskip]\normalsize User Manual} \author{Jinwen XU} -\thanks{Corresponding to: \texttt{\ProjLib{}~2021/08/07}} +\thanks{Corresponding to: \texttt{\ProjLib{}~2021/08/07a}} \email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}} \date{August 2021, Beijing} %</ProjLib-doc-en> @@ -124,7 +124,7 @@ %<*ProjLib-doc-fr> \title{La boîte à outils~\,\ProjLib{}\\[.3\baselineskip]\normalsize Manuel d'utilisation} \author{Jinwen XU} -\thanks{Correspondant à : \texttt{\ProjLib{}~2021/08/07}} +\thanks{Correspondant à : \texttt{\ProjLib{}~2021/08/07a}} \email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}} \date{Août 2021, à Pékin} %</ProjLib-doc-fr> @@ -150,7 +150,8 @@ %</ProjLib-doc-fr> \begin{multicols}{2} - \small +%<!ProjLib-doc-fr> \small +%<ProjLib-doc-fr> \footnotesize \tableofcontents \end{multicols} @@ -1434,7 +1435,7 @@ Pour plus de détails sur la façon de sélectionner une langue, veuillez vous r \end{equation*} \end{enumerate} -另外，\PJLmath{} 还提供了一些 \LaTeX 中未自带的符号。 +另外，\PJLmath{} 还提供了一些 \LaTeX{} 中未自带的符号。 \begin{longtable}[l]{ p{4cm} p{6cm} p{6cm} } \lstinline|\abs| & \lstinline|\abs{a}| $\rightarrow \abs{a}$ & 绝对值符号 \\ @@ -1447,6 +1448,8 @@ Pour plus de détails sur la façon de sélectionner une langue, veuillez vous r % \lstinline|\tlegendre| & \lstinline|\tlegendre{a}{p}| $\rightarrow \tlegendre{a}{p}$ & Legendre 符号 (text style) \\ % \lstinline|\dlegendre| & \lstinline|\dlegendre{a}{p}| $\rightarrow \dlegendre{a}{p}$ & Legendre 符号 (display style) \\ \end{longtable} + +这些捷径和符号是以一种安全的方式定义的，它们不会与已有的命令或你自己定义的命令相冲突。因此即使你用不到这些捷径或符号，也不用担心它们的存在会带来错误。 %</ProjLib-doc-cn> % %<*ProjLib-doc-en> @@ -1493,6 +1496,8 @@ In addition, \PJLmath{} also provides some math symbols that are not by default \end{longtable} % % There's also a starred version of \lstinline|\pmod|, which eliminate the spacing before it: \lstinline|a\pmod*{4}| $\rightarrow a\pmod*{4}$. Compared with: \lstinline|a\pmod{4}| $\rightarrow a\pmod{4}$. + +These shortcuts and symbols are defined in such a way that they will not conflict with existing or user-defined commands. Thus, even if you do not use these shortcuts or symbols, there is no need to worry that their existence will bring errors. %</ProjLib-doc-en> % %<*ProjLib-doc-fr> @@ -1536,6 +1541,8 @@ De plus, \PJLmath{} fournit également des symboles mathématiques qui ne sont p % \lstinline|\tlegendre| & \lstinline|\tlegendre{a}{p}| $\rightarrow \tlegendre{a}{p}$ & Symbole Legendre (text-style) \\ % \lstinline|\dlegendre| & \lstinline|\dlegendre{a}{p}| $\rightarrow \dlegendre{a}{p}$ & Symbole Legendre (display-style) \\ \end{longtable} + +Ces raccourcis et symboles sont définis de telle manière qu'ils n'entrent pas en conflit avec les commandes existantes ou les commandes définies par l'utilisateur. Ainsi, même dans le cas où vous n'utilisez pas ces raccourcis ou symboles, ne vous inquiétez pas que leur existence apporte des erreurs. %</ProjLib-doc-fr> %<*ProjLib-doc-cn> diff --git a/macros/latex/contrib/projlib/ProjLib.dtx b/macros/latex/contrib/projlib/ProjLib.dtx index 92b1d84fed..ee03498a47 100644 --- a/macros/latex/contrib/projlib/ProjLib.dtx +++ b/macros/latex/contrib/projlib/ProjLib.dtx @@ -18,47 +18,47 @@ % %<*ProjLib> \ProvidesPackage{ProjLib} - [2021/08/07 The collective interface of ProjLib toolkit] + [2021/08/07a The collective interface of ProjLib toolkit] %</ProjLib> % %<*PJLauthor> \ProvidesPackage{PJLauthor} - [2021/08/07 Enhanced author information block] + [2021/08/07a Enhanced author information block] %</PJLauthor> % %<*PJLdate> \ProvidesPackage{PJLdate} - [2021/08/07 Convert yyyy-mm-dd to normal datetime format] + [2021/08/07a Convert yyyy-mm-dd to normal datetime format] %</PJLdate> % %<*PJLdraft> \ProvidesPackage{PJLdraft} - [2021/08/07 Some useful macros for the draft stage] + [2021/08/07a Some useful macros for the draft stage] %</PJLdraft> % %<*PJLlang> \ProvidesPackage{PJLlang} - [2021/08/07 Multi-language configuration] + [2021/08/07a Multi-language configuration] %</PJLlang> % %<*PJLlogo> \ProvidesPackage{PJLlogo} - [2021/08/07 The ProjLib logo] + [2021/08/07a The ProjLib logo] %</PJLlogo> % %<*PJLmath> \ProvidesPackage{PJLmath} - [2021/08/07 Useful math macros and shortcuts] + [2021/08/07a Useful math macros and shortcuts] %</PJLmath> % %<*PJLpaper> \ProvidesPackage{PJLpaper} - [2021/08/07 Paper style configuration] + [2021/08/07a Paper style configuration] %</PJLpaper> % %<*PJLthm> \ProvidesPackage{PJLthm} - [2021/08/07 Theorem setup and configuration] + [2021/08/07a Theorem setup and configuration] %</PJLthm> % %# 下面两行引入宏包的代码是所有文件共用的。 diff --git a/macros/latex/contrib/projlib/README.md b/macros/latex/contrib/projlib/README.md index 28d8e8de04..b6b8a3eae4 100644 --- a/macros/latex/contrib/projlib/README.md +++ b/macros/latex/contrib/projlib/README.md @@ -2,8 +2,8 @@ # ProjLib Toolkit -> **ProjLib** can be interpreted as "***Proj**ect **Lib**rary*" (in English), or "***Proj**et **Lib**re*" (in French). -> Personally, I prefer later one. +> **ProjLib** can be interpreted as "***Proj**ect **Lib**rary*" (in English), or as "***Proj**et **Lib**re*" (in French). +> Personally, I prefer the later one. ## Introduction @@ -60,6 +60,12 @@ You can get the `.tex` source files of the documentation by compiling `ProjLib-d latex ProjLib-doc.ins ``` +## How to compile the documentation +It is recommended to use `latexmk` with option `-xelatex`: +``` +latexmk -xelatex ProjLib-doc-**.tex +``` + ## An example ```latex \documentclass{amsart} @@ -88,7 +94,7 @@ latex ProjLib-doc.ins \keywords{...} \begin{abstract} - Ceci est un résumé. \dnf<Plus de contenu est nécessaire.> + Ceci est un résumé. \dnf<Some hint> \end{abstract} \maketitle diff --git a/macros/latex/contrib/spbmark/spbmark.pdf b/macros/latex/contrib/spbmark/spbmark.pdf Binary files differindex e0dae969d6..4f2ab194f9 100644 --- a/macros/latex/contrib/spbmark/spbmark.pdf +++ b/macros/latex/contrib/spbmark/spbmark.pdf diff --git a/macros/latex/contrib/spbmark/spbmark.sty b/macros/latex/contrib/spbmark/spbmark.sty index f3e5446f52..d7261565ce 100644 --- a/macros/latex/contrib/spbmark/spbmark.sty +++ b/macros/latex/contrib/spbmark/spbmark.sty @@ -9,7 +9,7 @@ % https://creativecommons.org/licenses/by/4.0/legalcode \NeedsTeXFormat{LaTeX2e}[2018/12/31] \RequirePackage{xparse,l3keys2e} -\ProvidesExplPackage{spbmark}{2021/07/30}{1.1a} +\ProvidesExplPackage{spbmark}{2021/08/09}{1.1b} {Customize superscripts and subscripts} \cs_new_protected:Npn \spb_define:n { \keys_define:nn { spbmark } } @@ -42,6 +42,8 @@ sub-hshift .initial:n = 0pt, supersub-hshift .dim_set:N = \l__spb_supersub_script_hshift_dim, supersub-hshift .initial:n = 0pt, + nohshift .meta:n = {super-hshift = 0pt,sub-hshift = 0pt}, + nohvhift .meta:n = {super-vshift = 0pt,sub-vshift = 0pt}, super-format .tl_set:N = \l__spb_super_script_formati_tl, sub-format .tl_set:N = \l__spb_sub_script_formati_tl, supersub-format .code:n = \spb_both_format_assign:n {#1}, diff --git a/macros/latex/contrib/spbmark/spbmark.tex b/macros/latex/contrib/spbmark/spbmark.tex index 67047c8fef..835e4ca217 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.1a, - date = 2021/07/30, + version = v1.1b, + date = 2021/08/09, authors = Qu Yi, info = Customize superscript and subscript, email = quee123@foxmail.com, @@ -94,6 +94,10 @@ The following list of keys control the format both of superscript or subscript. Extra vertical shift of the subscript. \keyval{sub-hshift}{fixed length}\Default{0pt} Extra horizontal shift of the subscript. + \opt{nohshift}\Default! + Cancel the horizontal offset of superscript and subscript at the same time. + \opt{novshift}\Default! + Cancel the vertical offset of superscript and subscript at the same time. \keyval{super-format}{format code}\Default Control the format of superscript, the last command in the code can take an argument, which is a superscript. \keyval{sub-format}{format code}\Default |
