patch::: 1.3.79.jcn1

1.3.79.jcn1
===========

* Made crude fixes slurs don't crash, bezier still crashes on
  infinitely steep slurs (eg flauti-part *with* slur_engraver).

1.3.79
======

diff --git a/CHANGES b/CHANGES
index e13358409df904b590dc74d1b344b5369e9f842e..65f78969a7020845a2194d77d0017bbbca77af29 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,12 @@
+1.3.79.jcn1
+===========
+
+* Made crude fixes slurs don't crash, bezier still crashes on
+  infinitely steep slurs (eg flauti-part *with* slur_engraver).
+
+1.3.79
+======
+
 * etf2ly.py: Finale to LilyPond conversion.
 
 1.3.78.jcn4

diff --git a/VERSION b/VERSION
index cfec8508beb2e4ae82b49897c55748d9a05528cd..1586c1210bb9a9bb58688a5fb0750ab68c27b400 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=79
-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/bugs/almost.ly b/input/bugs/almost.ly
index 7276562718357d7d3e4d06e134a3fb0e417d9a00..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/input/bugs/almost.ly
+++ b/input/bugs/almost.ly
@@ -1,18 +0,0 @@
-\score{
-       \context Staff <
-               \context Voice=one { \skip 1; }
-               \context Voice=two { \skip 1; }
-
-               \context Voice=one \partcombine Voice
-                       \context Thread=one \notes\relative c'' {
-                               a4 c4.()g8 a4
-                       }
-                       \context Thread=two \notes\relative c'' {
-                               g4 e4.()d8 c4
-                       }
-       >
-       \paper{
-               linewidth=60.\mm;
-       }
-}
-

diff --git a/input/test/hymn.ly b/input/test/hymn.ly
index 8003c4dbd42960d6e721d4a53d43f94b5457ad59..cecbbfc731dc81feb4a0b4578b9981d3e8b4f27e 100644 (file)
--- a/input/test/hymn.ly
+++ b/input/test/hymn.ly
@@ -1,17 +1,15 @@
 \score{
        \context Staff <
-               \context Voice=one { \skip 1; }
-               \context Voice=two { \skip 1; }
-
+               \time 4/4;
                \context Voice=one \partcombine Voice
                        \context Thread=one \notes\relative c'' {
-                               %a4 c4.()g8 a4 |
+                               a4 c4.()g8 a4 |
                                g4 e' g()f | 
                                b, a c2
                        }
                        \context Thread=two \notes\relative c'' {
-                               %g4 e4.()d8 c4 |
-                               g4 c, e()f |
+                               g4 e4.()d8 c4 |
+                               g'4 c, e()f |
                                d2 a
                        }
        >
@@ -20,13 +18,7 @@
                \translator {
                        \VoiceContext
                        soloADue = ##f
-                       %\remove Slur_engraver;
-                       \consists Slur_engraver;
                }
-%              \translator {
-%                      \ThreadContext
-%                      \consists Slur_engraver;
-%              }
        }
 }
 

diff --git a/lily/slur.cc b/lily/slur.cc
index ccad52d81cd9172fdc879cacb1180f2923cbcaf2..46a9e190108e534d722c29deefa441603cfac8b5 100644 (file)
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -150,12 +150,16 @@ Slur::encompass_offset (Score_element*me,
   return o;
 }
 
