diff options
Diffstat (limited to 'macros/latex/contrib')
20 files changed, 222 insertions, 40 deletions
diff --git a/macros/latex/contrib/acmart/ACM-Reference-Format.bst b/macros/latex/contrib/acmart/ACM-Reference-Format.bst index 7bc0b809bc..807c0332d0 100644 --- a/macros/latex/contrib/acmart/ACM-Reference-Format.bst +++ b/macros/latex/contrib/acmart/ACM-Reference-Format.bst @@ -2612,6 +2612,99 @@ MACRO {nov} {"Nov."} MACRO {dec} {"Dec."} +%%% ACM journal names + +MACRO {cie} {"ACM Computers in Entertainment"} +MACRO {csur} {"ACM Computing Surveys"} +MACRO {dgov} {"Digital Government: Research and Practice"} +MACRO {dtrap} {"Digital Threats: Research and Practice"} +MACRO {health} {"ACM Transactions on Computing for Healthcare"} +MACRO {imwut} {"PACM on Interactive, Mobile, Wearable and Ubiquitous Technologies"} +MACRO {jacm} {"Journal of the ACM"} +MACRO {jdiq} {"ACM Journal of Data and Information Quality"} +MACRO {jea} {"ACM Journal of Experimental Algorithmics"} +MACRO {jeric} {"ACM Journal of Educational Resources in Computing"} +MACRO {jetc} {"ACM Journal on Emerging Technologies in Computing Systems"} +MACRO {jocch} {"ACM Journal on Computing and Cultural Heritage"} +MACRO {pacmcgit} {"Proceedings of the ACM on Computer Graphics and Interactive Techniques"} +MACRO {pacmhci} {"PACM on Human-Computer Interaction"} +MACRO {pacmpl} {"PACM on Programming Languages"} +MACRO {pomacs} {"PACM on Measurement and Analysis of Computing Systems"} +MACRO {taas} {"ACM Transactions on Autonomous and Adaptive Systems"} +MACRO {taccess} {"ACM Transactions on Accessible Computing"} +MACRO {taco} {"ACM Transactions on Architecture and Code Optimization"} +MACRO {talg} {"ACM Transactions on Algorithms"} +MACRO {tallip} {"ACM Transactions on Asian and Low-Resource Language Information Processing"} +MACRO {tap} {"ACM Transactions on Applied Perception"} +MACRO {tcps} {"ACM Transactions on Cyber-Physical Systems"} +MACRO {tds} {"ACM/IMS Transactions on Data Science"} +MACRO {teac} {"ACM Transactions on Economics and Computation"} +MACRO {tecs} {"ACM Transactions on Embedded Computing Systems"} +MACRO {telo} {"ACM Transactions on Evolutionary Learning"} +MACRO {thri} {"ACM Transactions on Human-Robot Interaction"} +MACRO {tiis} {"ACM Transactions on Interactive Intelligent Systems"} +MACRO {tiot} {"ACM Transactions on Internet of Things"} +MACRO {tissec} {"ACM Transactions on Information and System Security"} +MACRO {tist} {"ACM Transactions on Intelligent Systems and Technology"} +MACRO {tkdd} {"ACM Transactions on Knowledge Discovery from Data"} +MACRO {tmis} {"ACM Transactions on Management Information Systems"} +MACRO {toce} {"ACM Transactions on Computing Education"} +MACRO {tochi} {"ACM Transactions on Computer-Human Interaction"} +MACRO {tocl} {"ACM Transactions on Computational Logic"} +MACRO {tocs} {"ACM Transactions on Computer Systems"} +MACRO {toct} {"ACM Transactions on Computation Theory"} +MACRO {todaes} {"ACM Transactions on Design Automation of Electronic Systems"} +MACRO {tods} {"ACM Transactions on Database Systems"} +MACRO {tog} {"ACM Transactions on Graphics"} +MACRO {tois} {"ACM Transactions on Information Systems"} +MACRO {toit} {"ACM Transactions on Internet Technology"} +MACRO {tomacs} {"ACM Transactions on Modeling and Computer Simulation"} +MACRO {tomm} {"ACM Transactions on Multimedia Computing, Communications and Applications"} +MACRO {tompecs} {"ACM Transactions on Modeling and Performance Evaluation of Computing Systems"} +MACRO {toms} {"ACM Transactions on Mathematical Software"} +MACRO {topc} {"ACM Transactions on Parallel Computing"} +MACRO {toplas} {"ACM Transactions on Programming Languages and Systems"} +MACRO {tops} {"ACM Transactions on Privacy and Security"} +MACRO {tos} {"ACM Transactions on Storage"} +MACRO {tosem} {"ACM Transactions on Software Engineering and Methodology"} +MACRO {tosn} {"ACM Transactions on Sensor Networks"} +MACRO {tqc} {"ACM Transactions on Quantum Computing"} +MACRO {trets} {"ACM Transactions on Reconfigurable Technology and Systems"} +MACRO {tsas} {"ACM Transactions on Spatial Algorithms and Systems"} +MACRO {tsc} {"ACM Transactions on Social Computing"} +MACRO {tslp} {"ACM Transactions on Speech and Language Processing"} +MACRO {tweb} {"ACM Transactions on the Web"} + +%%% Some traditional macros +MACRO {acmcs} {"ACM Computing Surveys"} + +MACRO {acta} {"Acta Informatica"} + +MACRO {cacm} {"Communications of the ACM"} + +MACRO {ibmjrd} {"IBM Journal of Research and Development"} + +MACRO {ibmsj} {"IBM Systems Journal"} + +MACRO {ieeese} {"IEEE Transactions on Software Engineering"} + +MACRO {ieeetc} {"IEEE Transactions on Computers"} + +MACRO {ieeetcad} + {"IEEE Transactions on Computer-Aided Design of Integrated Circuits"} + +MACRO {ipl} {"Information Processing Letters"} + +MACRO {jcss} {"Journal of Computer and System Sciences"} + +MACRO {scp} {"Science of Computer Programming"} + +MACRO {sicomp} {"SIAM Journal on Computing"} + +MACRO {toois} {"ACM Transactions on Office Information Systems"} + +MACRO {tcs} {"Theoretical Computer Science"} + READ diff --git a/macros/latex/contrib/acmart/README b/macros/latex/contrib/acmart/README index 8d0b3f9c28..d5850e46f7 100644 --- a/macros/latex/contrib/acmart/README +++ b/macros/latex/contrib/acmart/README @@ -281,3 +281,8 @@ Version 1.74 Bug fixes. A regression introduced in the font changes Version 1.75. \country is now obligatory for addresses. Added \AtBeginMaketitle + +Version 1.76. Added many journal abbreviations to the bst. + New experimental option: pbalance + ORCID linking code +
\ No newline at end of file diff --git a/macros/latex/contrib/acmart/acmart.dtx b/macros/latex/contrib/acmart/acmart.dtx index f895373409..e8089a3910 100644 --- a/macros/latex/contrib/acmart/acmart.dtx +++ b/macros/latex/contrib/acmart/acmart.dtx @@ -1,6 +1,6 @@ % \iffalse % -% Copyright 2016-2020, Association for Computing Machinery +% Copyright 2016-2021, Association for Computing Machinery % 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 @@ -57,7 +57,7 @@ % \ifx\currentjob\guide\OnlyDescription\fi % \GetFileInfo{acmart.dtx} % \title{\LaTeX{} Class for the \emph{Association for Computing -% Machinery}\thanks{\copyright 2016--2020, Association for Computing Machinery}} +% Machinery}\thanks{\copyright 2016--2021, Association for Computing Machinery}} % \author{Boris Veytsman\thanks{% % \href{mailto:borisv@lk.net}{\texttt{borisv@lk.net}}, % \href{mailto:boris@varphi.com}{\texttt{boris@varphi.com}}}} @@ -112,6 +112,7 @@ % Ben Greenman, % Enrico Gregorio, % Jamie Davis, +% Ulrike Fischer, % Jason Hemann, % Peter Kemp, % Luis Leiva, @@ -374,7 +375,9 @@ % column mode has balanced columns. By default it is |true|; however, % it may lead to problems for some documents. Set it to |false| if % you encounter compilation errors. Note that for one page documents -% \cs{balance} command might cause problems. +% \cs{balance} command might cause problems. An alternative is the +% (experimental) option |pbalance|, which uses the new package +% |pbalance| for this end. % % The option |urlbreakonhyphens| determines whether URLs can be split % between lines after hyphens. By default it is true. Set it to @@ -408,6 +411,8 @@ % Section~\ref{sec:ug_theorems}\\ % balance & true & Whether to balance the last page in two column % mode\\ +% pbalance & false & Whether to balance the last page in two column +% mode using pbalance package\\ % urlbreakonhyphens & true & Whether to break urls on hyphens\\ % \bottomrule % \end{tabularx} @@ -1458,7 +1463,7 @@ % eprint = "960935712", % primaryclass = "cs", % \end{verbatim} -% See the examples at \url{http://arxiv.org/hypertex/bibstyles/}. +% See the examples at \url{https://arxiv.org/help/hypertex/bibstyles}. % % There are several special entry types. Types \path{online} and % \path{game} are used for Web pages and games, for example, @@ -1587,6 +1592,12 @@ % This will make the author to be sorted as ``Beethoven'' rather than % ``van Beethoven''. % +% The current bst style defines a number of macros for common journal +% names. In particular, all journals listed in Table~\ref{tab:pubs} +% are includes, so you can use strings like |journal = taccess| for +% \emph{ACM Transactions on Accessible Computing}. +% +% %\subsection{Colors} %\label{sec:ug_colors} % @@ -1895,7 +1906,7 @@ \ProvidesFile{acmart.dtx} %</gobble> %<class>\ProvidesClass{acmart} -[2020/11/15 v1.75 Typesetting articles for the Association for Computing Machinery] +[2021/02/21 v1.76 Typesetting articles for the Association for Computing Machinery] % \end{macrocode} % % \changes{v1.00}{2016/04/14}{First released version} @@ -2196,6 +2207,19 @@ % \end{macro} % % +% \begin{macro}{\if@ACM@pbalance} +% \changes{v1.76}{2021/03/16}{Added macro} +% Whether to balance the last page +% \begin{macrocode} +\define@boolkey+{acmart.cls}[@ACM@]{pbalance}[true]{}{% + \PackageError{\@classname}{The option pbalance can be either true or + false}} +\ExecuteOptionsX{pbalance=false} +% \end{macrocode} +% +% \end{macro} +% +% % \begin{macro}{\if@ACM@natbib@override} % \changes{v1.12}{2016/05/30}{Added macro} % \changes{v1.33}{2017/03/28}{Deleted macro} @@ -2818,6 +2842,14 @@ % % \end{macro} % +% Adding |hyperxmp| +% \changes{v1.72}{2020/06/14}{Added hyperxmp} +% \changes{v1.76}{2021/02/21}{Moved before hyperref, see +% https://github.com/borisveytsman/acmart/issues/425} +% \begin{macrocode} +\RequirePackage{hyperxmp} +% \end{macrocode} +% % % And now, |hyperref| % \changes{v1.28}{2017/01/07}{Got rid of warnings in pdf keywords} @@ -2868,12 +2900,6 @@ pdfdisplaydoctitle}} % \end{macrocode} % -% And |hyperxmp| -% \changes{v1.72}{2020/06/14}{Added hyperxmp} -% \begin{macrocode} -\RequirePackage{hyperxmp} -% \end{macrocode} -% % % Bibliography mangling. % \changes{v1.33}{2017/03/23}{Moved \cs{citename} definition for @@ -4016,9 +4042,12 @@ % The book title of the conference: % \begin{macrocode} \def\acmBooktitle#1{\gdef\@acmBooktitle{#1}} +\acmBooktitle{} +\ifx\acmConference@name\@undefined\else \acmBooktitle{Proceedings of \acmConference@name \ifx\acmConference@name\acmConference@shortname\else - \ (\acmConference@shortname)\fi} + \ (\acmConference@shortname)\fi} +\fi % \end{macrocode} % % \end{macro} @@ -4106,7 +4135,15 @@ % \changes{v1.54}{2018/06/23}{Added submission id in anonymous mode} % \changes{v1.57}{2018/12/09}{Added warning if \cs{author} has comma} % \changes{v1.72}{2020/05/04}{Added \cs{detokenize} (Kuldeep S. Meel)} -% Adding an author to the list of authors and addresses +% \changes{v1.76}{2021/03/15}{Added code for orcid links} +% Adding an author to the list of authors and addresses. +% +% Note that we want to typeset the link to the author's orcid if +% known. The problem is, we know the orcid only after the author is +% entered. The trick is based on the idea that |\csname...\endcsname| +% is \cs{relax} unless defined. Therefore we typeset authors by the +% special macro |\csname typeset@author\the\num@authors\endcsname|, +% which is defined by \cs{orcid} command. % \begin{macrocode} \renewcommand\author[2][]{% \IfSubStr{\detokenize{#2}}{,}{\ClassWarning{\@classname}{Do not put several @@ -4123,12 +4160,16 @@ \@acmSubmissionID\fi}}% \gdef\authors{Anonymous Author(s)}% \else - \gdef\addresses{\@author{#2}}% + \expandafter\gdef\expandafter\addresses\expandafter{% + \expandafter\@author\expandafter{% + \csname typeset@author\the\num@authors\endcsname{#2}}}% \gdef\authors{#2}% \fi \else \if@ACM@anonymous\else - \g@addto@macro\addresses{\and\@author{#2}}% + \expandafter\g@addto@macro\expandafter\addresses\expandafter{% + \expandafter\and\expandafter\@author\expandafter{% + \csname typeset@author\the\num@authors\endcsname{#2}}}% \g@addto@macro\authors{\and#2}% \fi \fi @@ -4232,9 +4273,17 @@ % % \begin{macro}{\orcid} % \changes{v1.15}{2016/06/25}{Introduced macro} -% Right now we do not typeset ORCIDs +% \changes{v1.76}{2021/03/15}{Added code for orcid links} +% We rededine the command to typeset the current author % \begin{macrocode} -\def\orcid#1{\unskip\ignorespaces} +\def\orcid#1{\unskip\ignorespaces% + \IfBeginWith{#1}{http}{% + \expandafter\gdef\csname + typeset@author\the\num@authors\endcsname##1{% + \href{#1}{##1}}}{% + \expandafter\gdef\csname + typeset@author\the\num@authors\endcsname##1{% + \href{https://orcid.org/#1}{##1}}}} % \end{macrocode} % % \end{macro} @@ -5215,7 +5264,8 @@ % (Scott Pakin)} % \changes{v1.73}{2020/09/07}{Do not check again the presense of % address fields} -% \changes{v1.75}{2020/11/15}{Added \cs{@beginmaketitlehook}} +% \changes{v1.75}{2020/11/15}{Added \cs{@beginmaketitlehook}} +% \changes{v1.76}{2021/04/05}{Put \cs{par} inside group for keywords} % The (in)famous \cs{maketitle}. Note that in |sigchi-a| mode, authors % are \emph{not} in the title box. % @@ -5328,7 +5378,7 @@ \else \@specialsection{Keywords}% \fi - \noindent\@keywords}\par\egroup + \noindent\@keywords\par}\egroup \fi \let\metadata@authors=\authors \nxandlist{, }{, }{, }\metadata@authors @@ -6517,6 +6567,7 @@ % \changes{v1.59}{2019/04/20}{Added logic for conference papers using % journal format} % \changes{v1.59}{2019/04/20}{Moved page styles to \cs{AtBeginDocument}} +% \changes{v1.76}{2021/02/21}{Fixed bug with no line numbers for nonacm} % The page style for all pages but the first one % \begin{macrocode} \AtBeginDocument{% @@ -6575,7 +6626,10 @@ \fancyfoot[C]{\if@ACM@printfolios\footnotesize\thepage\fi}% \fancyhead[LO]{\ACM@linecountL\@headfootfont\shorttitle}% \fancyhead[RE]{\@headfootfont\@shortauthors\ACM@linecountR}% - \if@ACM@nonacm\else% + \if@ACM@nonacm + \fancyhead[LE]{\ACM@linecountL}% + \fancyhead[RO]{\ACM@linecountR}% + \else% \fancyhead[LE]{\ACM@linecountL\@headfootfont\footnotesize \acmConference@shortname, \acmConference@date, \acmConference@venue}% @@ -6588,7 +6642,10 @@ \fancyfoot[C]{\if@ACM@printfolios\footnotesize\thepage\fi}% \fancyhead[LO]{\ACM@linecountL\@headfootfont\shorttitle}% \fancyhead[RE]{\@headfootfont\@shortauthors\ACM@linecountR}% - \if@ACM@nonacm\else% + \if@ACM@nonacm + \fancyhead[LE]{\ACM@linecountL}% + \fancyhead[RO]{\ACM@linecountR}% + \else% \fancyhead[LE]{\ACM@linecountL\@headfootfont \acmConference@shortname, \acmConference@date, \acmConference@venue}% @@ -7212,9 +7269,29 @@ %\label{sec:balancing} % % We need balancing only if the user did not disable it, and we use a -% two column format +% two column format. Note that |pbalance| uses a different +% mechanism. % \begin{macrocode} \AtEndPreamble{% + \if@ACM@pbalance + \global\@ACM@balancefalse + \ifcase\ACM@format@nr + \relax % manuscript + \or % acmsmall + \or % acmlarge + \or % acmtog + \RequirePackage{pbalance}% + \or % sigconf + \RequirePackage{pbalance}% + \or % siggraph + \RequirePackage{pbalance}% + \or % sigplan + \RequirePackage{pbalance}% + \or % sigchi + \RequirePackage{pbalance}% + \or % sigchi-a + \fi + \fi \if@ACM@balance \ifcase\ACM@format@nr \relax % manuscript @@ -7330,8 +7407,15 @@ \def\@tempa{#1}% \ifx\@tempa\@empty\def\@tempa{arxiv}\fi \def\@tempb{arxiv}% - \ifx\@tempa\@tempb - arXiv:\href{https://arxiv.org/abs/#2}{#2}\else arXiv:#2% + \ifx\@tempa\@tempb\relax + arXiv:\href{https://arxiv.org/abs/#2}{#2}% + \else + \def\@tempb{arXiv}% + \ifx\@tempa\@tempb\relax + arXiv:\href{https://arxiv.org/abs/#2}{#2}% + \else + arXiv:#2% + \fi \fi} % \end{macrocode} % diff --git a/macros/latex/contrib/acmart/acmart.pdf b/macros/latex/contrib/acmart/acmart.pdf Binary files differindex 8c026173ab..778ee57b72 100644 --- a/macros/latex/contrib/acmart/acmart.pdf +++ b/macros/latex/contrib/acmart/acmart.pdf diff --git a/macros/latex/contrib/acmart/acmguide.pdf b/macros/latex/contrib/acmart/acmguide.pdf Binary files differindex c298d7f1f8..5f74086d59 100644 --- a/macros/latex/contrib/acmart/acmguide.pdf +++ b/macros/latex/contrib/acmart/acmguide.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf b/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf Binary files differindex e8643fa668..e451d810ee 100644 --- a/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf +++ b/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf b/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf Binary files differindex 4ce5a1ee2f..b7450c8fd5 100644 --- a/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf +++ b/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdf b/macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdf Binary files differindex b972760d2b..255345f4d8 100644 --- a/macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdf +++ b/macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf b/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf Binary files differindex 489df51096..878ff72cea 100644 --- a/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf +++ b/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-acmtog.pdf b/macros/latex/contrib/acmart/samples/sample-acmtog.pdf Binary files differindex fea344a4f6..2c88ef5a4a 100644 --- a/macros/latex/contrib/acmart/samples/sample-acmtog.pdf +++ b/macros/latex/contrib/acmart/samples/sample-acmtog.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-authordraft.pdf b/macros/latex/contrib/acmart/samples/sample-authordraft.pdf Binary files differindex c066231c03..6a4d4115cb 100644 --- a/macros/latex/contrib/acmart/samples/sample-authordraft.pdf +++ b/macros/latex/contrib/acmart/samples/sample-authordraft.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-lualatex.pdf b/macros/latex/contrib/acmart/samples/sample-lualatex.pdf Binary files differindex 3d93e76394..20b03c985e 100644 --- a/macros/latex/contrib/acmart/samples/sample-lualatex.pdf +++ b/macros/latex/contrib/acmart/samples/sample-lualatex.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-manuscript.pdf b/macros/latex/contrib/acmart/samples/sample-manuscript.pdf Binary files differindex 7568fd5412..03cca1589c 100644 --- a/macros/latex/contrib/acmart/samples/sample-manuscript.pdf +++ b/macros/latex/contrib/acmart/samples/sample-manuscript.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-sigconf.pdf b/macros/latex/contrib/acmart/samples/sample-sigconf.pdf Binary files differindex cdd63d36ee..e1b6a010d9 100644 --- a/macros/latex/contrib/acmart/samples/sample-sigconf.pdf +++ b/macros/latex/contrib/acmart/samples/sample-sigconf.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-sigplan.pdf b/macros/latex/contrib/acmart/samples/sample-sigplan.pdf Binary files differindex 49bd68a9fd..830baea1a8 100644 --- a/macros/latex/contrib/acmart/samples/sample-sigplan.pdf +++ b/macros/latex/contrib/acmart/samples/sample-sigplan.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-xelatex.pdf b/macros/latex/contrib/acmart/samples/sample-xelatex.pdf Binary files differindex 2e56644b58..a4cc1f8f39 100644 --- a/macros/latex/contrib/acmart/samples/sample-xelatex.pdf +++ b/macros/latex/contrib/acmart/samples/sample-xelatex.pdf diff --git a/macros/latex/contrib/easybook/doc/easybook-demo.pdf b/macros/latex/contrib/easybook/doc/easybook-demo.pdf Binary files differindex 0bdc42f390..d643457c98 100644 --- a/macros/latex/contrib/easybook/doc/easybook-demo.pdf +++ b/macros/latex/contrib/easybook/doc/easybook-demo.pdf diff --git a/macros/latex/contrib/easybook/doc/easybook-demo.tex b/macros/latex/contrib/easybook/doc/easybook-demo.tex index c4d8542a18..c1f6df2024 100644 --- a/macros/latex/contrib/easybook/doc/easybook-demo.tex +++ b/macros/latex/contrib/easybook/doc/easybook-demo.tex @@ -104,7 +104,7 @@ \url{https://latexstudio.net} \\ \url{https://gitee.com/texl3/easybook}\thanks{Gitee为项目的主要发布地址。} } -\date{2021/04/11\hskip\ccwd\relax v1.24k} +\date{2021/04/12\hskip\ccwd\relax v1.24l} \frontmatter[roman] \maketitle diff --git a/macros/latex/contrib/easybook/doc/easybook.pdf b/macros/latex/contrib/easybook/doc/easybook.pdf Binary files differindex 439dc508f7..02a75ebd24 100644 --- a/macros/latex/contrib/easybook/doc/easybook.pdf +++ b/macros/latex/contrib/easybook/doc/easybook.pdf diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx index 1b187b7a0d..05282d5c78 100644 --- a/macros/latex/contrib/easybook/easybook.dtx +++ b/macros/latex/contrib/easybook/easybook.dtx @@ -55,7 +55,7 @@ The latest version of this license is in % % \title{\sffamily easybook 书籍文档类} % \author{瞿毅} -% \date{2021/04/11\hskip\ccwd\relax v1.24k\thanks{\url{https://gitee.com/texl3/easybook}}} +% \date{2021/04/12\hskip\ccwd\relax v1.24l\thanks{\url{https://gitee.com/texl3/easybook}}} % \maketitle % \begin{abstract} % \cls{easybook} 是基于 \cls{ctexbook} 书籍文档类创建以极简为风格的模板，可以看作对 \cls{ctexbook} 的进一步包装。虽然\CTeX 文档类提供了较好的中文支持，但想实现个性化功能一般需要在其基础上载入更多宏包来定制。\cls{easybook} 考虑了一些细节并载入一些常用宏包实现一般的排版需求，它适用于排版中英文书籍或笔记，甚至可稍加调整成为学位论文模板。 @@ -174,7 +174,7 @@ The latest version of this license is in % \end{syntax} % \opt{multoc} 与 \opt{style/multoc} 选项具有相同的效果，但是具有优先性且可单独设置不同目录是否双栏排版。已经预置了中英文的目录标题，可以使用 \opt{title} 选项更改目录标题的名称。\opt{book} 选项使目录标题按照 \opt{chapter} 级别输出，\opt{article} 选项使目录标题按照 \opt{article} 级别输出，默认为 \opt{chapter} 级别。 % \changes{v1.23}{2021/03/15}{为几个目录增加键值列表的选项，可设置标题输出级别以及是否加入主目录。} -% \changes{v1.24k}{2021/04/04}{目录命令的可选参数增加标题键值。} +% \changes{v1.24l}{2021/04/04}{目录命令的可选参数增加标题键值。} % \end{function} % % \section{接口选项} @@ -265,7 +265,7 @@ The latest version of this license is in % \ding{229} 以上选项路径为 \opt{link/...} \\ % \opt{link} 将超链接选项（包括以上选项）交给 \pkg{hyperref} 处理，除了一些关于 pdf 书签的选项可能会失效，其它由键值选项命令 \tn{hypersetup} 支持的多数选项可用。 % \changes{v1.10}{2021/01/08}{修复了 \opt{linktopage} 选项关闭时目录中标题编号无超链接的问题。} -% \changes{v1.24k}{2021/04/05}{增加 \pkg{hyperref} 超链接选项完整的支持。} +% \changes{v1.24l}{2021/04/05}{增加 \pkg{hyperref} 超链接选项完整的支持。} % \end{function} % % \begin{optdesc} @@ -342,7 +342,7 @@ The latest version of this license is in % \ding{229} 以上选项路径为 \opt{bibset/...} % \changes{v1.21}{2021/01/11}{增加 \opt{bibset} 选项，可以使用 \hologo{BibTeX} 或 \hologo{biber} 编译参考文献。} % \changes{v1.23}{2021/02/23}{使用 \opt{bibset} 选项时可设置标注风格。} -% \changes{v1.24k}{2021/04/09}{可以不载入参考文献包手动配置参考文献格式。} +% \changes{v1.24l}{2021/04/09}{可以不载入参考文献包手动配置参考文献格式。} % \end{function} % % \begin{optdesc} @@ -490,7 +490,7 @@ The latest version of this license is in % \changes{v1.21}{2021/01/13}{增加配置页眉页脚的选项。} % \changes{v1.23}{2021/03/08}{优化页眉页脚设置，增加 \opt{chap-mark} 和 \opt{sec-mark} 标志选项。} % \changes{v1.23}{2021/03/14}{可以手动绘制页眉、页脚和脚注的横线。} -% \changes{v1.24k}{2021/04/09}{增加 \opt{subsec-mark} 标志选项，仅在 \opt{article} 模式生效。} +% \changes{v1.24l}{2021/04/09}{增加 \opt{subsec-mark} 标志选项，仅在 \opt{article} 模式生效。} % \end{function} % % \begin{function}[added = 2021-01-13,updated = 2021-03-14]{\easyhead,\easyfoot} @@ -560,8 +560,8 @@ The latest version of this license is in % line-align = <(true)|false> % \end{syntax} % \opt{lolskip} 是代码目录中章之间的代码标题的距离，与\CTeX 的表格目录和图片目录中章之间的标题距离选项 \opt{lotskip} 和 \opt{lofskip} 类似，它们的值均默认0.8 pc，在 \opt{article} 模式中此选项失效。目录标签整体使用 \opt{tocline} 设置，也可使用小节 \ref{subsec:page margins} 的 \opt{list-labelsep} 选项只设置编号与标题的间距。在图表标签的参数中，\#1与\#2分别代表编号和标题，代码标签的编号和标题则是 \tn{thelstlisting} 和 \tn{lstcaption}，标签中还可包含标签名称，默认标签名称与图、表和代码环境的标题名称一致。下面举个设置标签的例子 -% \changes{v1.24k}{2021/04/05}{可以设置图、表和代码目录的标签。} -% \changes{v1.24k}{2021/04/06}{增加目录引导线右边对齐方式。} +% \changes{v1.24l}{2021/04/05}{可以设置图、表和代码目录的标签。} +% \changes{v1.24l}{2021/04/06}{增加目录引导线右边对齐方式。} % \end{function} % % \begin{ctexexam} @@ -594,7 +594,7 @@ The latest version of this license is in % \tn{end}\marg{环境名} % \end{syntax} % \pkg{enumitem} 宏包为系统预置的列表环境 \env{enumerate}、\env{itemize}和 \env{description} 提供了更灵活的标签以及间距的控制，可使用 \tn{setlist} 命令设置原有的三种列表格式。已为三种列表预置了三个级别的格式可相互嵌套，默认标签与 \cls{book} 文档类相同，若自定义标签可例如 -% \changes{v1.24k}{2021/04/08}{重新优化列表环境的配置。} +% \changes{v1.24l}{2021/04/08}{重新优化列表环境的配置。} % \end{function} % % \begin{ctexexam} @@ -760,7 +760,7 @@ The latest version of this license is in % \tn{labelformat}\marg{计数器}\marg{标签引用格式} % \end{syntax} % 使用 \tn{ref} 命令进行引用将会自动检测环境并添加相应的前缀，\tn{labelformat} 可以设置标签引用格式，第二个参数中\#1代表 \tn{the}\meta{计数器}，可以设置引用序号的前缀和后缀。 -% \changes{v1.24k}{2021/04/11}{取消载入 \pkg{cleveref} 宏包来交叉引用。} +% \changes{v1.24l}{2021/04/11}{取消载入 \pkg{cleveref} 宏包来交叉引用。} % \end{function} % % \subsubsection{索引} @@ -868,8 +868,8 @@ The latest version of this license is in % \StopEventually{} %<*class> \NeedsTeXFormat{LaTeX2e}[2020/10/01] -\RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2021/04/11}{1.24k}{beta} +\RequirePackage{l3keys2e,etoolbox} +\ProvidesExplClass{easybook}{2021/04/12}{1.24l}{beta} \cs_generate_variant:Nn \__ctex_define:nn {nx} \cs_generate_variant:Nn \int_to_arabic:n {v} @@ -1044,7 +1044,7 @@ The latest version of this license is in \tl_if_empty:NF \g__eb_config_tl{\file_input:n {\g__eb_config_tl}} } -\cs_new_protected:Npn \__eb_ifpackage_later:nn #1#2 +\cs_new_protected:Npn \__eb_package_later_bool:nn #1#2 { \@ifpackagelater{#1}{#2} {}{\msg_warning:nnn {easybook}{package-old}{#1}} @@ -1064,7 +1064,7 @@ The latest version of this license is in {ctex}{2020/10/19}, {thmtools}{2020/08/01}, {caption-light}{2020/08/24} - }{\__eb_ifpackage_later:nn #1} + }{\__eb_package_later_bool:nn #1} \sys_if_engine_xetex:TF { @@ -1983,7 +1983,7 @@ The latest version of this license is in \ctex_at_end_package:nn {tcolorbox} { - \__eb_ifpackage_later:nn {tcolorbox}{2020/10/09} + \__eb_package_later_bool:nn {tcolorbox}{2020/10/09} \tcbset { tc-theorem/.style = @@ -2049,7 +2049,7 @@ The latest version of this license is in } ]{\IfBooleanF{#1}{\CTEXthesection\hspace{0.5\ccwd}}#4} }{ - \sffamily\Large + \color{ctex@frame}\sffamily\Large \IfBooleanF{#1} { \CTEX@ifnametrue |