(make-ottava-set): bugfixes: also

process 2nd ottava correctly.

diff --git a/ChangeLog b/ChangeLog
index adf3eb9ccaa9ad499333e66bfdc86a965b8bb8ac..6a6e0e019fbb9712df2f5ee7e9911915c782890c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-27  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * scm/music-functions.scm (make-ottava-set): bugfixes: also
+       process 2nd ottava correctly.
+
 2003-05-27  Heikki Junes  <hjunes@cc.hut.fi>
 
        * lilypond-indent.el: allow strings in LilyPond-parens-alist.

diff --git a/input/regression/ottava.ly b/input/regression/ottava.ly
index fbadf825de13357831caf68245cb31fb0fde6528..562ed6ad40f75af23b174bfcebfb08fd08b9403b 100644 (file)
--- a/input/regression/ottava.ly
+++ b/input/regression/ottava.ly
@@ -16,7 +16,9 @@ use of the scheme function @code{set-octavation}.
   a b c a
   #(set-octavation 0)
 
-  a b c a 
+  a #(set-octavation 1) b
+  #(set-octavation 0)
+  c a 
 }
 }
 

diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc
index efa4eb40e2cb2e7700e296cf925c70cfb775f9ea..a00668d785e9bbc5a010ca701b762ed791aa0e01 100644 (file)
--- a/lily/beam-engraver.cc
+++ b/lily/beam-engraver.cc
@@ -164,7 +164,7 @@ Beam_engraver::process_music ()
       beam_ = 0;
     }
 
-  if (beam_ && to_boolean (get_property ("forbidBeamBreak")))
+  if (beam_ && !to_boolean (get_property ("allowBeamBreak")))
     {
       top_engraver ()->forbid_breaks ();
     }
@@ -375,6 +375,6 @@ ENTER_DESCRIPTION(Grace_beam_engraver,
 /* creats*/       "Beam",
 /* accepts */     "beam-event abort-event new-beam-event",
 /* acks  */      "stem-interface rest-interface",
-/* reads */       "beamMelismaBusy beatLength forbidBeamBreak subdivideBeams",
+/* reads */       "beamMelismaBusy beatLength allowBeamBreak subdivideBeams",
 /* write */       "");
 

diff --git a/lily/ottava-engraver.cc b/lily/ottava-engraver.cc
index e849a1d3f011ed883139a40df79f46ab4320ba56..2afa0c321aa930bf3ebfe8d632a1544b6430f700 100644 (file)
--- a/lily/ottava-engraver.cc
+++ b/lily/ottava-engraver.cc
@@ -36,6 +36,7 @@ Ottava_spanner_engraver::Ottava_spanner_engraver ()
 {
   finished_ = 0;
   span_ =0;
+  last_ottavation_ = SCM_EOL;
 }
 
 void

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 805b3757b092c9f93b90a23cb0a589aede3446ce..3dfcdbd3ebdd212c1db901421779fff19d8d4dea 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -463,7 +463,7 @@ ScoreContext = \translator {
        tupletNumberFormatFunction = #denominator-tuplet-formatter
        
        subdivideBeams = ##f
-       forbidBeamBreak = ##t
+       allowBeamBreak = ##f
        extraNatural = ##t
        autoAccidentals = #'(Staff (same-octave . 0))
        autoCautionaries = #'()  

diff --git a/scm/define-translator-properties.scm b/scm/define-translator-properties.scm
index 122de94ff49bf1a5fabfa69f67db29ca96959546..1d0818c81eaf0b94bcb0df74649e4ff9a812fcc1 100644 (file)
--- a/scm/define-translator-properties.scm
+++ b/scm/define-translator-properties.scm
@@ -251,8 +251,8 @@ another non-natural.
                                 "Used to set the relative size of all grobs
 in a context. This is done using the @code{Font_size_engraver}.")
 
-(translator-property-description 'forbidBeamBreak boolean?
-                                "If false, allow line breaks during beams.")
+(translator-property-description 'allowBeamBreak boolean?
+                                "If true allow line breaks during beams.")
 
 (translator-property-description 'forceClef boolean? "Show clef symbol, even if it hasn't changed. Only active for the first clef after the property is set, not for the full staff.")
 (translator-property-description 'graceAccidentalSpace number? "amount space to alot for an accidental")

diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index 4d99d86e3e19db52b9f8e9f9e80f2048689200aa..365efd4e756b1bf9ff8362cd827497857f99fa6c 100644 (file)
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -315,7 +315,7 @@ and set OTTAVATION to `8va', or whatever appropriate.
             (oc0 (ly:get-context-property context 'originalCentralCPosition))
 
             )
-         
+
          (ly:set-context-property context 'centralCPosition oc0)
          (ly:unset-context-property where 'originalCentralCPosition)
          (ly:unset-context-property where 'ottavation)
@@ -333,14 +333,14 @@ and set OTTAVATION to `8va', or whatever appropriate.
                                          (-2 . "15ma bassa")))))
             )
 
-         (ly:set-context-property where 'centralCPosition new-c0)
-         (ly:set-context-property where 'originalCentralCPosition c0)
-         (ly:set-context-property where 'ottavation string)
+         (ly:set-context-property context 'centralCPosition new-c0)
+         (ly:set-context-property context 'originalCentralCPosition c0)
+         (ly:set-context-property context 'ottavation string)
          
          )))
 
   (ly:set-mus-property! m 'procedure  ottava-modify)
-  m
+  (context-spec-music m "Staff" )
   ))
 
 (define-public (set-octavation ottavation)