Run grand replace for 2015.

[lilypond.git] / lily / part-combine-engraver.cc

diff --git a/lily/part-combine-engraver.cc b/lily/part-combine-engraver.cc
index f12cfbad95de5324622307e5c0f4cff712076e6f..54ad1797a44a6c54d2ccf1f03e37f19a1879d5f4 100644 (file)
--- a/lily/part-combine-engraver.cc
+++ b/lily/part-combine-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2000--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 2000--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 
@@ -79,7 +79,7 @@ Part_combine_engraver::Part_combine_engraver ()
 void
 Part_combine_engraver::create_item (Stream_event *ev)
 {
-  SCM what = ev->get_property ("class");
+  SCM what = scm_car (ev->get_property ("class"));
   SCM text = SCM_EOL;
   if (what == ly_symbol2scm ("solo-one-event"))
     text = get_property ("soloText");
@@ -117,8 +117,8 @@ Part_combine_engraver::acknowledge_note_head (Grob_info i)
       Grob *t = text_;
       Side_position_interface::add_support (t, i.grob ());
       if (Side_position_interface::get_axis (t) == X_AXIS
-         && !t->get_parent (Y_AXIS))
-       t->set_parent (i.grob (), Y_AXIS);
+          && !t->get_parent (Y_AXIS))
+        t->set_parent (i.grob (), Y_AXIS);
     }
 }
 
@@ -140,20 +140,20 @@ Part_combine_engraver::stop_translation_timestep ()
 ADD_ACKNOWLEDGER (Part_combine_engraver, note_head);
 ADD_ACKNOWLEDGER (Part_combine_engraver, stem);
 ADD_TRANSLATOR (Part_combine_engraver,
-               /* doc */
-               "Part combine engraver for orchestral scores: Print markings"
-               " @q{a2}, @q{Solo}, @q{Solo II}, and @q{unisono}.",
-
-               /* create */
-               "CombineTextScript ",
-
-               /* read */
-               "printPartCombineTexts "
-               "partCombineTextsOnNote "
-               "soloText "
-               "soloIIText "
-               "aDueText ",
-
-               /* write */
-               ""
-               );
+                /* doc */
+                "Part combine engraver for orchestral scores: Print markings"
+                " @q{a2}, @q{Solo}, @q{Solo II}, and @q{unisono}.",
+
+                /* create */
+                "CombineTextScript ",
+
+                /* read */
+                "printPartCombineTexts "
+                "partCombineTextsOnNote "
+                "soloText "
+                "soloIIText "
+                "aDueText ",
+
+                /* write */
+                ""
+               );