X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fvaticana-ligature-engraver.cc;h=df3a3d4ec4050e94f8f5c3dbf595ea08f734bb9c;hb=faedf68d175302e2f52de307368677e934112cc1;hp=6633341cbe5f731f7317c644c796599307e08290;hpb=b7a0cffbf9d1069860368f289a5b50e9d1d90ba8;p=lilypond.git diff --git a/lily/vaticana-ligature-engraver.cc b/lily/vaticana-ligature-engraver.cc index 6633341cbe..df3a3d4ec4 100644 --- a/lily/vaticana-ligature-engraver.cc +++ b/lily/vaticana-ligature-engraver.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2003--2009 Juergen Reuter + Copyright (C) 2003--2011 Juergen Reuter LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -205,8 +205,8 @@ Vaticana_ligature_engraver::align_heads (vector primitives, { if (!primitives.size ()) { - programming_error ("Vaticana_ligature: " - "empty ligature [ignored]"); + programming_error ("Vaticana_ligature:" + " empty ligature [ignored]"); return 0.0; } @@ -330,8 +330,8 @@ Vaticana_ligature_engraver::align_heads (vector 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 { @@ -397,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 ())); } } @@ -462,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 } } @@ -520,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)) @@ -732,8 +733,8 @@ Vaticana_ligature_engraver::transform_heads (Spanner *ligature, voices/staves also may want to set this property. */ Item *first_primitive = dynamic_cast (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)); @@ -744,7 +745,8 @@ ADD_ACKNOWLEDGER (Vaticana_ligature_engraver, rest); ADD_ACKNOWLEDGER (Vaticana_ligature_engraver, note_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 "