X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar-line.cc;h=4d2cbf9b5968b46b80f3f9c7b557379a09fde3d2;hb=def21b306e2b8fa2d5630fab0878e9922e197f0c;hp=800c138c9362e2231ee570497e3245a4e8e5ee41;hpb=94882ec3a3565a8198bf8028855f99cb907befdd;p=lilypond.git

diff --git a/lily/bar-line.cc b/lily/bar-line.cc
index 800c138c93..4d2cbf9b59 100644
--- a/lily/bar-line.cc
+++ b/lily/bar-line.cc
@@ -24,7 +24,8 @@ Bar_line::calc_bar_extent (SCM smob)
 
   SCM size = me->get_property ("bar-size");
 
-  if (!scm_is_number (size))
+  if (!scm_is_number (size)
+      || !Staff_symbol_referencer::get_staff_symbol (me))
     return ly_interval2scm (Interval ());
 
   Real h = scm_to_double (size);
@@ -93,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);
@@ -164,6 +180,8 @@ Bar_line::compound_barline (Grob *me, string str, Real h,
     {
       m = dot;
     }
+
+  m.translate_axis (center, Y_AXIS);
   return m;
 }
 
@@ -290,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 "