2003 -> 2004

[lilypond.git] / lily / breathing-sign.cc

diff --git a/lily/breathing-sign.cc b/lily/breathing-sign.cc
index 9f7a33f0cfdc6617f92fecb9b41d02a6945a65e6..8805654b1941bf6d139a3b7245a3cb1a1ced40c1 100644 (file)
--- a/lily/breathing-sign.cc
+++ b/lily/breathing-sign.cc
@@ -1,13 +1,13 @@
 /*
   breathing_sign.cc -- implement Breathing_sign
 
-  Copyright (C) 1999 Michael Krause
+  (c) 1999--2004 Michael Krause
 
   written for the GNU LilyPond music typesetter
 
   TODO: --> see breathing-sign-engraver.cc
 
-  Extensions for ancient notation (C) 2003 by Juergen Reuter
+  Extensions for ancient notation (c) 2003 by Juergen Reuter
 */
 
 #include "staff-symbol-referencer.hh"
@@ -24,54 +24,15 @@
 #include "font-interface.hh"
 
 /*
- * TODO: thickness should be a grob property (unit:
- * stafflinethickness) rather than hardwired to (staff_space / 6).
+  TODO: thickness should be a grob property (unit: linethickness)
+ rather than hardwired to (staff_space / 6).
  */
 
