(More about pitches and

accidentals): typo.

diff --git a/ChangeLog b/ChangeLog
index 77255f6f7dc7873f6f0ebd49aaccded06437af00..f2a3c78721e40224a919dde40612b66fd583d99b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2003-09-05  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * Documentation/user/tutorial.itely (More about pitches and
+       accidentals): typo.
+
+2003-08-30  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * Documentation/user/refman.itely (Fingering instructions): 
+
+       * lily/new-fingering-engraver.cc (position_scripts): don't crash
+       for borderline cases. 
+
 2003-08-29  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * cygwin/bug-lilypond-cygwin.sh: Run latex on lily output (WAS: tex).

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index 6e782189529309b6b79d017e7aa39368ccdee5ff..a0a3ecb20bba18a422768b87da50f809427ec90c 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -752,13 +752,17 @@ 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
@@ -767,6 +771,8 @@ is made, and the @internalsref{StaffSymbol} is created before any
 @code{\override} is effective. Properties can be changed in a
 @code{\translator} definition, or by using @code{\outputproperty}.
 
+
+
 @refbugs
 
 If a staff is ended halfway a piece, the staff symbol may not end
@@ -2061,6 +2067,10 @@ to the note head:
 
 @internalsref{FingerEvent}, and @internalsref{Fingering}.
 
+@refbugs
+
+Fingerings are only put horizontally on notes when there are also
+fingering above and below the notes.
 
 @menu
 * Text scripts::                

diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index 0eae233bede3af7e1650e553356b1539ca17114c..df7b88668ad18374c88db0244d913ec710c7d85c 100644 (file)
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -422,7 +422,7 @@ This example shows the key signature, accidentals and ties in action:
     \key g \minor
     \clef violin
     r4 r8 a8 gis4 b
-    g8 d4.-~ d' e'8
+    g8 d4.-~ d e'8
     fis4 fis8 fis8 eis4  a8 gis-~
     gis2 r2
   @}
@@ -1106,7 +1106,7 @@ Printing chords is done by adding @code{\context ChordNames}
 before the chords thus entered:
 @c
 @lilypond[verbatim]
- \context ChordNames \chords \chords { c2 f4.:m g4.:maj7 gis8:dim7 }
+ \context ChordNames \chords { c2 f4.:m g4.:maj7 gis8:dim7 }
 @end lilypond
 
 @cindex lead sheet 

diff --git a/lily/new-fingering-engraver.cc b/lily/new-fingering-engraver.cc
index 63a6c83a0a15f89f1933fdd1a47b7cbbfda20ce5..c87ada1620c3959f33750175e9910248c3bee1e4 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 (!down.size() && fingerings_.size ())
        {
          down.push (fingerings_[0]);
          fingerings_.del(0);