patches by mats

diff --git a/ChangeLog b/ChangeLog
index ed088486f14fc232a1847bbb507cd5da3bd09f66..cbdbf1c4ff8e4e83cf0aea4d61c83f1f3e352ac4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-04-10  Mats Bengtsson  <matsb@s3.kth.se>
+
+        * scm/grob-description.scm (MultiMeasureRest): number-threshold=1
+        by default: avoid "1" over single bar rests.
+
+       * scripts/lilypond-book.py (LatexPaper.set_geo_option): Simplify
+       and correct the handling of geometry options.
+
 2002-04-10  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * lily/include/grob-interface.hh (ADD_INTERFACE): make
@@ -10,7 +18,8 @@
 
        * lily/beam.cc: remove end_after_line_breaking().
 
-       * lily/grob.cc (calculate_dependencies): remove list support for callbacks.
+       * lily/grob.cc (calculate_dependencies): remove list support for
+       callbacks.
 
        * lily/font-size-engraver.cc: only do font-interface.
 
@@ -78,7 +87,7 @@
        * Documentation/windows/gsview-profile.sh: Remove.  Functionality
        moved to gs/gsview windows packages.
 
-2002-04-06  Mats Bengtsson  <matsb@matsb@s3.kth.se>
+2002-04-06  Mats Bengtsson  <matsb@s3.kth.se>
 
        * lily/stem-engraver.cc (acknowledge_grob): Revert to old way of
        finding out the duration. Fixes chord tremolo bug. 
@@ -1018,7 +1027,7 @@
        * lily/system-start-delimiter.cc (after_line_breaking): Bugfix:
        glyph is string.
 
-2002-02-28  Mats Bengtsson  <matsb@matsb@s3.kth.se>
+2002-02-28  Mats Bengtsson  <matsb@s3.kth.se>
 
        * scm/tex.scm, scm/ps.scm (or): Bugfix, ps output with Guile 3.4
 
@@ -1392,7 +1401,7 @@
        * scm/font.scm (make-style-sheet): Fixes to make staff-sizes work
        again.
 
-2001-12-22  Mats Bengtsson  <matsb@matsb@s3.kth.se>
+2001-12-22  Mats Bengtsson  <matsb@s3.kth.se>
 
        * tex/lilyponddefs.tex: Make sure interscorelinefill=1 doesn't
        spread the last few lines all over the last page of a score.

diff --git a/VERSION b/VERSION
index 9e432d9edc190f02ba5d220fc486402a4ea93cff..a94c8d5d6192a450931aec37ebb9bc58b36a0568 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
 PATCH_LEVEL=51
-MY_PATCH_LEVEL=hjj3
+MY_PATCH_LEVEL=uu1
 
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a

diff --git a/scm/grob-description.scm b/scm/grob-description.scm
index a342dc1a2273eb8b8750bfb6737bf6d0e0cc4778..7e4101ea20bd98bb4106d3880f6fbd8cb0550c06 100644 (file)
--- a/scm/grob-description.scm
+++ b/scm/grob-description.scm
@@ -429,7 +429,7 @@
        (Y-offset-callbacks . (,Staff_symbol_referencer::callback))
        (staff-position . 0)
        (expand-limit . 10)
-       (number-threshold . 0)
+       (number-threshold . 1)
        (padding . 1)
        (thickness . 6.6)
        (font-family . number)

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index cf10c42f20c5ce06d1459ee828596409249723aa..002e58a3b5e0ed1dd7b3ee24fb26e7a3adc2ad5d 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -161,12 +161,14 @@ class LatexPaper:
                                conv =  dimension_conversion_dict[m.group(2)]
 
                                value = conv(num)
-
-               if name == 'body' or name == 'text':
-                       if type(value) == type(""):
-                               self.m_geo_textwidth =  value
+                               
                        else:
-                               self.m_geo_textwidth =  value[0]
+                               m = re.match ("^[0-9.]+$",value)
+                               if m:
+                                       value = float(value)
+                               
+               if name == 'body' or name == 'text':
+                       self.m_geo_textwidth =  value
                        self.__body = 1
                elif name == 'portrait':
                        self.m_geo_landscape = 0
@@ -180,12 +182,9 @@ class LatexPaper:
                        self.m_geo_x_marginparsep =  value
                        self.m_geo_includemp = 1
                elif name == 'scale':
-                       if type(value) == type(""):
-                               self.m_geo_width = self.get_paperwidth() * float(value)
-                       else:
-                               self.m_geo_width = self.get_paperwidth() * float(value[0])
+                       self.m_geo_width = self.get_paperwidth() * value
                elif name == 'hscale':
-                       self.m_geo_width = self.get_paperwidth() * float(value)
+                       self.m_geo_width = self.get_paperwidth() * value
                elif name == 'left' or name == 'lmargin':
                        self.m_geo_lmargin =  value
                elif name == 'right' or name == 'rmargin':
@@ -198,25 +197,14 @@ class LatexPaper:
                        if value[2] not in ('*', ''):
                                self.m_geo_rmargin =  value[2]
                elif name == 'hmargin':
-                       if type(value) == type(""):
-                               self.m_geo_lmargin =  value
-                               self.m_geo_rmargin =  value
-                       else:
-                               self.m_geo_lmargin =  value[0]
-                               self.m_geo_rmargin =  value[1]
+                       self.m_geo_lmargin =  value
+                       self.m_geo_rmargin =  value
                elif name == 'margin':#ugh there is a bug about this option in
                                        # the geometry documentation
-                       if type(value) == type(""):
-                               self.m_geo_lmargin =  value
-                               self.m_geo_rmargin =  value
-                       else:
-                               self.m_geo_lmargin =  value[0]
-                               self.m_geo_rmargin =  value[0]
+                       self.m_geo_lmargin =  value
+                       self.m_geo_rmargin =  value
                elif name == 'total':
-                       if type(value) == type(""):
-                               self.m_geo_width =  value
-                       else:
-                               self.m_geo_width =  value[0]
+                       self.m_geo_width =  value
                elif name == 'width' or name == 'totalwidth':
                        self.m_geo_width =  value
                elif name == 'paper' or name == 'papername':