2002-12-06 Han-Wen Nienhuys <hanwen@cs.uu.nl>

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

diff --git a/lily/bar-line.cc b/lily/bar-line.cc
index 717da932c181a846cf7db819fcbd92f0eab9ee09..5fa03b00ac4a613639e6375e3a81ede66703be8a 100644 (file)
--- a/lily/bar-line.cc
+++ b/lily/bar-line.cc
@@ -84,48 +84,47 @@ Bar_line::compound_barline (Grob*me, String str, Real h)
     }
   else if (str == "|." || (h == 0 && 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, thick, 0, 0);      
+      m.add_at_edge (X_AXIS, LEFT, thin, kern,0 );
     }
   else if (str == ".|" || (h == 0 && str == "|:"))
     {
-      m.add_at_edge (X_AXIS, RIGHT, thick, 0);
-      m.add_at_edge (X_AXIS, RIGHT, thin, kern);
+      m.add_at_edge (X_AXIS, RIGHT, thick, 0, 0);
+      m.add_at_edge (X_AXIS, RIGHT, thin, kern, 0);
     }
   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, LEFT, thick, 0, 0);
+      m.add_at_edge (X_AXIS, LEFT, thin, kern, 0);
+      m.add_at_edge (X_AXIS, LEFT, colon, kern, 0);      
     }
   else if (str == "|:")
     {
-      m.add_at_edge (X_AXIS, RIGHT, thick, 0);
-      m.add_at_edge (X_AXIS, RIGHT, thin, kern);
-      m.add_at_edge (X_AXIS, RIGHT, colon, kern);      
+      m.add_at_edge (X_AXIS, RIGHT, thick, 0, 0);
+      m.add_at_edge (X_AXIS, RIGHT, thin, kern, 0);
+      m.add_at_edge (X_AXIS, RIGHT, colon, kern, 0);      
     }
   else if (str == ":|:")
     {
-      m.add_at_edge (X_AXIS, LEFT, thick, thinkern);
-      m.add_at_edge (X_AXIS, LEFT, colon, kern);      
-      m.add_at_edge (X_AXIS, RIGHT, thick, kern);
-      m.add_at_edge (X_AXIS, RIGHT, colon, kern);      
+      m.add_at_edge (X_AXIS, LEFT, thick, thinkern, 0);
+      m.add_at_edge (X_AXIS, LEFT, colon, kern, 0);
+      m.add_at_edge (X_AXIS, RIGHT, thick, kern, 0);
+      m.add_at_edge (X_AXIS, RIGHT, colon, kern, 0);      
     }
   else if (str == ".|.")
     {
-      m.add_at_edge (X_AXIS, LEFT, thick, thinkern);
-      m.add_at_edge (X_AXIS, RIGHT, thick, kern);      
+      m.add_at_edge (X_AXIS, LEFT, thick, thinkern, 0);
+      m.add_at_edge (X_AXIS, RIGHT, thick, kern, 0);
     }
   else if (str == "||")
     {
-      m.add_at_edge (X_AXIS, RIGHT, thin, 0);
-      m.add_at_edge (X_AXIS, RIGHT, thin, thinkern);      
+      m.add_at_edge (X_AXIS, RIGHT, thin, 0, 0);
+      m.add_at_edge (X_AXIS, RIGHT, thin, thinkern, 0);
     }
 
   return m;
 }
 
-
 Molecule
 Bar_line::simple_barline (Grob*,Real w, Real h) 
 {