Run `make grand-replace'.

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

diff --git a/lily/vaticana-ligature.cc b/lily/vaticana-ligature.cc
index d8e8b03e2d13b9ccf6e9af81fab1996d08b7543a..4995aad2f04ddd0b8920c57789f36516f66bf5fd 100644 (file)
--- a/lily/vaticana-ligature.cc
+++ b/lily/vaticana-ligature.cc
@@ -3,20 +3,19 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2003--2005 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2003--2008 Juergen Reuter <reuter@ipd.uka.de>
 */
 
 #include "vaticana-ligature.hh"
 
-#include <math.h>
-
-#include "item.hh"
+#include "bezier.hh"
 #include "font-interface.hh"
+#include "international.hh"
+#include "item.hh"
 #include "lookup.hh"
-#include "staff-symbol-referencer.hh"
 #include "note-head.hh"
 #include "output-def.hh"
-#include "bezier.hh"
+#include "staff-symbol-referencer.hh"
 #include "warn.hh"
 
 Stencil
@@ -26,7 +25,7 @@ vaticana_brew_cauda (Grob *me,
                     Real thickness,
                     Real blotdiameter)
 {
-  bool on_staffline = Staff_symbol_referencer::on_staffline (me, pos);
+  bool on_staffline = Staff_symbol_referencer::on_line (me, pos);
   int interspaces = Staff_symbol_referencer::line_count (me) - 1;
   bool above_staff = pos > interspaces;
 
@@ -78,20 +77,16 @@ vaticana_brew_flexa (Grob *me,
   Real interval;
   SCM flexa_height_scm = me->get_property ("flexa-height");
   if (flexa_height_scm != SCM_EOL)
-    {
-      interval = scm_to_int (flexa_height_scm);
-    }
+    interval = scm_to_int (flexa_height_scm);
   else
     {
       me->warning ("Vaticana_ligature: "
-                  "flexa-height undefined; assuming 0");
+                  + _ ("flexa-height undefined; assuming 0"));
       interval = 0.0;
     }
 
   if (interval >= 0.0)
-    {
-      me->warning (_ ("ascending vaticana style flexa"));
-    }
+    me->warning (_ ("ascending vaticana style flexa"));
 
   Real width = robust_scm2double (me->get_property ("flexa-width"), 2);
 
@@ -107,9 +102,9 @@ vaticana_brew_flexa (Grob *me,
    * Compensate optical illusion regarding vertical position of left
    * and right endings due to curved shape.
    */
-  Real ypos_correction = -0.1*staff_space * sign (interval);
-  Real interval_correction = 0.2*staff_space * sign (interval);
-  Real corrected_interval = interval*staff_space + interval_correction;
+  Real ypos_correction = -0.1 * staff_space * sign (interval);
+  Real interval_correction = 0.2 * staff_space * sign (interval);
+  Real corrected_interval = interval * staff_space + interval_correction;
 
   /*
    * middle curve of flexa shape
@@ -123,7 +118,7 @@ vaticana_brew_flexa (Grob *me,
   Bezier top_curve = curve, bottom_curve = curve;
   for (int i = 0; i < 4; i++)
     {
-      Real curve_thickness = 0.33 * ((3 - i)*left_height + i*right_height);
+      Real curve_thickness = 0.33 * ((3 - i) * left_height + i * right_height);
       top_curve.control_[i] += Offset (0, 0.5 * curve_thickness);
       bottom_curve.control_[i] -= Offset (0, 0.5 * curve_thickness);
     }
@@ -157,12 +152,12 @@ vaticana_brew_flexa (Grob *me,
        * the left end of the bezier curve.
        */
       Box left_edge_box (Interval (0, line_thickness),
-                        Interval (-0.5*left_height, +0.5*left_height));
+                        Interval (-0.5 * left_height, +0.5 * left_height));
       Stencil left_edge = Lookup::filled_box (left_edge_box);
       stencil.add_stencil (left_edge);
 
       Box right_edge_box (Interval (-line_thickness, 0),
-                         Interval (-0.5*right_height, +0.5*right_height));
+                         Interval (-0.5 * right_height, +0.5 * right_height));
       Stencil right_edge = Lookup::filled_box (right_edge_box);
       right_edge.translate_axis (width, X_AXIS);
       right_edge.translate_axis (corrected_interval / 2.0, Y_AXIS);
@@ -179,13 +174,13 @@ vaticana_brew_join (Grob *me, int delta_pitch,
   Real staff_space = Staff_symbol_referencer::staff_space (me);
   if (!delta_pitch)
     {
-      me->programming_error (_f ("Vaticana_ligature: "
-                                "zero join (delta_pitch == 0)"));
-      return Stencil ();
+      me->programming_error (_ ("Vaticana_ligature: "
+                               "zero join (delta_pitch == 0)"));
+      return Lookup::blank (Box (Interval (0, 0), Interval (0, 0)));
     }
   Interval x_extent = Interval (0, join_thickness);
-  Interval y_extent = (delta_pitch > 0) ?
-    Interval (0, delta_pitch * 0.5 * staff_space) : // ascending join
+  Interval y_extent = (delta_pitch > 0)
+    ? Interval (0, delta_pitch * 0.5 * staff_space) : // ascending join
     Interval (delta_pitch * 0.5 * staff_space, 0); // descending join
   Box join_box (x_extent, y_extent);
   return Lookup::round_filled_box (join_box, blotdiameter);
@@ -199,23 +194,23 @@ vaticana_brew_primitive (Grob *me)
     {
       me->programming_error ("Vaticana_ligature: "
                             "undefined glyph-name -> ignoring grob");
-      return Stencil ();
+      return Lookup::blank (Box (Interval (0, 0), Interval (0, 0)));
     }
 
-  String glyph_name = ly_scm2string (glyph_name_scm);
+  string glyph_name = ly_scm2string (glyph_name_scm);
 
   Stencil out;
   Real thickness = robust_scm2double (me->get_property ("thickness"), 1);
 
   Real line_thickness
-    = thickness * me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+    = thickness * me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
 
   Real blotdiameter
-    = (me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter")));
+    = (me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter")));
 
   int pos = Staff_symbol_referencer::get_rounded_position (me);
 
-  SCM delta_pitch_scm = me->get_property ("delta-pitch");
+  SCM delta_pitch_scm = me->get_property ("delta-position");
   int delta_pitch;
   if (delta_pitch_scm != SCM_EOL)
     delta_pitch = scm_to_int (delta_pitch_scm);
@@ -228,7 +223,7 @@ vaticana_brew_primitive (Grob *me)
   bool add_cauda = to_boolean (me->get_property ("add-cauda"));
   bool add_join = to_boolean (me->get_property ("add-join"));
 
-  if (!String::compare (glyph_name, ""))
+  if (glyph_name == "")
     {
       /*
        * This is an empty head.  This typically applies for the right
@@ -238,19 +233,17 @@ vaticana_brew_primitive (Grob *me)
        * flexa_width.)
        */
       Real staff_space = Staff_symbol_referencer::staff_space (me);
-      Real flexa_width = robust_scm2double (me->get_property ("flexa-width"), 2) *staff_space;
+      Real flexa_width = robust_scm2double (me->get_property ("flexa-width"), 2) * staff_space;
       out
-       = Lookup::blank (Box (Interval (0, 0.5*flexa_width), Interval (0, 0)));
-    }
-  else if (!String::compare (glyph_name, "flexa"))
-    {
-      out = vaticana_brew_flexa (me, true, line_thickness);
+       = Lookup::blank (Box (Interval (0, 0.5 * flexa_width), Interval (0, 0)));
     }
+  else if (glyph_name == "flexa")
+    out = vaticana_brew_flexa (me, true, line_thickness);
   else
     {
       out
        = Font_interface::get_default_font (me)->
-       find_by_name ("noteheads." + glyph_name);
+       find_by_name ("noteheads.s" + glyph_name);
     }
   out.translate_axis (x_offset, X_AXIS);
   Real head_width = out.extent (X_AXIS).length ();
@@ -299,8 +292,17 @@ Vaticana_ligature::print (SCM)
   return SCM_EOL;
 }
 
-ADD_INTERFACE (Vaticana_ligature, "vaticana-ligature-interface",
-              "A vaticana style gregorian ligature",
-              "glyph-name flexa-height flexa-width thickness add-cauda "
-              "add-stem add-join delta-pitch x-offset "
-              "ligature-primitive-callback");
+ADD_INTERFACE (Vaticana_ligature,
+              "A vaticana style Gregorian ligature.",
+
+              /* properties */
+              "glyph-name "
+              "flexa-height "
+              "flexa-width "
+              "thickness "
+              "add-cauda "
+              "add-stem "
+              "add-join "
+              "delta-position "
+              "x-offset "
+              );