commit 3380443817afe389c68f4cc3f5164ecf280d9e65 parent f6599c7f245236ee68467eb16989f5e7d90cb4a3 Author: Matthew Flatt <mflatt@racket-lang.org> Date: Tue, 2 Feb 2010 17:19:29 +0000 fix Scribble rendering problem with 'aux tables hidden within compound paragraphs (so some inherited-method tables didn't appear in the GUI docs) svn: r17940 original commit: db1533fa7878f85c010cc84b9914852492fae9d7 Diffstat:
| M | collects/scribble/html-render.ss | | | 27 | +++++++++++++-------------- |
| M | collects/scribble/private/manual-class.ss | | | 2 | +- |
2 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/collects/scribble/html-render.ss b/collects/scribble/html-render.ss @@ -426,20 +426,19 @@ d ri top (if (part-style? d 'no-toc) "tocview" "tocsub") sub-parts-on-other-page?) ,@(parameterize ([extra-breaking? #t]) - (append-map - (lambda (t) - (let loop ([t t]) - (if (table? t) - (render-table t d ri #f) - (loop (delayed-block-blocks t ri))))) - (filter (lambda (e) - (let loop ([e e]) - (or (and (table? e) - (memq 'aux (style-properties (table-style e))) - (pair? (table-blockss e))) - (and (delayed-block? e) - (loop (delayed-block-blocks e ri)))))) - (part-blocks d))))))) + (append-map (lambda (e) + (let loop ([e e]) + (cond + [(and (table? e) + (memq 'aux (style-properties (table-style e))) + (pair? (table-blockss e))) + (render-table e d ri #f)] + [(delayed-block? e) + (loop (delayed-block-blocks e ri))] + [(compound-paragraph? e) + (append-map loop (compound-paragraph-blocks e))] + [else null]))) + (part-blocks d)))))) (define/public (get-onthispage-label) null) diff --git a/collects/scribble/private/manual-class.ss b/collects/scribble/private/manual-class.ss @@ -72,7 +72,7 @@ (let loop ([supers start][accum null]) (cond [(null? supers) (reverse accum)] - [(memq (car supers) accum) + [(assoc (caar supers) accum) (loop (cdr supers) accum)] [else (let ([super (car supers)])