X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdefault-bar-line-engraver.cc;h=4eeb23036774feb4373e67bdad6e5577918678ba;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=3b5555f5818a26cc71f3712df1dac041b57180ec;hpb=d61cf3bbdb1c6670a127ba3baddf2f04d3e34fd3;p=lilypond.git diff --git a/lily/default-bar-line-engraver.cc b/lily/default-bar-line-engraver.cc index 3b5555f581..4eeb230367 100644 --- a/lily/default-bar-line-engraver.cc +++ b/lily/default-bar-line-engraver.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 @@ -52,10 +52,11 @@ ADD_TRANSLATOR (Default_bar_line_engraver, "defaultBarType " "measureLength " "whichBar " - "measurePosition ", + "measurePosition " + "timing ", /* write */ - "automaticBars " + "" ); Default_bar_line_engraver::Default_bar_line_engraver () @@ -76,7 +77,8 @@ Default_bar_line_engraver::start_translation_timestep () Moment mp = measure_position (context ()); bool start_of_measure = (last_moment_.main_part_ != now.main_part_ - && !mp.main_part_); + && !mp.main_part_ + && to_boolean (get_property ("timing"))); if (!scm_is_string (which) && to_boolean (automatic_bars)) {