X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fvolta-engraver.cc;h=bd198cbb67faad5c395bd1567133d6413019c938;hb=0398fdb9df24ac2e22a8cbff1b3c18ca04e9f221;hp=1860cbcf518261444a4200cad0adc93a13d0763b;hpb=624419506b254fc1a3fad0c2eb8a01a1d9bc90bb;p=lilypond.git diff --git a/lily/volta-engraver.cc b/lily/volta-engraver.cc index 1860cbcf51..bd198cbb67 100644 --- a/lily/volta-engraver.cc +++ b/lily/volta-engraver.cc @@ -1,14 +1,25 @@ /* - volta-engraver.cc -- implement Volta_engraver + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 2000--2015 Han-Wen Nienhuys - (c) 2000--2007 Han-Wen Nienhuys + 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 . */ #include "engraver.hh" -#include "bar-line.hh" +#include "axis-group-interface.hh" #include "context.hh" #include "grob-array.hh" #include "international.hh" @@ -39,8 +50,9 @@ protected: void process_music (); Moment started_mom_; - Spanner *volta_span_; - Spanner *end_volta_span_; + Spanner *volta_bracket_; + Spanner *end_volta_bracket_; + Spanner *volta_spanner_; SCM start_string_; }; @@ -53,8 +65,9 @@ Volta_engraver::derived_mark () const Volta_engraver::Volta_engraver () { start_string_ = SCM_EOL; - volta_span_ = 0; - end_volta_span_ = 0; + volta_bracket_ = 0; + end_volta_bracket_ = 0; + volta_spanner_ = 0; } void @@ -69,96 +82,108 @@ Volta_engraver::process_music () SCM c = scm_car (cs); if (scm_is_pair (c) - && scm_car (c) == ly_symbol2scm ("volta") - && scm_is_pair (scm_cdr (c))) - { - if (scm_cadr (c) == SCM_BOOL_F) - end = true; - else - start_string_ = scm_cadr (c); - } + && scm_is_eq (scm_car (c), ly_symbol2scm ("volta")) + && scm_is_pair (scm_cdr (c))) + { + if (scm_is_false (scm_cadr (c))) + end = true; + else + start_string_ = scm_cadr (c); + } cs = scm_cdr (cs); } - if (volta_span_) + if (volta_bracket_) { SCM l (get_property ("voltaSpannerDuration")); Moment now = now_mom (); - bool early_stop = unsmob_moment (l) - && *unsmob_moment (l) <= now - started_mom_; + bool early_stop = unsmob (l) + && *unsmob (l) <= now - started_mom_; end = end || early_stop; } - if (end && !volta_span_) + if (end && !volta_bracket_) /* fixme: be more verbose. */ warning (_ ("cannot end volta spanner")); else if (end) { - end_volta_span_ = volta_span_; - volta_span_ = 0; + end_volta_bracket_ = volta_bracket_; + volta_bracket_ = 0; } - if (volta_span_ + if (volta_bracket_ && (scm_is_string (start_string_) || scm_is_pair (start_string_))) { warning (_ ("already have a volta spanner, ending that one prematurely")); - if (end_volta_span_) - { - warning (_ ("also already have an ended spanner")); - warning (_ ("giving up")); - return; - } + if (end_volta_bracket_) + { + warning (_ ("also already have an ended spanner")); + warning (_ ("giving up")); + return; + } - end_volta_span_ = volta_span_; - volta_span_ = 0; + end_volta_bracket_ = volta_bracket_; + volta_bracket_ = 0; } - if (!volta_span_ + if (!volta_bracket_ && Text_interface::is_markup (start_string_)) { started_mom_ = now_mom (); - volta_span_ = make_spanner ("VoltaBracket", SCM_EOL); + volta_bracket_ = make_spanner ("VoltaBracket", SCM_EOL); + + volta_bracket_->set_property ("text", start_string_); + + if (!volta_spanner_) + volta_spanner_ = make_spanner ("VoltaBracketSpanner", SCM_EOL); - volta_span_->set_property ("text", start_string_); + Axis_group_interface::add_element (volta_spanner_, volta_bracket_); } } void Volta_engraver::acknowledge_bar_line (Grob_info i) { - if (volta_span_) - Volta_bracket_interface::add_bar (volta_span_, i.item ()); - if (end_volta_span_) - Volta_bracket_interface::add_bar (end_volta_span_, i.item ()); + if (volta_bracket_) + Volta_bracket_interface::add_bar (volta_bracket_, i.item ()); + if (end_volta_bracket_) + Volta_bracket_interface::add_bar (end_volta_bracket_, i.item ()); + + if (volta_spanner_) + Side_position_interface::add_support (volta_spanner_, i.grob ()); } void Volta_engraver::stop_translation_timestep () { - if (end_volta_span_ && !end_volta_span_->get_bound (RIGHT)) - { - Grob *cc = unsmob_grob (get_property ("currentCommandColumn")); - Item *ci = dynamic_cast (cc); - end_volta_span_->set_bound (RIGHT, ci); - } + Grob *cc = unsmob (get_property ("currentCommandColumn")); + Item *ci = dynamic_cast (cc); - if (end_volta_span_) - for (SCM s = get_property ("stavesFound"); scm_is_pair (s); s = scm_cdr (s)) - Side_position_interface::add_support (end_volta_span_, unsmob_grob (scm_car (s))); + if (end_volta_bracket_ && !end_volta_bracket_->get_bound (RIGHT)) + end_volta_bracket_->set_bound (RIGHT, ci); - end_volta_span_ = 0; + if (volta_spanner_ && end_volta_bracket_) + volta_spanner_->set_bound (RIGHT, end_volta_bracket_->get_bound (RIGHT)); - if (volta_span_ && !volta_span_->get_bound (LEFT)) + if (end_volta_bracket_ && !volta_bracket_) { - Grob *cc = unsmob_grob (get_property ("currentCommandColumn")); - Item *ci = dynamic_cast (cc); - volta_span_->set_bound (LEFT, ci); + for (SCM s = get_property ("stavesFound"); scm_is_pair (s); s = scm_cdr (s)) + Side_position_interface::add_support (volta_spanner_, unsmob (scm_car (s))); + volta_spanner_ = 0; } + + end_volta_bracket_ = 0; + + if (volta_bracket_ && !volta_bracket_->get_bound (LEFT)) + volta_bracket_->set_bound (LEFT, ci); + + if (volta_spanner_ && volta_bracket_ && !volta_spanner_->get_bound (LEFT)) + volta_spanner_->set_bound (LEFT, volta_bracket_->get_bound (LEFT)); } /* @@ -166,7 +191,18 @@ Volta_engraver::stop_translation_timestep () */ ADD_ACKNOWLEDGER (Volta_engraver, bar_line); ADD_TRANSLATOR (Volta_engraver, - /* doc */ "Make volta brackets.", - /* create */ "VoltaBracket", - /* read */ "repeatCommands voltaSpannerDuration stavesFound", - /* write */ ""); + /* doc */ + "Make volta brackets.", + + /* create */ + "VoltaBracket " + "VoltaBracketSpanner ", + + /* read */ + "repeatCommands " + "voltaSpannerDuration " + "stavesFound ", + + /* write */ + "" + );