patch::: 1.1.60.jcn1

pl 60.jcn1
	- interstaff slur tuning
	- added some regtests
	- removed now silly check in encompass-info

diff --git a/Documentation/tex/lilypond-regtest.doc b/Documentation/tex/lilypond-regtest.doc
index 9f73e72e10ad05c8742ef8840995e252825f264b..6412e1827da53bd64388468ed4e31142d3499616 100644 (file)
--- a/Documentation/tex/lilypond-regtest.doc
+++ b/Documentation/tex/lilypond-regtest.doc
@@ -52,6 +52,11 @@ Beams, stems and noteheads often have communication troubles, since
 the two systems for y dimensions (1 unit = staffspace, 1 unit = 1
 point) are mixed.
 
+Stems, beams, ties and slurs should behave similarly, when placed
+on the middle staff line.
+
+\mudelafile{stem-direction.sly}
+
 \section{Grace notes}
 
 Grace notes are typeset as an encapsulated piece of music. You can
@@ -84,6 +89,12 @@ Stems may be short, but noteheads should never touch the beam.
 
 \mudelafile{beam-extreme.ly}
 
+Beams should always reach the middle staff line, the second beam
+counting from the note head side, should never be lower than the
+second staff line.  This does not hold for grace note beams.
+
+\mudelafile{beam-position.sly}
+
 Slurs should look nice and symmetric.  The curvature may increase
 only to avoid noteheads, and as little as possible.
 

diff --git a/NEWS b/NEWS
index 792499e81e7505583d3fc9f2ea9284bb322f4ace..f685548b28f495ec3f56615c0840212607f828dd 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+pl 60.jcn1
+       - interstaff slur tuning
+       - added some regtests
+       - removed now silly check in encompass-info
+
 pl 59.uu1
        - papervar loose_column_distance
        - scripts don't collide.

diff --git a/VERSION b/VERSION
index 9a194ed92eb3783b57067b793031a61980a46edb..8dc0dc50e861d2e7ba952120ef6e2ad7c87d42f7 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=1
 PATCH_LEVEL=60
-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/input/test/beam-position.sly b/input/test/beam-position.sly
new file mode 100644 (file)
index 0000000..8755ed4
--- /dev/null
+++ b/input/test/beam-position.sly
@@ -0,0 +1 @@
+[f8 f] \grace { f8 e8 } [f64 f]

diff --git a/input/test/stem-direction.sly b/input/test/stem-direction.sly
new file mode 100644 (file)
index 0000000..0ac11c4
--- /dev/null
+++ b/input/test/stem-direction.sly
@@ -0,0 +1 @@
+b''4 ~ b8()b8

