Fixed rendering of non-dotted pairs in defform

As per the acmart pdf, top matter matterial needs to appear
before the `\maketitle` command. As such, we need to use the
`pretitle` paragraph style.

scribble-doc/scribblings/scribble/acmart.scrbl

@@ -0,0 +1,280 @@
+#lang scribble/manual
+@(require (except-in "utils.rkt" title author)
+          (for-label scribble/acmart))
+
+@(define acmart-url
+   "http://mirrors.concertpass.com/tex-archive/macros/latex/contrib/acmart/acmart.pdf")
+
+@title{ACM Paper Format}
+
+@defmodulelang[scribble/acmart]{The @racketmodname[scribble/acmart]
+language is like @racketmodname[scribble/base], but configured with
+LaTeX style defaults to use the @hyperlink[acmart-url]{@tt{acmart}}
+class for typesetting publications for the Association of Computing
+Machinery.}
+
+@deftogether[(
+@defidform[manuscript]
+@defidform[acmsmall]
+@defidform[acmlarge]
+@defidform[acmtog]
+@defidform[sigconf]
+@defidform[siggraph]
+@defidform[sigplan]
+@defidform[sigchi]
+@defidform[sigchi-a]
+)]{
+
+Enables the given document format. Use the format only on the same
+line as @hash-lang[], with only whitespace (or other options) between
+@racketmodname[scribble/acmart] and the format name:
+
+@verbatim[#:indent 2]|{
+  #lang scribble/acmart @acmsmall
+}|
+
+The @racket[manuscript], @racket[acmsmall], @racket[acmlarge],
+@racket[acmtog], @racket[sigconf], @racket[siggraph],
+@racket[sigplan], @racket[sigchi], and @racket[sigchi-a] formats are
+all mutually exclusive.}
+
+@deftogether[(
+@defidform[review]
+@defidform[screen]
+@defidform[natbib]
+@defidform[anonymous]
+@defidform[authorversion]
+@defidform[9pt]
+@defidform[10pt]
+@defidform[11pt]
+@defidform[12pt]
+)]{
+
+Enables the given document format option. Use the option only on the
+same line as @hash-lang[], with only whitespace (or other options)
+between @racketmodname[scribble/acmart] and the format option.  Any
+number of options may be used:
+
+@verbatim[#:indent 2]|{
+  #lang scribble/acmart @acmsmall @review @anonymous @natbib
+}|
+
+If multiple font size options are used, all but the last are ignored.
+}
+
+@defproc[(abstract [pre-content pre-content?] ...) block?]{
+
+Generates a @tech{nested flow} for a paper abstract.}
+
+@defform[(include-abstract module-path)]{
+
+Similar to @racket[include-section], but incorporates the document in the
+specified module as an abstract. The document must have no title or
+sub-parts.}
+
+@defproc[(title [#:short short-title pre-content? #f]
+                [#:tag tag (or/c string? (listof string?) #f) #f]
+                [#:tag-prefix prefix (or/c string? module-path? #f) #f]
+                [#:style style (or/c style? string? symbol? #f) #f]
+                [#:version version (or/c string? #f) #f]
+                [#:date date (or/c string? #f) #f]
+                [title pre-content?] ...)
+         title-decl?]{
+
+Specifies the title of the document, optionally with a short version of the title for running heads.}
+
+@defproc[(subtitle [pre-content pre-content?] ...) content?]{
+
+Specifies a subtitle.}
+
+@defproc[(author [#:orcid orcid (or/c pre-content? #f) #f]
+                 [#:affiliation affiliation
+                  (or/c pre-content?
+                        affiliation?
+                        (listof pre-content?)
+                        (listof affiliation?)
+                        #f)
+                  #f]
+                 [#:email email
+                  (or/c pre-content? (listof pre-content?) #f)
+                  #f]
+                 [name pre-content?] ...)
+         block?]{
+
+ Specifies an author with an optional email address, affiliation, and/or orcid.
+ 
+}
+
+@deftogether[(
+@defproc[(acmJournal [journal pre-content?] ...) block?]
+@defproc[(acmConference [name pre-content?] [date pre-content?] [venue pre-content?]) block?]
+@defproc[(acmVolume [content pre-content?] ...) block?]
+@defproc[(acmNumber [content pre-content?] ...) block?]
+@defproc[(acmArticle [content pre-content?] ...) block?]
+@defproc[(acmYear [content pre-content?] ...) block?]
+@defproc[(acmMonth [content pre-content?] ...) block?]
+@defproc[(acmArticleSeq [content pre-content?] ...) block?]
+@defproc[(acmPrice [content pre-content?] ...) block?]
+@defproc[(acmISBN [content pre-content?] ...) block?]
+@defproc[(acmDOI [content pre-content?] ...) block?]
+)]{
+
+Declares information that is collected into the front-matter region of the paper.}
+
+@deftogether[(
+@defproc[(acmBadgeL [#:url url string? #f] [graphics string?]) block?]
+@defproc[(acmBadgeR [#:url url string? #f] [graphics string?]) block?]
+)]{
+
+Display a special badge, such as an artifact evaluation badge, on the
+left or right of the first page.  If @racket[url] is provided, the
+screen version of the image links to the badge authority.
+
+}
+
+@defproc[(email [text pre-content?] ...)
+         email?]{
+ Creates an @racket[email?] object for use with @racket[author].
+}
+
+@defproc[(email? [email any/c]) boolean?]{
+                                          
+ Returns @racket[#t] if @racket[email] is an @racket[email],
+ @racket[#f] otherwise.
+}
+         
+
+@defproc[(affiliation
+          [#:position position (or/c pre-content? #f) #f]
+          [#:institution institution (or/c pre-content? institution? #f) #f]
+          [#:street-address street-address (or/c pre-content? #f) #f]
+          [#:city city (or/c pre-content? #f) #f]
+          [#:state state (or/c pre-content? #f) #f]
+          [#:postcode postcode (or/c pre-content? #f) #f]
+          [#:country country (or/c pre-content? #f) #f])
+         affiliation?]{
+                       
+ Creates an @racket[affiliation?] object for use with @racket[author].
+}
+
+@defproc[(affiliation? [aff any/c]) boolean?]{
+                                              
+ Returns @racket[#t] if @racket[aff] is an
+ @racket[affiliation], @racket[#f] otherwise.
+}
+
+@defproc[(institution [#:departments departments (or/c pre-content? institution? (listof institution)) '()]
+                      [inst institution?] ...)
+         institution?]{
+
+ Creates an @racket[institution?] object for use in @racket[author].}
+
+@defproc[(institution? [inst any/c]) boolean]{
+                                              
+ Returns @racket[#t] if @racket[inst] is an
+ @racket[institution], @racket[#f] otherwise.
+}
+
+@codeblock|{
+  #lang scribble/acmart
+  @title{Some Title}
+  @author["David Van Horn"
+          #:affiliation @affiliation[
+                         #:institution
+                         @institution[
+                          #:departments (list @institution{Department of Computer Science}
+                                              @institution{UMIACS})]{
+                           University of Maryland}
+                         #:city "College Park"
+                         #:state "Maryland"]
+          #:email "dvanhorn@cs.umd.edu"]}
+
+  @abstract{This is an abstract.}
+}|
+
+@deftogether[(
+@defproc[(terms [content pre-content?] ...) content?]
+@defproc[(keywords [content pre-content?] ...) content?]
+)]{
+
+Typesets term and keyword information for the paper, which
+is normally placed immediately after an @racket[abstract] form.
+See also @url["http://www.acm.org/about/class/how-to-use"].
+
+For @racket[terms], each general term should be in titlecase. Terms
+are usually drawn from a fixed list, and they are usually optional.
+
+For @racket[keywords], capitalize only the first letter of the first
+word, separate phrases by commas, and do not include ``and'' before
+the last one. Keywords should be noun phrases, not adjectives.}
+
+@defproc[(startPage [content pre-content?] ...) content?]{
+Sets the start page for the paper.}
+
+@defproc[(ccsdesc [#:number number? #f] [content pre-content?] ...) content?]{
+
+Declares CCS description with optional numeric code.}
+
+@defproc[(received [#:stage stage string? #f] [date string?]) content?]{
+
+Sets the history of the publication.  If @racket[stage] is omitted, it
+defaults to @racket{Received} for the first occurrence and
+@racket{revised} in subsequent uses.
+
+@codeblock[#:keep-lang-line? #f]|{
+  #lang scribble/acmart
+  @received{February 2007}
+  @received[#:stage "revised"]{March 2009}
+  @received[#:stage "accepted"]{June 2009}
+}|}
+
+@defproc[(teaserfigure [content pre-content?] ...) block?]{
+
+Creates a teaser figure to appear before main text.}
+
+@deftogether[(
+@defproc[(sidebar [content pre-content?] ...) block?]
+@defproc[(marginfigure [content pre-content?] ...) block?]
+@defproc[(margintable [content pre-content?] ...) block?]
+)]{
+
+In the @racket[sigchi-a] format, special sidebars,
+ tables and figures on the margin.}
+
+@deftogether[(
+@defproc[(printonly [content pre-content?] ...) block?]
+@defproc[(screenonly [content pre-content?] ...) block?]
+@defproc[(anonsuppress [content pre-content?] ...) block?]
+)]{
+Marks content to be included only for print or screen
+editions, or excluded from anonymous editions.}
+
+@defproc[(acks [content pre-content?] ...) block?]{
+
+Creates an unnumbered section ``Acknowledgments'' section, unless the
+@racket[anonymous] mode is selected.}
+
+@deftogether[(
+@defproc[(grantsponsor [sponsorID string?] [name string?] [url string?]) content?]
+@defproc[(grantnum [#:url url string? #f] [sponsorID string?] [num string?]) content?]
+)]{
+
+All financial support @emph{must} be listed using the
+@racket[grantsponsor] and @racket[grantnum] commands inside of
+@racket[acks].
+
+Here @racket[sponsorID] is the unique ID used to match grants to
+sponsors, @racket[name] is the name of the sponsor.  The
+@racket[sponsorID] of a @racket[grantnum] must match some
+@racket[sponsorID] of a @racket[grantsponsor] command.
+
+@codeblock[#:keep-lang-line? #f]|{
+  #lang scribble/acmart
+  @acks{
+    The author thanks Benjamin Greenman for helpful comments on this
+    code. Financial support provided by the @grantsponsor["NSF7000"
+    "National Scribble Foundation"]{http://racket-lang.org} under
+    grant No.: @grantnum["NSF7000"]{867-5309}.}
+}|}
+
+@history[#:added "1.20"]

scribble-doc/scribblings/scribble/base.scrbl

@@ -105,7 +105,7 @@ removed.}
 
 
 @def-section-like[section part-start?]{ Like @racket[title], but
- generates a @racket[part-start] of depth @racket[0] to be by
+ generates a @racket[part-start] of depth @racket[0] to be picked up by
  @racket[decode] or @racket[decode-part].}
 
 @def-section-like[subsection part-start?]{ Like @racket[section], but
@@ -605,7 +605,7 @@ Inserts a reference to the section tagged @racket[tag].
 
 If @racket[#:doc module-path] is provided, the @racket[tag] refers to
 a tag with a prefix determined by @racket[module-path]. When
-@exec{setup-plt} renders documentation, it automatically adds a tag
+@exec{raco setup} renders documentation, it automatically adds a tag
 prefix to the document based on the source module. Thus, for example,
 to refer to a section of the Racket reference,
 @racket[module-path] would be @racket['(lib
@@ -691,13 +691,13 @@ renders as a hyperlink with the text:
 }|}
 
 
-@defproc[(elemtag [t (or/c tag? string?)] [pre-content pre-content?] ...) element?]{
+@defproc[(elemtag [t (or/c taglet? generated-tag?)] [pre-content pre-content?] ...) element?]{
 
 The tag @racket[t] refers to the content form of
 @racket[pre-content].}
 
 
-@defproc[(elemref [t (or/c tag? string?)] [pre-content pre-content?] ... 
+@defproc[(elemref [t (or/c taglet? generated-tag?)] [pre-content pre-content?] ... 
                   [#:underline? underline? any/c #t]) element?]{
 
 The @tech{decode}d @racket[pre-content] is hyperlinked to @racket[t],

scribble-doc/scribblings/scribble/config.scrbl

@@ -172,7 +172,7 @@ configurable in the former way, since a document class determines a
 set of page-layout and font properties that are used by other
 commands. The style-replacement kind of configuration corresponds to
 re-defining Latex macros or overriding CSS class attributes.  When
-@exec{setup-plt} builds PDF documentation, it uses both kinds of
+@exec{raco setup} builds PDF documentation, it uses both kinds of
 configuration to produce a standard layout for Racket manuals;
 that is, it selects a particular page layout, and it replaces some
 @racketmodname[racket/base] styles.
@@ -640,6 +640,25 @@ style:
 
  ]
 
+Additionally, the @filepath{racket.tex} Latex configuration
+includes several macros that you can redefine to adjust the
+output style of Racket code:
+
+@itemlist[
+ @item{@ltxd[2]{SColorize} --- Sets the color scheme of
+  Racket code. Can be redefined to create black and white
+  code. The first argument is the requested color, and the
+  second argument is the text for that color.}
+ @item{@ltxd[1]{SHyphen} --- Enables or Disables the ability
+  for identifiers and keywords in Racket code from being
+  hyphenated. Defaults to enabled (for compatibility).
+  Redefine to disable or change the hyphenation behavior. For
+  example, to cause the text to overfill rather than hyphen,
+  it can be redefined to:
+  @tt["\\renewcommand{\\SHyphen}[1]{\\mbox{#1}}"]. The first
+  argument is an identifier or keyword inside of a code
+  block.}]
+
 @; ------------------------------------------------------------
 
 @section[#:tag "latex-prefix"]{Latex Prefix Support}

scribble-doc/scribblings/scribble/core.scrbl

@@ -118,10 +118,10 @@ A @deftech{block} is either a @techlink{table}, an
 
              @itemize[
 
-             @item{An @deftech{content} can be a string, one of a few
+             @item{A @deftech{content} can be a string, one of a few
                    symbols, an instance of @racket[element] (possibly
                    @racket[link-element], etc.), a @racket[multiarg-element], a
-                   a @techlink{traverse element}, @techlink{part-relative element}, a
+                   @techlink{traverse element}, a @techlink{part-relative element}, a
                    @techlink{delayed element}, or a list of content.
 
                    @itemize[
@@ -463,7 +463,7 @@ The recognized @tech{style properties} are as follows:
         be set separately for parts that start different HTML pages,
         otherwise it is effectively inherited by sub-parts; the
         default is @racket["scribble-racket-lang.org"], but
-        @exec{setup-plt} installs @racket["doc-racket-lang.org"] as the
+        @exec{raco setup} installs @racket["doc-racket-lang.org"] as the
         @tt{id} for any document that it builds.}
 
  @item{@racket[attributes] structure --- Provides additional HTML
@@ -729,6 +729,8 @@ The following @tech{style properties} are currently recognized:
  @item{@racket[alt-tag] structure --- Generates the indicated HTML tag
        instead of @tt{<blockquote>}.}
 
+ @item{@racket['pretitle] --- For Latex, raises the contents
+   of the flow to above the title.}
 ]}
 
 
@@ -1115,7 +1117,7 @@ reverse order):
        any number or lists element, while @racket[""] is used in place
        of all non-empty strings.}
 
-]}
+]
 
 @history[#:changed "6.4" @elem{Added @racket[(list/c string? string?)]
                                number items for
@@ -1349,7 +1351,7 @@ Returns the width in characters of the given @tech{block}.}
 @defproc[(part-number-item? [v any/c]) boolean]{
 
 Return @racket[#t] if @racket[v] is @racket[#f], an exact non-negative
-integer, a string, or a list containing two strings. See @racket[part]
+integer, a string, or a list containing two strings. See @racket[collected-info]
 for information on how different representations are used for numbering.
 
 @history[#:added "6.4"]}
@@ -1398,6 +1400,15 @@ identity is based on a @racket[generated-tag]. The result of
 number plus an updated hash table with an incremented value for the
 @tech{numberer}.
 
+Typically, the rendered form of a section number (produced by
+@racket[numberer-step]) is a list containing two strings. The first
+string is the part's immediate number, which can be combined with a
+prefix for enclosing parts' numbers. The second string is a separator
+that is placed after the part's number and before a subsection's
+number for each subsection. If @racket[numberer-step] produces a plain
+string for the rendered number, then it is not added as a prefix to
+subsection numbers. See also @racket[collected-info].
+
 @history[#:added "6.4"]}
 
 
@@ -1468,7 +1479,7 @@ documentation.
 @defproc[(resolve-get/ext? [p (or/c part? #f)] [ri resolve-info?] [key info-key?])
          (values any/c boolean?)]{
 
-Like @racket[render-get], but returns a second value to indicate
+Like @racket[resolve-get], but returns a second value to indicate
 whether the resulting information originated from an external source
 (i.e., a different document).}
 
@@ -1476,7 +1487,7 @@ whether the resulting information originated from an external source
 @defproc[(resolve-get/ext-id [p (or/c part? #f)] [ri resolve-info?] [key info-key?])
          (values any/c (or/c boolean? string?))]{
 
-Like @racket[render-get/ext?], but the second result can be a string
+Like @racket[resolve-get/ext?], but the second result can be a string
 to indicate the source document's identification as established via
 @racket[load-xref] and a @racket[#:doc-id] argument.
 
@@ -1772,7 +1783,7 @@ The @racket[path] field can be a result of
 Used as a @tech{style property} on the main @racket[part] of a document
 to set a default prefix file, style file, and extra files (see
 @secref["config-style"]).  The defaults are used by the
-@exec{scribble} command-line tool for and @DFlag{latex} or @DFlag{pdf}
+@exec{scribble} command-line tool for @DFlag{latex} or @DFlag{pdf}
 mode if none are supplied via @DFlag{prefix} and @DFlag{style} (where
 @racket[extra-files] are used only when @racket[prefix] is used). A
 byte-string value is used directly like file content, and a path can
@@ -1799,3 +1810,20 @@ See also @racketmodname[scribble/latex-prefix].}
 
 Used as a @tech{style property} on an @racket[element] to add extra
 arguments to the element's command in Latex output.}
+
+@defstruct[command-optional ([arguments (listof string?)])]{
+                                                  
+ Used as a @tech{style property} on a @racket[element] to add
+ a optional arguments to the element's command in Latex output.
+
+ @history[#:added "1.20"]
+}
+
+@defstruct[short-title ([text (or/c string? #f)])]{
+                                                  
+ Used as a @tech{style property} on a @racket[title-decl].
+ Attaches a short title to the title for a @racket[part] if
+ the Latex class file uses a short title.
+
+ @history[#:added "1.20"]
+}

scribble-doc/scribblings/scribble/generic.scrbl

@@ -10,5 +10,6 @@
 @include-section["book.scrbl"]
 @include-section["report.scrbl"]
 @include-section["sigplan.scrbl"]
+@include-section["acmart.scrbl"]
 @include-section["jfp.scrbl"]
 @include-section["lncs.scrbl"]

scribble-doc/scribblings/scribble/html.scrbl

@@ -94,6 +94,7 @@ as XHTML.
   style ; style info, which may include CDATA sections
   script ; script statements, which may include CDATA sections
   noscript ; alternate content container for non script-based rendering
+  slot
   frameset ; only one noframes element permitted per document
   frame ; tiled window within frameset
   iframe ; inline subwindow
@@ -107,6 +108,7 @@ as XHTML.
   h4
   h5
   h6
+  hgroup
   ul ; Unordered list
   ol ; Ordered (numbered) list
   menu ; single column list (DEPRECATED)
@@ -165,7 +167,10 @@ as XHTML.
   colgroup ; column group, olds col
   tr ; holds th or td
   th ; header cell
-  td)
+  td
+  details
+  dialog
+  menuitem)
 
 @(define-syntax-rule (def-tags/empty tag ...)
    @deftogether[(
@@ -179,7 +184,8 @@ as XHTML.
     (output-xml (hr))]})
 
 @(def-tags/empty
-  base meta link hr br basefont param img area input isindex col)
+  base meta link hr br basefont param img area input isindex col
+  embed keygen wbr)
 
 @(define-syntax-rule (def-entities ent ...)
    @deftogether[(
@@ -213,6 +219,52 @@ Procedures a value that renders as an inline style sheet.
                           ".racket { font-size: xx-large; }"))]}
 
 
+@subsection[#:tag "extra-html"]{Other HTML elements}
+
+@defmodule[scribble/html/extra]
+
+Provides renderers for
+@hyperlink["https://html.spec.whatwg.org/multipage/#toc-semantics"]{HTML
+elements} that are not provided by @racket[scribble/html/html].
+
+@(def-tags
+  article
+  aside
+  audio
+  bdi
+  canvas
+  data
+  datalist
+  figcaption
+  figure
+  footer
+  header
+  main
+  map
+  mark
+  math
+  meter
+  nav
+  output
+  picture
+  progress
+  rb
+  rp
+  rt
+  rtc
+  ruby
+  section
+  summary
+  svg
+  template
+  time
+  video)
+
+@(def-tags/empty
+  source
+  track)
+
+
 @; ----------------------------------------
 
 @section[#:tag "html-xml"]{Generating XML Strings}

scribble-doc/scribblings/scribble/jfp.scrbl

@@ -55,3 +55,19 @@ If different authors have different affiliations, use
 use @racket[affiliation-mark] before each different affiliation within
 a single @racket[affiliation], using @racket[(affiliation-sep)] to
 separate affiliations.}
+
+Example:
+@codeblock|{
+#lang scribble/jfp
+
+@title{My First Love Story}
+
+@((author/short "Romeo M. and Juliet C.")
+  "ROMEO" (affiliation-mark "1")
+  " and "
+  "JULIET" (affiliation-mark "2")
+  @affiliation[
+    "House Montague" (affiliation-mark "1")
+    (affiliation-sep)
+    "House Capulet" (affiliation-mark "2")])
+}|

scribble-doc/scribblings/scribble/manual.scrbl

@@ -494,18 +494,22 @@ generates
           #:grammar ([maybe-indirect code:blank
                                     #:indirect])]{
 
-Like @racket[racket], but typeset as a module path. If @racket[datum]
-is an identifier or @racket[expr] produces a symbol, then it is
-hyperlinked to the module path's definition as created by
-@racket[defmodule].
+Like @racket[racket], but typeset as a module path and without special
+treatment of identifiers (such as @racketidfont{code:blank} or identifiers
+that start with @litchar{_}). If @racket[datum] is an identifier or
+@racket[expr] produces a symbol, then it is hyperlinked to the module
+path's definition as created by @racket[defmodule].
 
 If @racket[#:indirect] is specified, then the hyperlink is given the
 @racket['indirect-link] @tech{style property}, which makes the
 hyperlink's resolution in HTML potentially delayed; see
-@racket['indirect-link] for @racket[link-element].}
+@racket['indirect-link] for @racket[link-element].
+
+@history[#:changed "1.21" @elem{Disabled @racket[racket]-style special
+                                treatment of identifiers.}]}
 
 @defform[(racketmodlink datum pre-content-expr ...)]{
-Like @racket[racketmod], but separating the module path to link
+Like @racket[racketmodname], but separating the module path to link
 from the content to be linked. The @racket[datum] module path is always
 linked, even if it is not an identifier.}
 
@@ -1399,10 +1403,12 @@ definition. The @racket[defstruct*] form corresponds to @racket[struct],
 while @racket[defstruct] corresponds to @racket[define-struct].
 
 Examples:
+
+An example using @racket[defstruct]:
 @codeblock[#:keep-lang-line? #f]|{
 #lang scribble/manual
 @defstruct[sandwich ([protein ingredient?] [sauce ingredient?])]{
-  A strucure type for sandwiches. Sandwiches are a pan-human foodstuff
+  A structure type for sandwiches. Sandwiches are a pan-human foodstuff
   composed of a partially-enclosing bread material and various
   ingredients.
 }
@@ -1410,11 +1416,28 @@ Examples:
 @doc-render-examples[
   @defstruct[#:link-target? #f
              sandwich ([protein ingredient?] [sauce ingredient?])]{
-    A strucure type for sandwiches. Sandwiches are a pan-human foodstuff
+    A structure type for sandwiches. Sandwiches are a pan-human foodstuff
     composed of a partially-enclosing bread material and various
     ingredients.
   }]
+
+Additionally, an example using @racket[defstruct*]:
+@codeblock[#:keep-lang-line? #f]|{
+#lang scribble/manual
+@defstruct*[burrito ([salsa ingredient?] [tortilla ingredient?])]{
+  A structure type for burritos. Burritos are a pan-human foodstuff
+  composed of a @emph{fully}-encolosed bread material and various
+  ingredients.
 }
+}|
+}
+@doc-render-examples[
+ @defstruct*[#:link-target? #f
+             burrito ([salsa ingredient?] [tortilla ingredient?])]{
+    A structure type for burritos. Burritos are a pan-human foodstuff
+    composed of a @emph{fully}-encolosed bread material and various
+    ingredients.
+  }]
 
 
 @defform[(deftogether [def-expr ...] pre-flow ...)]{
@@ -1794,9 +1817,9 @@ key; in either case, if @racket[normalize?] is true, the key is normalized in th
 arguments support cross-document and section-specific references, like
 in @racket[secref].
 For example:
-@racketblock[@tech[#:doc '(lib "scribblings/guide/guide.scrbl")]{blame object}]
+@racketblock[@tech[#:doc '(lib "scribblings/reference/reference.scrbl")]{blame object}]
 
-creates a link to @tech[#:doc '(lib "scribblings/guide/guide.scrbl")]{blame object} in
+creates a link to @tech[#:doc '(lib "scribblings/reference/reference.scrbl")]{blame object} in
 @other-doc['(lib "scribblings/guide/guide.scrbl")].
 
 With the default style files, the hyperlink created by @racket[tech]
@@ -1949,6 +1972,28 @@ produced by @racket[content-expr] should normally start with a capital
 letter and end with a period, but it can be a sentence fragment such
 as ``Added a @racket[#:changed] form.''
 
+Examples:
+@codeblock[#:keep-lang-line? #f]|{
+#lang scribble/manual
+@defthing[tasty-burrito burrito?]{
+  Compatible with the API of a sandwich, but not legally a
+  sandwich in Massachusetts.
+
+  @history[#:added "1.0"
+           #:changed "1.1" "Refactored tortilla."
+           #:changed "1.2" @elem{Now includes @emph{guacamole}.}]
+}
+}|
+@doc-render-examples[
+  @defthing[tasty-burrito burrito?]{
+    Compatible with the API of a sandwich, but not legally a
+    sandwich in Massachusetts.
+
+    @history[#:added "1.0"
+             #:changed "1.1" "Refactored tortilla."
+             #:changed "1.2" @elem{Now includes @emph{guacamole}.}]
+}]
+
 @history[#:added "1.1"]}
 
 @; ------------------------------------------------------------------------
@@ -2049,6 +2094,16 @@ rendered document.}
 Indicates that the index entry corresponds to a module definition via
 @racket[defmodule] and company.}
 
+@deftogether[(
+@defstruct[(language-index-desc module-path-index-desc) ()]{}
+@defstruct[(reader-index-desc module-path-index-desc) ()]{}
+)]{
+Indicates that the index entry corresponds to a module definition via
+@racket[defmodule] with the @racket[#:lang] or @racket[#:reader] option.
+For example, a module definition via @racket[defmodulelang] has a
+@racket[language-index-desc] index entry and a module definition via
+@racket[defmodulereader] has a @racket[reader-index-desc] index entry.}
+
 @defstruct[exported-index-desc ([name symbol?]
                                [from-libs (listof module-path?)])]{
 

scribble-doc/scribblings/scribble/plt.scrbl

@@ -16,7 +16,6 @@ relevant libraries and APIs in detail.
 @local-table-of-contents[]
 
 @include-section["how-to.scrbl"]
-@include-section["style.scrbl"]
 @include-section["manual.scrbl"]
 @include-section["scheme.scrbl"]
 @include-section["examples.scrbl"]

scribble-doc/scribblings/scribble/reader.scrbl

@@ -172,6 +172,7 @@ expression.
 @scribble-examples|==={
   @foo{(+ 1 2) -> @(+ 1 2)!}
   @foo{A @"string" escape}
+  @"@"
 }===|
 
 Note that an escaped Racket string is merged with the surrounding text

scribble-doc/scribblings/scribble/renderer.scrbl

@@ -396,6 +396,16 @@ are own their own pages. A value of @racket[0] is treated the same as
 
 Specializes a @racket[render<%>] class for generating Latex input.}}
 
+@defparam[extra-character-conversions convs (-> char? (or/c string? #f))]{
+Function that maps (special) characters to strings corresponding to the Latex
+code that should be used to render them. This function should return false for
+any character it does not know how to handle.
+
+Scribble already converts many special characters to the proper Latex
+commands. This parameter should be used in case you need characters it does not
+support yet.
+}
+
 @; ----------------------------------------
 
 @section{PDF Renderer}
@@ -405,7 +415,20 @@ Specializes a @racket[render<%>] class for generating Latex input.}}
 @defmixin[render-mixin (render<%>) ()]{
 
 Specializes a @racket[render<%>] class for generating PDF output via
-Latex, building on @|latex:render-mixin| from @racketmodname[scribble/latex-render].}}
+Latex, building on @|latex:render-mixin| from @racketmodname[scribble/latex-render].}
+
+@defmixin[dvi-render-mixin (render<%>) ()]{
+
+Like @racket[render-mixin], but generates PDF output via @exec{latex},
+@exec{dvips}, and @exec{pstopdf}.
+
+@history[#:added "1.4"]}}
+
+@defmixin[xelatex-render-mixin (render<%>) ()]{
+
+Like @racket[render-mixin], but generates PDF output via @exec{xelatex}.
+
+@history[#:added "1.19"]}
 
 @; ----------------------------------------
 

scribble-doc/scribblings/scribble/running.scrbl

@@ -35,6 +35,9 @@ its file suffix:
  @item{@DFlag{pdf} --- PDF @filepath{@|fn|.pdf} that is generated
        via @exec{pdflatex}}
 
+ @item{@DFlag{xelatex} --- PDF @filepath{@|fn|.pdf} that is generated
+       via @exec{xelatex}}
+
  @item{@DFlag{dvipdf} --- PDF @filepath{@|fn|.pdf} that is generated
        via @exec{latex}, @exec{dvips}, and @exec{pstopdf}}
 
@@ -65,14 +68,17 @@ source declares a module. The module should either have a @racket[doc]
 that exports @racket[doc] as a @racket[part], or it should directly
 export @racket[doc] as a @racket[part]. (The submodule is tried first,
 and the main module is not directly loaded or evaluated if the
-submodule can be loaded on its own.)
+submodule can be loaded on its own.) Use @DFlag{doc-binding} to
+access an alternate exported name in place of @racket[doc].
 
 When multiple documents are rendered at the same time, cross-reference
 information in one document is visible to the other documents. See
 @secref["xref-flags"] for information on references that cross
 documents that are built separately.
 
-@history[#:changed "1.4" @elem{Added @DFlag{dvipdf}.}]
+@history[#:changed "1.4" @elem{Added @DFlag{dvipdf}.}
+         #:changed "1.18" @elem{Added @DFlag{doc-binding}.}
+         #:changed "1.19" @elem{Added @DFlag{xelatex}.}]
 
 @section{Extra and Format-Specific Files}
 
@@ -209,4 +215,4 @@ and rendered, which could affect the content that
 @filepath{turtle.scrbl} generates if it uses
 @racket[current-command-line-arguments].
 
-@history[#:changed "1.1" @elem{Added the empty-vector default and @DPFlag{arg} flag.}]
+@history[#:changed "1.1" @elem{Added the empty-vector default and @DPFlag{arg} flag.}]

scribble-doc/scribblings/scribble/sigplan.scrbl

@@ -5,7 +5,7 @@
 
 @defmodulelang[scribble/sigplan]{The @racketmodname[scribble/sigplan]
 language is like @racketmodname[scribble/base], but configured with
-Latex style defaults to use the @filepath{sigplanconf.cls} class
+LaTeX style defaults to use the @filepath{sigplanconf.cls} class
 file that is included with Scribble.}
 
 @defidform[preprint]{

scribble-doc/scribblings/scribble/style.scrbl

@@ -1,231 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual scribble/eval "utils.rkt"
-          (for-label scribble/manual scribble/eval))
-
-@title[#:tag "reference-style"]{Style Guide}
-
-Consistent style---for terms, typesetting, and prose---makes
-documentation clearer. As much as possible, follow the rules listed in
-this section. Many of the rules are arbitrary in the sense that a
-different choice of rule could work fine, but the only way to make our
-documentation consistent is to pick one of the choices.
-
-There are too many rules to absorb easily on a first reading. Re-read
-this section after writing documentation for a library or two, and
-revisit the section periodically to refresh your memory and check for
-new rules.
-
-@section{Prose and Terminology}
-
-In the descriptive body of @racket[defform], @racket[defproc], etc.,
-do not start with ``This ...'' Instead, start with a sentence whose
-implicit subject is the form or value being described (but only start
-the first sentence that way). Capitalize the first word. Thus, the
-description will often start with ``Returns'' or ``Produces.''  Refer
-to arguments and sub-forms by name.
-
-Do not use the word ``argument'' to describe a sub-form in a syntactic
-form; use the term ``sub-form'' instead, reserving ``argument'' for
-values or expressions in a function call.  Refer to libraries and
-languages as such, rather than as ``modules'' (even though the form to
-typeset a library or language name is called @racket[racketmodname]).
-Do not call an identifier (i.e., a syntactic element) a ``variable''
-or a ``symbol.'' Do not use the word ``expression'' for a form that is
-a definition or might be a definition; use the word ``form,'' instead.
-Prefer ``function'' to ``procedure.''
-
-Use the word ``list'' only when you mean a run-time value consisting
-of the empty list and cons cells; use the word ``sequence'' in other
-cases, if you must use any word. For example, do not write that
-@racket[begin] has a ``list of sub-forms;'' instead, it has a
-``sequence of sub-forms.'' Similarly, do not refer to a ``list of
-arguments'' in a function call; just write ``arguments'' if possible,
-or write ``sequence of argument expressions.''  (Unfortunately,
-``@tech[#:doc '(lib
-"scribblings/reference/reference.scrbl")]{sequence}'' has acquired a
-specific run-time meaning, too, but the collision is less severe than
-the historical confusion between lists and other entities in Lisp.)
-
-Avoid cut-and-paste for descriptive text. If two functions are
-similar, consider documenting them together with
-@racket[deftogether]. To abstract a description, consider using
-explicit prose abstraction, such as ``@racket[x] is like @racket[y],
-except that ...,'' instead of abstracting the source and instantiating
-it multiple times; often, a prose abstraction is clearer to the reader
-than a hidden abstraction in the document implementation.
-
-Hyphenate the words ``sub-form'' and ``sub-expression.''
-
-Use ``Windows,'' ``Mac OS X,'' and ``Unix'' for the three
-``platforms'' (as opposed to ``systems'') on which Racket runs. Use
-``Unix'' as a generic term for Unix-like operating systems---notably
-including Linux---other than Mac OS X. Use ``Unix'' even when ``Gtk''
-or ``the X11 windowing system'' would be more precisely correct, but
-use ``X11'' as adjective when necessary, such as ``X11 display.''
-Racket runs ``on'' a platform, as opposed to ``under'' a platform.
-
-
-@section{Typesetting Code}
-
-Use @racketidfont{id} or a name that ends @racketidfont{-id} in
-@racket[defform] to mean an identifier, not @racketidfont{identifier},
-@racketidfont{variable}, @racketidfont{name}, or
-@racketidfont{symbol}. Similarly, use @racketidfont{expr} or something
-that ends @racketidfont{-expr} for an expression position within a
-syntactic form. Use @racketidfont{body} for a form (definition or
-expression) in an internal-definition position---always followed by 
-@racket[...+] in a grammar description. Do not use
-@racketidfont{expr} for something that isn't exactly an expression,
-@racket[id] for something that isn't exactly an identifier, etc.;
-instead, use @racket[defform/subs] to define a new non-terminal.
-
-Beware of using @racket[deftogether] to define multiple variants of a
-syntactic form or procedure, because each @racket[defform] or
-@racket[defproc] creates a definition point, but each form or
-procedure should have a single definition point. (Scribble issues a
-warning when a binding has multiple definition points.) Instead, use
-@racket[defproc*] or @racket[defform*].
-
-For function arguments, use @racket[v] as the meta-variable for ``any
-value.'' Use @racket[x] as a meta-variable only for numerical
-values. Other conventions include @racket[lst] for a list and
-@racket[proc] for a procedure.
-
-Pay attention to the difference between identifiers and meta-variables
-when using @racket[racket], especially outside of @racket[defproc] or
-@racket[defform]. Prefix a meta-variable with @litchar{_}; for
-example,
-
-@verbatim[#:indent 2]|{@racket[(rator-expr rand-expr ...)]}|
-
-would be the wrong way to refer to the grammar of a function call,
-because it produces @racket[(rator-expr rand-expr ...)], where
-@racketidfont{rator-expr} and @racketidfont{rand-expr} are
-typeset as variables. The correct description is
-
-@verbatim[#:indent 2]|{@racket[(_rator-expr _rand-expr ...)]}|
-
-which produces @racket[(_rator-expr _rand-expr ...)], where
-@racketidfont{rator-expr} and @racketidfont{rand-expr} are typeset as
-meta-variables. The @racket[defproc], @racket[defform], @|etc| forms
-greatly reduce this burden in descriptions, since they automatically
-set up meta-variable typesetting for non-literal identifiers. In
-@racket[defform], be sure to include literal identifiers (i.e., those
-not meant as variables, other than the form name being defined) in a
-@racket[#:literals] clause.
-
-To typeset an identifier with no particular interpretation---syntax,
-variable, meta-variable, etc.---use @racket[racketidfont] (e.g., as in
-@racketidfont{rand-expr} above).  Otherwise, use @racket[litchar],
-not merely @racket[racketfont] or @racket[verbatim], to refer to a
-specific sequence of characters.
-
-When a syntactic form synthesizes an identifier from a given
-identifier, use a combination of @racket[racketidfont] and
-@racket[racket] to describe the identifiers. For example, if
-@racket[_id] is combined with @racketidfont{is-} and @racketidfont{?}
-to form @racketidfont{is-}@racket[_id]@racketidfont{?}, then implement
-that identifier as
-@code[#:lang "at-exp racket"]|{@racketidfont{is-}@racket[id]@racketidfont{?}}|.
-
-When using @racket[defform] to describe a syntactic form, don't
-confuse the @racket[#:contracts] clause with a grammar
-specification. Use @racket[#:contracts] only for expressions within the
-syntactic form, and the contract is a run-time constraint---not a
-syntactic constraint, such as requiring a sub-form to be an identifier.
-Use @racket[defform/subs] for syntactic constraints.
-
-When showing example evaluations, use the REPL-snapshot style:
-
-@verbatim[#:indent 2]|{
-  @interaction[
-  (+ 1 2)
-  ]
-}|
-
-See also the @racket[scribble/eval] library and @secref["examples-style"].
-
-Use four dots, @litchar{....}, in place of omitted code, since
-@litchar{...} means repetition.
-
-
-@section{Typesetting Prose}
-
-Refrain from referring to documentation ``above'' or ``below,'' and
-instead have a hyperlink point to the right place.
-
-In prose, use @litchar{``} and @litchar{''} quotation marks instead of
-@litchar{"}. Use @litchar{---} for an em dash, and do not include
-spaces on either side. Use American style for quotation marks and punctuation
-@; [Eli] BTW, I've asked several people about this, and the general
-@;   agreement that I've seen is that this is a rather arbitrary rule
-@;   and there's no harm in doing the more logical thing of putting
-@;   the punctuations outside quotations and parens.  Just like you
-@;   did at the end of this sentence...
-@; [Matthew] See intro of this section.
-at the end of quotation marks (i.e., a sentence-terminating period
-goes inside the quotation marks). Of course, this rule does not apply
-for quotation marks that are part of code.
-
-Do not use a citation reference (as created by @racket[cite]) as a
-noun; use it as an annotation.
-
-Do not start a sentence with a Racket variable name, since it is
-normally lowercase. For example, use ``The @racket[_thing] argument
-is...'' instead of ``@racket[_thing] is...''
-
-Use @racket[etc] for ``@|etc|'' when it does not end a sentence, and
-include a comma after ``@|etc|'' unless it ends a sentence of is
-followed by other punctuation (such as a parenthesis).
-
-@section{Section Titles}
-
-Capitalize all words except articles (``the,'' ``a,'' etc.),
-prepositions, and conjunctions that are not at the start of the title.
-
-A manual title should normally start with a suitable keyword or key
-phrase (such as ``Scribble'' for this manual) that is in boldface. If
-the key word is primarily an executable name, use @racket[exec]
-instead of @racket[bold]. Optionally add further descriptive text in
-the title after a colon, where the text starting with the colon is not
-in boldface.
-
-@section{Indexing}
-
-Document and section titles, identifiers that are documented with
-@racket[defproc], @racket[defform], etc. are automatically indexed, as
-are terms defined with @racket[deftech].
-
-Symbols are not indexed automatically.  Use @racket[indexed-racket]
-instead of @racket[racket] for the instance of a symbol that roughly
-defines the use. For an example, try searching for ``truncate'' to
-find @racket['truncate] as used with @racket[open-output-file]. Do no
-use something like @racket[(index "'truncate")] to index a symbol,
-because it will not typeset correctly (i.e., in a fixed-width font
-with the color of a literal).
-
-Use @racket[index], @racket[as-index], and @racket[section-index] as a
-last resort. Create index entries for terms that are completely
-different from terms otherwise indexed. Do not try to index minor
-variations of a term or phrase in an attempt to improve search
-results; if search fails to find a word or phrase due to a minor
-variation, then the search algorithm should be fixed, not the index
-entry.
-
-@section[#:tag "examples-style"]{Examples}
-
-Strive to include examples (using @racket[examples]) with the
-documentation of every function and syntactic form. When writing
-examples, refrain from using nonsense words like ``foo'' and ``bar.''
-For example, when documenting @racket[member], resist the temptation
-to write
-
-@interaction[
-(member "foo" '("bar" "foo" "baz"))
-]
-
-and instead write something like
-
-@interaction[
-(member "Groucho" '("Harpo" "Groucho" "Zeppo"))
-]

scribble-doc/scribblings/scribble/xref.scrbl

@@ -80,12 +80,18 @@ get all cross-reference information for installed documentation.
                                                       (list/c (or/c module-path?
                                                                     module-path-index?)
                                                               symbol?)
-                                                      (listof module-path-index?
+                                                      (list/c module-path-index?
                                                               symbol?
                                                               module-path-index?
                                                               symbol?
                                                               (one-of/c 0 1)
                                                               (or/c exact-integer? false/c)
+                                                              (or/c exact-integer? false/c))
+                                                      (list/c (or/c module-path?
+                                                                    module-path-index?)
+                                                              symbol?
+                                                              (one-of/c 0 1)
+                                                              (or/c exact-integer? false/c)
                                                               (or/c exact-integer? false/c)))]
                                        [mode (or/c exact-integer? false/c)])
          (or/c tag? false/c)]{

scribble-doc/scriblib/scribblings/autobib.scrbl

@@ -52,8 +52,8 @@ includes a citation to section 8 of the Racket reference.
               ([option (code:line #:style style-expr)
                        (code:line #:disambiguate disambiguator-expr)
                        (code:line #:spaces spaces-expr)
-                       (code:line #:render-date-bib render-date-expr)
-                       (code:line #:render-date-cite render-date-expr)
+                       (code:line #:render-date-in-bib render-date-expr)
+                       (code:line #:render-date-in-cite render-date-expr)
                        (code:line #:date<? date-compare-expr)
                        (code:line #:date=? date-compare-expr)])
               #:contracts ([style-expr (or/c author+date-style number-style)]

scribble-doc/scriblib/scribblings/footnote.scrbl

@@ -14,13 +14,12 @@ Creates a margin note for HTML and a footnote for Latex/PDF output.}
 
 @defform[(define-footnote footnote-id footnote-part-id)]{
 
-Binds @racket[footnote-id] to a form like @racket[note] that generates
-a footnote in HTML output as well as Latex/PDF output. To trigger the
-HTML output of the footnotes that are registered through
-@racket[footnote-id], the function bound to @racket[footnote-part-id]
-must be called at a position that corresponds the bottom of the HTML
-page. (The generated section will not show a title or appear in a
-table of contents; it will look like a footnote area.)
+Binds @racket[footnote-id] to a form like @racket[note] that registers a
+footnote.
+Binds @racket[footnote-part-id] to a function that generates a section to
+display the registered footnotes.
+(The section generated by @racket[footnote-part-id] will not show a title or
+appear in a table of contents; it will look like a footnote area.)
 
 Beware that any content passed to @racket[footnote-id] will occur
 twice in at least an intermediate form of the document, and perhaps
@@ -28,6 +27,24 @@ also in the rendered form of the document. Consequently, the content
 passed to @racket[footnote-id] should not bind link targets or include
 other one-time declarations.}
 
+Example:
+@codeblock|{
+  #lang scribble/manual
+  @require[scriblib/footnote]
 
+  @define-footnote[my-note make-my-note]
 
+  @title{Months of the Year}
 
+  @section{January}
+  January has 31 days.
+
+  @section{February}
+  February has 28 days in common years.@my-note{In leap years,
+  February has 29 days.}
+
+  @make-my-note[]
+
+  @section{March}
+  March has 30 days.
+}|

scribble-html-lib/scribble/html/extra.rkt

@@ -0,0 +1,42 @@
+#lang racket/base
+
+;; (X)HTML elements that are uncommon / likely to cause namespace conflicts
+
+(require "xml.rkt")
+
+(define/provide-elements/empty
+  source
+  track)
+
+(define/provide-elements/not-empty
+  article
+  aside
+  audio
+  bdi
+  canvas
+  data
+  datalist
+  figcaption
+  figure
+  footer
+  header
+  main
+  map
+  mark
+  math
+  meter
+  nav
+  output
+  picture
+  progress
+  rb
+  rp
+  rt
+  rtc
+  ruby
+  section
+  summary
+  svg
+  template
+  time
+  video)

scribble-html-lib/scribble/html/html.rkt

@@ -1,6 +1,9 @@
 #lang racket/base
 
 ;; (X)HTML elements etc.
+;; Keep this file up to date with:
+;;    https://html.spec.whatwg.org/multipage/#toc-semantics
+;; Put esoteric elements in scribble/html/extra
 
 (require "xml.rkt" scribble/text)
 
@@ -59,6 +62,7 @@
   style ; style info, which may include CDATA sections
   script ; script statements, which may include CDATA sections
   noscript ; alternate content container for non script-based rendering
+  slot
   ;; ========== Frames
   frameset ; only one noframes element permitted per document
   frame ; tiled window within frameset
@@ -76,6 +80,7 @@
   h4
   h5
   h6
+  hgroup
   ;; ========== Lists
   ul ; Unordered list
   ol ; Ordered (numbered) list
@@ -163,11 +168,16 @@
   tr ; holds th or td
   th ; header cell
   td ; table cell
+  ;; ========== Interactive Elements
+  details
+  dialog
+  menuitem
   )
 
 ;; [*] empty elements, these are listed with an `EMPTY' content in
 ;; http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd
 (define/provide-elements/empty
+  embed keygen wbr
   base meta link hr br basefont param img area input isindex col)
 
 ;; [*] elements with a cdata/comment body

scribble-lib/info.rkt

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

scribble-lib/scribble/acmart.rkt

@@ -0,0 +1,381 @@
+#lang racket/base
+
+(require setup/collects
+         racket/contract/base
+         racket/list
+         scribble/core
+         scribble/base
+         scribble/decode
+         scribble/html-properties
+         scribble/latex-properties
+         scribble/private/tag
+         (for-syntax racket/base))
+
+(struct affiliation (position institution street-address city state postcode country)
+  #:constructor-name author-affiliation
+  #:name author-affiliation
+  #:transparent)
+
+(struct email (text)
+  #:constructor-name author-email
+  #:name author-email
+  #:transparent)
+
+(struct institution (name departments)
+  #:constructor-name author-institution
+  #:name author-institution
+  #:transparent)
+
+(provide/contract
+ [title (->* ()
+             (#:short pre-content?
+              #:tag (or/c string? (listof string?) #f)
+              #:tag-prefix (or/c string? module-path? #f)
+              #:style (or/c style? string? symbol? #f)
+              #:version (or/c string? #f)
+              #:date (or/c string? #f))
+             #:rest (listof pre-content?)
+             title-decl?)]
+ [author (->* ()
+              (#:orcid (or/c pre-content? #f)
+               #:affiliation (or/c pre-content?
+                                   affiliation?
+                                   (listof affiliation?)
+                                   #f)
+               #:email (or/c pre-content? email? (listof email?) #f))
+              #:rest (listof pre-content?)
+              block?)]
+ [institution (->* ()
+                   (#:departments (listof (or/c pre-content? institution?)))
+                   #:rest pre-content?
+                   institution?)]
+ [institution? (-> any/c boolean?)]
+ [email (->* ()
+             #:rest (listof pre-content?)
+             email?)]
+ [email? (-> any/c boolean?)]
+ [affiliation (->* ()
+                   (#:position (or/c pre-content? #f)
+                    #:institution (or/c pre-content? institution? (listof institution?) #f)
+                    #:street-address (or/c pre-content? #f)
+                    #:city (or/c pre-content? #f)
+                    #:state (or/c pre-content? #f)
+                    #:postcode (or/c pre-content? #f)
+                    #:country (or/c pre-content? #f))
+                   affiliation?)]
+ [affiliation? (-> any/c boolean?)]
+ [abstract 
+  (->* () () #:rest (listof pre-content?)
+       block?)]
+ [acmConference 
+  (-> string? string? string? block?)]
+ [grantsponsor 
+  (-> string? string? string? block?)]
+ [grantnum 
+  (->* (string? string?) (#:url string?) block?)]
+ [acmBadgeR (->* (string?) (#:url string?) block?)]
+ [acmBadgeL (->* (string?) (#:url string?) block?)]
+ [received (->* (string?) (#:stage string?) block?)]
+ [citestyle (-> content? block?)]
+ [CCSXML 
+  (->* () () #:rest (listof pre-content?)
+       any/c)])
+
+(define-syntax-rule (defopts name ...)
+  (begin (define-syntax (name stx)
+           (raise-syntax-error #f
+                               "option must appear on the same line as `#lang scribble/acmart'"
+                               stx))
+         ...
+         (provide name ...)))
+
+(define-syntax-rule (define-commands name ...)
+  (begin
+    (begin
+      (provide/contract [name (->* () () #:rest (listof pre-content?)
+                                   block?)])
+      (define (name . str)
+        (make-paragraph (make-style 'pretitle '())
+                        (make-element (make-style (symbol->string 'name) command-props)
+                                      (decode-content str)))))
+    ...))
+
+(define-syntax-rule (define-environments name ...)
+  (begin
+    (begin
+      (provide/contract [name (->* () () #:rest (listof pre-content?)
+                                   block?)])
+      (define (name . str)
+        (make-nested-flow (make-style (symbol->string 'name) acmart-extras)
+                          (decode-flow str))))
+    ...))
+
+; comment environments ensure the \begin and \end are on their own lines
+(define-syntax-rule (define-comment-environments name ...)
+  (begin
+    (begin
+      (provide/contract [name (->* () () #:rest (listof pre-content?)
+                                   block?)])
+      (define (name . str)
+        (make-nested-flow (make-style (symbol->string 'name) acmart-extras)
+                          (append (list (make-paragraph (style #f '()) '("")))
+                                  (decode-flow str)
+                                  (list (make-paragraph (style #f '()) '("")))))))
+    ...))
+
+; format options
+(defopts manuscript acmsmall acmlarge acmtog sigconf siggraph sigplan sigchi sigchi-a)
+; boolean options
+(defopts review screen natbib anonymous authorversion 9pt 10pt 11pt 12pt)
+
+(define acmart-extras
+  (let ([abs (lambda (s)
+               (path->collects-relative
+                (collection-file-path s "scribble" "acmart")))])
+    (list
+     (make-css-addition (abs "acmart.css"))
+     (make-tex-addition (abs "acmart.tex")))))
+
+;; ----------------------------------------
+;; Abstracts:
+
+(define abstract-style (make-style "abstract" (cons 'pretitle acmart-extras)))
+
+(define command-props (cons 'command acmart-extras))
+(define multicommand-props (cons 'multicommand acmart-extras))
+
+(define (abstract . strs)
+  (make-nested-flow
+   abstract-style
+   (decode-flow strs)))
+
+(define (acmConference name date venue)
+  (make-paragraph (make-style 'pretitle '())
+                  (make-multiarg-element (make-style "acmConference" multicommand-props)
+                                         (list (decode-string name)
+                                               (decode-string date)
+                                               (decode-string venue)))))
+
+(define (grantsponsor id name url)
+  (make-paragraph (make-style 'pretitle '())
+                  (make-multiarg-element (make-style "grantsponsor" multicommand-props)
+                                         (list (decode-string id)
+                                               (decode-string name)
+                                               (decode-string url)))))
+
+(define (grantnum #:url [url #f] id num)
+  (make-paragraph (make-style 'pretitle '())
+                  (if url
+                      (make-multiarg-element (make-style "SgrantnumURL" multicommand-props)
+                                             (list (decode-string url)
+                                                   (decode-string id)
+                                                   (decode-string num)))
+                      (make-multiarg-element (make-style "grantnum" multicommand-props)
+                                             (list (decode-string id)
+                                                   (decode-string num))))))
+
+(define (acmBadgeR #:url [url #f] str)
+  (make-paragraph (make-style 'pretitle '())
+                  (if url
+                      (make-multiarg-element (make-style "SacmBadgeRURL" multicommand-props)
+                                             (list (decode-string url)
+                                                   (decode-string str)))
+                      (make-element (make-style "acmBadgeR" command-props)
+                                    (decode-string str)))))
+  
+(define (acmBadgeL #:url [url #f] str)
+  (make-paragraph (make-style 'pretitle '())
+                  (if url
+                      (make-multiarg-element (make-style "SacmBadgeLURL" multicommand-props)
+                                             (list (decode-string url)
+                                                   (decode-string str)))
+                      (make-element (make-style "acmBadgeL" command-props)
+                                    (decode-string str)))))
+
+(define (received #:stage [s #f] str)
+  (make-paragraph (make-style 'pretitle '())
+                  (if s
+                      (make-multiarg-element (make-style "SreceivedStage" multicommand-props)
+                                             (list (decode-string s)
+                                                   (decode-string str)))
+                      (make-element (make-style "received" command-props)
+                                    (decode-string str)))))
+
+(define (citestyle str)
+  (make-paragraph (make-style 'pretitle '())
+                  (make-element (make-style "citestyle" command-props)
+                                (decode-string str))))
+
+(define (ccsdesc #:number [n #f] str)
+  (make-paragraph (make-style 'pretitle '())
+                  (if n
+                      (make-multiarg-element (make-style "SccsdescNumber" multicommand-props)
+                                             (list (number->string n)
+                                                   (decode-string str)))
+                      (make-element (make-style "ccsdesc" command-props)
+                                    (decode-string str)))))
+
+(define (title #:tag [tag #f]
+               #:tag-prefix [prefix #f]
+               #:style [style plain]
+               #:version [version #f]
+               #:date [date #f]
+               #:short [short #f]
+               . str)
+  (let ([content (decode-content str)])
+    (make-title-decl (prefix->string prefix)
+                     (convert-tag tag content)
+                     version
+                     (let* ([s (convert-part-style 'title style)]
+                            [s (if date
+                                   (make-style (style-name s)
+                                               (cons (make-document-date date)
+                                                     (style-properties s)))
+                                   s)]
+                            [s (if short
+                                   (make-style (style-name s)
+                                               (cons (short-title short)
+                                                     (style-properties s)))
+                                   s)])
+                       s)
+                     content)))
+
+(define (author #:orcid [orcid #f]
+                #:affiliation [affiliation '()]
+                #:email [email '()]
+                . name)
+  (make-paragraph
+   (make-style 'author command-props)
+   (decode-content
+    (list
+     (make-multiarg-element (make-style "SAuthorinfo" multicommand-props)
+                            (list (make-element #f (decode-content name))
+                                  (make-element #f
+                                                (if orcid
+                                                    (make-element
+                                                     (make-style "SAuthorOrcid" multicommand-props)
+                                                     (decode-content (list orcid)))
+                                                    '()))
+                                  (make-element #f
+                                                (cond
+                                                  [(affiliation? affiliation)
+                                                   (convert-affiliation affiliation)]
+                                                  [(pre-content? affiliation)
+                                                   (make-element
+                                                    (make-style "SAuthorPlace" multicommand-props)
+                                                    (decode-content (list affiliation)))]
+                                                  [else
+                                                   (for/list ([a (in-list affiliation)])
+                                                     (convert-affiliation a))]))
+                                  (make-element #f
+                                                (cond
+                                                  [(email? email)
+                                                   (convert-email email)]
+                                                  [(pre-content? email)
+                                                   (make-element
+                                                    (make-style "SAuthorEmail" multicommand-props)
+                                                    (decode-content (list email)))]
+                                                  [else
+                                                   (for/list ([e (in-list email)])
+                                                     (convert-email e))]))))))))
+  
+(define (institution #:departments [departments '()]
+                     . name)
+  (author-institution name departments))
+
+(define (convert-institution inst
+                             #:department? [department? #f])
+  (define level 0)
+  (define (mk-inst name
+                   #:department? [department? department?]
+                   #:level [level level])
+    (displayln department?)
+    (case department?
+      [(#f) (make-element (make-style "institution" command-props)
+                          (decode-content name))]
+      [(sub) (make-element (make-style "department"
+                                       (cons (command-optional (list (number->string level)))
+                                             command-props))
+                           (decode-content name))]
+      [else (make-element (make-style "department"
+                                      (append
+                                       (if (> level 0)
+                                           (list (command-optional (list (number->string level))))
+                                           (list))
+                                       command-props))
+                          (decode-content name))]))
+  (define lst
+    (append
+     (for/list ([i (in-list (institution-departments inst))])
+       (cond
+         [(institution? i)
+          (define-values (content new-level)
+            (convert-institution i
+                                 #:department? (or (and department? 'sub)
+                                                   #t)))
+          (set! level (max level (+ 1 new-level)))
+          content]
+         [else
+          (set! level 1)
+          (mk-inst (list i)
+                   #:department? (or (and department? 'sub)
+                                     #t)
+                   #:level 0)]))
+     (list (mk-inst (institution-name inst)))))
+  (if department?
+      (values lst level)
+      lst))
+
+(define (email . text)
+  (author-email text))
+
+(define (convert-email email)
+  (make-element
+   (make-style "SAuthorEmail" command-props)
+   (decode-content (email-text email))))
+
+(define (affiliation #:position [position #f]
+                     #:institution [institution #f]
+                     #:street-address [street-address #f]
+                     #:city [city #f]
+                     #:state [state #f]
+                     #:postcode [postcode #f]
+                     #:country [country #f])
+  (author-affiliation position institution street-address city state postcode country))
+
+(define (convert-affiliation aff)
+  (define (maybe-element str content)
+    (and (content aff) (make-element str (decode-content (list (content aff))))))
+  (make-element
+   (make-style "SAuthorPlace" command-props)
+   (make-multiarg-element
+    (make-style #f multicommand-props)
+    (filter values
+            (append (list (maybe-element "position" affiliation-position))
+                    (if (institution? (affiliation-institution aff))
+                        (convert-institution (affiliation-institution aff))
+                        (list (maybe-element "institution" affiliation-institution)))
+                    (list (maybe-element "streetaddress" affiliation-street-address)
+                          (maybe-element "city" affiliation-city)
+                          (maybe-element "state" affiliation-state)
+                          (maybe-element "postcode" affiliation-postcode)
+                          (maybe-element "country" affiliation-country)))))))
+  
+(define-commands subtitle acmJournal
+  thanks titlenote subtitlenote authornote acmVolume acmNumber acmArticle acmYear acmMonth
+  acmArticleSeq acmPrice acmISBN acmDOI
+  startPage terms keywords
+  setcopyright copyrightyear
+  settopmatter hortauthors)
+
+(define (CCSXML . strs)
+  (make-nested-flow (make-style "CCSXML" '())
+                    (list (make-paragraph (make-style #f '())
+                                          (make-element (make-style #f '(exact-chars))
+                                                        (apply string-append strs))))))
+
+(define-environments teaserfigure sidebar marginfigure margintable)
+(define-comment-environments printonly screenonly anonsuppress acks)
+
+; FIXME: theorem styles
+

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

@@ -0,0 +1,4 @@
+% Avoid package option conflict
+\renewcommand\packageColor\relax
+\let\Footnote\undefined
+\let\captionwidth\undefined

scribble-lib/scribble/acmart/acmart.css

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

scribble-lib/scribble/acmart/acmart.tex

@@ -0,0 +1,26 @@
+
+% Support for styles in scribble/acmart
+
+% These are replaced by scribble/acmart/style.tex,
+%  which is used in combination with acmart.cls
+
+\newcommand{\SAuthorinfo}[4]{#1}
+\newcommand{\SAuthorPlace}[1]{#1}
+\newcommand{\SAuthorEmail}[1]{#1}
+\newcommand{\SAuthorOrcid}[1]{#1}
+
+\newcommand{\SConferenceInfo}[2]{}
+\newcommand{\SCopyrightYear}[1]{}
+\newcommand{\SCopyrightData}[1]{}
+\newcommand{\Sdoi}[1]{}
+\newcommand{\SPexclusivelicense}[0]{}
+
+\newcommand{\SCategory}[3]{}
+\newcommand{\SCategoryPlus}[4]{}
+\newcommand{\STerms}[1]{}
+\newcommand{\SKeywords}[1]{}
+
+% Normally gets re-written by the title macro:
+\newcommand{\SSubtitle}[1]{{\bf #1}}
+
+

scribble-lib/scribble/acmart/lang.rkt

@@ -0,0 +1,149 @@
+#lang racket/base
+(require scribble/doclang
+         scribble/core
+         (except-in scribble/base author title)
+         scribble/acmart
+         scribble/latex-prefix
+         racket/list
+         "../private/defaults.rkt"
+         (for-syntax racket/base))
+(provide (except-out (all-from-out scribble/doclang) #%module-begin)
+         (all-from-out scribble/acmart)
+         (all-from-out scribble/base)
+         (rename-out [module-begin #%module-begin]))
+
+(define-syntax (module-begin stx)
+  (syntax-case stx ()
+    [(_ id . body)
+     (let ([format? #f]
+           [review? #f]
+           [screen? #f]
+           [natbib? #f]
+           [anonymous? #f]
+           [authorversion? #f]
+           [font-size #f])
+       (let loop ([stuff #'body])
+         (syntax-case* stuff (manuscript acmsmall acmlarge acmtog sigconf siggraph sigplan sigchi sigchi-a
+					 review screen natbib anonymous authorversion 9pt 10pt 11pt 12pt)
+		       (lambda (a b) (eq? (syntax-e a) (syntax-e b)))
+           [(ws . body)
+            ;; Skip intraline whitespace to find options:
+            (and (string? (syntax-e #'ws))
+                 (regexp-match? #rx"^ *$" (syntax-e #'ws)))
+            (loop #'body)]
+
+	   ; boolean options
+	   [((review #t) . body)
+	    (set! review? "review=true")
+	    (loop #'body)]
+	   [((review #f) . body)
+	    (set! review? "review=false")
+	    (loop #'body)]
+	   [(review . body)
+	    (set! review? "review=true")
+	    (loop #'body)]
+	   [((screen #t) . body)
+	    (set! screen? "screen=true")
+	    (loop #'body)]
+	   [((screen #f) . body)
+	    (set! screen? "screen=false")
+	    (loop #'body)]
+	   [(screen . body)
+	    (set! screen? "screen=true")
+	    (loop #'body)]
+	   [((natbib #t) . body)
+	    (set! natbib? "natbib=true")
+	    (loop #'body)]
+	   [((natbib #f) . body)
+	    (set! natbib? "natbib=false")
+	    (loop #'body)]
+	   [(natbib . body)
+	    (set! natbib? "natbib=true")
+	    (loop #'body)]
+
+	   [((anonymous #t) . body)
+	    (set! anonymous? "anonymous=true")
+	    (loop #'body)]
+	   [((anonymous #f) . body)
+	    (set! anonymous? "anonymous=false")
+	    (loop #'body)]
+	   [(anonymous . body)
+	    (set! anonymous? "anonymous=true")
+	    (loop #'body)]
+	   [((authorversion #t) . body)
+	    (set! authorversion? "authorversion=true")
+	    (loop #'body)]
+	   [((authorversion #f) . body)
+	    (set! authorversion? "authorversion=false")
+	    (loop #'body)]
+	   [(authorversion . body)
+	    (set! authorversion? "authorversion=true")
+	    (loop #'body)]
+	   [(9pt . body)
+	    (set! font-size "9pt")
+	    (loop #'body)]
+	   [(10pt . body)
+	    (set! font-size "10pt")
+	    (loop #'body)]
+	   [(11pt . body)
+	    (set! font-size "11pt")
+	    (loop #'body)]
+	   [(12pt . body)
+	    (set! font-size "12pt")
+	    (loop #'body)]
+	   
+	   
+           ; format options
+           [(manuscript . body)
+            (set! format? "manuscript")
+            (loop #'body)]
+           [(acmsmall . body)
+            (set! format? "acmsmall")
+            (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)  
+  (let ([options
+         (if (ormap values opts)
+             (format "[~a]" (apply string-append (add-between (filter values opts) ", ")))
+             "")])
+    (add-acmart-styles 
+     (add-defaults doc
+                   (string->bytes/utf-8
+                    (format "\\documentclass~a{acmart}\n~a"
+                            options
+                            unicode-encoding-packages))
+                   (scribble-file "acmart/style.tex")
+                   (list (scribble-file "acmart/acmart.cls"))
+                   #f
+		   #:replacements (hash "scribble-load-replace.tex" (scribble-file "acmart/acmart-load.tex"))))))
+
+(define (add-acmart-styles doc)
+  ;; Ensure that "acmart.tex" is used, since "style.tex"
+  ;; re-defines commands.
+  (struct-copy part doc [to-collect
+                         (cons (terms) ; FIXME
+                               (part-to-collect doc))]))

scribble-lib/scribble/acmart/lang/reader.rkt

@@ -0,0 +1,3 @@
+#lang s-exp scribble/base/reader
+scribble/acmart/lang
+#:wrapper1 (lambda (t) (cons 'doc (t)))

scribble-lib/scribble/acmart/style.tex

@@ -0,0 +1,56 @@
+
+% Define \SXtitle to lift \SSubtitle out:
+\newcommand{\SXtitle}[2][]{\title#1{\let\SSubtitle\SSubtitleDrop#2}\SExtractSubtitle#2\SExtractSubtitleDone}
+\def\SSubtitleDrop#1{}
+\def\SExtractSubtitleDone {}
+\def\SExtractSubtitle{\futurelet\next\SExtractSubtitleX}
+\def\SExtractSubtitleX#1{\ifx{#1}\SSubtitle \let\Snext\SWithSubtitle \else \let\Snext\SExtractSubtitleY \fi \Snext}
+\def\SExtractSubtitleY{\ifx\next\SExtractSubtitleDone \let\Snext\relax \else \let\Snext\SExtractSubtitle \fi \Snext}
+\def\SWithSubtitle#1{\subtitle{#1}\SExtractSubtitle}
+
+\renewcommand{\titleAndVersionAndAuthors}[3]{\SXtitle{#1}#3\maketitle}
+\renewcommand{\titleAndEmptyVersionAndAuthors}[3]{\titleAndVersionAndAuthors{#1}{#2}{#3}}
+\renewcommand{\titleAndVersionAndEmptyAuthors}[3]{\SXtitle{#1}\author{Anonymous Author(s)}\maketitle}
+\renewcommand{\titleAndEmptyVersionAndEmptyAuthors}[3]{\titleAndVersionAndEmptyAuthors{#1}{#2}{#3}}
+\renewcommand{\titleAndVersionAndAuthorsAndShort}[4]{\SXtitle[[#4]]{#1}#3\maketitle}
+\renewcommand{\titleAndEmptyVersionAndAuthorsAndShort}[4]{\titleAndVersionAndAuthorsAndShort{#1}{#2}{#3}{#4}}
+\renewcommand{\titleAndVersionAndEmptyAuthorsAndShort}[4]{\SXtitle[[#4]]{#1}\author{Anonymous Author(s)}\maketitle}
+\renewcommand{\titleAndEmptyVersionAndEmptyAuthorsAndShort}[4]{\titleAndVersionAndEmptyAuthorsAndShort{#1}{#2}{#3}{#4}}
+
+% Support plain `author' while enabling `authorinfo': for each
+% use of \SAuthor, check whether it contains an \SAuthorinfo form:
+\def\SAuthor#1{\SAutoAuthor#1\SAutoAuthorDone{#1}}
+\def\SAutoAuthorDone#1{}
+\def\SAutoAuthor{\futurelet\next\SAutoAuthorX}
+\def\SAutoAuthorX{\ifx\next\SAuthorinfo \let\Snext\relax \else \let\Snext\SToAuthorDone \fi \Snext}
+\def\SToAuthorDone{\futurelet\next\SToAuthorDoneX}
+\def\SToAuthorDoneX#1{\ifx\next\SAutoAuthorDone \let\Snext\SAddAuthorInfo \else \let\Snext\SToAuthorDone \fi \Snext}
+\newcommand{\SAddAuthorInfo}[1]{\SAuthorinfo{#1}{}{}}
+
+\renewcommand{\SAuthorinfo}[4]{\author{#1}{#2}{#3}{#4}}
+\renewcommand{\SAuthorSep}[1]{}
+\renewcommand{\SAuthorOrcid}[1]{\orcid{#1}}
+\renewcommand{\SAuthorPlace}[1]{\affiliation{#1}}
+\renewcommand{\SAuthorEmail}[1]{\email{#1}}
+
+\renewcommand{\SConferenceInfo}[2]{\conferenceinfo{#1}{#2}}
+\renewcommand{\SCopyrightYear}[1]{\copyrightyear{#1}}
+\renewcommand{\SCopyrightData}[1]{\copyrightdata{#1}}
+%\renewcommand{\Sdoi}[1]{\doi{#1}}
+\renewcommand{\SPexclusivelicense}[0]{\exclusivelicense}
+
+\renewcommand{\SCategory}[3]{\category{#1}{#2}{#3}}
+\renewcommand{\SCategoryPlus}[4]{\category{#1}{#2}{#3}[#4]}
+\renewcommand{\STerms}[1]{\terms{#1}}
+\renewcommand{\SKeywords}[1]{\keywords{#1}}
+
+\newcommand{\StitleShort}[2]{\title[#1]{#2}}
+
+\newcommand{\SacmBadgeRURL}[2]{\acmBadgeR[#1]{#2}}
+\newcommand{\SacmBadgeLURL}[2]{\acmBadgeL[#1]{#2}}
+
+\newcommand{\SgrantnumURL}[3]{\grantnum[#1]{#2}{#3}}
+
+\newcommand{\SreceivedStage}[2]{\received[#1]{#2}}
+
+\newcommand{\SccsdescNumber}[2]{\ccsdesc[#1]{#2}}

scribble-lib/scribble/base-render.rkt

@@ -72,35 +72,41 @@
       #f)
 
     (define/public (format-number number sep [keep-separator? #f])
-      (if (or (null? number)
-              (andmap (lambda (x) (or (not x) (equal? x "")))
-                      number)
-              (and (not (car number))
-                   (not (ormap number? number))))
-          null
-          (cons (let ([s (string-append
-                          (apply
-                           string-append
-                           (map (lambda (n) 
-                                  (cond
-                                   [(number? n) (format "~a." n)]
-                                   [(or (not n) (string? n)) ""]
-                                   [(pair? n) (string-append (car n) (cadr n))]))
-                                (reverse (cdr number))))
-                          (if (and (car number) 
-                                   (not (equal? "" (car number))))
-                              (if (pair? (car number))
-                                  (if keep-separator?
-                                      (string-append (caar number)
-                                                     (cadar number))
-                                      (caar number))
-                                  (format "~a." (car number)))
-                              ""))])
-                  (if (or keep-separator?
-                          (pair? (car number)))
-                      s
-                      (substring s 0 (sub1 (string-length s)))))
-                sep)))
+      (cond
+       [(or (null? number)
+            (andmap (lambda (x) (or (not x) (equal? x "")))
+                    number)
+            (and (not (car number))
+                 (not (ormap number? number))))
+        null]
+       [else
+        (define result-s
+          (let ([s (string-append
+                    (apply
+                     string-append
+                     (map (lambda (n) 
+                            (cond
+                             [(number? n) (format "~a." n)]
+                             [(or (not n) (string? n)) ""]
+                             [(pair? n) (string-append (car n) (cadr n))]))
+                          (reverse (cdr number))))
+                    (if (and (car number) 
+                             (not (equal? "" (car number))))
+                        (if (pair? (car number))
+                            (if keep-separator?
+                                (string-append (caar number)
+                                               (cadar number))
+                                (caar number))
+                            (format "~a." (car number)))
+                        ""))])
+            (if (or keep-separator?
+                    (pair? (car number))
+                    (equal? s ""))
+                s
+                (substring s 0 (sub1 (string-length s))))))
+        (if (equal? result-s "")
+            null
+            (cons result-s sep))]))
 
     (define/public (number-depth number)
       (if (null? number)
@@ -245,25 +251,42 @@
                     (document-date-text v)))
              (style-properties (part-style d))))
 
-    (define/private (extract-pre-paras d sym)
+    (define/private (extract-content d lift-proc)
       (let loop ([l (part-blocks d)])
+        (apply append
+               (for/list ([b (in-list l)])
+                 (define lifted (lift-proc b loop))
+                 lifted))))
+
+    (define/private (extract-pre-paras-proc sym)
+      (λ (v loop)
         (cond
-         [(null? l) null]
-         [else (let ([v (car l)])
-                 (cond
-                  [(and (paragraph? v)
-                        (eq? sym (style-name (paragraph-style v))))
-                   (cons v (loop (cdr l)))]
-                  [(compound-paragraph? v)
-                   (append (loop (compound-paragraph-blocks v))
-                           (loop (cdr l)))]
-                  [else (loop (cdr l))]))])))
+          [(and (paragraph? v)
+                (eq? sym (style-name (paragraph-style v))))
+           (list v)]
+          [(compound-paragraph? v)
+           (loop (compound-paragraph-blocks v))]
+          [else '()])))
+  
+    (define/private (extract-pre-content-proc sym)
+      (λ (v loop)
+        (define pre-para ((extract-pre-paras-proc sym) v loop))
+        (cond
+          [(not (null? pre-para)) pre-para]
+          [(and (nested-flow? v)
+                (member sym (style-properties (nested-flow-style v))))
+           (list v)]
+          [else '()])))
+
 
     (define/public (extract-authors d)
-      (extract-pre-paras d 'author))
-
+      (extract-content d (extract-pre-paras-proc 'author)))
+    
     (define/public (extract-pretitle d)
-      (extract-pre-paras d 'pretitle))
+      (extract-content d (extract-pre-paras-proc 'pretitle)))
+
+    (define/public (extract-pretitle-content d)
+      (extract-content d (extract-pre-content-proc 'pretitle)))
     
     ;; ----------------------------------------
 
@@ -674,6 +697,8 @@
         (begin (when (target-element? i) (collect-target-element i ci))
                (when (index-element? i) (collect-index-element i ci))
                (when (collect-element? i) ((collect-element-collect i) ci))
+               (when (traverse-element? i)
+                 (collect-content (traverse-element-content i ci) ci))
                (when (element? i)
                  (collect-content (element-content i) ci))
                (when (multiarg-element? i)

scribble-lib/scribble/base.rkt

@@ -6,6 +6,7 @@
          "decode-struct.rkt"
          "html-properties.rkt"
          "tag.rkt"
+         "private/tag.rkt"
          scheme/list
          scheme/class
          racket/contract/base
@@ -42,29 +43,6 @@
                           block?)])
 (provide include-section)
 
-(define (gen-tag content)
-  (datum-intern-literal
-   (regexp-replace* "[^-a-zA-Z0-9_=]" (content->string content) "_")))
-
-(define (prefix->string p)
-  (and p (if (string? p) 
-             (datum-intern-literal p)
-             (module-path-prefix->string p))))
-
-(define (convert-tag tag content)
-  (if (list? tag)
-    (append-map (lambda (t) (convert-tag t content)) tag)
-    `((part ,(or tag (gen-tag content))))))
-
-(define (convert-part-style who s)
-  (cond
-   [(style? s) s]
-   [(not s) plain]
-   [(string? s) (make-style s null)]
-   [(symbol? s) (make-style #f (list s))]
-   [(and (list? s) (andmap symbol? s)) (make-style #f s)]
-   [else (raise-argument-error who "(or/c style? string? symbol? (listof symbol?) #f)" s)]))
-
 (define (title #:tag [tag #f] #:tag-prefix [prefix #f] #:style [style plain]
                #:version [version #f] #:date [date #f]
                . str)
@@ -572,11 +550,11 @@
 ;; ----------------------------------------
 
 (provide/contract
- [elemtag (->* ((or/c tag? string?))
+ [elemtag (->* ((or/c taglet? generated-tag?))
                ()
                #:rest (listof pre-content?)
                element?)]
- [elemref (->* ((or/c tag? string?))
+ [elemref (->* ((or/c taglet? generated-tag?))
                (#:underline? any/c)
                #:rest (listof pre-content?)
                element?)]

scribble-lib/scribble/core.rkt

@@ -640,6 +640,7 @@
                         [(rarr) "->"]
                         [(lang) "<"]
                         [(rang) ">"]
+                        [(nbsp) "\xA0"]
                         [else (format "~s" c)])
                       op)])]
     [(op c renderer sec ri)

scribble-lib/scribble/elsarticle/.gitignore

@@ -0,0 +1,2 @@
+# to avoid committing it by accident, since we can't distribute it
+/elsarticle.cls

scribble-lib/scribble/elsarticle/elsarticle.tex

@@ -0,0 +1,5 @@
+\newcommand{\ELSauthor}[1]{\author{#1}}
+\newcommand{\ELSaddress}[1]{\address{#1}}
+\newcommand{\ELSemail}[1]{\ead{#1}}
+
+\newcommand{\ELSabstract}[1]{\begin{abstract}#1\end{abstract}}

scribble-lib/scribble/elsarticle/lang.rkt

@@ -0,0 +1,68 @@
+#lang racket/base
+(require scribble/doclang
+         scribble/core
+         racket/file
+         (except-in scribble/base author)
+         (prefix-in s/b: scribble/base)
+         scribble/decode
+         "../private/defaults.rkt"
+         setup/collects
+         scribble/html-properties
+         scribble/latex-properties
+         scribble/latex-prefix
+         racket/stxparam
+         net/ftp
+         file/gunzip
+         (for-syntax racket/base
+                     racket/list
+                     racket/stxparam-exptime))
+
+(module test racket/base)
+
+(provide (except-out (all-from-out scribble/doclang) #%module-begin)
+         (all-from-out scribble/base)
+         (rename-out [module-begin #%module-begin])
+         frontmatter
+         abstract author email address)
+
+(define-syntax (module-begin stx)
+  ;; No options, currently, but keep in case we want to support some:
+  (syntax-case* stx () (lambda (a b) (eq? (syntax-e a) (syntax-e b)))
+    [(_ id ws . body)
+     ;; Skip intraline whitespace to find options:
+     (and (string? (syntax-e #'ws))
+          (regexp-match? #rx"^ *$" (syntax-e #'ws)))
+     #'(module-begin id . body)]
+    [(_ id . body)
+     #'(#%module-begin id (post-process) () . body)]))
+
+(define ((post-process) doc)
+  (add-defaults doc
+                (string->bytes/utf-8 (string-append "\\documentclass{elsarticle}\n"
+                                                    unicode-encoding-packages))
+                (scribble-file "elsarticle/style.tex")
+                '()
+                #f))
+
+(define elsarticle-extras
+  (let ([abs (lambda (s)
+               (path->collects-relative
+                (collection-file-path s "scribble" "elsarticle")))])
+    (list
+     (make-tex-addition (abs "elsarticle.tex")))))
+
+(define (LaTeX-element i)
+  (λ strs
+    (make-element (style i elsarticle-extras)
+                  ;; XXX maybe decode-content
+                  (decode-content strs))))
+
+(define abstract (LaTeX-element "ELSabstract"))
+(define author (LaTeX-element "ELSauthor"))
+(define address (LaTeX-element "ELSaddress"))
+(define email (LaTeX-element "ELSemail"))
+
+(define (frontmatter #:authors as
+                     #:abstract a)
+  (paragraph (style 'author '())
+             (append as (list a))))

scribble-lib/scribble/elsarticle/lang/reader.rkt

@@ -0,0 +1,3 @@
+#lang s-exp scribble/base/reader
+scribble/elsarticle/lang
+#:wrapper1 (lambda (t) (cons 'doc (t)))

scribble-lib/scribble/elsarticle/style.tex

@@ -0,0 +1,3 @@
+
+\renewcommand{\titleAndVersionAndAuthors}[3]{\begin{frontmatter}\title{#1}#3\end{frontmatter}}
+\renewcommand{\titleAndEmptyVersionAndAuthors}[3]{\titleAndVersionAndAuthors{#1}{#1}{#3}}

scribble-lib/scribble/eval.rkt

@@ -99,13 +99,15 @@
         [(eof-object? v)
          (let* ([line-accum (add-string string-accum line-accum)]
                 [flow-accum (add-line line-accum flow-accum)])
-           (list
-            (list.flow.list
-             (if (= 1 (length flow-accum))
-               (car flow-accum)
-               (make-table
-                #f
-                (map list.flow.list (reverse flow-accum)))))))]
+           (if (null? flow-accum)
+               null
+               (list
+                (list.flow.list
+                 (if (= 1 (length flow-accum))
+                     (car flow-accum)
+                     (make-table
+                      #f
+                      (map list.flow.list (reverse flow-accum))))))))]
         [(equal? #\newline v)
          (loop #f #f (add-line (add-string string-accum line-accum)
                                flow-accum))]

scribble-lib/scribble/html-render.rkt

@@ -731,24 +731,25 @@
                   (if (or (nearly-top? d) 
                           (part-style? d 'toc-hidden))
                       null 
-                      (list (cons d prefixes)))
+                      (list (vector d prefixes d)))
                   ;; get internal targets:
-                  (map (lambda (v) (cons v prefixes)) (append-map block-targets (part-blocks d)))
+                  (map (lambda (v) (vector v prefixes d)) (append-map block-targets (part-blocks d)))
                   (map (lambda (p) (if (or (part-whole-page? p ri) 
                                            (and (part-style? p 'toc-hidden)
                                                 (all-toc-hidden? p)))
                                        null
                                        (flatten p prefixes #f)))
                        (part-parts d)))))))
-          (define any-parts? (ormap (compose part? car) ps))
+          (define any-parts? (ormap (compose part? (lambda (p) (vector-ref p 0))) ps))
           (if (null? ps)
             null
             `((div ([class ,box-class])
                 ,@(get-onthispage-label)
                 (table ([class "tocsublist"] [cellspacing "0"])
                   ,@(map (lambda (p)
-                           (let ([p (car p)]
-                                 [prefixes (cdr p)]
+                           (let ([p (vector-ref p 0)]
+                                 [prefixes (vector-ref p 1)]
+                                 [from-d (vector-ref p 2)]
                                  [add-tag-prefixes
                                   (lambda (t prefixes)
                                     (if (null? prefixes)
@@ -765,7 +766,7 @@
                                       '(""))
                                 ,@(if (toc-element? p)
                                       (render-content (toc-element-toc-content p)
-                                                      d ri)
+                                                      from-d ri)
                                       (parameterize ([current-no-links #t]
                                                      [extra-breaking? #t])
                                         `((a ([href
@@ -793,7 +794,7 @@
                                                     (if (toc-target2-element? p)
                                                         (toc-target2-element-toc-content p)
                                                         (element-content p)))
-                                                d ri)))))))))
+                                                from-d ri)))))))))
                          ps)))))))
 
     (define/private (extract-inherited d ri pred extract)
@@ -866,6 +867,8 @@
                  (head ()
                    (meta ([http-equiv "content-type"]
                           [content "text/html; charset=utf-8"]))
+                   (meta ([name "viewport"]
+                          [content "width=device-width, initial-scale=0.8"]))
                    ,title
                    ,(scribble-css-contents scribble-css
                                            (lookup-path scribble-css alt-paths) 
@@ -2015,6 +2018,7 @@
   (define e-d (and d (explode (path->complete-path d))))
   (define p-in? (in-plt? e-p))
   (define d-in? (and d (in-plt? e-d)))
+  (define (normalize p) (normal-case-path p))
   ;; use an absolute link if the link is from outside the plt tree
   ;; going in (or if d is #f)
   (if (not (and d (cond
@@ -2022,7 +2026,10 @@
                     [d-in? (error 'from-root
                                   "got a link from the PLT tree going out; ~e"
                                   p)]
-                    [else #f])))
+                    [else #f])
+		  ;; On Windows, need to be on the same drive, at least:
+		  (equal? (normalize (car e-d))
+		          (normalize (car e-p)))))
     (path->url-string c-p)
     (let loop ([e-d e-d] [e-p e-p])
       (cond
@@ -2030,11 +2037,11 @@
          (string-append*
           (let loop ([e-p e-p])
             (cond [(null? e-p) '("/")]
-                  [(null? (cdr e-p)) (list (path->string (car e-p)))]
+                  [(null? (cdr e-p)) (list (path-element->string (car e-p)))]
                   [(eq? 'same (car e-p)) (loop (cdr e-p))]
                   [(eq? 'up (car e-p)) (cons "../" (loop (cdr e-p)))]
-                  [else (cons (path->string (car e-p)) (cons "/" (loop (cdr e-p))))])))]
-        [(equal? (car e-d) (car e-p)) (loop (cdr e-d) (cdr e-p))]
+                  [else (cons (path-element->string (car e-p)) (cons "/" (loop (cdr e-p))))])))]
+        [(equal? (normalize (car e-d)) (normalize (car e-p))) (loop (cdr e-d) (cdr e-p))]
         [(eq? 'same (car e-d)) (loop (cdr e-d) e-p)]
         [(eq? 'same (car e-p)) (loop e-d (cdr e-p))]
         [else (string-append (string-append* (map (lambda (x) "../") e-d))

scribble-lib/scribble/jfp/replacements.tex

@@ -1 +1 @@
-\renewcommand{\packageRelsize}{}
+\renewcommand\Large{\@setfontsize\@xvpt{18}}

scribble-lib/scribble/latex-properties.rkt

@@ -10,4 +10,6 @@
                   [extra-files (listof (or/c path-string? (cons/c 'collects (listof bytes?))))])]
  [(latex-defaults+replacements latex-defaults)
   ([replacements (hash/c string? (or/c bytes? path-string? (cons/c 'collects (listof bytes?))))])]
- [command-extras ([arguments (listof string?)])])
+ [command-extras ([arguments (listof string?)])]
+ [command-optional ([arguments (listof string?)])]
+ [short-title ([text (or/c string? #f)])])

scribble-lib/scribble/latex-render.rkt

@@ -11,7 +11,8 @@
          setup/collects
          file/convertible)
 (provide render-mixin
-         make-render-part-mixin)
+         make-render-part-mixin
+         extra-character-conversions)
 
 (define current-table-mode (make-parameter #f))
 (define rendering-tt (make-parameter #f))
@@ -47,6 +48,8 @@
 (define-runtime-path skull-tex "scribble-skull.tex")
 (define skull-style (make-style #f (list (tex-addition skull-tex))))
 
+(define extra-character-conversions (make-parameter (λ (c) #f)))
+
 (define (render-mixin % #:image-mode [image-mode #f])
   (class %
     (super-new)
@@ -78,7 +81,13 @@
              extract-version
              extract-date
              extract-authors
-             extract-pretitle)
+             extract-pretitle-content)
+
+    (define/public (extract-short-title d)
+      (ormap (lambda (v)
+               (and (short-title? v)
+                    (short-title-text v)))
+             (style-properties (part-style d))))
 
     (define/override (auto-extra-files? v) (latex-defaults? v))
     (define/override (auto-extra-files-paths v) (latex-defaults-extra-files v))
@@ -141,15 +150,22 @@
           (when (part-title-content d)
             (let ([vers (extract-version d)]
                   [date (extract-date d)]
-                  [pres (extract-pretitle d)]
-                  [auths (extract-authors d)])
+                  [pres (extract-pretitle-content d)]
+                  [auths (extract-authors d)]
+                  [short (extract-short-title d)])
               (for ([pre (in-list pres)])
                 (printf "\n\n")
-                (do-render-paragraph pre d ri #t #f))
+                (cond
+                  [(paragraph? pre)
+                   (do-render-paragraph pre d ri #t #f)]
+                  [(nested-flow? pre)
+                   (do-render-nested-flow pre d ri #t #f #t)]))
               (when date (printf "\\date{~a}\n" date))
-              (printf "\\titleAnd~aVersionAnd~aAuthors{" 
+              (printf "\\titleAnd~aVersionAnd~aAuthors~a{"
+                      
                       (if (equal? vers "") "Empty" "")
-                      (if (null? auths) "Empty" ""))
+                      (if (null? auths) "Empty" "")
+                      (if short "AndShort" ""))
               (render-content (part-title-content d) d ri)
               (printf "}{~a}{" vers)
               (unless (null? auths)
@@ -158,7 +174,9 @@
                 (unless first? (printf "\\SAuthorSep{}"))
                 (do-render-paragraph auth d ri #t #f)
                 #f)
-              (printf "}\n"))))
+              (if short
+                  (printf "}{~a}\n" short)
+                  (printf "}\n")))))
         (render-part d ri)
         (when whole-doc?
           (printf "\n\n\\postDoc\n\\end{document}\n"))))
@@ -174,7 +192,7 @@
                          (and d (positive? d)))))
           (when (eq? (style-name (part-style d)) 'index)
             (printf "\\twocolumn\n\\parskip=0pt\n\\addcontentsline{toc}{section}{Index}\n"))
-          (let ([pres (extract-pretitle d)])
+          (let ([pres (extract-pretitle-content d)])
             (for ([pre (in-list pres)])
               (printf "\n\n")
               (do-render-paragraph pre d ri #t #f)))
@@ -473,6 +491,11 @@
                    [(multiarg-element? e)
                     (check-render)
                     (printf "\\~a" style-name)
+                    (define maybe-optional-args
+                      (findf command-optional? (if style (style-properties style) '())))
+                    (when maybe-optional-args
+                      (for ([i (in-list (command-optional-arguments maybe-optional-args))])
+                        (printf "[~a]" i)))
                     (if (null? (multiarg-element-contents e))
                         (printf "{}")
                         (for ([i (in-list (multiarg-element-contents e))])
@@ -481,7 +504,16 @@
                             (render-content i part ri))
                           (printf "}")))]
                    [else
-                    (wrap e style-name tt?)]))]
+                    (define maybe-optional
+                      (findf command-optional? (if style (style-properties style) '())))
+                    (if maybe-optional
+                        (wrap e
+                              (string-join #:before-first (format "~a[" style-name)
+                                           #:after-last "]"
+                                           (command-optional-arguments maybe-optional)
+                                           "][")
+                              tt?)
+                        (wrap e style-name tt?))]))]
                [(and (not style-name)
                      style
                      (memq 'exact-chars (style-properties style)))
@@ -618,6 +650,7 @@
                part 
                ri
                #t
+               #f
                #f)
               (when (string? s-name)
                 (printf "\\end{~a}" s-name)))
@@ -821,7 +854,7 @@
        [(table? p)
         (render-table* p part ri #f (format "[~a]" mode))]
        [(nested-flow? p)
-        (do-render-nested-flow p part ri #f mode)]
+        (do-render-nested-flow p part ri #f mode #f)]
        [(paragraph? p)
         (do-render-paragraph p part ri #f mode)]))
 
@@ -852,7 +885,7 @@
         (printf "\\end{~a}" mode)
         null))
 
-    (define/private (do-render-nested-flow t part ri single-column? as-box-mode)
+    (define/private (do-render-nested-flow t part ri single-column? as-box-mode show-pre?)
       (let* ([props (style-properties (nested-flow-style t))]
              [kind (or (and as-box-mode
                             (or
@@ -873,29 +906,31 @@
              [multicommand? (memq 'multicommand props)]
              [command? (or (and as-box-mode (not multicommand?))
                            (memq 'command props))])
-        (cond
-         [command? (printf "\\~a{" kind)]
-         [multicommand? (printf "\\~a" kind)]
-         [else (printf "\\begin{~a}" kind)])
-        (parameterize ([current-table-mode (if (or single-column?
-                                                   (not (current-table-mode)))
-                                               (current-table-mode)
-                                               (list "nested-flow" t))])
-          (if as-box-mode
-              (for-each (lambda (p) 
-                          (when multicommand? (printf "{"))
-                          (render-boxable-block p part ri as-box-mode)
-                          (when multicommand? (printf "}")))
-                        (nested-flow-blocks t))
-              (render-flow (nested-flow-blocks t) part ri #f multicommand?)))
-        (cond
-         [command? (printf "}")]
-         [multicommand? (void)]
-         [else (printf "\\end{~a}" kind)])
-        null))
+        (unless (and (not show-pre?)
+                     (member 'pretitle props))
+          (cond
+            [command? (printf "\\~a{" kind)]
+            [multicommand? (printf "\\~a" kind)]
+            [else (printf "\\begin{~a}" kind)])
+          (parameterize ([current-table-mode (if (or single-column?
+                                                     (not (current-table-mode)))
+                                                 (current-table-mode)
+                                                 (list "nested-flow" t))])
+            (if as-box-mode
+                (for-each (lambda (p) 
+                            (when multicommand? (printf "{"))
+                            (render-boxable-block p part ri as-box-mode)
+                            (when multicommand? (printf "}")))
+                          (nested-flow-blocks t))
+                (render-flow (nested-flow-blocks t) part ri #f multicommand?)))
+          (cond
+            [command? (printf "}")]
+            [multicommand? (void)]
+            [else (printf "\\end{~a}" kind)])
+          null)))
 
     (define/override (render-nested-flow t part ri starting-item?)
-      (do-render-nested-flow t part ri #f #f))
+      (do-render-nested-flow t part ri #f #f #f))
 
     (define/override (render-compound-paragraph t part ri starting-item?)
       (let ([kind (style-name (compound-paragraph-style t))]
@@ -941,7 +976,8 @@
           [else ses])))
 
     (define/private (display-protected s)
-      (define rtt (rendering-tt))
+      (define rtt   (rendering-tt))
+      (define convs (extra-character-conversions))
       (cond
        [(eq? rtt 'exact)
         (display s)]
@@ -995,242 +1031,244 @@
                      [(#\uDF) "{\\ss}"]
                      [else
                       (if ((char->integer c) . > . 127)
-                          ;; latex-prefix.rkt enables utf8 input, but this does not work for
-                          ;; all the characters below (e.g. ∞). Some parts of the table
-                          ;; below are therefore necessary, but some parts probably are not.
-                          ;; Which parts are necessary may depend on the latex version,
-                          ;; though, so we keep this table around to avoid regressions.
-                          (case c
-                            [(#\╔ #\═ #\╗ #\║ #\╚ #\╝ #\╦ #\╠ #\╣ #\╬ #\╩) (box-character c)]
-                            [(#\┌ #\─ #\┐ #\│ #\└ #\┘ #\┬ #\├ #\┤ #\┼ #\┴) (box-character c)]
-                            [(#\┏ #\━ #\┓ #\┃ #\┗ #\┛ #\┳ #\┣ #\┫ #\╋ #\┻) (box-character c 2)]
-                            [(#\u2011) "\\mbox{-}"] ; non-breaking hyphen
-                            [(#\uB0) "$^{\\circ}$"] ; degree
-                            [(#\uB2) "$^2$"]
-                            [(#\u039A) "K"] ; kappa
-                            [(#\u0391) "A"] ; alpha
-                            [(#\u039F) "O"] ; omicron
-                            [(#\u03A3) "$\\Sigma$"]
-                            [(#\u03BA) "$\\kappa$"]
-                            [(#\u03B1) "$\\alpha$"]
-                            [(#\u03B2) "$\\beta$"]
-                            [(#\u03B3) "$\\gamma$"]
-                            [(#\u03BF) "o"] ; omicron
-                            [(#\u03C3) "$\\sigma$"]
-                            [(#\u03C2) "$\\varsigma$"]
-                            [(#\u03BB) "$\\lambda$"]
-                            [(#\u039B) "$\\Lambda$"]
-                            [(#\u03BC) "$\\mu$"]
-                            [(#\u03C0) "$\\pi$"]
-                            [(#\ϖ) "$\\varpi$"]
-                            [(#\‘) "{`}"]
-                            [(#\’) "{'}"]
-                            [(#\“) "{``}"]
-                            [(#\”) "{''}"]
-                            [(#\u2013) "{--}"]
-                            [(#\u2014) "{---}"]
-                            [(#\⟨ #\〈) "$\\langle$"] ; [MATHEMATICAL] LEFT ANGLE BRACKET
-                            [(#\⟩ #\〉) "$\\rangle$"] ; [MATHEMATICAL] RIGHT ANGLE BRACKET
-                            [(#\∞) "$\\infty$"]
-                            [(#\⇓) "$\\Downarrow$"]
-                            [(#\↖) "$\\nwarrow$"]
-                            [(#\↓) "$\\downarrow$"]
-                            [(#\⇒) "$\\Rightarrow$"]
-                            [(#\→) "$\\rightarrow$"]
-                            [(#\↘) "$\\searrow$"]
-                            [(#\↙) "$\\swarrow$"]
-                            [(#\←) "$\\leftarrow$"]
-                            [(#\↑) "$\\uparrow$"]
-                            [(#\⇐) "$\\Leftarrow$"]
-                            [(#\−) "$\\longrightarrow$"]
-                            [(#\⇑) "$\\Uparrow$"]
-                            [(#\⇔) "$\\Leftrightarrow$"]
-                            [(#\↕) "$\\updownarrow$"]
-                            [(#\↔) "$\\leftrightarrow$"]
-                            [(#\↗) "$\\nearrow$"]
-                            [(#\⇕) "$\\Updownarrow$"]
-                            [(#\א) "$\\aleph$"]
-                            [(#\′) "$\\prime$"]
-                            [(#\∅) "$\\emptyset$"]
-                            [(#\∇) "$\\nabla$"]
-                            [(#\♦) "$\\diamondsuit$"]
-                            [(#\♠) "$\\spadesuit$"]
-                            [(#\♣) "$\\clubsuit$"]
-                            [(#\♥) "$\\heartsuit$"]
-                            [(#\♯) "$\\sharp$"]
-                            [(#\♭) "$\\flat$"]
-                            [(#\♮) "$\\natural$"]
-                            [(#\√) "$\\surd$"]
-                            [(#\∆) "$\\Delta$"] ; no better mapping for than \Delta for "increment"
-                            [(#\u2211) "$\\sum$"] ; better than \Sigma, right?
-                            [(#\u220F) "$\\prod$"] ; better than \Pi, right?
-                            [(#\u2210) "$\\coprod$"]
-                            [(#\u222B) "$\\int$"]
-                            [(#\u222E) "$\\oint$"]
-                            [(#\¬) "$\\neg$"]
-                            [(#\△) "$\\triangle$"]
-                            [(#\∀) "$\\forall$"]
-                            [(#\∃) "$\\exists$"]
-                            [(#\∘) "$\\circ$"]
-                            [(#\θ) "$\\theta$"]
-                            [(#\ϑ) "$\\vartheta$"]
-                            [(#\τ) "$\\tau$"]
-                            [(#\υ) "$\\upsilon$"]
-                            [(#\φ) "$\\phi$"]
-                            [(#\ϕ) "$\\varphi$"]
-                            [(#\δ) "$\\delta$"]
-                            [(#\ρ) "$\\rho$"]
-                            [(#\ϱ) "$\\varrho$"]
-                            [(#\ϵ) "$\\epsilon$"]
-                            [(#\ε) "$\\varepsilon$"]
-                            [(#\χ) "$\\chi$"]
-                            [(#\ψ) "$\\psi$"]
-                            [(#\ζ) "$\\zeta$"]
-                            [(#\ν) "$\\nu$"]
-                            [(#\ω) "$\\omega$"]
-                            [(#\η) "$\\eta$"]
-                            [(#\ι) "$\\iota$"]
-                            [(#\ξ) "$\\xi$"]
-                            [(#\Γ) "$\\Gamma$"]
-                            [(#\Ψ) "$\\Psi$"]
-                            [(#\Δ) "$\\Delta$"]
-                            [(#\Ξ) "$\\Xi$"]
-                            [(#\Υ) "$\\Upsilon$"]
-                            [(#\Ω) "$\\Omega$"]
-                            [(#\Θ) "$\\Theta$"]
-                            [(#\Π) "$\\Pi$"]
-                            [(#\Φ) "$\\Phi$"]
-                            [(#\±) "$\\pm$"]
-                            [(#\∩) "$\\cap$"]
-                            [(#\◇) "$\\diamond$"]
-                            [(#\⊕) "$\\oplus$"]
-                            [(#\∓) "$\\mp$"]
-                            [(#\∪) "$\\cup$"]
-                            [(#\△) "$\\bigtriangleup$"]
-                            [(#\⊖) "$\\ominus$"]
-                            [(#\×) "$\\times$"]
-                            [(#\⊎) "$\\uplus$"]
-                            [(#\▽) "$\\bigtriangledown$"]
-                            [(#\⊗) "$\\otimes$"]
-                            [(#\÷) "$\\div$"]
-                            [(#\⊓) "$\\sqcap$"]
-                            [(#\▹) "$\\triangleleft$"]
-                            [(#\⊘) "$\\oslash$"]
-                            [(#\∗) "$\\ast$"]
-                            [(#\⊔) "$\\sqcup$"]
-                            [(#\∨) "$\\vee$"]
-                            [(#\∧) "$\\wedge$"]
-                            [(#\◃) "$\\triangleright$"]
-                            [(#\⊙) "$\\odot$"]
-                            [(#\★) "$\\star$"]
-                            [(#\†) "$\\dagger$"]
-                            [(#\•) "$\\bullet$"]
-                            [(#\‡) "$\\ddagger$"]
-                            [(#\≀) "$\\wr$"]
-                            [(#\⨿) "$\\amalg$"]
-                            [(#\≤) "$\\leq$"]
-                            [(#\≥) "$\\geq$"]
-                            [(#\≡) "$\\equiv$"]
-                            [(#\⊨) "$\\models$"]
-                            [(#\≺) "$\\prec$"]
-                            [(#\≻) "$\\succ$"]
-                            [(#\∼) "$\\sim$"]
-                            [(#\⊥) "$\\perp$"]
-                            [(#\≼) "$\\preceq$"]
-                            [(#\≽) "$\\succeq$"]
-                            [(#\≃) "$\\simeq$"]
-                            [(#\≪) "$\\ll$"]
-                            [(#\≫) "$\\gg$"]
-                            [(#\≍) "$\\asymp$"]
-                            [(#\∥) "$\\parallel$"]
-                            [(#\⊂) "$\\subset$"]
-                            [(#\⊃) "$\\supset$"]
-                            [(#\≈) "$\\approx$"]
-                            [(#\⋈) "$\\bowtie$"]
-                            [(#\⊆) "$\\subseteq$"]
-                            [(#\⊇) "$\\supseteq$"]
-                            [(#\≌) "$\\cong$"]
-                            [(#\⊏) "$\\sqsubset$"]
-                            [(#\⊐) "$\\sqsupset$"]
-                            [(#\≠) "$\\neq$"]
-                            [(#\⌣) "$\\smile$"]
-                            [(#\⊑) "$\\sqsubseteq$"]
-                            [(#\⊒) "$\\sqsupseteq$"]
-                            [(#\≐) "$\\doteq$"]
-                            [(#\⌢) "$\\frown$"]
-                            [(#\∈) "$\\in$"]
-                            [(#\∉) "$\\not\\in$"]
-                            [(#\∋) "$\\ni$"]
-                            [(#\∝) "$\\propto$"]
-                            [(#\⊢) "$\\vdash$"]
-                            [(#\⊣) "$\\dashv$"]    
-                            [(#\☠) "$\\skull$"]
-                            [(#\☺) "$\\smiley$"]
-                            [(#\☻) "$\\blacksmiley$"]
-                            [(#\☹) "$\\frownie$"]
-                            [(#\ø) "{\\o}"]
-                            [(#\Ø) "{\\O}"]
-                            [(#\ł) "{\\l}"]
-                            [(#\Ł) "{\\L}"]
-                            [(#\uA7) "{\\S}"]
-                            [(#\⟦ #\〚) "$[\\![$"]
-                            [(#\⟧ #\〛) "$]\\!]$"]
-                            [(#\↦) "$\\mapsto$"]
-                            [(#\⊤) "$\\top$"]
-                            [(#\¥) "{\\textyen}"]
-                            [(#\™) "{\\texttrademark}"]
-                            [(#\®) "{\\textregistered}"]
-                            [(#\©) "{\\textcopyright}"]
-                            [(#\u2070) "$^0$"]
-                            [(#\u00b9) "$^1$"]
-                            [(#\u00b2) "$^2$"]
-                            [(#\u00b3) "$^3$"]
-                            [(#\u2074) "$^4$"]
-                            [(#\u2075) "$^5$"]
-                            [(#\u2076) "$^6$"]
-                            [(#\u2077) "$^7$"]
-                            [(#\u2078) "$^8$"]
-                            [(#\u2079) "$^9$"]
-                            [(#\u207a) "$^+$"]
-                            [(#\u207b) "$^-$"]
-                            [(#\⋖) "$\\precdot$"]
-                            [(#\⋗) "$\\succdot$"]
-                            [(#\⋮) "\\vdots"]
-                            [(#\⋱) "$\\ddots$"]
-                            [(#\⋯) "$\\cdots$"]
-                            [(#\⋯) "\\hdots"]
-                            [else
-                             (cond
-                              [(char<=? #\uAC00 c #\uD7AF) ; Korean Hangul
-                               (format "\\begin{CJK}{UTF8}{mj}~a\\end{CJK}" c)]
-                              [else
-                               ;; Detect characters that can be formed with combining characters
-                               ;; and translate them to Latex combinations:
-                               (define s (string-normalize-nfd (string c)))
-                               (define len (string-length s))
-                               (cond
-                                [(len . > . 1)
-                                 (define combiner (case (string-ref s (sub1 len))
-                                                    [(#\u300) "\\`{~a}"]
-                                                    [(#\u301) "\\'{~a}"]
-                                                    [(#\u302) "\\^{~a}"]
-                                                    [(#\u303) "\\~~{~a}"]
-                                                    [(#\u304) "\\={~a}"]
-                                                    [(#\u306) "\\u{~a}"]
-                                                    [(#\u307) "\\.{~a}"]
-                                                    [(#\u308) "\\\"{~a}"]
-                                                    [(#\u30a) "\\r{~a}"]
-                                                    [(#\u30b) "\\H{~a}"]
-                                                    [(#\u30c) "\\v{~a}"]
-                                                    [(#\u327) "\\c{~a}"]
-                                                    [(#\u328) "\\k{~a}"]
-                                                    [else #f]))
-                                 (define base (string-normalize-nfc (substring s 0 (sub1 len))))
-                                 (if (and combiner
-                                          (= 1 (string-length base)))
-                                     (format combiner (char-loop (string-ref base 0)))
-                                     c)]
-                                [else c])])])
+                          ;; first, try user-defined conversions
+                          (or (convs c)
+                              ;; latex-prefix.rkt enables utf8 input, but this does not work for
+                              ;; all the characters below (e.g. ∞). Some parts of the table
+                              ;; below are therefore necessary, but some parts probably are not.
+                              ;; Which parts are necessary may depend on the latex version,
+                              ;; though, so we keep this table around to avoid regressions.
+                              (case c
+                                [(#\╔ #\═ #\╗ #\║ #\╚ #\╝ #\╦ #\╠ #\╣ #\╬ #\╩) (box-character c)]
+                                [(#\┌ #\─ #\┐ #\│ #\└ #\┘ #\┬ #\├ #\┤ #\┼ #\┴) (box-character c)]
+                                [(#\┏ #\━ #\┓ #\┃ #\┗ #\┛ #\┳ #\┣ #\┫ #\╋ #\┻) (box-character c 2)]
+                                [(#\u2011) "\\mbox{-}"] ; non-breaking hyphen
+                                [(#\uB0) "$^{\\circ}$"] ; degree
+                                [(#\uB2) "$^2$"]
+                                [(#\u039A) "K"] ; kappa
+                                [(#\u0391) "A"] ; alpha
+                                [(#\u039F) "O"] ; omicron
+                                [(#\u03A3) "$\\Sigma$"]
+                                [(#\u03BA) "$\\kappa$"]
+                                [(#\u03B1) "$\\alpha$"]
+                                [(#\u03B2) "$\\beta$"]
+                                [(#\u03B3) "$\\gamma$"]
+                                [(#\u03BF) "o"] ; omicron
+                                [(#\u03C3) "$\\sigma$"]
+                                [(#\u03C2) "$\\varsigma$"]
+                                [(#\u03BB) "$\\lambda$"]
+                                [(#\u039B) "$\\Lambda$"]
+                                [(#\u03BC) "$\\mu$"]
+                                [(#\u03C0) "$\\pi$"]
+                                [(#\‘) "{`}"]
+                                [(#\’) "{'}"]
+                                [(#\“) "{``}"]
+                                [(#\”) "{''}"]
+                                [(#\u2013) "{--}"]
+                                [(#\u2014) "{---}"]
+                                [(#\⟨ #\〈) "$\\langle$"] ; [MATHEMATICAL] LEFT ANGLE BRACKET
+                                [(#\⟩ #\〉) "$\\rangle$"] ; [MATHEMATICAL] RIGHT ANGLE BRACKET
+                                [(#\∞) "$\\infty$"]
+                                [(#\⇓) "$\\Downarrow$"]
+                                [(#\↖) "$\\nwarrow$"]
+                                [(#\↓) "$\\downarrow$"]
+                                [(#\⇒) "$\\Rightarrow$"]
+                                [(#\→) "$\\rightarrow$"]
+                                [(#\↘) "$\\searrow$"]
+                                [(#\↙) "$\\swarrow$"]
+                                [(#\←) "$\\leftarrow$"]
+                                [(#\↑) "$\\uparrow$"]
+                                [(#\⇐) "$\\Leftarrow$"]
+                                [(#\−) "$\\longrightarrow$"]
+                                [(#\⇑) "$\\Uparrow$"]
+                                [(#\⇔) "$\\Leftrightarrow$"]
+                                [(#\↕) "$\\updownarrow$"]
+                                [(#\↔) "$\\leftrightarrow$"]
+                                [(#\↗) "$\\nearrow$"]
+                                [(#\⇕) "$\\Updownarrow$"]
+                                [(#\א) "$\\aleph$"]
+                                [(#\′) "$\\prime$"]
+                                [(#\∅) "$\\emptyset$"]
+                                [(#\∇) "$\\nabla$"]
+                                [(#\♦) "$\\diamondsuit$"]
+                                [(#\♠) "$\\spadesuit$"]
+                                [(#\♣) "$\\clubsuit$"]
+                                [(#\♥) "$\\heartsuit$"]
+                                [(#\♯) "$\\sharp$"]
+                                [(#\♭) "$\\flat$"]
+                                [(#\♮) "$\\natural$"]
+                                [(#\√) "$\\surd$"]
+                                [(#\∆) "$\\Delta$"] ; no better mapping for than \Delta for "increment"
+                                [(#\u2211) "$\\sum$"] ; better than \Sigma, right?
+                                [(#\u220F) "$\\prod$"] ; better than \Pi, right?
+                                [(#\u2210) "$\\coprod$"]
+                                [(#\u222B) "$\\int$"]
+                                [(#\u222E) "$\\oint$"]
+                                [(#\¬) "$\\neg$"]
+                                [(#\△) "$\\triangle$"]
+                                [(#\∀) "$\\forall$"]
+                                [(#\∃) "$\\exists$"]
+                                [(#\∘) "$\\circ$"]
+                                [(#\θ) "$\\theta$"]
+                                [(#\ϑ) "$\\vartheta$"]
+                                [(#\τ) "$\\tau$"]
+                                [(#\υ) "$\\upsilon$"]
+                                [(#\φ) "$\\phi$"]
+                                [(#\ϕ) "$\\varphi$"]
+                                [(#\δ) "$\\delta$"]
+                                [(#\ρ) "$\\rho$"]
+                                [(#\ϱ) "$\\varrho$"]
+                                [(#\ϵ) "$\\epsilon$"]
+                                [(#\ε) "$\\varepsilon$"]
+                                [(#\ϖ) "$\\varpi$"]
+                                [(#\χ) "$\\chi$"]
+                                [(#\ψ) "$\\psi$"]
+                                [(#\ζ) "$\\zeta$"]
+                                [(#\ν) "$\\nu$"]
+                                [(#\ω) "$\\omega$"]
+                                [(#\η) "$\\eta$"]
+                                [(#\ι) "$\\iota$"]
+                                [(#\ξ) "$\\xi$"]
+                                [(#\Γ) "$\\Gamma$"]
+                                [(#\Ψ) "$\\Psi$"]
+                                [(#\Δ) "$\\Delta$"]
+                                [(#\Ξ) "$\\Xi$"]
+                                [(#\Υ) "$\\Upsilon$"]
+                                [(#\Ω) "$\\Omega$"]
+                                [(#\Θ) "$\\Theta$"]
+                                [(#\Π) "$\\Pi$"]
+                                [(#\Φ) "$\\Phi$"]
+                                [(#\±) "$\\pm$"]
+                                [(#\∩) "$\\cap$"]
+                                [(#\◇) "$\\diamond$"]
+                                [(#\⊕) "$\\oplus$"]
+                                [(#\∓) "$\\mp$"]
+                                [(#\∪) "$\\cup$"]
+                                [(#\△) "$\\bigtriangleup$"]
+                                [(#\⊖) "$\\ominus$"]
+                                [(#\×) "$\\times$"]
+                                [(#\⊎) "$\\uplus$"]
+                                [(#\▽) "$\\bigtriangledown$"]
+                                [(#\⊗) "$\\otimes$"]
+                                [(#\÷) "$\\div$"]
+                                [(#\⊓) "$\\sqcap$"]
+                                [(#\▹) "$\\triangleleft$"]
+                                [(#\⊘) "$\\oslash$"]
+                                [(#\∗) "$\\ast$"]
+                                [(#\⊔) "$\\sqcup$"]
+                                [(#\∨) "$\\vee$"]
+                                [(#\∧) "$\\wedge$"]
+                                [(#\◃) "$\\triangleright$"]
+                                [(#\⊙) "$\\odot$"]
+                                [(#\★) "$\\star$"]
+                                [(#\†) "$\\dagger$"]
+                                [(#\•) "$\\bullet$"]
+                                [(#\‡) "$\\ddagger$"]
+                                [(#\≀) "$\\wr$"]
+                                [(#\⨿) "$\\amalg$"]
+                                [(#\≤) "$\\leq$"]
+                                [(#\≥) "$\\geq$"]
+                                [(#\≡) "$\\equiv$"]
+                                [(#\⊨) "$\\models$"]
+                                [(#\≺) "$\\prec$"]
+                                [(#\≻) "$\\succ$"]
+                                [(#\∼) "$\\sim$"]
+                                [(#\⊥) "$\\perp$"]
+                                [(#\≼) "$\\preceq$"]
+                                [(#\≽) "$\\succeq$"]
+                                [(#\≃) "$\\simeq$"]
+                                [(#\≪) "$\\ll$"]
+                                [(#\≫) "$\\gg$"]
+                                [(#\≍) "$\\asymp$"]
+                                [(#\∥) "$\\parallel$"]
+                                [(#\⊂) "$\\subset$"]
+                                [(#\⊃) "$\\supset$"]
+                                [(#\≈) "$\\approx$"]
+                                [(#\⋈) "$\\bowtie$"]
+                                [(#\⊆) "$\\subseteq$"]
+                                [(#\⊇) "$\\supseteq$"]
+                                [(#\≌) "$\\cong$"]
+                                [(#\⊏) "$\\sqsubset$"]
+                                [(#\⊐) "$\\sqsupset$"]
+                                [(#\≠) "$\\neq$"]
+                                [(#\⌣) "$\\smile$"]
+                                [(#\⊑) "$\\sqsubseteq$"]
+                                [(#\⊒) "$\\sqsupseteq$"]
+                                [(#\≐) "$\\doteq$"]
+                                [(#\⌢) "$\\frown$"]
+                                [(#\∈) "$\\in$"]
+                                [(#\∉) "$\\not\\in$"]
+                                [(#\∋) "$\\ni$"]
+                                [(#\∝) "$\\propto$"]
+                                [(#\⊢) "$\\vdash$"]
+                                [(#\⊣) "$\\dashv$"]    
+                                [(#\☠) "$\\skull$"]
+                                [(#\☺) "$\\smiley$"]
+                                [(#\☻) "$\\blacksmiley$"]
+                                [(#\☹) "$\\frownie$"]
+                                [(#\ø) "{\\o}"]
+                                [(#\Ø) "{\\O}"]
+                                [(#\ł) "{\\l}"]
+                                [(#\Ł) "{\\L}"]
+                                [(#\uA7) "{\\S}"]
+                                [(#\⟦ #\〚) "$[\\![$"]
+                                [(#\⟧ #\〛) "$]\\!]$"]
+                                [(#\↦) "$\\mapsto$"]
+                                [(#\⊤) "$\\top$"]
+                                [(#\¥) "{\\textyen}"]
+                                [(#\™) "{\\texttrademark}"]
+                                [(#\®) "{\\textregistered}"]
+                                [(#\©) "{\\textcopyright}"]
+                                [(#\u2070) "$^0$"]
+                                [(#\u00b9) "$^1$"]
+                                [(#\u00b2) "$^2$"]
+                                [(#\u00b3) "$^3$"]
+                                [(#\u2074) "$^4$"]
+                                [(#\u2075) "$^5$"]
+                                [(#\u2076) "$^6$"]
+                                [(#\u2077) "$^7$"]
+                                [(#\u2078) "$^8$"]
+                                [(#\u2079) "$^9$"]
+                                [(#\u207a) "$^+$"]
+                                [(#\u207b) "$^-$"]
+                                [(#\⋖) "$\\precdot$"]
+                                [(#\⋗) "$\\succdot$"]
+                                [(#\⋮) "\\vdots"]
+                                [(#\⋱) "$\\ddots$"]
+                                [(#\⋯) "$\\cdots$"]
+                                [(#\⋯) "\\hdots"]
+                                [else
+                                 (cond
+                                  [(char<=? #\uAC00 c #\uD7AF) ; Korean Hangul
+                                   (format "\\begin{CJK}{UTF8}{mj}~a\\end{CJK}" c)]
+                                  [else
+                                   ;; Detect characters that can be formed with combining characters
+                                   ;; and translate them to Latex combinations:
+                                   (define s (string-normalize-nfd (string c)))
+                                   (define len (string-length s))
+                                   (cond
+                                    [(len . > . 1)
+                                     (define combiner (case (string-ref s (sub1 len))
+                                                        [(#\u300) "\\`{~a}"]
+                                                        [(#\u301) "\\'{~a}"]
+                                                        [(#\u302) "\\^{~a}"]
+                                                        [(#\u303) "\\~~{~a}"]
+                                                        [(#\u304) "\\={~a}"]
+                                                        [(#\u306) "\\u{~a}"]
+                                                        [(#\u307) "\\.{~a}"]
+                                                        [(#\u308) "\\\"{~a}"]
+                                                        [(#\u30a) "\\r{~a}"]
+                                                        [(#\u30b) "\\H{~a}"]
+                                                        [(#\u30c) "\\v{~a}"]
+                                                        [(#\u327) "\\c{~a}"]
+                                                        [(#\u328) "\\k{~a}"]
+                                                        [else #f]))
+                                     (define base (string-normalize-nfc (substring s 0 (sub1 len))))
+                                     (if (and combiner
+                                              (= 1 (string-length base)))
+                                         (format combiner (char-loop (string-ref base 0)))
+                                         c)]
+                                    [else c])])]))
                           c)])))
                 (loop (add1 i))))))]))
     

scribble-lib/scribble/manual-struct.rkt

@@ -5,6 +5,8 @@
 
 (provide-structs
  [module-path-index-desc ()]
+ [(language-index-desc module-path-index-desc) ()]
+ [(reader-index-desc module-path-index-desc) ()]
  [exported-index-desc ([name symbol?]
                        [from-libs (listof module-path?)])]
  [(method-index-desc exported-index-desc) ([method-name symbol?]

scribble-lib/scribble/manual-style.css

@@ -315,7 +315,7 @@ a:hover {
 
 
 /* slightly different handling for margin-note* on narrow screens */
-@media all and (max-width:1260px) {
+@media all and (max-width:1340px) {
      span.refcolumn {
          float: right;
          width: 50%;
@@ -352,13 +352,12 @@ a:hover {
 }
 
 
-@media all and (min-width:1260px) {
+@media all and (min-width:1340px) {
     .refcolumn {
-        position: absolute;
-        left: 66rem; right: 3em;
-        margin: 0;
+        margin: 0 -22.5rem 1rem 0;
         float: right;
-        max-width: 18rem;
+        clear: right;
+        width: 18rem;
     }
 }
 

scribble-lib/scribble/pdf-render.rkt

@@ -4,7 +4,8 @@
          (prefix-in latex: "latex-render.rkt"))
 
 (provide render-mixin
-         dvi-render-mixin)
+         dvi-render-mixin
+         xelatex-render-mixin)
 
 (define render-mixin
   (make-indirect-renderer-mixin
@@ -15,3 +16,8 @@
   (make-indirect-renderer-mixin
    (λ (%) (latex:render-mixin % #:image-mode 'ps)) #".tex" #".pdf"
    run-dvipdf-latex))
+
+(define xelatex-render-mixin
+  (make-indirect-renderer-mixin
+   (λ (%) (latex:render-mixin % #:image-mode 'pdf)) #".tex" #".pdf"
+   run-xelatex))

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

@@ -114,7 +114,15 @@
                                 (let ([ns-id 
                                        (let ([ns (make-base-empty-namespace)])
                                          (parameterize ([current-namespace ns])
-                                           (namespace-require `(for-label ,lib))
+                                           ;; A `(namespace-require `(for-label ,lib))` can
+                                           ;; fail if `lib` provides different bindings of the
+                                           ;; same name at different phases. We can require phases
+                                           ;; 1 and 0 separately, in which case the phase-0
+                                           ;; binding shadows the phase-1 one in that case.
+                                           ;; This strategy only works for documenting bindings
+                                           ;; at phases 0 and 1, though.
+                                           (namespace-require `(just-meta 1 (for-label ,lib)))
+                                           (namespace-require `(just-meta 0 (for-label ,lib)))
                                            (namespace-syntax-introduce (datum->syntax #f 'x))))])
                                   (let ([checker
                                          (lambda (id)

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

@@ -95,13 +95,14 @@
                          (if (and (identifier? spec)
                                   (free-identifier=? spec #'defined-id))
                              (datum->syntax #'here '(unsyntax x) spec spec)
-                             (syntax-case spec ()
-                               [(a . b)
-                                (datum->syntax spec
-                                               (cons (loop #'a) (loop #'b))
-                                               spec
-                                               spec)]
-                               [_ spec]))))])
+                             (cond
+                               [(syntax? spec) (datum->syntax spec
+                                                              (loop (syntax-e spec))
+                                                              spec
+                                                              spec)]
+                               [(pair? spec) (cons (loop (car spec))
+                                                   (loop (cdr spec)))]
+                               [else spec]))))])
        #'(with-togetherable-racket-variables
             (l.lit ...)
             ([form [defined-id spec]] [form [defined-id spec1]] ...

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

@@ -221,30 +221,36 @@
                                    (add-between (map tt pkgs) ", "))))))))))
     (define (flow-width f) (apply max (map block-width f)))
     (define libs-specs
+      ;; make-desc  : element -> flow
+      ;; index-desc : module-path-index-desc
+      (let-values ([(make-desc index-desc)
+                    (case lang
+                      [(#f)
+                       (values (lambda (modname) (list (racket (#,req #,modname))))
+                               the-module-path-index-desc)]
+                      [(#t)
+                       (values (lambda (modname) (list (hash-lang) spacer modname))
+                               the-language-index-desc)]
+                      [(reader)
+                       (values (lambda (modname) (list (racketmetafont "#reader") spacer modname))
+                               the-reader-index-desc)]
+                      [(just-lang)
+                       (values (lambda (modname) (list (hash-lang) spacer modname))
+                               the-language-index-desc)]
+                      [else (error 'defmodule "unknown mode: ~e" lang)])])
       (map
        (lambda (name modpath)
          (define modname (if link-target?
-                             (make-defracketmodname name modpath)
+                             (make-defracketmodname name modpath index-desc)
                              name))
          (list
           (make-flow
            (list
             (make-omitable-paragraph
-             (cons
-              spacer
-              (case lang
-                [(#f)
-                 (list (racket (#,req #,modname)))]
-                [(#t)
-                 (list (hash-lang) spacer modname)]
-                [(reader)
-                 (list (racketmetafont "#reader") spacer modname)]
-                [(just-lang)
-                 (list (hash-lang) spacer modname)]
-                [else (error 'defmodule "unknown mode: ~e" lang)])))))
+             (cons spacer (make-desc modname)))))
           'cont))
        names
-       modpaths))
+       modpaths)))
 
     (make-splice
      (cons
@@ -278,8 +284,10 @@
               (flow-paragraphs (decode-flow content)))))))
 
 (define the-module-path-index-desc (make-module-path-index-desc))
+(define the-language-index-desc (make-language-index-desc))
+(define the-reader-index-desc (make-reader-index-desc))
 
-(define (make-defracketmodname mn mp)
+(define (make-defracketmodname mn mp index-desc)
   (let ([name-str (datum-intern-literal (element->string mn))]
         [path-str (datum-intern-literal (element->string mp))])
     (make-index-element #f
@@ -287,7 +295,7 @@
                         (intern-taglet `(mod-path ,path-str))
                         (list name-str)
                         (list mn)
-                        the-module-path-index-desc)))
+                        index-desc)))
 
 (define-syntax (declare-exporting stx)
   (syntax-parse stx

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

@@ -857,17 +857,16 @@
                             (short-width . < . max-proto-width))]
                        [split-field-line?
                         ;; start fields on the line after "struct"?
-                        (max-proto-width . < . (+ 8
-                                                  (if (pair? name)
-                                                      (+ (sym-length (car name))
-                                                         1
-                                                         (sym-length (cadr name)))
-                                                      (sym-length name))
-                                                  1
-                                                  (if (pair? fields)
-                                                      (sym-length (field-name (car fields)))
-                                                      0)
-                                                  1))])
+                        (and (pair? fields)
+                             (max-proto-width . < . (+ 8
+                                                       (if (pair? name)
+                                                           (+ (sym-length (car name))
+                                                              1
+                                                              (sym-length (cadr name)))
+                                                           (sym-length name))
+                                                       1
+                                                       (sym-length (field-name (car fields)))
+                                                       1)))])
                   (make-table
                    #f
                    ;; First four columns: "(struct" <space> <name><space> (

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

@@ -92,16 +92,17 @@
     [(_ #:file filename #:escape unsyntax-id lang rest ...)
      (with-syntax ([modtag (datum->syntax
                             #'here
-                            `(unsyntax (make-element
-                                        #f
-                                        (list (hash-lang)
-                                              spacer
-                                              ,(if (identifier? #'lang)
-                                                   `(as-modname-link
-                                                     ',#'lang
-                                                     (to-element ',#'lang)
-                                                     #f)
-                                                   #'(racket lang)))))
+                            (list #'unsyntax-id
+                                  `(make-element
+                                    #f
+                                    (list (hash-lang)
+                                          spacer
+                                          ,(if (identifier? #'lang)
+                                               `(as-modname-link
+                                                 ',#'lang
+                                                 (to-element ',#'lang)
+                                                 #f)
+                                               #'(racket lang)))))
                             #'lang)])
        (if (syntax-e #'filename)
            (quasisyntax/loc stx
@@ -121,6 +122,8 @@
   (make-element result-color (list (to-element/no-color s))))
 (define (to-element/id s)
   (make-element symbol-color (list (to-element/no-color s))))
+(define (to-element/no-escapes s)
+  (to-element s #:escapes? #f))
 
 (define-syntax (keep-s-expr stx)
   (syntax-case stx (quote)
@@ -159,7 +162,7 @@
 (define-code RACKET to-element UNSYNTAX keep-s-expr add-sq-prop)
 (define-code racketresult to-element/result unsyntax keep-s-expr add-sq-prop)
 (define-code racketid to-element/id unsyntax keep-s-expr add-sq-prop)
-(define-code *racketmodname to-element unsyntax keep-s-expr add-sq-prop)
+(define-code *racketmodname to-element/no-escapes unsyntax keep-s-expr add-sq-prop)
 
 (define-syntax (**racketmodname stx)
   (syntax-case stx ()

scribble-lib/scribble/private/run-pdflatex.rkt

@@ -2,16 +2,22 @@
 
 (require scheme/system scheme/port)
 
-(provide run-pdflatex run-dvipdf-latex)
+(provide run-pdflatex run-dvipdf-latex run-xelatex)
 
-(define (run-pdflatex file [notify void]) (run file notify #f))
+(define (run-pdflatex file [notify void]) (run file notify 'pdflatex))
 (define (run-dvipdf-latex file [notify void]) 
   (parameterize ([function-name 'run-dvipdf-latex])
-    (run file notify #t)))
+    (run file notify 'dvipdf)))
+(define (run-xelatex file [notify void])
+  (parameterize ([function-name 'run-xelatex])
+    (run file notify 'xelatex)))
 
 (define max-runs 5)
-(define (run file notify via-dvipdf?)
-  (define latex-cmd-name (if via-dvipdf? "latex" "pdflatex"))
+(define (run file notify type)
+  (define latex-cmd-name (cond [(equal? type 'pdflatex) "pdflatex"]
+                               [(equal? type 'dvipdf) "latex"]
+                               [(equal? type 'xelatex) "xelatex"]
+                               [else (err "unknown run type ~a" type)]))
   (define cmd
     (list (get-latex-binary latex-cmd-name)
           "-interaction=batchmode"
@@ -43,7 +49,7 @@
           [(zero? n)
            (notify "WARNING: no \"Rerun\" found in first run of pdflatex for ~a"
                    file)]))
-  (when via-dvipdf?
+  (when (equal? type 'dvipdf)
     (define dvi-file (path-replace-suffix file #".dvi"))
     (define ps-file (path-replace-suffix file #".ps"))
     (unless (file-exists? dvi-file) (err "didn't find .dvi file"))

scribble-lib/scribble/private/tag.rkt

@@ -0,0 +1,40 @@
+#lang scheme/base
+
+;; It might make sense to make these functions public, but since they weren't originally,
+;; I am going to keep them in the private folder for now.
+;; -- With Love, Leif
+
+(provide (all-defined-out))
+
+(require racket/list
+         scribble/core
+         "../tag.rkt")
+
+(define (gen-tag content)
+  (datum-intern-literal
+   ;; Generate tag from ASCII plus CJK characters. Constraining to
+   ;; ASCII for most purposes helps avoid encoding issues for
+   ;; uncooperative environments, but constraining to ASCII is too
+   ;; uncooperative in another direction for CJK text (i.e., creates
+   ;; too many conflicting tags).
+   (regexp-replace* #px"[^-a-zA-Z0-9_=\u4e00-\u9fff\u3040-\u309F\u30A0-\u30FF]"
+                    (content->string content) "_")))
+
+(define (convert-tag tag content)
+  (if (list? tag)
+    (append-map (lambda (t) (convert-tag t content)) tag)
+    `((part ,(or tag (gen-tag content))))))
+
+(define (convert-part-style who s)
+  (cond
+   [(style? s) s]
+   [(not s) plain]
+   [(string? s) (make-style s null)]
+   [(symbol? s) (make-style #f (list s))]
+   [(and (list? s) (andmap symbol? s)) (make-style #f s)]
+   [else (raise-argument-error who "(or/c style? string? symbol? (listof symbol?) #f)" s)]))
+
+(define (prefix->string p)
+  (and p (if (string? p) 
+             (datum-intern-literal p)
+             (module-path-prefix->string p))))

scribble-lib/scribble/racket.rkt

@@ -326,6 +326,7 @@
            [first (if escapes?
                       (syntax-case c (code:line)
                         [(code:line e . rest) #'e]
+                      [(code:line . rest) #'rest]
                         [else c])
                       c)]
            [init-col (or (syntax-column first) 0)]
@@ -380,7 +381,7 @@
               (set! content (cons (elem-wrap
                                    ((if highlight?
                                         (lambda (c)
-                                          (make-element highlighted-color c))
+                                          (make-element highlight? c))
                                         values)
                                     (if (and color? cls)
                                         (make-element/cache cls v)
@@ -469,6 +470,70 @@
          [else s]))
       (define (loop init-line! quote-depth expr? no-cons?)
         (lambda (c srcless-step)
+        (define (lloop quote-depth l)
+          (let inner-lloop ([first-element? #t]
+                      [l l]
+                      [first-expr? (and expr?
+                                        (or (zero? quote-depth)
+                                            (not (struct-proxy? (syntax-e c))))
+                                        (not no-cons?))]
+                      [dotted? #f]
+                      [srcless-step #f])
+                 (define (print-dot-separator l)
+                   (unless (and expr? (zero? quote-depth))
+                      (advance l init-line! (and srcless-step (+ srcless-step 3)) -2)
+                      (out ". " (if (positive? quote-depth) value-color paren-color))
+                      (set! src-col (+ src-col 3)))
+                    (hash-set! next-col-map src-col dest-col))
+                 (cond
+                   [(let ([el (if (syntax? l) (syntax-e l) l)])
+                      (and (pair? el)
+                           (eq? (if (syntax? (car el))
+                                    (syntax-e (car el))
+                                    (car el))
+                                'code:hilite)))
+                    (define l-stx
+                      (if (syntax? l)
+                         l
+                         (datum->syntax #f l (list #f #f #f #f 0))))
+                    (print-dot-separator l-stx)
+                    ((loop init-line! quote-depth first-expr? #f) l-stx (if (and expr? (zero? quote-depth))
+                                                                            srcless-step
+                                                                            #f))]
+                   [(and (syntax? l)
+                         (pair? (syntax-e l))
+                         (not dotted?)
+                         (not (and (memq (syntax-e (car (syntax-e l)))
+                                         '(quote unquote syntax unsyntax quasiquote quasiunsyntax))
+                                   (let ([v (syntax->list l)])
+                                     (and v (= 2 (length v))))
+                                   (or (not expr?)
+                                       (quote-depth . > . 1)
+                                       (not (memq (syntax-e (car (syntax-e l)))
+                                                  '(unquote unquote-splicing)))))))
+                    (if first-element?
+                        (inner-lloop #f (syntax-e l) first-expr? #f srcless-step)
+                        (begin
+                          (print-dot-separator l)
+                          ((loop init-line! quote-depth first-expr? #f) l srcless-step)))]
+                   [(and (or (null? l)
+                             (and (syntax? l)
+                                  (null? (syntax-e l)))))
+                    (void)]
+                   [(and (pair? l) (not dotted?))
+                    ((loop init-line! quote-depth first-expr? #f) (car l) srcless-step)
+                    (inner-lloop #f (cdr l) expr? #f 1)]
+                   [(forced-pair? l)
+                    ((loop init-line! quote-depth first-expr? #f) (forced-pair-car l) srcless-step)
+                    (inner-lloop #f (forced-pair-cdr l) expr? #t 1)]
+                   [(mpair? l)
+                    ((loop init-line! quote-depth first-expr? #f) (mcar l) srcless-step)
+                    (inner-lloop #f (mcdr l) expr? #t 1)]
+                   [else
+                    (print-dot-separator l)
+                    ((loop init-line! quote-depth first-expr? #f) l (if (and expr? (zero? quote-depth))
+                                                                        srcless-step
+                                                                        #f))])))
           (cond
            [(and escapes? (eq? 'code:blank (syntax-e c)))
             (advance c init-line! srcless-step)]
@@ -513,24 +578,30 @@
            [(and escapes?
                  (pair? (syntax-e c))
                  (eq? (syntax-e (car (syntax-e c))) 'code:line))
-            (let ([l (cdr (syntax->list c))])
-              (for-each/i (loop init-line! quote-depth expr? #f) 
-                          l
-                          #f))]
+           (lloop quote-depth
+                  (cdr (syntax-e c)))]
            [(and escapes?
                  (pair? (syntax-e c))
                  (eq? (syntax-e (car (syntax-e c))) 'code:hilite))
             (let ([l (syntax->list c)]
                   [h? highlight?])
-              (unless (and l (= 2 (length l)))
-                (error "bad code:redex: ~.s" (syntax->datum c)))
+             (unless (and l (or (= 2 (length l)) (= 3 (length l))))
+               (error "bad code:hilite: ~.s" (syntax->datum c)))
+
               (advance c init-line! srcless-step)
               (set! src-col (syntax-column (cadr l)))
               (hash-set! next-col-map src-col dest-col)
-              (set! highlight? #t)
+
+             (set! highlight? (if (= 3 (length l))
+                                  (let ([the-style (syntax-e (caddr l))])
+                                    (if (syntax? the-style)
+                                        (syntax->datum the-style)
+                                        the-style))
+                                  highlighted-color))
               ((loop init-line! quote-depth expr? #f) (cadr l) #f)
               (set! highlight? h?)
-              (set! src-col (add1 src-col)))]
+             (unless (= (syntax-span c) 0)
+               (set! src-col (add1 src-col))))]
            [(and escapes?
                  (pair? (syntax-e c))
                  (eq? (syntax-e (car (syntax-e c))) 'code:quote))
@@ -660,80 +731,40 @@
                        p-color))
                 (set! src-col (+ src-col 1))
                 (hash-set! next-col-map src-col dest-col)
-                (let lloop ([l (cond
-                                [(vector? (syntax-e c))
-                                 (vector->short-list (syntax-e c) syntax-e)]
-                                [(struct? (syntax-e c))
-                                 (let ([l (vector->list (struct->vector (syntax-e c)))])
-                                   ;; Need to build key datum, syntax-ize it internally, and
-                                   ;;  set the overall width to fit right:
-                                   (if (and expr? (zero? quote-depth))
-                                       (cdr l)
-                                       (cons (let ([key (syntax-ize (prefab-struct-key (syntax-e c))
-                                                                    (+ 3 (or (syntax-column c) 0))
-                                                                    (or (syntax-line c) 1))]
-                                                   [end (if (pair? (cdr l))
-                                                            (and (equal? (syntax-line c) (syntax-line (cadr l)))
-                                                                 (syntax-column (cadr l)))
-                                                            (and (syntax-column c)
-                                                                 (+ (syntax-column c) (syntax-span c))))])
-                                               (if end
-                                                   (datum->syntax #f
-                                                                  (syntax-e key)
-                                                                  (vector #f (syntax-line key)
-                                                                          (syntax-column key)
-                                                                          (syntax-position key)
-                                                                          (max 1 (- end 1 (syntax-column key)))))
-                                                   end))
-                                             (cdr l))))]
-                                [(struct-proxy? (syntax-e c))
-                                 (struct-proxy-content (syntax-e c))]
-                                [(forced-pair? (syntax-e c))
-                                 (syntax-e c)]
-                                [(mpair? (syntax-e c))
-                                 (syntax-e c)]
-                                [else c])]
-                            [first-expr? (and expr? 
-                                              (or (zero? quote-depth)
-                                                  (not (struct-proxy? (syntax-e c))))
-                                              (not no-cons?))]
-                            [dotted? #f]
-                            [srcless-step #f])
-                  (cond
-                   [(and (syntax? l)
-                         (pair? (syntax-e l))
-                         (not dotted?)
-                         (not (and (memq (syntax-e (car (syntax-e l)))
-                                         '(quote unquote syntax unsyntax quasiquote quasiunsyntax))
-                                   (let ([v (syntax->list l)])
-                                     (and v (= 2 (length v))))
-                                   (or (not expr?)
-                                       (quote-depth . > . 1)
-                                       (not (memq (syntax-e (car (syntax-e l))) 
-                                                  '(unquote unquote-splicing)))))))
-                    (lloop (syntax-e l) first-expr? #f srcless-step)]
-                   [(and (or (null? l)
-                             (and (syntax? l)
-                                  (null? (syntax-e l)))))
-                    (void)]
-                   [(and (pair? l) (not dotted?))
-                    ((loop init-line! quote-depth first-expr? #f) (car l) srcless-step)
-                    (lloop (cdr l) expr? #f 1)]
-                   [(forced-pair? l)
-                    ((loop init-line! quote-depth first-expr? #f) (forced-pair-car l) srcless-step)
-                    (lloop (forced-pair-cdr l) expr? #t 1)]
-                   [(mpair? l)
-                    ((loop init-line! quote-depth first-expr? #f) (mcar l) srcless-step)
-                    (lloop (mcdr l) expr? #t 1)]
-                   [else
-                    (unless (and expr? (zero? quote-depth))
-                      (advance l init-line! (and srcless-step (+ srcless-step 3)) -2)
-                      (out ". " (if (positive? quote-depth) value-color paren-color))
-                      (set! src-col (+ src-col 3)))
-                    (hash-set! next-col-map src-col dest-col)
-                    ((loop init-line! quote-depth first-expr? #f) l (if (and expr? (zero? quote-depth))
-                                                                        srcless-step
-                                                                        #f))]))
+               (lloop quote-depth
+                      (cond
+                        [(vector? (syntax-e c))
+                         (vector->short-list (syntax-e c) syntax-e)]
+                        [(struct? (syntax-e c))
+                         (let ([l (vector->list (struct->vector (syntax-e c)))])
+                           ;; Need to build key datum, syntax-ize it internally, and
+                           ;;  set the overall width to fit right:
+                           (if (and expr? (zero? quote-depth))
+                               (cdr l)
+                               (cons (let ([key (syntax-ize (prefab-struct-key (syntax-e c))
+                                                            (+ 3 (or (syntax-column c) 0))
+                                                            (or (syntax-line c) 1))]
+                                           [end (if (pair? (cdr l))
+                                                    (and (equal? (syntax-line c) (syntax-line (cadr l)))
+                                                         (syntax-column (cadr l)))
+                                                    (and (syntax-column c)
+                                                         (+ (syntax-column c) (syntax-span c))))])
+                                       (if end
+                                           (datum->syntax #f
+                                                          (syntax-e key)
+                                                          (vector #f (syntax-line key)
+                                                                  (syntax-column key)
+                                                                  (syntax-position key)
+                                                                  (max 1 (- end 1 (syntax-column key)))))
+                                           end))
+                                     (cdr l))))]
+                        [(struct-proxy? (syntax-e c))
+                         (struct-proxy-content (syntax-e c))]
+                        [(forced-pair? (syntax-e c))
+                         (syntax-e c)]
+                        [(mpair? (syntax-e c))
+                         (syntax-e c)]
+                        [else c]))
                 (out (case sh
                        [(#\[ #\?) "]"]
                        [(#\{) "}"]

scribble-lib/scribble/racket.tex

@@ -2,7 +2,10 @@
 % Redefine \SColorize to produce B&W Scheme text
 \newcommand{\SColorize}[2]{\color{#1}{#2}}
 
-\newcommand{\inColor}[2]{{\Scribtexttt{\SColorize{#1}{#2}}}}
+% Redefine SHyphen to allow identifiers to be hyphenated
+\newcommand{\SHyphen}[1]{#1}
+
+\newcommand{\inColor}[2]{{\SHyphen{\Scribtexttt{\SColorize{#1}{#2}}}}}
 \definecolor{PaleBlue}{rgb}{0.90,0.90,1.0}
 \definecolor{LightGray}{rgb}{0.90,0.90,0.90}
 \definecolor{CommentColor}{rgb}{0.76,0.45,0.12}

scribble-lib/scribble/run.rkt

@@ -40,6 +40,7 @@
         (and (eof-object? (read i)) v)))))
 
 (define (run)
+  (define doc-binding 'doc)
   (command-line
    #:program (short-program+command-name)
    #:once-any
@@ -66,6 +67,9 @@
    [("--pdf") "generate PDF-format output (via PDFLaTeX)"
     (current-html #f)
     (current-render-mixin pdf:render-mixin)]
+   [("--xelatex") "generate PDF-format output (via XeLaTeX)"
+    (current-html #f)
+    (current-render-mixin pdf:xelatex-render-mixin)]
    [("--dvipdf") "generate PDF-format output (via LaTeX, dvips, and pstopdf)"
     (current-html #f)
     (current-render-mixin pdf:dvi-render-mixin)]
@@ -136,15 +140,19 @@
    #:once-each
    [("--quiet") "suppress output-file and undefined-tag reporting"
     (current-quiet #t)]
+   [("--doc-binding") id
+    "render document provided as <id> instead of `doc`"
+    (set! doc-binding (string->symbol id))]
    #:args (file . another-file)
    (let ([files (cons file another-file)])
      (parameterize ([current-command-line-arguments
                      (list->vector (reverse (doc-command-line-arguments)))])
        (build-docs (map (lambda (file) 
                           ;; Try `doc' submodule, first:
-                          (if (module-declared? `(submod (file ,file) doc) #t)
-                              (dynamic-require `(submod (file ,file) doc) 'doc)
-                              (dynamic-require `(file ,file) 'doc)))
+                          (if (module-declared? `(submod (file ,file) ,doc-binding) #t)
+                            (dynamic-require `(submod (file ,file) ,doc-binding)
+                                             doc-binding)
+                            (dynamic-require `(file ,file) doc-binding)))
                         files)
                    files)))))
 

scribble-lib/scribble/scribble.css

@@ -194,6 +194,7 @@ table td {
   font-size: 85%;
   border: 0.5em solid #F5F5DC;
   margin: 0 0 0 0;
+  white-space: normal; /* in case margin note is inside code sample */
 }
 
 .refcontent {

scribble-lib/scribble/scribble.tex

@@ -301,6 +301,10 @@
 \newcommand{\titleAndVersionAndEmptyAuthors}[3]{\title{#1\\{\normalsize \SVersionBefore{}#2}}#3\maketitle}
 \newcommand{\titleAndEmptyVersionAndAuthors}[3]{\title{#1}\author{#3}\maketitle}
 \newcommand{\titleAndEmptyVersionAndEmptyAuthors}[3]{\title{#1}\maketitle}
+\newcommand{\titleAndVersionAndAuthorsAndShort}[4]{\title[#4]{#1\\{\normalsize \SVersionBefore{}#2}}\author{#3}\maketitle}
+\newcommand{\titleAndVersionAndEmptyAuthorsAndShort}[4]{\title[#4]{#1\\{\normalsize \SVersionBefore{}#2}}#3\maketitle}
+\newcommand{\titleAndEmptyVersionAndAuthorsAndShort}[4]{\title[#4]{#1}\author{#3}\maketitle}
+\newcommand{\titleAndEmptyVersionAndEmptyAuthorsAndShort}[4]{\title[#4]{#1}\maketitle}
 \newcommand{\SAuthor}[1]{#1}
 \newcommand{\SAuthorSep}[1]{\qquad}
 \newcommand{\SVersionBefore}[1]{Version }

scribble-lib/scribble/search.rkt

@@ -92,7 +92,8 @@
                                 (let ([v (resolve-get/tentative part ri `(form ,eb))])
                                   (or (and v `(form ,eb))
                                       `(def ,eb))))]
-                          [need-result? (and need-result? (not here-result))])
+                          [need-result? (and need-result? (not here-result))]
+                          [rmp-name (resolved-module-path-name rmp)])
                      ;; Even if we've found `here-result', look deeper so that we have 
                      ;; consistent `dep' results.
                      (let ([nest-result
@@ -102,7 +103,9 @@
                                 ;; Not defined through this path, so keep looking
                                 (loop queue rqueue need-result?)
                                 ;; Check parents, if we can get the source:
-                                (if (and (path? (resolved-module-path-name rmp))
+                                (if (and (or (path? rmp-name)
+                                             (and (list? rmp-name)
+                                                  (path? (car rmp-name))))
                                          (not (hash-ref seen (cons export-phase rmp) #f)))
                                     (let ([exports
                                            (hash-ref
@@ -114,7 +117,12 @@
                                                              (lambda ()
                                                                ;; First, try using bytecode:
                                                                (module-compiled-exports 
-                                                                (get-module-code (resolved-module-path-name rmp)
+                                                                (get-module-code (if (list? rmp-name)
+                                                                                     (car rmp-name)
+                                                                                     rmp-name)
+                                                                                 #:submodule-path (if (list? rmp-name)
+                                                                                                      (cdr rmp-name)
+                                                                                                      '())
                                                                                  #:choose (lambda (src zo so) 'zo))))
                                                              (lambda ()
                                                                (try

scribble-lib/scribble/sigplan/style.tex

@@ -4,7 +4,7 @@
 \def\SSubtitleDrop#1{}
 \def\SExtractSubtitleDone {}
 \def\SExtractSubtitle{\futurelet\next\SExtractSubtitleX}
-\def\SExtractSubtitleX#1{\ifx#1\SSubtitle \let\Snext\SWithSubtitle \else \let\Snext\SExtractSubtitleY \fi \Snext}
+\def\SExtractSubtitleX#1{\ifx{#1}\SSubtitle \let\Snext\SWithSubtitle \else \let\Snext\SExtractSubtitleY \fi \Snext}
 \def\SExtractSubtitleY{\ifx\next\SExtractSubtitleDone \let\Snext\relax \else \let\Snext\SExtractSubtitle \fi \Snext}
 \def\SWithSubtitle#1{\subtitle{#1}\SExtractSubtitle}
 

scribble-lib/scriblib/bibtex.rkt

@@ -1,7 +1,8 @@
 #lang at-exp racket/base
 (require racket/function
          racket/match
-         racket/list)
+         racket/list
+         racket/string)
 
 (struct bibdb (raw bibs))
 
@@ -208,7 +209,7 @@
               (λ (key)
                 (and (not (string=? "\n" key))
                      (generate-bib bibtex-db key)))
-              (append-map (curry regexp-split #rx" +")
+              (append-map (curry regexp-split #px"\\s+")
                           (cons f r)))))
     (define ~cite-id (make-citer autobib-cite))
     (define citet-id (make-citer autobib-citet))))
@@ -216,14 +217,25 @@
 (define (parse-author as)
   (and as
       (apply authors
-         (for/list ([a (in-list (regexp-split #rx" +and *" as))])
-           (match (regexp-split #rx" +" a)
-             [(list one) (org-author-name one)]
-             [(list one two) (author-name one two)]
-             [(list-rest first rest) 
-              (author-name (apply string-append (add-between (cons first (drop-right rest 1))
-                                                             " "))
-                           (last rest))])))))
+         (for/list ([a (in-list (regexp-split #px"\\s+and\\s+" as))])
+           (define (trim s)
+             (string-trim (regexp-replace #px"\\s+" s " ")))
+           (match a
+             [(pregexp #px"^(.*),(.*),(.*)$" (list _ two suffix one))
+              (author-name (trim one) (trim two) #:suffix (trim suffix))]
+             [(pregexp #px"^(.*),(.*)$" (list _ two one))
+              (author-name (string-trim one) (string-trim two))]
+             [(pregexp #px"^(.*?)\\s+(\\p{Ll}[^\\s]*(\\s+\\p{Ll}[^\\s]*)*)\\s+(.*)$" (list _ one von-like _ two))
+              (author-name (string-trim one)
+                           (string-append (string-trim von-like) " " (string-trim two)))]
+             [space-separated
+              (match (regexp-split #px"\\s+" space-separated)
+                [(list one) (org-author-name one)]
+                [(list one two) (author-name one two)]
+                [(list-rest first rest)
+                 (author-name (apply string-append (add-between (cons first (drop-right rest 1))
+                                                                " "))
+                              (last rest))])])))))
 
 (module+ test
   (require rackunit)
@@ -235,8 +247,8 @@
     (equal? (format "~s" a)
             (format "~s" b)))
   
-  (check 
-   print-as-equal-string? 
+  (check
+   print-as-equal-string?
    (parse-author "James Earl Jones")
    (authors
     (author-name "James Earl" "Jones")))
@@ -248,12 +260,158 @@
             (author-name "Morgan" "Freeman")))
   
   (check
-   print-as-equal-string? 
+   print-as-equal-string?
    (parse-author "Edward L. Deci and Robert J. Vallerand and Luc G. Pelletier and Richard M. Ryan")
    (authors (author-name "Edward L." "Deci")
             (author-name "Robert J." "Vallerand")
             (author-name "Luc G." "Pelletier")
-            (author-name "Richard M." "Ryan"))))
+            (author-name "Richard M." "Ryan")))
+
+  (check
+   print-as-equal-string?
+   (parse-author "Lst, Fst")
+   (authors
+    (author-name "Fst" "Lst")))
+
+  (check
+   print-as-equal-string?
+   (parse-author "Lst,Fst")
+   (authors
+    (author-name "Fst" "Lst")))
+
+  (check
+   print-as-equal-string?
+   (parse-author "James, Earl Jones")
+   (authors
+    (author-name "Earl Jones" "James")))
+
+  (check
+   print-as-equal-string?
+   (parse-author "James,Earl Jones")
+   (authors
+    (author-name "Earl Jones" "James")))
+
+  (check
+   print-as-equal-string?
+   (parse-author "LstA LstB, Fst")
+   (authors
+    (author-name "Fst" "LstA LstB")))
+
+  (check
+   print-as-equal-string?
+   (parse-author "LstA LstB,Fst")
+   (authors
+    (author-name "Fst" "LstA LstB")))
+
+  (check
+   print-as-equal-string?
+   (parse-author "LstA LstB, FstA FstB")
+   (authors
+    (author-name "FstA FstB" "LstA LstB")))
+
+  (check
+   print-as-equal-string?
+   (parse-author "LstA LstB,FstA FstB")
+   (authors
+    (author-name "FstA FstB" "LstA LstB")))
+
+  (check
+   print-as-equal-string?
+   (parse-author "James, Jr, Earl Jones")
+   (authors
+    (author-name "Earl Jones" "James" #:suffix "Jr")))
+
+  (check
+   print-as-equal-string?
+   (parse-author "James,Jr, Earl Jones")
+   (authors
+    (author-name "Earl Jones" "James" #:suffix "Jr")))
+
+  (check
+   print-as-equal-string?
+   (parse-author "James, Jr,Earl Jones")
+   (authors
+    (author-name "Earl Jones" "James" #:suffix "Jr")))
+
+  (check
+   print-as-equal-string?
+   (parse-author "James,Jr,Earl Jones")
+   (authors
+    (author-name "Earl Jones" "James" #:suffix "Jr")))
+
+  (check
+   print-as-equal-string?
+   (parse-author "James, III, Earl Jones")
+   (authors
+    (author-name "Earl Jones" "James" #:suffix "III")))
+
+  (check
+   print-as-equal-string?
+   (parse-author "James,III, Earl Jones")
+   (authors
+    (author-name "Earl Jones" "James" #:suffix "III")))
+
+  (check
+   print-as-equal-string?
+   (parse-author "James, III,Earl Jones")
+   (authors
+    (author-name "Earl Jones" "James" #:suffix "III")))
+
+  (check
+   print-as-equal-string?
+   (parse-author "James,III,Earl Jones")
+   (authors
+    (author-name "Earl Jones" "James" #:suffix "III")))
+
+  (check
+   print-as-equal-string?
+   (parse-author "James Jack von Earl Jones")
+   (authors
+    (author-name "James Jack" "von Earl Jones")))
+
+  (check
+   print-as-equal-string?
+   (parse-author "James Jack de la Earl Jones")
+   (authors
+    (author-name "James Jack" "de la Earl Jones")))
+
+  (check
+   print-as-equal-string?
+   (parse-author "James Jack van der Earl Jones")
+   (authors
+    (author-name "James Jack" "van der Earl Jones")))
+
+  (check
+   print-as-equal-string?
+   (parse-author "James Jack von de la Earl Jones")
+   (authors
+    (author-name "James Jack" "von de la Earl Jones")))
+
+  (check
+   print-as-equal-string?
+   (parse-author "James Jack di Earl Jones")
+   (authors
+    (author-name "James Jack" "di Earl Jones")))
+
+  (check
+   print-as-equal-string?
+   (parse-author "First fOn bER Last")
+   (authors
+    (author-name "First" "fOn bER Last")))
+
+  (check
+   print-as-equal-string?
+   (parse-author "Deci, Edward L. and Robert J. Vallerand and Pelletier, Luc G. and Ryan, Jr, Richard M.")
+   (authors (author-name "Edward L." "Deci")
+            (author-name "Robert J." "Vallerand")
+            (author-name "Luc G." "Pelletier")
+            (author-name "Richard M." "Ryan" #:suffix "Jr")))
+
+  (check
+   print-as-equal-string?
+   (parse-author "Foo anderson") ;; Should not be parsed as the two authors "Foo" & "erson"
+   (authors
+    (author-name "Foo" "anderson"))))
 
 (define (parse-pages ps)
   (match ps

scribble-lib/scriblib/footnote.rkt

@@ -71,7 +71,7 @@
    #f
    (list `(part ,(generated-tag)))
    #f
-   (make-style #f '(hidden toc-hidden))
+   (make-style #f '(unnumbered hidden toc-hidden))
    null
    (list
     (make-traverse-block

scribble-test/tests/scribble/docs/manual.scrbl

@@ -90,6 +90,8 @@ A function, again, not a link target, documented to return @racket[10] using a d
 
 @defstruct[#:link-target? #f pt ([x real?] [y real?]) #:mutable]{A mutable structure type with extra name, again.}
 
+@defstruct[a-struct-with-an-extremely-long-name-and-no-fields ()]{Used to raise error, taking car of empty fields list. Reported by Carlos Lopez, 2017-03-11.}
+
 
 @defmodule["manual-ex0.rkt" #:no-declare #:link-target? #f #:packages ()]
 @defmodule["manual-ex0.rkt" #:lang #:no-declare #:link-target? #f #:packages ()]

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

@@ -217,6 +217,13 @@ A structure type with extra name, again.
 
 A mutable structure type with extra name, again.
 
+(struct a-struct-with-an-extremely-long-name-and-no-fields ()
+    #:extra-constructor-name                                 
+    make-a-struct-with-an-extremely-long-name-and-no-fields) 
+
+Used to raise error, taking car of empty fields list. Reported by Carlos
+Lopez, 2017-03-11.
+
  (require "manual-ex0.rkt")
 
  #lang "manual-ex0.rkt"

scribble-test/tests/scribble/html.rkt

@@ -0,0 +1,166 @@
+#lang racket/base
+
+;; Check that the HTML tags provided by scribble/html/html
+;;  and scribble/html/extra
+;;  match a master list of HTML tags (defined in this file)
+;; Also check that `scribble/html/html` is disjoint from `racket/base`
+
+(require rackunit racket/set)
+
+(define (phase0-provides m) ; Symbol -> [Setof Symbol]
+  (parameterize ([current-namespace (make-base-namespace)])
+    (dynamic-require m #f)
+    (let-values ([(e1* e2*) (module->exports m)])
+      (for*/seteq ([export* (in-list (list e1* e2*))]
+                   [tag+exp (in-list export*)]
+                   #:when (or (not (car tag+exp)) (zero? (car tag+exp)))
+                   [exp (in-list (cdr tag+exp))])
+        (car exp)))))
+
+(define (expected-disjoint m1 m2)
+  (format "'~a' and '~a' should provide disjoint sets of identifiers" m1 m2))
+
+(define (expected-overlap m1 m2)
+  (format "expected '~a' and '~a' to provide overlapping sets of identifiers" m1 m2))
+
+(define html-provides (phase0-provides 'scribble/html/html))
+(define extra-provides (phase0-provides 'scribble/html/extra))
+(define base-provides (phase0-provides 'racket/base))
+
+(check-pred set-empty?
+            (set-intersect html-provides extra-provides)
+            (expected-disjoint 'scribble/html/html 'scribble/html/extra))
+
+;; note: 'racket' and 'scribble/html/html' both provide "link"
+(check-pred set-empty?
+            (set-intersect html-provides base-provides)
+            (expected-disjoint 'scribble/html/html 'racket/base))
+
+(check-pred positive?
+            (set-count (set-intersect extra-provides base-provides))
+            (expected-overlap 'scribble/html/extra 'racket/base))
+
+;; From: https://html.spec.whatwg.org/multipage/#toc-semantics
+(define whatwg-master (list->seteq '(
+  html
+  head
+  title
+  base
+  link
+  meta
+  style
+  body
+  article
+  section
+  nav
+  aside
+  h1 h2 h3 h4 h5 h6
+  hgroup
+  header
+  footer
+  address
+  p
+  hr
+  pre
+  blockquote
+  ol
+  ul
+  li
+  dl
+  dt
+  dd
+  figure
+  figcaption
+  main
+  div
+  a
+  em
+  strong
+  small
+  s
+  cite
+  q
+  dfn
+  abbr
+  ruby
+  rt
+  rp
+  data
+  time
+  code
+  var
+  samp
+  kbd
+  sub sup
+  i
+  b
+  u
+  mark
+  bdi
+  bdo
+  span
+  br
+  wbr
+  ins
+  del
+  picture
+  source
+  img
+  iframe
+  embed
+  object
+  param
+  video
+  audio
+  track
+  map
+  area
+  table
+  caption
+  colgroup
+  col
+  tbody
+  thead
+  tfoot
+  tr
+  td
+  th
+  form
+  label
+  input
+  button
+  select
+  datalist
+  optgroup
+  option
+  textarea
+  keygen
+  output
+  progress
+  meter
+  fieldset
+  legend
+  details
+  summary
+  menu
+  menuitem
+  dialog
+  script
+  noscript
+  template
+  slot
+  canvas)))
+
+(let ([scribble-master (set-union html-provides extra-provides)])
+  (check-true (subset? whatwg-master scribble-master))
+  ;; Uncomment to debug scribble provides vs. whatwg master
+  #;(void
+    (displayln "checking MASTER vs SCRIBBLE")
+    (for ([m (in-set whatwg-master)]
+          #:when (not (set-member? scribble-master m)))
+      (displayln m))
+    (newline)
+    (displayln "checking SCRIBBLE vs MASTER")
+    (for ([s (in-set scribble-master)]
+          #:when (not (set-member? whatwg-master s)))
+      (displayln s))))

scribble-test/tests/scribble/markdown-docs/example.md

@@ -81,17 +81,14 @@ Examples:
 
 ```racket
 > (define x 0) 
-               
 > (displayln x)
 0              
-               
 ```
 
 Example of Scribble `interaction`:
 
 ```racket
 > (define x 0)
-              
 > x           
 0             
 ```