From 1db8e5d8762baae951ac9824ee7e745dca295ac8 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Wed, 27 Mar 2002 01:04:34 +0000
Subject: [PATCH] lilypond-1.5.23

---
 lily/bar.cc       | 13 +++++++++----
 mf/feta-puntje.mf | 14 --------------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/lily/bar.cc b/lily/bar.cc
index 33a04d2f39..bd38f9637c 100644
--- a/lily/bar.cc
+++ b/lily/bar.cc
@@ -53,6 +53,8 @@ Bar::compound_barline (Grob*me, String str, Real h)
   Real fatline = gh_scm2double (me->get_grob_property ("thick-thickness"));
 
   Real staffline = me->paper_l ()->get_var ("stafflinethickness");
+  Real staffspace = me->paper_l ()->get_var ("staffspace")
+    * Staff_symbol_referencer::staff_space (me);
 
   kern *= staffline;
   thinkern *= staffline;
@@ -61,10 +63,13 @@ Bar::compound_barline (Grob*me, String str, Real h)
   
   Molecule thin = simple_barline (me, hair, h);
   Molecule thick = simple_barline (me, fatline, h);
-  Molecule colon = Font_interface::get_default_font (me)->find_by_name (
-    Staff_symbol_referencer::line_count (me) & 1 == 1 ?
-    "dots-repeatcolon" : "dots-evenrepeatcolon"
-  );
+  Molecule colon;
+  Molecule dot = Font_interface::get_default_font (me)->find_by_name ("dots-dot");
+  Real dist = (2-(Staff_symbol_referencer::line_count (me) & 1))*staffspace;
+  dot.translate_axis(dist/2,Y_AXIS);
+  colon.add_molecule(dot);
+  dot.translate_axis(-dist,Y_AXIS);
+  colon.add_molecule(dot);
 
   Molecule m;
   
diff --git a/mf/feta-puntje.mf b/mf/feta-puntje.mf
index 67199364fb..5ad45c1951 100644
--- a/mf/feta-puntje.mf
+++ b/mf/feta-puntje.mf
@@ -10,18 +10,4 @@ fet_beginchar("duration dot","dot", "dot")
 	set_char_box(0, dot_diam#, dot_diam#/2, dot_diam#/2);
 fet_endchar;
 
-fet_beginchar("repeat dots", "repeatcolon", "repeatcolon")
-	pickup pencircle scaled dot_diam;
-	draw (dot_diam/2, staff_space/2);
-	addto currentpicture also currentpicture yscaled -1;
-	set_char_box(0, dot_diam#, staff_space#/2, staff_space#/2);
-fet_endchar;
-
-fet_beginchar("even repeat dots", "evenrepeatcolon", "evenrepeatcolon")
-	pickup pencircle scaled dot_diam;
-	draw (dot_diam/2, staff_space);
-	addto currentpicture also currentpicture yscaled -1;
-	set_char_box(0, dot_diam#, staff_space#, staff_space#);
-fet_endchar;
-
 fet_endgroup("dots");
-- 
2.39.5