From 6f73b1aef60f5668ae53771adaaf0aadf0c4512a Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Thu, 7 Sep 2017 20:19:37 -0600
Subject: [PATCH] acmart: fix `grantsponsor` and `grantnum`
Generating a block is inconsistent with `acks`.
---
scribble-lib/scribble/acmart.rkt | 30 ++++++++++++++----------------
1 file changed, 14 insertions(+), 16 deletions(-)
diff --git a/scribble-lib/scribble/acmart.rkt b/scribble-lib/scribble/acmart.rkt
index d630f9dd..dd5bc278 100644
--- a/scribble-lib/scribble/acmart.rkt
+++ b/scribble-lib/scribble/acmart.rkt
@@ -70,9 +70,9 @@
[acmConference
(-> string? string? string? block?)]
[grantsponsor
- (-> string? string? string? block?)]
+ (-> string? string? string? content?)]
[grantnum
- (->* (string? string?) (#:url string?) block?)]
+ (->* (string? string?) (#:url string?) content?)]
[acmBadgeR (->* (string?) (#:url string?) block?)]
[acmBadgeL (->* (string?) (#:url string?) block?)]
[received (->* (string?) (#:stage string?) block?)]
@@ -163,22 +163,20 @@
(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)))))
+ (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))))))
+ (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 '())