patch::: 1.3.96.jcn2

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

diff --git a/input/les-nereides.ly b/input/les-nereides.ly
index 7dc06841ed901eb2046045c6d62db2a250b19cce..36eeadb3c2328702ee915668f33744436e0320e9 100644 (file)
--- a/input/les-nereides.ly
+++ b/input/les-nereides.ly
@@ -20,13 +20,14 @@ cpp -P -traditional -o l-fake.ly  -DFAKE_GRACE les-nereides.ly
          (* (if (<= multiplicity 3) 0.816 0.844) 0.8))
 
 %% cpp: don't start on first column
-%% hmm, why doesn't this work?
  #(define (make-text-checker text)
   (lambda (elt)
-    (and (not (eq? #f (memq 'text-item-interface (ly-get-elt-property elt 'interfaces))))
-         (not (#f (string-match text (ly-get-elt-property elt 'text)))))
+     ;; huh, string-match undefined?
+     ;; (string-match text (ly-get-elt-property elt 'text))
+     (equal? text (ly-get-elt-property elt 'text))
     ))
 
+
 global = \notes{
     \partial 2;
     \key a \major;
@@ -58,13 +59,21 @@ treble = \context Voice=treble \notes\relative c''{
     r4 <cis\arpeggio eis a cis> r2
     %3
     r4 <cis\arpeggio fis a cis> r8.
+    % Huh, urg?  Implicit \context Staff lifts us up to Staff context???
     \translator Staff=bass
-    \outputproperty #(make-text-checker "m")
-           #'extra-offset = #'(-6 . 2)
+    % Get back
+    \context Voice 
+    \outputproperty #(make-text-checker "m.d.")
+           #'extra-offset = #'(-3 . -4)
+    % currently, this can't be (small) italic, because in the paperblock
+    % we set italic_magnifictation to get large italics.
     cis,16^2^"m.d."( <fis8 fis,> <e! e,!>
     %4
     <)dis,4 a' dis>
+    % Urg, this lifts us up to staff context
     \translator Staff=treble
+    % Get back
+    \context Voice 
     \property Voice.Slur \pop #'direction
     \property Voice.Slur \push #'direction = #1
     \property PianoStaff.connectArpeggios = ##t
@@ -77,9 +86,14 @@ treble = \context Voice=treble \notes\relative c''{
     \property Voice.TextSpanner \push #'type = #"dotted-line"
     \property Voice.TextSpanner \push #'edge-height = #'(0 . 1.5)
     \property Voice.TextSpanner \push #'edge-text = #'("8 " . "")
+    % Huh, urg?  Implicit \context Staff lifts us up to Staff context???
     \property Staff."c0-position" = #-13
-    \outputproperty #(make-text-checker "m")
-           #'extra-offset = #'(-6 . 2)
+    % Get back
+    \context Voice 
+    \outputproperty #(make-text-checker "m.g.")
+           #'extra-offset = #'(-3 . -2)
+    % currently, this can't be (small) italic, because in the paperblock
+    % we set italic_magnifictation to get large italics.
     cis''''4^"m.g."\arpeggio \spanrequest \start "text"  (
 
 #ifndef FAKE_GRACE
@@ -168,7 +182,7 @@ trebleTwo = \context Voice=trebleTwo \notes\relative c''{
 #endif
 
     \property Voice.NoteColumn \push #'force-hshift = #-0.2
-    <e,2 gis, e d>
+    <e,2 gis, e d!>
     % Hmm s/r?
     %r8 cis4. d4
     s8 cis4. d4
@@ -182,40 +196,54 @@ trebleTwo = \context Voice=trebleTwo \notes\relative c''{
 }
 
 bass = \context Voice=bass \notes\relative c{
-    \property Voice.Slur \push #'details =
-          #'((height-limit . 2.0) (ratio . 0.333) (force-blowfit . 0.5) (beautiful . 5.0))
+    % Allow ugly slurs
+    \property Voice.Slur \push #'beautiful = #5.0
     \property Voice.Slur \push #'attachment-offset = #'((0 . -3) . (0 . -6))
     \property Voice.Stem \pop #'direction
     \property Voice.Slur \push #'direction = #-1
     % huh, auto-beamer?
     r8. e,16-2( [<a8 a,> <b b,>] <cis4 cis,> |
     %2
+    % Huh, urg?  Implicit \context Staff lifts us up to Staff context???
     \translator Staff=treble
+    % Get back
+    \context Voice 
     \property Voice.Stem \pop #'direction
     \property Voice.Stem \push #'direction = #-1
     \property Voice.slurEndAttachment = #'stem
     <)a''4\arpeggio eis cis> 
     %\stemboth
     \property Voice.slurEndAttachment = ##f
+    % Huh, urg?  Implicit \context Staff lifts us up to Staff context???
     \translator Staff=bass
+    % Get back
+    \context Voice 
     \property Voice.Stem \pop #'direction
     \property Voice.Slur \pop #'y-free
     \property Voice.Slur \push #'y-free = #0.1
+    \property Voice.Slur \pop #'attachment-offset
+    \property Voice.Slur \push #'attachment-offset = #'((0 . -3) . (0 . -8))
     r8. cis,,16( <fis8 fis,> <gis gis,>
     %3
     \property Voice.Stem \pop #'length
     \property Voice.Stem \push #'length = #5
     <a4 a,>
+    % Huh, urg?  Implicit \context Staff lifts us up to Staff context???
     \translator Staff=treble
+    % Get back
+    \context Voice 
     \property Voice.Stem \pop #'length
     \property Voice.Stem \pop #'direction
     \property Voice.Stem \push #'direction = #-1
     <)a'\arpeggio fis cis>
+    % Huh, urg?  Implicit \context Staff lifts us up to Staff context???
     \translator Staff=bass
+    % Get back
+    \context Voice 
     \property Voice.Stem \pop #'direction
     r2
     %4
-    \property Voice.Slur \pop #'details
+    \property Voice.Slur \pop #'beautiful
     \property Voice.Slur \pop #'attachment-offset
     \property Voice.Stem \pop #'direction
     \property Voice.Stem \push #'direction = #-1

diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc
index e432c710a8210660affedd3816fe9387c75a1a70..68226226ab9aff93bb23194a029a2aef2c11b01f 100644 (file)
--- a/lily/arpeggio.cc
+++ b/lily/arpeggio.cc
@@ -84,7 +84,7 @@ Arpeggio::brew_molecule (SCM smob)
 /*
   We have to do a callback, because brew_molecule () triggers a
   vertical alignment if it is cross-staff.
-  This callback alos adds padding.
+  This callback also adds padding.
 */
 MAKE_SCHEME_CALLBACK(Arpeggio, width_callback,2);
 SCM

diff --git a/lily/slur.cc b/lily/slur.cc
index 63420539c50ad63bd059d2189a6fe5e6bd230dfd..1ac4b5cf79513bcecd10db8476306770189b170d 100644 (file)
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -549,8 +549,10 @@ Slur::set_control_points (Score_element*me)
       Real length = bb.curve_.control_[3][X_AXIS]; 
       Real default_height = slur_height (length, h_inf, r_0);
 
-      SCM ssb = scm_assq (ly_symbol2scm ("beautiful"), details);
-      Real sb =gh_scm2double (gh_cdr (ssb));
+      SCM ssb = me->get_elt_property ("beautiful");
+      Real sb = 0;
+      if (gh_number_p (ssb))
+       sb = gh_scm2double (ssb);
 
       bb.minimise_enclosed_area (me->paper_l(), sb);
       SCM sbf = scm_assq (ly_symbol2scm ("force-blowfit"), details);

diff --git a/ly/engraver.ly b/ly/engraver.ly
index 6db1546235f92dacb7001b3f58e98c2d690846fc..79b9632739cba4cae7172d95806e0d56ee76c531 100644 (file)
--- a/ly/engraver.ly
+++ b/ly/engraver.ly
@@ -777,7 +777,8 @@ ScoreContext = \translator {
                (extremity-rules . ,default-slur-extremity-rules)
                (extremity-offset-alist . ,default-slur-extremity-offset-alist)
                (de-uglify-parameters . ( 1.5  0.8  -2.0))
-               (details . ((height-limit . 2.0) (ratio . 0.333) (force-blowfit . 0.5) (beautiful . 0.5)))
+               (details . ((height-limit . 2.0) (ratio . 0.333) (force-blowfit . 0.5)))
+               (beautiful . 0.5)
                (y-free . 0.75)
                (slope-limit . 0.8)
                (attachment-offset . ((0 . 0) . (0 . 0)))