X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-column.cc;h=867542bdbd39fe497b6da103e66572e5840ddf4c;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=e1a8e695fd16474e616a5cadad5a4bb8e959dc76;hpb=024e51d1cb0e21d211baf91ad0774bc766dff687;p=lilypond.git

diff --git a/lily/note-column.cc b/lily/note-column.cc
index e1a8e695fd..867542bdbd 100644
--- a/lily/note-column.cc
+++ b/lily/note-column.cc
@@ -1,14 +1,25 @@
 /*
-  note-column.cc -- implement Note_column
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2014 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 "note-column.hh"
 
-#include <cmath>		// ceil
+#include <cmath>                // ceil
 using namespace std;
 
 #include "accidental-placement.hh"
@@ -53,6 +64,18 @@ Note_column::get_stem (Grob *me)
   return unsmob_item (s);
 }
 
+Item *
+Note_column::get_flag (Grob *me)
+{
+  Item *stem = get_stem (me);
+  if (stem)
+    {
+      SCM s = stem->get_object ("flag");
+      return unsmob_item (s);
+    }
+  return 0;
+}
+
 Slice
 Note_column::head_positions_interval (Grob *me)
 {
@@ -81,7 +104,7 @@ Note_column::dir (Grob *me)
     {
       extract_grob_set (me, "note-heads", heads);
       if (heads.size ())
-	return (Direction)sign (head_positions_interval (me).center ());
+        return (Direction)sign (head_positions_interval (me).center ());
     }
 
   programming_error ("note column without heads and stem");
@@ -109,14 +132,14 @@ Note_column::add_head (Grob *me, Grob *h)
     {
       extract_grob_set (me, "note-heads", heads);
       if (heads.size ())
-	both = true;
+        both = true;
       else
-	me->set_object ("rest", h->self_scm ());
+        me->set_object ("rest", h->self_scm ());
     }
   else if (Note_head::has_interface (h))
     {
       if (unsmob_grob (me->get_object ("rest")))
-	both = true;
+        both = true;
       Pointer_group_interface::add_grob (me, ly_symbol2scm ("note-heads"), h);
     }
 
@@ -126,22 +149,6 @@ Note_column::add_head (Grob *me, Grob *h)
     Axis_group_interface::add_element (me, h);
 }
 
-/**
-   translate the rest symbols vertically by amount DY, but only if
-   they have no staff-position set.
-*/
-void
-Note_column::translate_rests (Grob *me, int dy)
-{
-  Grob *r = unsmob_grob (me->get_object ("rest"));
-  if (r && !scm_is_number (r->get_property ("staff-position")))
-    {
-      r->translate_axis (dy * Staff_symbol_referencer::staff_space (r) / 2.0, Y_AXIS);
-      Grob *p = r->get_parent (Y_AXIS);
-      p->flush_extent_cache (Y_AXIS);
-    }
-}
-
 Grob *
 Note_column::first_head (Grob *me)
 {
@@ -150,7 +157,7 @@ Note_column::first_head (Grob *me)
 }
 
 /*
-  Return the first Accidentals grob that we find in a note-head.
+  Return the first AccidentalPlacement grob that we find in a note-head.
 */
 Grob *
 Note_column::accidentals (Grob *me)
@@ -162,7 +169,7 @@ Note_column::accidentals (Grob *me)
       Grob *h = heads[i];
       acc = h ? unsmob_grob (h->get_object ("accidental-grob")) : 0;
       if (acc)
-	break;
+        break;
     }
 
   if (!acc)
@@ -183,16 +190,10 @@ Note_column::dot_column (Grob *me)
     {
       Grob *dots = unsmob_grob (heads[i]->get_object ("dot"));
       if (dots)
-	return dots->get_parent (X_AXIS);
+        return dots->get_parent (X_AXIS);
     }
-  
-  return 0;
-}
 
-Grob *
-Note_column::arpeggio (Grob *me)
-{
-  return unsmob_grob (me->get_object ("arpeggio"));
+  return 0;
 }
 
 /* If a note-column contains a cross-staff stem then
@@ -210,15 +211,14 @@ Note_column::cross_staff_extent (Grob *me, Grob *refp)
 }
 
 ADD_INTERFACE (Note_column,
-	       "Stem and noteheads combined",
-
-	       /* properties */
-	       "arpeggio "
-	       "force-hshift "
-	       "horizontal-shift "
-	       "ignore-collision "
-	       "note-heads "
-	       "rest "
-	       "rest-collision "
-	       "stem "
-	       );
+               "Stem and noteheads combined.",
+
+               /* properties */
+               "force-hshift "
+               "horizontal-shift "
+               "ignore-collision "
+               "note-heads "
+               "rest "
+               "rest-collision "
+               "stem "
+              );