summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Court`es2006-12-08 17:33:45 +0000
committerLudovic Court`es2006-12-08 17:33:45 +0000
commit4e4849ca546074d9475229cc7508bc81b9b6c06c (patch)
treee1eecab2f1ad9335ec36cfdf45d258927d9f2b0c
parenta24b5dbd2dc91b6fc3088c77a946fd8931e7e7dd (diff)
downloadskribilo-4e4849ca546074d9475229cc7508bc81b9b6c06c.tar.gz
skribilo-4e4849ca546074d9475229cc7508bc81b9b6c06c.tar.lz
skribilo-4e4849ca546074d9475229cc7508bc81b9b6c06c.zip
eq/lout: Properly handle `div-style' and `mul-style'.
* src/guile/skribilo/package/eq/lout.scm (eq:*): Always pass the result
  through `mul-style->lout'.
  (eq:/): Likewise.

git-archimport-id: lcourtes@laas.fr--2005-libre/skribilo--devo--1.2--patch-88
-rw-r--r--src/guile/skribilo/package/eq/lout.scm18
1 files changed, 8 insertions, 10 deletions
diff --git a/src/guile/skribilo/package/eq/lout.scm b/src/guile/skribilo/package/eq/lout.scm
index e08e6d1..21e8f92 100644
--- a/src/guile/skribilo/package/eq/lout.scm
+++ b/src/guile/skribilo/package/eq/lout.scm
@@ -167,21 +167,19 @@
                            (lambda (n e)
                              ;; Obey either the per-node `:mul-style' or the
                              ;; top-level one.
-                             (or (markup-option n :mul-style)
-                                 (let* ((eq (ast-parent n))
-                                        (mul-style
-                                         (markup-option eq :mul-style)))
-                                   (mul-style->lout mul-style)))))
+                             (mul-style->lout
+                              (or (markup-option n :mul-style)
+                                  (let ((eq (ast-parent n)))
+                                    (markup-option eq :mul-style))))))
 
 (simple-lout-markup-writer /
                            (lambda (n e)
                              ;; Obey either the per-node `:div-style' or the
                              ;; top-level one.
-                             (or (markup-option n :div-style)
-                                 (let* ((eq (ast-parent n))
-                                        (div-style
-                                         (markup-option eq :div-style)))
-                                   (div-style->lout div-style))))
+                             (div-style->lout
+                              (or (markup-option n :div-style)
+                                  (let ((eq (ast-parent n)))
+                                    (markup-option eq :div-style)))))
                            #f)
 (simple-lout-markup-writer =)
 (simple-lout-markup-writer <)