Merge tag 'v7.0' into my-changes-rebased

scribble-doc/scribblings/scribble/acmart.scrbl

@@ -34,6 +34,9 @@ Example:
 @defidform[sigplan]
 @defidform[sigchi]
 @defidform[sigchi-a]
+@defidform[dtrap]
+@defidform[tiot]
+@defidform[tdsci]
 )]{
 
 Enables the given document format. Use the format only on the same

scribble-doc/scribblings/scribble/base.scrbl

@@ -261,7 +261,8 @@ Returns @racket[#t] if @racket[v] is an item produced by
                   [#:sep sep (or/c block? content? #f) #f]
                   [#:column-properties column-properties (listof any/c) '()]
                   [#:row-properties row-properties (listof any/c) '()]
-                  [#:cell-properties cell-properties (listof (listof any/c)) '()])
+                  [#:cell-properties cell-properties (listof (listof any/c)) '()]
+                  [#:sep-properties sep-properties (or/c list? #f) #f])
          table?]{
 
 Creates a @tech{table} with the given @racket[cells] content, which is
@@ -276,11 +277,11 @@ cell in a row.
 The @racket[style] argument is handled the same as @racket[para].
 See @racket[table] for a list of recognized @tech{style names} and @tech{style properties}.
 
-If @racket[sep] is not @racket[#f], it is inserted as a new column
+The default style places no space between table columns. If
-between every column in the table; note that any
+@racket[sep] is not @racket[#f], it is inserted as a new column
-@racket[table-columns] or @racket[table-cells] property in
+between every column in the table; the new column's properties are the
-@racket[style] must take the added columns into account. Otherwise,
+same as the preceding column's, unless @racket[sep-properties]
-the default style places no space between table columns. When @racket[sep]
+provides a list of @tech{style properties} to use. When @racket[sep]
 would be placed before a @racket['cont], a @racket['cont] is inserted,
 instead.
 
@@ -343,7 +344,10 @@ properties will be used from the merger into @racket[table-cells].}
                                @racket[#:row-properties],
                                and @racket[#:cell-properties] arguments.}
          #:changed "1.12" @elem{Changed @racket[sep] insertion before a
-                                @racket['cont].}]
+                                @racket['cont].}
+         #:changed "1.28" @elem{Added @racket[sep-properties] and made
+                                the preceding column's properties used
+                                consistently if not specified.}]
 
 Examples:
 @codeblock[#:keep-lang-line? #f]|{

scribble-doc/scribblings/scribble/lp.scrbl

@@ -69,6 +69,15 @@ a @racket[doc] submodule that is expanded (so that the content is
 effectively re-expanded). The @racketidfont{doc} submodule is declared
 with @racket[module*].
 
+To include a @racketmodname[scribble/lp2] document named
+ @filepath{file.scrbl} into another Scribble document,
+ import the @racketidfont{doc} submodule:
+
+@codeblock[#:keep-lang-line? #false]|{
+  #lang scribble/manual
+  @include-section[(submod "file.scrbl" doc)]
+}|
+
 @history[#:added "1.8"
          #:changed "1.17" @elem{Declared the @racketidfont{doc} submodule with
                                 @racket[module*] instead of @racket[module].}]
@@ -127,8 +136,8 @@ used.
 @defmodule[scribble/lp-include]{The
 @racketmodname[scribble/lp-include] library is normally used within a
 Scribble document---that is, a module that starts with something like
-@racket[#, @hash-lang[] @racketmodname[scribble/base]] or @racket[#, @hash-lang[]
+@hash-lang[] @racketmodname[scribble/base] or @hash-lang[] @racketmodname[scribble/manual],
-@racketmodname[scribble/manual]], instead of @racket[#, @hash-lang[] @racketmodname[racket]].}
+instead of @hash-lang[] @racketmodname[racket].}
 
 @defform[(lp-include filename)]{
 Includes the source of @racket[filename] as the typeset version of the literate

scribble-doc/scribblings/scribble/manual.scrbl

@@ -106,7 +106,7 @@ for-label bindings in the lexical environment of the syntax object
 provided by @racket[context-expr]. The default @racket[context-expr]
 has the same lexical context as the first @racket[str-expr].
 When @racket[line-number-expr] is true, line number is enabled starting 
-from @racket[line-number-expr], and @racket[line-number-sep] controls
+from @racket[line-number-expr], and @racket[line-number-sep-expr] controls
 the separation (in spaces; defaults to 1) between the line numbers and
 code.
 

scribble-doc/scribblings/scribble/reader-internals.scrbl

@@ -163,7 +163,7 @@ reports @racket["Hello, friend."].
 
 In addition to configuring the reader for a module body,
 @racketmodname[at-exp] attaches a run-time configuration annotation to
-the module, so that it if it used as the main module, the
+the module, so that if it used as the main module, the
 @racket[current-read-interaction] parameter is adjusted to use the
 @seclink["reader"]{@"@"-reader} readtable extension.
 

scribble-lib/info.rkt

@@ -23,4 +23,4 @@
 
 (define pkg-authors '(mflatt eli))
 
-(define version "1.27")
+(define version "1.28")

scribble-lib/scribble/acmart.rkt

@@ -9,6 +9,7 @@
          scribble/html-properties
          scribble/latex-properties
          scribble/private/tag
+         scribble/private/lang-parameters
          (for-syntax racket/base))
 
 (struct affiliation (position institution street-address city state postcode country)
@@ -86,7 +87,8 @@
   (->* () () #:rest (listof pre-content?)
        any/c)])
 (provide
-  invisible-element-to-collect-for-acmart-extras)
+  invisible-element-to-collect-for-acmart-extras
+  include-abstract)
 
 (define-syntax-rule (defopts name ...)
   (begin (define-syntax (name stx)
@@ -131,7 +133,8 @@
     ...))
 
 ; format options
-(defopts manuscript acmsmall acmlarge acmtog sigconf siggraph sigplan sigchi sigchi-a)
+(defopts manuscript acmsmall acmlarge acmtog sigconf siggraph sigplan sigchi sigchi-a
+  dtrap pacmcgit tiot tdsci)
 ; boolean options
 (defopts review screen natbib anonymous authorversion 9pt 10pt 11pt 12pt)
 
@@ -159,6 +162,20 @@
    abstract-style
    (decode-flow strs)))
 
+(define (extract-abstract p)
+  (unless (part? p)
+    (error 'include-abstract "doc binding is not a part: ~e" p))
+  (unless (null? (part-parts p))
+    (error 'include-abstract "abstract part has sub-parts: ~e" (part-parts p)))
+  (when (part-title-content p)
+    (error 'include-abstract "abstract part has title content: ~e" (part-title-content p)))
+  (part-blocks p))
+
+(define-syntax-rule (include-abstract mp)
+  (begin
+    (require (only-in mp [doc abstract-doc]))
+    (make-nested-flow abstract-style (extract-abstract abstract-doc))))
+
 (define (acmConference name date venue)
   (make-paragraph (make-style 'pretitle '())
                   (make-multiarg-element (make-style "acmConference" multicommand-props)
@@ -392,3 +409,7 @@
 
 ; FIXME: theorem styles
 
+(default-figure-label-text (make-element 'sf "Fig."))
+(default-figure-label-sep ". ")
+(default-figure-caption-style 'sf)
+(default-figure-counter-style 'sf)

scribble-lib/scribble/acmart/acmart-load.tex

@@ -3,6 +3,8 @@
 % Avoid package option conflict
 \renewcommand\packageColor\relax
 \renewcommand\packageTocstyle\relax
+\renewcommand\packageMathabx{\ifx\bigtimes\undefined \usepackage{mathabx} \else \relax \fi}
+% Both 'mathabx' and 'newtxmath' (required by the 'acmart' class) define a '\bigtimes' command. 
 \let\Footnote\undefined
 \let\captionwidth\undefined
 \renewcommand{\renewrmdefault}{}

scribble-lib/scribble/acmart/acmart.cls

@@ -37,7 +37,7 @@
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{acmart}
-[2017/09/16 v1.48 Typesetting articles for the Association for
+[2018/04/14 v1.53 Typesetting articles for the Association for
 Computing Machinery]
 \def\@classname{acmart}
 \InputIfFileExists{acmart-preload-hook.tex}{%
@@ -199,22 +199,6 @@ Computing Machinery]
 \ClassInfo{\@classname}{Using fontsize \ACM@fontsize}
 \LoadClass[\ACM@fontsize, reqno]{amsart}
 \RequirePackage{microtype}
-\ifcase\ACM@format@nr
- \relax % manuscript
- \or % acmsmall
- \or % acmlarge
- \or % acmtog
-   \RequirePackage{flushend}
- \or % sigconf
-   \RequirePackage{flushend}
- \or % siggraph
-   \RequirePackage{flushend}
- \or % sigplan
-   \RequirePackage{flushend}
- \or % sigchi
-   \RequirePackage{flushend}
- \or % sigchi-a
-\fi
 \RequirePackage{etoolbox}
 \RequirePackage{refcount}
 \RequirePackage{totpages}
@@ -465,7 +449,6 @@ Computing Machinery]
   \let\citeANP\citeauthor
   \let\citeNN\citeyearpar
   \let\citeyearNP\citeyear
-  \let\citeyear\citeyearpar
   \let\citeNP\citealt
   \DeclareRobustCommand\citeA
      {\begingroup\NAT@swafalse
@@ -477,7 +460,7 @@ Computing Machinery]
     \providecommand\citename[1]{#1}}
 \fi
 \newcommand\shortcite[2][]{%
-  \ifNAT@numbers\cite[#1]{#2}\else\citeyear[#1]{#2}\fi}
+  \ifNAT@numbers\cite[#1]{#2}\else\citeyearpar[#1]{#2}\fi}
 \def\bibliographystyle#1{%
   \ifx\@begindocumenthook\@undefined\else
     \expandafter\AtBeginDocument
@@ -485,7 +468,8 @@ Computing Machinery]
     {\if@filesw
        \immediate\write\@auxout{\string\bibstyle{#1}}%
      \fi}}
-\RequirePackage{graphicx, xcolor}
+\RequirePackage{graphicx}
+\RequirePackage[prologue]{xcolor}
 \definecolor[named]{ACMBlue}{cmyk}{1,0.1,0,0.1}
 \definecolor[named]{ACMYellow}{cmyk}{0,0.16,1,0}
 \definecolor[named]{ACMOrange}{cmyk}{0,0.42,1,0.01}
@@ -499,8 +483,8 @@ Computing Machinery]
   \SetWatermarkFontSize{0.5in}
   \SetWatermarkColor[gray]{.9}
   \SetWatermarkText{\parbox{12em}{\centering
-      Unpublished working draft\\
+      Unpublished working draft.\\
-      Not for distribution}}
+      Not for distribution.}}
 \fi
 \RequirePackage{geometry}
 \ifcase\ACM@format@nr
@@ -655,10 +639,16 @@ Computing Machinery]
     have the newtxmath package installed.  Please upgrade your
     TeX}\@ACM@newfontsfalse}
 \if@ACM@newfonts
-\RequirePackage[tt=false, type1=true]{libertine}
+\ifxetex
+  \RequirePackage[tt=false]{libertine}
+\else
+  \RequirePackage[tt=false, type1=true]{libertine}
+\fi
 \RequirePackage[varqu]{zi4}
 \RequirePackage[libertine]{newtxmath}
-\RequirePackage[T1]{fontenc}
+\ifxetex\else
+  \RequirePackage[T1]{fontenc}
+\fi
 \fi
 \let\liningnums\@undefined
 \AtEndPreamble{%
@@ -793,6 +783,7 @@ Computing Machinery]
 \define@choicekey*+{ACM}{acmJournal}[\@journalCode\@journalCode@nr]{%
   CIE,%
   CSUR,%
+  DTRAP,%
   IMWUT,%
   JACM,%
   JDIQ,%
@@ -800,6 +791,7 @@ Computing Machinery]
   JERIC,%
   JETC,%
   JOCCH,%
+  PACMCGIT,%
   PACMHCI,%
   PACMPL,%
   POMACS,%
@@ -810,10 +802,12 @@ Computing Machinery]
   TALLIP,%
   TAP,%
   TCPS,%
+  TDSCI,%
   TEAC,%
   TECS,%
   THRI,%
   TIIS,%
+  TIOT,%
   TISSEC,%
   TIST,%
   TKDD,%
@@ -853,6 +847,10 @@ Computing Machinery]
   \def\@journalName{ACM Computing Surveys}%
   \def\@journalNameShort{ACM Comput. Surv.}%
   \def\@permissionCodeOne{0360-0300}%
+\or % DTRAP
+  \def\@journalName{Digital Threats: Research and Practice}%
+  \def\@journalNameShort{Digit. Threat. Res. Pract.}%
+  \def\@permissionCodeOne{2576-5337}%
 \or % IMWUT
   \def\@journalName{Proceedings of the ACM on Interactive, Mobile,
     Wearable and Ubiquitous Technologies}%
@@ -883,6 +881,12 @@ Computing Machinery]
 \or % JOCCH
   \def\@journalName{ACM Journal on Computing and Cultural Heritage}%
   \def\@journalNameShort{ACM J. Comput. Cult. Herit.}%
+\or % PACMCGIT
+  \def\@journalName{Proceedings of the ACM on Computer Graphics and Interactive Techniques}%
+  \def\@journalNameShort{Proc. ACM Comput. Graph. Interact. Tech.}%
+  \def\@permissionCodeOne{2577-6193}%
+  \@ACM@screentrue
+  \PackageInfo{\@classname}{Using screen mode due to \@journalCode}%
 \or % PACMHCI
   \def\@journalName{Proceedings of the ACM on Human-Computer Interaction}%
   \def\@journalNameShort{Proc. ACM Hum.-Comput. Interact.}%
@@ -924,6 +928,10 @@ Computing Machinery]
   \def\@journalName{ACM Transactions on Applied Perception}%
 \or % TCPS
   \def\@journalName{ACM Transactions on Cyber-Physical Systems}%
+\or % TDSCI
+  \def\@journalName{ACM Transactions on Data Science}%
+  \def\@journalNameShort{ACM Trans. Data Sci.}%
+  \def\@permissionCodeOne{2577-3224}%
 \or % TEAC
   \def\@journalName{ACM Transactions on Economics and Computation}%
 \or % TECS
@@ -938,6 +946,10 @@ Computing Machinery]
   \def\@journalName{ACM Transactions on Interactive Intelligent Systems}%
   \def\@journalNameShort{ACM Trans. Interact. Intell. Syst.}%
   \def\@permissionCodeOne{2160-6455}%
+\or % TIOT
+  \def\@journalName{ACM Transactions on Internet of Things}%
+  \def\@journalNameShort{ACM Trans. Internet Things}%
+  \def\@permissionCodeOne{2577-6207}%
 \or % TISSEC
   \def\@journalName{ACM Transactions on Information and System Security}%
   \def\@journalNameShort{ACM Trans. Info. Syst. Sec.}%
@@ -1332,7 +1344,8 @@ Computing Machinery]
   \acm@copyrightinput\acm@copyrightmode]{none,%
     acmcopyright,acmlicensed,rightsretained,%
     usgov,usgovmixed,cagov,cagovmixed,licensedusgovmixed,%
-    licensedcagov,licensedcagovmixed,othergov,licensedothergov}{%
+    licensedcagov,licensedcagovmixed,othergov,licensedothergov,%
+    iw3c2w3,iw3c2w3g}{%
   \@printpermissiontrue
   \@printcopyrighttrue
   \@acmownedtrue
@@ -1346,13 +1359,13 @@ Computing Machinery]
   \fi
   \ifnum\acm@copyrightmode=3\relax % rightsretained
    \@acmownedfalse
-   \acmPrice{}%
+   \AtBeginDocument{\acmPrice{}}%
   \fi
   \ifnum\acm@copyrightmode=4\relax % usgov
    \@printpermissiontrue
    \@printcopyrightfalse
    \@acmownedfalse
-   \acmPrice{}%
+   \AtBeginDocument{\acmPrice{}}%
   \fi
   \ifnum\acm@copyrightmode=6\relax % cagov
    \@acmownedfalse
@@ -1371,6 +1384,14 @@ Computing Machinery]
   \fi
   \ifnum\acm@copyrightmode=12\relax % licensedothergov
    \@acmownedfalse
+  \fi
+  \ifnum\acm@copyrightmode=13\relax % iw3c2w3
+   \@acmownedfalse
+   \AtBeginDocument{\acmPrice{}}%
+  \fi
+  \ifnum\acm@copyrightmode=14\relax % iw3c2w3g
+   \@acmownedfalse
+   \AtBeginDocument{\acmPrice{}}%
   \fi}
 \def\setcopyright#1{\setkeys{ACM@}{acmcopyrightmode=#1}}
 \setcopyright{acmcopyright}
@@ -1380,7 +1401,7 @@ Computing Machinery]
   Association for Computing Machinery.
   \or % acmlicensed
   Copyright held by the owner/author(s). Publication rights licensed to
-  Association for Computing Machinery.
+  ACM\@.
   \or % rightsretained
   Copyright held by the owner/author(s).
   \or % usgov
@@ -1392,18 +1413,24 @@ Computing Machinery]
   Association for Computing Machinery.
   \or %licensedusgovmixed
   Copyright held by the owner/author(s). Publication rights licensed to
-  Association for Computing Machinery.
+  ACM\@.
   \or % licensedcagov
   Crown in Right of Canada. Publication rights licensed to
-  Association for Computing Machinery.
+  ACM\@.
   \or %licensedcagovmixed
   Copyright held by the owner/author(s). Publication rights licensed to
-  Association for Computing Machinery.
+  ACM\@.
   \or % othergov
   Association for Computing Machinery.
   \or % licensedothergov
   Copyright held by the owner/author(s). Publication rights licensed to
-  Association for Computing Machinery.
+  ACM\@.
+  \or % ic2w3www
+  IW3C2 (International World Wide Web Conference Committee), published
+  under Creative Commons CC-BY~4.0 License.
+  \or % ic2w3wwwgoogle
+  IW3C2 (International World Wide Web Conference Committee), published
+  under Creative Commons CC-BY-NC-ND~4.0 License.
   \fi}
 \def\@formatdoi#1{\url{https://doi.org/#1}}
 \def\@copyrightpermission{%
@@ -1517,7 +1544,18 @@ Computing Machinery]
    retains a nonexclusive, royalty-free right to publish or reproduce
    this article, or to allow others to do so, for Government purposes
    only.
-  \fi}
+ \or % iw3c2w3
+   This paper is published under the Creative Commons Attribution~4.0
+   International (CC-BY~4.0) license. Authors reserve their rights to
+   disseminate the work on their personal and corporate Web sites with
+   the appropriate attribution.
+ \or % iw3c2w3g
+   This paper is published under the Creative Commons
+   Attribution-NonCommercial-NoDerivs~4.0 International
+   (CC-BY-NC-ND~4.0) license. Authors reserve their rights to
+   disseminate the work on their personal and corporate Web sites with
+   the appropriate attribution.
+ \fi}
 \def\copyrightyear#1{\def\@copyrightyear{#1}}
 \copyrightyear{\@acmYear}
 \def\@teaserfigures{}
@@ -1571,8 +1609,7 @@ Computing Machinery]
   \footnotetextcopyrightpermission{%
     \if@ACM@authordraft
         \raisebox{-2ex}[\z@][\z@]{\makebox[0pt][l]{\large\bfseries
-            Unpublished
+            Unpublished working draft. Not for distribution.}}%
-            working draft. Not for distribution}}%
        \color[gray]{0.9}%
     \fi
     \parindent\z@\parskip0.1\baselineskip
@@ -1642,10 +1679,17 @@ Computing Machinery]
   \if@ACM@printacmref
      \@mkbibcitation
   \fi
-  \hypersetup{pdfauthor={\authors},
+  \hypersetup{%
+    pdflang={English},
+    pdfdisplaydoctitle,
+    pdfauthor={\authors},
     pdftitle={\@title},
     pdfsubject={\@concepts},
-    pdfkeywords={\@keywords}}%
+    pdfkeywords={\@keywords},
+    pdfcreator={LaTeX with acmart
+      \csname ver@acmart.cls\endcsname\space
+      and hyperref
+      \csname ver@hyperref.sty\endcsname}}%
   \@printendtopmatter
   \@afterindentfalse
   \@afterheading
@@ -2119,7 +2163,7 @@ Computing Machinery]
      ACM, New York, NY, USA%
        \@article@string\unskip, \ref{TotPages}~\@pages@word.
   \fi
-  \@formatdoi{\@acmDOI}
+  \ifx\@acmDOI\@empty\else\@formatdoi{\@acmDOI}\fi
 \par\egroup}
 \def\@printendtopmatter{\par\bigskip}
 \def\@setthanks{\long\def\thanks##1{\par##1\@addpunct.}\thankses}
@@ -2189,7 +2233,7 @@ Computing Machinery]
     \fancyhead[RO]{\@headfootfont\@acmArticle\if@ACM@printfolios:\thepage\fi}%
     \fancyhead[RE]{\@headfootfont\@shortauthors}%
     \fancyhead[LO]{\ACM@linecountL\@headfootfont\shorttitle}%
-    \fancyfoot[RO,LE]{\footnotesize \@journalName, Vol. \@acmVolume, No.
+    \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
     \@acmNumber, Article \@acmArticle.  Publication date: \@acmPubDate.}%
   \or % acmlarge
     \fancyhead[LE]{\ACM@linecountL\@headfootfont
@@ -2197,7 +2241,7 @@ Computing Machinery]
     \fancyhead[LO]{\ACM@linecountL}%
     \fancyhead[RO]{\@headfootfont
       \shorttitle\quad\textbullet\quad\@acmArticle\if@ACM@printfolios:\thepage\fi}%
-    \fancyfoot[RO,LE]{\footnotesize \@journalName, Vol. \@acmVolume, No.
+    \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
     \@acmNumber, Article \@acmArticle.  Publication date: \@acmPubDate.}%
   \or % acmtog
     \fancyhead[LE]{\ACM@linecountL\@headfootfont
@@ -2206,7 +2250,7 @@ Computing Machinery]
     \fancyhead[RE]{\ACM@linecountR}%
     \fancyhead[RO]{\@headfootfont
       \shorttitle\quad\textbullet\quad\@acmArticle\if@ACM@printfolios:\thepage\fi\ACM@linecountR}%
-    \fancyfoot[RO,LE]{\footnotesize \@journalName, Vol. \@acmVolume, No.
+    \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
     \@acmNumber, Article \@acmArticle.  Publication date: \@acmPubDate.}%
   \else % Proceedings
     \fancyfoot[C]{\if@ACM@printfolios\footnotesize\thepage\fi}%
@@ -2275,7 +2319,7 @@ Computing Machinery]
     \fancyfoot[RO,LE]{\if@ACM@printfolios\small\thepage\fi}%
     \fancyfoot[RE,LO]{\footnotesize Manuscript submitted to ACM}%
   \or % acmsmall
-    \fancyfoot[RO,LE]{\footnotesize \@journalName, Vol. \@acmVolume, No.
+    \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
     \@acmNumber, Article \@acmArticle.  Publication date:
     \@acmPubDate.}%
     \fancyhead[LE]{\ACM@linecountL\@folioblob}%
@@ -2283,7 +2327,7 @@ Computing Machinery]
     \fancyhead[RO]{\@folioblob}%
     \fancyheadoffset[RO,LE]{0.6\@folio@wd}%
   \or % acmlarge
