diff options
| author | Ludovic Courtes | 2007-06-24 19:52:01 +0000 |
|---|---|---|
| committer | Ludovic Courtes | 2007-06-24 19:52:01 +0000 |
| commit | 40220a2365104a2807caf2fcf895f83e1a21539a (patch) | |
| tree | f6765f373989c7c8a6807ba22ecf1ffc4c32614a /src/guile/skribilo/package/eq.scm | |
| parent | 7fcc1f288b8f7a1b2f1c3a16fcba581cd7a9884b (diff) | |
| download | skribilo-40220a2365104a2807caf2fcf895f83e1a21539a.tar.gz skribilo-40220a2365104a2807caf2fcf895f83e1a21539a.tar.lz skribilo-40220a2365104a2807caf2fcf895f83e1a21539a.zip | |
eq: Implemented equation numbering.
* src/guile/skribilo/package/base.scm (chapter): Augmented environment to
include `equation-env' and `equation-counter'.
* src/guile/skribilo/package/eq.scm: Use `(skribilo resolve)'.
(equation-number-string): New.
(eq)[:number]: New option.
Handle it.
* src/guile/skribilo/package/eq/lout.scm (eq): Prepare to handle
`:number'.
git-archimport-id: skribilo@sv.gnu.org--2006/skribilo--devo--1.2--patch-118
Diffstat (limited to 'src/guile/skribilo/package/eq.scm')
| -rw-r--r-- | src/guile/skribilo/package/eq.scm | 34 |
1 files changed, 31 insertions, 3 deletions
diff --git a/src/guile/skribilo/package/eq.scm b/src/guile/skribilo/package/eq.scm index 9b03aef..211a9bd 100644 --- a/src/guile/skribilo/package/eq.scm +++ b/src/guile/skribilo/package/eq.scm @@ -27,7 +27,8 @@ :use-module (skribilo utils syntax) :use-module (skribilo utils keywords) ;; `the-options', etc. :autoload (skribilo package base) (it symbol sub sup) - :autoload (skribilo engine lout) (lout-illustration) + :autoload (skribilo engine lout) (lout-illustration) + :autoload (skribilo resolve) (resolve-counter) :use-module (srfi srfi-1) :use-module (srfi srfi-39) @@ -207,6 +208,18 @@ a symbol representing the mathematical operator denoted by @var{m} (e.g., (current-module))) +(define-public (equation-number-string equation) + "Return an appropriate document-wide number for @var{equation}." + (and (is-markup? equation 'eq) + (not (inline-equation? equation)) + (let ((num (markup-option equation :number))) + (and (number? num) + (let ((chapter (ast-chapter equation))) + (and (markup? chapter) + (string-append + (number->string (markup-option chapter :number)) "." + (number->string num)))))))) + ;;; ;;; Markup. @@ -224,7 +237,8 @@ a symbol representing the mathematical operator denoted by @var{m} (e.g., (define-markup (eq :rest opts :key (ident #f) (class "eq") (inline? 'auto) (align-with #f) (renderer #f) (div-style 'over) - (mul-style 'space)) + (mul-style 'space) + (number #f)) (new container (markup 'eq) (ident (or ident (symbol->string (gensym "eq")))) @@ -232,9 +246,23 @@ a symbol representing the mathematical operator denoted by @var{m} (e.g., (loc &invocation-location) (options `((:div-style ,div-style) (:align-with ,align-with) (:mul-style ,mul-style) (:inline? ,inline?) + (:number ,(cond ((not number) #f) + ((string? number) number) + (else + (new unresolved + (proc (lambda (n e env) + (let* ((p? (assq 'parent env)) + (p (and (pair? p?) + (cadr p?)))) + (and (is-markup? p 'eq) + (not (inline-equation? p)) + (resolve-counter n env + 'equation + number))))))))) ,@(the-options opts :ident :class :inline? - :div-style :mul-style :align-with))) + :div-style :mul-style :align-with + :number))) (body (let loop ((body (the-body opts)) (result '())) (if (null? body) |