Also don't reset it in \cadenzaOff, and leave autoBeaming alone in
\cadenzaOn/\cadenzaOff. This should cause quite fewer interferences
of cadenze with timing, accidentals, barlines and other stuff.
"defaultBarType "
"measureLength "
"whichBar "
"defaultBarType "
"measureLength "
"whichBar "
+ "measurePosition "
+ "timing ",
);
Default_bar_line_engraver::Default_bar_line_engraver ()
);
Default_bar_line_engraver::Default_bar_line_engraver ()
Moment mp = measure_position (context ());
bool start_of_measure = (last_moment_.main_part_ != now.main_part_
Moment mp = measure_position (context ());
bool start_of_measure = (last_moment_.main_part_ != now.main_part_
+ && !mp.main_part_
+ && to_boolean (get_property ("timing")));
if (!scm_is_string (which) && to_boolean (automatic_bars))
{
if (!scm_is_string (which) && to_boolean (automatic_bars))
{
measposp.smobbed_copy ());
}
measposp.smobbed_copy ());
}
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);
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)
- 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++;
+ }
}
context ()->set_property ("currentBarNumber", scm_from_int (current_barnumber));
}
context ()->set_property ("currentBarNumber", scm_from_int (current_barnumber));
-cadenzaOn = {
- \set Timing.timing = ##f
- \set Timing.autoBeaming = ##f
-}
-
-cadenzaOff = {
- \set Timing.timing = ##t
- \set Timing.measurePosition = #ZERO-MOMENT
- \set Timing.autoBeaming = ##t
-}
+cadenzaOn = \set Timing.timing = ##f
+cadenzaOff = \set Timing.timing = ##t