-    \fancyfoot[RO,LE]{\footnotesize \@journalName, Vol. \@acmVolume, No.
+    \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
     \@acmNumber, Article \@acmArticle.  Publication date:
     \@acmPubDate.}%
     \fancyhead[RO]{\@folioblob}%
@@ -2291,7 +2335,7 @@ Computing Machinery]
     \fancyhead[LO]{\ACM@linecountL}%
     \fancyheadoffset[RO,LE]{1.4\@folio@wd}%
   \or % acmtog
-    \fancyfoot[RO,LE]{\footnotesize \@journalName, Vol. \@acmVolume, No.
+    \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
     \@acmNumber, Article \@acmArticle.  Publication date:
     \@acmPubDate.}%
     \fancyhead[L]{\ACM@linecountL}%
@@ -2465,8 +2509,9 @@ Computing Machinery]
   \@ifundefined{proposition}{%
   \newtheorem{proposition}[theorem]{Proposition}
   }{}
+  \@ifundefined{lemma}{%
   \newtheorem{lemma}[theorem]{Lemma}
-  \@ifundefined{lemma}{}{}
+  }{}
   \@ifundefined{corollary}{%
   \newtheorem{corollary}[theorem]{Corollary}
   }{}

scribble-lib/scribble/acmart/acmart.css

