bugfix.

diff --git a/ChangeLog b/ChangeLog
index aae8ec07ad8fe489b96fdd8e31b783adfd97f10b..795bde67699e18acc06be239a8f541c3f2e20ebb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-05-31  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * input/regression/tuplet-nest.ly: bugfix.
+
        * lily/tie-performer.cc (stop_translation_timestep): reset
        ties_created_. Fixes: midi-tie.ly, midi-lyrics-barcheck.ly
 

diff --git a/input/regression/span-bar.ly b/input/regression/span-bar.ly
index 04f86b2ad293053220fe9ebc2eeba667fa930fa1..cb28fd748cb6a9a87812f6f34e38a4be6168e2ce 100644 (file)
--- a/input/regression/span-bar.ly
+++ b/input/regression/span-bar.ly
@@ -3,7 +3,7 @@
   texidoc = "Span bars are drawn only between staff bar lines. By setting 
 bar lines to transparent, they are shown only between systems.
 
-Setting @code{SpanBar} transparent does the removes the barlines
+Setting @code{SpanBar} transparent  removes the barlines
 between systems.
  
 "

diff --git a/input/regression/tie-busy-grobs.ly b/input/regression/tie-busy-grobs.ly
index 3394945306e1db8089867e310b4920bc560c7784..811d9229b4b56853676968b6ae0a8a7418318af8 100644 (file)
--- a/input/regression/tie-busy-grobs.ly
+++ b/input/regression/tie-busy-grobs.ly
@@ -10,13 +10,17 @@ one may have collisions between ties and beams.
 
 \score
 {
-\notes \context Staff \relative c'' 
- <<
- {  \times 2/3 { c'8~  c8~ c8~ c8~ c8~ c8 } }
- \\
-  { \voiceTwo \times 2/5 { a,4 ~a4 ~a4~ a4~ a4 }}
- \\
-  { \voiceThree  { b,8 ~ b8 ~ b8 ~  b8 }}
- >>
+    \context Staff \relative c'' 
+    <<
+       {  \times 2/3 { c'8~  c8~ c8~ c8~ c8~ c8 } }
+       \\
+       { \voiceTwo \times 2/5 { a,4 ~a4 ~a4~ a4~ a4 }}
+       \\
+       { \voiceThree  { b,8 ~ b8 ~ b8 ~  b8 }}
+    >>
+
+    \paper {
+       raggedright = ##t
+    }
 }
 

diff --git a/input/regression/tuplet-nest.ly b/input/regression/tuplet-nest.ly
index 216ca7892f7101bb8bea0c01f8098d4227c7b2cb..f03cd4782da4fec9bfaab5d6f643db7ded1cf1fe 100644 (file)
--- a/input/regression/tuplet-nest.ly
+++ b/input/regression/tuplet-nest.ly
@@ -1,7 +1,12 @@
 
 \version "2.3.1"
+
+
 \header {
-  texidoc="By a manual hack for nested tuplets, an outer tuplet can be moved up."
+
+    texidoc=" Nested tuplets can be printed, using a manual hack to
+  move the outer bracket up."
+
 }
 
 #(define (make-text-checker-once text)
@@ -14,13 +19,14 @@
 #(define text-checker-once #t)
 
 \score {
-  \notes\relative c'' {
+    \relative c'' {
 
     \set tupletNumberFormatFunction = #fraction-tuplet-formatter
 
-    \applyoutput #(outputproperty-compatibility (make-text-checker-once "2:3")
-                  'extra-offset '(0 . 1.5))
-    \times 2/3 {
+    \applyoutput #(lambda (gr org cur)
+                  (if (equal? (ly:grob-property gr 'text) "6:4")
+                   (set! (ly:grob-property gr 'extra-offset) '(0 . 1.5))))
+    \times 4/6 {
       \times 2/3 {
         a a a
       }

diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc
index 47ce8426a50d587af915d6d4294d9cec609dea17..70378670ebc28cf85e08c359e2dfdf5053e0b377 100644 (file)
--- a/lily/tuplet-engraver.cc
+++ b/lily/tuplet-engraver.cc
@@ -32,7 +32,6 @@ protected:
   /// The spanners. Array order is synced with time_scaled_musics_
   Link_array<Spanner> started_spanners_;
 
-  virtual void finalize ();
   virtual void acknowledge_grob (Grob_info);
   virtual bool try_music (Music*r);
   virtual void start_translation_timestep ();
@@ -93,7 +92,7 @@ Tuplet_engraver::acknowledge_grob (Grob_info i)
 {
   if (Note_column::has_interface (i.grob_))
     {
-      for (int j =0; j  <started_spanners_.size (); j++)
+      for (int j =0; j < started_spanners_.size (); j++)
        if (started_spanners_[j]) 
          Tuplet_bracket::add_column (started_spanners_[j], dynamic_cast<Item*> (i.grob_));
     }
@@ -135,15 +134,10 @@ Tuplet_engraver::start_translation_timestep ()
     }
 }
 
-void
-Tuplet_engraver::finalize ()
+Tuplet_engraver::Tuplet_engraver ()
 {
 }
 
-
-
-Tuplet_engraver::Tuplet_engraver (){}
-
 ENTER_DESCRIPTION (Tuplet_engraver,
 /* descr */       "Catch Time_scaled_music and generate appropriate bracket  ",
 /* creats*/       "TupletBracket",