*** empty log message ***

diff --git a/input/regression/quote-cue-during.ly b/input/regression/quote-cue-during.ly
index 16821ab8def9bfafa93040671835c2a0694334c7..5ed1d79c4d32a6db83d40aeb57ba618338c95513 100644 (file)
--- a/input/regression/quote-cue-during.ly
+++ b/input/regression/quote-cue-during.ly
@@ -3,7 +3,7 @@ stem directions on both quoted and main voice, and deliver the quoted
 voice in the @code{cue} @code{Voice}."
 
 }
-\version "2.4.0"
+\version "2.5.0"
 \layout {
     raggedright = ##t
 }

diff --git a/input/regression/quote-cyclic.ly b/input/regression/quote-cyclic.ly
index 7d5717cbabbf2c6dd6ac7f392545791035be9bf6..c9f1ec9a7037bfe639b7e79c1c801ba87f236e92 100644 (file)
--- a/input/regression/quote-cyclic.ly
+++ b/input/regression/quote-cyclic.ly
@@ -6,11 +6,11 @@ example, there are notes with each full-bar rest."
          
  
 }
-\version "2.4.0"
+\version "2.5.0"
 A = \relative c' { c4 d e f | << R1            \\
-                                \quote "qB" 1 >> | }
+                                \quoteDuring #"qB" { \skip 1 } >> | }
 B = \relative c' { << R1            \\
-                     \quote "qA" 1 >> | f4 e d c | }
+                     \quoteDuring #"qA" { \skip 1 } >> | f4 e d c | }
 
 \addquote "qA" \A
 \addquote "qB" \B

diff --git a/input/regression/quote-during.ly b/input/regression/quote-during.ly
index 7d51fccc90ced411628f7e005167fb67fd7225f6..8d7324cd01c8d1d47599b80d6050557783977593 100644 (file)
--- a/input/regression/quote-during.ly
+++ b/input/regression/quote-during.ly
@@ -8,7 +8,7 @@ quoted. In this example, a 16th rests is not quoted, since
 @code{rest-event} is not in @code{quotedEventTypes}."
 
 }
-\version "2.4.0"
+\version "2.5.0"
 \layout {
     raggedright = ##t
 }

diff --git a/input/regression/quote-transposition.ly b/input/regression/quote-transposition.ly
index ccceb187e4d84df09ec98ea14ff478295a423cdf..de9c94f2d7e114f8dbab2655b21f3f3a2b47f005 100644 (file)
--- a/input/regression/quote-transposition.ly
+++ b/input/regression/quote-transposition.ly
@@ -10,7 +10,7 @@ quoted ones) will transposed as well.  "
 
 }
 
-\version "2.4.0"
+\version "2.5.0"
 
 \layout { raggedright = ##t }
 
@@ -32,8 +32,8 @@ quoteTest = {
     \transposition f  % french horn
     
     g'4
-    << \quote clarinet 4 s4^"clar" >> 
-    << \quote sax 4 s4^"sax" >> 
+    << \quoteDuring #"clarinet" { \skip 4 } s4^"clar" >> 
+    << \quoteDuring #"sax" { \skip 4 } s4^"sax" >> 
 }
 
 

diff --git a/input/regression/quote.ly b/input/regression/quote.ly
index 8738478a913e57df2c9bb8002397a76dd3e5e127..0d7516c47ee53b1596c751281042222c50afd109 100644 (file)
--- a/input/regression/quote.ly
+++ b/input/regression/quote.ly
@@ -7,13 +7,13 @@ things are quoted. In this example, a 16th rests is not quoted, since
 @code{rest-event} is not in @code{quotedEventTypes}."
 
 }
-\version "2.4.0"
+\version "2.5.0"
 \layout {
     raggedright = ##t
 }
 
 
-quoteMe = \relative c' { fis4 r16  a8.-> b4-\ff }
+quoteMe = \relative c' { fis4 r16  a8.-> b4-\ff c }
 
 \addquote quoteMe \quoteMe 
 original = \relative c'' { c8 d s2 es8 gis8 }
@@ -35,7 +35,7 @@ original = \relative c'' { c8 d s2 es8 gis8 }
            s4
            \set fontSize = #-4
            \override Stem #'lengths = #'(2.5 2.5 3.0 3.0)
-           \quote quoteMe 2.
+           \quoteDuring #"quoteMe" { \skip 2. }
        }
     >>
 >>

diff --git a/lily/new-quote-iterator.cc b/lily/new-quote-iterator.cc
index de4cc8954b50d5c4ee0defdb60d25388baa257fb..241f77b63508267dbc0b52898204724d1d2c2f12 100644 (file)
--- a/lily/new-quote-iterator.cc
+++ b/lily/new-quote-iterator.cc
@@ -184,6 +184,9 @@ New_quote_iterator::process (Moment m)
   if (Music_wrapper_iterator::ok())
     Music_wrapper_iterator::process (m);
 
+  if (!ly_c_vector_p (event_vector_))
+    return ;
+  
   if (event_idx_ < 0)
     {
       event_idx_ = binsearch_scm_vector (event_vector_,