`eq' package: Added support for Lout's new `eq2'.

* src/guile/skribilo/package/eq.scm (*use-lout-eq2?*): New.
  (direct-equation-child?): New.

* src/guile/skribilo/package/eq/lout.scm (Initialization): Use `eq2' if
  asked to.
  (simple-lout-markup-writer): Use `direct-equation-child?' to decide on
  whether the issue the `^' character.  This is to avoid issuing too many
  `^', which could result in broken layout.
  (eq:limit): Adapated.
  (range-lout-markup-writer): Likewise.

git-archimport-id: lcourtes@laas.fr--2006-libre/skribilo--devo--1.2--patch-48

1 files changed, 15 insertions, 0 deletions

diff --git a/src/guile/skribilo/package/eq.scm b/src/guile/skribilo/package/eq.scm
index 8b4d325..90db17b 100644
--- a/src/guile/skribilo/package/eq.scm
+++ b/src/guile/skribilo/package/eq.scm
@@ -60,6 +60,11 @@
   ;; native engine.
   (make-parameter #f))
 
+(define-public *use-lout-eq2?*
+  ;; Whether the use the new Lout `eq2' package instead of `eq'.
+  (make-parameter #f))
+
+
 (define %operators
   '(/ * + - = != ~= < > <= >= sqrt expt sum product script
     in notin apply limit combinations set))
@@ -130,6 +135,16 @@ a symbol representing the mathematical operator denoted by @var{m} (e.g.,
            ((#t) #t)
            (else #f)))))
 
+(define-public (direct-equation-child? m)
+  "Return @code{#t} if @var{m} is a direct child of an @code{eq} markup."
+  (let ((parent (ast-parent m)))
+    (and (is-markup? parent 'eq)
+         (let ((body (markup-body parent)))
+           (or (eq? body m)
+               (and (list? body)
+                    (memq m body)))))))
+
+
 
 ;;;
 ;;; Operator precedence.