-MAKE_SCHEME_CALLBACK(Slur,after_line_breaking);
-
+MAKE_SCHEME_CALLBACK (Slur, after_line_breaking);
 SCM
 Slur::after_line_breaking (SCM smob)
 {
   Score_element *me = unsmob_element (smob);
+  if (!gh_scm2int(scm_length (me->get_elt_property ("note-columns"))))
+    {
+      me->suicide ();
+      return SCM_UNSPECIFIED;
+    }
   set_extremities (me);
   set_control_points (me);
   return SCM_UNSPECIFIED;
@@ -281,7 +285,7 @@ Slur::get_attachment (Score_element*me,Direction dir,
 Array<Offset>
 Slur::get_encompass_offset_arr (Score_element*me) 
 {
-    Spanner*sp = dynamic_cast<Spanner*>(me);
+  Spanner*sp = dynamic_cast<Spanner*>(me);
   SCM eltlist = me->get_elt_property ("note-columns");
   Score_element *common[] = {me->common_refpoint (eltlist,X_AXIS),
                             me->common_refpoint (eltlist,Y_AXIS)};
@@ -371,11 +375,17 @@ Slur::set_spacing_rods (SCM smob)
 /*
   Ugh should have dash-length + dash-period
  */
-MAKE_SCHEME_CALLBACK(Slur,brew_molecule);
+MAKE_SCHEME_CALLBACK (Slur, brew_molecule);
 SCM
 Slur::brew_molecule (SCM smob)
 {
   Score_element * me = unsmob_element (smob);
+  if (!gh_scm2int(scm_length (me->get_elt_property ("note-columns"))))
+    {
+      me->suicide ();
+      return SCM_EOL;
+    }
+
   Real thick = me->paper_l ()->get_var ("stafflinethickness") *
     gh_scm2double (me->get_elt_property ("thickness"));
   Bezier one = get_curve (me);

diff --git a/mutopia/Coriolan/flauti-part.ly b/mutopia/Coriolan/flauti-part.ly
index 64c15a8d61f3cda2f736704194b9f629c12cffe2..182f57d2325ef0818f991cfb7243fd9ddc92209a 100644 (file)
--- a/mutopia/Coriolan/flauti-part.ly
+++ b/mutopia/Coriolan/flauti-part.ly
@@ -16,7 +16,30 @@ copyright =   "public domain";
 
 \score{
        \$flauti_staff
-       \include "coriolan-part-paper.ly"
+       %\include "coriolan-part-paper.ly"
+
+       \paper {
+               textheight = 295.0\mm;
+               linewidth = 180.0\mm;
+
+               % slurs are never beautiful (no steep slurs)
+               slur_beautiful = 0.0;
+
+               \translator {
+                       \VoiceContext
+                       \remove Slur_engraver;
+               }
+               \translator { 
+                       \ScoreContext skipBars = ##t 
+                       %% URG: this changes dynamics too
+                       %%textStyle = #"italic"
+                       timeSignatureStyle = #"C"
+                       instrumentScriptPadding = #60  %% urg, this is in pt
+                       instrScriptPadding = #40 %% urg, this is in pt
+                       marginScriptHorizontalAlignment = #1
+                       maximumRestCount = #1
+               }
+       }
        \include "coriolan-midi.ly"
 }
 

diff --git a/mutopia/Coriolan/flauti.ly b/mutopia/Coriolan/flauti.ly
index 4de0fdd35391057cd699668ff5ddb720c821ce4f..9fe7ce067487e4618306f09bd0f4615049ac0614 100644 (file)
--- a/mutopia/Coriolan/flauti.ly
+++ b/mutopia/Coriolan/flauti.ly
@@ -14,17 +14,18 @@ copyright =  "public domain";
 \include "flauto-1.ly"
 \include "flauto-2.ly"
 
-$flauti_staff = \context Staff = flauti <
+$flauti_staff = \notes \context Staff = flauti <
        \property Staff.midiInstrument = #"flute"
        \property Staff.instrument = #"2 Flauti"
        \property Staff.instr = #"Fl."
-       %\notes \context Voice=flauti < 
-       \notes \context Staff=flauti < 
-               \global
-               \context VoiceOne=flautoi 
-                       \$flauto1
-               \context VoiceTwo=flautoii 
-                       \$flauto2
-       >
+
+       \global
+
+       \context Voice=one { \skip 1; }
+       \context Voice=two { \skip 1; }
+
+       \context Voice=one \partcombine Voice
+               \context Thread=one \$flauto1
+               \context Thread=two \$flauto2
 >
 

diff --git a/scm/slur.scm b/scm/slur.scm
index dadeb3056c564716d33a23292f400f361f775d05..bf36ed76ac122b768aa8ea39a09cb3d553c6af0f 100644 (file)
--- a/scm/slur.scm
+++ b/scm/slur.scm
@@ -28,6 +28,10 @@
 
    ;; (cons (lambda (slur dir) (begin (display "before head") (newline))#f) #f)
 
+   ;; urg: don't crash on a slur without note-columns
+   (cons (lambda (slur dir)
+          (< (length (ly-get-elt-property slur 'note-columns)) 1)) 'head)
+
    (cons (lambda (slur dir)
           ;; urg, code dup
           (let* ((note-columns (ly-get-elt-property slur 'note-columns))