From ef02b4039cc852c0eeec94a48352d27ab61ed54a Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Sat, 3 Dec 2011 08:41:15 -0700
Subject: [PATCH] scribble: fix HTML rendering of table in nested flow starting
 item

original commit: 07342303e5eb63c0d255cacaa49faabc8c667d19
---
 collects/scribble/base-render.rkt  | 9 +++++----
 collects/scribble/html-render.rkt  | 6 +++---
 collects/scribble/latex-render.rkt | 2 +-
 collects/scribble/text-render.rkt  | 6 +++---
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/collects/scribble/base-render.rkt b/collects/scribble/base-render.rkt
index 04453059..eb2c8b42 100644
--- a/collects/scribble/base-render.rkt
+++ b/collects/scribble/base-render.rkt
@@ -666,7 +666,7 @@
                        (render-auxiliary-table p part ri)
                        (render-table p part ri starting-item?))]
        [(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?)]
        [(delayed-block? p) 
         (render-block (delayed-block-blocks p ri) part ri starting-item?)]
@@ -685,9 +685,10 @@
       (map (lambda (d) (render-flow d part ri #t))
            (itemization-blockss i)))
 
-    (define/public (render-nested-flow i part ri)
-      (map (lambda (d) (render-block d part ri #f))
-           (nested-flow-blocks i)))
+    (define/public (render-nested-flow i part ri starting-item?)
+      (for/list ([b (in-list (nested-flow-blocks i))]
+                 [pos (in-naturals)])
+        (render-block b part ri (and starting-item? (zero? pos)))))
 
     (define/public (render-content i part ri)
       (cond
diff --git a/collects/scribble/html-render.rkt b/collects/scribble/html-render.rkt
index 6e39453f..2162c1fa 100644
--- a/collects/scribble/html-render.rkt
+++ b/collects/scribble/html-render.rkt
@@ -1311,7 +1311,7 @@
                      (table-blockss 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
                         (cond
                          [(eq? 'code-inset (style-name (nested-flow-style t)))
@@ -1323,8 +1323,8 @@
                           `([class "SubFlow"])]
                          [else null])
                         (style->attribs (nested-flow-style t)))]
-                    ,@(append-map (lambda (i) (render-block i part ri #f))
-                                  (nested-flow-blocks t)))))
+                    ,@(apply append
+                             (super render-nested-flow t part ri starting-item?)))))
 
     (define/override (render-compound-paragraph t part ri starting-item?)
       (let ([style (compound-paragraph-style t)])
diff --git a/collects/scribble/latex-render.rkt b/collects/scribble/latex-render.rkt
index 3a3da10e..a47ad09e 100644
--- a/collects/scribble/latex-render.rkt
+++ b/collects/scribble/latex-render.rkt
@@ -670,7 +670,7 @@
          [else (printf "\\end{~a}" kind)])
         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))
 
     (define/override (render-compound-paragraph t part ri starting-item?)
diff --git a/collects/scribble/text-render.rkt b/collects/scribble/text-render.rkt
index 5c540cfe..7cd34bf6 100644
--- a/collects/scribble/text-render.rkt
+++ b/collects/scribble/text-render.rkt
@@ -175,7 +175,7 @@
               (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)])
           (if (and s
                    (or (eq? (style-name s) 'inset)
@@ -183,8 +183,8 @@
               (begin
                 (printf "  ")
                 (parameterize ([current-indent (make-indent 2)])
-                  (super render-nested-flow i part ri)))
-              (super render-nested-flow i part ri))))
+                  (super render-nested-flow i part ri starting-item?)))
+              (super render-nested-flow i part ri starting-item?))))
       
       (define/override (render-other i part ht)
         (cond