doc fixes and rendering tweaks

svn: r8453

original commit: 60f7074babcd1ce0c4bdceff70893baf91c117bc

collects/scribble/basic.ss

@@ -251,19 +251,20 @@
                                  (loop (cdr i) (cdr alpha)))]
                          [else (loop (cdr i) alpha)]))]))
         (list 'nbsp)
-        (apply append
+        ((if (null? l) values cdr) ; drop one 'newline
-               (map (lambda (i)
+         (apply append
-                      (define e (make-link-element
+                (map (lambda (i)
-                                 "indexlink" (commas (caddr i)) (car i)))
+                       (define e (make-link-element
-                      (list (cond [(hash-table-get alpha-starts i #f)
+                                  "indexlink" (commas (caddr i)) (car i)))
-                                   => (lambda (let)
+                       (list (make-element 'newline '("/n"))
-                                        (make-element
+                             (cond [(hash-table-get alpha-starts i #f)
-                                         (make-url-anchor
+                                    => (lambda (let)
-                                          (format "alpha:~a" (char-upcase let)))
+                                         (make-element
-                                         (list e)))]
+                                          (make-url-anchor
-                                  [else e])
+                                           (format "alpha:~a" (char-upcase let)))
-                            'newline))
+                                          (list e)))]
-                    l))))))
+                                   [else e])))
+                     l)))))))
   (list contents))
 
 ;; ----------------------------------------

collects/scribble/html-render.ss

@@ -457,6 +457,7 @@
               [(hspace) `((span ([class "hspace"])
                                 ,@(let ([str (content->string (element-content e))])
                                     (map (lambda (c) 'nbsp) (string->list str)))))]
+              [(newline) `((br))]
               [else (error 'html-render "unrecognized style symbol: ~e" style)])]
            [(string? style) 
             `((span ([class ,style]) ,@(super render-element e part ri)))]
@@ -507,7 +508,6 @@
                       [(centered) '((align "center"))]
                       [(at-right) '((align "right"))]
                       [(at-left)  '((align "left"))]
-                      [(index)    '((align "right"))]
                       [else null])
                   ,@(let ([a (and (list? (table-style t))
                                   (assoc 'style (table-style t)))])
@@ -601,8 +601,6 @@
                      (render-other (substring i (cdar m)) part ri))
               (ascii-ize i)))]
          [(eq? i 'mdash) `(" " ndash " ")]
-         [(eq? i 'hline) `((hr))]
-         [(eq? i 'newline) `((br))]
          [(symbol? i) (list i)]
          [else (list (format "~s" i))]))
 

collects/scribble/latex-render.ss

@@ -180,6 +180,7 @@
                                 [else
                                  (printf "{\\mytexttt{~a}}"
                                          (regexp-replace* #rx"." s "~"))]))]
+                  [(newline) (printf "\\\\")]
                   [else (error 'latex-render "unrecognzied style symbol: ~s" style)])]
                [(string? style)
                 (wrap e style (regexp-match? #px"^scheme(?!error)" style))]
@@ -343,7 +344,6 @@
          [(string? i) (display-protected i)]
          [(symbol? i) (display
                        (case i
-                         [(newline) "\\\\"]
                          [(nbsp) "~"]
                          [(mdash) "---"]
                          [(ndash) "--"]

collects/scribble/scribble.css

@@ -16,7 +16,7 @@
 }
 
 /* Serif: */
-.main, .refcontent, .tocview, .tocsub, i {
+.main, .refcontent, .tocview, .tocsub, .inheritedlbl, i {
   font-family: serif;
 }
 
@@ -142,7 +142,7 @@ font-weight: bold;
 }
 
 .tocviewtitle {
-  font-size: 80%;
+  font-size: 82%;
   font-weight: bold;
   margin: 0.2em 0.2em 0.2em 0.2em;
 }
@@ -152,7 +152,7 @@ font-weight: bold;
 }
 
 .tocviewlist td {
-  font-size: 80%;
+  font-size: 82%;
   vertical-align: top;
 }
 
@@ -171,15 +171,16 @@ font-weight: bold;
 }
 
 .tocsublinknumber {
-  font-size: 80%;
+  font-size: 82%;
 }
 
 .tocsublink {
+  font-size: 82%;
   text-decoration: none;
 }
 
 .tocsubseclink {
-  font-size: 80%;
+  font-size: 82%;
   text-decoration: none;
 }
 
@@ -189,7 +190,7 @@ font-weight: bold;
 }
 
 .tocsubtitle {
-  font-size: 80%;
+  font-size: 82%;
   font-style: italic;
   margin: 0.2em 0.2em 0.2em 0.2em;
 }
@@ -205,6 +206,7 @@ font-weight: bold;
 }
 
 .inherited td {
+  font-size: 82%;
   padding-left: 1em;
   text-indent: -0.8em;
   padding-right: 0.2em;
@@ -212,7 +214,6 @@ font-weight: bold;
 
 .inheritedlbl {
   font-style: italic;
-  font-size: 85%;
 }
 
 /* ---------------------------------------- */
@@ -441,13 +442,13 @@ i {
   margin-right: 0.3em;
 }
 
-.compact li p { 
-  margin: 0 0 0 0;
-  padding: 0 0 0 0;
-}
-
 /* A hack, inserted to break some Scheme ids: */
 .mywbr {
   width: 0;
   font-size: 1px;
 }
+
+.compact li p { 
+  margin: 0 0 0 0;
+  padding: 0 0 0 0;
+}

collects/scribblings/scribble/struct.scrbl

@@ -339,8 +339,9 @@ The @scheme[style] field is normally either
 
  @item{one of the symbols that all renderers recognize: @scheme['tt],
        @scheme['italic], @scheme['bold], @scheme['sf],
-       @scheme['subscript], @scheme['superscript], or
+       @scheme['subscript], @scheme['superscript], @scheme['hspace],
-       @scheme['hspace];}
+       or @scheme['newline] (which renders a line break independent of
+       the @scheme[content]);}
 
  @item{a list of the form @scheme[(list 'color _name)] or
        @scheme[(list 'color _byte _byte _byte)] to set the text color,