* lily/paper-book.cc (output): load framework module

scm_c_resolve_module().

* python/lilylib.py (exit): exit with argument i.

diff --git a/ChangeLog b/ChangeLog
index 3f65b6dc6c3f0c4d6ffd9f030b2198757ddd3190..0134056269355e1f00a078cbe0cfcbd14dd3b878 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-06-14  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * lily/paper-book.cc (output): load framework module
+       scm_c_resolve_module().
+
+       * python/lilylib.py (exit): exit with argument i.
+
 2004-06-14  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * scm/framework-gnome.scm (output-framework-gnome): Try loading
@@ -38,6 +45,8 @@
 
 2004-06-13  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * VERSION: release 2.3.4
+
        * Documentation/user/invoking.itexi (Invoking the lilypond
        binary): document --safe.
 

diff --git a/lily/beam.cc b/lily/beam.cc
index 91574c3484afa1a49f9cec597e3626b191683db0..6cc0a3a7171b56dabfb403ed787ea62c107296a4 100644 (file)
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -339,7 +339,7 @@ Beam::print (SCM grob)
   else
     pos= ly_scm2realdrul (posns);
 
-  scale_drul (  &pos,  Staff_symbol_referencer::staff_space (me));
+  scale_drul (&pos,  Staff_symbol_referencer::staff_space (me));
   
   Real dy = pos[RIGHT] - pos[LEFT];
   Real dydx = (dy && dx) ? dy/dx : 0;
@@ -351,7 +351,7 @@ Beam::print (SCM grob)
   Real last_xposn = -1;
   Real last_stem_width = -1 ;
 
-  Real gap_length =robust_scm2double ( me->get_property ("gap"), 0.0);
+  Real gap_length = robust_scm2double (me->get_property ("gap"), 0.0);
   
   Stencil the_beam;
   Real lt = me->get_paper ()->get_dimension (ly_symbol2scm ("linethickness"));
@@ -369,7 +369,7 @@ Beam::print (SCM grob)
        right from the left stem, and rfliebertjes pointing left from
        right stem.
        */
-      SCM left = (i>0) ? ly_cdr (last_beaming) : SCM_EOL;
+      SCM left = (i > 0) ? ly_cdr (last_beaming) : SCM_EOL;
       SCM right = st ? ly_car (this_beaming) : SCM_EOL;
 
       Array<int> full_beams;

diff --git a/lily/ly-module.cc b/lily/ly-module.cc
index 24ddaf8d7e36b26e5609a42b5f9edbdd4208c9c7..247a456dc375a46fc896324d13765bd28777ff33 100644 (file)
--- a/lily/ly-module.cc
+++ b/lily/ly-module.cc
@@ -70,6 +70,13 @@ ly_module_define (void *closure, SCM key, SCM val, SCM result)
 /* Ugh signature of scm_internal_hash_fold () is inaccurate.  */
 typedef SCM (*Hash_cl_func)();
 
+/*
+  Check me. This is NOT an actual import. It just copies the
+  definitions.
+
+  If a variable in changed in SRC, we DEST doesn't see the
+  definitions.
+ */
 LY_DEFINE (ly_import_module, "ly:import-module",
           2, 0, 0, (SCM dest, SCM src),
           "Import all bindings from module SRC into DEST.")

diff --git a/lily/paper-book.cc b/lily/paper-book.cc
index a25c0dedab83fc4e9be8eda8e3c08356075d518c..fe7105d9ea9f454f1f54691d81c6cf1f6e56db79 100644 (file)
--- a/lily/paper-book.cc
+++ b/lily/paper-book.cc
@@ -135,8 +135,12 @@ Paper_book::output (String outname)
   
       String func_nm = format;
       func_nm = "output-framework-" + func_nm;
-       
-      SCM func = ly_scheme_function (func_nm.to_str0 ());
+      String mod_nm = "scm framework-" + format;
+      
+      SCM mod = scm_c_resolve_module (mod_nm.to_str0 ());
+      SCM func = scm_c_module_lookup (mod, func_nm.to_str0 ());
+
+      func = scm_variable_ref (func);
       scm_apply_0 (func, scm_list_n (out->self_scm (),
                                     self_scm (),
                                     scopes,

diff --git a/python/lilylib.py b/python/lilylib.py
index 01b3e8054070dac9a171f7d2020c484368de1dc8..da44570a57b45cee8a12344d460216829c832d1e 100644 (file)
--- a/python/lilylib.py
+++ b/python/lilylib.py
@@ -129,7 +129,7 @@ def exit (i):
        if __main__.verbose_p:
                raise _ ('Exiting (%d)...') % i
        else:
-               sys.exit (1)
+               sys.exit (i)
                
 def getopt_args (opts):
        '''Construct arguments (LONG, SHORT) for getopt from  list of options.'''

diff --git a/scm/define-music-properties.scm b/scm/define-music-properties.scm
index 031bef9a9d6b49f824d605a7afceccdf23ac74e5..6e1940b94abe09ab8c5bb4e4ccb039a23e1116e7 100644 (file)
--- a/scm/define-music-properties.scm
+++ b/scm/define-music-properties.scm
@@ -15,8 +15,7 @@
        ))
   (set-object-property! symbol 'music-type? type?)
   (set-object-property! symbol 'music-doc description)
-  symbol )
-
+  symbol)
 
 (define-public all-music-properties
   (map

diff --git a/scm/lily.scm b/scm/lily.scm
index 945f26fb415298c18e52052ee3a36f186eac34c1..69a6f686f3f2732164b2ee225d7ec3b1ca78d609 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -373,15 +373,6 @@ L1 is copied, L2 not.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;  output
 
-
-;; 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)))))