From 2dbbd1b58e558b029a170258f944d61a253573c3 Mon Sep 17 00:00:00 2001
From: Sam Tobin-Hochstadt <samth@racket-lang.org>
Date: Tue, 16 Nov 2010 12:36:26 -0500
Subject: [PATCH] Add @onecolumn option to scribble/sigplan

---
 collects/scribble/sigplan.rkt               |  4 ++--
 collects/scribble/sigplan/lang.rkt          |  8 ++++++--
 collects/scribblings/scribble/sigplan.scrbl | 15 +++++++++++++--
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/collects/scribble/sigplan.rkt b/collects/scribble/sigplan.rkt
index e6e5bcc8b6..a144ac294b 100644
--- a/collects/scribble/sigplan.rkt
+++ b/collects/scribble/sigplan.rkt
@@ -35,7 +35,7 @@
   (->* () () #:rest (listof pre-content?)
        content?)])
 
-(provide preprint 10pt nocopyright
+(provide preprint 10pt nocopyright onecolumn
          include-abstract)
 
 (define-syntax-rule (defopts name ...)
@@ -45,7 +45,7 @@
                                stx))
          ...
          (provide name ...)))
-(defopts preprint 10pt nocopyright)
+(defopts preprint 10pt nocopyright onecolumn)
 
 (define sigplan-extras
   (let ([abs (lambda (s)
diff --git a/collects/scribble/sigplan/lang.rkt b/collects/scribble/sigplan/lang.rkt
index f2aa6ef0e9..4c03b3eb5a 100644
--- a/collects/scribble/sigplan/lang.rkt
+++ b/collects/scribble/sigplan/lang.rkt
@@ -17,9 +17,10 @@
     [(_ id . body)
      (let ([preprint? #f]
            [10pt? #f]
+           [onecolumn? #f]
            [nocopyright? #f])
        (let loop ([stuff #'body])
-         (syntax-case* stuff (preprint 10pt nocopyright) (lambda (a b) (eq? (syntax-e a) (syntax-e b)))
+         (syntax-case* stuff (onecolumn preprint 10pt nocopyright) (lambda (a b) (eq? (syntax-e a) (syntax-e b)))
            [(ws . body)
             ;; Skip intraline whitespace to find options:
             (and (string? (syntax-e #'ws))
@@ -28,6 +29,9 @@
            [(preprint . body)
             (set! preprint? "preprint")
             (loop #'body)]
+           [(onecolumn . body)
+            (set! onecolumn? "onecolumn")
+            (loop #'body)]
            [(nocopyright . body)
             (set! nocopyright? "nocopyrightspace")
             (loop #'body)]
@@ -35,7 +39,7 @@
             (set! 10pt? "10pt")
             (loop #'body)]
            [body
-            #`(#%module-begin id (post-process #,preprint? #,10pt? #,nocopyright?) () . body)])))]))
+            #`(#%module-begin id (post-process #,preprint? #,10pt? #,nocopyright? #,onecolumn?) () . body)])))]))
 
 (define ((post-process . opts) doc)
   (let ([options 
diff --git a/collects/scribblings/scribble/sigplan.scrbl b/collects/scribblings/scribble/sigplan.scrbl
index 2b4f14e826..8b265fd1b7 100644
--- a/collects/scribblings/scribble/sigplan.scrbl
+++ b/collects/scribblings/scribble/sigplan.scrbl
@@ -39,8 +39,19 @@ same line as @hash-lang[], with only whitespace between
   #lang scribble/sigplan @nocopyright
 }|}
 
-The @racket[10pt], @racket[preprint], and @racket[nocopyright] options can be
-used together and may appear in any order.
+@defidform[onecolumn]{
+
+Enables the @tt{onecolumn} option. Use @racket[onecolumn] only on the
+same line as @hash-lang[], with only whitespace between
+@racketmodname[scribble/sigplan] and @racket[onecolumn]:
+
+@codeblock{
+  #lang scribble/sigplan @onecolumn
+}}
+
+The @racket[10pt], @racket[preprint], @racket[nocopyright], and
+@racket[onecolumn] options can be used together and may appear in any
+order.  
 }