Imported Upstream version 2.16.0

[lilypond.git] / lily / pitched-trill-engraver.cc

diff --git a/lily/pitched-trill-engraver.cc b/lily/pitched-trill-engraver.cc
index 6960d3e2dd1883d390daff87f982aefa7483da2f..ef49b217d14ff2f2dad2fc79afa604c25a9a675f 100644 (file)
--- a/lily/pitched-trill-engraver.cc
+++ b/lily/pitched-trill-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2012 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
@@ -46,7 +46,7 @@ private:
   Item *trill_group_;
   Item *trill_accidental_;
 
-  vector<Grob*> heads_;
+  vector<Grob *> heads_;
 
   void make_trill (Stream_event *);
 };
@@ -89,24 +89,24 @@ Pitched_trill_engraver::make_trill (Stream_event *ev)
   SCM keysig = get_property ("localKeySignature");
 
   SCM key = scm_cons (scm_from_int (p->get_octave ()),
-                     scm_from_int (p->get_notename ()));
+                      scm_from_int (p->get_notename ()));
 
-  int bn = measure_number (context());
+  int bn = measure_number (context ());
 
   SCM handle = scm_assoc (key, keysig);
   if (handle != SCM_BOOL_F)
     {
       bool same_bar = (bn == robust_scm2int (scm_caddr (handle), 0));
       bool same_alt
-       = (p->get_alteration () == robust_scm2rational (scm_cadr (handle), 0));
+        = (p->get_alteration () == robust_scm2rational (scm_cadr (handle), 0));
 
       if (!same_bar || (same_bar && !same_alt))
-       handle = SCM_BOOL_F;
+        handle = SCM_BOOL_F;
     }
 
   bool print_acc
     = (handle == SCM_BOOL_F) || p->get_alteration () == Rational (0)
-    || (ev->get_property ("force-accidental") == SCM_BOOL_T);
+      || (ev->get_property ("force-accidental") == SCM_BOOL_T);
 
   if (trill_head_)
     {
@@ -120,8 +120,8 @@ Pitched_trill_engraver::make_trill (Stream_event *ev)
   int c0 = scm_is_number (c0scm) ? scm_to_int (c0scm) : 0;
 
   trill_head_->set_property ("staff-position",
-                            scm_from_int (unsmob_pitch (scm_pitch)->steps ()
-                                          + c0));
+                             scm_from_int (unsmob_pitch (scm_pitch)->steps ()
+                                           + c0));
 
   trill_group_ = make_item ("TrillPitchGroup", ev->self_scm ());
   trill_group_->set_parent (trill_head_, Y_AXIS);
@@ -135,7 +135,7 @@ Pitched_trill_engraver::make_trill (Stream_event *ev)
       // fixme: naming -> alterations
       trill_accidental_->set_property ("alteration", ly_rational2scm (p->get_alteration ()));
       Side_position_interface::add_support (trill_accidental_, trill_head_);
-      
+
       trill_head_->set_object ("accidental-grob", trill_accidental_->self_scm ());
       trill_accidental_->set_parent (trill_head_, Y_AXIS);
       Axis_group_interface::add_element (trill_group_, trill_accidental_);
@@ -155,7 +155,6 @@ Pitched_trill_engraver::stop_translation_timestep ()
   trill_accidental_ = 0;
 }
 
-
 #include "translator.icc"
 
 ADD_ACKNOWLEDGER (Pitched_trill_engraver, note_head);
@@ -163,17 +162,17 @@ ADD_ACKNOWLEDGER (Pitched_trill_engraver, dots);
 ADD_ACKNOWLEDGER (Pitched_trill_engraver, trill_spanner);
 
 ADD_TRANSLATOR (Pitched_trill_engraver,
-               /* doc */
-               "Print the bracketed note head after a note head with trill.",
+                /* doc */
+                "Print the bracketed note head after a note head with trill.",
 
-               /* create */
-               "TrillPitchHead "
-               "TrillPitchAccidental "
-               "TrillPitchGroup ",
+                /* create */
+                "TrillPitchHead "
+                "TrillPitchAccidental "
+                "TrillPitchGroup ",
 
-               /* read */
-               "",
+                /* read */
+                "",
 
-               /* write */
-               ""
-               );
+                /* write */
+                ""
+               );