X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbreathing-sign.cc;h=a4180549fff48d0ccf3b4862ea0c21088ccb1b5b;hb=d12d721e46d077c3e9557567f84c0eb401fc277a;hp=4810dec72ef05f24311c7ea4bf71d3fa3a4fc268;hpb=f988425624a6f6d1a48aea0ac0c1c84ff0857e56;p=lilypond.git

diff --git a/lily/breathing-sign.cc b/lily/breathing-sign.cc
index 4810dec72e..a4180549ff 100644
--- a/lily/breathing-sign.cc
+++ b/lily/breathing-sign.cc
@@ -1,62 +1,195 @@
 /*
   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
 */
 
 #include "staff-symbol-referencer.hh"
 #include "directional-element-interface.hh"
 #include "breathing-sign.hh"
 #include "string.hh"
-#include "molecule.hh"
+#include "stencil.hh"
 #include "paper-def.hh"
 #include "lookup.hh"
-#include "debug.hh"
+
 #include "dimensions.hh"
 #include "direction.hh"
+#include "text-item.hh"
+#include "font-interface.hh"
+
+/*
+  TODO: thickness should be a grob property (unit: linethickness)
+ rather than hardwired to (staff_space / 6).
+ */
+
+  
+
+/*
+  UGH : this is full of C&P code. Consolidate!  --hwn
+*/
+
+/*
+  Gregorian chant divisio minima.  (Actually, this was the original
+  breathing sign by Michael. -- jr)
+ */
+MAKE_SCHEME_CALLBACK (Breathing_sign,divisio_minima,1);
+SCM 
+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 = 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;
+    }
+  else
+    staff_size = 0.0;
 
+  Real blotdiameter = me->get_paper ()->get_realvar (ly_symbol2scm ("blotdiameter"));
 
-MAKE_SCHEME_CALLBACK(Breathing_sign,brew_molecule);
+  /*
+   * Draw a small vertical line through the uppermost (or, depending
+   * on direction, lowermost) staff line.
+   */
+  Interval xdim (0, thickness);
+  Interval ydim (-0.5 * staff_space, +0.5 * staff_space);
+  Box b (xdim, ydim);
+  Stencil out = Lookup::round_filled_box (b, blotdiameter);
+  return out.smobbed_copy ();
+}
 
+/*
+  Gregorian chant divisio maior.
+ */
+MAKE_SCHEME_CALLBACK (Breathing_sign,divisio_maior,1);
 SCM 
-Breathing_sign::brew_molecule (SCM smob)
+Breathing_sign::divisio_maior (SCM smob)
 {
-  Score_element * me = unsmob_element (smob);
-  Real space = Staff_symbol_referencer::staff_space (me);
+  Grob *me = unsmob_grob (smob);
+  Real staff_space = Staff_symbol_referencer::staff_space (me);
+  Real staff_size;
+  Real thickness = Staff_symbol_referencer::line_thickness (me);
+  thickness *= robust_scm2double (me->get_grob_property ("thickness"), 1.0);
 
-  // todo: cfg'able.
-  Interval i1(0, space / 6), i2(-space / 2, space / 2);
-  Box b(i1, i2);
+  if (Staff_symbol_referencer::get_staff_symbol (me))
+    {
+      staff_size = (Staff_symbol_referencer::line_count (me) - 1) * staff_space;
+    }
+  else
+    staff_size = 0.0;
+
+  Real blotdiameter = me->get_paper ()->get_realvar (ly_symbol2scm ("blotdiameter"));
+
+  /*
+   * Draw a vertical line that is vertically centered in the staff
+   * (just like a bar).  The height of this line should be a little
+   * more than half the size of the staff, such that the endings of
+   * the line are in the middle of a staff space.
+   */
+  int lines = Staff_symbol_referencer::line_count (me);
+  int height = lines / 2; // little more than half of staff size
+  if ((lines & 1) != (height & 1))
+    height++; // ensure endings are centered in staff space
 
-  return me->lookup_l()->filledbox(b).create_scheme ();
+  Interval xdim (0, thickness);
+  Interval ydim (-0.5 * height, +0.5 * height);
+  Box b (xdim, ydim);
+  Stencil out = Lookup::round_filled_box (b, blotdiameter);
+  return out.smobbed_copy ();
 }
 
-Real
-Breathing_sign::offset_callback (Score_element * b, Axis a)
+/*
+  Gregorian chant divisio maxima.
+ */
+MAKE_SCHEME_CALLBACK (Breathing_sign,divisio_maxima,1);
+SCM 
+Breathing_sign::divisio_maxima (SCM smob)
 {
-  Score_element * me = (Score_element*)b;
+  Grob *me = unsmob_grob (smob);
+  Real staff_space = Staff_symbol_referencer::staff_space (me);
+  Real staff_size;
+  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;
+    }
+  else
+    staff_size = 0.0;
+
+  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);
+  Stencil out = Lookup::round_filled_box (b, blotdiameter);
+  return out.smobbed_copy ();
+}
+
+/*
+  Gregorian chant finalis.
+ */
+MAKE_SCHEME_CALLBACK (Breathing_sign,finalis,1);
+SCM 
+Breathing_sign::finalis (SCM smob)
+{
+  Grob *me = unsmob_grob (smob);
+  Real staff_space = Staff_symbol_referencer::staff_space (me);
+  Real staff_size;
+  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;
+    }
+  else
+    staff_size = 0.0;
+
+  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);
+  Stencil line1 = Lookup::round_filled_box (b, blotdiameter);
+  Stencil line2 (line1);
+  line2.translate_axis (0.5 * staff_space, X_AXIS);
+  line1.add_stencil (line2);
+
+  return line1.smobbed_copy ();
+}
+
+MAKE_SCHEME_CALLBACK (Breathing_sign,offset_callback,2);
+SCM
+Breathing_sign::offset_callback (SCM element_smob, SCM)
+{
+  Grob *me = unsmob_grob (element_smob);
   
-  Direction d = Directional_element_interface::get (b);
+  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;
   int sz = Staff_symbol_referencer::line_count (me)-1;
-  return inter_f * sz * d;
+  return gh_double2scm (inter_f * sz * d);
 }
 
-void
-Breathing_sign::set_interface (Score_element *b)
-{
-  Staff_symbol_referencer::set_interface  (b);
-  b->add_offset_callback (Breathing_sign::offset_callback,Y_AXIS); 
-}
+ADD_INTERFACE(Breathing_sign, "breathing-sign-interface",
+	      "A breathing sign.",
+	      "direction");