summaryrefslogtreecommitdiff
path: root/src/guile
diff options
context:
space:
mode:
authorLudovic Courtès2010-11-07 22:30:48 +0100
committerLudovic Courtès2010-11-07 22:30:48 +0100
commitfb8d006c8480587e216c34777c132c766344970f (patch)
treeb944f8a9cac66efb6e79b3fb914034ec273408d6 /src/guile
parentc8c67b39bb0ee3147a1fcfef9716c79034c073df (diff)
downloadskribilo-fb8d006c8480587e216c34777c132c766344970f.tar.gz
skribilo-fb8d006c8480587e216c34777c132c766344970f.tar.lz
skribilo-fb8d006c8480587e216c34777c132c766344970f.zip
eq: lout: Honor `:inline?' when it's not `auto'.
* src/guile/skribilo/package/eq/lout.scm (eq): Honor `:inline?' when it's not `auto'.
Diffstat (limited to 'src/guile')
-rw-r--r--src/guile/skribilo/package/eq/lout.scm10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/guile/skribilo/package/eq/lout.scm b/src/guile/skribilo/package/eq/lout.scm
index d7571c4..336ee31 100644
--- a/src/guile/skribilo/package/eq/lout.scm
+++ b/src/guile/skribilo/package/eq/lout.scm
@@ -1,6 +1,6 @@
;;; lout.scm -- Lout implementation of the `eq' package.
;;;
-;;; Copyright 2005, 2006, 2007, 2008 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright 2005, 2006, 2007, 2008, 2010 Ludovic Courtès <ludo@gnu.org>
;;;
;;;
;;; This program is free software; you can redistribute it and/or modify
@@ -59,9 +59,11 @@
(markup-writer 'eq (find-engine 'lout)
:options '(:inline? :align-with :div-style :mul-style :number)
:before (lambda (node engine)
- (let* ((parent (ast-parent node))
- (displayed? (is-markup? parent 'eq-display))
- (number (equation-number-string node)))
+ (let ((displayed? (case (markup-option node :inline?)
+ ((auto) (is-markup? (ast-parent node)
+ 'eq-display))
+ (else (not (markup-option node :inline?)))))
+ (number (equation-number-string node)))
;; Note: The `@BypassNumber' option appeared in Lout 3.36.
(if (and displayed? (not (*embedded-renderer*)))
(display (if (string? number)