patch::: 1.3.16.jcn1

1.3.16.jcn1
	* Fixed cross staff slurs.  It seems that cross-staff sign
	  was swapped.

diff --git a/CHANGES b/CHANGES
index f0d171221dc1cad39a0636d40e0c784d1213b050..5b2222460c1684c46153983254ebc2af8de3b2f1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+1.3.16.jcn1
+       * Fixed cross staff slurs.  It seems that cross-staff sign
+         was swapped.
+
 1.3.15.hwn1
 ===========
 

diff --git a/Documentation/topdocs/AUTHORS.texi b/Documentation/topdocs/AUTHORS.texi
index a9969ccd58ef9d79ac91bf638bf056b84fe69bc1..1472a368633a6f108903942f314e46ce06b30654 100644 (file)
--- a/Documentation/topdocs/AUTHORS.texi
+++ b/Documentation/topdocs/AUTHORS.texi
@@ -54,10 +54,9 @@ list is alphabetically ordered.
 @item @email{oliva@@dcc.unicamp.br, Alexandre Oliva}, 
     @uref{http://sunsite.unicamp.br/~oliva/}
     testing
-@item @email{pinard@@iro.umontreal.ca, Francois Pinard},
+@item @email{pinard@@iro.umontreal.ca, Franc@,ois Pinard}, 
     parts of Documentation/Vocab*, started internationalization stuff
-@c urg: @c,{} in @email{} barfs.
-@item @email{portnoy@@ai.mit.edu,Stephen Peters}, pdfTeX support
+@item @email{portnoy@@ai.mit.edu,Stephen Peters} pdfTeX support
 @item @email{glenprideaux@@iname.com, Glen Prideaux},
     minor bug fix to script used to generate doc++ documentation
 @item @email{Roy.Rankin@@alcatel.com.au, Roy R. Rankin},

diff --git a/VERSION b/VERSION
index 9bba35ee8b4f6ea1ab5234e3a6c0b43a797c3582..392c87bcaa1cffd06092fa54cd3fd4f7fbf8125a 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=16
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/lily/slur.cc b/lily/slur.cc
index 6f4d1c279ceb6c1027995acecd23201b3afbb5c5..9b965fa52274952df4a80d7dff29b90c7fcf0a65 100644 (file)
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -119,7 +119,7 @@ Slur::encompass_offset (Note_column const* col) const
    leave a gap: slur mustn't touch head/stem
    */
   o[Y_AXIS] += dir * paper_l ()->get_var ("slur_y_free");
-  o[Y_AXIS] += calc_interstaff_dist (stem_l, this);
+  o[Y_AXIS] -= calc_interstaff_dist (stem_l, this);
   return o;
 }
 
@@ -252,7 +252,7 @@ Slur::do_post_processing ()
   do
     {
       info_drul[d] = encompass_offset (encompass_arr.boundary (d, 0));
-      interstaff_interval[d] = calc_interstaff_dist (encompass_arr.boundary (d,0),
+      interstaff_interval[d] = - calc_interstaff_dist (encompass_arr.boundary (d,0),
                                                     this);
     }
   while (flip (&d) != LEFT);