X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar-line.cc;h=024d9a8535effbc5a1bb35ccd7f9f9d7249a55c2;hb=655fa53d715c93e7a771f4061d1f2a3572f832b7;hp=80c5e94f302b0abcc6f4fa21444329e329a371ef;hpb=6fb6249345ce846c8c55f843b21c6e85024a720b;p=lilypond.git

diff --git a/lily/bar-line.cc b/lily/bar-line.cc
index 80c5e94f30..024d9a8535 100644
--- 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);
@@ -130,11 +145,33 @@ Bar_line::compound_barline (Grob *me, string str, Real h,
       m.add_at_edge (X_AXIS, RIGHT, thick, kern);
       m.add_at_edge (X_AXIS, RIGHT, colon, kern);
     }
+  else if (str == ":|.|:")
+    {
+      m.add_at_edge (X_AXIS, LEFT, thick, 0);
+      m.add_at_edge (X_AXIS, LEFT, thin, kern);
+      m.add_at_edge (X_AXIS, LEFT, colon, kern);
+      m.add_at_edge (X_AXIS, RIGHT, thin, kern);
+      m.add_at_edge (X_AXIS, RIGHT, colon, kern);
+
+    }
+  else if (str == ":|.:")
+    {
+      m.add_at_edge (X_AXIS, LEFT, thick, 0);
+      m.add_at_edge (X_AXIS, LEFT, thin, kern);
+      m.add_at_edge (X_AXIS, LEFT, colon, kern);
+      m.add_at_edge (X_AXIS, RIGHT, colon, kern);
+    }
   else if (str == ".|.")
     {
       m.add_at_edge (X_AXIS, LEFT, thick, thinkern);
       m.add_at_edge (X_AXIS, RIGHT, thick, kern);
     }
+  else if (str == "|.|")
+    {
+      m.add_at_edge (X_AXIS, LEFT, thick, 0);
+      m.add_at_edge (X_AXIS, LEFT, thin, kern);
+      m.add_at_edge (X_AXIS, RIGHT, thin, kern);
+    }
   else if (str == "||")
     {
       /*
@@ -165,6 +202,8 @@ Bar_line::compound_barline (Grob *me, string str, Real h,
     {
       m = dot;
     }
+
+  m.translate_axis (center, Y_AXIS);
   return m;
 }
 
@@ -293,22 +332,23 @@ Bar_line::calc_anchor (SCM smob)
 ADD_INTERFACE (Bar_line,
 	       "Bar line.\n"
 	       "\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"
+	       "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{.|}, @code{.|.}, @code{:} and @code{\"dashed\"}.\n"
 	       "\n"
-	       "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"
+	       "These produce, respectively, a right repeat, a left repeat,"
+	       " a double repeat, a double bar, a start bar, an end bar,"
+	       " a thick double bar, a dotted bar and a dashed 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"
+	       "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.",