(determine-split-list): remove playing1

and playing2.

diff --git a/ChangeLog b/ChangeLog
index 412552fe5665d61ba2762ca634b1e7a32dcaf7af..90e1bf7aa5e042ef6586b34d0435f4eb32514a30 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-03  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * scm/part-combiner.scm (determine-split-list): remove playing1
+       and playing2.
+
 2004-10-02  Graham Percival  <gperlist@shaw.ca>
 
        * Documentation/index.html.in: remove link to templates.

diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely
index 04e17f7dffd0e20d41d92b1ee9c35f6d8b932c1e..398b4a91ee020254fc0a082b08a2b7418185c009 100644 (file)
--- a/Documentation/user/changing-defaults.itely
+++ b/Documentation/user/changing-defaults.itely
@@ -2106,6 +2106,9 @@ This is a demonstration of the fields available,
     }
     { c'1 }
   }
+  \bookpaper {
+    linewidth = 8.0 \cm
+  }
 }
 @end lilypond
 

diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index 96d9746d17912e6744b6e42bef30c082da78238e..444bac2777b77355e982304309623fac9b51eef4 100644 (file)
--- a/Documentation/user/notation.itely
+++ b/Documentation/user/notation.itely
@@ -5150,14 +5150,11 @@ they should be entered as
   @}
 @end example
 
-@noindent
-in this case, @code{\transposition} does not have to be used, since
-@code{c'} is the default. 
-
-@code{\transposition} should be used when the music is entered from a
-(transposed) orchestral part.  For example, in classical horn parts,
-the tuning of the instrument is often changed during a piece. When copying
-the notes from the  part, use @code{\transposition}, e.g.
+The command @code{\transposition} should be used when the music is
+entered from a (transposed) orchestral part.  For example, in
+classical horn parts, the tuning of the instrument is often changed
+during a piece. When copying the notes from the part, use
+@code{\transposition}, e.g.
 
 @example
   \transposition d'
@@ -7671,7 +7668,8 @@ such as fermatas to notes.
 Feathered beams are not supported natively, but they can be faked by
 forcing two beams to overlap.  Here is an example,
 
-@lilypond[raggedright,relative=2,fragment,verbatim]
+@c don't change  relative setting witout changing positions!
+@lilypond[raggedright,relative=1,fragment,verbatim]
 \new Staff <<
   \new Voice
   {

diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc
index e97605c82b9c790a51c412cf48f61a47a72ff475..78af05c857cbbe5cb189e8d1e9ae6ecead3410e9 100644 (file)
--- a/lily/spacing-spanner.cc
+++ b/lily/spacing-spanner.cc
@@ -944,3 +944,4 @@ ADD_INTERFACE (Spacing_interface, "spacing-interface",
   "Something to do with line breaking and spacing. Kill this one after determining line breaks.",
   "");
 
+.

diff --git a/scm/part-combiner.scm b/scm/part-combiner.scm
index e206d0d12111eda12afc5a7544fb22dd4f504337..a2ca3ab4171702e3669083609c5a5683e2e8d111 100644 (file)
--- a/scm/part-combiner.scm
+++ b/scm/part-combiner.scm
@@ -259,14 +259,6 @@ Only set if not set previously.
                               ly:pitch<?)))
          (cond ((> (length notes1) 1) (put 'apart))
                ((> (length notes2) 1) (put 'apart))
-               ;;
-               ((and (= (length notes2) 1)
-                     (= (length notes1) 0))
-                     (put 'playing2))
-               ((and (= (length notes1) 1)
-                     (= (length notes2) 0))
-                     (put 'playing1))
-               ;;
                ((and (= (length durs1) 1)
                      (= (length durs2) 1)
                      (not (equal? (car durs1) (car durs2))))