X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fproperty-iterator.cc;h=4725406323e46efceef64fb788543788009c6c76;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=7fbab5fe9d9f2dacdb58b6ff8fb456ce14dd3d5c;hpb=cec6dfa6bf0fb931eb7f42b1ee44ca2ec19a9f34;p=lilypond.git

diff --git a/lily/property-iterator.cc b/lily/property-iterator.cc
index 7fbab5fe9d..4725406323 100644
--- a/lily/property-iterator.cc
+++ b/lily/property-iterator.cc
@@ -1,26 +1,132 @@
 /*
-  property-iterator.cc -- implement Property_iterator
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.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 "property-iterator.hh"
-#include "translation-property.hh"
-#include "translator-group.hh"
 
-Property_iterator::Property_iterator (Translation_property *prop_l)
+#include "context-def.hh"
+#include "global-context.hh"
+#include "international.hh"
+#include "music.hh"
+
+bool check_grob (Music *mus, SCM sym);
+
+/**
+   There is no real processing to a property: just lookup the
+   translation unit, and set the property.
+*/
+void
+Property_iterator::process (Moment mom)
+{
+  Context *o = get_outlet ();
+  Music *m = get_music ();
+
+  send_stream_event (o, "SetProperty", m->origin (),
+                     ly_symbol2scm ("symbol"), m->get_property ("symbol"),
+                     ly_symbol2scm ("value"), m->get_property ("value"),
+                     ly_symbol2scm ("once"), m->get_property ("once"));
+
+  Simple_music_iterator::process (mom);
+}
+
+void
+Property_unset_iterator::process (Moment mom)
+{
+  Context *o = get_outlet ();
+  Music *m = get_music ();
+
+  send_stream_event (o, "UnsetProperty", m->origin (),
+                     ly_symbol2scm ("symbol"), m->get_property ("symbol"),
+                     ly_symbol2scm ("once"), m->get_property ("once"));
+
+  Simple_music_iterator::process (mom);
+}
+
+bool
+check_grob (Music *mus, SCM sym)
+{
+  bool g = to_boolean (scm_object_property (sym, ly_symbol2scm ("is-grob?")));
+
+  if (!g)
+    mus->origin ()->warning (_f ("not a grob name, `%s'",
+                                 ly_symbol2string (sym)));
+
+  return g;
+}
+
+SCM
+get_property_path (Music *m)
+{
+  SCM grob_property_path = m->get_property ("grob-property-path");
+
+  SCM eprop = m->get_property ("grob-property");
+  if (scm_is_symbol (eprop))
+    {
+      grob_property_path = scm_list_1 (eprop);
+    }
+
+  return grob_property_path;
+}
+
+void
+Push_property_iterator::process (Moment m)
 {
-  property_l_ = prop_l;
+  SCM sym = get_music ()->get_property ("symbol");
+  if (check_grob (get_music (), sym))
+    {
+      SCM grob_property_path = get_property_path (get_music ());
+      SCM val = get_music ()->get_property ("grob-value");
+      SCM once = get_music ()->get_property ("once");
+
+      if (to_boolean (get_music ()->get_property ("pop-first"))
+          && !to_boolean (once))
+        send_stream_event (get_outlet (), "Revert", get_music ()->origin (),
+                           ly_symbol2scm ("symbol"), sym,
+                           ly_symbol2scm ("property-path"), grob_property_path);
+
+      send_stream_event (get_outlet (), "Override", get_music ()->origin (),
+                         ly_symbol2scm ("symbol"), sym,
+                         ly_symbol2scm ("property-path"), grob_property_path,
+                         ly_symbol2scm ("once"), once,
+                         ly_symbol2scm ("value"), val);
+    }
+  Simple_music_iterator::process (m);
 }
 
 void
-Property_iterator::process_and_next (Moment m)
+Pop_property_iterator::process (Moment mom)
 {
-  if (property_l_->var_str_)
-    report_to_l ()->set_property (property_l_->var_str_, property_l_->value_);
-  Music_iterator::process_and_next (m);
+  Music *m = get_music ();
+  SCM sym = m->get_property ("symbol");
+
+  if (check_grob (m, sym))
+    {
+      SCM grob_property_path = get_property_path (m);
+
+      send_stream_event (get_outlet (), "Revert", m->origin (),
+                         ly_symbol2scm ("symbol"), sym,
+                         ly_symbol2scm ("once"), m->get_property ("once"),
+                         ly_symbol2scm ("property-path"), grob_property_path);
+    }
+  Simple_music_iterator::process (mom);
 }
 
-IMPLEMENT_IS_TYPE_B1(Property_iterator, Music_iterator);
+IMPLEMENT_CTOR_CALLBACK (Pop_property_iterator);
+IMPLEMENT_CTOR_CALLBACK (Push_property_iterator);
+IMPLEMENT_CTOR_CALLBACK (Property_iterator);
+IMPLEMENT_CTOR_CALLBACK (Property_unset_iterator);