mostly cosmetics, very minor bug in index cleanup

svn: r10004

original commit: 46528afa5bacfdbe1ac01c8659ba49d14e927dd3

collects/scribble/base-render.ss

@@ -165,9 +165,7 @@
         [(part tech cite)
          (let ([rhs (cadr k)])
            (if (or (string? rhs) (pair? rhs))
-               (list (car k) (cons prefix (if (pair? rhs)
-                                              rhs
-                                              (list rhs))))
+               (list (car k) (cons prefix (if (pair? rhs) rhs (list rhs))))
                k))]
         [(index-entry)
          (let ([v (convert-key prefix (cadr k))])
@@ -177,8 +175,8 @@
     (define/public (collect-part-tags d ci number)
       (for ([t (part-tags d)])
         (hash-set! (collect-info-ht ci)
-                         (generate-tag t ci)
-                         (list (or (part-title-content d) '("???")) number))))
+                   (generate-tag t ci)
+                   (list (or (part-title-content d) '("???")) number))))
 
     (define/public (collect-content c ci)
       (for ([i c]) (collect-element i ci)))
@@ -191,12 +189,11 @@
         (collect-block p ci)))
 
     (define/public (collect-block p ci)
-      (cond
-        [(table? p) (collect-table p ci)]
-        [(itemization? p) (collect-itemization p ci)]
-        [(blockquote? p) (collect-blockquote p ci)]
-        [(delayed-block? p) (void)]
-        [else (collect-paragraph p ci)]))
+      (cond [(table? p) (collect-table p ci)]
+            [(itemization? p) (collect-itemization p ci)]
+            [(blockquote? p) (collect-blockquote p ci)]
+            [(delayed-block? p) (void)]
+            [else (collect-paragraph p ci)]))
 
     (define/public (collect-table i ci)
       (for ([d (apply append (table-flowss i))])
@@ -212,24 +209,19 @@
 
     (define/public (collect-element i ci)
       (if (part-relative-element? i)
-        (let ([content
-               (or (hash-ref (collect-info-relatives ci) i #f)
-                   (let ([v ((part-relative-element-collect i) ci)])
-                     (hash-set! (collect-info-relatives ci) i v)
-                     v))])
+        (let ([content (or (hash-ref (collect-info-relatives ci) i #f)
+                           (let ([v ((part-relative-element-collect i) ci)])
+                             (hash-set! (collect-info-relatives ci) i v)
+                             v))])
           (collect-content content ci))
-        (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 (element? i)
-            (for ([e (element-content i)])
-              (collect-element e ci))))))
+        (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 (element? i)
+                 (for ([e (element-content i)]) (collect-element e ci))))))
 
     (define/public (collect-target-element i ci)
-      (collect-put! ci
-                    (generate-tag (target-element-tag i) ci)
-                    (list i)))
+      (collect-put! ci (generate-tag (target-element-tag i) ci) (list i)))
 
     (define/public (collect-index-element i ci)
       (collect-put! ci
@@ -242,10 +234,7 @@
     ;; global-info resolution
 
     (define/public (resolve ds fns ci)
-      (let ([ri (make-resolve-info ci
-                                   (make-hasheq)
-                                   (make-hash)
-                                   (make-hash))])
+      (let ([ri (make-resolve-info ci (make-hasheq) (make-hash) (make-hash))])
         (start-resolve ds fns ri)
         ri))
 

collects/scribble/basic.ss

@@ -4,8 +4,8 @@
 (require "decode.ss"
          "struct.ss"
          "config.ss"
-         mzlib/list
-         mzlib/class
+         scheme/list
+         scheme/class
          setup/main-collects
          syntax/modresolve
          (for-syntax scheme/base))
@@ -25,7 +25,7 @@
 
 (define (convert-tag tag content)
   (if (list? tag)
-    (apply append (map (lambda (t) (convert-tag t content)) tag))
+    (append-map (lambda (t) (convert-tag t content)) tag)
     `((part ,(or tag (gen-tag content))))))
 
 (define (title #:tag [tag #f] #:tag-prefix [prefix #f] #:style [style #f]
@@ -176,21 +176,21 @@
 
 (define (index* word-seq content-seq . s)
   (let ([key (make-generated-tag)])
-    (record-index (map clean-up-index-string word-seq) content-seq key (decode-content s))))
+    (record-index (map clean-up-index-string word-seq)
+                  content-seq key (decode-content s))))
 
 (define (index word-seq . s)
   (let ([word-seq (if (string? word-seq) (list word-seq) word-seq)])
-    (apply index* (map clean-up-index-string word-seq) word-seq s)))
+    (apply index* word-seq word-seq s)))
 
 (define (as-index . s)
   (let ([key (make-generated-tag)]
         [content (decode-content s)])
-    (record-index (list (clean-up-index-string (content->string content)))
-                  (if (= 1 (length content))
-                      content
-                      (list (make-element #f content)))
-                  key
-                  content)))
+    (record-index
+     (list (clean-up-index-string (content->string content)))
+     (if (= 1 (length content)) content (list (make-element #f content)))
+     key
+     content)))
 
 (define (index-section #:title [title "Index"] #:tag [tag #f])
   (make-unnumbered-part #f
@@ -205,7 +205,7 @@
   (define (commas l)
     (if (or (null? l) (null? (cdr l)))
       l
-      (cdr (apply append (map (lambda (i) (list ", " i)) l)))))
+      (cdr (append-map (lambda (i) (list ", " i)) l))))
   (define (cadr-string-lists<? a b)
     (let loop ([a (cadr a)] [b (cadr b)])
       (cond [(null? b) #f]

collects/scribble/decode.ss

@@ -33,16 +33,13 @@
  [part-tag-decl ([tag tag?])])
 
 (define (clean-up-index-string s)
-  ;; Remove leading spaces or trailing, which might appear there due 
-  ;; to images or something else that gets dropped in string form.
-  ;; Then collapse whitespace.
-  (regexp-replace* #px"\\s+" 
-                   (regexp-replace #rx"^ +" 
-                                   (regexp-replace #rx" +$" 
-                                                   s 
-                                                   "")
-                                   "")
-                   " "))
+  ;; Collapse whitespace, and remove leading or trailing spaces, which
+  ;; might appear there due to images or something else that gets
+  ;; dropped in string form.
+  (let* ([s (regexp-replace* #px"\\s+" s " ")]
+         [s (regexp-replace* #rx"^ " s "")]
+         [s (regexp-replace* #rx" $" s "")])
+    s))
 
 (define (decode-string s)
   (let loop ([l '((#rx"---" mdash)
@@ -102,9 +99,8 @@
               (cons (make-index-element
                      #f null (car tags)
                      (list (clean-up-index-string
-                            (regexp-replace
-                             #px"^\\s+(?:(?:A|An|The)\\s)?"
-                             (content->string title) "")))
+                            (regexp-replace #px"^\\s+(?:(?:A|An|The)\\s)?"
+                                            (content->string title) "")))
                      (list (make-element #f title))
                      (make-part-index-desc))
                     l)

collects/scribble/html-render.ss

@@ -872,7 +872,7 @@
     (define/override (render-table t part ri need-inline?)
       (define t-style (table-style t))
       (define t-style-get (if (and (pair? t-style) (list? t-style))
-                            (lambda (k) (assoc k (or t-style null)))
+                            (lambda (k) (assoc k t-style))
                             (lambda (k) #f)))
       (define index? (eq? 'index t-style))
       (define (make-row flows style)

collects/scribble/manual-struct.ss

@@ -6,7 +6,7 @@
 (provide-structs
  [module-path-index-desc ()]
  [exported-index-desc ([name symbol?]
-                        [from-libs (listof module-path?)])]
+                       [from-libs (listof module-path?)])]
  [(method-index-desc exported-index-desc) ([method-name symbol?]
                                            [class-tag tag?])]
  [(procedure-index-desc exported-index-desc) ()]
@@ -16,6 +16,3 @@
  [(class-index-desc exported-index-desc) ()]
  [(interface-index-desc exported-index-desc) ()]
  [(mixin-index-desc exported-index-desc) ()])
-
- 
- 

collects/scribble/manual.ss

@@ -303,8 +303,9 @@
 (define (indexed-file . str)
   (let* ([f (apply filepath str)]
          [s (element->string f)])
-    (index* (list (clean-up-index-string (substring s 1 (sub1 (string-length s)))))
-            (list f) 
+    (index* (list (clean-up-index-string
+                   (substring s 1 (sub1 (string-length s)))))
+            (list f)
             f)))
 (define (exec . str)
   (if (andmap string? str)