`eq' package: Properly handle auto-inlining.

* src/guile/skribilo/package/eq.scm (inline-equation?): Use `find1-up'
  instead of `find-up'.  This fixes a bug.
  (eq): Properly pass the `:inline?' options through the `options' slot.

* src/guile/skribilo/package/eq/lout.scm (eq): When inline, enclose
  equation in `@OneRow @OneCol' so that it is not breakable.

git-archimport-id: skribilo@sv.gnu.org--2006/skribilo--devo--1.2--patch-87

3 files changed, 29 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index eb8e8c2..e8a8d8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,28 @@
 # arch-tag: automatic-ChangeLog--skribilo@sv.gnu.org--2006/skribilo--devo--1.2
 #
 
+2007-04-04 17:18:18 GMT	Ludovic Court`es <ludovic.courtes@laas.fr>	patch-87
+
+    Summary:
+      `eq' package: Properly handle auto-inlining.
+    Revision:
+      skribilo--devo--1.2--patch-87
+
+    * src/guile/skribilo/package/eq.scm (inline-equation?): Use `find1-up'
+      instead of `find-up'.  This fixes a bug.
+      (eq): Properly pass the `:inline?' options through the `options' slot.
+    
+    * src/guile/skribilo/package/eq/lout.scm (eq): When inline, enclose
+      equation in `@OneRow @OneCol' so that it is not breakable.
+
+    modified files:
+     ChangeLog src/guile/skribilo/package/eq.scm
+     src/guile/skribilo/package/eq/lout.scm
+
+    new patches:
+     lcourtes@laas.fr--2006-libre/skribilo--devo--1.2--patch-46
+
+
 2007-04-04 17:17:32 GMT	Ludovic Court`es <ludovic.courtes@laas.fr>	patch-86
 
     Summary:
diff --git a/src/guile/skribilo/package/eq.scm b/src/guile/skribilo/package/eq.scm
index 7ad39d8..8b4d325 100644
--- a/src/guile/skribilo/package/eq.scm
+++ b/src/guile/skribilo/package/eq.scm
@@ -19,7 +19,7 @@
 ;;; USA.
 
 (define-module (skribilo package eq)
-  :autoload   (skribilo ast)    (markup? find-up)
+  :autoload   (skribilo ast)    (markup? find1-up)
   :autoload   (skribilo output) (output)
   :use-module (skribilo writer)
   :use-module (skribilo engine)
@@ -124,9 +124,9 @@ a symbol representing the mathematical operator denoted by @var{m} (e.g.,
        (let ((i (markup-option m :inline?)))
          (case i
            ((auto)
-            (not (find-up (lambda (n)
-                            (is-markup? n 'eq-display))
-                          m)))
+            (not (find1-up (lambda (n)
+                             (is-markup? n 'eq-display))
+                           m)))
            ((#t) #t)
            (else #f)))))
 
@@ -217,9 +217,9 @@ a symbol representing the mathematical operator denoted by @var{m} (e.g.,
        (class class)
        (loc   &invocation-location)
        (options `((:div-style ,div-style) (:align-with ,align-with)
-                  (:mul-style ,mul-style)
+                  (:mul-style ,mul-style) (:inline? ,inline?)
                   ,@(the-options opts
-                                 :ident :class
+                                 :ident :class :inline?
                                  :div-style :mul-style :align-with)))
        (body (let loop ((body (the-body opts))
 			(result '()))
diff --git a/src/guile/skribilo/package/eq/lout.scm b/src/guile/skribilo/package/eq/lout.scm
index 5633ae4..d0d9570 100644
--- a/src/guile/skribilo/package/eq/lout.scm
+++ b/src/guile/skribilo/package/eq/lout.scm
@@ -66,7 +66,7 @@
                            "\n@IAD " ""))))
    :action (lambda (node engine)
 	     (display (if (inline-equation? node)
-			  "@E { "
+			  "@OneRow @OneCol @E { "
 			  "@Eq { "))
 	     (let ((eq (markup-body node)))
 	       ;;(fprint (current-error-port) "eq=" eq)