diff --git a/lily/encompass-info.cc b/lily/encompass-info.cc
index 323fc20a9c5c8295bd0d38cae4cf5ace91c7a94c..9b42db316cd1a7f9ed1580a4f51815f8f161819f 100644 (file)
--- a/lily/encompass-info.cc
+++ b/lily/encompass-info.cc
@@ -47,10 +47,6 @@ Encompass_info::Encompass_info (Note_column const* note_column, Direction dir, S
       && !stem_l->extent (Y_AXIS).empty_b ())
     {
       o_[Y_AXIS] = stem_l->extent (Y_AXIS)[dir];
-      // URG URG.
-      // some slur in choral.ly returns -inf here
-      if (abs (o_[Y_AXIS]) > 1000)
-       o_[Y_AXIS] = 0;
     }
   else
     {

diff --git a/ly/params.ly b/ly/params.ly
index 8ac1cd2880441d14891aa9baaed38f71d5e15ed1..d0b193ff2f8fe7933dae7a95181590f135ffecb9 100644 (file)
--- a/ly/params.ly
+++ b/ly/params.ly
@@ -93,10 +93,10 @@ slur_x_minimum = 3.0 * \interline;
 
 % slope damping: keep dy/dx < slur_slope_damping
 slur_slope_damping = 0.35;
-slur_interstaff_slope_damping = 0.8;
+slur_interstaff_slope_damping = 0.5;
 % height damping: keep h/dx < slur_height_damping
 slur_height_damping = 0.45;
-slur_interstaff_height_damping = 1.2;
+slur_interstaff_height_damping = 0.7;
 % snap to stem if slur ends closer to stem than
 slur_snap_to_stem = 1.5 * \interline;
 slur_interstaff_snap_to_stem = 2.5 * \interline;

diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly
index 586ab4e11f1510cad9118a0de48602ff6cea5e83..f10fa350ab00e12b30be840f3515d31fde30766f 100644 (file)
--- a/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly
+++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly
@@ -112,7 +112,7 @@ global = \notes{
 
 \score{
        % Moderato
-       \context GrandStaff <
+       \context PianoStaff <
                \context Staff = upper <
                        \global
                        \upper
@@ -128,11 +128,6 @@ global = \notes{
                % no slur damping
                slur_slope_damping = 10.0;
                gourlay_maxmeasures = 4.0;
-               \translator{ 
-                       \GrandStaffContext
-                       minVerticalAlign = 3.0*\staffheight;
-                       maxVerticalAlign = 3.0*\staffheight;
-               }
        }
        \midi{ \tempo 4 = 80; }
        \header {

diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-3.lym4 b/mutopia/J.S.Bach/Petites-Preludes/preludes-3.lym4
index 6da0ff5e84eed5ee4b25eab2fbfe68e17617b067..fb7f748af23fa08a6d6f720768a20bc08f58ca2e 100644 (file)
--- a/mutopia/J.S.Bach/Petites-Preludes/preludes-3.lym4
+++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-3.lym4
@@ -17,7 +17,7 @@ enteredby =    "jcn";
 copyright =     "public domain";
 }
 
-\version "1.0.14";
+\version "1.1.60";
 
 
 upper = \type Staff \notes \transpose c'' {

diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly
index 71139a0aa612dff7b997bffdc0a908f71d08ca31..fc90830c0be257bd32470555d8e020229f69e465 100644 (file)
--- a/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly
+++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly
@@ -189,7 +189,7 @@ global = \notes{
 
 \score{
        % Allegretto
-       \context GrandStaff <
+       \context PianoStaff <
                \context Staff = upper <
                        \global
                        \one
@@ -205,11 +205,6 @@ global = \notes{
        \paper{
                \include "preludes-paper.ly";
                gourlay_maxmeasures = 2.0;
-               \translator{ 
-                       \GrandStaffContext
-                       minVerticalAlign = 3.0*\staffheight;
-                       maxVerticalAlign = 3.0*\staffheight;
-               }
        }
        \midi{ \tempo 4 = 70; }
        \header{

diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly
index 9f0fde92410136fb916c9b5ce07dc9d46563c963..213589b9d857411fa5576a1a2c6f4bf5921f30a7 100644 (file)
--- a/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly
+++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly
@@ -186,7 +186,7 @@ global = \notes{
 
 \score{
        % Moderato
-       \context GrandStaff <
+       \context PianoStaff <
                \context Staff = upper <
                        \global
                        \upper
@@ -200,11 +200,6 @@ global = \notes{
        \paper{
                \include "preludes-paper.ly";
                gourlay_maxmeasures = 5.0;
-               \translator{ 
-                       \GrandStaffContext
-                       minVerticalAlign = 3.0*\staffheight;
-                       maxVerticalAlign = 3.0*\staffheight;
-               }
        }
        \midi{ \tempo 4 = 90; }
        \header{

diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly
index a3568d5bbb3a7066565bae984109744a79ebe289..16edc408f400dfd94a832b68fd57a47712b9540b 100644 (file)
--- a/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly
+++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly
@@ -103,7 +103,7 @@ global = \notes{
 
 \score{
        % Allegretto
-       \context GrandStaff <
+       \context PianoStaff <
                \context Staff = upper <
                        \global
                        \one
@@ -119,11 +119,6 @@ global = \notes{
        \paper{
                \include "preludes-paper.ly";
                gourlay_maxmeasures = 3.0;
-               \translator{ 
-                       \GrandStaffContext
-                       minVerticalAlign = 3.0*\staffheight;
-                       maxVerticalAlign = 3.0*\staffheight;
-               }
        }
        \midi{ \tempo 4 = 40; }
        \header{