X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcoherent-ligature-engraver.cc;h=2ba9eeca85aecae4cb43aa42084c697e0f4179ac;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=acbbbf8e183ad8e221d6fa25848b93c8fd6e042c;hpb=ece8e196440187c2eef4b1c0e6bdae29cd2695ca;p=lilypond.git

diff --git a/lily/coherent-ligature-engraver.cc b/lily/coherent-ligature-engraver.cc
index acbbbf8e18..2ba9eeca85 100644
--- a/lily/coherent-ligature-engraver.cc
+++ b/lily/coherent-ligature-engraver.cc
@@ -1,15 +1,25 @@
 /*
-  coherent-ligature-engraver.cc -- implement Coherent_ligature_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2003--2015 Juergen Reuter <reuter@ipd.uka.de>
 
-  (c) 2003--2007 Juergen Reuter <reuter@ipd.uka.de>
+  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 "coherent-ligature-engraver.hh"
 
 #include "warn.hh"
-#include "axis-group-interface.hh"
 #include "paper-column.hh"
 #include "pitch.hh"
 #include "pointer-group-interface.hh"
@@ -30,9 +40,9 @@
  *
  * - delegate actual creation of ligature to concrete subclass,
  *
- * - collect all accidentals that occur within the ligature and put
- * them at the left side of the ligature (TODO; see function
- * collect_accidentals ()),
+ * - except in Kievan notation, collect all accidentals that occur
+ * within the ligature and put them at the left side of the ligature
+ * (TODO; see function collect_accidentals ()),
  *
  * - collapse superflous space after each ligature (TODO).
  *
@@ -73,7 +83,6 @@
  * example, Ligature_bracket_engraver does not share any of this code.
  */
 
-
 /*
  * TODO: move this function to class Item?
  */
@@ -88,27 +97,23 @@ Coherent_ligature_engraver::move_related_items_to_column
     {
       Item *sibling = elements[i];
       if (!sibling)
-	// should not occur, but who knows... -jr
-	continue;
+        // should not occur, but who knows... -jr
+        continue;
 
       if (Staff_symbol_referencer::get_staff_symbol (sibling) != staff_symbol)
-	// sibling is from a staff different than that of the item of
-	// interest
-	continue;
-
-      if (dynamic_cast<Item*> (sibling)->get_column () != source_column)
-	continue;
+        // sibling is from a staff different than that of the item of
+        // interest
+        continue;
 
 #if 0 /* experimental code to collapse spacing after ligature */
       Grob *sibling_parent = sibling->get_parent (X_AXIS);
       sibling_parent->warning (_f ("Coherent_ligature_engraver: "
-				   "setting `spacing-increment="
-				   "0.01': ptr=%ul", parent));
+                                   "setting `spacing-increment="
+                                   "0.01': ptr=%ul", parent));
       sibling_parent->set_property ("forced-spacing",
-				    scm_from_double (0.01));
+                                    scm_from_double (0.01));
 #endif
 
-      Axis_group_interface::add_element (target_column, sibling);
       sibling->set_parent (target_column, X_AXIS);
       sibling->translate_axis (offset, X_AXIS);
     }
@@ -126,13 +131,17 @@ Coherent_ligature_engraver::move_related_items_to_column
  * occurs within the broken ligatures any more.
  */
 void
-Coherent_ligature_engraver::collect_accidentals (Spanner *, vector<Grob_info>)
+Coherent_ligature_engraver::collect_accidentals (Spanner *,
+                                                 vector<Grob_info> const &)
 {
   /* TODO */
+  /* NOTE: if implementing such a function, note that in Kievan notation,
+   * the B-flat accidental should not be "collected", but rather prints
+   * immediately before the note head as usual. */
 }
 
 void
-compute_delta_pitches (vector<Grob_info> primitives)
+compute_delta_pitches (vector<Grob_info> const &primitives)
 {
   int prev_pitch = 0;
   int delta_pitch = 0;
@@ -142,13 +151,13 @@ compute_delta_pitches (vector<Grob_info> primitives)
       primitive = dynamic_cast<Item *> (primitives[i].grob ());
       Stream_event *cause = primitives[i].event_cause ();
       int pitch
-	= unsmob_pitch (cause->get_property ("pitch"))->steps ();
+        = unsmob<Pitch> (cause->get_property ("pitch"))->steps ();
       if (prev_primitive)
-	{
-	  delta_pitch = pitch - prev_pitch;
-	  prev_primitive->set_property ("delta-position",
-					scm_from_int (delta_pitch));
-	}
+        {
+          delta_pitch = pitch - prev_pitch;
+          prev_primitive->set_property ("delta-position",
+                                        scm_from_int (delta_pitch));
+        }
       prev_pitch = pitch;
       prev_primitive = primitive;
     }
@@ -157,7 +166,7 @@ compute_delta_pitches (vector<Grob_info> primitives)
 
 void
 Coherent_ligature_engraver::typeset_ligature (Spanner *ligature,
-					      vector<Grob_info> primitives)
+                                              vector<Grob_info> const &primitives)
 {
   // compute some commonly needed context info stored as grob
   // properties