diff options
author | Norbert Preining <norbert@preining.info> | 2024-11-27 03:03:14 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2024-11-27 03:03:14 +0000 |
commit | 13c9eb88008983c7f0fe6a552623757ec93cdd8f (patch) | |
tree | b0a0e66a1dffe33beb18dae14dd48745aaef86d2 /macros/latex | |
parent | 1ddba8cb76b4114c7f0737f7e34fb270f5b34f12 (diff) |
CTAN sync 202411270303
Diffstat (limited to 'macros/latex')
41 files changed, 220 insertions, 109 deletions
diff --git a/macros/latex/contrib/acmart/ACM-Reference-Format.bst b/macros/latex/contrib/acmart/ACM-Reference-Format.bst index c47cb4c0f0..dca222184c 100644 --- a/macros/latex/contrib/acmart/ACM-Reference-Format.bst +++ b/macros/latex/contrib/acmart/ACM-Reference-Format.bst @@ -2419,7 +2419,6 @@ FUNCTION { misc } { } { "\bibinfo{howpublished}{" howpublished "}" * * output } if$ - "" output.nonnull.dot.space calc.format.page.count output fin.block output.issue.doi.coden.isxn.lccn.url.eprint.note diff --git a/macros/latex/contrib/acmart/README b/macros/latex/contrib/acmart/README index b46a735447..2518ab0f9a 100644 --- a/macros/latex/contrib/acmart/README +++ b/macros/latex/contrib/acmart/README @@ -12,6 +12,8 @@ The production version is the one on CTAN and ACM sites. Changes +Version 2.10. Bug fixes. Documentation update. + Version 2.09. Experimental tagging code is now in the main branch. Creative Commons license is now allowed for all materials. diff --git a/macros/latex/contrib/acmart/acmart.dtx b/macros/latex/contrib/acmart/acmart.dtx index 26e19fdcc6..842ba3fd3f 100644 --- a/macros/latex/contrib/acmart/acmart.dtx +++ b/macros/latex/contrib/acmart/acmart.dtx @@ -321,7 +321,7 @@ % acmtog & Large double-column format. Used for % TOG, including annual conference Technical Papers.\\ % sigconf & Proceedings format for most ACM -% conferences (with the exception of SIGPlAN) and all ICPS +% conferences (with the exception of SIGPLAN) and all ICPS % volumes.\\ % sigplan & Proceedings format for SIGPLAN conferences.\\ % acmengage & ACM EngageCSEdu Course materials.\\ @@ -874,7 +874,7 @@ % the output. For example, if the badge image is |ae-logo.pdf|, the % command is % \begin{verbatim} -% \acmBadgeR[http://ctuning.org/ae/ppopp2016.html]{ae-logo} +% \acmBadge[http://ctuning.org/ae/ppopp2016.html]{ae-logo} % \end{verbatim} % The command can be repeated, if a paper has several badges. % @@ -1251,7 +1251,7 @@ % languages are \emph{secondary,} and used for translated titles, % keywords, abstracts. Thus the paper above is written in English, % and has a secondary abstract and a secondary title in French. On -% the other hand, a paper in French wih secondary titles and abstracts +% the other hand, a paper in French with secondary titles and abstracts % in English and German should use, for example % \begin{verbatim} % \documentclass[sigconf, @@ -1782,10 +1782,10 @@ % %\subsubsection{Processing using Bib\LaTeX} % You will find in this package two sets of style files for Bib\LaTeX, -% \verb|acmnumeric| and \verb|acmauthoryear|, that mimic the behaviour -% of the ACM-Reference-Format.bst Bib\TeX\ sytle. They provide you +% \verb|acmnumeric| and \verb|acmauthoryear|, that mimic the behavior +% of the ACM-Reference-Format.bst Bib\TeX\ style. They provide you % access to all the power of Bib\LaTeX\ and already include -% support for advanced citation of software artefact from the +% support for advanced citation of software artifacts from the % \verb|biblatex-software| package, also separately available on CTAN. % Look at the \verb|biblatex-software| documentation to learn more about % what it offers. @@ -1794,7 +1794,10 @@ % when using Bib\LaTeX\ instead of Bib\TeX, that we summarize briefly % here (please refer to the official Bib\LaTeX\ documentation for more details). % -% In the preamble of your document you need to load the Bib\LaTeX\ package +% First of all, you need to pass the \verb|natbib=false| option to the document class, +% and remove the \verb|\citestyle{acmauthoryear}| command from the sources (if present). +% +% Then, in the preamble of your document you need to load the Bib\LaTeX\ package % and select the approriate bibliography style, as follows % \begin{verbatim} % \RequirePackage[ @@ -1804,7 +1807,7 @@ % \end{verbatim} % % Also in the preamble, you need to declare the bibliography sources files -% using the \verb|\addbibresouce| directe (one \verb|\addbibresource| +% using the \verb|\addbibresource| command (one \verb|\addbibresource| % command per source file), e.g.: % \begin{verbatim} % \addbibresource{software.bib} @@ -1956,30 +1959,6 @@ % document. % % -%\subsection{Creative Commons licenses for ACM publications} -%\label{sec:ug_cc} -% -% At present ACM does not allow the authors to typeset Creative -% Commons license for most ACM publications. These licenses can be -% used under an agreement with the ACM publishing office. In this -% case they are inserted by ACM itself. -% -% The exceptions are ACM Engage format, which allows Creative Commons -% license, and conferences organized and copyrighted by IW3C2. In -% these cases the authors should use correspondingly -% |\setcopyright{cc}|, |\setcopyright{iw3c2w3}|, or -% |\setcopyright{iw3c2w3g}| (the latter should be used by Google -% employees). -% -% Yet another case is the typesetting of non-ACM materials, when the -% option |nonacm| is used. This case is somewhat opposite, because -% for this case \emph{only} Creative Common licenses are supported. -% -% The command |\setcopyright{cc}| produces an error unless the format is -% |acmengage| or |nonacm| option is selected. On the other hand, if -% the option |nonacm| is selected, any argument of |\setcopyright| -% other than |cc| is treated as |none|. -% % %\subsection{Disabled or forbidden commands} %\label{sec:ug_disabled} @@ -2277,7 +2256,7 @@ %</gobble> %<class&!tagged>\ProvidesClass{acmart} %<tagged>\ProvidesClass{acmart-tagged} -[2024/08/25 v2.09 Typesetting articles for the Association for Computing Machinery] +[2024/10/19 v2.10 Typesetting articles for the Association for Computing Machinery] % \end{macrocode} % % \changes{v1.00}{2016/04/14}{First released version} @@ -4093,6 +4072,10 @@ \let\@vspacer\@vspacer@orig} \AtBeginEnvironment{listing*}{\let\@vspace\@vspace@orig \let\@vspacer\@vspacer@orig} +\AtBeginEnvironment{lstinputlisting}{\let\@vspace\@vspace@orig + \let\@vspacer\@vspacer@orig} +\AtBeginEnvironment{lstinputlisting*}{\let\@vspace\@vspace@orig + \let\@vspacer\@vspacer@orig} % \end{macrocode} % @@ -5267,10 +5250,12 @@ % Adding a footnote mark to the authors % \begin{macrocode} \newcommand\authornotemark[1][\relax]{% - \ifx#1\relax\relax\relax - \g@addto@macro\addresses{\@authornotemark}% - \else - \g@addto@macro\addresses{\@@authornotemark{#1}}% + \if@ACM@anonymous\else + \ifx#1\relax\relax\relax + \g@addto@macro\addresses{\@authornotemark}% + \else + \g@addto@macro\addresses{\@@authornotemark{#1}}% + \fi \fi} % \end{macrocode} % @@ -5685,7 +5670,7 @@ \fi} \AtEndDocument{% \ifx\@received\@empty\else - \par\bigskip\noindent\small\normalfont\@received\par + \par\bigskip\noindent{\small\normalfont\@received\par}% \fi} % \end{macrocode} % @@ -6090,7 +6075,7 @@ Government and is in the public domain. Non-exclusive copying or redistribution is allowed, provided that the article citation is given and the authors and agency are clearly identified as its - source. All others Request permissions from + source. Request permissions from owner\hspace*{.5pt}/author(s). \or % usgovmixed ACM acknowledges that this contribution was authored or co-authored @@ -8237,8 +8222,8 @@ % \changes{v1.45}{2017/08/15}{Switched \cs{bfeseries}\cs{sffamily} to % \cs{sffamily}\cs{bfseries}} % \changes{v1.67}{2020/01/11}{Deleted redefinitions of sections} -% \changes{1.85}{2022/05/08}{Added: acmengage} -% \changes{2.08}{2024/05/27}{Deleted uppercasing} +% \changes{v1.85}{2022/05/08}{Added: acmengage} +% \changes{v2.08}{2024/05/27}{Deleted uppercasing} % Fonts for sections etc. are different for different formats. % \begin{macrocode} \def\@secfont{\sffamily\bfseries\section@raggedright} @@ -8287,6 +8272,27 @@ % \end{macro} % \end{macro} % +% \changes{v2.10}{2024/10/19}{Added tocindent for paragraphs and +% subparagraphs} +% Amasat does not define tocindents for paragraphs and subparagraphs. +% Here we add them +% \begin{macrocode} +\AtBeginDocument{% + \@for\@tempa:=-1,0,1,2,3,4,5\do{% + \@ifundefined{r@tocindent\@tempa}{% + \@xp\gdef\csname r@tocindent\@tempa\endcsname{0pt}}{}% + }% +} +\def\@writetocindents{% + \begingroup + \@for\@tempa:=-1,0,1,2,3,4,5\do{% + \immediate\write\@auxout{% + \string\newlabel{tocindent\@tempa}{% + \csname r@tocindent\@tempa\endcsname}}% + }% + \endgroup} +% \end{macrocode} +% % \begin{macro}{\@adddotafter} % Add punctuation after a sectioning command % \begin{macrocode} diff --git a/macros/latex/contrib/acmart/acmart.pdf b/macros/latex/contrib/acmart/acmart.pdf Binary files differindex 1bcb0df6ad..8fad04317a 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 5e90dfb3a5..0547dea05d 100644 --- a/macros/latex/contrib/acmart/acmguide.pdf +++ b/macros/latex/contrib/acmart/acmguide.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-acmcp.pdf b/macros/latex/contrib/acmart/samples/sample-acmcp.pdf Binary files differindex 47892feee6..abe3641f7c 100644 --- a/macros/latex/contrib/acmart/samples/sample-acmcp.pdf +++ b/macros/latex/contrib/acmart/samples/sample-acmcp.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-acmengage.pdf b/macros/latex/contrib/acmart/samples/sample-acmengage.pdf Binary files differindex d4cd824cf2..743cf52163 100644 --- a/macros/latex/contrib/acmart/samples/sample-acmengage.pdf +++ b/macros/latex/contrib/acmart/samples/sample-acmengage.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf b/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf Binary files differindex 65c836673e..5efdb94ea9 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-biblatex.pdf b/macros/latex/contrib/acmart/samples/sample-acmsmall-biblatex.pdf Binary files differindex 4fe535b32c..b5bb9c99fc 100644 --- a/macros/latex/contrib/acmart/samples/sample-acmsmall-biblatex.pdf +++ b/macros/latex/contrib/acmart/samples/sample-acmsmall-biblatex.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 17cb0fe359..a4ea84762a 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 81006c5a71..54f291a9a8 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-tagged.pdf b/macros/latex/contrib/acmart/samples/sample-acmsmall-tagged.pdf Binary files differindex 87bd3e53d1..8019ce4bee 100644 --- a/macros/latex/contrib/acmart/samples/sample-acmsmall-tagged.pdf +++ b/macros/latex/contrib/acmart/samples/sample-acmsmall-tagged.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf b/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf Binary files differindex fa3a710f0f..15ecfd3fab 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-conf.pdf b/macros/latex/contrib/acmart/samples/sample-acmtog-conf.pdf Binary files differindex 3518df9fdd..2d7124b6e1 100644 --- a/macros/latex/contrib/acmart/samples/sample-acmtog-conf.pdf +++ b/macros/latex/contrib/acmart/samples/sample-acmtog-conf.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-acmtog.pdf b/macros/latex/contrib/acmart/samples/sample-acmtog.pdf Binary files differindex 681d94fbc7..c883560427 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-base.bib b/macros/latex/contrib/acmart/samples/sample-base.bib index 6cebd818e2..042f46cc7e 100644 --- a/macros/latex/contrib/acmart/samples/sample-base.bib +++ b/macros/latex/contrib/acmart/samples/sample-base.bib @@ -170,7 +170,7 @@ @String{AddisonWesley = "Addison-Wesley" } @String{AllynBacon = "Allyn and Bacon" } @String{AMS = "American Mathematical Society" } - @String{Birkhauser = "Birkha{\"u}ser" } + @String{Birkhauser = "Birkh{\"a}user" } @String{CambridgePress = "Cambridge University Press" } @String{Chelsea = "Chelsea" } @String{ClaredonPress = "Claredon Press" } diff --git a/macros/latex/contrib/acmart/samples/sample-manuscript.pdf b/macros/latex/contrib/acmart/samples/sample-manuscript.pdf Binary files differindex 2b02e5a7ab..ed04e4c1eb 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-authordraft.pdf b/macros/latex/contrib/acmart/samples/sample-sigconf-authordraft.pdf Binary files differindex be82dbf5ab..3bebdeadd4 100644 --- a/macros/latex/contrib/acmart/samples/sample-sigconf-authordraft.pdf +++ b/macros/latex/contrib/acmart/samples/sample-sigconf-authordraft.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-sigconf-biblatex.pdf b/macros/latex/contrib/acmart/samples/sample-sigconf-biblatex.pdf Binary files differindex e2548408a0..e812ffd86c 100644 --- a/macros/latex/contrib/acmart/samples/sample-sigconf-biblatex.pdf +++ b/macros/latex/contrib/acmart/samples/sample-sigconf-biblatex.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-sigconf-i13n.pdf b/macros/latex/contrib/acmart/samples/sample-sigconf-i13n.pdf Binary files differindex f89bc4b108..793196e0ee 100644 --- a/macros/latex/contrib/acmart/samples/sample-sigconf-i13n.pdf +++ b/macros/latex/contrib/acmart/samples/sample-sigconf-i13n.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-sigconf.pdf b/macros/latex/contrib/acmart/samples/sample-sigconf.pdf Binary files differindex dd0252c1d5..25f3d13f20 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 6f0cccd362..f2adcfeaa1 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/samples.dtx b/macros/latex/contrib/acmart/samples/samples.dtx index b2d75d2a83..b94128f870 100644 --- a/macros/latex/contrib/acmart/samples/samples.dtx +++ b/macros/latex/contrib/acmart/samples/samples.dtx @@ -75,7 +75,7 @@ %<*proceedings> %% These commands are for a PROCEEDINGS abstract or paper. \acmConference[Conference acronym 'XX]{Make sure to enter the correct - conference title from your rights confirmation emai}{June 03--05, + conference title from your rights confirmation email}{June 03--05, 2018}{Woodstock, NY} %% %% Uncomment \acmBooktitle if the title of the proceedings is different @@ -464,7 +464,7 @@ Frequently-used parameters, or combinations of parameters, include: \begin{itemize} \item {\texttt{anonymous,review}}: Suitable for a ``double-anonymous'' conference submission. Anonymizes the work and includes line - numbers. Use with the \texttt{\acmSubmissionID} command to print the + numbers. Use with the \texttt{\string\acmSubmissionID} command to print the submission's unique ID on each page of the work. \item{\texttt{authorversion}}: Produces a version of the work suitable for posting by the author. @@ -610,13 +610,34 @@ two-page articles (or abstracts). \section{Sectioning Commands} Your work should use standard \LaTeX\ sectioning commands: -\verb|section|, \verb|subsection|, \verb|subsubsection|, and -\verb|paragraph|. They should be numbered; do not remove the numbering +\verb|\section|, \verb|\subsection|, \verb|\subsubsection|, +\verb|\paragraph|, and \verb|\subparagraph|. The sectioning levels up to +\verb|\subsusection| should be numbered; do not remove the numbering from the commands. Simulating a sectioning command by setting the first word or words of a paragraph in boldface or italicized text is {\bfseries not allowed.} +Below are examples of sectioning commands. + +\subsection{Subsection} +\label{sec:subsection} + +This is a subsection. + +\subsubsection{Subsubsection} +\label{sec:subsubsection} + +This is a subsubsection. + +\paragraph{Paragraph} + +This is a paragraph. + +\subparagraph{Subparagraph} + +This is a subparagraph. + \section{Tables} The ``\verb|acmart|'' document class includes the ``\verb|booktabs|'' @@ -1038,4 +1059,4 @@ requirements of ACM publishing. \end{document} -%</acmcp>
\ No newline at end of file +%</acmcp> diff --git a/macros/latex/contrib/fontscale/CHANGELOG.md b/macros/latex/contrib/fontscale/CHANGELOG.md index 98a1d81be1..35aa85d141 100644 --- a/macros/latex/contrib/fontscale/CHANGELOG.md +++ b/macros/latex/contrib/fontscale/CHANGELOG.md @@ -7,6 +7,13 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to ## [Unreleased] +## [v3.0.2] - 2024-11-25 + +### Changed +- Keys and commands that take an integer expression as a value or argument now + remove the extra tokens that were not part of the integer expression. +- Added more explanatory code comments. + ## [v3.0.1] - 2024-10-20 ### Changed diff --git a/macros/latex/contrib/fontscale/beery.cls b/macros/latex/contrib/fontscale/beery.cls index 7ba1baf129..9656a8b93d 100644 --- a/macros/latex/contrib/fontscale/beery.cls +++ b/macros/latex/contrib/fontscale/beery.cls @@ -4,7 +4,7 @@ \NeedsTeXFormat{LaTeX2e}[2023-11-01] \ProvidesExplClass {beery} - {2024-10-20} + {2024-11-25} {} {} diff --git a/macros/latex/contrib/fontscale/fontscale-table-classic.tex b/macros/latex/contrib/fontscale/fontscale-table-classic.tex index e087ba0e20..d0d55951a4 100644 --- a/macros/latex/contrib/fontscale/fontscale-table-classic.tex +++ b/macros/latex/contrib/fontscale/fontscale-table-classic.tex @@ -1,4 +1,4 @@ -\ProvidesFile{fontscale-table-classic.tex}[2024-10-20] +\ProvidesFile{fontscale-table-classic.tex}[2024-11-25] \begin{table} \centering diff --git a/macros/latex/contrib/fontscale/fontscale-table-font-steps.tex b/macros/latex/contrib/fontscale/fontscale-table-font-steps.tex index 687736625e..130f467668 100644 --- a/macros/latex/contrib/fontscale/fontscale-table-font-steps.tex +++ b/macros/latex/contrib/fontscale/fontscale-table-font-steps.tex @@ -1,4 +1,4 @@ -\ProvidesFile{fontscale-table-font-steps.tex}[2024-10-20] +\ProvidesFile{fontscale-table-font-steps.tex}[2024-11-25] \begin{table} \centering diff --git a/macros/latex/contrib/fontscale/fontscale-table-musical.tex b/macros/latex/contrib/fontscale/fontscale-table-musical.tex index 9944e9fd7a..c8717a5182 100644 --- a/macros/latex/contrib/fontscale/fontscale-table-musical.tex +++ b/macros/latex/contrib/fontscale/fontscale-table-musical.tex @@ -1,4 +1,4 @@ -\ProvidesFile{fontscale-table-musical.tex}[2024-10-20] +\ProvidesFile{fontscale-table-musical.tex}[2024-11-25] \begin{table} \centering diff --git a/macros/latex/contrib/fontscale/fontscale.pdf b/macros/latex/contrib/fontscale/fontscale.pdf Binary files differindex 30f6c7f9f4..6ac6bebaed 100644 --- a/macros/latex/contrib/fontscale/fontscale.pdf +++ b/macros/latex/contrib/fontscale/fontscale.pdf diff --git a/macros/latex/contrib/fontscale/fontscale.sty b/macros/latex/contrib/fontscale/fontscale.sty index 276d1b6caa..25639a6e31 100644 --- a/macros/latex/contrib/fontscale/fontscale.sty +++ b/macros/latex/contrib/fontscale/fontscale.sty @@ -8,8 +8,8 @@ \NeedsTeXFormat{LaTeX2e}[2023-11-01] \ProvidesExplPackage {fontscale} - {2024-10-20} - {3.0.1} + {2024-11-25} + {3.0.2} {A flexible interface for setting font sizes} % l3kernel version 2023-10-10 added many 'e'-variants. @@ -222,42 +222,48 @@ \fp_new:N \l__fontscale_musical_notes_fp \fp_new:N \l__fontscale_musical_selectfont_fp -% Scratch variables -\dim_new:N \l__fontscale_tmp_dim -\skip_new:N \l__fontscale_tmp_skip -\fp_new:N \l__fontscale_tmp_fp +% Scratch variable +\fp_new:N \l__fontscale_tmp_fp % SOME FUNCTIONS % Variants of l3kernel functions \cs_generate_variant:Nn \msg_error:nnnn { nnv , nne } -% Sets a dimen/skip variable from a dimen/skip expression, appending a default -% unit of pt. This also removes any extra tokens. -\cs_new_protected:Npn \__fontscale_dim_set_default_pt:Nn #1#2 +% Used to process user input. Sets an integer/dimen/skip variable from an +% integer/dimen/skip expression and removes extra tokens. A default unit of +% 'pt' is appended in the dimen/skip expressions. +\cs_new_protected:Npn \__fontscale_int_set_from_user:Nn #1#2 + { + \afterassignment \use_none_delimit_by_q_stop:w + #1 = \numexpr #2 \relax + \q_stop + } +\cs_new_protected:Npn \__fontscale_dim_set_from_user:Nn #1#2 { \afterassignment \use_none_delimit_by_q_stop:w #1 = \dimexpr #2 pt \relax \relax \q_stop } -\cs_generate_variant:Nn \__fontscale_dim_set_default_pt:Nn { c } -\cs_new_protected:Npn \__fontscale_skip_set_default_pt:Nn #1#2 +\cs_generate_variant:Nn \__fontscale_dim_set_from_user:Nn { c } +\cs_new_protected:Npn \__fontscale_skip_set_from_user:Nn #1#2 { \afterassignment \use_none_delimit_by_q_stop:w #1 = \glueexpr #2 pt \relax \q_stop } -\cs_generate_variant:Nn \__fontscale_skip_set_default_pt:Nn { c } -% Argument processors. A default 'pt' is appended only in user-level commands, -% not in internal programming functions. -\cs_new_protected:Npn \__fontscale_arg_to_dim_default_pt:n #1 +\cs_generate_variant:Nn \__fontscale_skip_set_from_user:Nn { c } +% Argument processors +\dim_new:N \l__fontscale_arg_process_dim +\cs_new_protected:Npn \__fontscale_arg_process_dim:n #1 { - \__fontscale_dim_set_default_pt:Nn \l__fontscale_tmp_dim {#1} - \tl_set:NV \ProcessedArgument \l__fontscale_tmp_dim + \__fontscale_dim_set_from_user:Nn \l__fontscale_arg_process_dim {#1} + \tl_set:NV \ProcessedArgument \l__fontscale_arg_process_dim } -\cs_new_protected:Npn \__fontscale_arg_to_skip_default_pt:n #1 +\skip_new:N \l__fontscale_arg_process_skip +\cs_new_protected:Npn \__fontscale_arg_process_skip:n #1 { - \__fontscale_skip_set_default_pt:Nn \l__fontscale_tmp_skip {#1} - \tl_set:NV \ProcessedArgument \l__fontscale_tmp_skip + \__fontscale_skip_set_from_user:Nn \l__fontscale_arg_process_skip {#1} + \tl_set:NV \ProcessedArgument \l__fontscale_arg_process_skip } % Used to define \tiny to \Huge. Sets \@currsize only for compatibility. Need % \dim_use:N only for compatibility with the microtype package. @@ -268,7 +274,7 @@ } % Similar to \fontsize + \selectfont, except that it: % (1) Takes dimen and skip expressions as arguments without appending a default -% unit of pt. +% unit of 'pt'. % (2) Avoids the issue where \f@size is set to the new font size before the % second argument is expanded. % (3) Issues a user-friendly error message if the font size is not a positive @@ -346,8 +352,13 @@ \iow_char:N \\tiny~ to~ \iow_char:N \\Huge. } +% This package tests for math mode only at the user level because this is not +% necessary for programmers. To avoid confusion, this package issues a warning +% when \fontsize + \selectfont would be used in math mode because it would not +% change the math font size. \msg_new:nnn { fontscale } { math-mode-warning } { '#1'~ does~ nothing~ if~ used~ in~ math~ mode~ \msg_line_context:. } +% \@ and \par cannot be used in math mode. \msg_new:nnn { fontscale } { math-mode-error } { '#1'~ cannot~ be~ used~ in~ math~ mode~ \msg_line_context:. } \msg_new:nnn { fontscale } { font-size-out-of-bounds } @@ -372,14 +383,15 @@ \str_new:N \l__fontscale_typographic_scale_str \dim_new:N \l__fontscale_musical_base_dim +\int_new:N \l__fontscale_musical_notes_int -\cs_new_protected:Npn \__fontscale_keys_name:n #1 +\cs_new_protected:Npn \__fontscale_keys_code_name:n #1 { \tl_if_in:nnTF {#1} { / } - { \__fontscale_keys_name_split:ww #1 \q_stop } + { \__fontscale_keys_code_name_split:ww #1 \q_stop } { \tl_set:cn { l__fontscale_ \l_keys_key_str _size_tl } {#1} } } -\cs_new_protected:Npn \__fontscale_keys_name_split:ww #1 / #2 \q_stop +\cs_new_protected:Npn \__fontscale_keys_code_name_split:ww #1 / #2 \q_stop { \tl_set:cn { l__fontscale_ \l_keys_key_str _size_tl } {#1} \tl_set:cn { l__fontscale_ \l_keys_key_str _baselineskip_tl } {#2} @@ -411,13 +423,14 @@ \keys_define:nn { fontscale / musical } { base .code:n = - \__fontscale_dim_set_default_pt:Nn \l__fontscale_musical_base_dim {#1} + \__fontscale_dim_set_from_user:Nn \l__fontscale_musical_base_dim {#1} , base .value_required:n = true , ratio .fp_set:N = \l__fontscale_musical_ratio_fp , ratio .value_required:n = true - , notes .int_set:N = \l__fontscale_musical_notes_int + , notes .code:n = + \__fontscale_int_set_from_user:Nn \l__fontscale_musical_notes_int {#1} , notes .value_required:n = true } \keys_define:nn { fontscale / normalsize } @@ -529,40 +542,41 @@ } \keys_define:nn { fontscale } { - tiny .code:n = \__fontscale_keys_name:n {#1} + tiny .code:n = \__fontscale_keys_code_name:n {#1} , tiny .value_required:n = true - , scriptsize .code:n = \__fontscale_keys_name:n {#1} + , scriptsize .code:n = \__fontscale_keys_code_name:n {#1} , scriptsize .value_required:n = true - , footnotesize .code:n = \__fontscale_keys_name:n {#1} + , footnotesize .code:n = \__fontscale_keys_code_name:n {#1} , footnotesize .value_required:n = true - , small .code:n = \__fontscale_keys_name:n {#1} + , small .code:n = \__fontscale_keys_code_name:n {#1} , small .value_required:n = true - , normalsize .code:n = \__fontscale_keys_name:n {#1} + , normalsize .code:n = \__fontscale_keys_code_name:n {#1} , normalsize .value_required:n = true - , large .code:n = \__fontscale_keys_name:n {#1} + , large .code:n = \__fontscale_keys_code_name:n {#1} , large .value_required:n = true - , Large .code:n = \__fontscale_keys_name:n {#1} + , Large .code:n = \__fontscale_keys_code_name:n {#1} , Large .value_required:n = true - , LARGE .code:n = \__fontscale_keys_name:n {#1} + , LARGE .code:n = \__fontscale_keys_code_name:n {#1} , LARGE .value_required:n = true - , huge .code:n = \__fontscale_keys_name:n {#1} + , huge .code:n = \__fontscale_keys_code_name:n {#1} , huge .value_required:n = true - , Huge .code:n = \__fontscale_keys_name:n {#1} + , Huge .code:n = \__fontscale_keys_code_name:n {#1} , Huge .value_required:n = true } % Pre-compiles the keys with their initial values and then sets the keys to % their initial values. This is significantly faster than using .initial:n and -% \keys_precompile:nnN. +% \keys_precompile:nnN. The value of \q_no_value is used to test if the +% corresponding key has been set by the user. \cs_new_protected:Npn \__fontscale_keys_set_initial: { \fp_set:Nn \l__fontscale_baselineskip_size_ratio_fp { 1.2 } @@ -680,7 +694,7 @@ } } { - \__fontscale_dim_set_default_pt:Nn \l_fontscale_normalsize_size_dim + \__fontscale_dim_set_from_user:Nn \l_fontscale_normalsize_size_dim { \l__fontscale_normalsize_size_tl } \dim_compare:nNnF \l_fontscale_normalsize_size_dim > \c_zero_dim { @@ -703,7 +717,7 @@ } } { - \__fontscale_skip_set_default_pt:Nn + \__fontscale_skip_set_from_user:Nn \l_fontscale_normalsize_baselineskip_skip { \l__fontscale_normalsize_baselineskip_tl } } @@ -832,7 +846,7 @@ } \quark_if_no_value:cF { l__fontscale_#1_size_tl } { - \__fontscale_dim_set_default_pt:cn { l_fontscale_#1_size_dim } + \__fontscale_dim_set_from_user:cn { l_fontscale_#1_size_dim } { \use:c { l__fontscale_#1_size_tl } } \dim_compare:nNnF { \use:c { l_fontscale_#1_size_dim } } > \c_zero_dim { @@ -872,8 +886,7 @@ \use:c { l_fontscale_#1_size_dim } / \l__fontscale_normalsize_size_fp } - \__fontscale_skip_set_default_pt:cn - { l_fontscale_#1_baselineskip_skip } + \__fontscale_skip_set_from_user:cn { l_fontscale_#1_baselineskip_skip } { \use:c { l__fontscale_#1_baselineskip_tl } } } } @@ -1137,8 +1150,7 @@ { \fp_to_dim:n { (#1) * \l__fontscale_normalsize_size_fp } } } -\NewDocumentCommand \SetFontSize - { s >{ \__fontscale_arg_to_dim_default_pt:n } m } +\NewDocumentCommand \SetFontSize { s >{ \__fontscale_arg_process_dim:n } m } { \mode_if_math:TF { @@ -1175,8 +1187,8 @@ \NewDocumentCommand \SetFontSizeBaselineskip { - >{ \__fontscale_arg_to_dim_default_pt:n } m - >{ \__fontscale_arg_to_skip_default_pt:n } m + >{ \__fontscale_arg_process_dim:n } m + >{ \__fontscale_arg_process_skip:n } m } { \mode_if_math:TF @@ -1188,7 +1200,7 @@ } \NewDocumentCommand \SetFontBaselineskip - { s >{ \__fontscale_arg_to_skip_default_pt:n } m } + { s >{ \__fontscale_arg_process_skip:n } m } { \mode_if_math:TF { diff --git a/macros/latex/contrib/fontscale/fontscale.tex b/macros/latex/contrib/fontscale/fontscale.tex index 3c755467cf..a9d8e7233d 100644 --- a/macros/latex/contrib/fontscale/fontscale.tex +++ b/macros/latex/contrib/fontscale/fontscale.tex @@ -14,7 +14,7 @@ A flexible interface for setting font sizes Oliver Beery -Version 3.0.1\quad{}20 October 2024 +Version 3.0.2\quad{}25 November 2024 \section{Introduction} diff --git a/macros/latex/contrib/scaletextbullet/CHANGELOG.md b/macros/latex/contrib/scaletextbullet/CHANGELOG.md index e3ea89b9da..0f18ad5da1 100644 --- a/macros/latex/contrib/scaletextbullet/CHANGELOG.md +++ b/macros/latex/contrib/scaletextbullet/CHANGELOG.md @@ -7,6 +7,14 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to ## [Unreleased] +## [v1.0.2] - 2024-11-25 + +### Changed +- Keys and commands that take an integer expression as a value or argument now + remove the extra tokens that were not part of the integer expression. + +### Changed + ## [v1.0.1] - 2024-11-12 ### Added diff --git a/macros/latex/contrib/scaletextbullet/beery.cls b/macros/latex/contrib/scaletextbullet/beery.cls index 113d6bd6aa..7eba8ad48f 100644 --- a/macros/latex/contrib/scaletextbullet/beery.cls +++ b/macros/latex/contrib/scaletextbullet/beery.cls @@ -4,7 +4,7 @@ \NeedsTeXFormat{LaTeX2e}[2023-11-01] \ProvidesExplClass {beery} - {2024-11-12} + {2024-11-25} {} {} diff --git a/macros/latex/contrib/scaletextbullet/scaletextbullet.pdf b/macros/latex/contrib/scaletextbullet/scaletextbullet.pdf Binary files differindex b2ac9e826d..00a34d0f45 100644 --- a/macros/latex/contrib/scaletextbullet/scaletextbullet.pdf +++ b/macros/latex/contrib/scaletextbullet/scaletextbullet.pdf diff --git a/macros/latex/contrib/scaletextbullet/scaletextbullet.sty b/macros/latex/contrib/scaletextbullet/scaletextbullet.sty index cfb901e288..06620c6450 100644 --- a/macros/latex/contrib/scaletextbullet/scaletextbullet.sty +++ b/macros/latex/contrib/scaletextbullet/scaletextbullet.sty @@ -9,8 +9,8 @@ \NeedsTeXFormat{LaTeX2e}[2023-11-01] \ProvidesExplPackage {scaletextbullet} - {2024-11-12} - {1.0.1} + {2024-11-25} + {1.0.2} {Resize the \noexpand\textbullet without changing its vertical center.} % l3kernel version 2023-10-10 added many 'e'-variants. @@ -25,6 +25,10 @@ \msg_critical:nn { scaletextbullet } { expl3-out-of-date } } +% This package does not require any other packages! + +% SOME VARIABLES + \tl_new:N \l__scaletextbullet_factor_tl \tl_set:Nn \l__scaletextbullet_factor_tl { 0.4 } @@ -39,6 +43,24 @@ \fp_new:N \l__scaletextbullet_tmp_fp \box_new:N \l__scaletextbullet_tmp_box +% SOME FUNCTIONS + +% Used to process user input. Sets an integer variable from an integer +% expression and removes extra tokens. +\cs_new_protected:Npn \__scaletextbullet_int_set_from_user:Nn #1#2 + { + \afterassignment \use_none_delimit_by_q_stop:w + #1 = \numexpr #2 \relax + \q_stop + } +% Argument processor +\int_new:N \l__scaletextbullet_arg_process_int +\cs_new_protected:Npn \__scaletextbullet_arg_process_int:n #1 + { + \__scaletextbullet_int_set_from_user:Nn \l__scaletextbullet_arg_process_int + {#1} + \tl_set:NV \ProcessedArgument \l__scaletextbullet_arg_process_int + } % Lowers the \textbullet to the baseline, scales it by a factor of #2, and % then raises it back to the vertical center. % I have referenced code by the great egreg: @@ -64,6 +86,8 @@ } } +% MESSAGES + \msg_new:nnn { scaletextbullet } { factor-out-of-bounds } { Invalid~ \iow_char:N \\textbullet~ factor~ '#1'~ \msg_line_context:. } \msg_new:nnn { scaletextbullet } { scale-out-of-bounds } @@ -111,7 +135,8 @@ } } -\NewDocumentCommand \ScaleTextBullets { o m } +\NewDocumentCommand \ScaleTextBullets + { o >{ \__scaletextbullet_arg_process_int:n } m } { \mode_leave_vertical: \IfNoValueTF {#1} diff --git a/macros/latex/contrib/scaletextbullet/scaletextbullet.tex b/macros/latex/contrib/scaletextbullet/scaletextbullet.tex index 690fc2ff11..9cf8f324a0 100644 --- a/macros/latex/contrib/scaletextbullet/scaletextbullet.tex +++ b/macros/latex/contrib/scaletextbullet/scaletextbullet.tex @@ -16,7 +16,7 @@ Resize the \cs{textbullet} without changing its vertical center Oliver Beery -Version 1.0.1\quad{}12 November 2024 +Version 1.0.2\quad{}25 November 2024 \section{Introduction} diff --git a/macros/latex/contrib/zref-vario/CHANGELOG.md b/macros/latex/contrib/zref-vario/CHANGELOG.md index 6b8f449b5b..08ac6878da 100644 --- a/macros/latex/contrib/zref-vario/CHANGELOG.md +++ b/macros/latex/contrib/zref-vario/CHANGELOG.md @@ -1,6 +1,12 @@ # Changelog -## [Unreleased](https://github.com/gusbrs/zref-vario/compare/v0.1.11...HEAD) +## [Unreleased](https://github.com/gusbrs/zref-vario/compare/v0.1.12...HEAD) + +## [v0.1.12](https://github.com/gusbrs/zref-vario/compare/v0.1.11...v0.1.12) (2024-11-25) + +### Added +- Swedish localization (see issue + [#3](https://github.com/gusbrs/zref-vario/issues/3)). ## [v0.1.11](https://github.com/gusbrs/zref-vario/compare/v0.1.10...v0.1.11) (2024-11-07) diff --git a/macros/latex/contrib/zref-vario/zref-vario-code.pdf b/macros/latex/contrib/zref-vario/zref-vario-code.pdf Binary files differindex b9ac5d19e9..c712b69393 100644 --- a/macros/latex/contrib/zref-vario/zref-vario-code.pdf +++ b/macros/latex/contrib/zref-vario/zref-vario-code.pdf diff --git a/macros/latex/contrib/zref-vario/zref-vario-doc.pdf b/macros/latex/contrib/zref-vario/zref-vario-doc.pdf Binary files differindex be3a7bfd5f..92f3213f73 100644 --- a/macros/latex/contrib/zref-vario/zref-vario-doc.pdf +++ b/macros/latex/contrib/zref-vario/zref-vario-doc.pdf diff --git a/macros/latex/contrib/zref-vario/zref-vario-doc.tex b/macros/latex/contrib/zref-vario/zref-vario-doc.tex index d6187077b7..45e8f93f12 100644 --- a/macros/latex/contrib/zref-vario/zref-vario-doc.tex +++ b/macros/latex/contrib/zref-vario/zref-vario-doc.tex @@ -352,8 +352,10 @@ generously provided by (in chronological order): % and following discussion. The package's language settings have been provided or improved thanks to: - Matteo Ferrigato (Italian). % 'matteo339' + Matteo Ferrigato (Italian) % 'matteo339' % 2023-01-02: https://github.com/gusbrs/zref-vario/issues/1 + and \username{Timmyfox} (Swedish). + % 2024-11-25: https://github.com/gusbrs/zref-vario/issues/3 If I have inadvertently left anyone off the list I apologize, and please let me know, so that I can correct the oversight. diff --git a/macros/latex/contrib/zref-vario/zref-vario.dtx b/macros/latex/contrib/zref-vario/zref-vario.dtx index ef9dc197c3..9e6161d590 100644 --- a/macros/latex/contrib/zref-vario/zref-vario.dtx +++ b/macros/latex/contrib/zref-vario/zref-vario.dtx @@ -141,7 +141,7 @@ % % Identify the package. % \begin{macrocode} -\ProvidesExplPackage {zref-vario} {2024-11-07} {0.1.11} +\ProvidesExplPackage {zref-vario} {2024-11-25} {0.1.12} {Extended LaTeX page cross-references with varioref and zref-clever} % \end{macrocode} % @@ -1233,7 +1233,7 @@ % % % Italian localization improved thanks to \contributor{Matteo Ferrigato} (at -% \githubissue{1}) +% \githubissue{1}). % % \begin{macrocode} \zvLanguageSetup { italian } @@ -1253,6 +1253,29 @@ % \end{macrocode} % % +% Swedish localization initially provided by \contributor{\username{Timmyfox}} +% (at \githubissue{3}). +% +% \begin{macrocode} +\zvLanguageSetup { swedish } + { + reftextfaceafter = + {på~\zvhyperlink{\reftextvario{motstående}{nästa}~sida}} , + reftextfacebefore = + {på~\zvhyperlink{\reftextvario{motstående}{föregående}~sida}} , + reftextafter = + {på~\zvhyperlink{\reftextvario{följande}{nästa}~sida}} , + reftextbefore = + {på~\zvhyperlink{föregående~sida}} , + reftextcurrent = + {på~\zvhyperlink{\reftextvario{den~här~sidan}{denna~sida}}} , + reftextfaraway = {på~\zcpageref{#1}} , + reftextpagerange = {på~\zcpageref[range]{#1,#2}} , + reftextlabelrange = {\zcref[range]{#1,#2}} , + } +% \end{macrocode} +% +% % \begin{macrocode} %</package> % \end{macrocode} |