diff options
22 files changed, 114 insertions, 59 deletions
diff --git a/Master/texmf-dist/doc/latex/acmart/README b/Master/texmf-dist/doc/latex/acmart/README index 0b833bdd1b8..b84560af246 100644 --- a/Master/texmf-dist/doc/latex/acmart/README +++ b/Master/texmf-dist/doc/latex/acmart/README @@ -12,6 +12,10 @@ The production version is the one on CTAN and ACM sites. Changes +Version 1.86. Empty country in affiliation now produces an error + Bug fixes + New samples for acmengage + Version 1.85. Bug fixes Added support for Creative Commons licenses (requires doclicense images) diff --git a/Master/texmf-dist/doc/latex/acmart/acmart.pdf b/Master/texmf-dist/doc/latex/acmart/acmart.pdf Binary files differindex 1ea8df54c44..d7d29d82795 100644 --- a/Master/texmf-dist/doc/latex/acmart/acmart.pdf +++ b/Master/texmf-dist/doc/latex/acmart/acmart.pdf diff --git a/Master/texmf-dist/doc/latex/acmart/acmguide.pdf b/Master/texmf-dist/doc/latex/acmart/acmguide.pdf Binary files differindex 2ad7f38b268..2c96654fa5f 100644 --- a/Master/texmf-dist/doc/latex/acmart/acmguide.pdf +++ b/Master/texmf-dist/doc/latex/acmart/acmguide.pdf diff --git a/Master/texmf-dist/doc/latex/acmart/samples/sample-acmengage.pdf b/Master/texmf-dist/doc/latex/acmart/samples/sample-acmengage.pdf Binary files differindex cd50ae2a4e6..f9caa582b95 100644 --- a/Master/texmf-dist/doc/latex/acmart/samples/sample-acmengage.pdf +++ b/Master/texmf-dist/doc/latex/acmart/samples/sample-acmengage.pdf diff --git a/Master/texmf-dist/doc/latex/acmart/samples/sample-acmengage.tex b/Master/texmf-dist/doc/latex/acmart/samples/sample-acmengage.tex index a6a504b1d06..861cdacde46 100644 --- a/Master/texmf-dist/doc/latex/acmart/samples/sample-acmengage.tex +++ b/Master/texmf-dist/doc/latex/acmart/samples/sample-acmengage.tex @@ -161,10 +161,16 @@ This section is included in the template to explain the choices for the meta-dat Current courses are: \begin{itemize} - \item CS0 -- a breadth first introductory computing course similar to Exploring Computer Science or AP CS Principles - \item CS1 -- an introductory programming course covering topics normally associated with an imperative or functional programming course. Similar to an AP CS A course - \item Data Structures -- a follow-on course occurring after CS1 that introduces linear and non-linear data structures including implementation and usage - \item Discrete Math -- a course covering discrete mathematical structures such as integers, graphs and logic statements. This may include logic, set theory, combinatorics, graphy theory, number theory, topology, etc. + \item CS0---a breadth first introductory computing course similar to Exploring Computer Science or AP CS Principles + \item CS1---an introductory programming course covering topics normally associated with an imperative or functional programming course. Similar to an AP CS A course + \item Data Structures---a follow-on course occurring after CS1 that introduces linear and non-linear data structures including implementation and usage + \item Discrete Math---a course covering discrete mathematical + structures such as integers, graphs and logic statements. This + may include logic, set theory, combinatorics, graphy theory, + number theory, topology, etc. + \item HCI---a course in the general area of human computer + interaction. This might be a general HCI course or a course in a + specific subdiscipline such as user-centred design. \end{itemize} More than one course may be selected. If you are submitting an OER for a special topics issue of Engage, please discuss the appropriate course choice with the guest editors of the special issue. @@ -191,12 +197,12 @@ Authors may select all that apply from the following list: One resource type must be selected. Current list to select from includes: \begin{itemize} - \item Assignment -- the most common OER type. Typically represents a task assigned to individual or groups of students that will be completed outside of class time. - \item Lecture slides -- an annotated set of presentation slides to introduce or explain a topic, typically a cutting-edge research topic, to a more lay audience. An example might be explaining a specific cryptography algorithm, blockchain, or an AI / ML solution to a problem. - \item Lab -- this represents a task assigned to an individual or group of students to be completed under supervision, usually during a closed-lab model - \item Project -- an assignment that is of a longer duration, perhaps multiple weeks to an entire term - \item Tutorial -- a task usually completed by an individual to learn some material on their own - \item Other -- any other type of OER that does not fit into one of the above categories + \item Assignment---the most common OER type. Typically represents a task assigned to individual or groups of students that will be completed outside of class time. + \item Lecture slides---an annotated set of presentation slides to introduce or explain a topic, typically a cutting-edge research topic, to a more lay audience. An example might be explaining a specific cryptography algorithm, blockchain, or an AI / ML solution to a problem. + \item Lab---this represents a task assigned to an individual or group of students to be completed under supervision, usually during a closed-lab model + \item Project---an assignment that is of a longer duration, perhaps multiple weeks to an entire term + \item Tutorial---a task usually completed by an individual to learn some material on their own + \item Other---any other type of OER that does not fit into one of the above categories \end{itemize} \subsection{CS Concepts} @@ -206,11 +212,11 @@ This is selectable from the ontology of topics found at \url{https://www.engage- Authors will select the most appropriate one from the following list: \begin{itemize} - \item Programming Concepts -- anything involving programming - \item Data Structures -- anything involving data structures - \item Software Development Methods -- if the OER centers around software development (i.e., requirements gathering, testing, maintenance, code reviews) rather than the actual programming content - \item Discrete Math -- anything involving discrete math - \item N/A -- not applicable + \item Programming Concepts---anything involving programming + \item Data Structures---anything involving data structures + \item Software Development Methods---if the OER centers around software development (i.e., requirements gathering, testing, maintenance, code reviews) rather than the actual programming content + \item Discrete Math---anything involving discrete math + \item N/A---not applicable \end{itemize} \subsection{Creative Commons License} diff --git a/Master/texmf-dist/doc/latex/acmart/samples/sample-acmlarge.pdf b/Master/texmf-dist/doc/latex/acmart/samples/sample-acmlarge.pdf Binary files differindex 63c033e8eab..1d17b01c8ee 100644 --- a/Master/texmf-dist/doc/latex/acmart/samples/sample-acmlarge.pdf +++ b/Master/texmf-dist/doc/latex/acmart/samples/sample-acmlarge.pdf diff --git a/Master/texmf-dist/doc/latex/acmart/samples/sample-acmsmall-biblatex.pdf b/Master/texmf-dist/doc/latex/acmart/samples/sample-acmsmall-biblatex.pdf Binary files differindex 8ca28a339b1..71f6045226d 100644 --- a/Master/texmf-dist/doc/latex/acmart/samples/sample-acmsmall-biblatex.pdf +++ b/Master/texmf-dist/doc/latex/acmart/samples/sample-acmsmall-biblatex.pdf diff --git a/Master/texmf-dist/doc/latex/acmart/samples/sample-acmsmall-conf.pdf b/Master/texmf-dist/doc/latex/acmart/samples/sample-acmsmall-conf.pdf Binary files differindex 7ce11c18ef1..72f5f4d98d3 100644 --- a/Master/texmf-dist/doc/latex/acmart/samples/sample-acmsmall-conf.pdf +++ b/Master/texmf-dist/doc/latex/acmart/samples/sample-acmsmall-conf.pdf diff --git a/Master/texmf-dist/doc/latex/acmart/samples/sample-acmsmall-submission.pdf b/Master/texmf-dist/doc/latex/acmart/samples/sample-acmsmall-submission.pdf Binary files differindex a669bf6e704..a01026bcb69 100644 --- a/Master/texmf-dist/doc/latex/acmart/samples/sample-acmsmall-submission.pdf +++ b/Master/texmf-dist/doc/latex/acmart/samples/sample-acmsmall-submission.pdf diff --git a/Master/texmf-dist/doc/latex/acmart/samples/sample-acmsmall.pdf b/Master/texmf-dist/doc/latex/acmart/samples/sample-acmsmall.pdf Binary files differindex 1d4570b8982..a966e4d2563 100644 --- a/Master/texmf-dist/doc/latex/acmart/samples/sample-acmsmall.pdf +++ b/Master/texmf-dist/doc/latex/acmart/samples/sample-acmsmall.pdf diff --git a/Master/texmf-dist/doc/latex/acmart/samples/sample-acmtog.pdf b/Master/texmf-dist/doc/latex/acmart/samples/sample-acmtog.pdf Binary files differindex 78e6c02e70c..d42901423d2 100644 --- a/Master/texmf-dist/doc/latex/acmart/samples/sample-acmtog.pdf +++ b/Master/texmf-dist/doc/latex/acmart/samples/sample-acmtog.pdf diff --git a/Master/texmf-dist/doc/latex/acmart/samples/sample-authordraft.pdf b/Master/texmf-dist/doc/latex/acmart/samples/sample-authordraft.pdf Binary files differindex a1894beb3ab..654952f224d 100644 --- a/Master/texmf-dist/doc/latex/acmart/samples/sample-authordraft.pdf +++ b/Master/texmf-dist/doc/latex/acmart/samples/sample-authordraft.pdf diff --git a/Master/texmf-dist/doc/latex/acmart/samples/sample-lualatex.pdf b/Master/texmf-dist/doc/latex/acmart/samples/sample-lualatex.pdf Binary files differindex 678fa91b4c4..a4885105351 100644 --- a/Master/texmf-dist/doc/latex/acmart/samples/sample-lualatex.pdf +++ b/Master/texmf-dist/doc/latex/acmart/samples/sample-lualatex.pdf diff --git a/Master/texmf-dist/doc/latex/acmart/samples/sample-manuscript.pdf b/Master/texmf-dist/doc/latex/acmart/samples/sample-manuscript.pdf Binary files differindex 1e4e320907a..7ab5447a4fc 100644 --- a/Master/texmf-dist/doc/latex/acmart/samples/sample-manuscript.pdf +++ b/Master/texmf-dist/doc/latex/acmart/samples/sample-manuscript.pdf diff --git a/Master/texmf-dist/doc/latex/acmart/samples/sample-sigconf-biblatex.pdf b/Master/texmf-dist/doc/latex/acmart/samples/sample-sigconf-biblatex.pdf Binary files differindex 830091259d5..5b32f3eb2f7 100644 --- a/Master/texmf-dist/doc/latex/acmart/samples/sample-sigconf-biblatex.pdf +++ b/Master/texmf-dist/doc/latex/acmart/samples/sample-sigconf-biblatex.pdf diff --git a/Master/texmf-dist/doc/latex/acmart/samples/sample-sigconf-i13n.pdf b/Master/texmf-dist/doc/latex/acmart/samples/sample-sigconf-i13n.pdf Binary files differindex d809b00c0cb..312f44903c2 100644 --- a/Master/texmf-dist/doc/latex/acmart/samples/sample-sigconf-i13n.pdf +++ b/Master/texmf-dist/doc/latex/acmart/samples/sample-sigconf-i13n.pdf diff --git a/Master/texmf-dist/doc/latex/acmart/samples/sample-sigconf.pdf b/Master/texmf-dist/doc/latex/acmart/samples/sample-sigconf.pdf Binary files differindex c2405c25d64..ee926cd1100 100644 --- a/Master/texmf-dist/doc/latex/acmart/samples/sample-sigconf.pdf +++ b/Master/texmf-dist/doc/latex/acmart/samples/sample-sigconf.pdf diff --git a/Master/texmf-dist/doc/latex/acmart/samples/sample-sigplan.pdf b/Master/texmf-dist/doc/latex/acmart/samples/sample-sigplan.pdf Binary files differindex 126b953ab3e..c77f003bafd 100644 --- a/Master/texmf-dist/doc/latex/acmart/samples/sample-sigplan.pdf +++ b/Master/texmf-dist/doc/latex/acmart/samples/sample-sigplan.pdf diff --git a/Master/texmf-dist/doc/latex/acmart/samples/sample-xelatex.pdf b/Master/texmf-dist/doc/latex/acmart/samples/sample-xelatex.pdf Binary files differindex 246ab3e7bed..77dcd18b8a4 100644 --- a/Master/texmf-dist/doc/latex/acmart/samples/sample-xelatex.pdf +++ b/Master/texmf-dist/doc/latex/acmart/samples/sample-xelatex.pdf diff --git a/Master/texmf-dist/doc/latex/acmart/samples/samples.dtx b/Master/texmf-dist/doc/latex/acmart/samples/samples.dtx index a6738fc8976..e5ab6b43991 100644 --- a/Master/texmf-dist/doc/latex/acmart/samples/samples.dtx +++ b/Master/texmf-dist/doc/latex/acmart/samples/samples.dtx @@ -1091,10 +1091,16 @@ This section is included in the template to explain the choices for the meta-dat Current courses are: \begin{itemize} - \item CS0 -- a breadth first introductory computing course similar to Exploring Computer Science or AP CS Principles - \item CS1 -- an introductory programming course covering topics normally associated with an imperative or functional programming course. Similar to an AP CS A course - \item Data Structures -- a follow-on course occurring after CS1 that introduces linear and non-linear data structures including implementation and usage - \item Discrete Math -- a course covering discrete mathematical structures such as integers, graphs and logic statements. This may include logic, set theory, combinatorics, graphy theory, number theory, topology, etc. + \item CS0---a breadth first introductory computing course similar to Exploring Computer Science or AP CS Principles + \item CS1---an introductory programming course covering topics normally associated with an imperative or functional programming course. Similar to an AP CS A course + \item Data Structures---a follow-on course occurring after CS1 that introduces linear and non-linear data structures including implementation and usage + \item Discrete Math---a course covering discrete mathematical + structures such as integers, graphs and logic statements. This + may include logic, set theory, combinatorics, graphy theory, + number theory, topology, etc. + \item HCI---a course in the general area of human computer + interaction. This might be a general HCI course or a course in a + specific subdiscipline such as user-centred design. \end{itemize} More than one course may be selected. If you are submitting an OER for a special topics issue of Engage, please discuss the appropriate course choice with the guest editors of the special issue. @@ -1121,12 +1127,12 @@ Authors may select all that apply from the following list: One resource type must be selected. Current list to select from includes: \begin{itemize} - \item Assignment -- the most common OER type. Typically represents a task assigned to individual or groups of students that will be completed outside of class time. - \item Lecture slides -- an annotated set of presentation slides to introduce or explain a topic, typically a cutting-edge research topic, to a more lay audience. An example might be explaining a specific cryptography algorithm, blockchain, or an AI / ML solution to a problem. - \item Lab -- this represents a task assigned to an individual or group of students to be completed under supervision, usually during a closed-lab model - \item Project -- an assignment that is of a longer duration, perhaps multiple weeks to an entire term - \item Tutorial -- a task usually completed by an individual to learn some material on their own - \item Other -- any other type of OER that does not fit into one of the above categories + \item Assignment---the most common OER type. Typically represents a task assigned to individual or groups of students that will be completed outside of class time. + \item Lecture slides---an annotated set of presentation slides to introduce or explain a topic, typically a cutting-edge research topic, to a more lay audience. An example might be explaining a specific cryptography algorithm, blockchain, or an AI / ML solution to a problem. + \item Lab---this represents a task assigned to an individual or group of students to be completed under supervision, usually during a closed-lab model + \item Project---an assignment that is of a longer duration, perhaps multiple weeks to an entire term + \item Tutorial---a task usually completed by an individual to learn some material on their own + \item Other---any other type of OER that does not fit into one of the above categories \end{itemize} \subsection{CS Concepts} @@ -1136,11 +1142,11 @@ This is selectable from the ontology of topics found at \url{https://www.engage- Authors will select the most appropriate one from the following list: \begin{itemize} - \item Programming Concepts -- anything involving programming - \item Data Structures -- anything involving data structures - \item Software Development Methods -- if the OER centers around software development (i.e., requirements gathering, testing, maintenance, code reviews) rather than the actual programming content - \item Discrete Math -- anything involving discrete math - \item N/A -- not applicable + \item Programming Concepts---anything involving programming + \item Data Structures---anything involving data structures + \item Software Development Methods---if the OER centers around software development (i.e., requirements gathering, testing, maintenance, code reviews) rather than the actual programming content + \item Discrete Math---anything involving discrete math + \item N/A---not applicable \end{itemize} \subsection{Creative Commons License} diff --git a/Master/texmf-dist/source/latex/acmart/acmart.dtx b/Master/texmf-dist/source/latex/acmart/acmart.dtx index dcb00ec66cd..da94d187c58 100644 --- a/Master/texmf-dist/source/latex/acmart/acmart.dtx +++ b/Master/texmf-dist/source/latex/acmart/acmart.dtx @@ -2142,7 +2142,7 @@ \ProvidesFile{acmart.dtx} %</gobble> %<class>\ProvidesClass{acmart} -[2022/05/10 v1.85 Typesetting articles for the Association for Computing Machinery] +[2022/06/26 v1.86 Typesetting articles for the Association for Computing Machinery] % \end{macrocode} % % \changes{v1.00}{2016/04/14}{First released version} @@ -6394,6 +6394,7 @@ % \changes{v1.43}{2017/07/11}{Added comma before country for journals} % \changes{v1.46}{2017/08/30}{Corrected spacing for institution} % \changes{v1.73}{2020/09/07}{Check the presence in affil} +% \changes{v1.86}{2022/06/26}{Error if country is empty} % Theoretically we can define the macros for \cs{affiliation} inside % the \cs{@mkauthors}-style commands. However, this would lead to a % strange error if an author uses them outside \cs{affiliation}. Of @@ -6408,7 +6409,9 @@ \def\city#1{\global\@ACM@citypresenttrue\unskip\ignorespaces} \def\state#1{\unskip\ignorespaces} \newcommand\department[2][0]{\unskip\ignorespaces} - \def\country#1{\global\@ACM@countrypresenttrue + \def\country#1{\StrDel{#1}{ }[\@tempa]% + \ifx\@tempa\@empty\else + \global\@ACM@countrypresenttrue\fi \if@ACM@affiliation@obeypunctuation\else, \fi#1\ignorespaces} \else \def\position#1{\if@ACM@affiliation@obeypunctuation#1\else#1\par\fi}% @@ -7257,7 +7260,9 @@ % \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} +% \changes{v1.76}{2021/02/21}{Fixed bug with no line numbers for +% nonacm} +% \changes{v1.86}{2022/06/26}{Special treatment of ACM Engage materials} % The page style for all pages but the first one % \begin{macrocode} \AtBeginDocument{% @@ -7320,12 +7325,20 @@ \fancyhead[LE]{\ACM@linecountL}% \fancyhead[RO]{\ACM@linecountR}% \else% - \fancyhead[LE]{\ACM@linecountL\@headfootfont\footnotesize - \acmConference@shortname, - \acmConference@date, \acmConference@venue}% - \fancyhead[RO]{\@headfootfont - \acmConference@shortname, - \acmConference@date, \acmConference@venue\ACM@linecountR}% + \if@ACM@engage + \fancyhead[LE]{\ACM@linecountL\@headfootfont\footnotesize + EngageCSEdu. \ifx\@acmDOI\@empty\else\@formatdoi{\@acmDOI}\fi}% + \fancyhead[RO]{\@headfootfont + EngageCSEdu. \ifx\@acmDOI\@empty\else\@formatdoi{\@acmDOI}\fi + \ACM@linecountR}% + \else + \fancyhead[LE]{\ACM@linecountL\@headfootfont\footnotesize + \acmConference@shortname, + \acmConference@date, \acmConference@venue}% + \fancyhead[RO]{\@headfootfont + \acmConference@shortname, + \acmConference@date, \acmConference@venue\ACM@linecountR}% + \fi \fi \fi \else % Proceedings @@ -7336,12 +7349,20 @@ \fancyhead[LE]{\ACM@linecountL}% \fancyhead[RO]{\ACM@linecountR}% \else% - \fancyhead[LE]{\ACM@linecountL\@headfootfont - \acmConference@shortname, - \acmConference@date, \acmConference@venue}% - \fancyhead[RO]{\@headfootfont - \acmConference@shortname, - \acmConference@date, \acmConference@venue\ACM@linecountR}% + \if@ACM@engage + \fancyhead[LE]{\ACM@linecountL\@headfootfont + EngageCSEdu. \ifx\@acmDOI\@empty\else\@formatdoi{\@acmDOI}\fi}% + \fancyhead[RO]{\@headfootfont + EngageCSEdu. \ifx\@acmDOI\@empty\else\@formatdoi{\@acmDOI}\fi + \ACM@linecountR}% + \else + \fancyhead[LE]{\ACM@linecountL\@headfootfont + \acmConference@shortname, + \acmConference@date, \acmConference@venue}% + \fancyhead[RO]{\@headfootfont + \acmConference@shortname, + \acmConference@date, \acmConference@venue\ACM@linecountR}% + \fi \fi \fi \if@ACM@sigchiamode diff --git a/Master/texmf-dist/tex/latex/acmart/acmart.cls b/Master/texmf-dist/tex/latex/acmart/acmart.cls index 0b2a9382d03..97a17e2e884 100644 --- a/Master/texmf-dist/tex/latex/acmart/acmart.cls +++ b/Master/texmf-dist/tex/latex/acmart/acmart.cls @@ -38,7 +38,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesClass{acmart} -[2022/05/10 v1.85 Typesetting articles for the Association for Computing Machinery] +[2022/06/26 v1.86 Typesetting articles for the Association for Computing Machinery] \def\@classname{acmart} \InputIfFileExists{acmart-preload-hook.tex}{% \ClassWarning{\@classname}{% @@ -2358,7 +2358,9 @@ \def\city#1{\global\@ACM@citypresenttrue\unskip\ignorespaces} \def\state#1{\unskip\ignorespaces} \newcommand\department[2][0]{\unskip\ignorespaces} - \def\country#1{\global\@ACM@countrypresenttrue + \def\country#1{\StrDel{#1}{ }[\@tempa]% + \ifx\@tempa\@empty\else + \global\@ACM@countrypresenttrue\fi \if@ACM@affiliation@obeypunctuation\else, \fi#1\ignorespaces} \else \def\position#1{\if@ACM@affiliation@obeypunctuation#1\else#1\par\fi}% @@ -2844,12 +2846,20 @@ \fancyhead[LE]{\ACM@linecountL}% \fancyhead[RO]{\ACM@linecountR}% \else% - \fancyhead[LE]{\ACM@linecountL\@headfootfont\footnotesize - \acmConference@shortname, - \acmConference@date, \acmConference@venue}% - \fancyhead[RO]{\@headfootfont - \acmConference@shortname, - \acmConference@date, \acmConference@venue\ACM@linecountR}% + \if@ACM@engage + \fancyhead[LE]{\ACM@linecountL\@headfootfont\footnotesize + EngageCSEdu. \ifx\@acmDOI\@empty\else\@formatdoi{\@acmDOI}\fi}% + \fancyhead[RO]{\@headfootfont + EngageCSEdu. \ifx\@acmDOI\@empty\else\@formatdoi{\@acmDOI}\fi + \ACM@linecountR}% + \else + \fancyhead[LE]{\ACM@linecountL\@headfootfont\footnotesize + \acmConference@shortname, + \acmConference@date, \acmConference@venue}% + \fancyhead[RO]{\@headfootfont + \acmConference@shortname, + \acmConference@date, \acmConference@venue\ACM@linecountR}% + \fi \fi \fi \else % Proceedings @@ -2860,12 +2870,20 @@ \fancyhead[LE]{\ACM@linecountL}% \fancyhead[RO]{\ACM@linecountR}% \else% - \fancyhead[LE]{\ACM@linecountL\@headfootfont - \acmConference@shortname, - \acmConference@date, \acmConference@venue}% - \fancyhead[RO]{\@headfootfont - \acmConference@shortname, - \acmConference@date, \acmConference@venue\ACM@linecountR}% + \if@ACM@engage + \fancyhead[LE]{\ACM@linecountL\@headfootfont + EngageCSEdu. \ifx\@acmDOI\@empty\else\@formatdoi{\@acmDOI}\fi}% + \fancyhead[RO]{\@headfootfont + EngageCSEdu. \ifx\@acmDOI\@empty\else\@formatdoi{\@acmDOI}\fi + \ACM@linecountR}% + \else + \fancyhead[LE]{\ACM@linecountL\@headfootfont + \acmConference@shortname, + \acmConference@date, \acmConference@venue}% + \fancyhead[RO]{\@headfootfont + \acmConference@shortname, + \acmConference@date, \acmConference@venue\ACM@linecountR}% + \fi \fi \fi \if@ACM@sigchiamode |