patch::: 1.1.18.jcn5: fixje

pl 18.jcn5
	- bf: beamtrend
	- bf: vv-duet

diff --git a/NEWS b/NEWS
index a87715db56d6a67dd7c90d532b8f6b462bd4b988..71c59972677c19cebc8fb6b0459519d6033a2ed5 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+pl 18.jcn5
+       - bf: beamtrend
+       - bf: vv-duet
+
 pl 18.jcn4
        - beam length adjustments
        - ugly beamtrend fix: input/test/beam-trend.ly

diff --git a/VERSION b/VERSION
index d0c2078b63d2297ed56b7d45599a8cc58aa686b5..251089a8fbcdbb76d943043decae2e3c72947e2a 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=1
 PATCH_LEVEL=18
-MY_PATCH_LEVEL=jcn4
+MY_PATCH_LEVEL=jcn5
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/init/params.ly b/init/params.ly
index 807a8a06fd4fa7526486c02f6f053121ef7c3bdc..35ab7533d489cb11c673d9fab3cdab0ee5f81950 100644 (file)
--- a/init/params.ly
+++ b/init/params.ly
@@ -54,13 +54,7 @@ beam_dir_algorithm = \MAJORITY;
 %    beam_*2 : multiplicity >= beam_multiple_break
 %
 beam_multiple_break = 3.0;
-% beam_minimum_stem1 = 1.5 * \interline;
-% beam_ideal_stem1 = 2.0 * \interline;
-% beam_minimum_stem2 = 1.0 * \interline;
-% beam_ideal_stem2 = 1.5 * \interline;
-
-% let's try these minor adjustments
-beam_minimum_stem1 = 1.25 * \interline;
+beam_minimum_stem1 = 0.75 * \interline;
 beam_ideal_stem1 = 1.75 * \interline;
 beam_minimum_stem2 = 0.75 * \interline;
 beam_ideal_stem2 = 1.25 * \interline;

diff --git a/input/bugs/rediculous-dim.ly b/input/bugs/rediculous-dim.ly
new file mode 100644 (file)
index 0000000..1110e94
--- /dev/null
+++ b/input/bugs/rediculous-dim.ly
@@ -0,0 +1,8 @@
+\score{
+       \notes\relative c'' {
+       <
+           \property Voice.textstyle = "large" s4^"Moderato"
+           r4 
+       >
+       }
+}

diff --git a/lily/beam.cc b/lily/beam.cc
index b82b7c498ec0a546da11ec26524a876b880bc67c..40648d83534e54284edc239cc21e6e0379e0bb52 100644 (file)
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -233,7 +233,8 @@ Beam::solve_slope (Array<Stem_info>& sinfo)
       l.input.push (Offset (sinfo[i].x_, sinfo[i].idealy_f_));
     }
 
-  l.input[0].y () += left_y_;
+  // l.input[0].y () += left_y_;
+  l.input[0].y () += left_y_ / 2;
   l.minimise (slope_f_, left_y_);
 
   solved_slope_f_ = dir_ * slope_f_;
