From dd92ebd2d98707b942c295c123f95a6b125df3eb Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Thu, 7 Sep 2017 20:21:27 -0600
Subject: [PATCH] acmart: fix contract on nested-flow forms, like `acks`

A nested flow's argument to be decoded a pre-flow instead of a
pre-content.
---
 scribble-doc/scribblings/scribble/acmart.scrbl | 16 ++++++++--------
 scribble-lib/scribble/acmart.rkt               |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/scribble-doc/scribblings/scribble/acmart.scrbl b/scribble-doc/scribblings/scribble/acmart.scrbl
index ac0d45d9..0a39027e 100644
--- a/scribble-doc/scribblings/scribble/acmart.scrbl
+++ b/scribble-doc/scribblings/scribble/acmart.scrbl
@@ -239,28 +239,28 @@ defaults to @racket{Received} for the first occurrence and
   @received[#:stage "accepted"]{June 2009}
 }|}
 
-@defproc[(teaserfigure [content pre-content?] ...) block?]{
+@defproc[(teaserfigure [content pre-flow?] ...) 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?]
+@defproc[(sidebar [content pre-flow?] ...) block?]
+@defproc[(marginfigure [content pre-flow?] ...) block?]
+@defproc[(margintable [content pre-flow?] ...) 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?]
+@defproc[(printonly [content pre-flow?] ...) block?]
+@defproc[(screenonly [content pre-flow?] ...) block?]
+@defproc[(anonsuppress [content pre-flow?] ...) block?]
 )]{
 Marks content to be included only for print or screen
 editions, or excluded from anonymous editions.}
 
-@defproc[(acks [content pre-content?] ...) block?]{
+@defproc[(acks [content pre-flow?] ...) block?]{
 
 Creates an unnumbered section ``Acknowledgments'' section, unless the
 @racket[anonymous] mode is selected.}
diff --git a/scribble-lib/scribble/acmart.rkt b/scribble-lib/scribble/acmart.rkt
index dd5bc278..b993bba7 100644
--- a/scribble-lib/scribble/acmart.rkt
+++ b/scribble-lib/scribble/acmart.rkt
@@ -106,7 +106,7 @@
 (define-syntax-rule (define-environments name ...)
   (begin
     (begin
-      (provide/contract [name (->* () () #:rest (listof pre-content?)
+      (provide/contract [name (->* () () #:rest (listof pre-flow?)
                                    block?)])
       (define (name . str)
         (make-nested-flow (make-style (symbol->string 'name) acmart-extras)
@@ -117,7 +117,7 @@
 (define-syntax-rule (define-comment-environments name ...)
   (begin
     (begin
-      (provide/contract [name (->* () () #:rest (listof pre-content?)
+      (provide/contract [name (->* () () #:rest (listof pre-flow?)
                                    block?)])
       (define (name . str)
         (make-nested-flow (make-style (symbol->string 'name) acmart-extras)