Merge branch 'master' into nested-bookparts

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

diff --git a/lily/bar-line.cc b/lily/bar-line.cc
index a0fa5587b410ef0fb22b2ea16c8f61e56249c1f3..4d2cbf9b5968b46b80f3f9c7b557379a09fde3d2 100644 (file)
--- a/lily/bar-line.cc
+++ b/lily/bar-line.cc
@@ -94,13 +94,28 @@ Bar_line::compound_barline (Grob *me, string str, Real h,
   colon.translate_axis (-dist / 2, Y_AXIS);
 
   Stencil m;
+  Grob *staff = Staff_symbol_referencer::get_staff_symbol (me);
+  Real center = 0;
+  if (staff)
+    {
+      Interval staff_extent = staff->extent (staff, Y_AXIS);
+      center = staff_extent.center ();
+    }
+
   if (str == "||:")
     str = "|:";
 
   if (str == "")
-    return Lookup::blank (Box (Interval (0, 0), Interval (-h / 2, h / 2)));
+    {
+      Stencil empty =  Lookup::blank (Box (Interval (0, 0), Interval (-h / 2, h / 2)));
+      empty.translate_axis (center, Y_AXIS);
+      return empty;
+    }
   else if (str == "|")
-    return thin;
+    {
+      thin.translate_axis (center, Y_AXIS);
+      return thin;
+    }
   else if (str == "|." || (h == 0 && str == ":|"))
     {
       m.add_at_edge (X_AXIS, LEFT, thick, 0);
@@ -165,6 +180,8 @@ Bar_line::compound_barline (Grob *me, string str, Real h,
     {
       m = dot;
     }
+
+  m.translate_axis (center, Y_AXIS);
   return m;
 }
 
@@ -291,30 +308,26 @@ Bar_line::calc_anchor (SCM smob)
 }
 
 ADD_INTERFACE (Bar_line,
-
               "Bar line.\n"
               "\n"
-              "Print a special bar symbol. It replaces the \n"
-              "regular bar symbol with a special\n"
-              "symbol.  The argument @var{bartype} is a string which specifies the\n"
-              "kind of bar to print.  Options are @code{:|}, \n"
-              "@code{|:}, @code{:|:},\n"
-              "@code{||}, @code{|.},\n"
-              "@code{.|}, and @code{.|.}. \n"
+              "Print a special bar symbol.  It replaces the regular bar"
+              " symbol with a special symbol.  The argument @var{bartype}"
+              " is a string which specifies the kind of bar to print."
+              "  Options are @code{:|}, @code{|:}, @code{:|:}, @code{||},"
+              " @code{|.}, @code{.|}, and @code{.|.}.\n"
               "\n"
-              "These produce, respectively, a right repeat, a left repeat, a double\n"
-              "repeat, a double bar, a start bar, an end bar, and a thick double bar.\n"
-              "In addition, there is an option @code{||:} which is equivalent to\n"
-              "@code{|:} except at line breaks, where it produces a double bar (@code{||})\n"
-              "at the end of the line and a repeat sign (@code{|:}) at the beginning\n"
-              "of the new line."
-              "If @var{bartype} is set to @code{empty} then nothing is printed,\n"
-              "but a line break is allowed at that spot.\n"
-              "\n\n"
-              "@code{gap} is used for the gaps in dashed barlines."
-
-              ,
-
+              "These produce, respectively, a right repeat, a left repeat,"
+              " a double repeat, a double bar, a start bar, an end bar, and"
+              " a thick double bar.  In addition, there is an option"
+              " @code{||:} which is equivalent to @code{|:} except at line"
+              " breaks, where it produces a double bar (@code{||}) at the"
+              " end of the line and a repeat sign (@code{|:}) at the"
+              " beginning of the new line.\n"
+              "\n"
+              "If @var{bartype} is set to @code{empty} then nothing is"
+              " printed, but a line break is allowed at that spot.\n"
+              "\n"
+              "@code{gap} is used for the gaps in dashed barlines.",
 
               /* properties */
               "allow-span-bar "