lilypond-0.0.78

diff --git a/lily/tex-slur.cc b/lily/tex-slur.cc
index 70f3e5179759414f2ce44cb09fe59ab57d97c3da..c1ba56bd89623823fd400fc0da71ba355dfc1af7 100644 (file)
--- a/lily/tex-slur.cc
+++ b/lily/tex-slur.cc
@@ -62,6 +62,7 @@ Lookup::half_slur_middlepart(Real &dx, int dir) const
     if (dir < 0)
        idx += 128;
 
+    assert (idx < 256);
 
     f+=String( "{" ) + String( idx ) + "}";
     s.tex = f;
@@ -107,12 +108,12 @@ Lookup::half_slur(int dy, Real &dx, int dir, int xpart) const
        hidx = -hidx;
     hidx --;
     int idx =-1;
-    
 
     idx = widx * 16 + hidx;
     if (xpart < 0)
        idx += 128;
     
+    assert (idx < 256);
     f+=String( "{" ) + String( idx ) + "}";
 
     
@@ -127,7 +128,7 @@ Lookup::slur (int dy , Real &dx, int dir) const
     assert(dx >=0 && abs(dir) <= 1);
     int y_sign = sign(dy);
 
-    bool large = dy > 16;
+    bool large = abs(dy) > 8;
 
     if (y_sign) {
        large |= dx>= 4*16 PT;
@@ -150,7 +151,7 @@ Lookup::slur (int dy , Real &dx, int dir) const
     if (hidx <0)
        hidx = -hidx;
     hidx --; 
-    if (hidx > 16) {
+    if (hidx > 8) {
        WARN<<"slur to steep: " << dy << " shrinking (ugh)\n";
     }
     
@@ -176,6 +177,7 @@ Lookup::slur (int dy , Real &dx, int dir) const
            idx += 54;          
     }
     
+    assert (idx < 256);
     f+=String( "{" ) + String( idx ) + "}";
     s.tex = f;
 

diff --git a/tex/dimen.tex b/tex/dimen.tex
index fb9d6d9d59e97f56e9017becc564791eccf135f5..59c50fb1e4903349f9612d18db2dac734352c4c2 100644 (file)
--- a/tex/dimen.tex
+++ b/tex/dimen.tex
@@ -3,10 +3,11 @@
 %
 
 \font\musicfont=musixsps
-\font\slurfont=xslu16
+\font\slurfont=xhslu16
 \font\specfont=musixspx
 % \def\thefont{\musicfont}
-\def\thefont{\specfont}
+%\def\thefont{\specfont}
+\def\thefont{\slurfont}
 
 \def\mb#1{{\thefont\char#1}}