X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Farpeggio.cc;h=ad0ca353e1b8adb9d6532ef7e8bab4a8778c5d16;hb=95e91ffb8d0d82efbda9d266c63d4ccf0bcc5133;hp=5b0e755577b254f27b611484f4a51ef5ceb56732;hpb=f68bbd7a1ed1b0e7146bbbffcbcbb7f9c9bda3cc;p=lilypond.git

diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc
index 5b0e755577..ad0ca353e1 100644
--- a/lily/arpeggio.cc
+++ b/lily/arpeggio.cc
@@ -1,13 +1,13 @@
 /*   
-  arpegggio.cc -- implement Arpeggio
+  arpeggio.cc -- implement Arpeggio
 
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2004 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
-#include "molecule.hh"
-#include "paper-def.hh"
+#include "stencil.hh"
+#include "output-def.hh"
 #include "arpeggio.hh"
 #include "grob.hh"
 #include "stem.hh"
@@ -15,24 +15,20 @@
 #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);
+MAKE_SCHEME_CALLBACK (Arpeggio, print, 1);
 SCM 
-Arpeggio::brew_molecule (SCM smob) 
+Arpeggio::print (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))
+  for (SCM s = me->get_property ("stems"); ly_c_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);
     }
 
@@ -47,10 +43,10 @@ Arpeggio::brew_molecule (SCM smob)
   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))
+  for (SCM s = me->get_property ("stems"); ly_c_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;
       
@@ -58,42 +54,104 @@ Arpeggio::brew_molecule (SCM smob)
 		   - my_y);
     }
 
-  if (heads.empty_b ())
+  if (heads.is_empty ())
     {
-      programming_error ("Huh? Dumb blonde encountered?");
       /*
-	Nee Valerie, jij bent _niet_ dom. 
+	Dumb blonde error
+
+	:-)
        */
+      programming_error ("Huh, no heads for arpeggio found.");
       return SCM_EOL;
     }
+
+  SCM ad = me->get_property ("arpeggio-direction");
+  Direction dir = CENTER;
+  if (is_direction (ad))
+    {
+      dir = to_dir (ad);
+    }
   
-  Molecule mol;
-  Molecule arpeggio = Font_interface::get_default_font (me)->find_by_name ("scripts-arpeggio");
+  Stencil mol;
+  Font_metric *fm =Font_interface::get_default_font (me);
+  Stencil squiggle = fm->find_by_name ("scripts-arpeggio");
 
-  Real y = heads[LEFT];
-  while (y < heads[RIGHT])
+  Stencil arrow ;  
+  if (dir)
     {
-      mol.add_at_edge (Y_AXIS, UP,arpeggio, 0.0);
-      y+= arpeggio. extent (Y_AXIS).length ();
+      arrow = fm->find_by_name ("scripts-arpeggio-arrow-" + to_string (dir));
+      heads[dir] -= dir * arrow.extent (Y_AXIS).length ();
     }
-  mol.translate_axis (heads[LEFT], Y_AXIS);
+  
+  for (Real  y= heads[LEFT] ; y < heads[RIGHT];
+       y+= squiggle. extent (Y_AXIS).length ())
+      mol.add_at_edge (Y_AXIS, UP,squiggle, 0.0, 0);
 
+  mol.translate_axis (heads[LEFT], Y_AXIS);
+  if (dir)
+    mol.add_at_edge (Y_AXIS, dir,arrow, 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_property ("stems"); ly_c_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_property ("stems"); ly_c_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_dimension (ly_symbol2scm ("linethickness"));
+  Real sp = 1.5 * Staff_symbol_referencer::staff_space (me);
+  Real dy = heads.length () + sp;
+  Real x = 0.7;
+
+  Stencil mol (Lookup::bracket (Y_AXIS, Interval (0, dy), lt, x, lt));
+  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
+  We have to do a callback, because print () triggers a
   vertical alignment if it is cross-staff.
-  This callback also adds padding.
 */
 MAKE_SCHEME_CALLBACK (Arpeggio, width_callback,2);
 SCM
 Arpeggio::width_callback (SCM smob, SCM axis)
 {
   Grob * me = unsmob_grob (smob);
-  Axis a = (Axis)gh_scm2int (axis);
+  Axis a = (Axis)ly_scm2int (axis);
   assert (a == X_AXIS);
-  Molecule arpeggio = Font_interface::get_default_font (me)->find_by_name ("scripts-arpeggio");
+  Stencil arpeggio = Font_interface::get_default_font (me)->find_by_name ("scripts-arpeggio");
 
-  return ly_interval2scm (arpeggio.extent (X_AXIS) * 1.5);
+  return ly_interval2scm (arpeggio.extent (X_AXIS));
 }
+
+
+ADD_INTERFACE (Arpeggio, "arpeggio-interface",
+  "Functions and settings for drawing an arpeggio symbol (a wavy line left to noteheads.",
+  "stems arpeggio-direction");
+