commit 96172c025d271c8dfc57337ae9bcd67a78dc5d83
parent cc4e99778eb8ae29df99649ac538528361470e44
Author: Matthew Flatt <mflatt@racket-lang.org>
Date: Thu, 16 Aug 2007 18:48:47 +0000
new gui reference work
svn: r7106
original commit: 33d7e3ded3aece1850cdf02e9d9db6702dec146d
Diffstat:
5 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/collects/scribble/base-render.ss b/collects/scribble/base-render.ss
@@ -296,7 +296,9 @@
(let ([number (collected-info-number (part-collected-info part))])
(let ([subs
(if (quiet (and (styled-part? part)
- (eq? 'quiet (styled-part-style part))
+ (let ([st(styled-part-style part)])
+ (or (eq? 'quiet st)
+ (and (list? st) (memq 'quiet st))))
(not (= base-len (sub1 (length number))))))
(apply
append
diff --git a/collects/scribble/basic.ss b/collects/scribble/basic.ss
@@ -22,17 +22,17 @@
(let ([content (decode-content str)])
(make-title-decl (or tag (gen-tag content)) style content)))
- (define (section #:tag [tag #f] . str)
+ (define (section #:tag [tag #f] #:style [style #f] . str)
(let ([content (decode-content str)])
- (make-part-start 0 (or tag (gen-tag content)) content)))
+ (make-part-start 0 (or tag (gen-tag content)) style content)))
(define (subsection #:tag [tag #f] . str)
(let ([content (decode-content str)])
- (make-part-start 1 (or tag (gen-tag content)) content)))
+ (make-part-start 1 (or tag (gen-tag content)) #f content)))
(define (subsubsection #:tag [tag #f] . str)
(let ([content (decode-content str)])
- (make-part-start 2 (or tag (gen-tag content)) content)))
+ (make-part-start 2 (or tag (gen-tag content)) #f content)))
(define (subsubsub*section #:tag [tag #f] . str)
(let ([content (decode-content str)])
diff --git a/collects/scribble/decode.ss b/collects/scribble/decode.ss
@@ -18,6 +18,7 @@
[content list?])]
[part-start ([depth integer?]
[tag (or/c false/c string?)]
+ [style any/c]
[title list?])]
[splice ([run list?])]
[part-index-decl ([plain-seq (listof string?)]
@@ -136,10 +137,11 @@
((part-start-depth (car l)) . <= . part-depth))
(part? (car l))))
(let ([para (decode-accum-para accum)]
- [s (decode-part (reverse s-accum)
- (part-start-tag s)
- (part-start-title s)
- (add1 part-depth))]
+ [s (decode-styled-part (reverse s-accum)
+ (part-start-tag s)
+ (part-start-style s)
+ (part-start-title s)
+ (add1 part-depth))]
[part (decode-flow* l keys tag style title part-depth)])
(make-styled-part (part-tags part)
(part-title-content part)
@@ -179,6 +181,9 @@
(define (decode-part l tag title depth)
(decode-flow* l null tag #f title depth))
+ (define (decode-styled-part l tag style title depth)
+ (decode-flow* l null tag style title depth))
+
(define (decode-flow l)
(part-flow (decode-flow* l null #f #f #f #f)))
diff --git a/collects/scribble/html-render.ss b/collects/scribble/html-render.ss
@@ -454,7 +454,9 @@
(define/private (toc-part? d)
(and (styled-part? d)
- (eq? 'toc (styled-part-style d))))
+ (let ([st (styled-part-style d)])
+ (or (eq? 'toc st)
+ (and (list? st) (memq 'toc st))))))
(define/override (collect-part d parent ht number)
(let ([prev-sub (collecting-sub)])
diff --git a/collects/scribble/manual.ss b/collects/scribble/manual.ss
@@ -84,10 +84,14 @@
#f
(map (lambda (s)
(list (make-flow (list (make-paragraph
- (let ([spaces (cdar (regexp-match-positions #rx"^ *" s))])
- (list
- (hspace spaces)
- (make-element 'tt (list (substring s spaces))))))))))
+ (let loop ([s s])
+ (let ([spaces (regexp-match-positions #rx"(?:^| ) +" s)])
+ (if spaces
+ (append
+ (loop (substring s 0 (caar spaces)))
+ (list (hspace (- (cdar spaces) (caar spaces))))
+ (loop (substring s (cdar spaces))))
+ (list (make-element 'tt (list s)))))))))))
strs))))
(define-syntax indexed-scheme
