Imported Upstream version 2.16.0

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

diff --git a/lily/breathing-sign.cc b/lily/breathing-sign.cc
index a59bd650703fe2aafc2ea40e58b2e85492c78a6b..02b29858af1465d042c0c16d6f57c967e82f0f27 100644 (file)
--- a/lily/breathing-sign.cc
+++ b/lily/breathing-sign.cc
@@ -1,8 +1,8 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1999--2011 Michael Krause
-  Extensions for ancient notation (c) 2003--2011 by Juergen Reuter
+  Copyright (C) 1999--2012 Michael Krause
+  Extensions for ancient notation (c) 2003--2012 by Juergen Reuter
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -70,16 +70,9 @@ SCM
 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 = Staff_symbol_referencer::line_thickness (me);
   thickness *= robust_scm2double (me->get_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->layout ()->get_dimension (ly_symbol2scm ("blot-diameter"));
 
   /*
@@ -88,13 +81,19 @@ Breathing_sign::divisio_maior (SCM smob)
    * 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
+  Interval ydim = Staff_symbol_referencer::staff_span (me);
+  ydim.widen (-0.25 * ydim.delta ());
+  for (UP_and_DOWN (i))
+    {
+      int const int_dim = (int) ydim[i];
+      if (int_dim == ydim[i]
+          && Staff_symbol_referencer::on_staff_line (me, int_dim))
+        ydim[i] += i;
+    }
+
+  ydim *= 1.0 / Staff_symbol_referencer::staff_space (me);
 
   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 ();
@@ -109,20 +108,15 @@ 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 = Staff_symbol_referencer::line_thickness (me);
   thickness *= robust_scm2double (me->get_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->layout ()->get_dimension (ly_symbol2scm ("blot-diameter"));
 
   // like a "|" type bar
   Interval xdim (0, thickness);
-  Interval ydim (-0.5 * staff_size, +0.5 * staff_size);
+  Interval ydim = Staff_symbol_referencer::staff_span (me);
+  ydim *= staff_space / 2;
   Box b (xdim, ydim);
   Stencil out = Lookup::round_filled_box (b, blotdiameter);
   return out.smobbed_copy ();
@@ -137,20 +131,15 @@ 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_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->layout ()->get_dimension (ly_symbol2scm ("blot-diameter"));
 
   // like a "||" type bar
   Interval xdim (0, thickness);
-  Interval ydim (-0.5 * staff_size, +0.5 * staff_size);
+  Interval ydim = Staff_symbol_referencer::staff_span (me);
+  ydim *= staff_space / 2;
   Box b (xdim, ydim);
   Stencil line1 = Lookup::round_filled_box (b, blotdiameter);
   Stencil line2 (line1);
@@ -177,7 +166,7 @@ Breathing_sign::offset_callback (SCM smob)
   if (staff)
     {
       Interval iv = Staff_symbol::line_span (staff);
-      Real inter = Staff_symbol::staff_space (me) / 2;
+      Real inter = Staff_symbol::staff_space (staff) / 2;
       return scm_from_double (inter * iv[d]);
     }
 
@@ -185,8 +174,8 @@ Breathing_sign::offset_callback (SCM smob)
 }
 
 ADD_INTERFACE (Breathing_sign,
-              "A breathing sign.",
+               "A breathing sign.",
 
-              /* properties */
-              "direction "
-              );
+               /* properties */
+               "direction "
+              );