Lout engine: Work around bug with tables within floating figures.

* src/guile/skribilo/engine/lout.scm (table): Check whether N is within a
  figure, in which case `@OneRow' must be preprended.

git-archimport-id: skribilo@sv.gnu.org--2006/skribilo--devo--1.2--patch-113

2 files changed, 25 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 9e18673..d45cc29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,23 @@
 # arch-tag: automatic-ChangeLog--skribilo@sv.gnu.org--2006/skribilo--devo--1.2
 #
 
+2007-06-11 16:00:19 GMT	Ludovic Court`es <ludovic.courtes@laas.fr>	patch-113
+
+    Summary:
+      Lout engine: Work around bug with tables within floating figures.
+    Revision:
+      skribilo--devo--1.2--patch-113
+
+    * src/guile/skribilo/engine/lout.scm (table): Check whether N is within a
+      figure, in which case `@OneRow' must be preprended.
+
+    modified files:
+     ChangeLog src/guile/skribilo/engine/lout.scm
+
+    new patches:
+     lcourtes@laas.fr--2006-libre/skribilo--devo--1.2--patch-72
+
+
 2007-06-11 15:59:21 GMT	Ludovic Court`es <ludovic.courtes@laas.fr>	patch-112
 
     Summary:
diff --git a/src/guile/skribilo/engine/lout.scm b/src/guile/skribilo/engine/lout.scm
index 664e046..6a8486f 100644
--- a/src/guile/skribilo/engine/lout.scm
+++ b/src/guile/skribilo/engine/lout.scm
@@ -2200,6 +2200,14 @@
 		 ;; Mark each row with vertical spanning information
 		 (lout-table-mark-vspan! n)
 
+                 (if (find1-up (lambda (n)
+                                 (is-markup? n 'figure))
+                               n)
+                     ;; Work around a bug preventing `@VSpan' from working
+                     ;; properly within floating figures:
+                     ;; http://article.gmane.org/gmane.comp.type-setting.lout/1090 .
+                     (display "\n@OneRow"))
+
 		 (display "\n@Tbl # table\n")
 
 		 (if (number? border)