* lily/vaticana-ligature.cc, lily/vaticana-ligature-engraver.cc:

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

diff --git a/lily/vaticana-ligature-engraver.cc b/lily/vaticana-ligature-engraver.cc
index 72fdb41f50317e2e0e21fca5cf1307e224bc8a6d..15117f3784377e912d541d32b6fdbd3d45e390eb 100644 (file)
--- a/lily/vaticana-ligature-engraver.cc
+++ b/lily/vaticana-ligature-engraver.cc
@@ -47,6 +47,8 @@ protected:
 
 Vaticana_ligature_engraver::Vaticana_ligature_engraver ()
 {
+  brew_ligature_primitive_proc = 
+    Vaticana_ligature::brew_ligature_primitive_proc;
 }
 
 Spanner *
@@ -159,7 +161,7 @@ Vaticana_ligature_engraver::align_heads (Array<Grob_info> primitives,
     = dynamic_cast<Item *> (primitives[0].grob ())->get_column ();
 
   Real join_thickness
-    = thickness * column->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+    = thickness * column->layout ()->get_dimension (ly_symbol2scm ("linethickness"));
 
   /*
    * Amount of extra space two put between some particular
@@ -203,9 +205,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:"
@@ -234,7 +234,7 @@ Vaticana_ligature_engraver::align_heads (Array<Grob_info> primitives,
          head_width = 0.0;
          x_offset = join_thickness
            - Font_interface::get_default_font (primitive)->
-           find_by_name ("noteheads." + glyph_name).extent (X_AXIS).length ();
+           find_by_name ("noteheads.s" + glyph_name).extent (X_AXIS).length ();
        }
       else if (!String::compare (glyph_name, "flexa")
               || !String::compare (glyph_name, ""))
@@ -254,7 +254,7 @@ Vaticana_ligature_engraver::align_heads (Array<Grob_info> primitives,
           */
          head_width
            = Font_interface::get_default_font (primitive)->
-           find_by_name ("noteheads." + glyph_name).extent (X_AXIS).length ();
+           find_by_name ("noteheads.s" + glyph_name).extent (X_AXIS).length ();
          x_offset = 0.0;
        }
 
