Docs-fr: fix PDF docs build

[lilypond.git] / lily / rest-collision.cc

diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc
index dd92f083e36db01a468dcc5a2acf9d1299cd11ad..1b5b2ee85a70eca7a178996103c05fd90f9f7ce2 100644 (file)
--- a/lily/rest-collision.cc
+++ b/lily/rest-collision.cc
@@ -1,9 +1,20 @@
 /*
-  rest-collision.cc -- implement Rest_collision
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "rest-collision.hh"
@@ -14,6 +25,7 @@ using namespace std;
 #include "directional-element-interface.hh"
 #include "duration.hh"
 #include "international.hh"
+#include "item.hh"
 #include "note-column.hh"
 #include "output-def.hh"
 #include "pointer-group-interface.hh"
@@ -228,7 +240,10 @@ Rest_collision::calc_positioning_done (SCM smob)
       Interval notedim;
       for (vsize i = 0; i < notes.size (); i++)
        {
-         if (Note_column::dir (notes[i]) == -dir)
+         if (Note_column::dir (notes[i]) == -dir
+             // If the note has already happened (but it has a long duration, so there is a collision),
+             // don't look at the stem. If we do, the rest gets shifted down a lot and it looks bad.
+             || dynamic_cast<Item*> (notes[i])->get_column () != dynamic_cast<Item*> (rest)->get_column ())
            {
              /* try not to look at the stem, as looking at a beamed
                 note may trigger beam positioning prematurely.
@@ -272,11 +287,12 @@ Rest_collision::calc_positioning_done (SCM smob)
 }
 
 ADD_INTERFACE (Rest_collision,
-              "Move around ordinary rests (not multi-measure-rests) to avoid "
-              "conflicts.",
+              "Move around ordinary rests (not multi-measure-rests) to avoid"
+              " conflicts.",
 
               /* properties */
               "minimum-distance "
               "positioning-done "
-              "elements");
+              "elements "
+              );