source file of the GNU LilyPond music typesetter
- (c) 2008 Han-Wen Nienhuys <hanwen@lilypond.org>
+ (c) 2008--2009 Han-Wen Nienhuys <hanwen@lilypond.org>
*/
#include "engraver.hh"
+#include "hairpin.hh"
+#include "international.hh"
#include "item.hh"
-#include "pointer-group-interface.hh"
-#include "text-interface.hh"
#include "note-column.hh"
+#include "pointer-group-interface.hh"
#include "self-alignment-interface.hh"
#include "spanner.hh"
#include "stream-event.hh"
+#include "text-interface.hh"
#include "translator.icc"
if (cresc_type != ly_symbol2scm ("hairpin"))
{
// Fixme: should put value in error message.
- ly_display_scm (cresc_type);
+ string as_string = ly_scm_write_string (cresc_type);
current_span_event_
- ->origin()->warning ("unknown crescendo style; defaulting to hairpin.");
+ ->origin()->warning (_f ("unknown crescendo style: %s\ndefaulting to hairpin.", as_string.c_str()));
}
current_spanner_ = make_spanner ("Hairpin",
current_span_event_->self_scm ());
if (current_spanner_)
{
current_spanner_->set_bound (LEFT, script_);
- set_nested_property (current_spanner_,
- scm_list_3 (ly_symbol2scm ("bound-details"),
- ly_symbol2scm ("left"),
- ly_symbol2scm ("attach-dir")
- ),
- scm_from_int (RIGHT));
+
+ 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));
}
}
/* create */
"DynamicTextSpanner "
"DynamicText "
- "Hairpin "
- "TextSpanner ",
+ "Hairpin ",
/* read */
- "currentMusicalColumn ",
+ "crescendoSpanner "
+ "crescendoText "
+ "currentMusicalColumn "
+ "decrescendoSpanner "
+ "decrescendoText ",
/* write */
""