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 d0b18fd1c55345adf59f2d46f99321a5d9390af3..4d2cbf9b5968b46b80f3f9c7b557379a09fde3d2 100644 (file)
--- a/lily/bar-line.cc
+++ b/lily/bar-line.cc
@@ -145,33 +145,11 @@ 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 == "||")
     {
       /*