summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog21
-rw-r--r--src/guile/skribilo/package/eq.scm7
-rw-r--r--src/guile/skribilo/package/eq/lout.scm14
3 files changed, 34 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index debaf96..42013ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,27 @@
# arch-tag: automatic-ChangeLog--skribilo@sv.gnu.org--2006/skribilo--devo--1.2
#
+2007-08-24 08:31:04 GMT Ludovic Court`es <ludovic.courtes@laas.fr> patch-147
+
+ Summary:
+ `eq' package: Switched to Lout's `@Math'.
+ Revision:
+ skribilo--devo--1.2--patch-147
+
+ * src/guile/skribilo/package/eq.scm (*use-lout-eq2?*): Renamed to...
+ (*use-lout-math?*): Default to `#t' since `@Math' is now part of Lout,
+ from version 3.36.
+
+ * src/guile/skribilo/package/eq/lout.scm: Updated accordingly.
+
+ 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-89
+
+
2007-08-20 16:30:42 GMT Ludovic Court`es <ludovic.courtes@laas.fr> patch-146
Summary:
diff --git a/src/guile/skribilo/package/eq.scm b/src/guile/skribilo/package/eq.scm
index 31b297d..a9a64c1 100644
--- a/src/guile/skribilo/package/eq.scm
+++ b/src/guile/skribilo/package/eq.scm
@@ -60,9 +60,10 @@
;; 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-public *use-lout-math?*
+ ;; Whether the use the Lout's `math' package (new in Lout 3.36) instead
+ ;; of `eq'.
+ (make-parameter #t))
(define %operators
diff --git a/src/guile/skribilo/package/eq/lout.scm b/src/guile/skribilo/package/eq/lout.scm
index 577f6da..ce478f7 100644
--- a/src/guile/skribilo/package/eq/lout.scm
+++ b/src/guile/skribilo/package/eq/lout.scm
@@ -44,7 +44,7 @@
(engine-custom-set! lout 'includes
(string-append includes "\n"
"@SysInclude { "
- (if (*use-lout-eq2?*) "eq2" "eq")
+ (if (*use-lout-math?*) "math" "eq")
" }\n")))))
@@ -71,8 +71,12 @@
(display "{ ")))
:action (lambda (node engine)
(display (if (inline-equation? node)
- "@OneRow @OneCol @E { "
- "@Eq { "))
+ (if (*use-lout-math?*)
+ "@M { "
+ "@OneRow @OneCol @E { ")
+ (if (*use-lout-math?*)
+ "@Math { "
+ "@Eq { ")))
(let ((eq (markup-body node)))
;;(fprint (current-error-port) "eq=" eq)
(output eq engine)))
@@ -240,7 +244,7 @@
(var (markup-option node :var))
(limit (markup-option node :limit)))
(format #t "{ lim ~a { { "
- (if (*use-lout-eq2?*)
+ (if (*use-lout-math?*)
"atop @SubScriptStyle"
"from"))
(output var engine)
@@ -273,7 +277,7 @@
(to (markup-option node :to))
(body (markup-body node)))
(display ,(string-append " { "
- (if (*use-lout-eq2?*)
+ (if (*use-lout-math?*)
""
"big ")
lout-name