From 12fef7aa53e3695c36d3650fa4fb98f991bc223e Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 5 May 2020 03:00:58 +0000 Subject: CTAN sync 202005050300 --- .../latex/contrib/acmart/ACM-Reference-Format.bst | 19 ++- macros/latex/contrib/acmart/Makefile | 8 + macros/latex/contrib/acmart/README | 7 + macros/latex/contrib/acmart/acmart.dtx | 173 +++++++++++++++------ macros/latex/contrib/acmart/acmart.pdf | Bin 840485 -> 842984 bytes macros/latex/contrib/acmart/acmguide.pdf | Bin 405668 -> 407753 bytes .../contrib/acmart/samples/sample-acmlarge.pdf | Bin 564476 -> 566845 bytes .../acmart/samples/sample-acmsmall-conf.pdf | Bin 1009110 -> 1011260 bytes .../contrib/acmart/samples/sample-acmsmall.pdf | Bin 574924 -> 576810 bytes .../latex/contrib/acmart/samples/sample-acmtog.pdf | Bin 521652 -> 524469 bytes .../contrib/acmart/samples/sample-authordraft.pdf | Bin 1001590 -> 1003404 bytes .../latex/contrib/acmart/samples/sample-base.bib | 18 ++- .../contrib/acmart/samples/sample-lualatex.pdf | Bin 0 -> 691642 bytes .../contrib/acmart/samples/sample-manuscript.pdf | Bin 574341 -> 576645 bytes .../contrib/acmart/samples/sample-sigchi-a.pdf | Bin 461051 -> 0 bytes .../latex/contrib/acmart/samples/sample-sigchi.pdf | Bin 575173 -> 0 bytes .../contrib/acmart/samples/sample-sigconf.pdf | Bin 997807 -> 999623 bytes .../contrib/acmart/samples/sample-sigplan.pdf | Bin 1006831 -> 1008702 bytes .../contrib/acmart/samples/sample-xelatex.pdf | Bin 631300 -> 633119 bytes macros/latex/contrib/acmart/samples/samples.dtx | 56 +++++-- macros/latex/contrib/acmart/samples/samples.ins | 3 +- macros/latex/contrib/apa7/apa7.dtx | 36 +++-- macros/latex/contrib/apa7/apa7.pdf | Bin 514782 -> 520965 bytes macros/latex/contrib/apa7/samples/longsample.pdf | Bin 195755 -> 196731 bytes macros/latex/contrib/apa7/samples/shortsample.pdf | Bin 58843 -> 63826 bytes .../latex/contrib/babel-contrib/portuges/README.md | 16 ++ .../contrib/babel-contrib/portuges/portuges.dtx | 24 ++- .../contrib/babel-contrib/portuges/portuges.ins | 24 +-- .../contrib/babel-contrib/portuges/portuges.pdf | Bin 146040 -> 145322 bytes macros/latex/contrib/curve2e/README.txt | 38 ++--- macros/latex/contrib/curve2e/curve2e-manual.pdf | Bin 565999 -> 567196 bytes macros/latex/contrib/curve2e/curve2e-manual.tex | 40 +++-- macros/latex/contrib/curve2e/curve2e.dtx | 20 ++- macros/latex/contrib/curve2e/curve2e.pdf | Bin 648539 -> 649719 bytes 34 files changed, 335 insertions(+), 147 deletions(-) create mode 100644 macros/latex/contrib/acmart/samples/sample-lualatex.pdf delete mode 100644 macros/latex/contrib/acmart/samples/sample-sigchi-a.pdf delete mode 100644 macros/latex/contrib/acmart/samples/sample-sigchi.pdf create mode 100644 macros/latex/contrib/babel-contrib/portuges/README.md (limited to 'macros/latex') diff --git a/macros/latex/contrib/acmart/ACM-Reference-Format.bst b/macros/latex/contrib/acmart/ACM-Reference-Format.bst index 80ed3bb23f..18bf3b82b6 100644 --- a/macros/latex/contrib/acmart/ACM-Reference-Format.bst +++ b/macros/latex/contrib/acmart/ACM-Reference-Format.bst @@ -1358,7 +1358,19 @@ FUNCTION { format.series } { series empty.or.unknown {""} - {" \emph{(\bibinfo{series}{" * series "})}" *} + {" \emph{(\bibinfo{series}{" * series "}" * + volume empty.or.unknown + { + number empty.or.unknown + {")}" *} + {", \bibinfo{number}{" number "})}" * * *} + if$ + } + {", Vol.~\bibinfo{volume}{" volume "})}" * * * + "volume and number" number either.or.check + } + if$ + } if$ } @@ -2290,7 +2302,10 @@ FUNCTION { inproceedings } { format.in.emphasize.booktitle format.city "booktitle" output.check.dot.space format.series output.removenospace format.editors.fml output % BV 2011/09/27 Moved dot to comma - format.bvolume.noseries output + series empty.or.unknown + { format.bvolume.noseries output } + {} + if$ new.sentence organization output publisher "publisher" bibinfo.output.check % jtb: require publisher (?) diff --git a/macros/latex/contrib/acmart/Makefile b/macros/latex/contrib/acmart/Makefile index 68e33d0437..916c87c9f1 100644 --- a/macros/latex/contrib/acmart/Makefile +++ b/macros/latex/contrib/acmart/Makefile @@ -66,6 +66,14 @@ samples/sample-xelatex.pdf: samples/sample-xelatex.tex samples/$(PACKAGE).cls while ( grep -q '^LaTeX Warning: Label(s) may have changed' $(basename $<).log) \ do cd $(dir $@) && xelatex-dev $(notdir $<); done +samples/sample-lualatex.pdf: samples/sample-lualatex.tex samples/$(PACKAGE).cls samples/ACM-Reference-Format.bst + cd $(dir $@) && lualatex-dev $(notdir $<) + - cd $(dir $@) && bibtex $(notdir $(basename $<)) + cd $(dir $@) && lualatex-dev $(notdir $<) + cd $(dir $@) && lualatex-dev $(notdir $<) + while ( grep -q '^LaTeX Warning: Label(s) may have changed' $(basename $<).log) \ + do cd $(dir $@) && lualatex-dev $(notdir $<); done + .PRECIOUS: $(PACKAGE).cfg $(PACKAGE).cls diff --git a/macros/latex/contrib/acmart/README b/macros/latex/contrib/acmart/README index 8a23c4c2a5..1e042b99ff 100644 --- a/macros/latex/contrib/acmart/README +++ b/macros/latex/contrib/acmart/README @@ -262,3 +262,10 @@ Version 1.69 Bug fixes Version 1.70 Title change for ACM/IMS Transactions on Data Science Bug fixes for bibliography + + +Version 1.71 Bug fixes + Formats sigchi and sigchi-a are retired + Bibliography formatting changes for @inproceedings entries + having both series and volume + LuaLaTeX now uses the same OTF fonts as XeTeX \ No newline at end of file diff --git a/macros/latex/contrib/acmart/acmart.dtx b/macros/latex/contrib/acmart/acmart.dtx index 72e256f18c..36b1cbe6a6 100644 --- a/macros/latex/contrib/acmart/acmart.dtx +++ b/macros/latex/contrib/acmart/acmart.dtx @@ -1,6 +1,6 @@ % \iffalse % -% Copyright 2016-2019, Association for Computing Machinery +% Copyright 2016-2020, 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 @@ -19,7 +19,6 @@ % acmart.cls, the files ACM-Reference-Format.bst, and templates % sample-acmlarge.tex, sample-acmsmall.tex, sample-acmtog.tex, % samplebody-conf.tex, samplebody-journals.tex, sample-manuscript.tex, -% sample-sigchi-a.tex, sample-sigchi.tex, % sample-sigconf-authordraft.tex, sample-sigconf.tex, % sample-sigplan.tex % @@ -58,7 +57,7 @@ % \ifx\currentjob\guide\OnlyDescription\fi % \GetFileInfo{acmart.dtx} % \title{\LaTeX{} Class for the \emph{Association for Computing -% Machinery}\thanks{\copyright 2016--2019, Association for Computing Machinery}} +% Machinery}\thanks{\copyright 2016--2020, 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}}}} @@ -102,6 +101,7 @@ % Leif Andersen, % Lawrence Christopher Angrave, % Dirk Beyer, +% Andrew Black, % Joachim Breitner, % Benjamin Byholm, % Nils Anders Danielsson, @@ -111,6 +111,7 @@ % Ben Greenman, % Enrico Gregorio, % Jamie Davis, +% Jason Hemann, % Peter Kemp, % Luis Leiva, % Ben Liblit, @@ -137,6 +138,7 @@ % Stephen Spencer, % Shin Hwei Tan, % Daniel Thomas, +% Shari Trewin, % Zack Weinberg, % John Wickerson % and many others for their invaluable help. @@ -221,8 +223,7 @@ % \item \textsl{geometry}, \url{http://www.ctan.org/pkg/geometry} % \item \textsl{graphics}, \url{http://www.ctan.org/pkg/graphics} % \item \textsl{hyperref}, \url{http://www.ctan.org/pkg/hyperref} -% \item \textsl{ifluatex}, \url{http://www.ctan.org/pkg/ifluatex} -% \item \textsl{ifxetex}, \url{http://www.ctan.org/pkg/ifxetex} +% \item \textsl{iftex}, \url{http://www.ctan.org/pkg/iftex} % \item \textsl{inconsolata}, \url{http://www.ctan.org/pkg/inconsolata} % \item \textsl{libertine}, \url{http://www.ctan.org/pkg/libertine} % \item \textsl{manyfoot}, \url{http://www.ctan.org/pkg/manyfoot} @@ -309,12 +310,16 @@ % conferences (with the exceptions listed below) and all ICPS % volumes.\\ % sigplan & Proceedings format for SIGPLAN conferences.\\ -% sigchi & Proceedings format for SIGCHI conferences.\\ -% sigchi-a & Format for SIGCHI extended abstracts.\\ % \bottomrule % \end{tabularx} % \end{table} % +% Starting in 2020, ACM retired formats |sigchi| and |sigchi-a|. +% SIGCHI conferences now use |sigconf| format for their publications. +% If a file uses |sigchi| format, a warning is issued, and the format +% is automatically switched to |sigconf|. Format |sigchi-a| can be +% used for non-ACM documents only (see Section~\ref{sec:sigchi-a}). +% % There are several Boolean options that can take |true| or |false| % values. They are listed in Table~\ref{tab:opts_bool}. The words % |=true| can be omitted when setting a Boolean option, so instead of @@ -875,13 +880,12 @@ % \cs{acmBadgeR}\oarg{url}\marg{graphics} and % \cs{acmBadgeL}\oarg{url}\marg{graphics}. The first command puts the % badge to the right of the title, and the second one---to the left. -% The exception is the |sigchi-a| mode for SIGCHI extended abstracts, -% which puts the badges on the left margin. The arguments have the -% following meaning: \oarg{url}, if provided, sets the link to the -% badge authority in the screen version, while \marg{graphics} sets -% the graphics file with the badge image. The file must be a cropped -% square, which is scaled to a standard size in the output. For -% example, if the badge image is |ae-logo.pdf|, the command is +% The arguments have the following meaning: \oarg{url}, if provided, +% sets the link to the badge authority in the screen version, while +% \marg{graphics} sets the graphics file with the badge image. The +% file must be a cropped square, which is scaled to a standard size in +% 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} % \end{verbatim} @@ -1154,8 +1158,6 @@ % \item[figure*, table*] in two-column formats, a special figure or % table taking a full text width. % \item[teaserfigure:] a special figure before \cs{maketitle}. -% \item[sidebar, marginfigure, margintable:] in the |sigchi-a| format, -% special sidebars, tables and figures in the margin. % \end{description} % % \item Accordingly, when scaling images, one should use the @@ -1166,9 +1168,6 @@ % use \cs{columnwidth}, which coincides with \cs{textwidth} in this % case. % \item For |figure| in two-column mode, use \cs{columnwidth}. -% \item For |marginfigure|, use \cs{marginparwidth}. -% \item For |figure*| in SIGCHI extended -% abstracts, use \cs{fulltextwidth}. % \end{enumerate} % % \end{enumerate} @@ -1217,23 +1216,11 @@ % \end{table} % \end{verbatim} % -% \DescribeEnv{sidebar}% -% \DescribeEnv{marginfigure}% -% \DescribeEnv{margintable}% -% SIGCHI extended abstracts use margin space extensively. This package -% provides three environments for this with optional captions: -% \begin{description} -% \item[sidebar:] textual information in the margin -% \item[marginfigure:] a figure in the margin -% \item[margintable:] a table in the margin -% \end{description} -% % -% Tables and figures (including margin tables and margin figures) are -% by default centered. However, in some cases (for example, when you -% use several subimages per figure) you may need to override this. -% A good way to do so is to put the contents into a -% \cs{minipage} of the width \cs{columnwidth}. +% Tables and figures are by default centered. However, in some cases +% (for example, when you use several subimages per figure) you may +% need to override this. A good way to do so is to put the contents +% into a \cs{minipage} of the width \cs{columnwidth}. % % %\subsection{Descriptions of images} @@ -1819,6 +1806,48 @@ % special ``publication'' type FACMP, a forthcoming ACM publication, % reserved for new journals which are not assigned an ISSN yet. % +% +%\subsection{A note about \texttt{sigchi-a} format} +%\label{sec:sigchi-a} +% +% Starting in Spring 2020 ACM retired SIGCHI Extended Abstract format +% (|sigchi-a|). ACM will not, under any circumstances, accept +% documents in this format for publication and will not offer +% technical support to the authors who use this template. +% +% You may use this format in the |nonacm| mode only, as in +% \begin{verbatim} +% \documentclass[sigchi-a, nonacm]{acmart} +% \end{verbatim} +% +% +% +% \DescribeEnv{sidebar}% +% \DescribeEnv{marginfigure}% +% \DescribeEnv{margintable}% +% This format has large margin uses for special figures and +% tables. This package provides three environments for this with +% optional captions: +% \begin{description} +% \item[sidebar:] textual information in the margin, +% \item[marginfigure:] a figure in the margin, +% \item[margintable:] a table in the margin. +% \end{description} +% +% The environments |figure| and |table| produce figures and tables +% with the width of the text column. The environments |figure*| and +% |table*| produce ``wide'' figures and tables, which take a large +% part of the margin. +% +% The horizontal sizes of figures are: +% \begin{enumerate} +% \item |figure|: \cs{columnwidth}, +% \item |marginfigure|: \cs{marginparwidth}, +% \item |figure*|: \cs{fulltextwidth}. +% \end{enumerate} +% +% +% % \StopEventually{ % \clearpage % \bibliography{acmart} @@ -1842,7 +1871,7 @@ \ProvidesFile{acmart.dtx} % %\ProvidesClass{acmart} -[2020/02/22 v1.70 Typesetting articles for the Association for Computing Machinery] +[2020/04/30 v1.71 Typesetting articles for the Association for Computing Machinery] % \end{macrocode} % % \changes{v1.00}{2016/04/14}{First released version} @@ -1943,6 +1972,10 @@ % papers over two pages} % \changes{1.66}{2019/12/18}{Authors' addresses are mandatory for % journal articles} +% \changes{1.71}{2020/05/01}{Retired sigchi and sigchi-a} +% \changes{1.71}{2020/05/02}{Bibliography change: volume for +% @inproceedings is now in brackets together with series} +% \changes{1.71}{2020/05/02}{LuaTeX now uses the OTF versions of fonts} % % And the driver code: % \begin{macrocode} @@ -1992,6 +2025,11 @@ \RequirePackage{xstring} % \end{macrocode} % +% We need |iftex| to check the engine +% \begin{macrocode} +\RequirePackage{iftex} +% \end{macrocode} +% % % % \begin{macro}{format} @@ -2276,10 +2314,30 @@ % Setting up switches % \begin{macrocode} \ifnum\ACM@format@nr=5\relax % siggraph - \ClassWarning{\@classname}{The format siggraph is now obsolete. - I am switching to sigconf.} +\ClassWarning{\@classname}{% + The format siggraph is now obsolete.\MessageBreak + I am switching to sigconf.} + \setkeys{acmart.cls}{format=sigconf} +\fi +\ifnum\ACM@format@nr=7\relax % sigchi +\ClassWarning{\@classname}{% + The format sigchi is now obsolete.\MessageBreak + I am switching to sigconf.} \setkeys{acmart.cls}{format=sigconf} \fi +\ifnum\ACM@format@nr=8\relax % sigchi +\ClassWarning{\@classname}{% + ACM SIGCHI has retired the SIGCHI-A template\MessageBreak + effective immediately. ACM is keeping this template\MessageBreak + option available to authors who are working on legacy\MessageBreak + documents only. ACM will not, under any circumstances,\MessageBreak + accept documents in this format for publication and\MessageBreak + will not offer technical support to the authors who use\MessageBreak + this template.\MessageBreak + ACM SIGCHI is directing Conference leaders and\MessageBreak + authors to publish their articles using the SIGCONF\MessageBreak + template call.} +\fi \ifnum\ACM@format@nr=0\relax \@ACM@manuscripttrue \else @@ -2342,7 +2400,7 @@ \or % sigplan \def\ACM@fontsize{10pt}% \or % sigchi - \def\ACM@fontsize{10pt}% + \def\ACM@fontsize{9pt}% \or % sigchi-a \def\ACM@fontsize{10pt}% \fi @@ -2667,9 +2725,10 @@ % \end{macro} % \begin{macro}{\l@subsubsection} % \changes{v1.31}{2017/03/04}{Redefined macro} +% \changes{v1.71}{2020/04/30}{Bug fixed (thanks to Andrew Black)} % The spacing in |amsart| is too large % \begin{macrocode} -\def\l@subsubsection{\@tocline{2}{0pt}{1pc}{5pc}{}} +\def\l@subsubsection{\@tocline{3}{0pt}{1pc}{5pc}{}} % \end{macrocode} % % \end{macro} @@ -2847,7 +2906,7 @@ % \end{macrocode} % % -% Author-draft mode +% Author-draft mode or sigchi-a mode % \begin{macrocode} \if@ACM@authordraft \RequirePackage{draftwatermark} @@ -2856,6 +2915,17 @@ \SetWatermarkText{\parbox{12em}{\centering Unpublished working draft.\\ Not for distribution.}} +\else + \if@ACM@sigchiamode + \if@ACM@nonacm\else + \RequirePackage{draftwatermark} + \SetWatermarkFontSize{0.5in} + \SetWatermarkColor[gray]{.9} + \SetWatermarkText{\parbox{12em}{\centering + Legacy document. \\ + Not for publication in an ACM venue}} + \fi + \fi \fi % \end{macrocode} % @@ -3125,14 +3195,19 @@ % \begin{macrocode} \if@ACM@newfonts \RequirePackage[T1]{fontenc} -\ifxetex - \RequirePackage[tt=false]{libertine} - \setmonofont{inconsolata} -\else - \RequirePackage[tt=false, type1=true]{libertine} -\fi -\RequirePackage[varqu]{zi4} -\RequirePackage[libertine]{newtxmath} + \ifxetex + \RequirePackage[tt=false]{libertine} + \setmonofont[StylisticSet=3]{inconsolata} + \else + \ifluatex + \RequirePackage[tt=false]{libertine} + \setmonofont[StylisticSet=3]{inconsolata} + \else + \RequirePackage[tt=false, type1=true]{libertine} + \RequirePackage[varqu]{zi4} + \fi + \fi + \RequirePackage[libertine]{newtxmath} \fi % \end{macrocode} % diff --git a/macros/latex/contrib/acmart/acmart.pdf b/macros/latex/contrib/acmart/acmart.pdf index 8c98fc64b6..ffb2bf2616 100644 Binary files a/macros/latex/contrib/acmart/acmart.pdf and b/macros/latex/contrib/acmart/acmart.pdf differ diff --git a/macros/latex/contrib/acmart/acmguide.pdf b/macros/latex/contrib/acmart/acmguide.pdf index 3fb7c9a5c6..63cf9ccaec 100644 Binary files a/macros/latex/contrib/acmart/acmguide.pdf and b/macros/latex/contrib/acmart/acmguide.pdf differ diff --git a/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf b/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf index d5ab7238d5..7ab264a9d4 100644 Binary files a/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf and b/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf differ diff --git a/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf b/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf index 3f90e052be..990a35ad19 100644 Binary files a/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf and b/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf differ diff --git a/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf b/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf index 57bd85df9f..a60476aa63 100644 Binary files a/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf and b/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf differ diff --git a/macros/latex/contrib/acmart/samples/sample-acmtog.pdf b/macros/latex/contrib/acmart/samples/sample-acmtog.pdf index 361822c0ff..e082644d0f 100644 Binary files a/macros/latex/contrib/acmart/samples/sample-acmtog.pdf and b/macros/latex/contrib/acmart/samples/sample-acmtog.pdf differ diff --git a/macros/latex/contrib/acmart/samples/sample-authordraft.pdf b/macros/latex/contrib/acmart/samples/sample-authordraft.pdf index 4e1c8b52ba..237c7cd7b2 100644 Binary files a/macros/latex/contrib/acmart/samples/sample-authordraft.pdf and b/macros/latex/contrib/acmart/samples/sample-authordraft.pdf differ diff --git a/macros/latex/contrib/acmart/samples/sample-base.bib b/macros/latex/contrib/acmart/samples/sample-base.bib index 561e5e170a..9b713fd687 100644 --- a/macros/latex/contrib/acmart/samples/sample-base.bib +++ b/macros/latex/contrib/acmart/samples/sample-base.bib @@ -665,7 +665,7 @@ year = {2003}, note = "", } -@article{Rous08, +@article{rous08, author = "Bernard Rous", year = "2008", title = "The Enabling of Digital Libraries", @@ -874,7 +874,7 @@ year = {2003}, } % div book -@book{Mullender:1993:DS(:302430, +@book{Mullender:1993:DS:302430, editor = {Mullender, Sape}, title = {Distributed systems (2nd Ed.)}, year = {1993}, @@ -1434,7 +1434,7 @@ month = jul, year = 1984, pages = "380--401"} -@book{lamport:latex, +@book{Lamport:LaTeX, author = "Leslie Lamport", title = "\it {\LaTeX}: A Document Preparation System", publisher = "Addison-Wesley", @@ -1627,3 +1627,15 @@ archivePrefix = {arXiv}, archivePrefix = {arXiv}, eprint = {1403.1349}, } + +@inproceedings{Hagerup1993, +title = {Maintaining Discrete Probability Distributions Optimally}, +author = {Hagerup, Torben and Mehlhorn, Kurt and Munro, J. Ian}, +booktitle = {Proceedings of the 20th International Colloquium on Automata, Languages and Programming}, +series = {Lecture Notes in Computer Science}, +volume = {700}, +pages = {253--264}, +year = {1993}, +publisher = {Springer-Verlag}, +address = {Berlin}, +} diff --git a/macros/latex/contrib/acmart/samples/sample-lualatex.pdf b/macros/latex/contrib/acmart/samples/sample-lualatex.pdf new file mode 100644 index 0000000000..8c840fa6b9 Binary files /dev/null and b/macros/latex/contrib/acmart/samples/sample-lualatex.pdf differ diff --git a/macros/latex/contrib/acmart/samples/sample-manuscript.pdf b/macros/latex/contrib/acmart/samples/sample-manuscript.pdf index 3c16480ab5..afb1134fa3 100644 Binary files a/macros/latex/contrib/acmart/samples/sample-manuscript.pdf and b/macros/latex/contrib/acmart/samples/sample-manuscript.pdf differ diff --git a/macros/latex/contrib/acmart/samples/sample-sigchi-a.pdf b/macros/latex/contrib/acmart/samples/sample-sigchi-a.pdf deleted file mode 100644 index 7b8c796a50..0000000000 Binary files a/macros/latex/contrib/acmart/samples/sample-sigchi-a.pdf and /dev/null differ diff --git a/macros/latex/contrib/acmart/samples/sample-sigchi.pdf b/macros/latex/contrib/acmart/samples/sample-sigchi.pdf deleted file mode 100644 index 18cd73a8cb..0000000000 Binary files a/macros/latex/contrib/acmart/samples/sample-sigchi.pdf and /dev/null differ diff --git a/macros/latex/contrib/acmart/samples/sample-sigconf.pdf b/macros/latex/contrib/acmart/samples/sample-sigconf.pdf index f11436a101..370abe1a40 100644 Binary files a/macros/latex/contrib/acmart/samples/sample-sigconf.pdf and b/macros/latex/contrib/acmart/samples/sample-sigconf.pdf differ diff --git a/macros/latex/contrib/acmart/samples/sample-sigplan.pdf b/macros/latex/contrib/acmart/samples/sample-sigplan.pdf index 3693877765..a59f68989c 100644 Binary files a/macros/latex/contrib/acmart/samples/sample-sigplan.pdf and b/macros/latex/contrib/acmart/samples/sample-sigplan.pdf differ diff --git a/macros/latex/contrib/acmart/samples/sample-xelatex.pdf b/macros/latex/contrib/acmart/samples/sample-xelatex.pdf index 620d2448cf..b133ccef1c 100644 Binary files a/macros/latex/contrib/acmart/samples/sample-xelatex.pdf and b/macros/latex/contrib/acmart/samples/sample-xelatex.pdf differ diff --git a/macros/latex/contrib/acmart/samples/samples.dtx b/macros/latex/contrib/acmart/samples/samples.dtx index e4236f1e4a..ed8e0af0da 100644 --- a/macros/latex/contrib/acmart/samples/samples.dtx +++ b/macros/latex/contrib/acmart/samples/samples.dtx @@ -9,7 +9,7 @@ %\documentclass[sigconf,authordraft]{acmart} %\documentclass[sigplan,screen]{acmart} %\documentclass[sigchi]{acmart} -%\documentclass[sigchi-a]{acmart} +%\documentclass[sigchi-a, nonacm]{acmart} %% %% \BibTeX command to typeset BibTeX logo in the docs @@ -512,6 +512,12 @@ in the printed output of this document. \end{tabular} \end{table*} +Always use midrule to separate table header rows from data rows, and +use it only for this purpose. This enables assistive technologies to +recognise table headers and support their users in navigating tables +more easily. + + \section{Math Equations} You may want to display math equations in three distinct styles: inline, numbered or non-numbered display. Each of the three are @@ -570,17 +576,35 @@ in the example below. \caption{1907 Franklin Model D roadster. Photograph by Harris \& Ewing, Inc. [Public domain], via Wikimedia Commons. (\url{https://goo.gl/VLCRBB}).} - \Description{The 1907 Franklin Model D roadster.} + \Description{A woman and a girl in white dresses sit in an open car.} %\end{figure} %\end{marginfigure} Your figures should contain a caption which describes the figure to -the reader. Figure captions go below the figure. Your figures should -{\bfseries also} include a description suitable for screen readers, to -assist the visually-challenged to better understand your work. +the reader. Figure captions are placed {\itshape below} the figure. +Every figure should also have a figure description unless it is purely +decorative. These descriptions convey what’s in the image to someone +who cannot see it. They are also used by search engine crawlers for +indexing images, and when images cannot be loaded. + +A figure description must be unformatted plain text less than 2000 +characters long (including spaces). {\bfseries Figure descriptions + should not repeat the figure caption – their purpose is to capture + important information that is not already provided in the caption or + the main text of the paper.} For figures that convey important and +complex new information, a short text description may not be +adequate. More complex alternative descriptions can be placed in an +appendix and referenced in a short figure description. For example, +provide a data table capturing the information in a bar chart, or a +structured list representing a graph. For additional information +regarding how best to write figure descriptions and why doing this is +so important, please see +\url{https://www.acm.org/publications/taps/describing-figures/}. + + \subsection{The ``Teaser Figure''} A ``teaser figure'' is an image, or set of images in one figure, that @@ -633,17 +657,17 @@ command in the {\bfseries preamble} (before the command Editor00a's series should NOT be present since it has no vol. no.), a chapter in a divisible book \cite{Spector90}, a chapter in a divisible book in a series \cite{Douglass98}, a multi-volume work as - book \cite{Knuth97}, an article in a proceedings (of a conference, - symposium, workshop for example) (paginated proceedings article) - \cite{Andler79}, a proceedings article with all possible elements - \cite{Smith10}, an example of an enumerated proceedings article - \cite{VanGundy07}, an informally published work \cite{Harel78}, - a couple of preprints \cite{Bornmann2019, AnzarootPBM14}, - a doctoral dissertation \cite{Clarkson85}, a master's thesis: - \cite{anisi03}, an online document / world wide web resource - \cite{Thornburg01, Ablamowicz07, Poker06}, a video game (Case 1) - \cite{Obama08} and (Case 2) \cite{Novak03} and \cite{Lee05} and - (Case 3) a patent \cite{JoeScientist001}, work accepted for + book \cite{Knuth97}, a couple of articles in a proceedings (of a + conference, symposium, workshop for example) (paginated proceedings + article) \cite{Andler79, Hagerup1993}, a proceedings article with + all possible elements \cite{Smith10}, an example of an enumerated + proceedings article \cite{VanGundy07}, an informally published work + \cite{Harel78}, a couple of preprints \cite{Bornmann2019, + AnzarootPBM14}, a doctoral dissertation \cite{Clarkson85}, a + master's thesis: \cite{anisi03}, an online document / world wide web + resource \cite{Thornburg01, Ablamowicz07, Poker06}, a video game + (Case 1) \cite{Obama08} and (Case 2) \cite{Novak03} and \cite{Lee05} + and (Case 3) a patent \cite{JoeScientist001}, work accepted for publication \cite{rous08}, 'YYYYb'-test for prolific author \cite{SaeediMEJ10} and \cite{SaeediJETC10}. Other cites might contain 'duplicate' DOI and URLs (some SIAM articles) diff --git a/macros/latex/contrib/acmart/samples/samples.ins b/macros/latex/contrib/acmart/samples/samples.ins index b98cca55ab..2384a5f27d 100644 --- a/macros/latex/contrib/acmart/samples/samples.ins +++ b/macros/latex/contrib/acmart/samples/samples.ins @@ -14,9 +14,8 @@ \file{sample-sigconf.tex}{\from{samples.dtx}{sigconf}} \file{sample-authordraft.tex}{\from{samples.dtx}{authordraft}} \file{sample-xelatex.tex}{\from{samples.dtx}{sigconf}} + \file{sample-lualatex.tex}{\from{samples.dtx}{sigconf}} \file{sample-sigplan.tex}{\from{samples.dtx}{sigplan}} - \file{sample-sigchi.tex}{\from{samples.dtx}{sigchi}} - \file{sample-sigchi-a.tex}{\from{samples.dtx}{sigchi-a}} \file{sample-acmsmall-conf.tex}{\from{samples.dtx}{acmsmall-conf}} } diff --git a/macros/latex/contrib/apa7/apa7.dtx b/macros/latex/contrib/apa7/apa7.dtx index b670b67b92..5eb0137424 100644 --- a/macros/latex/contrib/apa7/apa7.dtx +++ b/macros/latex/contrib/apa7/apa7.dtx @@ -4,11 +4,11 @@ % % % CHANGE THESE VALUES WITH EACH NEW RELEASE: % % % -%\ProvidesClass{apa7}[2020/3/27 v1.05 APA formatting (7th edition)] +%\ProvidesClass{apa7}[2020/05/04 v1.06 APA formatting (7th edition)] % % %<*internal> % -\def\apaSevenVersionDate{2020/3/27} -\def\apaSevenVersionNumber{1.05} +\def\apaSevenVersionDate{2020/05/04} +\def\apaSevenVersionNumber{1.06} % % % % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -235,10 +235,11 @@ and the derived files apa7.ins, % % \changes{v1.03}{2019/12/29}{Updated class to detect babel package in document and localize accordingly.} % -% \changes{v1.04}{2019/12/30}{Added table of contents.} -% \changes{v1.04}{2019/12/30}{Updated documentation and added correct license statement to cls for apa6 package.} +% \changes{v1.04}{2019/12/30}{Added table of contents. Updated documentation and added correct license statement to cls for apa6 package.} % -% \changes{v1.05}{2020/3/27}{Fixed float placement at end for man and stu mode to ensure one correctly placed figure/table per page. Thanks WC!} +% \changes{v1.05}{2020/03/27}{Fixed float placement at end for man and stu mode to ensure one correctly placed figure/table per page. Thanks WC.} +% +% \changes{v1.06}{2020/05/04}{Added figurenote command.} % % \begin{abstract} % The \textit{Publication Manual} of the American Psychological @@ -543,6 +544,9 @@ and the derived files apa7.ins, % | \centering|\par\vspace{-.5em} % | \begin{threeparttable}|\par % \item +% \DescribeMacro{\figurenote}|\figurenote|\marg{figure-note-text}: +% Formats figure note when placed immidiatly after |\includegraphic|, |\fitfigure|, or similar command within |\begin{figure}| and |\end{figure}|. +% \item % \DescribeMacro{\fitfigure}|\fitfigure|\oarg{height}\marg{eps-filename}: % Automatically fit a postscript figure; use instead of % |\includegraphics| @@ -1785,6 +1789,7 @@ and the derived files apa7.ins, % %============================================================= +\newcommand{\figurenote}[1]{\newline \small \textit{Note.} {#1}} % Code from theapa.sty @@ -3496,21 +3501,24 @@ and the derived files apa7.ins, \begin{document} \maketitle We begin with \textcite{Shotton1989}. We can also cite this work in -parenthesis, like this: \parencite{Shotton1989}. - -A three-author paper \parencite[e.g.,][]{Lassen2006} lists all -three authors for the first citation, then only the first author -on all subsequent citations \parencite{Lassen2006}. +parenthesis, like this: \parencite{Lassen2006}. Note the use of five heading levels throughout this demonstration Method section. \section{Method} \subsection{Participants} -We had a lot of people in this study. +We had a lot of people in this study, show in Figure \ref{fig:Figure1}. + +\begin{figure}[htbp] + \caption{This is my figure caption.} + \includegraphics[bb=0in 0in 2.5in 2.5in, height=1.4in, width=1.4in]{Figure1.pdf} + \figurenote{This is an awesome figure.} + \label{fig:Figure1} +\end{figure} \subsection{Materials} -Several materials were used for this project. Some of themwere +Several materials were used for this project. Some of them were already created for prior research. \subsubsection{Paper-and-Pencil Instrument} @@ -3675,6 +3683,7 @@ Table~\ref{tab:BasicTable} summarizes the data. \lipsum[15] \begin{figure} \caption{This is my first figure caption.} \includegraphics[bb=0in 0in 2.5in 2.5in, height=2.5in, width=2.5in]{Figure1.pdf} + \figurenote{This is a great figure.} \label{fig:Figure1} \end{figure} @@ -3700,6 +3709,7 @@ As shown in Figure~\ref{fig:Figure2}, these results are impressive. \lipsum[20] \begin{figure} \caption{This is my second figure caption.} \includegraphics[bb=0in 0in 2.5in 2.5in, height=2.5in, width=2.5in]{Figure1.pdf} + \figurenote{This is a great appendix figure.} \label{fig:Figure2} \end{figure} diff --git a/macros/latex/contrib/apa7/apa7.pdf b/macros/latex/contrib/apa7/apa7.pdf index 65bee10d57..c854fb9117 100644 Binary files a/macros/latex/contrib/apa7/apa7.pdf and b/macros/latex/contrib/apa7/apa7.pdf differ diff --git a/macros/latex/contrib/apa7/samples/longsample.pdf b/macros/latex/contrib/apa7/samples/longsample.pdf index 2d327622a4..e7ea5d3a3c 100644 Binary files a/macros/latex/contrib/apa7/samples/longsample.pdf and b/macros/latex/contrib/apa7/samples/longsample.pdf differ diff --git a/macros/latex/contrib/apa7/samples/shortsample.pdf b/macros/latex/contrib/apa7/samples/shortsample.pdf index 7a69897514..68e951e2c7 100644 Binary files a/macros/latex/contrib/apa7/samples/shortsample.pdf and b/macros/latex/contrib/apa7/samples/shortsample.pdf differ diff --git a/macros/latex/contrib/babel-contrib/portuges/README.md b/macros/latex/contrib/babel-contrib/portuges/README.md new file mode 100644 index 0000000000..c81d3294a8 --- /dev/null +++ b/macros/latex/contrib/babel-contrib/portuges/README.md @@ -0,0 +1,16 @@ +Portuguese 1.2r +-------------- + +This is the babel style for Portuguese. + +**This package is NOT being actively maintained, but bugs might +got fixed if you report them. If you want to take over maintenance +of this language style, please contact me at +http://www.texnia.com/contact.html .** + +Changes 1.2r +------------ + +Months are now lowercased in all 'dialects'. + + diff --git a/macros/latex/contrib/babel-contrib/portuges/portuges.dtx b/macros/latex/contrib/babel-contrib/portuges/portuges.dtx index 7797f12541..09ff720e40 100644 --- a/macros/latex/contrib/babel-contrib/portuges/portuges.dtx +++ b/macros/latex/contrib/babel-contrib/portuges/portuges.dtx @@ -1,7 +1,8 @@ % \iffalse meta-comment % -% Copyright 1989-2008 Johannes L. Braams and any individual authors -% listed elsewhere in this file. All rights reserved. +% Copyright 1989-2020 Johannes L. Braams, Javier Bezos, and any +% individual authors listed elsewhere in this file. All rights +% reserved. % % This file is part of the Babel system. % -------------------------------------- @@ -16,7 +17,7 @@ % % This work has the LPPL maintenance status "maintained". % -% The Current Maintainer of this work is Johannes Braams. +% The Current Maintainer of this work is Javier Bezos. % % The list of all files belonging to the Babel system is % given in the file `manifest.bbl. See also `legal.bbl' for additional @@ -36,19 +37,16 @@ %\ProvidesLanguage{portuges} %\fi %\ProvidesFile{portuges.dtx} - [2008/03/18 v1.2q Portuguese support from the babel system] + [2020/05/04 v1.2r Portuguese support from the babel system] %\iffalse %% File `portuges.dtx' %% Babel package for LaTeX version 2e -%% Copyright (C) 1989 - 2008 -%% by Johannes Braams, TeXniek +%% Copyright (C) 1989 - 2020 +%% by Johannes Braams, Javier Bezos % %% Portuguese Language Definition File -%% Copyright (C) 1989 - 2008 -%% by Johannes Braams, TeXniek -% -%% Please report errors to: J.L. Braams -%% babel at braams.cistron.nl +%% Copyright (C) 1989 - 2020 +%% by Johannes Braams, Javier Bezos % % This file is part of the babel system, it provides the source % code for the Portuguese language definition file. The Portuguese @@ -268,8 +266,8 @@ % \begin{macrocode} \@namedef{date\CurrentOption}{% \def\today{\number\day\space de\space\ifcase\month\or - Janeiro\or Fevereiro\or Mar\c{c}o\or Abril\or Maio\or Junho\or - Julho\or Agosto\or Setembro\or Outubro\or Novembro\or Dezembro% + janeiro\or fevereiro\or mar\c{c}o\or abril\or maio\or junho\or + julho\or agosto\or setembro\or outubro\or novembro\or dezembro% \fi \space de\space\number\year}} \else diff --git a/macros/latex/contrib/babel-contrib/portuges/portuges.ins b/macros/latex/contrib/babel-contrib/portuges/portuges.ins index e4e3c2e029..d8b04a27ed 100644 --- a/macros/latex/contrib/babel-contrib/portuges/portuges.ins +++ b/macros/latex/contrib/babel-contrib/portuges/portuges.ins @@ -3,8 +3,9 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright 1989-2008 Johannes L. Braams and any individual authors -%% listed elsewhere in this file. All rights reserved. +%% Copyright 1989-2020 Johannes L. Braams, Javier Bezos and any +%% individual authors listed elsewhere in this file. All rights +%% reserved. %% %% This file is part of the Babel system. %% -------------------------------------- @@ -19,7 +20,7 @@ %% %% This work has the LPPL maintenance status "maintained". %% -%% The Current Maintainer of this work is Johannes Braams. +%% The Current Maintainer of this work is Javier Bezos. %% %% The list of all files belonging to the LaTeX base distribution is %% given in the file `manifest.bbl. See also `legal.bbl' for additional @@ -31,7 +32,7 @@ %% %% --------------- start of docstrip commands ------------------ %% -\def\filedate{1999/04/11} +\def\filedate{2020/05/04} \def\batchfile{portuges.ins} \input docstrip.tex @@ -53,8 +54,8 @@ \declarepreamble\mainpreamble This is a generated file. -Copyright 1989-2008 Johannes L. Braams and any individual authors -listed elsewhere in this file. All rights reserved. +Copyright 1989-2020 Johannes L. Braams, Javier Bezos and any individual +authors listed elsewhere in this file. All rights reserved. This file was generated from file(s) of the Babel system. --------------------------------------------------------- @@ -69,7 +70,7 @@ version 2003/12/01 or later. This work has the LPPL maintenance status "maintained". -The Current Maintainer of this work is Johannes Braams. +The Current Maintainer of this work is Javier Bezos. This file may only be distributed together with a copy of the Babel system. You may however distribute the Babel system without @@ -87,8 +88,8 @@ extension .ins) which are part of the distribution. \declarepreamble\fdpreamble This is a generated file. -Copyright 1989-2008 Johannes L. Braams and any individual authors -listed elsewhere in this file. All rights reserved. +Copyright 1989-2020 Johannes L. Braams, Javier Bezos and any individual +authors listed elsewhere in this file. All rights reserved. This file was generated from file(s) of the Babel system. --------------------------------------------------------- @@ -103,7 +104,7 @@ version 2003/12/01 or later. This work has the LPPL maintenance status "maintained". -The Current Maintainer of this work is Johannes Braams. +The Current Maintainer of this work is Javier Bezos. This file may only be distributed together with a copy of the Babel system. You may however distribute the Babel system without @@ -127,6 +128,9 @@ of this file under its original name. \usepreamble\mainpreamble \generate{\file{portuges.ldf}{\from{portuges.dtx}{code}} + \file{portuguese.ldf}{\from{portuges.dtx}{code}} + \file{brazil.ldf}{\from{portuges.dtx}{code}} + \file{brazilian.ldf}{\from{portuges.dtx}{code}} } \usepreamble\fdpreamble diff --git a/macros/latex/contrib/babel-contrib/portuges/portuges.pdf b/macros/latex/contrib/babel-contrib/portuges/portuges.pdf index 05697c6b84..cb8bc27062 100644 Binary files a/macros/latex/contrib/babel-contrib/portuges/portuges.pdf and b/macros/latex/contrib/babel-contrib/portuges/portuges.pdf differ diff --git a/macros/latex/contrib/curve2e/README.txt b/macros/latex/contrib/curve2e/README.txt index d805a99f29..c938d9e12e 100644 --- a/macros/latex/contrib/curve2e/README.txt +++ b/macros/latex/contrib/curve2e/README.txt @@ -10,7 +10,7 @@ %% License information appended %% File README.txt for package curve2e - [2020-04-02 v.2.2.6 Extension package for pict2e] + [2020-05-03 v.2.2.8 Extension package for pict2e] The package bundle curve2e is composed of the following files curve2e.dtx @@ -33,21 +33,23 @@ Move curve2e.sty and curve2e-v161.sty to ROOT/tex/latex/curve2e/ Move README.txt to ROOT/doc/latex/curve2e/ curve2e.dtx is the documented TeX source file of the derived files -curve2e.sty, curve2e-v161.sty and README.txt. +curve2e.sty, curve2e.pdf, curve2e-v161.sty and README.txt. You get curve2e.sty, curve2e.pdf, curve2e-v161.sty, and README.txt by running pdflatex on curve2e.dtx. The curve2e-manual files contains the user manual; in -this way the long preliminary descriptive part has been transferred to -a shorter dedicated file, and the “normal” user should have enough -information to use the package. Th curve2e.pdf file, extracted from -the .dtx one, contains the code documentation and is intended for the -developers, or for the curious advanced users. For what concerns -curve2e-v161.sty is a previous version of this package; see below why -the older version might become necessary to the end user. +this way the long preliminary descriptive part of the previous versions +curve2e.pdf file has been transferred to shorter dedicated file, and the +“normal” user should have enough information to use the package. The +curve2e.pdf file, extracted from the .dtx one, contains the code +documentation and is intended for the developers, or for the curious +advanced users. For what concerns curve2e-v161.sty is a previous +version of this package; see below why the older version might become +necessary to the end user. README.txt, this file, contains general information. + This bundle contains also package curve2e-v161.sty, a roll-back version needed in certain rare cases. @@ -56,15 +58,15 @@ standard picture LaTeX environment according to what Leslie Lamport specified in the second edition of his LaTeX manual (1994). This further extension curve2e.sty to pict2e.sty allows to draw lines -and vectorsith any non integer slope parameters, to draw dashed and dotted -lines of any slope, to draw arcs and curved vectors, to draw curves where -just the interpolating nodes are specified together with the slopes at -such nodes; closed paths of any shape can be filled with color; all -coordinates are treated as ordered pairs, i.e. 'complex numbers'; -coordinates may be expressed also in polar form. Coordinates may be -specified with macros, so that editing any drawing is rendered much -simpler: any point specified with a macro is modified only once in -its macro definition. +and vectors with any non integer slope parameters, to draw dashed and +dotted lines of any slope, to draw arcs and curved vectors, to draw +curves where just the interpolating nodes are specified together with +the slopes at such nodes; closed paths of any shape can be filled with +color; all coordinates are treated as ordered pairs, i.e. 'complex +numbers'; coordinates may be expressed also in polar form. Coordinates +may be specified with macros, so that editing any drawing is rendered +much simpler: any point specified with a macro is modified only once +in its macro definition. Some of these features have been incorporated in the 2009 version of pict2e; therefore this package avoids any modification to the original pict2e commands. In any case the version of curve2e is compatible with diff --git a/macros/latex/contrib/curve2e/curve2e-manual.pdf b/macros/latex/contrib/curve2e/curve2e-manual.pdf index 9d0fc06c45..034014125e 100644 Binary files a/macros/latex/contrib/curve2e/curve2e-manual.pdf and b/macros/latex/contrib/curve2e/curve2e-manual.pdf differ diff --git a/macros/latex/contrib/curve2e/curve2e-manual.tex b/macros/latex/contrib/curve2e/curve2e-manual.tex index 23a35a8f85..87961a4cd9 100644 --- a/macros/latex/contrib/curve2e/curve2e-manual.tex +++ b/macros/latex/contrib/curve2e/curve2e-manual.tex @@ -1279,7 +1279,7 @@ Remember to delete all these subfolders if you decide to install a complete upda \multiput(50,50)(-15:5){11}{\polygon*(-1,-1)(1,-1)(1,1)(-1,1)} \end{picture} \end{minipage} -\caption{Some examples of the \meta{handler} optional argument}%\label{pag:multiput} +\caption{Some examples of the \meta{handler} optional argument}\label{pag:multiput} \end{figure} A new command |\xmultiput| (not available with the previous versions @@ -1331,14 +1331,14 @@ Remember to delete all these subfolders if you decide to install a complete upda \end{figure} \item This implementation of \pack{curve2e} includes an extension - to package |xfp|, in the sense that adds two more L3 commands: - |\fptest| and |\fpdowhile| to the two already contained and + to package |xfp|, in the sense that adds three more L3 commands: + |\fptest|, |\fpdowhile|, |fpwhiledo| to the two already contained and documented in the latter package. The syntax of such new commands is the following \begin{flushleft}\obeylines \cs{fptext}\marg{test}\marg{true}\marg{false} - and \cs{fpdowhile}\meta{test}\meta{operations to be repeated} + \cs{fpwhiledo}\meta{test}\meta{operations to be repeated} \end{flushleft} The macro |\fptest| requires two further arguments that contain what to do if the \meta{test} is true, and what to do if the @@ -1346,20 +1346,32 @@ Remember to delete all these subfolders if you decide to install a complete upda The \meta{test} is a logical expressions that connects math relation expressions, even floating point ones, by means of \emph{logical operators}; such operators are \verb+||+, \verb|&&|, and \verb|!|, - respectively for OR, AND, NOT; for example \verb|!<| means “not lower - than”, which is equivalent to “equal or grater than”. The logical - expression is parsed left to right and normal parentheses may be - used to alter this sequence. The logical operators work also - between logical variables, therefore the \meta{test} may contain - an interesting mixture of relation and logical operators. - - Before using |\fpdowhile| the arguments the \meta{test} depends - from must be set so that the test is true; during the execution + respectively for OR, AND, NOT; math relation expressions contain + relation operators, even negated ones: for example \verb|!<| means + “not lower than”, which is equivalent to “equal or grater than”, i.e. + \verb|=>|. The logical expression is parsed left to right and normal + parentheses may be used to alter this sequence. The logical operators + work also between logical variables, therefore the \meta{test} may + contain an interesting mixture of relation and logical operators. + + Before using |\fpdowhile| and |\fpwhiledo|the arguments of \meta{test} + depends on must be set so that the test is true; during the execution of the \meta{operations to be repeated} there must be some setting that eventually renders the \meta{test} false. The user should - pay attention to set the elements that \meta{test} depends from, + pay attention to set the elements that \meta{test} depends on, because the risk is to enter an infinite loop and end up with some error message stating that the working memory of the program is full. + Notice that |\fpdowhile| first puts the \meta{operations to be repeated} + into the work flow then checks the \meta{test} and possibly repeats the + cycle; on the opposite, |\fpwhiledo| first checks the \meta{test} then + possibly inserts the \meta{operations to be repeated} and cycles. + Evidently with the same \meta{test} the two while cycles produce + different results with a little, but important difference: if the input + data are macros defined by previous computations, there is no guarantee + that the \meta{test} is initially true; if it sis false, |fpwhiledo| + does not do anything, while |\fpdowhile| executes one cycle and produces + in the output stream something that might be nonsense. While cycles done + with |\fpwhiledo| should be safer and should be preferred. Nevertheless such commands are very useful also for drawing graphics; the |xmultiput| already makes use of such L3~functions. diff --git a/macros/latex/contrib/curve2e/curve2e.dtx b/macros/latex/contrib/curve2e/curve2e.dtx index a0e4bae20b..748a8e38d2 100644 --- a/macros/latex/contrib/curve2e/curve2e.dtx +++ b/macros/latex/contrib/curve2e/curve2e.dtx @@ -46,7 +46,7 @@ README.txt and curve2e-v161.sty. %<+package>\ProvidesPackage{curve2e}% %<+readme>File README.txt for package curve2e %<*package|readme> - [2020-04-02 v.2.2.6 Extension package for pict2e] + [2020-05-03 v.2.2.8 Extension package for pict2e] % %<*driver> \documentclass{ltxdoc}\errorcontextlines=9 @@ -183,7 +183,7 @@ README.txt and curve2e-v161.sty. % % \fi % -% \CheckSum{5594} +% \CheckSum{5598} % \begin{abstract} % This file documents the |curve2e| extension package to the |pict2e| % bundle implementation; the latter was described by Lamport @@ -554,9 +554,9 @@ README.txt and curve2e-v161.sty. } % \end{macrocode} % Since we already loaded package|xfp| or at least we explicitly load it -% in our preamble, we add, if not already defined by the package, the two -% new commands that allow to make floating point tests, and to implement -% a “while” cycle\footnote{Thanks to Brian Dunn who spotted a bug in +% in our preamble, we add, if not already defined by the package, three +% new commands that allow to make floating point tests, and two +% “while” cycles\footnote{Thanks to Brian Dunn who spotted a bug in % the previous 2.0.x version definitions.} % \begin{macrocode} % @@ -566,10 +566,14 @@ README.txt and curve2e-v161.sty. \fp_compare:nTF{#1}{#2}{#3}} \ProvideExpandableDocumentCommand\fpdowhile{m m}{% \fp_do_while:nn{#1}{#2}} +\ProvideExpandableDocumentCommand\fpwhiledo{m m}{% + \fp_while_do:nn{#1}{#2}} } \ExplSyntaxOff % \end{macrocode} +% The while cycles differ in the order of what they do; see the +% |interface3.pdf| documentation file for details. % % The next macros are just for debugging. With the \texttt{trace} package % it would probably be better to define other macros, but this is not for @@ -989,7 +993,9 @@ README.txt and curve2e-v161.sty. % original macros, but now the increments are computed within the while % loop, but outside the argument of the inner |\put| command. If the % optional \meta{handler} is specified the increments are computed -% from the macros specified by the user. +% from the macros specified by the user. Another new feature: the fourth +% argument, that contains the number of objects to be put in place, +% may be an integer expression such as for example |3*\N+1|. % % The two increments components inside the optional argument may be set % by means of mathematical expressions operated upon by the |\fpeval| @@ -1011,7 +1017,7 @@ README.txt and curve2e-v161.sty. {\put(#1){\let\c@multicnt\@multicnt \CopyVect #2 to \R \CopyVect#3 to\D - \@multicnt=#4\relax + \@multicnt=\inteval{#4}\relax \@whilenum \@multicnt > \z@\do{% \put(\R){#5}% \IfValueTF{#6}{#6}{\AddVect#3 and\R to \R}% diff --git a/macros/latex/contrib/curve2e/curve2e.pdf b/macros/latex/contrib/curve2e/curve2e.pdf index 21c403da84..81441253bd 100644 Binary files a/macros/latex/contrib/curve2e/curve2e.pdf and b/macros/latex/contrib/curve2e/curve2e.pdf differ -- cgit v1.2.3