-/*
- 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 <hanwen@xs4all.nl>
- (c) 2002--2004 Han-Wen Nienhuys <hanwen@cs.uu.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 "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
{
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
{
if (grouping_)
{
- grouping_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn")));
+ grouping_->set_bound (RIGHT, unsmob<Grob> (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
if (grouping_ && now.main_part_ >= stop_grouping_mom_ && !now.grace_part_)
{
grouping_->set_bound (RIGHT,
- unsmob_grob (get_property ("currentMusicalColumn")));
-
+ unsmob<Grob> (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<Moment> (get_property ("measurePosition"));
Rational mp = measpos->main_part_;
-
- Moment * beatlen = unsmob_moment (get_property ("beatLength"));
- Rational bl = beatlen->main_part_;
-
+
+ Moment *base_mom = unsmob<Moment> (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<Grob> (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 */
+ ""
+ );
projects / lilypond.git / blobdiff