Imported Upstream version 2.14.2

[lilypond.git] / lily / quote-iterator.cc

diff --git a/lily/quote-iterator.cc b/lily/quote-iterator.cc
index 820d0ed1587fbd36826a2b7cf022e6ed6c36ef65..749bc13407befb65449969c75e92190e248bcc6d 100644 (file)
--- a/lily/quote-iterator.cc
+++ b/lily/quote-iterator.cc
@@ -1,14 +1,26 @@
 /*
-  quote-iterator.cc -- implement Quote_iterator
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2004--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "music-wrapper-iterator.hh"
 
 #include "context.hh"
+#include "dispatcher.hh"
 #include "input.hh"
 #include "international.hh"
 #include "lily-guile.hh"
@@ -33,7 +45,7 @@ public:
 
   DECLARE_SCHEME_CALLBACK (constructor, ());
   bool quote_ok () const;
-  bool accept_music_type (Music *) const;
+  bool accept_music_type (Stream_event *, bool is_cue = true) const;
 
 protected:
   virtual void derived_mark () const;
@@ -52,16 +64,21 @@ Quote_iterator::do_quit ()
 }
 
 bool
-Quote_iterator::accept_music_type (Music *mus) const
+Quote_iterator::accept_music_type (Stream_event *ev, bool is_cue) const
 {
-  SCM accept = get_outlet ()->get_property ("quotedEventTypes");
-  for (SCM s = mus->get_property ("types");
-       scm_is_pair (s); s = scm_cdr (s))
+  SCM accept = SCM_EOL;
+  // Cue notes use the quotedCueEventTypes property, otherwise (and as fallback
+  // for cue notes if quotedCueEventTypes is not set) use quotedEventTypes
+  if (is_cue)
+    accept = get_outlet ()->get_property ("quotedCueEventTypes");
+  if (accept == SCM_EOL)
+    accept = get_outlet ()->get_property ("quotedEventTypes");
+
+  for (; scm_is_pair (accept); accept = scm_cdr (accept))
     {
-      if (scm_memq (scm_car (s), accept) != SCM_BOOL_F)
+      if (ev->internal_in_event_class (scm_car (accept)))
        return true;
     }
-
   return false;
 }
 
@@ -225,16 +242,19 @@ Quote_iterator::process (Moment m)
       Pitch *me_pitch = unsmob_pitch (get_music ()->get_property ("quoted-transposition"));
       if (!me_pitch)
        me_pitch = unsmob_pitch (get_outlet ()->get_property ("instrumentTransposition"));
+      SCM cid = get_music ()->get_property ("quoted-context-id");
+      bool is_cue = scm_is_string (cid) && (ly_scm2string (cid) == "cue");
 
       for (SCM s = scm_cdr (entry); scm_is_pair (s); s = scm_cdr (s))
        {
          SCM ev_acc = scm_car (s);
 
-         Music *mus = unsmob_music (scm_car (ev_acc));
-         if (!mus)
+         Stream_event *ev = unsmob_stream_event (scm_car (ev_acc));
+         if (!ev)
            programming_error ("no music found in quote");
-         else if (accept_music_type (mus))
+         else if (accept_music_type (ev, is_cue))
            {
+             /* create a transposed copy if necessary */
              if (quote_pitch || me_pitch)
                {
                  Pitch qp, mp;
@@ -244,18 +264,12 @@ Quote_iterator::process (Moment m)
                    mp = *me_pitch;
 
                  Pitch diff = pitch_interval (qp, mp);
-
-                 SCM copy = ly_music_deep_copy (mus->self_scm ());
-                 mus = unsmob_music (copy);
-
-                 transposed_musics_ = scm_cons (copy, transposed_musics_);
-                 mus->transpose (diff);
+                 ev = ev->clone ();
+                 
+                 transpose_mutable (ev->get_property_alist (true), diff);
+                 transposed_musics_ = scm_cons (ev->unprotect (), transposed_musics_);
                }
-
-             bool b = quote_outlet_.get_outlet ()->try_music (mus);
-             if (!b)
-               mus->origin ()->warning (_f ("in quotation: junking event %s",
-                                            mus->name ()));
+             quote_outlet_.get_outlet ()->event_source ()->broadcast (ev);
            }
        }