-/*
- new-dynamic-engraver.cc -- implement New_dynamic_engraver
-
- source file of the GNU LilyPond music typesetter
-
- (c) 2008--2009 Han-Wen Nienhuys <hanwen@lilypond.org>
-
-*/
+/*
+ This file is part of LilyPond, the GNU music typesetter.
+ Copyright (C) 2008--2011 Han-Wen Nienhuys <hanwen@lilypond.org>
-#include "engraver.hh"
+ 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 "engraver.hh"
#include "hairpin.hh"
#include "international.hh"
#include "item.hh"
virtual void finalize ();
private:
+ SCM get_property_setting (Stream_event *evt, char const *evprop,
+ char const *ctxprop);
string get_spanner_type (Stream_event *ev);
Drul_array<Stream_event *> accepted_spanevents_drul_;
Spanner *current_spanner_;
Spanner *finished_spanner_;
-
+
Item *script_;
Stream_event *script_event_;
Stream_event *current_span_event_;
ASSIGN_EVENT_ONCE (accepted_spanevents_drul_[d], ev);
}
+SCM
+New_dynamic_engraver::get_property_setting (Stream_event *evt,
+ char const *evprop,
+ char const *ctxprop)
+{
+ SCM spanner_type = evt->get_property (evprop);
+ if (spanner_type == SCM_EOL)
+ spanner_type = get_property (ctxprop);
+ return spanner_type;
+}
void
New_dynamic_engraver::process_music ()
{
if (current_spanner_
- && (accepted_spanevents_drul_[STOP] || script_event_ || accepted_spanevents_drul_[START]))
+ && (accepted_spanevents_drul_[STOP]
+ || script_event_
+ || accepted_spanevents_drul_[START]))
{
Stream_event *ender = accepted_spanevents_drul_[STOP];
if (!ender)
if (!ender)
ender = accepted_spanevents_drul_[START];
-
+
finished_spanner_ = current_spanner_;
announce_end_grob (finished_spanner_, ender->self_scm ());
current_spanner_ = 0;
current_span_event_ = accepted_spanevents_drul_[START];
string start_type = get_spanner_type (current_span_event_);
- SCM cresc_type = get_property ((start_type + "Spanner").c_str ());
+ SCM cresc_type = get_property_setting (current_span_event_, "span-type",
+ (start_type + "Spanner").c_str ());
if (cresc_type == ly_symbol2scm ("text"))
{
= make_spanner ("DynamicTextSpanner",
accepted_spanevents_drul_[START]->self_scm ());
- SCM text = get_property ((start_type + "Text").c_str ());
+ SCM text = get_property_setting (current_span_event_, "span-text",
+ (start_type + "Text").c_str ());
if (Text_interface::is_markup (text))
- {
- current_spanner_->set_property ("text", text);
- }
+ current_spanner_->set_property ("text", text);
}
else
{
}
current_spanner_ = make_spanner ("Hairpin",
current_span_event_->self_scm ());
- if (finished_spanner_)
- {
- Pointer_group_interface::add_grob (finished_spanner_,
- ly_symbol2scm ("adjacent-hairpins"),
- current_spanner_);
-
- Pointer_group_interface::add_grob (current_spanner_,
- ly_symbol2scm ("adjacent-hairpins"),
- finished_spanner_);
- }
+ }
+ if (finished_spanner_)
+ {
+ if (Hairpin::has_interface (finished_spanner_))
+ Pointer_group_interface::add_grob (finished_spanner_,
+ ly_symbol2scm ("adjacent-spanners"),
+ current_spanner_);
+ if (Hairpin::has_interface (current_spanner_))
+ Pointer_group_interface::add_grob (current_spanner_,
+ ly_symbol2scm ("adjacent-spanners"),
+ finished_spanner_);
}
}
if (finished_spanner_)
finished_spanner_->set_bound (RIGHT, script_);
if (current_spanner_)
- {
- current_spanner_->set_bound (LEFT, script_);
-
- if (!Hairpin::has_interface (current_spanner_))
- set_nested_property (current_spanner_,
- scm_list_3 (ly_symbol2scm ("bound-details"),
- ly_symbol2scm ("left"),
- ly_symbol2scm ("attach-dir")
- ),
- scm_from_int (RIGHT));
-
- }
+ current_spanner_->set_bound (LEFT, script_);
}
}
-
-
void
New_dynamic_engraver::stop_translation_timestep ()
{
if (finished_spanner_ && !finished_spanner_->get_bound (RIGHT))
- finished_spanner_->set_bound (RIGHT,
- unsmob_grob (get_property ("currentMusicalColumn")));
+ finished_spanner_
+ ->set_bound (RIGHT,
+ unsmob_grob (get_property ("currentMusicalColumn")));
if (current_spanner_ && !current_spanner_->get_bound (LEFT))
- current_spanner_->set_bound (LEFT,
- unsmob_grob (get_property ("currentMusicalColumn")));
+ current_spanner_
+ ->set_bound (LEFT,
+ unsmob_grob (get_property ("currentMusicalColumn")));
script_ = 0;
script_event_ = 0;
accepted_spanevents_drul_.set (0, 0);
type = "crescendo";
else
programming_error ("unknown dynamic spanner type");
+
return type;
}
if (script_ && !script_->get_parent (X_AXIS))
{
extract_grob_set (info.grob (), "note-heads", heads);
- if (heads.size ())
+ /*
+ Spacing constraints may require dynamics to be aligned on rests,
+ so check for a rest if this note column has no note heads.
+ */
+ Grob *x_parent = (heads.size ()
+ ? heads[0]
+ : unsmob_grob (info.grob ()->get_object ("rest")));
+ if (x_parent)
{
- Grob *head = heads[0];
- script_->set_parent (head, X_AXIS);
+ script_->set_parent (x_parent, X_AXIS);
Self_alignment_interface::set_center_parent (script_, X_AXIS);
}
}
ADD_ACKNOWLEDGER (New_dynamic_engraver, note_column);
ADD_TRANSLATOR (New_dynamic_engraver,
/* doc */
- "Create hairpins, dynamic texts, and their vertical"
- " alignments. The symbols are collected onto a"
- " @code{DynamicLineSpanner} grob which takes care of vertical"
- " positioning.",
+ "Create hairpins, dynamic texts and dynamic text spanners.",
/* create */
"DynamicTextSpanner "
projects / lilypond.git / blobdiff