@@ -1,4 +1,4 @@
-/* Support for styles in scribble/sigplan */
+/* Support for styles in scribble/acmart */
 
 .SAuthorPlace, .SAuthorEmail,
 .SConferenceInfo, .SCopyrightYear, .SCopyrightData,

scribble-lib/scribble/acmart/lang.rkt

@@ -6,7 +6,8 @@
          scribble/latex-prefix
          racket/list
          "../private/defaults.rkt"
-         (for-syntax racket/base))
+         (for-syntax racket/base
+                     syntax/parse))
 (provide (except-out (all-from-out scribble/doclang) #%module-begin)
          (all-from-out scribble/acmart)
          (all-from-out scribble/base)
@@ -23,106 +24,98 @@
            [authorversion? #f]
            [font-size #f])
        (let loop ([stuff #'body])
-         (syntax-case* stuff (manuscript acmsmall acmlarge acmtog sigconf siggraph sigplan sigchi sigchi-a
+         (syntax-parse stuff
-					 review screen natbib anonymous authorversion 9pt 10pt 11pt 12pt)
+           #:datum-literals (manuscript acmsmall acmlarge acmtog sigconf siggraph sigplan sigchi
-		       (lambda (a b) (eq? (syntax-e a) (syntax-e b)))
+                                        sigchi-a dtrap pacmcgit tiot tdsci review screen natbib
+                                        anonymous authorversion 9pt 10pt 11pt 12pt)
+           
+           ;; Skip intraline whitespace to find options:
            [(ws . body)
-            ;; Skip intraline whitespace to find options:
+            #:when (and (string? (syntax-e #'ws))
-            (and (string? (syntax-e #'ws))
+                        (regexp-match? #rx"^ *$" (syntax-e #'ws)))
-                 (regexp-match? #rx"^ *$" (syntax-e #'ws)))
             (loop #'body)]
 
-	   ; boolean options
+           ; boolean options
-	   [((review #t) . body)
+           [((review #t) . body)
-	    (set! review? "review=true")
+            (set! review? "review=true")
-	    (loop #'body)]
+            (loop #'body)]
-	   [((review #f) . body)
+           [((review #f) . body)
-	    (set! review? "review=false")
+            (set! review? "review=false")
-	    (loop #'body)]
+            (loop #'body)]
-	   [(review . body)
+           [(review . body)
-	    (set! review? "review=true")
+            (set! review? "review=true")
-	    (loop #'body)]
+            (loop #'body)]
-	   [((screen #t) . body)
+           [((screen #t) . body)
-	    (set! screen? "screen=true")
+            (set! screen? "screen=true")
-	    (loop #'body)]
+            (loop #'body)]
-	   [((screen #f) . body)
+           [((screen #f) . body)
-	    (set! screen? "screen=false")
+            (set! screen? "screen=false")
-	    (loop #'body)]
+            (loop #'body)]
-	   [(screen . body)
+           [(screen . body)
-	    (set! screen? "screen=true")
+            (set! screen? "screen=true")
-	    (loop #'body)]
+            (loop #'body)]
-	   [((natbib #t) . body)
+           [((natbib #t) . body)
-	    (set! natbib? "natbib=true")
+            (set! natbib? "natbib=true")
-	    (loop #'body)]
+            (loop #'body)]
-	   [((natbib #f) . body)
+           [((natbib #f) . body)
-	    (set! natbib? "natbib=false")
+            (set! natbib? "natbib=false")
-	    (loop #'body)]
+            (loop #'body)]
-	   [(natbib . body)
+           [(natbib . body)
-	    (set! natbib? "natbib=true")
+            (set! natbib? "natbib=true")
-	    (loop #'body)]
+            (loop #'body)]
 
-	   [((anonymous #t) . body)
+           [((anonymous #t) . body)
-	    (set! anonymous? "anonymous=true")
+            (set! anonymous? "anonymous=true")
-	    (loop #'body)]
+            (loop #'body)]
-	   [((anonymous #f) . body)
+           [((anonymous #f) . body)
-	    (set! anonymous? "anonymous=false")
+            (set! anonymous? "anonymous=false")
-	    (loop #'body)]
+            (loop #'body)]
-	   [(anonymous . body)
+           [(anonymous . body)
-	    (set! anonymous? "anonymous=true")
+            (set! anonymous? "anonymous=true")
-	    (loop #'body)]
+            (loop #'body)]
-	   [((authorversion #t) . body)
+           [((authorversion #t) . body)
-	    (set! authorversion? "authorversion=true")
+            (set! authorversion? "authorversion=true")
-	    (loop #'body)]
+            (loop #'body)]
-	   [((authorversion #f) . body)
+           [((authorversion #f) . body)
-	    (set! authorversion? "authorversion=false")
+            (set! authorversion? "authorversion=false")
-	    (loop #'body)]
+            (loop #'body)]
-	   [(authorversion . body)
+           [(authorversion . body)
-	    (set! authorversion? "authorversion=true")
+            (set! authorversion? "authorversion=true")
-	    (loop #'body)]
+            (loop #'body)]
-	   [(9pt . body)
+           [(9pt . body)
-	    (set! font-size "9pt")
+            (set! font-size "9pt")
-	    (loop #'body)]
+            (loop #'body)]
-	   [(10pt . body)
+           [(10pt . body)
-	    (set! font-size "10pt")
+            (set! font-size "10pt")
-	    (loop #'body)]
+            (loop #'body)]
-	   [(11pt . body)
+           [(11pt . body)
-	    (set! font-size "11pt")
+            (set! font-size "11pt")
-	    (loop #'body)]
+            (loop #'body)]
-	   [(12pt . body)
+           [(12pt . body)
-	    (set! font-size "12pt")
+            (set! font-size "12pt")
-	    (loop #'body)]
+            (loop #'body)]
 	   
 	   
            ; format options
-           [(manuscript . body)
+           [((~and fmt
-            (set! format? "manuscript")
+                   (~or manuscript
+                        acmsmall
+                        acmlarge
+                        acmtog
+                        sigconf
+                        siggraph
+                        sigplan
+                        sigchi
+                        sigchi-a
+                        dtrap
+                        pacmcgit
+                        tiot
+                        tdsci))
+             . body)
+            (set! format? (symbol->string (syntax->datum #'fmt)))
             (loop #'body)]
-           [(acmsmall . body)
+           
-            (set! format? "acmsmall")
+           [body
-            (loop #'body)]
-           [(acmlarge . body)
-            (set! format? "acmlarge")
-            (loop #'body)]
-           [(acmtog . body)
-            (set! format? "acmtog")
-            (loop #'body)]
-           [(sigconf . body)
-            (set! format? "sigconf")
-            (loop #'body)]
-           [(sigconf . body)
-            (set! format? "siggraph")
-            (loop #'body)]
-           [(sigplan . body)
-            (set! format? "sigplan")
-            (loop #'body)]
-           [(sigchi . body)
-            (set! format? "sigchi")
-            (loop #'body)]
-           [(sigchi-a . body)
-            (set! format? "sigchi-a")
-            (loop #'body)]
-	    
-	   [body
             #`(#%module-begin id (post-process #,review? #,screen? #,natbib? #,anonymous? #,authorversion? #,font-size #,format?) () . body)])))]))
 
 (define ((post-process . opts) doc)  
@@ -139,7 +132,7 @@
                    (scribble-file "acmart/style.tex")
                    (list (scribble-file "acmart/acmart.cls"))
                    #f
-		   #:replacements (hash "scribble-load-replace.tex" (scribble-file "acmart/acmart-load.tex"))))))
+                   #:replacements (hash "scribble-load-replace.tex" (scribble-file "acmart/acmart-load.tex"))))))
 
 (define (add-acmart-styles doc)
   (struct-copy part doc

scribble-lib/scribble/base.rkt

@@ -329,7 +329,8 @@
                 #:sep (or/c content? block? #f)
                 #:column-properties (listof any/c)
                 #:row-properties (listof any/c)
-                #:cell-properties (listof (listof any/c)))
+                #:cell-properties (listof (listof any/c))
+                #:sep-properties (or/c list? #f))
                table?)])
 
 (define (convert-block-style style)
@@ -352,6 +353,7 @@
 
 (define (tabular #:style [style #f]
                  #:sep [sep #f]
+                 #:sep-properties [sep-props #f]
                  #:column-properties [column-properties null]
                  #:row-properties [row-properties null]
                  #:cell-properties [cell-properties null]
@@ -426,7 +428,7 @@
                      [(null? column-properties)
                       (if (or (zero? n) (not sep))
                           (cons prev (loop null (add1 n) prev))
-                          (list* prev prev (loop null (+ n 2) prev)))]
+                          (list* (or sep-props prev) prev (loop null (+ n 2) prev)))]
                      [else
                       (define (to-list v) (if (list? v) v (list v)))
                       (define props (to-list (car column-properties)))
@@ -437,7 +439,7 @@
                                          props))
                       (if (or (zero? n) (not sep))
                           (cons props rest)
-                          (list* null props rest))])))
+                          (list* (or sep-props prev) props rest))])))
                 (define full-column-properties
                   (make-full-column-properties column-properties))
                 (define (make-full-cell-properties cell-properties)
@@ -560,7 +562,7 @@
                 #:rest (listof pre-content?)
                 element?)]
   [secref (->* (string?)
-               (#:doc module-path?
+               (#:doc (or/c #f module-path?)
                 #:tag-prefixes (or/c #f (listof string?))
                 #:underline? any/c
                 #:link-render-style (or/c #f link-render-style?))

scribble-lib/scribble/html-render.rkt

@@ -1317,17 +1317,11 @@
                            (if (path? p)
                                (url->string* (path->url (path->complete-path p)))
                                p))])
-             `((,(if svg? 'object 'img)
+             `((img
-                ([,(if svg? 'data 'src) ,srcref]
+                ([src ,srcref]
                  [alt ,(content->string (element-content e))]
-                 ,@(if svg?
-                       `([type "image/svg+xml"])
-                       null)
                  ,@sz
-                 ,@(attribs))
+                 ,@(attribs))))))]
-                ,@(if svg? 
-                      `((param ([name "src"] [value ,srcref])))
-                      null)))))]
         [(element-style-property-matching e script-property?)
          => 
          (lambda (v)
@@ -1496,8 +1490,8 @@
                   (list
                    (add-padding
                     cvt
-                    `(object
+                    `(img
-                      ([data ,(install-file "pict.svg" bstr)]
+                      ([src ,(install-file "pict.svg" bstr)]
                        [type "image/svg+xml"]))))))]
           [else #f])))
 

scribble-lib/scribble/latex-render.rkt

@@ -1112,6 +1112,16 @@
                                 [(#\u039B) "$\\Lambda$"]
                                 [(#\u03BC) "$\\mu$"]
                                 [(#\u03C0) "$\\pi$"]
+                                [(#\₀) "$_0$"]
+                                [(#\₁) "$_1$"]
+                                [(#\₂) "$_2$"]
+                                [(#\₃) "$_3$"]
+                                [(#\₄) "$_4$"]
+                                [(#\₅) "$_5$"]
+                                [(#\₆) "$_6$"]
+                                [(#\₇) "$_7$"]
+                                [(#\₈) "$_8$"]
+                                [(#\₉) "$_9$"]
                                 [(#\‘) "{`}"]
                                 [(#\’) "{'}"]
                                 [(#\“) "{``}"]

scribble-lib/scribble/lncs/lang.rkt

@@ -63,8 +63,8 @@
 (unless (or (not (path? cls-file))
             (file-exists? cls-file))
   (log-error (format "File not found: ~a" cls-file))
-  (define site "ftp.springer.de")
+  (define site "ftp.springernature.com")
-  (define path "pub/tex/latex/llncs/latex2e")
+  (define path "cs-proceeding/llncs")
   (define file "llncs2e.zip")
   (unless (directory-exists? (find-system-path 'addon-dir))
     (make-directory (find-system-path 'addon-dir)))

scribble-lib/scribble/lncs/lncs.css

@@ -0,0 +1,13 @@
+/* Support for styles in scribble/lncs */
+
+.SAuthorPlace, .SAuthorEmail,
+.SConferenceInfo, .SCopyrightYear, .SCopyrightData,
+.Sdoi, .SPexclusivelicense,
+.SCategory, .SCategoryPlus, .STerms, .SKeywords {
+  display: none;
+}
+
+.SSubtitle {
+  display: block;
+  font-size: smaller;
+}

scribble-lib/scribble/private/lang-parameters.rkt

@@ -0,0 +1,19 @@
+#lang racket/base
+
+(provide (all-defined-out))
+
+;; Some latex formats have different requirements on how
+;;   figures, citations, etc. are displayed. This allows different
+;;   scribble langs to handle them.
+
+;; `Figure` string that appears in front of a figure caption
+(define default-figure-label-text (make-parameter "Figure"))
+
+;; Seperator string between figure counter and caption
+(define default-figure-label-sep (make-parameter ": "))
+
+;; Style for the figure caption
+(define default-figure-caption-style (make-parameter #f))
+
+;; Style for the number in the figure counter
+(define default-figure-counter-style (make-parameter #f))

scribble-lib/scribble/private/manual-proc.rkt

@@ -1039,12 +1039,13 @@
      #'(with-togetherable-racket-variables
         ()
         ()
-        (*defthing kind.kind
+        (let ([id-val id-expr])
-                   lt.expr
+          (*defthing kind.kind
-                   (list (or id-expr (quote-syntax/loc id))) (list 'id) #f
+                     lt.expr
-                   (list (racketblock0 result))
+                     (list (or id-val (quote-syntax/loc id))) (list (if (identifier? id-val) (syntax-e id-val) 'id)) #f
-                   (lambda () (list desc ...))
+                     (list (racketblock0 result))
-                   (list (result-value value.value))))]))
+                     (lambda () (list desc ...))
+                     (list (result-value value.value)))))]))
 
 (define-syntax (defthing* stx)
   (syntax-parse stx

scribble-lib/scribble/private/manual-scheme.rkt

@@ -247,12 +247,16 @@
 
 (define-for-syntax (strip-ellipsis-context a)
   (define a-ellipsis (datum->syntax a '...))
+  (define a-ellipsis+ (datum->syntax a '...+))
   (let loop ([a a])
     (cond
      [(identifier? a)
-      (if (free-identifier=? a a-ellipsis #f)
+      (cond
-          (datum->syntax #f '... a a)
+        [(free-identifier=? a a-ellipsis #f)
-          a)]
+         (datum->syntax #f '... a a)]
+        [(free-identifier=? a a-ellipsis+ #f)
+         (datum->syntax #f '...+ a a)]
+        [else a])]
      [(syntax? a)
       (datum->syntax a (loop (syntax-e a)) a a)]
      [(pair? a)

scribble-lib/scribble/scribble.tex

@@ -340,10 +340,10 @@
 \newcommand{\Ssubsubsubsubsectionstar}[1]{\Ssubsubsubsectionstar{#1}}
 
 % "starx" means unnumbered but in ToC:
-\newcommand{\Spartstarx}[2]{\Spartstar{#2}\addcontentsline{toc}{part}{#1}}
+\newcommand{\Spartstarx}[2]{\Spartstar{#2}\phantomsection\addcontentsline{toc}{part}{#1}}
-\newcommand{\Ssectionstarx}[2]{\Ssectionstar{#2}\addcontentsline{toc}{section}{#1}}
+\newcommand{\Ssectionstarx}[2]{\Ssectionstar{#2}\phantomsection\addcontentsline{toc}{section}{#1}}
-\newcommand{\Ssubsectionstarx}[2]{\Ssubsectionstar{#2}\addcontentsline{toc}{subsection}{#1}}
+\newcommand{\Ssubsectionstarx}[2]{\Ssubsectionstar{#2}\phantomsection\addcontentsline{toc}{subsection}{#1}}
-\newcommand{\Ssubsubsectionstarx}[2]{\Ssubsubsectionstar{#2}\addcontentsline{toc}{subsubsection}{#1}}
+\newcommand{\Ssubsubsectionstarx}[2]{\Ssubsubsectionstar{#2}\phantomsection\addcontentsline{toc}{subsubsection}{#1}}
 \newcommand{\Ssubsubsubsectionstarx}[2]{\Ssubsubsubsectionstar{#2}}
 \newcommand{\Ssubsubsubsubsectionstarx}[2]{\Ssubsubsubsubsectionstar{#2}}
 

scribble-lib/scriblib/figure.rkt

@@ -6,7 +6,8 @@
          scribble/html-properties
          scribble/latex-properties
          setup/main-collects
-         "private/counter.rkt")
+         "private/counter.rkt"
+         scribble/private/lang-parameters)
 
 (provide figure
          figure*
@@ -75,11 +76,9 @@
                                        figure-style-extras))
     c))
 
-(define default-label-sep ": ")
-
 (define (figure tag caption 
                 #:style [style center-figure-style]
-                #:label-sep [label-sep default-label-sep]
+                #:label-sep [label-sep (default-figure-label-sep)]
                 #:label-style [label-style #f]
                 #:continue? [continue? #f]
                 . content)
@@ -87,7 +86,7 @@
 
 (define (figure-here tag caption 
                      #:style [style center-figure-style]
-                     #:label-sep [label-sep default-label-sep]
+                     #:label-sep [label-sep (default-figure-label-sep)]
                      #:label-style [label-style #f]
                      #:continue? [continue? #f]
                      . content)
@@ -95,14 +94,14 @@
 
 (define (figure* tag caption 
                  #:style [style center-figure-style]
-                 #:label-sep [label-sep default-label-sep]
+                 #:label-sep [label-sep (default-figure-label-sep)]
                  #:label-style [label-style #f]
                  #:continue? [continue? #f]
                  . content)
   (figure-helper figuremulti-style style label-sep label-style tag caption content continue?))
 (define (figure** tag caption 
                   #:style [style center-figure-style]
-                  #:label-sep [label-sep default-label-sep]
+                  #:label-sep [label-sep (default-figure-label-sep)]
                   #:label-style [label-style #f]
                   #:continue? [continue? #f]
                   . content)
@@ -124,7 +123,7 @@
                                               #:label-sep label-sep
                                               #:label-style label-style
                                               #:continue? continue?)
-                               caption)))))))
+                               (make-element (default-figure-caption-style) caption))))))))
 
 (define figures (new-counter "figure" 
                              #:target-wrap make-figure-target
@@ -134,7 +133,7 @@
                        #:label-sep [label-sep ": "]
                        #:label-style [label-style #f])
   (counter-target figures tag 
-                  "Figure" 
+                  (default-figure-label-text)
                   #:label-suffix (list (if continue? " (continued)" "") label-sep)
                   #:label-style label-style
                   #:target-style figure-target-style

scribble-lib/scriblib/footnote.css

@@ -3,7 +3,8 @@
   position: relative;
   float: right;
   left: 2em;
-  height: 0em;
+  height: auto;
+  clear: right;
   width: 13em;
   margin: 0em -13em 0em 0em;
 }

scribble-lib/scriblib/private/counter.rkt

@@ -1,6 +1,7 @@
 #lang racket/base
 (require scribble/core
-         scribble/decode)
+         scribble/decode
+         scribble/private/lang-parameters)
 
 (provide new-counter
          counter-target
@@ -38,7 +39,8 @@
              (let ([n (resolve-get part ri (tag->counter-tag counter tag "value"))])
                (cons
                 (make-element label-style
-                              (let ([l (cons (format "~a" n) (decode-content (list label-suffix)))])
+                              (let ([l (cons (make-element (default-figure-counter-style) (format "~a" n))
+                                             (decode-content (list label-suffix)))])
                                 (if label
                                     (list* label 'nbsp l)
                                     l)))

scribble-test/tests/scribble/docs/stxobj.txt

@@ -1,2 +1,2 @@
-  > (syntax-e #'(+ 1 2))                            
+  > (syntax-e #'(+ 1 2))                                           
-  '(#<syntax:1:0 +> #<syntax:1:0 1> #<syntax:1:0 2>)
+  '(#<syntax:eval:1:0 +> #<syntax:eval:1:0 1> #<syntax:eval:1:0 2>)

scribble-test/tests/scribble/reader.rkt

@@ -687,30 +687,30 @@ foo
 ---
 ;; -------------------- errors
 ---
-(  -@error-> "inp:1:0: read: expected a `)' to close `('" ; check -@error->
+(  -@error-> "inp:1:0: read: expected a `)` to close `(`" ; check -@error->
 ---
-@foo{ -@error-> #rx":1:0: missing closing `}'$"
+@foo{ -@error-> #rx":1:0: missing closing `}`$"
 ---
-\foo{ -\error-> #rx":1:0: missing closing `}'$"
+\foo{ -\error-> #rx":1:0: missing closing `}`$"
 ---
-@foo{@bar{ -@error-> #rx":1:5: missing closing `}'$"
+@foo{@bar{ -@error-> #rx":1:5: missing closing `}`$"
 ---
-\foo{\bar{ -\error-> #rx":1:5: missing closing `}'$"
+\foo{\bar{ -\error-> #rx":1:5: missing closing `}`$"
 ---
-@foo{@bar{} -@error-> #rx":1:0: missing closing `}'$"
+@foo{@bar{} -@error-> #rx":1:0: missing closing `}`$"
 ---
-@foo{@bar|{} -@error-> #rx":1:5: missing closing `}\\|'$"
+@foo{@bar|{} -@error-> #rx":1:5: missing closing `}\\|`$"
 ---
-@foo{@bar|-{} -@error-> #rx":1:5: missing closing `}-\\|'$"
+@foo{@bar|-{} -@error-> #rx":1:5: missing closing `}-\\|`$"
 ---
-@foo{@bar|-{} -@error-> #rx":1:5: missing closing `}-\\|'$"
+@foo{@bar|-{} -@error-> #rx":1:5: missing closing `}-\\|`$"
 ---
-\foo{\bar|-{} -\error-> #rx":1:5: missing closing `}-\\|'$"
+\foo{\bar|-{} -\error-> #rx":1:5: missing closing `}-\\|`$"
 ---
-@foo{@" -@error-> #rx":1:6: read: expected a closing '\"'$"
+@foo{@" -@error-> #rx":1:6: read-syntax: expected a closing `\"`$"
 ;; " <-- (balance this file)
 ---
-\foo{\" -\error-> #rx":1:6: read: expected a closing '\"'$"
+\foo{\" -\error-> #rx":1:6: read-syntax: expected a closing `\"`$"
 ---
 @|1 2|
 -@error->

scribble-text-lib/scribble/text/output.rkt

@@ -3,6 +3,7 @@
          racket/contract/base)
 
 (provide
+ special?
  outputable/c
  (contract-out 
   [output (->* (outputable/c) (output-port?) void?)]))