*** empty log message ***

[lilypond.git] / lily / arpeggio.cc

diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc
index dcf1a03dac2098dfd0c39ebf68bc0247267ae394..70177a758469d80d4f105aeb27a460ad974471b5 100644 (file)
--- a/lily/arpeggio.cc
+++ b/lily/arpeggio.cc
@@ -1,9 +1,9 @@
 /*   
-  arpegggio.cc -- implement Arpeggio
+  arpeggio.cc -- implement Arpeggio
 
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2003 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "molecule.hh"
@@ -15,12 +15,8 @@
 #include "staff-symbol.hh"
 #include "warn.hh"
 #include "font-interface.hh"
+#include "lookup.hh"
 
-bool
-Arpeggio::has_interface (Grob* me)
-{
-  return me && me->has_interface (ly_symbol2scm ("arpeggio-interface"));
-}
 
 MAKE_SCHEME_CALLBACK (Arpeggio, brew_molecule, 1);
 SCM 
@@ -32,7 +28,7 @@ Arpeggio::brew_molecule (SCM smob)
   for (SCM s = me->get_grob_property ("stems"); gh_pair_p (s); s = ly_cdr (s))
     {
       Grob * stem =  unsmob_grob (ly_car (s));
-      common =  common->common_refpoint (Staff_symbol_referencer::staff_symbol_l (stem),
+      common =  common->common_refpoint (Staff_symbol_referencer::get_staff_symbol (stem),
                                 Y_AXIS);
     }
 
@@ -50,7 +46,7 @@ Arpeggio::brew_molecule (SCM smob)
   for (SCM s = me->get_grob_property ("stems"); gh_pair_p (s); s = ly_cdr (s))
     {
       Grob * stem = unsmob_grob (ly_car (s));
-      Grob * ss = Staff_symbol_referencer::staff_symbol_l (stem);
+      Grob * ss = Staff_symbol_referencer::get_staff_symbol (stem);
       Interval iv =Stem::head_positions (stem);
       iv *= Staff_symbol::staff_space (ss)/2.0;
       
@@ -82,17 +78,63 @@ Arpeggio::brew_molecule (SCM smob)
   Real y = heads[LEFT];
   while (y < heads[RIGHT] - arrow_space)
     {
-      mol.add_at_edge (Y_AXIS, UP,squiggle, 0.0);
+      mol.add_at_edge (Y_AXIS, UP,squiggle, 0.0, 0);
       y+= squiggle. extent (Y_AXIS).length ();
     }
   mol.translate_axis (heads[LEFT], Y_AXIS);
   if (dir)
     mol.add_at_edge (Y_AXIS, dir,
-                    fm->find_by_name ("scripts-arpeggio-arrow-" + to_str (dir)), 0.0);
+                    fm->find_by_name ("scripts-arpeggio-arrow-" + to_string (dir)), 0.0, 0);
   
   return mol.smobbed_copy () ;
 }
 
+/* Draws a vertical bracket to the left of a chord 
+   Chris Jackson <chris@fluffhouse.org.uk> */
+
+MAKE_SCHEME_CALLBACK (Arpeggio, brew_chord_bracket, 1);
+SCM 
+Arpeggio::brew_chord_bracket (SCM smob) 
+{
+  Grob *me = unsmob_grob (smob);
+  
+  Grob * common = me;
+  for (SCM s = me->get_grob_property ("stems"); gh_pair_p (s); s = ly_cdr (s))
+    {
+      Grob * stem =  unsmob_grob (ly_car (s));
+      common =  common->common_refpoint (Staff_symbol_referencer::get_staff_symbol (stem),
+                                Y_AXIS);
+    }
+
+  Interval heads;
+  Real my_y = me->relative_coordinate (common, Y_AXIS);
+      
+  for (SCM s = me->get_grob_property ("stems"); gh_pair_p (s); s = ly_cdr (s))
+    {
+      Grob * stem = unsmob_grob (ly_car (s));
+      Grob * ss = Staff_symbol_referencer::get_staff_symbol (stem);
+      Interval iv = Stem::head_positions (stem);
+      iv *= Staff_symbol::staff_space (ss)/2.0;      
+      heads.unite (iv  +  ss->relative_coordinate (common, Y_AXIS)  -  my_y);
+    }
+
+  Real lt =  me->get_paper ()->get_var ("linethickness");
+  Real sp = 1.5 * Staff_symbol_referencer::staff_space (me);
+  Real dy = heads.length() + sp;
+  Real x = 0.7;
+
+  Molecule l1     = Lookup::line (lt, Offset(0, 0),  Offset (0, dy));
+  Molecule bottom = Lookup::line (lt, Offset(0, 0),  Offset (x, 0));
+  Molecule top    = Lookup::line (lt, Offset(0, dy), Offset (x, dy));
+  Molecule mol;
+  mol.add_molecule (l1);
+  mol.add_molecule (bottom);
+  mol.add_molecule (top);
+  mol.translate_axis (heads[LEFT] - sp/2.0, Y_AXIS);
+  return mol.smobbed_copy();
+}
+
+
 /*
   We have to do a callback, because brew_molecule () triggers a
   vertical alignment if it is cross-staff.