diff options
| author | Ludovic Court`es | 2007-06-06 13:06:45 +0000 |
|---|---|---|
| committer | Ludovic Court`es | 2007-06-06 13:06:45 +0000 |
| commit | e6bda4dce5fa0fdc935484e2a2540953f43b5a2d (patch) | |
| tree | 68348a085aeac037e52c8e28ff9c3648d5f2cbcf /src/guile/skribilo/resolve.scm | |
| parent | 2fa73d579b53028324526cc1d73ad09332ac76a9 (diff) | |
| download | skribilo-e6bda4dce5fa0fdc935484e2a2540953f43b5a2d.tar.gz skribilo-e6bda4dce5fa0fdc935484e2a2540953f43b5a2d.tar.lz skribilo-e6bda4dce5fa0fdc935484e2a2540953f43b5a2d.zip | |
Cleaned up the core modules.
git-archimport-id: lcourtes@laas.fr--2006-libre/skribilo--devo--1.2--patch-65
Diffstat (limited to 'src/guile/skribilo/resolve.scm')
| -rw-r--r-- | src/guile/skribilo/resolve.scm | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/guile/skribilo/resolve.scm b/src/guile/skribilo/resolve.scm index 94ab360..4a83703 100644 --- a/src/guile/skribilo/resolve.scm +++ b/src/guile/skribilo/resolve.scm @@ -31,8 +31,8 @@ :use-module (srfi srfi-34) :use-module (srfi srfi-35) - :export (resolve! resolve-search-parent resolve-children resolve-children* - find1 resolve-counter resolve-parent resolve-ident + :export (resolve! resolve-search-parent + resolve-counter resolve-parent resolve-ident *document-being-resolved*)) (fluid-set! current-reader %skribilo-module-reader) @@ -239,7 +239,7 @@ (debug-item "searching=" pred) (let ((p (resolve-parent n e))) (debug-item "parent=" p " " - (if (is-a? p 'markup) (slot-ref p 'markup) "???")) + (if (is-a? p <markup>) (slot-ref p 'markup) "???")) (cond ((pred p) p) ((is-a? p <unresolved>) p) @@ -262,10 +262,7 @@ (list (list (symbol-append cnt '-counter) 0) (list (symbol-append cnt '-env) '()))) (resolve-counter n e cnt val))) - (let* ((num (cadr c)) - (nval (if (integer? val) - val - (+ 1 num)))) + (let* ((num (cadr c))) (let ((c2 (assq (symbol-append cnt '-env) e))) (set-car! (cdr c2) (cons (resolve-parent n e) (cadr c2)))) (cond |