diff options
| author | Ludovic Courtes | 2006-11-05 21:03:03 +0000 |
|---|---|---|
| committer | Ludovic Courtes | 2006-11-05 21:03:03 +0000 |
| commit | 68f8a0a11cd2fdc5b9e77ba96cf1ec40389f0f12 (patch) | |
| tree | f249718656109e65f660056de2f06b2da34742f9 /src | |
| parent | 404ce8d5766faa2c0c3b46e7315dd935655040ce (diff) | |
| parent | e9a7c27f217ab5b2b8bfe119bf78a301818b828e (diff) | |
| download | skribilo-68f8a0a11cd2fdc5b9e77ba96cf1ec40389f0f12.tar.gz skribilo-68f8a0a11cd2fdc5b9e77ba96cf1ec40389f0f12.tar.lz skribilo-68f8a0a11cd2fdc5b9e77ba96cf1ec40389f0f12.zip | |
`base' engine: Fixed dependencies and use of `markup-writer-get'.
* src/guile/skribilo/engine/base.scm: Autoload `package base' upon `color' and `utils keywords' upon `list-split'. Fixed all invocations of `markup-writer-get' so that they pass an engine class (rather than an engine) as the last argument. (line-ref): Removed the second writer. git-archimport-id: lcourtes@laas.fr--2005-libre/skribilo--engine-classes--1.2--patch-10
Diffstat (limited to 'src')
| -rw-r--r-- | src/guile/skribilo/engine/base.scm | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/guile/skribilo/engine/base.scm b/src/guile/skribilo/engine/base.scm index c7f7dd2..2a7a0d4 100644 --- a/src/guile/skribilo/engine/base.scm +++ b/src/guile/skribilo/engine/base.scm @@ -25,6 +25,8 @@ :use-module (skribilo writer) :autoload (skribilo output) (output) :use-module (skribilo evaluator) + :autoload (skribilo package base) (color) + :autoload (skribilo utils keywords) (list-split) ;; syntactic sugar :use-module (skribilo reader) @@ -186,13 +188,13 @@ ;*---------------------------------------------------------------------*/ (markup-writer '&the-bibliography :before (lambda (n e) - (let ((w (markup-writer-get 'table e))) + (let ((w (markup-writer-get 'table (engine-class e)))) (and (writer? w) (invoke (writer-before w) n e)))) :action (lambda (n e) (when (pair? (markup-body n)) (for-each (lambda (i) (output i e)) (markup-body n)))) :after (lambda (n e) - (let ((w (markup-writer-get 'table e))) + (let ((w (markup-writer-get 'table (engine-class e)))) (and (writer? w) (invoke (writer-after w) n e))))) ;*---------------------------------------------------------------------*/ @@ -201,23 +203,28 @@ (markup-writer '&bib-entry :options '(:title) :before (lambda (n e) - (invoke (writer-before (markup-writer-get 'tr e)) n e)) + (invoke (writer-before (markup-writer-get 'tr + (engine-class e))) + n e)) :action (lambda (n e) - (let ((wtc (markup-writer-get 'tc e))) + (let ((wtc (markup-writer-get 'tc (engine-class e)))) ;; the label (markup-option-add! n :valign 'top) (markup-option-add! n :align 'right) (invoke (writer-before wtc) n e) - (output n e (markup-writer-get '&bib-entry-label e)) + (output n e (markup-writer-get '&bib-entry-label + (engine-class e))) (invoke (writer-after wtc) n e) ;; the body (markup-option-add! n :valign 'top) (markup-option-add! n :align 'left) (invoke (writer-before wtc) n e) - (output n e (markup-writer-get '&bib-entry-body)) + (output n e (markup-writer-get '&bib-entry-body + (engine-class e))) (invoke (writer-after wtc) n e))) :after (lambda (n e) - (invoke (writer-after (markup-writer-get 'tr e)) n e))) + (invoke (writer-after (markup-writer-get 'tr (engine-class e))) + n e))) ;*---------------------------------------------------------------------*/ ;* &bib-entry-label ... */ @@ -484,9 +491,3 @@ (n (markup-ident (handle-body (markup-body n))))) (evaluate-document (it (if (integer? o) (+ o n) n)) e)))) - - -;;;; A VIRER (mais handle-body n'est pas défini) -(markup-writer 'line-ref - :options '(:offset) - :action #f) |