* lily/midi-item.cc (name): new method.

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

diff --git a/lily/vaticana-ligature-engraver.cc b/lily/vaticana-ligature-engraver.cc
index f24aa902089d6e1b82a93a7fcfa012cd04bd5162..7819fb380dd1187e484b54ab17dd07a5714ca8b5 100644 (file)
--- a/lily/vaticana-ligature-engraver.cc
+++ b/lily/vaticana-ligature-engraver.cc
@@ -203,9 +203,7 @@ Vaticana_ligature_engraver::align_heads (Array<Grob_info> primitives,
        {
          SCM delta_pitch_scm = prev_primitive->get_property ("delta-pitch");
          if (delta_pitch_scm != SCM_EOL)
-           {
-             delta_pitch = scm_to_int (delta_pitch_scm);
-           }
+           delta_pitch = scm_to_int (delta_pitch_scm);
          else
            {
              primitive->programming_error ("Vaticana_ligature:"
@@ -369,9 +367,7 @@ Vaticana_ligature_engraver::transform_heads (Spanner *ligature,
       int delta_pitch;
       SCM delta_pitch_scm = primitive->get_property ("delta-pitch");
       if (delta_pitch_scm != SCM_EOL)
-       {
-         delta_pitch = scm_to_int (delta_pitch_scm);
-       }
+       delta_pitch = scm_to_int (delta_pitch_scm);
       else
        {
          primitive->programming_error ("Vaticana_ligature:"
@@ -471,14 +467,10 @@ Vaticana_ligature_engraver::transform_heads (Spanner *ligature,
                prev_primitive->set_property ("add-cauda",
                                              ly_bool2scm (false));
              }
-             if (prev_delta_pitch < - 1)
-               {
-                 glyph_name = "svaticana.reverse.plica";
-               }
-             else
-               {
-                 glyph_name = "svaticana.reverse.vplica";
-               }
+           if (prev_delta_pitch < - 1)
+             glyph_name = "svaticana.reverse.plica";
+           else
+             glyph_name = "svaticana.reverse.vplica";
          }
        else // (prev_delta_pitch == 0)
          {
@@ -599,8 +591,8 @@ Vaticana_ligature_engraver::transform_heads (Spanner *ligature,
 ADD_ACKNOWLEDGER (Vaticana_ligature_engraver, rest);
 ADD_ACKNOWLEDGER (Vaticana_ligature_engraver, note_head);
 ADD_TRANSLATOR (Vaticana_ligature_engraver,
-               /* descr */ "Handles ligatures by glueing special ligature heads together.",
-               /* creats*/ "VaticanaLigature",
-               /* accepts */ "ligature-event",
-               /* reads */ "",
+               /* doc */ "Handles ligatures by glueing special ligature heads together.",
+               /* create */ "VaticanaLigature",
+               /* accept */ "ligature-event",
+               /* read */ "",
                /* write */ "");