suzanne.soy/scribble-enhanced
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

scribble: fix HTML rendering of table in nested flow starting item

Browse Source 
original commit: 07342303e5eb63c0d255cacaa49faabc8c667d19
This commit is contained in:
Matthew Flatt 2011-12-03 08:41:15 -07:00
parent 44a9f835da
commit ef02b4039c
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
collects/scribble/base-render.rkt
View File

@ -666,7 +666,7 @@
(render-auxiliary-table p part ri) (render-auxiliary-table p part ri)
(render-table p part ri starting-item?))] (render-table p part ri starting-item?))]
[(itemization? p) (render-itemization p part ri)] [(itemization? p) (render-itemization p part ri)]
[(nested-flow? p) (render-nested-flow p part ri)] [(nested-flow? p) (render-nested-flow p part ri starting-item?)]
[(compound-paragraph? p) (render-compound-paragraph p part ri starting-item?)] [(compound-paragraph? p) (render-compound-paragraph p part ri starting-item?)]
[(delayed-block? p) [(delayed-block? p)
(render-block (delayed-block-blocks p ri) part ri starting-item?)] (render-block (delayed-block-blocks p ri) part ri starting-item?)]
@ -685,9 +685,10 @@
(map (lambda (d) (render-flow d part ri #t)) (map (lambda (d) (render-flow d part ri #t))
(itemization-blockss i))) (itemization-blockss i)))
(define/public (render-nested-flow i part ri) (define/public (render-nested-flow i part ri starting-item?)
(map (lambda (d) (render-block d part ri #f)) (for/list ([b (in-list (nested-flow-blocks i))]
(nested-flow-blocks i))) [pos (in-naturals)])
(render-block b part ri (and starting-item? (zero? pos)))))
(define/public (render-content i part ri) (define/public (render-content i part ri)
(cond (cond

6
collects/scribble/html-render.rkt
View File

@ -1311,7 +1311,7 @@
(table-blockss t) (table-blockss t)
(extract-table-cell-styles t)))))) (extract-table-cell-styles t))))))
(define/override (render-nested-flow t part ri) (define/override (render-nested-flow t part ri starting-item?)
`((blockquote [,@(combine-class `((blockquote [,@(combine-class
(cond (cond
[(eq? 'code-inset (style-name (nested-flow-style t))) [(eq? 'code-inset (style-name (nested-flow-style t)))
@ -1323,8 +1323,8 @@
`([class "SubFlow"])] `([class "SubFlow"])]
[else null]) [else null])
(style->attribs (nested-flow-style t)))] (style->attribs (nested-flow-style t)))]
,@(append-map (lambda (i) (render-block i part ri #f)) ,@(apply append
(nested-flow-blocks t))))) (super render-nested-flow t part ri starting-item?)))))
(define/override (render-compound-paragraph t part ri starting-item?) (define/override (render-compound-paragraph t part ri starting-item?)
(let ([style (compound-paragraph-style t)]) (let ([style (compound-paragraph-style t)])

2
collects/scribble/latex-render.rkt
View File

@ -670,7 +670,7 @@
[else (printf "\\end{~a}" kind)]) [else (printf "\\end{~a}" kind)])
null)) null))
(define/override (render-nested-flow t part ri) (define/override (render-nested-flow t part ri starting-item?)
(do-render-nested-flow t part ri #f #f)) (do-render-nested-flow t part ri #f #f))
(define/override (render-compound-paragraph t part ri starting-item?) (define/override (render-compound-paragraph t part ri starting-item?)

6
collects/scribble/text-render.rkt
View File

@ -175,7 +175,7 @@
(super render-content i part ri)) (super render-content i part ri))
(super render-content i part ri))) (super render-content i part ri)))
(define/override (render-nested-flow i part ri) (define/override (render-nested-flow i part ri starting-item?)
(let ([s (nested-flow-style i)]) (let ([s (nested-flow-style i)])
(if (and s (if (and s
(or (eq? (style-name s) 'inset) (or (eq? (style-name s) 'inset)
@ -183,8 +183,8 @@
(begin (begin
(printf " ") (printf " ")
(parameterize ([current-indent (make-indent 2)]) (parameterize ([current-indent (make-indent 2)])
(super render-nested-flow i part ri))) (super render-nested-flow i part ri starting-item?)))
(super render-nested-flow i part ri)))) (super render-nested-flow i part ri starting-item?))))
(define/override (render-other i part ht) (define/override (render-other i part ht)
(cond (cond