summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtes2006-12-09 16:28:52 +0000
committerLudovic Courtes2006-12-09 16:28:52 +0000
commit6ab9a84667beb0eb5521f1bcb9dc7684f4de8fa3 (patch)
treee1eecab2f1ad9335ec36cfdf45d258927d9f2b0c
parent22500ac669ef089089458d27b90895945a4c8884 (diff)
downloadskribilo-6ab9a84667beb0eb5521f1bcb9dc7684f4de8fa3.tar.gz
skribilo-6ab9a84667beb0eb5521f1bcb9dc7684f4de8fa3.tar.lz
skribilo-6ab9a84667beb0eb5521f1bcb9dc7684f4de8fa3.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: skribilo@sv.gnu.org--2006/skribilo--devo--1.2--patch-35
-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 <)