@@ -369,9 +369,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:"
@@ -401,29 +399,29 @@ Vaticana_ligature_engraver::transform_heads (Spanner *ligature,
       String glyph_name;
       if (prefix_set & VIRGA)
        {
-         glyph_name = "svaticana.punctum";
+         glyph_name = "vaticana.punctum";
          primitive->set_property ("add-stem", ly_bool2scm (true));
        }
       else if (prefix_set & QUILISMA)
-       glyph_name = "svaticana.quilisma";
+       glyph_name = "vaticana.quilisma";
       else if (prefix_set & ORISCUS)
-       glyph_name = "ssolesmes.oriscus";
+       glyph_name = "solesmes.oriscus";
       else if (prefix_set & STROPHA)
        if (prefix_set & AUCTUM)
-         glyph_name = "ssolesmes.stropha.aucta";
-       else glyph_name = "ssolesmes.stropha";
+         glyph_name = "solesmes.stropha.aucta";
+       else glyph_name = "solesmes.stropha";
       else if (prefix_set & INCLINATUM)
        if (prefix_set & AUCTUM)
-         glyph_name = "ssolesmes.incl.auctum";
+         glyph_name = "solesmes.incl.auctum";
        else if (prefix_set & DEMINUTUM)
-         glyph_name = "ssolesmes.incl.parvum";
+         glyph_name = "solesmes.incl.parvum";
        else
-         glyph_name = "svaticana.inclinatum";
+         glyph_name = "vaticana.inclinatum";
       else if (prefix_set & DEMINUTUM)
        if (i == 0)
          {
            // initio debilis
-           glyph_name = "svaticana.reverse.plica";
+           glyph_name = "vaticana.reverse.plica";
          }
        else if (prev_delta_pitch > 0)
          {
@@ -431,15 +429,13 @@ Vaticana_ligature_engraver::transform_heads (Spanner *ligature,
            if (! (prev_context_info & FLEXA_RIGHT))
              /* correct head of previous primitive */
              if (prev_delta_pitch > 1)
-               {
-                 prev_glyph_name = "svaticana.epiphonus";
-                 glyph_name = "svaticana.plica";
-               }
+               prev_glyph_name = "vaticana.epiphonus";
              else
-               {
-                 prev_glyph_name = "svaticana.vepiphonus";
-                 glyph_name = "svaticana.vplica";
-               }
+               prev_glyph_name = "vaticana.vepiphonus";
+           if (prev_delta_pitch > 1)
+             glyph_name = "vaticana.plica";
+           else
+             glyph_name = "vaticana.vplica";
          }
        else if (prev_delta_pitch < 0)
          {
@@ -450,12 +446,12 @@ Vaticana_ligature_engraver::transform_heads (Spanner *ligature,
                if (i > 1)
                  {
                    /* cephalicus head with fixed size cauda */
-                   prev_glyph_name = "svaticana.inner.cephalicus";
+                   prev_glyph_name = "vaticana.inner.cephalicus";
                  }
                else
                  {
                    /* cephalicus head without cauda */
-                   prev_glyph_name = "svaticana.cephalicus";
+                   prev_glyph_name = "vaticana.cephalicus";
                  }
 
                /*
@@ -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 = "vaticana.reverse.plica";
+           else
+             glyph_name = "vaticana.reverse.vplica";
          }
        else // (prev_delta_pitch == 0)
          {
@@ -488,24 +480,24 @@ Vaticana_ligature_engraver::transform_heads (Spanner *ligature,
          }
       else if (prefix_set & (CAVUM | LINEA))
        if ((prefix_set & CAVUM) && (prefix_set & LINEA))
-         glyph_name = "svaticana.linea.punctum.cavum";
+         glyph_name = "vaticana.linea.punctum.cavum";
        else if (prefix_set & CAVUM)
-         glyph_name = "svaticana.punctum.cavum";
+         glyph_name = "vaticana.punctum.cavum";
        else
-         glyph_name = "svaticana.linea.punctum";
+         glyph_name = "vaticana.linea.punctum";
       else if (prefix_set & AUCTUM)
        if (prefix_set & ASCENDENS)
-         glyph_name = "ssolesmes.auct.asc";
+         glyph_name = "solesmes.auct.asc";
        else
-         glyph_name = "ssolesmes.auct.desc";
+         glyph_name = "solesmes.auct.desc";
       else if ((context_info & STACKED_HEAD)
               && (context_info & PES_UPPER))
        if (prev_delta_pitch > 1)
-         glyph_name = "svaticana.upes";
+         glyph_name = "vaticana.upes";
        else
-         glyph_name = "svaticana.vupes";
+         glyph_name = "vaticana.vupes";
       else
-       glyph_name = "svaticana.punctum";
+       glyph_name = "vaticana.punctum";
 
       /*
        * This head needs a cauda, if it starts a flexa, is not the upper
@@ -553,9 +545,9 @@ Vaticana_ligature_engraver::transform_heads (Spanner *ligature,
            {
              if (!String::compare (prev_glyph_name, "svaticana.punctum"))
                if (prev_delta_pitch > 1)
-                 prev_glyph_name = "svaticana.lpes";
+                 prev_glyph_name = "vaticana.lpes";
                else
-                 prev_glyph_name = "svaticana.vlpes";
+                 prev_glyph_name = "vaticana.vlpes";
            }
        }
 
@@ -596,11 +588,11 @@ Vaticana_ligature_engraver::transform_heads (Spanner *ligature,
 #endif
 }
 
-ADD_ACKNOWLEDGER(Vaticana_ligature_engraver, rest);
-ADD_ACKNOWLEDGER(Vaticana_ligature_engraver, note_head);
+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 */ "");