diff --git a/collects/scribble/basic.ss b/collects/scribble/basic.ss index f90073da..2c37884e 100644 --- a/collects/scribble/basic.ss +++ b/collects/scribble/basic.ss @@ -251,19 +251,20 @@ (loop (cdr i) (cdr alpha)))] [else (loop (cdr i) alpha)]))])) (list 'nbsp) - (apply append - (map (lambda (i) - (define e (make-link-element - "indexlink" (commas (caddr i)) (car i))) - (list (cond [(hash-table-get alpha-starts i #f) - => (lambda (let) - (make-element - (make-url-anchor - (format "alpha:~a" (char-upcase let))) - (list e)))] - [else e]) - 'newline)) - l)))))) + ((if (null? l) values cdr) ; drop one 'newline + (apply append + (map (lambda (i) + (define e (make-link-element + "indexlink" (commas (caddr i)) (car i))) + (list (make-element 'newline '("/n")) + (cond [(hash-table-get alpha-starts i #f) + => (lambda (let) + (make-element + (make-url-anchor + (format "alpha:~a" (char-upcase let))) + (list e)))] + [else e]))) + l))))))) (list contents)) ;; ---------------------------------------- diff --git a/collects/scribble/html-render.ss b/collects/scribble/html-render.ss index 309e2ba3..764e867c 100644 --- a/collects/scribble/html-render.ss +++ b/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))])) diff --git a/collects/scribble/latex-render.ss b/collects/scribble/latex-render.ss index da392016..5a90c10d 100644 --- a/collects/scribble/latex-render.ss +++ b/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) "--"] diff --git a/collects/scribble/scribble.css b/collects/scribble/scribble.css index 63136677..cf3bde68 100644 --- a/collects/scribble/scribble.css +++ b/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; +} diff --git a/collects/scribblings/scribble/struct.scrbl b/collects/scribblings/scribble/struct.scrbl index 0fad019d..dae113de 100644 --- a/collects/scribblings/scribble/struct.scrbl +++ b/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['hspace];} + @scheme['subscript], @scheme['superscript], @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,