Patch for 1.4.7

[Mats Bengtsson]

Hi,

I backported a couple of bug fixes to 1.4.7 and 
introduced a workaround in lilypond-book. It 
produced an exception when you for example used
the option `verbose' to the geometry package.

I've sent the fix in font.scm earlier, but hasn't 
been included in any 1.4.x or 1.5.x.

   /Mats

Generated by (address unknown),
>From = lilypond-1.4.7, To = lilypond-1.4.7.mb1

usage 

    cd lilypond-source-dir; patch -E -p1 < lilypond-1.4.7.mb1.diff

Patches do not contain automatically generated files 
or (urg) empty directories, 
i.e., you should rerun autoconf, configure

diff -urN ../lilypond-1.4.7/CHANGES ./CHANGES
--- ../lilypond-1.4.7/CHANGES   Wed Aug 22 12:29:23 2001
+++ ./CHANGES   Sun Sep 16 22:51:14 2001
@@ -1,3 +1,12 @@
+1.4.7.mb1
+==========
+
+* Bugfix: span-bars and hara-kiri.
+
+* Bugfix: lilypond-book, avoid exception on some geometry options
+
+* Bugfix: fontSize affects also time signatures.
+
 1.4.6.hwn1
 ==========
 
diff -urN ../lilypond-1.4.7/VERSION ./VERSION
--- ../lilypond-1.4.7/VERSION   Thu Aug 23 14:40:08 2001
+++ ./VERSION   Sun Sep 16 22:43:32 2001
@@ -2,7 +2,7 @@
 MAJOR_VERSION=1
 MINOR_VERSION=4
 PATCH_LEVEL=7
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=mb1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
diff -urN ../lilypond-1.4.7/lily/span-bar.cc ./lily/span-bar.cc
--- ../lilypond-1.4.7/lily/span-bar.cc  Sun Jul 15 14:48:40 2001
+++ ./lily/span-bar.cc  Sun Sep 16 21:35:34 2001
@@ -92,44 +92,41 @@
 
   // compose span_bar_mol
   Molecule span_bar_mol = Molecule::Molecule ();
-  Grob *prev_staff_bar = 0;
-  Real prev_staff_bar_length = 0.0;
+  Interval prev_extent;
   for (SCM elts = first_elt;
        gh_pair_p (elts);
        elts = gh_cdr (elts))
   {
     SCM smobbed_staff_bar = gh_car (elts);
-    SCM smobbed_staff_bar_molecule =
-      Bar::brew_molecule (smobbed_staff_bar);
     Grob *staff_bar = unsmob_grob (smobbed_staff_bar);
-    Real staff_bar_length =
-      unsmob_molecule (smobbed_staff_bar_molecule)->
-      extent (Y_AXIS).length ();
+    Interval ext = staff_bar->extent (refp, Y_AXIS);
 
-    if (prev_staff_bar) {
+    if (ext.empty_b ())
+      continue; 
+    
+    if (!prev_extent.empty_b ()) {
 
       Interval l;
-      l[LEFT] = prev_staff_bar->extent (refp, Y_AXIS)[UP];
-      l[RIGHT] = staff_bar->extent (refp, Y_AXIS)[DOWN];
-
-      SCM smobbed_staff_bar = gh_car (elts);
-      Grob *staff_bar = unsmob_grob (smobbed_staff_bar);
+      l[LEFT] = prev_extent[UP];
+      l[RIGHT] = ext[DOWN];
+      
+      //SCM smobbed_staff_bar = gh_car (elts);
+      //Grob *staff_bar = unsmob_grob (smobbed_staff_bar);
       SCM smobbed_interstaff_bar_molecule = 
        Bar::compound_barline (staff_bar, glyph_str, l.length()).
        smobbed_copy ();
-
+      
       Molecule *interstaff_bar_mol =
        unsmob_molecule (smobbed_interstaff_bar_molecule);
-
-      yoffs += prev_staff_bar_length; // skip staff bar
+      
+      yoffs += prev_extent.length (); // skip staff bar
       yoffs += 0.5 * (l[RIGHT] - l[LEFT]); // compensate interstaff bar 
centering
       interstaff_bar_mol->translate_axis (yoffs, Y_AXIS);
       yoffs += 0.5 * (l[RIGHT] - l[LEFT]);
-
+      
       span_bar_mol.add_molecule (*interstaff_bar_mol);
     }
-    prev_staff_bar = staff_bar;
-    prev_staff_bar_length = staff_bar_length;
+    prev_extent = ext;
   }
 
   return span_bar_mol.smobbed_copy ();
diff -urN ../lilypond-1.4.7/scm/font.scm ./scm/font.scm
--- ../lilypond-1.4.7/scm/font.scm      Wed May  9 14:13:19 2001
+++ ./scm/font.scm      Sun Sep 16 22:47:56 2001
@@ -204,11 +204,11 @@
        (volta . ((font-family . number) (font-relative-size . -2)))
        (tuplet . ((font-family . roman) (font-shape . italic) 
(font-relative-size . -1)))
 
-       (timesig . ((font-family . number) (font-relative-size . 0)))
-       (timesig-symbol . ((font-family . music) (font-relative-size . 0)))
+       (timesig . ((font-family . number)))
+       (timesig-symbol . ((font-family . music)))
        
        (mmrest . ((font-family . number) (font-relative-size . 1)))
-       (mmrest-symbol . ((font-family . music) (font-relative-size . 0)))
+       (mmrest-symbol . ((font-family . music)))
 
        (mark . ((font-family . number) (font-relative-size . 1)))
        (script . ((font-family . roman) (font-relative-size . -1)))
diff -urN ../lilypond-1.4.7/scripts/lilypond-book.py ./scripts/lilypond-book.py
--- ../lilypond-1.4.7/scripts/lilypond-book.py  Tue Aug 21 18:05:28 2001
+++ ./scripts/lilypond-book.py  Sun Sep 16 22:45:10 2001
@@ -188,7 +188,9 @@
                elif name[-5:] == 'paper':
                        self.m_papersize = name
                else:
-                       self._set_dimen('m_geo_'+name, value)
+                       pass 
+                       # what is _set_dimen ?? /MB
+                       #self._set_dimen('m_geo_'+name, value)
        def __setattr__(self, name, value):
                if type(value) == type("") and \
                   dimension_conversion_dict.has_key (value[-2:]):