summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtes2007-06-24 19:53:02 +0000
committerLudovic Courtes2007-06-24 19:53:02 +0000
commit699590eb680344df7283943e5b0f32667deae615 (patch)
tree7ba35b542fbd3cb6aa306da3531a9fc88afbed22
parent40220a2365104a2807caf2fcf895f83e1a21539a (diff)
downloadskribilo-699590eb680344df7283943e5b0f32667deae615.tar.gz
skribilo-699590eb680344df7283943e5b0f32667deae615.tar.lz
skribilo-699590eb680344df7283943e5b0f32667deae615.zip
eq/lout: Use the new `@BypassNumber' option for numbered displays.
* src/guile/skribilo/package/eq.scm (eq)[number]: Default to `#t'. * src/guile/skribilo/package/eq/lout.scm (eq): Use `@CAND'/`@CAD' instead of `@IAD' (because `@IAND' is broken). Handle `:number'. git-archimport-id: skribilo@sv.gnu.org--2006/skribilo--devo--1.2--patch-119
-rw-r--r--ChangeLog20
-rw-r--r--src/guile/skribilo/package/eq.scm2
-rw-r--r--src/guile/skribilo/package/eq/lout.scm14
3 files changed, 29 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index be980d9..bcbcb1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,26 @@
# arch-tag: automatic-ChangeLog--skribilo@sv.gnu.org--2006/skribilo--devo--1.2
#
+2007-06-24 19:53:02 GMT Ludovic Courtes <ludovic.courtes@laas.fr> patch-119
+
+ Summary:
+ eq/lout: Use the new `@BypassNumber' option for numbered displays.
+ Revision:
+ skribilo--devo--1.2--patch-119
+
+ * src/guile/skribilo/package/eq.scm (eq)[number]: Default to `#t'.
+
+ * src/guile/skribilo/package/eq/lout.scm (eq): Use `@CAND'/`@CAD' instead
+ of `@IAD' (because `@IAND' is broken). Handle `:number'.
+
+ modified files:
+ ChangeLog src/guile/skribilo/package/eq.scm
+ src/guile/skribilo/package/eq/lout.scm
+
+ new patches:
+ lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2--patch-107
+
+
2007-06-24 19:52:01 GMT Ludovic Courtes <ludovic.courtes@laas.fr> patch-118
Summary:
diff --git a/src/guile/skribilo/package/eq.scm b/src/guile/skribilo/package/eq.scm
index 211a9bd..31b297d 100644
--- a/src/guile/skribilo/package/eq.scm
+++ b/src/guile/skribilo/package/eq.scm
@@ -238,7 +238,7 @@ a symbol representing the mathematical operator denoted by @var{m} (e.g.,
(inline? 'auto) (align-with #f)
(renderer #f) (div-style 'over)
(mul-style 'space)
- (number #f))
+ (number #t))
(new container
(markup 'eq)
(ident (or ident (symbol->string (gensym "eq"))))
diff --git a/src/guile/skribilo/package/eq/lout.scm b/src/guile/skribilo/package/eq/lout.scm
index 017b1f8..dff7c66 100644
--- a/src/guile/skribilo/package/eq/lout.scm
+++ b/src/guile/skribilo/package/eq/lout.scm
@@ -61,12 +61,14 @@
:before (lambda (node engine)
(let* ((parent (ast-parent node))
(displayed? (is-markup? parent 'eq-display))
- ;;(number (equation-number-string node))
- )
- ;; FIXME: Use NUMBER when `@BypassNumber' is available.
- (format #t "~a{ "
- (if (and displayed? (not (*embedded-renderer*)))
- "\n@IAD " ""))))
+ (number (equation-number-string node)))
+ ;; Note: The `@BypassNumber' option appeared in Lout 3.36.
+ (if (and displayed? (not (*embedded-renderer*)))
+ (display (if (string? number)
+ (string-append "@CAND @BypassNumber { \""
+ number "\" }")
+ "@CAD")))
+ (display " { ")))
:action (lambda (node engine)
(display (if (inline-equation? node)
"@OneRow @OneCol @E { "