aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Court`es2007-06-11 16:00:19 +0000
committerLudovic Court`es2007-06-11 16:00:19 +0000
commitd558f49f502ed9fa21ee75f75ef53490cf0a48ea (patch)
treeb286d00b2093adfebcae676e9dff15b21b2d56dd
parent4bc8ca4a30e3a1348d4e6362ac3ff60b2ed10911 (diff)
parent9de369aeabb484175f8784c41dbad0592b5db91e (diff)
downloadskribilo-d558f49f502ed9fa21ee75f75ef53490cf0a48ea.tar.gz
skribilo-d558f49f502ed9fa21ee75f75ef53490cf0a48ea.tar.lz
skribilo-d558f49f502ed9fa21ee75f75ef53490cf0a48ea.zip
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
-rw-r--r--ChangeLog17
-rw-r--r--src/guile/skribilo/engine/lout.scm8
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)