aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Court`es2006-07-24 12:04:09 +0000
committerLudovic Court`es2006-07-24 12:04:09 +0000
commitd01831ea950fbb2d095743ac019bd332296c8137 (patch)
treec9683e8e541851bc1414a3299be91ef61475f05a
parent3a7c4a562510115f1d2ebb386a6f4e0ff9f42cc7 (diff)
downloadskribilo-d01831ea950fbb2d095743ac019bd332296c8137.tar.gz
skribilo-d01831ea950fbb2d095743ac019bd332296c8137.tar.lz
skribilo-d01831ea950fbb2d095743ac019bd332296c8137.zip
pie: Fixed the Lout engine.
* src/guile/skribilo/engine/lout.scm (lout-color-specification): Export it. * src/guile/skribilo/package/pie.scm: Also autoload `ast' on `ast-parent'. * src/guile/skribilo/package/pie/lout.scm: Autoload `(skribilo engine lout)' on `lout-color-specification'. (pie): Use `format' instead of `printf'. git-archimport-id: lcourtes@laas.fr--2005-libre/skribilo--devo--1.2--patch-31
-rw-r--r--src/guile/skribilo/engine/lout.scm2
-rw-r--r--src/guile/skribilo/package/pie.scm2
-rw-r--r--src/guile/skribilo/package/pie/lout.scm3
3 files changed, 4 insertions, 3 deletions
diff --git a/src/guile/skribilo/engine/lout.scm b/src/guile/skribilo/engine/lout.scm
index cb7c6fa..893ab2e 100644
--- a/src/guile/skribilo/engine/lout.scm
+++ b/src/guile/skribilo/engine/lout.scm
@@ -921,7 +921,7 @@
(if (< size 0) "0.3f" "1.5f")
"1.0f"))))
-(define (lout-color-specification skribe-color)
+(define-public (lout-color-specification skribe-color)
;; Return a Lout color name, ie. a string which is either an English color
;; name or something like "rgb 0.5 0.2 0.6". `skribe-color' is a string
;; representing a Skribe color such as "black" or "#ffffff".
diff --git a/src/guile/skribilo/package/pie.scm b/src/guile/skribilo/package/pie.scm
index 0895748..5256f22 100644
--- a/src/guile/skribilo/package/pie.scm
+++ b/src/guile/skribilo/package/pie.scm
@@ -19,7 +19,7 @@
;;; USA.
(define-module (skribilo package pie)
- :autoload (skribilo ast) (markup? markup-ident)
+ :autoload (skribilo ast) (markup? markup-ident ast-parent)
:autoload (skribilo output) (output)
:use-module (skribilo writer)
:use-module (skribilo engine)
diff --git a/src/guile/skribilo/package/pie/lout.scm b/src/guile/skribilo/package/pie/lout.scm
index a9d5819..61dbcb7 100644
--- a/src/guile/skribilo/package/pie/lout.scm
+++ b/src/guile/skribilo/package/pie/lout.scm
@@ -27,6 +27,7 @@
:use-module (skribilo lib)
:use-module (skribilo utils syntax)
:use-module (skribilo utils keywords) ;; `the-options', etc.
+ :autoload (skribilo engine lout) (lout-color-specification)
:use-module (ice-9 optargs))
(fluid-set! current-reader %skribilo-module-reader)
@@ -84,7 +85,7 @@
;; We assume `:radius' to be centimeters
(if (markup-option node :radius)
- (printf " radius { ~ac }\n"
+ (format #t " radius { ~ac }\n"
(markup-option node :radius)))
(format #t " labelradius { ~a }\n"