Merge branch 'master' of git://git.sv.gnu.org/lilypond

[lilypond.git] / lily / bar-line.cc

diff --git a/lily/bar-line.cc b/lily/bar-line.cc
index 48b9c4715da6e4e09631bb7b873812b82e123ddc..800c138c9362e2231ee570497e3245a4e8e5ee41 100644 (file)
--- a/lily/bar-line.cc
+++ b/lily/bar-line.cc
@@ -16,6 +16,30 @@
 #include "staff-symbol-referencer.hh"
 #include "line-interface.hh"
 
+MAKE_SCHEME_CALLBACK (Bar_line, calc_bar_extent, 1)
+SCM
+Bar_line::calc_bar_extent (SCM smob)
+{
+  Grob *me = unsmob_grob (smob);
+
+  SCM size = me->get_property ("bar-size");
+
+  if (!scm_is_number (size))
+    return ly_interval2scm (Interval ());
+
+  Real h = scm_to_double (size);
+  return ly_interval2scm (Interval (-h/2, h/2));
+}
+
+Interval
+Bar_line::bar_y_extent (Grob *me, Grob *refpoint)
+{
+  Interval iv = robust_scm2interval (me->get_property ("bar-extent"), Interval ());
+
+  iv.translate (me->relative_coordinate (refpoint, Y_AXIS));
+  return iv;
+}
+
 MAKE_SCHEME_CALLBACK (Bar_line, print, 1);
 SCM
 Bar_line::print (SCM smob)
@@ -292,6 +316,7 @@ ADD_INTERFACE (Bar_line,
 
 
               /* properties */
+              "allow-span-bar "
               "gap "
               "kern "
               "thin-kern "
@@ -300,6 +325,7 @@ ADD_INTERFACE (Bar_line,
               "glyph "
               "glyph-name "
               "bar-size "
+              "bar-extent "
               );