-MAKE_SCHEME_CALLBACK (Breathing_sign,brew_molecule,1);
-SCM 
-Breathing_sign::brew_molecule (SCM smob)
-{
-  Grob *me = unsmob_grob (smob);
-  SCM text = me->get_grob_property ("text");
-  if (text == SCM_EOL)
-    return divisio_minima (smob);
-  SCM properties = Font_interface::font_alist_chain (me);
-  Molecule out;
-  out = Text_item::text2molecule (me, text, properties);
-  SCM space_scm = me->get_grob_property ("word-space");
-  if (gh_number_p (space_scm))
-    {
-      Molecule mol;
-      mol.set_empty (false);
-      out.add_at_edge (X_AXIS, RIGHT, mol, gh_scm2double (space_scm) *
-                      Staff_symbol_referencer::staff_space (me), 0);
-    }
-  return out.smobbed_copy ();
-}
+  
 
 /*
-  Simplistic caesura.
- */
-MAKE_SCHEME_CALLBACK (Breathing_sign,railtracks,1);
-SCM 
-Breathing_sign::railtracks (SCM smob)
-{
-  Grob * me = unsmob_grob (smob);
-  Real space = Staff_symbol_referencer::staff_space (me);
-  Real th = me->get_paper ()->get_var ("linethickness");
-  SCM lt =  me->get_grob_property ("thickness");
-  if (gh_number_p (lt))
-    th *= gh_scm2double (lt);
-  
-  Offset x1 (0, -space);
-  Offset x2 (space / 3, space);
-  Molecule l1 (Lookup::line (th, x1, x2));
-  Molecule l2 (l1);
-  l2.translate_axis (space *0.6 , X_AXIS);
-  l1.add_molecule (l2);
-  return l1.smobbed_copy();
-}
+  UGH : this is full of C&P code. Consolidate!  --hwn
+*/
 
 /*
   Gregorian chant divisio minima.  (Actually, this was the original
@@ -84,10 +45,9 @@ Breathing_sign::divisio_minima (SCM smob)
   Grob *me = unsmob_grob (smob);
   Real staff_space = Staff_symbol_referencer::staff_space (me);
   Real staff_size;
-  Real thickness = me->get_paper ()->get_var ("linethickness");
-  SCM lt =  me->get_grob_property ("thickness");
-  if (gh_number_p (lt))
-    thickness *= gh_scm2double (lt);
+
+  Real thickness = Staff_symbol_referencer::line_thickness (me);
+  thickness *= robust_scm2double (me->get_grob_property ("thickness"), 1.0);
   if (Staff_symbol_referencer::get_staff_symbol (me))
     {
       staff_size = (Staff_symbol_referencer::line_count (me) - 1) * staff_space;
@@ -95,7 +55,7 @@ Breathing_sign::divisio_minima (SCM smob)
   else
     staff_size = 0.0;
 
-  Real blotdiameter = me->get_paper ()->get_var ("blotdiameter");
+  Real blotdiameter = me->get_paper ()->get_realvar (ly_symbol2scm ("blotdiameter"));
 
   /*
    * Draw a small vertical line through the uppermost (or, depending
@@ -104,7 +64,7 @@ Breathing_sign::divisio_minima (SCM smob)
   Interval xdim (0, thickness);
   Interval ydim (-0.5 * staff_space, +0.5 * staff_space);
   Box b (xdim, ydim);
-  Molecule out = Lookup::roundfilledbox (b, blotdiameter);
+  Molecule out = Lookup::round_filled_box (b, blotdiameter);
   return out.smobbed_copy ();
 }
 
@@ -118,10 +78,9 @@ Breathing_sign::divisio_maior (SCM smob)
   Grob *me = unsmob_grob (smob);
   Real staff_space = Staff_symbol_referencer::staff_space (me);
   Real staff_size;
-  Real thickness = me->get_paper ()->get_var ("linethickness");
-  SCM lt =  me->get_grob_property ("thickness");
-  if (gh_number_p (lt))
-    thickness *= gh_scm2double (lt);
+  Real thickness = Staff_symbol_referencer::line_thickness (me);
+  thickness *= robust_scm2double (me->get_grob_property ("thickness"), 1.0);
+
   if (Staff_symbol_referencer::get_staff_symbol (me))
     {
       staff_size = (Staff_symbol_referencer::line_count (me) - 1) * staff_space;
@@ -129,7 +88,7 @@ Breathing_sign::divisio_maior (SCM smob)
   else
     staff_size = 0.0;
 
-  Real blotdiameter = me->get_paper ()->get_var ("blotdiameter");
+  Real blotdiameter = me->get_paper ()->get_realvar (ly_symbol2scm ("blotdiameter"));
 
   /*
    * Draw a vertical line that is vertically centered in the staff
@@ -145,7 +104,7 @@ Breathing_sign::divisio_maior (SCM smob)
   Interval xdim (0, thickness);
   Interval ydim (-0.5 * height, +0.5 * height);
   Box b (xdim, ydim);
-  Molecule out = Lookup::roundfilledbox (b, blotdiameter);
+  Molecule out = Lookup::round_filled_box (b, blotdiameter);
   return out.smobbed_copy ();
 }
 
@@ -159,10 +118,9 @@ Breathing_sign::divisio_maxima (SCM smob)
   Grob *me = unsmob_grob (smob);
   Real staff_space = Staff_symbol_referencer::staff_space (me);
   Real staff_size;
-  Real thickness = me->get_paper ()->get_var ("linethickness");
-  SCM lt =  me->get_grob_property ("thickness");
-  if (gh_number_p (lt))
-    thickness *= gh_scm2double (lt);
+  Real thickness = Staff_symbol_referencer::line_thickness (me);
+  thickness *= robust_scm2double (me->get_grob_property ("thickness"), 1.0);
+
   if (Staff_symbol_referencer::get_staff_symbol (me))
     {
       staff_size = (Staff_symbol_referencer::line_count (me) - 1) * staff_space;
@@ -170,13 +128,13 @@ Breathing_sign::divisio_maxima (SCM smob)
   else
     staff_size = 0.0;
 
-  Real blotdiameter = me->get_paper ()->get_var ("blotdiameter");
+  Real blotdiameter = me->get_paper ()->get_realvar (ly_symbol2scm ("blotdiameter"));
 
   // like a "|" type bar
   Interval xdim (0, thickness);
   Interval ydim (-0.5 * staff_size, +0.5 * staff_size);
   Box b (xdim, ydim);
-  Molecule out = Lookup::roundfilledbox (b, blotdiameter);
+  Molecule out = Lookup::round_filled_box (b, blotdiameter);
   return out.smobbed_copy ();
 }
 
@@ -190,10 +148,9 @@ Breathing_sign::finalis (SCM smob)
   Grob *me = unsmob_grob (smob);
   Real staff_space = Staff_symbol_referencer::staff_space (me);
   Real staff_size;
-  Real thickness = me->get_paper ()->get_var ("linethickness");
-  SCM lt =  me->get_grob_property ("thickness");
-  if (gh_number_p (lt))
-    thickness *= gh_scm2double (lt);
+  Real thickness = Staff_symbol_referencer::line_thickness (me);
+  thickness *= robust_scm2double (me->get_grob_property ("thickness"), 1.0);
+
   if (Staff_symbol_referencer::get_staff_symbol (me))
     {
       staff_size = (Staff_symbol_referencer::line_count (me) - 1) * staff_space;
@@ -201,13 +158,13 @@ Breathing_sign::finalis (SCM smob)
   else
     staff_size = 0.0;
 
-  Real blotdiameter = me->get_paper ()->get_var ("blotdiameter");
+  Real blotdiameter = me->get_paper ()->get_realvar (ly_symbol2scm ("blotdiameter"));
 
   // like a "||" type bar
   Interval xdim (0, thickness);
   Interval ydim (-0.5 * staff_size, +0.5 * staff_size);
   Box b (xdim, ydim);
-  Molecule line1 = Lookup::roundfilledbox (b, blotdiameter);
+  Molecule line1 = Lookup::round_filled_box (b, blotdiameter);
   Molecule line2 (line1);
   line2.translate_axis (0.5 * staff_space, X_AXIS);
   line1.add_molecule (line2);
@@ -221,11 +178,11 @@ Breathing_sign::offset_callback (SCM element_smob, SCM)
 {
   Grob *me = unsmob_grob (element_smob);
   
-  Direction d = Directional_element_interface::get (me);
+  Direction d = get_grob_direction (me);
   if (!d)
     {
       d = UP;
-      Directional_element_interface::set (me, d);
+      set_grob_direction (me, d);
     }
 
   Real inter_f = Staff_symbol_referencer::staff_space (me)/2;