diff --git a/paper/ACM-Reference-Format.bst b/paper/ACM-Reference-Format.bst
index f955c84baa272b4fc432a95f8d88659e5b517dce..d65cd699aebf2d64d82435251bd486baa5337c07 100644
--- a/paper/ACM-Reference-Format.bst
+++ b/paper/ACM-Reference-Format.bst
@@ -1456,14 +1456,16 @@ FUNCTION { format.articleno.numpages }
%% numpages, pages -> "pages-value"
%% numpages -> "numpages-value"
%% pages -> "pages-value"
+ %%
+ %% We no longer issue warninig when missing articleno, but having numpages
articleno empty.or.unknown eid empty.or.unknown and
{
- numpages empty.or.unknown
- { }
- { "numpages field, but no articleno or eid field, in "
- cite$ * warning$ }
- if$
+%% numpages empty.or.unknown
+%% { }
+%% { "numpages field, but no articleno or eid field, in "
+%% cite$ * warning$ }
+%% if$
""
}
{
@@ -2889,4 +2891,4 @@ FUNCTION { end.bib }
writeln
}
-EXECUTE {end.bib}
\ No newline at end of file
+EXECUTE {end.bib}
diff --git a/paper/acmart.cls b/paper/acmart.cls
index 403b13f86575825d28438845fa0a169591505d3b..ba7eddbd85f125651ac9823725240f863fa9744c 100644
--- a/paper/acmart.cls
+++ b/paper/acmart.cls
@@ -20,6 +20,7 @@
%% original source files, as listed above, are part of the
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
+
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -37,6 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{acmart}
+<<<<<<< HEAD
[2018/05/09 v1.54 Typesetting articles for the Association for
Computing Machinery, modified to add a 'nonacm' option -- see
https://github.com/borisveytsman/acmart/pull/282.
@@ -45,6 +47,10 @@ You may obtain the source of this modified version at
and the original version at
https://github.com/borisveytsman/acmart/.
]
+=======
+[2018/10/20 v1.55 Typesetting articles for the Association for
+Computing Machinery]
+>>>>>>> update acmart, use correct titlecase
\def\@classname{acmart}
\InputIfFileExists{acmart-preload-hook.tex}{%
\ClassWarning{\@classname}{%
@@ -266,7 +272,7 @@ and the original version at
\def\@tempb{compress}\ifx\@tempa\@tempb
\def\NAT@cmprs{\@ne}\fi
\def\@tempb{nocompress}\ifx\@tempa\@tempb
- \def\NAT@cmprs{\@z}\fi
+ \def\NAT@cmprs{\z@}\fi
\def\@tempb{sort&compress}\ifx\@tempa\@tempb
\def\NAT@sort{\@ne}\def\NAT@cmprs{\@ne}\fi
\def\@tempb{mcite}\ifx\@tempa\@tempb
@@ -428,6 +434,32 @@ and the original version at
\def\l@section{\@tocline{1}{0pt}{1pc}{2pc}{}}
\def\l@subsection{\@tocline{2}{0pt}{1pc}{3pc}{}}
\def\l@subsubsection{\@tocline{2}{0pt}{1pc}{5pc}{}}
+\def\@makefntext{\noindent\@makefnmark}
+\if@ACM@sigchiamode
+\long\def\@footnotetext#1{\marginpar{%
+ \reset@font\small
+ \interlinepenalty\interfootnotelinepenalty
+ \protected@edef\@currentlabel{%
+ \csname p@footnote\endcsname\@thefnmark
+ }%
+ \color@begingroup
+ \@makefntext{%
+ \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
+ \color@endgroup}}%
+\fi
+\long\def\@mpfootnotetext#1{%
+ \global\setbox\@mpfootins\vbox{%
+ \unvbox\@mpfootins
+ \reset@font\footnotesize
+ \hsize\columnwidth
+ \@parboxrestore
+ \protected@edef\@currentlabel
+ {\csname p@mpfootnote\endcsname\@thefnmark}%
+ \color@begingroup\centering
+ \@makefntext{%
+ \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
+ \color@endgroup}}
+\def\@makefnmark{\hbox{\@textsuperscript{\normalfont\@thefnmark}}}
\let\@footnotemark@nolink\@footnotemark
\let\@footnotetext@nolink\@footnotetext
\RequirePackage[bookmarksnumbered,unicode]{hyperref}
@@ -454,13 +486,15 @@ and the original version at
\AtEndPreamble{%
\if@ACM@screen
\hypersetup{colorlinks,
- linkcolor=ACMRed,
+ linkcolor=ACMPurple,
citecolor=ACMPurple,
urlcolor=ACMDarkBlue,
filecolor=ACMDarkBlue}
\else
\hypersetup{hidelinks}
- \fi}
+ \fi
+ \hypersetup{pdflang={English},
+ pdfdisplaydoctitle}}
\if@ACM@natbib
\let\citeN\cite
\let\cite\citep
@@ -604,32 +638,6 @@ and the original version at
\color@endgroup
\egroup
\expandafter\@iiiparbox\@mpargs{\unvbox\@tempboxa}}
-\def\@makefntext{\noindent\@makefnmark}
-\if@ACM@sigchiamode
-\long\def\@footnotetext#1{\marginpar{%
- \reset@font\small
- \interlinepenalty\interfootnotelinepenalty
- \protected@edef\@currentlabel{%
- \csname p@footnote\endcsname\@thefnmark
- }%
- \color@begingroup
- \@makefntext{%
- \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
- \color@endgroup}}%
-\fi
-\long\def\@mpfootnotetext#1{%
- \global\setbox\@mpfootins\vbox{%
- \unvbox\@mpfootins
- \reset@font\footnotesize
- \hsize\columnwidth
- \@parboxrestore
- \protected@edef\@currentlabel
- {\csname p@mpfootnote\endcsname\@thefnmark}%
- \color@begingroup\centering
- \@makefntext{%
- \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
- \color@endgroup}}
-\def\@makefnmark{\hbox{\@textsuperscript{\normalfont\@thefnmark}}}
\def\@textbottom{\vskip \z@ \@plus 1pt}
\let\@texttop\relax
\RequirePackage{iftex}
@@ -639,9 +647,9 @@ and the original version at
\pdfglyphtounicode{f_f_i}{FB03}
\pdfglyphtounicode{f_f_l}{FB04}
\pdfglyphtounicode{f_i}{FB01}
-\pdfglyphtounicode{t_t}{00740074}
-\pdfglyphtounicode{f_t}{00660074}
-\pdfglyphtounicode{T_h}{00540068}
+\pdfglyphtounicode{t_t}{0074 0074}
+\pdfglyphtounicode{f_t}{0066 0074}
+\pdfglyphtounicode{T_h}{0054 0068}
\pdfgentounicode=1
\fi
\RequirePackage{cmap}
@@ -657,6 +665,7 @@ and the original version at
have the newtxmath package installed. Please upgrade your
TeX}\@ACM@newfontsfalse}
\if@ACM@newfonts
+ \RequirePackage[T1]{fontenc}
\ifxetex
\RequirePackage[tt=false]{libertine}
\else
@@ -664,9 +673,6 @@ and the original version at
\fi
\RequirePackage[varqu]{zi4}
\RequirePackage[libertine]{newtxmath}
-\ifxetex\else
- \RequirePackage[T1]{fontenc}
-\fi
\fi
\let\liningnums\@undefined
\AtEndPreamble{%
@@ -697,9 +703,13 @@ and the original version at
\or % sigchi
\captionsetup[figure]{labelfont={bf, small},
textfont={bf, small}}
+ \captionsetup[table]{labelfont={bf, small},
+ textfont={bf, small}}
\or % sigchi-a
\captionsetup[figure]{labelfont={bf, small},
textfont={bf, small}}
+ \captionsetup[table]{labelfont={bf, small},
+ textfont={bf, small}}
\fi
\fi
\newfloat{sidebar}{}{sbar}
@@ -1132,7 +1142,9 @@ and the original version at
\fi
\ifx\addresses\@empty
\if@ACM@anonymous
- \gdef\addresses{\@author{Anonymous Author(s)}}%
+ \gdef\addresses{\@author{Anonymous Author(s)%
+ \ifx\@acmSubmissionID\@empty\else\\Submission Id:
+ \@acmSubmissionID\fi}}%
\gdef\authors{Anonymous Author(s)}%
\else
\gdef\addresses{\@author{#2}}%
@@ -1146,7 +1158,9 @@ and the original version at
\fi
\if@ACM@anonymous
\ifx\shortauthors\@empty
- \gdef\shortauthors{Anon.}%
+ \gdef\shortauthors{Anon.
+ \ifx\@acmSubmissionID\@empty\else Submission Id:
+ \@acmSubmissionID\fi}%
\fi
\else
\def\@tempa{#1}%
@@ -1596,9 +1610,6 @@ and the original version at
\let\@footnotemark\@footnotemark@nolink
\let\@footnotetext\@footnotetext@nolink
\renewcommand\thefootnote{\@fnsymbol\c@footnote}%
- \global\@topnum\z@ % this prevents floats from falling
- % at the top of page 1
- \global\@botnum\z@ % we do not want them to be on the bottom either
\hsize=\textwidth
\def\@makefnmark{\hbox{\@textsuperscript{\@thefnmark}}}%
\@mktitle\if@ACM@sigchiamode\else\@mkauthors\fi\@mkteasers
@@ -1701,8 +1712,6 @@ and the original version at
\@mkbibcitation
\fi
\hypersetup{%
- pdflang={English},
- pdfdisplaydoctitle,
pdfauthor={\authors},
pdftitle={\@title},
pdfsubject={\@concepts},
@@ -1711,6 +1720,9 @@ and the original version at
\csname ver@acmart.cls\endcsname\space
and hyperref
\csname ver@hyperref.sty\endcsname}}%
+ \global\@topnum\z@ % this prevents floats from falling
+ % at the top of page 1
+ \global\@botnum\z@ % we do not want them to be on the bottom either
\@printendtopmatter
\@afterindentfalse
\@afterheading
@@ -2156,7 +2168,7 @@ and the original version at
\if@ACM@journal
\everypar{\setbox\z@\lastbox\everypar{}}\small
\else
- \section*{Abstract}%
+ \section*{\abstractname}%
\fi
\ignorespaces\@abstract\par}%
\fi\egroup}
@@ -2170,7 +2182,8 @@ and the original version at
\def\@article@string{\ifx\@acmArticle\@empty{\ }\else,
Article~\@acmArticle\ \fi}%
\par\medskip\small\noindent{\bfseries ACM Reference Format:}\par\nobreak
- \noindent\authors. \@acmYear. \@title
+ \noindent\bgroup
+ \def\\{\unskip{}, \ignorespaces}\authors\egroup. \@acmYear. \@title
\ifx\@subtitle\@empty. \else: \@subtitle. \fi
\if@ACM@nonacm\else
% The 'nonacm' option disables 'printacmref' by default,
@@ -2242,7 +2255,11 @@ and the original version at
Page \thepage\ of \@startPage--\pageref*{TotPages}.%
}
\fi
-\def\@shortauthors{\if@ACM@anonymous Anon.\else\shortauthors\fi}
+\def\@shortauthors{%
+ \if@ACM@anonymous
+ Anon.
+ \ifx\@acmSubmissionID\@empty\else Submission Id: \@acmSubmissionID\fi
+ \else\shortauthors\fi}
\def\@headfootfont{\sffamily}
\fancypagestyle{standardpagestyle}{%
\fancyhf{}%
@@ -2416,26 +2433,56 @@ and the original version at
\let\ps@myheadings\ACM@ps@myheadings
\let\ps@headings\ACM@ps@headings}
\AtBeginDocument{\ACM@restore@pagestyle}
+\def\ACM@NRadjust#1{%
+ \begingroup
+ \expandafter\ifx\csname Sectionformat\endcsname\relax
+ % do nothing when \Sectionformat is unknown
+ \def\next{\endgroup #1}%
+ \else
+ \def\next{\endgroup
+ \let\realSectionformat\Sectionformat
+ \def\ACM@sect@format@{#1}%
+ \let\Sectionformat\ACM@NR@adjustedSectionformat
+ %% next lines added 2018-06-17 to ensure section number is styled
+ \let\real@adddotafter\@adddotafter
+ \let\@adddotafter\ACM@adddotafter
+ #1{}% imposes the styles, but nullifies \MakeUppercase
+ \let\@adddotafter\real@adddotafter
+ }%
+ \fi \next
+}
+\def\ACM@NR@adjustedSectionformat#1#2{%
+ \realSectionformat{\ACM@sect@format{#1}}{#2}%
+ \let\Sectionformat\realSectionformat}
+\DeclareRobustCommand{\ACM@sect@format}{\ACM@sect@format@}
+\def\ACM@sect@format@null#1{#1}
+\let\ACM@sect@format@\ACM@sect@format@null
+\AtBeginDocument{%
+ \expandafter\ifx\csname LTX@adddotafter\endcsname\relax
+ \let\LTX@adddotafter\@adddotafter
+ \fi
+}
+\def\ACM@adddotafter#1{\ifx\relax#1\relax\else\LTX@adddotafter{#1}\fi}
\renewcommand\section{\@startsection{section}{1}{\z@}%
{-.75\baselineskip \@plus -2\p@ \@minus -.2\p@}%
{.25\baselineskip}%
- {\@secfont}}
+ {\ACM@NRadjust\@secfont}}
\renewcommand\subsection{\@startsection{subsection}{2}{\z@}%
{-.75\baselineskip \@plus -2\p@ \@minus -.2\p@}%
{.25\baselineskip}%
- {\@subsecfont}}
-\renewcommand\subsubsection{\@startsection{subsubsection}{3}{10pt}%
+ {\ACM@NRadjust\@subsecfont}}
+\renewcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}%
{-.5\baselineskip \@plus -2\p@ \@minus -.2\p@}%
{-3.5\p@}%
- {\@subsubsecfont\@adddotafter}}
+ {\ACM@NRadjust{\@subsubsecfont\@adddotafter}}}
\renewcommand\paragraph{\@startsection{paragraph}{4}{\parindent}%
{-.5\baselineskip \@plus -2\p@ \@minus -.2\p@}%
{-3.5\p@}%
- {\@parfont\@adddotafter}}
+ {\ACM@NRadjust{\@parfont\@adddotafter}}}
\renewcommand\part{\@startsection{part}{9}{\z@}%
{-10\p@ \@plus -4\p@ \@minus -2\p@}%
{4\p@}%
- {\@parfont}}
+ {\ACM@NRadjust\@parfont}}
\def\section@raggedright{\@rightskip\@flushglue
\rightskip\@rightskip
\leftskip\z@skip
diff --git a/paper/gtt.tex b/paper/gtt.tex
index ac2408dc98ed27ba49a8a4bc9e801f447e1ec58c..d9c6f24d9a698f5e26397cb8f4e759ba57df66c9 100644
--- a/paper/gtt.tex
+++ b/paper/gtt.tex
@@ -2421,7 +2421,7 @@ which is true by downcast left.
\end{longproof}
\end{longonly}
-\subsection{Type-generic Properties of Casts}
+\subsection{Type-Generic Properties of Casts}
The universal property axioms for upcasts and downcasts in
Figure~\ref{fig:gtt-term-dyn-axioms} define them \emph{uniquely} up to
@@ -4253,7 +4253,7 @@ By composing these, we get a model of GTT where equidynamism is sound
for observational equivalence and an operational semantics that
satisfies the graduality theorem.
-\subsection{Call-by-push-value}
+\subsection{Call-by-Push-Value}
\label{sec:cbpvstar}
Next, we define the call-by-push-value language \cbpvstar\ that will be
@@ -4748,7 +4748,7 @@ type is booleans $1+1$), we can restrict the dynamic types as follows:
\end{definition}
\end{longonly}
-\subsubsection{Scheme-like Dynamic Type Interpretation}
+\subsubsection{Scheme-Like Dynamic Type Interpretation}
The above dynamic type interpretation does not correspond to any
dynamically typed language used in practice, in part because it
@@ -4797,7 +4797,7 @@ of the booleans, say $\texttt{true}$.
%
This leads to the following definition:
-\begin{definition}[Scheme-like Dynamic Type Interpretation] \label{def:scheme-like-type-interp}
+\begin{definition}[Scheme-Like Dynamic Type Interpretation] \label{def:scheme-like-type-interp}
We can define a dynamic type interpretation with the following type
isomorphisms:
\begin{mathpar}
@@ -7844,7 +7844,7 @@ By composition with the axiomatic graduality theorem, this establishes
the \emph{operational graduality} theorem, i.e., a theorem analogous
to the \emph{dynamic gradual guarantee}~\cite{refined}.
-\subsection{Call-by-push-value operational semantics}
+\subsection{Call-by-Push-Value Operational Semantics}
We use a small-step operational semantics for CBPV
\ifshort