X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftime-signature-engraver.cc;h=1c6cd69bd4518b4571caf4b1e931c2bb8a612b9e;hb=bed2a69b131afe27801ac467fea9f7f402949705;hp=52cf5e73fbda8ff5bf66463053f35a981154f023;hpb=0eb7d103fae1508384b1918069f9b6ef16fe5837;p=lilypond.git diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc index 52cf5e73fb..1c6cd69bd4 100644 --- a/lily/time-signature-engraver.cc +++ b/lily/time-signature-engraver.cc @@ -1,15 +1,29 @@ /* - time-signature-engraver.cc -- implement Time_signature_engraver + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2012 Han-Wen Nienhuys - (c) 1997--2005 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 "time-signature.hh" -#include "warn.hh" #include "engraver-group.hh" + +#include "item.hh" +#include "international.hh" #include "misc.hh" +#include "time-signature.hh" +#include "warn.hh" /** generate time_signatures. @@ -52,20 +66,25 @@ Time_signature_engraver::process_music () { int den = scm_to_int (scm_cdr (fr)); if (den != (1 << intlog2 (den))) - { - /* - Todo: should make typecheck? + { + /* + Todo: should make typecheck? - OTOH, Tristan Keuris writes 8/20 in his Intermezzi. - */ - warning (_f ("strange time signature found: %d/%d", - den, - scm_to_int (scm_car (fr)))); - } + OTOH, Tristan Keuris writes 8/20 in his Intermezzi. + */ + warning (_f ("strange time signature found: %d/%d", + int (scm_to_int (scm_car (fr))), + den)); + } - last_time_fraction_ = fr; time_signature_ = make_item ("TimeSignature", SCM_EOL); time_signature_->set_property ("fraction", fr); + + if (last_time_fraction_ == SCM_BOOL_F) + time_signature_->set_property ("break-visibility", + get_property ("implicitTimeSignatureVisibility")); + + last_time_fraction_ = fr; } } @@ -78,8 +97,17 @@ Time_signature_engraver::stop_translation_timestep () #include "translator.icc" ADD_TRANSLATOR (Time_signature_engraver, - /* doc */ "Create a TimeSignature whenever @code{timeSignatureFraction} changes", - /* create */ "TimeSignature", - /* accept */ "", - /* read */ "", - /* write */ ""); + /* doc */ + "Create a @ref{TimeSignature} whenever" + " @code{timeSignatureFraction} changes.", + + /* create */ + "TimeSignature ", + + /* read */ + "implicitTimeSignatureVisibility " + "timeSignatureFraction ", + + /* write */ + "" + );