From 6ab9a84667beb0eb5521f1bcb9dc7684f4de8fa3 Mon Sep 17 00:00:00 2001
From: Ludovic Courtes
Date: Sat, 9 Dec 2006 16:28:52 +0000
Subject: 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
---
src/guile/skribilo/package/eq/lout.scm | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
(limited to 'src')
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 <)
--
cgit v1.2.3