(position_scripts): don't crash

for borderline cases (e.g. 1 fingering.)

diff --git a/ChangeLog b/ChangeLog
index ee43536d593e34ab7cf50699d5ef76f454de33cc..c8b0bcf7397915e49733e4fd1123d860dabcd7e4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-08-30  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * lily/new-fingering-engraver.cc (position_scripts): don't crash
+       for borderline cases (e.g. 1 fingering.)
+
        * scm/document-translation.scm (context-doc): add aliases to
        automated documentation.
 
@@ -37,7 +40,7 @@
 
        * input/regression/breathing-sign.ly: changed ancient examples to
        be relevant (by request of Han-Wen); updated BreathingSign text
-       property according to new syntax
+       property according to new syntax.
 
        * ly/gregorian-init.ly: updated BreathingSign text property
        according to new syntax

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index 5ec71cf33fe4765cb9a4f8c70313b84199560325..1a1d93fe9bb9172d8d2b3586f4f5917285b81a66 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -792,13 +792,18 @@ such as keys, clefs and time signatures.
 
 @cindex adjusting staff symbol
 @cindex StaffSymbol, using \property
-@cindex staff lines, setting number of
 
 Notes, dynamic signs, etc. are grouped
 with a set of horizontal lines, into a staff (plural `staves'). In our
 system, these lines are drawn using a separate layout object called
 staff symbol.  
 
+
+@cindex staff lines, setting number of
+@cindex staff lines, setting thickness of
+@cindex thickness of staff lines, setting 
+@cindex number of staff lines, setting 
+
 This object is created whenever a @internalsref{Staff} context is
 created.  The appearance of the staff symbol cannot be changed by
 using @code{\override} or @code{\set}.  At the moment that

diff --git a/THANKS b/THANKS
index 1cbc182e2d80c428490602c6ada9d9ae7929f4e5..5bf9579ae5c418e61b844f8408026b62abb3a3c0 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -1,9 +1,29 @@
 
+Release 2.0
+
 HEAD HACKERS
 
 Han-Wen Nienhuys
 Jan Nieuwenhuizen
 
+CONTRIBUTORS
+
+Heikki Junes
+Juergen Reuter
+
+BUG HUNTERS
+
+David Rayleigh Arnold
+Fabio dos Santos
+Antonio Palama
+
+
+Release 1.8
+
+HEAD HACKERS
+
+Han-Wen Nienhuys
+Jan Nieuwenhuizen
 
 CONTRIBUTORS
 
@@ -37,6 +57,7 @@ Koblinger Egmont
 Paul Scott
 Pedro Kroger
 Richard Shann
+Roland Stigge
 Ryan O'Neil
 Simon Bailey
 Simon Weatherill

diff --git a/input/regression/allfontstyle.ly b/input/regression/allfontstyle.ly
index 8619b9061f642a8e9caf7b1028fcced1feb65ee1..ba147ce0784d39c443892eeb499d5c4b95683984 100644 (file)
--- a/input/regression/allfontstyle.ly
+++ b/input/regression/allfontstyle.ly
@@ -14,7 +14,7 @@ Different text styles are used for various purposes.
                        {
                            d-4_\markup { \italic "cantabile"  } }
                        {  e }  } \acciaccatura { c16 }
-                        
+                         
                         f4\ff^""^\markup  { \large "Largo" } \mark "B" g 
        }
        \paper { raggedright = ##t

diff --git a/input/regression/grace-types.ly b/input/regression/grace-types.ly
index ba46b7c3169a5acabeda9c6e26a474ba806a75bc..96307f2088c6f620dde3166ef97ee84ff5180556 100644 (file)
--- a/input/regression/grace-types.ly
+++ b/input/regression/grace-types.ly
@@ -11,3 +11,4 @@ acciaccatura inserts a slur and slashes the stem."
                       }
     
 }
+ 

diff --git a/lily/new-fingering-engraver.cc b/lily/new-fingering-engraver.cc
index f91a24d07e571fbf92023bd0fddd2e4db3099a05..94b0614dde937def9f225aabf4a6696784c2469c 100644 (file)
--- a/lily/new-fingering-engraver.cc
+++ b/lily/new-fingering-engraver.cc
@@ -197,7 +197,7 @@ New_fingering_engraver::position_scripts ()
     {
       if (!up.size())
        up.push (fingerings_.pop());
-      if (!down.size())
+      if (fingerings_.size () && !down.size())
        {
          down.push (fingerings_[0]);
          fingerings_.del(0);
@@ -222,7 +222,7 @@ New_fingering_engraver::position_scripts ()
       f->add_offset_callback (Self_alignment_interface::aligned_on_self_proc, Y_AXIS);
       f->add_offset_callback (Side_position_interface::aligned_side_proc, X_AXIS);
 
-      f->set_grob_property( "direction", fhd);
+      f->set_grob_property ("direction", fhd);
       typeset_grob (f);
     }