+2004-06-11 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+ * lily/paper-book.cc (LY_DEFINE): ly:output-formats. New function.
+
2004-06-10 Jan Nieuwenhuizen <janneke@gnu.org>
* scm/output-gnome.scm: Add font scaling. Attempt to resurrect
return fields;
}
+LY_DEFINE(ly_output_formats, "ly:output-formats",
+ 0, 0, 0, (),
+ "Formats passed to --format as a list of strings, "
+ "used for the output.")
+{
+ Array<String> output_formats = split_string (output_format_global, ',');
+
+ SCM l = SCM_EOL;
+ for (int i = 0; i < output_formats.size (); i ++)
+ {
+ l = scm_cons (scm_makfrom0str (output_formats[i].to_str0 ()), l);
+ }
+
+ return l;
+}
+
+
+
/*
TODO: there is too much code dup, and the interface is not
clear. FIXME.
/* Generate all stencils to trigger font loads. */
pages ();
- Array<String> output_formats = split_string (output_format_global, ',');
-
- for (int i = 0; i < output_formats.size (); i++)
+
+ SCM formats = ly_output_formats();
+ for (SCM s = formats; ly_c_pair_p (s); s = ly_cdr (s))
{
- String format = output_formats[i];
- Paper_outputter *out = get_paper_outputter (outname + "." + output_formats[i], format);
+ String format = ly_scm2string (ly_car (s));
+ Paper_outputter *out = get_paper_outputter (outname + "." + format, format);
SCM scopes = SCM_EOL;
(not (= l r)))
(define-public (ly:load x)
- (let* (
- (fn (%search-load-path x))
-
- )
+ (let* ((fn (%search-load-path x)))
(if (ly:get-option 'verbose)
(format (current-error-port) "[~A]" fn))
(primitive-load fn)))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; output
-(use-modules
- (scm framework-gnome)
- (scm framework-tex)
- (scm framework-ps))
+
+;; only load modules necessary.
+(eval
+ (cons use-modules
+ (map (lambda (x)
+ (list 'scm (string->symbol (string-append "framework-" x))))
+ (ly:output-formats)))
+ (current-module))
+
+
(define output-tex-module
(make-module 1021 (list (resolve-interface '(scm output-tex)))))
(define output-ps-module
## 4. get guile-gnome
tla register-archive guile-gnome-devel@gnu.org--2004 http://people.debian.org/~rotty/arch/guile-gnome-devel@gnu.org/2004/ || true
rm -rf guile-gnome
-tla guile-gnome-devel@gnu.org--2004/dists--dev guile-gnome
+tla get guile-gnome-devel@gnu.org--2004/dists--dev guile-gnome
cd guile-gnome
tla build-config -r configs/gnu.org/dev
cd src
export LD_LIBRARY_PATH=$HOME/usr/pkg/g-wrap/lib:$LD_LIBRARY_PATH
export PKG_CONFIG_PATH=$HOME/usr/pkg/g-wrap/lib/pkgconfig:$PKG_CONFIG_PATH
+# cp srfi-34.scm from CVS head ? --hwn
+
+
../src/configure --prefix=$HOME/usr/pkg/guile-gnome
G_WRAP_MODULE_DIR=$HOME/usr/pkg/g-wrap/share/guile/site make install
export GUILE_LOAD_PATH=$HOME/usr/pkg/guile-gnome/share/guile:$GUILE_LOAD_PATH
export LD_LIBRARY_PATH=$HOME/usr/pkg/guile-gnome/lib:$LD_LIBRARY_PATH
-guile -s ../src/libgnoecanvas/examples/canvas.scm
+guile -s ../src/libgnomecanvas/examples/canvas.scm
"