X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmeasure-grouping-engraver.cc;h=c91fdc63418f748af80fdd4ddd0a421758226520;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=3025e2621ac9dfe5b234116b13695b95855b7189;hpb=a79995a9bd9afb1f45660ee19581d7f0e6b3d6a5;p=lilypond.git diff --git a/lily/measure-grouping-engraver.cc b/lily/measure-grouping-engraver.cc index 3025e2621a..c91fdc6341 100644 --- a/lily/measure-grouping-engraver.cc +++ b/lily/measure-grouping-engraver.cc @@ -1,16 +1,29 @@ -/* - measure-grouping-engraver.cc -- implement Measure_grouping_engraver +/* + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 2002--2015 Han-Wen Nienhuys - (c) 2002--2004 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 "spanner.hh" #include "warn.hh" #include "side-position-interface.hh" #include "global-context.hh" #include "engraver.hh" +#include "spanner.hh" + +#include "translator.icc" class Measure_grouping_engraver : public Engraver { @@ -18,12 +31,12 @@ public: TRANSLATOR_DECLARATIONS (Measure_grouping_engraver); protected: - Spanner * grouping_; + Spanner *grouping_; Rational stop_grouping_mom_; - virtual void process_music (); + void process_music (); virtual void finalize (); - virtual void acknowledge_grob (Grob_info); + void acknowledge_note_column (Grob_info); }; void @@ -31,20 +44,17 @@ Measure_grouping_engraver::finalize () { if (grouping_) { - grouping_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn"))); + grouping_->set_bound (RIGHT, unsmob (get_property ("currentCommandColumn"))); grouping_->suicide (); - grouping_= 0; + grouping_ = 0; } } - void -Measure_grouping_engraver::acknowledge_grob (Grob_info gi) +Measure_grouping_engraver::acknowledge_note_column (Grob_info gi) { if (grouping_) - { - Side_position_interface::add_support (grouping_, gi.grob_); - } + Side_position_interface::add_support (grouping_, gi.grob ()); } void @@ -54,65 +64,81 @@ Measure_grouping_engraver::process_music () if (grouping_ && now.main_part_ >= stop_grouping_mom_ && !now.grace_part_) { grouping_->set_bound (RIGHT, - unsmob_grob (get_property ("currentMusicalColumn"))); - + unsmob (get_property ("currentMusicalColumn"))); + grouping_ = 0; } - + if (now.grace_part_) - return; - - SCM grouping = get_property ("beatGrouping"); - if (ly_c_pair_p (grouping)) + return; + + SCM grouping = get_property ("beatStructure"); + if (scm_is_pair (grouping)) { - Moment *measpos = unsmob_moment (get_property ("measurePosition")); + Moment *measpos = unsmob (get_property ("measurePosition")); Rational mp = measpos->main_part_; - - Moment * beatlen = unsmob_moment (get_property ("beatLength")); - Rational bl = beatlen->main_part_; - + + Moment *base_mom = unsmob (get_property ("baseMoment")); + Rational base_moment = base_mom->main_part_; + Rational where (0); - for (SCM s = grouping; ly_c_pair_p (s); - where += Rational (ly_scm2int (ly_car (s))) * bl, - s = ly_cdr (s) - ) - { - int grouplen = ly_scm2int (ly_car (s)); - if (where == mp) - { - if (grouping_) - { - programming_error ("Huh, last grouping not finished yet."); - continue; - } - - grouping_ = make_spanner ("MeasureGrouping", SCM_EOL); - grouping_->set_bound (LEFT, unsmob_grob (get_property ("currentMusicalColumn"))); - - - - stop_grouping_mom_ = now.main_part_ + Rational (grouplen - 1) * bl ; - get_global_context ()->add_moment_to_process (Moment (stop_grouping_mom_)); - - if (grouplen == 3) - grouping_->set_property ("style", ly_symbol2scm ("triangle")); - else - grouping_->set_property ("style", ly_symbol2scm ("bracket")); - - break ; - } - } + for (SCM s = grouping; scm_is_pair (s); + where += Rational ((int) scm_to_int (scm_car (s))) * base_moment, + s = scm_cdr (s)) + { + int grouplen = scm_to_int (scm_car (s)); + if (where == mp) + { + if (grouping_) + { + programming_error ("last grouping not finished yet"); + continue; + } + if (grouplen > 1) + { + grouping_ = make_spanner ("MeasureGrouping", SCM_EOL); + grouping_->set_bound (LEFT, unsmob (get_property ("currentMusicalColumn"))); + + stop_grouping_mom_ = now.main_part_ + Rational (grouplen - 1) * base_moment; + get_global_context ()->add_moment_to_process (Moment (stop_grouping_mom_)); + + if (grouplen == 3) + grouping_->set_property ("style", ly_symbol2scm ("triangle")); + else + grouping_->set_property ("style", ly_symbol2scm ("bracket")); + + break; + } + } + } } } -Measure_grouping_engraver::Measure_grouping_engraver () + +Measure_grouping_engraver::Measure_grouping_engraver (Context *c) + : Engraver (c) { grouping_ = 0; } -ENTER_DESCRIPTION (Measure_grouping_engraver, -/* descr */ "Creates MeasureGrouping to indicate beat subdivision.", -/* creats*/ "MeasureGrouping", -/* accepts */ "", -/* acks */ "note-column-interface", -/* reads */ "beatGrouping beatLength measurePosition currentMusicalColumn", -/* write */ ""); +void +Measure_grouping_engraver::boot () +{ + ADD_ACKNOWLEDGER (Measure_grouping_engraver, note_column); +} + +ADD_TRANSLATOR (Measure_grouping_engraver, + /* doc */ + "Create @code{MeasureGrouping} to indicate beat subdivision.", + + /* create */ + "MeasureGrouping ", + + /* read */ + "baseMoment " + "beatStructure " + "currentMusicalColumn " + "measurePosition ", + + /* write */ + "" + );