resolve merge

[lilypond.git] / lily / vaticana-ligature-engraver.cc

diff --git a/lily/vaticana-ligature-engraver.cc b/lily/vaticana-ligature-engraver.cc
index 414020db7a7de54ec0e816e376f23866b491e0e8..5402a8fb01da24f005a09caafe2c2b054f6bc42e 100644 (file)
--- a/lily/vaticana-ligature-engraver.cc
+++ b/lily/vaticana-ligature-engraver.cc
@@ -1,9 +1,20 @@
 /*
-  vaticana-ligature-engraver.cc -- implement Vaticana_ligature_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2003--2011 Juergen Reuter <reuter@ipd.uka.de>
 
-  (c) 2003--2009 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 "gregorian-ligature-engraver.hh"
@@ -91,7 +102,7 @@ Vaticana_ligature_engraver::listen_ligature (Stream_event *ev)
 
 Vaticana_ligature_engraver::Vaticana_ligature_engraver ()
 {
-  brew_ligature_primitive_proc = 
+  brew_ligature_primitive_proc =
     Vaticana_ligature::brew_ligature_primitive_proc;
   augmented_primitives_.clear ();
 }
@@ -194,8 +205,8 @@ Vaticana_ligature_engraver::align_heads (vector<Grob_info> primitives,
 {
   if (!primitives.size ())
     {
-      programming_error ("Vaticana_ligature: "
-                        "empty ligature [ignored]");
+      programming_error ("Vaticana_ligature:"
+                        " empty ligature [ignored]");
       return 0.0;
     }
 
@@ -319,8 +330,8 @@ Vaticana_ligature_engraver::align_heads (vector<Grob_info> primitives,
        {
          if (!prev_primitive)
            {
-             primitive->programming_error ("vaticana ligature: add-join: "
-                                           "missing previous primitive");
+             primitive->programming_error ("Vaticana ligature: add-join:"
+                                           " missing previous primitive");
            }
          else
            {
@@ -386,8 +397,9 @@ Vaticana_ligature_engraver::check_for_prefix_loss (Item *primitive)
   if (prefix_set & ~PES_OR_FLEXA)
     {
       string prefs = Gregorian_ligature::prefixes_to_str (primitive);
-      primitive->warning (_f ("ignored prefix (es) `%s' of this head according "
-                             "to restrictions of the selected ligature style",
+      primitive->warning (_f ("ignored prefix(es) `%s' of this head"
+                             " according to restrictions of the selected"
+                             " ligature style",
                              prefs.c_str ()));
     }
 }
@@ -451,9 +463,9 @@ Vaticana_ligature_engraver::check_for_ambiguous_dot_pitch (Grob_info primitive)
       if (pitch == new_pitch)
        {
          primitive.grob ()->
-           warning ("Ambiguous use of dots in ligature: there are "
-                    "multiple dotted notes with the same pitch.  "
-                    "The ligature should be split.");
+           warning ("Ambiguous use of dots in ligature: there are"
+                    " multiple dotted notes with the same pitch."
+                    "  The ligature should be split.");
          return; // supress multiple identical warnings
        }
     }
@@ -509,10 +521,10 @@ Vaticana_ligature_engraver::transform_heads (Spanner *ligature,
        }
       else if (augmented_primitives_.size () > 0)
        {
-         primitive->warning ("This ligature has a dotted head followed by "
-                             "a non-dotted head.  The ligature should be "
-                             "split after the last dotted head before "
-                             "this head.");
+         primitive->warning ("This ligature has a dotted head followed by"
+                             " a non-dotted head.  The ligature should be"
+                             " split after the last dotted head before"
+                             " this head.");
        }
 
       if (is_stacked_head (prefix_set, context_info))
@@ -721,8 +733,8 @@ Vaticana_ligature_engraver::transform_heads (Spanner *ligature,
      voices/staves also may want to set this property. */
   Item *first_primitive = dynamic_cast<Item *> (primitives[0].grob ());
   Paper_column *paper_column = first_primitive->get_column ();
-  paper_column->warning (_f ("Vaticana_ligature_engraver: "
-                            "setting `spacing-increment = %f': ptr =%ul",
+  paper_column->warning (_f ("Vaticana_ligature_engraver:"
+                            " setting `spacing-increment = %f': ptr =%ul",
                             ligature_width, paper_column));
   paper_column->
     set_property ("forced-spacing", scm_from_double (ligature_width));
@@ -730,10 +742,11 @@ Vaticana_ligature_engraver::transform_heads (Spanner *ligature,
 }
 
 ADD_ACKNOWLEDGER (Vaticana_ligature_engraver, rest);
-ADD_ACKNOWLEDGER (Vaticana_ligature_engraver, note_head);
+ADD_ACKNOWLEDGER (Vaticana_ligature_engraver, ligature_head);
 ADD_TRANSLATOR (Vaticana_ligature_engraver,
                /* doc */
-               "Handle ligatures by glueing special ligature heads together.",
+               "Handle ligatures by glueing special ligature heads"
+               " together.",
 
                /* create */
                "VaticanaLigature "