X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcustos-engraver.cc;h=90c221c10f4a63e1617845221e13e870b8c1d7a9;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=00044094a6ad6ea65a1b41656972a655465396ab;hpb=e18531db1f79fb685fbd16d6a2a67bf4b6c09915;p=lilypond.git

diff --git a/lily/custos-engraver.cc b/lily/custos-engraver.cc
index 00044094a6..90c221c10f 100644
--- a/lily/custos-engraver.cc
+++ b/lily/custos-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2000--2010 Juergen Reuter <reuter@ipd.uka.de>,
+  Copyright (C) 2000--2015 Juergen Reuter <reuter@ipd.uka.de>,
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -19,7 +19,6 @@
 */
 
 #include "engraver.hh"
-#include "bar-line.hh"
 #include "item.hh"
 #include "note-head.hh"
 #include "pitch.hh"
@@ -49,7 +48,7 @@ public:
 private:
   Item *create_custos ();
   bool custos_permitted_;
-  vector<Grob*> custodes_;
+  vector<Grob *> custodes_;
   vector<Pitch> pitches_;
 };
 
@@ -89,14 +88,14 @@ Custos_engraver::acknowledge_note_head (Grob_info info)
     {
 
       /*
-	ideally, we'd do custos->set_parent (Y_AXIS, notehead),
-	but since the note head lives on the other system, we can't
+        ideally, we'd do custos->set_parent (Y_AXIS, notehead),
+        but since the note head lives on the other system, we can't
 
-	So we copy the position from the note head pitch.  We
-	don't look at the staff-position, since we can't be sure
-	whether Clef_engraver already applied a vertical shift.
+        So we copy the position from the note head pitch.  We
+        don't look at the staff-position, since we can't be sure
+        whether Clef_engraver already applied a vertical shift.
       */
-      pitches_.push_back (*unsmob_pitch (ev->get_property ("pitch")));
+      pitches_.push_back (*Pitch::unsmob (ev->get_property ("pitch")));
     }
 }
 
@@ -109,17 +108,17 @@ Custos_engraver::process_acknowledged ()
   if (custos_permitted_)
     {
       for (vsize i = pitches_.size (); i--;)
-	{
-	  Item *c = create_custos ();
+        {
+          Item *c = create_custos ();
 
-	  int p = pitches_[i].steps ();
-	  SCM c0 = get_property ("middleCPosition");
-	  if (scm_is_number (c0))
-	    p += scm_to_int (c0);
+          int p = pitches_[i].steps ();
+          SCM c0 = get_property ("middleCPosition");
+          if (scm_is_number (c0))
+            p += scm_to_int (c0);
 
-	  c->set_property ("staff-position",
-			   scm_from_int (p));
-	}
+          c->set_property ("staff-position",
+                           scm_from_int (p));
+        }
 
       pitches_.clear ();
     }
@@ -147,15 +146,15 @@ ADD_ACKNOWLEDGER (Custos_engraver, bar);
 ADD_ACKNOWLEDGER (Custos_engraver, note_head);
 
 ADD_TRANSLATOR (Custos_engraver,
-		/* doc */
-		"Engrave custodes.",
+                /* doc */
+                "Engrave custodes.",
 
-		/* create */
-		"Custos ",
+                /* create */
+                "Custos ",
 
-		/* read */
-		"",
+                /* read */
+                "",
 
-		/* write */
-		""
-		);
+                /* write */
+                ""
+               );