X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fottava-engraver.cc;h=aafae77401e461555bd3701b35dd022c274de3a3;hb=f4c712ec8d705f02d42c5c00724de44554edd97e;hp=5b07f61592ff964d53472b063d3781f614ebac2a;hpb=b7a0cffbf9d1069860368f289a5b50e9d1d90ba8;p=lilypond.git diff --git a/lily/ottava-engraver.cc b/lily/ottava-engraver.cc index 5b07f61592..aafae77401 100644 --- a/lily/ottava-engraver.cc +++ b/lily/ottava-engraver.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2000--2009 Han-Wen Nienhuys + Copyright (C) 2000--2012 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 @@ -17,13 +17,13 @@ along with LilyPond. If not, see . */ -#include "protected-scm.hh" +#include "engraver.hh" +#include "item.hh" #include "note-column.hh" +#include "protected-scm.hh" #include "side-position-interface.hh" -#include "engraver.hh" #include "spanner.hh" #include "text-interface.hh" -#include "item.hh" class Ottava_spanner_engraver : public Engraver { @@ -68,14 +68,14 @@ Ottava_spanner_engraver::process_music () finished_ = span_; span_ = 0; if (Text_interface::is_markup (ott)) - { - span_ = make_spanner ("OttavaBracket", SCM_EOL); - span_->set_property ("text", ott); - - SCM offset (get_property ("middleCOffset")); - if (robust_scm2double (offset, 0) > 0) - span_->set_property ("direction", scm_from_int (DOWN)); - } + { + span_ = make_spanner ("OttavaBracket", SCM_EOL); + span_->set_property ("text", ott); + + SCM offset (get_property ("middleCOffset")); + if (robust_scm2double (offset, 0) > 0) + span_->set_property ("direction", scm_from_int (DOWN)); + } } last_ottavation_ = ott; } @@ -89,7 +89,7 @@ Ottava_spanner_engraver::acknowledge_note_column (Grob_info info) Side_position_interface::add_support (span_, it); if (!span_->get_bound (LEFT)) - span_->set_bound (LEFT, it); + span_->set_bound (LEFT, it); span_->set_bound (RIGHT, it); } } @@ -101,13 +101,13 @@ Ottava_spanner_engraver::typeset_all () { Direction d = LEFT; do - { - if (!finished_->get_bound (RIGHT)) - { - Grob *e = unsmob_grob (get_property ("currentMusicalColumn")); - finished_->set_bound (d, e); - } - } + { + if (!finished_->get_bound (RIGHT)) + { + Grob *e = unsmob_grob (get_property ("currentMusicalColumn")); + finished_->set_bound (d, e); + } + } while (flip (&d) != LEFT); finished_ = 0; @@ -141,17 +141,17 @@ Ottava_spanner_engraver::finalize () ADD_ACKNOWLEDGER (Ottava_spanner_engraver, note_column); ADD_TRANSLATOR (Ottava_spanner_engraver, - /* doc */ - "Create a text spanner when the ottavation property changes.", - - /* create */ - "OttavaBracket ", - - /* read */ - "ottavation " - "originalMiddleCPosition " - "currentMusicalColumn ", - - /* write */ - "" - ); + /* doc */ + "Create a text spanner when the ottavation property changes.", + + /* create */ + "OttavaBracket ", + + /* read */ + "middleCOffset " + "ottavation " + "currentMusicalColumn ", + + /* write */ + "" + );