Merge branch 'master' of ssh+git://jneem@git.sv.gnu.org/srv/git/lilypond

diff --git a/THANKS b/THANKS
index 98c05e8a7f5b5b71ec86f7fa8cd84f4d082bb824..94f71d220862707fa81e5ac1e13ccec350fe9f8e 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -23,6 +23,7 @@ Benjamin Drung
 David Bobroff
 Cameron Horsburgh
 Maarten Hijzelendoorn 
+Matthijs Frankeno
 Phillip Kirlin
 Rick Hansen
 Thomas Scharkowski

diff --git a/buildscripts/pfx2ttf.fontforge b/buildscripts/pfx2ttf.fontforge
index ec0f9a214abbb3ecb6f7f392e6e4da072fbe3bbf..cdb82475f67079612a02a406c5b6593b619e1df5 100644 (file)
--- a/buildscripts/pfx2ttf.fontforge
+++ b/buildscripts/pfx2ttf.fontforge
@@ -3,6 +3,22 @@
 Open($1);
 MergeKern($2)
 
+
+# 
+# NCSB is broken as shipped by Fedora Core 6
+# it contains bogus ligatures TM and No in the AFM file.
+#
+# Remove the TM glyph - for want of better FF fix.  
+err = SelectIf("trademark");
+if ( err > 0 )
+   Cut();
+elseif ( err == 0 )
+   Print("Could not find \"trademark\" glyph");
+elseif ( err < 0 )
+   Print("An error occurred while searching for the \"trademark\" glyph");
+endif
+
+
 # Remove the No. glyph - for want of better FF fix.  
 err = SelectIf("afii61352");
 if ( err > 0 )

diff --git a/input/regression/font-bogus-ligature.ly b/input/regression/font-bogus-ligature.ly
new file mode 100644 (file)
index 0000000..ec7399e
--- /dev/null
+++ b/input/regression/font-bogus-ligature.ly
@@ -0,0 +1,16 @@
+\header
+{
+  texidoc = "TM and No should not be changed into trademark/number symbols.
+This may happen with incorrect font versions.
+"
+}
+
+\version "2.10.0"
+
+\paper {
+  ragged-right = ##T
+}
+
+{
+  c4^"November WHITMAN"
+}

diff --git a/input/regression/quote-tuplet.ly b/input/regression/quote-tuplet.ly
new file mode 100644 (file)
index 0000000..0579d4f
--- /dev/null
+++ b/input/regression/quote-tuplet.ly
@@ -0,0 +1,31 @@
+
+\version "2.10.0"
+
+\header {
+
+  texidoc = "In cue notes, Tuplet stops are handled before new tuplets
+  start."
+
+}
+
+foo = \relative {
+  \times 2/3 { c4 c c } \times 2/3 { c4 c c }
+}
+
+\addquote "foo" { \foo }
+
+\paper {
+  ragged-right = ##t
+}
+
+\new Staff
+<<
+  \new Voice \transpose c c' {
+    \override Stem #'direction = #UP
+    \foo
+  }
+  \new Voice {
+    \cueDuring #"foo" #DOWN { s1 }
+  }
+>>
+  

diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc
index 946fd1d80272e03d4266f024a8b7e25891d6acbd..441fdd7610783a45c8644aa662bf96fca5cb72aa 100644 (file)
--- a/lily/tuplet-engraver.cc
+++ b/lily/tuplet-engraver.cc
@@ -44,8 +44,10 @@ public:
 
 protected:
   vector<Tuplet_description> tuplets_;
+  vector<Tuplet_description> new_tuplets_;
   vector<Tuplet_description> stopped_tuplets_;
   vector<Spanner*> last_tuplets_;
+  
   DECLARE_ACKNOWLEDGER (note_column);
   DECLARE_TRANSLATOR_LISTENER (tuplet_span);
   virtual void finalize ();
@@ -62,7 +64,7 @@ Tuplet_engraver::listen_tuplet_span (Stream_event *ev)
     {
       Tuplet_description d;
       d.event_ = ev;
-      tuplets_.push_back (d);
+      new_tuplets_.push_back (d);
     }
   else if (dir == STOP && tuplets_.size ())
     {
@@ -105,6 +107,8 @@ Tuplet_engraver::process_music ()
     }
   stopped_tuplets_.clear ();
 
+  concat (tuplets_, new_tuplets_);
+  new_tuplets_.clear ();
   for (vsize j = tuplets_.size (); j > 0; j--)
     {
       /* i goes from size-1 downto 0, inclusively */