@@ -328,7 +329,9 @@ Beam::calculate_slope ()
     {
       Real y;
       Real s;
-      for (int i = 0; i < 3; i++)
+      Array <Stem_info> local_sinfo;
+      local_sinfo = sinfo;
+      for (int i = 0; i < 5; i++)
         {
          y = left_y_;
          solve_slope (sinfo);
@@ -346,6 +349,7 @@ Beam::calculate_slope ()
            {
              left_y_ = 0;
              slope_f_ = 0;
+             sinfo = local_sinfo;
              Real dy = check_stemlengths_f (sinfo);
              left_y_ += dy;
              break;
@@ -354,6 +358,7 @@ Beam::calculate_slope ()
          else if (abs (slope_f_) > abs (s))
            {
              slope_f_ = s;
+             sinfo = local_sinfo;
              Real dy = check_stemlengths_f (sinfo);
              left_y_ += dy;
              break;

diff --git a/mutopia/J.S.Bach/viola-part.ly b/mutopia/J.S.Bach/viola-part.ly
new file mode 100644 (file)
index 0000000..a7fe1b4
--- /dev/null
+++ b/mutopia/J.S.Bach/viola-part.ly
@@ -0,0 +1,25 @@
+\header{
+filename =      "viola-part.ly";
+title =                 "Vier Duette";
+description =   "Four duets for Violino and Violoncello (Viola)";
+opus =           "BWV";
+composer =      "Johann Sebastian Bach (1685-1750)";
+enteredby =     "jcn";
+copyright =     "Public Domain";
+}
+
+\include "global-i.ly"
+\include "viola-i.ly"
+
+\score{
+       \$viola_i_staff
+       \paper{
+               \translator { \BarNumberingStaffContext }
+       }
+       \midi{
+%urg
+%              \tempo 4. = 69;
+               \tempo 4 . = 69;
+       }
+}
+

diff --git a/mutopia/J.S.Bach/violino-i.ly b/mutopia/J.S.Bach/violino-i.ly
index 094805df0f39daa1d4d740b9433f384a36a1d83d..f365d06a7b7ca582588aed9a1a96d68f5aea78d8 100644 (file)
--- a/mutopia/J.S.Bach/violino-i.ly
+++ b/mutopia/J.S.Bach/violino-i.ly
@@ -30,7 +30,9 @@ $violino_i = \notes\relative c'' {
 
 $violino_i_staff = \type Staff = violino <
        <
-               \notes\property Voice.textstyle = "large" s4^"Moderato"
+               %urg
+               % \notes\property Voice.textstyle = "large" s4^"Moderato"
+               % \notes {s4. \property Voice.textstyle = "large" s4^"Moderato"}
                \$violino_i
        >
        \$global_i

diff --git a/mutopia/J.S.Bach/violino-part.ly b/mutopia/J.S.Bach/violino-part.ly
new file mode 100644 (file)
index 0000000..de5a179
--- /dev/null
+++ b/mutopia/J.S.Bach/violino-part.ly
@@ -0,0 +1,25 @@
+\header{
+filename =      "violino-part.ly";
+title =                 "Vier Duette";
+description =   "Four duets for Violino and Violoncello (Viola)";
+opus =           "BWV";
+composer =      "Johann Sebastian Bach (1685-1750)";
+enteredby =     "jcn";
+copyright =     "Public Domain";
+}
+
+\include "global-i.ly"
+\include "violino-i.ly"
+
+\score{
+       \$violino_i_staff
+       \paper{
+               \translator { \BarNumberingStaffContext }
+       }
+       \midi{
+%urg
+%              \tempo 4. = 69;
+               \tempo 4 . = 69;
+       }
+}
+

diff --git a/mutopia/J.S.Bach/violoncello-part.ly b/mutopia/J.S.Bach/violoncello-part.ly
new file mode 100644 (file)
index 0000000..bf1d8f0
--- /dev/null
+++ b/mutopia/J.S.Bach/violoncello-part.ly
@@ -0,0 +1,25 @@
+\header{
+filename =      "violoncello-part.ly";
+title =                 "Vier Duette";
+description =   "Four duets for Violino and Violoncello (Viola)";
+opus =           "BWV";
+composer =      "Johann Sebastian Bach (1685-1750)";
+enteredby =     "jcn";
+copyright =     "Public Domain";
+}
+
+\include "global-i.ly"
+\include "violoncello-i.ly"
+
+\score{
+       \$violoncello_i_staff
+       \paper{
+               \translator { \BarNumberingStaffContext }
+       }
+       \midi{
+%urg
+%              \tempo 4. = 69;
+               \tempo 4 . = 69;
+       }
+}
+

diff --git a/mutopia/J.S.Bach/wtk1-fugue2.ly b/mutopia/J.S.Bach/wtk1-fugue2.ly
index df8a32b935d153f72f45ddae23f57163fcd766bb..9aeb030879c36049d5c480ea7ec15b3100c7a274 100644 (file)
--- a/mutopia/J.S.Bach/wtk1-fugue2.ly
+++ b/mutopia/J.S.Bach/wtk1-fugue2.ly
@@ -187,18 +187,8 @@ bassdux = \notes \relative c' {
 
     %hmm
 %    \translator { \BarNumberingScoreContext }
-    \translator { \BarNumberingStaffContext }
-
-    % Breitkopf; unlike B\"arenreiter rule
-    % really looks a lot better?
-    % should have an array of min/ideal lengths (scheme)
-    % and check B\"arenreiter rules again -- make testcase
-
-    % beam_multiple_break = 2.0;
-    % beam_minimum_stem1 = 1.5 * \interline;
-    % beam_ideal_stem1 = 2.0 * \interline;
-    % beam_minimum_stem2 = 1.25 * \interline;
-    % beam_ideal_stem2 = 1.75 * \interline;
+%    \translator { \BarNumberingStaffContext }
+  \translator{ \OrchestralScoreContext }
   }
   \header{
          opus = "BWV 847";