X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftiming-translator.cc;h=6c3a5c88c233343a2fad6fba9450cb58e72c6472;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=81d82eec97a71d02c9c2005954304ad4e2261e41;hpb=9a73c67a79a21b889d67f8d28f2c106de830d936;p=lilypond.git diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc index 81d82eec97..6c3a5c88c2 100644 --- a/lily/timing-translator.cc +++ b/lily/timing-translator.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2012 Han-Wen Nienhuys + Copyright (C) 1997--2015 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 @@ -22,6 +22,7 @@ #include "warn.hh" #include "translator-group.hh" #include "global-context.hh" +#include "moment.hh" void Timing_translator::stop_translation_timestep () @@ -46,18 +47,19 @@ Timing_translator::stop_translation_timestep () void Timing_translator::initialize () { - Context *timing = unsmob_context (scm_call_2 (ly_lily_module_constant ("ly:context-find"), - context ()->self_scm (), - ly_symbol2scm ("Timing"))); + Context *timing = Context::unsmob (scm_call_2 (ly_lily_module_constant ("ly:context-find"), + context ()->self_scm (), + ly_symbol2scm ("Timing"))); if (timing != context ()) { context ()->add_alias (ly_symbol2scm ("Timing")); - if (!timing) { - programming_error ("Can't find Timing context template"); - timing = context (); - } - } + if (!timing) + { + programming_error ("Can't find Timing context template"); + timing = context (); + } + } SCM barnumber = timing->get_property ("currentBarNumber"); if (!scm_is_integer (barnumber)) @@ -65,24 +67,88 @@ Timing_translator::initialize () context ()->set_property ("currentBarNumber", barnumber); context ()->set_property ("internalBarNumber", barnumber); - context ()->set_property ("timeSignatureFraction", - timing->get_property ("timeSignatureFraction")); + SCM timeSignatureFraction = timing->get_property ("timeSignatureFraction"); + + if (!scm_is_pair (timeSignatureFraction)) + { + programming_error ("missing timeSignatureFraction"); + timeSignatureFraction = scm_cons (scm_from_int (4), scm_from_int (4)); + } + context ()->set_property ("timeSignatureFraction", timeSignatureFraction); + + SCM measureLength = timing->get_property ("measureLength"); + + if (!Moment::is_smob (measureLength)) + { + measureLength = + Moment (ly_scm2rational + (scm_divide (scm_car (timeSignatureFraction), + scm_cdr (timeSignatureFraction)))).smobbed_copy (); + } + context ()->set_property ("measureLength", measureLength); + /* Do not init measurePosition; this should be done from global context. */ - context ()->set_property ("measureLength", - timing->get_property ("measureLength")); - context ()->set_property ("baseMoment", - timing->get_property ("baseMoment")); + + SCM timeSignatureSettings = timing->get_property ("timeSignatureSettings"); + if (!scm_is_pair (timeSignatureSettings)) + { + programming_error ("missing timeSignatureSettings"); + // A memoized constant is not the prettiest thing as a fallback + // since it does not track changes of the variable. However, + // this is still better than nothing, and we already complained + // via a programming_error + timeSignatureSettings = ly_lily_module_constant ("default-time-signature-settings"); + } + context ()->set_property ("timeSignatureSettings", timeSignatureSettings); + + SCM beamExceptions = timing->get_property ("beamExceptions"); + if (!scm_is_pair (beamExceptions)) + { + beamExceptions = + scm_call_2 (ly_lily_module_constant ("beam-exceptions"), + timeSignatureFraction, + timeSignatureSettings); + } + context ()->set_property ("beamExceptions", beamExceptions); + + SCM baseMoment = timing->get_property ("baseMoment"); + if (!Moment::is_smob (baseMoment)) + { + baseMoment = + Moment (ly_scm2rational + (scm_call_2 (ly_lily_module_constant ("base-length"), + timeSignatureFraction, + timeSignatureSettings))).smobbed_copy (); + } + context ()->set_property ("baseMoment", baseMoment); + + SCM beatStructure = timing->get_property ("beatStructure"); + if (!scm_is_pair (beatStructure)) + { + beatStructure = + scm_call_3 (ly_lily_module_constant ("beat-structure"), + ly_rational2scm (Moment::unsmob (baseMoment)->main_part_), + timeSignatureFraction, + timeSignatureSettings); + } + context ()->set_property ("beatStructure", beatStructure); + + context ()->set_property ("beamHalfMeasure", + timing->get_property ("beamHalfMeasure")); + + context ()->set_property ("autoBeaming", + timing->get_property ("autoBeaming")); } Rational Timing_translator::measure_length () const { SCM l = get_property ("measureLength"); - if (unsmob_moment (l)) - return unsmob_moment (l)->main_part_; + if (Moment::is_smob (l)) + return Moment::unsmob (l)->main_part_; else return Rational (1); } @@ -115,31 +181,49 @@ Timing_translator::start_translation_timestep () Moment measposp; SCM s = get_property ("measurePosition"); - if (unsmob_moment (s)) - measposp = *unsmob_moment (s); + if (Moment::is_smob (s)) + measposp = *Moment::unsmob (s); else { measposp = now; - context ()->set_property ("measurePosition", - measposp.smobbed_copy ()); } - measposp += dt; - int current_barnumber = robust_scm2int (get_property ("currentBarNumber"), 0); int internal_barnumber = robust_scm2int (get_property ("internalBarNumber"), 0); SCM cad = get_property ("timing"); bool c = to_boolean (cad); - Rational len = measure_length (); - while (c && measposp.main_part_ >= len) + if (c) { - measposp.main_part_ -= len; - current_barnumber++; - internal_barnumber++; + Rational len = measure_length (); + + measposp += dt; + + while (measposp.main_part_ >= len) + { + measposp.main_part_ -= len; + current_barnumber++; + internal_barnumber++; + } } + + // Because "timing" can be switched on and off asynchronously with + // graces, measurePosition might get into strange settings of + // grace_part_. It does not actually make sense to have it diverge + // from the main timing. Updating the grace part outside of the + // actual check for "timing" looks strange and will lead to changes + // of grace_part_ even when timing is off. However, when timing is + // switched back on again, this will generally happen in an override + // that does _not_ in itself advance current_moment. So the whole + // timing advance logic will only get triggered while "timing" is + // still of. Maybe we should keep measurePosition.grace_part_ + // constantly at zero anyway? + + measposp.grace_part_ = now.grace_part_; + + context ()->set_property ("currentBarNumber", scm_from_int (current_barnumber)); context ()->set_property ("internalBarNumber", scm_from_int (internal_barnumber)); context ()->set_property ("measurePosition", measposp.smobbed_copy ()); @@ -159,12 +243,12 @@ ADD_TRANSLATOR (Timing_translator, "", /* read */ - "baseMoment " + "baseMoment " "currentBarNumber " "internalBarNumber " "measureLength " "measurePosition " - "timeSignatureFraction ", + "timeSignatureFraction ", /* write */ "baseMoment "