lilypond-0.1.18

diff --git a/lily/tex-slur.cc b/lily/tex-slur.cc
index 664460f8b9c542e4942071d24f8605273d559386..58783600f581f5cdf311904d9f33a833cb2a128e 100644 (file)
--- a/lily/tex-slur.cc
+++ b/lily/tex-slur.cc
@@ -55,8 +55,8 @@ Lookup::half_slur_middlepart (Real &dx, Direction dir) const
 
   Atom s;
   
-  s.dim_.y() = Interval (min (0,0), max (0,0)); // todo
-  s.dim_.x() = Interval (0,dx);
+  s.dim_[Y_AXIS] = Interval (min (0, 0), max (0, 0)); // todo
+  s.dim_[X_AXIS] = Interval (-dx/2, dx/2);
 
   String f =  String ("\\hslurchar");
   f += direction_char (CENTER);
@@ -74,6 +74,11 @@ Lookup::half_slur_middlepart (Real &dx, Direction dir) const
   return s;
 }
 
+/*
+   The halfslurs have their center at the end pointing away from the notehead.  
+   This lookup translates so that width() == [0, w]
+ */
+
 Atom
 Lookup::half_slur (int dy, Real &dx, Direction dir, int xpart) const
 {
@@ -99,8 +104,8 @@ Lookup::half_slur (int dy, Real &dx, Direction dir, int xpart) const
     }
        
   Atom s;
-  s.dim_.x() = Interval (0,dx);
-  s.dim_.y() = Interval (min (0,dy), max (0,dy));
+  s.dim_[X_AXIS] = Interval (0, dx);
+  s.dim_[Y_AXIS] = Interval (min (0, dy), max (0, dy));
 
 
   String f = String ("\\hslurchar");
@@ -171,17 +176,18 @@ Lookup::slur (int dy , Real &dx, Direction dir) const
     }
   
   Atom s;
-  s.dim_.x() = Interval (-dx/2,dx/2);
-  s.dim_.y() = Interval (min (0,dy), max (0,dy));
+  s.dim_[X_AXIS] = Interval (0, dx);
+  s.dim_[Y_AXIS] = Interval (min (0, dy), max (0, dy));
 
   String f = String ("\\slurchar") + String (direction_char (y_sign));
 
   int idx=-1;
-  if (y_sign) {        
-    idx = hidx * 16 + widx;
-    if (dir < 0)
-      idx += 128;
-  }
+  if (y_sign) 
+    {  
+      idx = hidx * 16 + widx;
+      if (dir < 0)
+       idx += 128;
+    }
   else 
     {
       if (dx >= 4*54 PT) 
@@ -222,17 +228,18 @@ Lookup::big_slur (int dy , Real &dx, Direction dir) const
   Real right_wid = left_wid;
 
   Atom l = half_slur (l_dy, left_wid, dir, -1);
+  
+   
   Atom r = half_slur (r_dy, right_wid, dir, 1);
   Real mid_wid = dx - left_wid - right_wid;
 
   Molecule mol;
   mol.add (l);
   Atom a (half_slur (0, mid_wid, dir, 0));
-  a.translate (slur_extra * internote_f, Y_AXIS);
   mol.add_at_edge (X_AXIS, RIGHT, a);
   mol.add_at_edge (X_AXIS, RIGHT, r);
+
   mol.translate (l_dy * internote_f, Y_AXIS);
-  
   Atom s;
   s.tex_ = mol.TeX_string();
   s.dim_ = mol.extent();

diff --git a/mf/dimen.tex b/mf/dimen.tex
index dd1df884d6529f3103e73e725e06f1ce7974681c..78fc5369afad7e1e06a2bf8f65888adb1b57decf 100644 (file)
--- a/mf/dimen.tex
+++ b/mf/dimen.tex
@@ -2,10 +2,12 @@
 % A tex file to help determine dims.
 %
 
-\font\musicfont=musix16
-\font\slurfont=xslu16
+\font\taupin=musix16
+\font\fet=font-en-tja16
+\font\vet=vette-beams16
+\font\slurs=xslhd16
 \font\specfont=musixspx
-\def\thefont{\musicfont}
+\def\thefont{\slurs}
 %\def\thefont{\specfont}
 
 \def\mb#1{{\thefont\char#1}}