X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsystem-start-delimiter-engraver.cc;h=b7a210e86956e01ed9a66f63d73dabcd60b7c4f7;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=a0bc5039254db3688e3e8a07a271752c75bc436a;hpb=55ac733b69643a6bc6a83b706c65cb56efd388ef;p=lilypond.git diff --git a/lily/system-start-delimiter-engraver.cc b/lily/system-start-delimiter-engraver.cc index a0bc503925..b7a210e869 100644 --- a/lily/system-start-delimiter-engraver.cc +++ b/lily/system-start-delimiter-engraver.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2005--2011 Han-Wen Nienhuys + Copyright (C) 2005--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 @@ -26,6 +26,8 @@ #include "staff-symbol.hh" #include "system-start-delimiter.hh" +#include "translator.icc" + struct Bracket_nesting_node { public: @@ -40,7 +42,7 @@ public: struct Bracket_nesting_group : public Bracket_nesting_node { Spanner *delimiter_; - vector children_; + vector children_; SCM symbol_; void from_list (SCM); @@ -53,7 +55,6 @@ struct Bracket_nesting_group : public Bracket_nesting_node Bracket_nesting_group (); }; - struct Bracket_nesting_staff : public Bracket_nesting_node { Grob *staff_; @@ -62,7 +63,6 @@ struct Bracket_nesting_staff : public Bracket_nesting_node virtual bool add_staff (Grob *); }; - Bracket_nesting_group::Bracket_nesting_group () { symbol_ = SCM_EOL; @@ -85,9 +85,9 @@ Bracket_nesting_group::create_grobs (Engraver *engraver, SCM default_type) { SCM type = scm_is_symbol (symbol_) ? symbol_ : default_type; delimiter_ = engraver->make_spanner (ly_symbol2string (type).c_str (), - SCM_EOL); + SCM_EOL); - for (vsize i = 0 ; i < children_.size (); i++) + for (vsize i = 0; i < children_.size (); i++) children_[i]->create_grobs (engraver, default_type); } @@ -95,7 +95,7 @@ void Bracket_nesting_group::add_support (Grob *g) { Side_position_interface::add_support (g, delimiter_); - for (vsize i = 0 ; i < children_.size (); i++) + for (vsize i = 0; i < children_.size (); i++) children_[i]->add_support (g); } @@ -108,7 +108,7 @@ void Bracket_nesting_group::set_bound (Direction d, Grob *g) { delimiter_->set_bound (d, g); - for (vsize i = 0 ; i < children_.size (); i++) + for (vsize i = 0; i < children_.size (); i++) children_[i]->set_bound (d, g); } @@ -118,11 +118,10 @@ Bracket_nesting_group::set_nesting_support (Grob *parent) if (parent) Side_position_interface::add_support (delimiter_, parent); - for (vsize i = 0 ; i < children_.size (); i++) + for (vsize i = 0; i < children_.size (); i++) children_[i]->set_nesting_support (delimiter_); } - void Bracket_nesting_group::from_list (SCM x) { @@ -130,18 +129,18 @@ Bracket_nesting_group::from_list (SCM x) { SCM entry = scm_car (s); if (scm_is_pair (entry)) - { - Bracket_nesting_group *node = new Bracket_nesting_group; - node->from_list (entry); - children_.push_back (node); - } - else if (entry == ly_symbol2scm ("SystemStartBrace") - || entry == ly_symbol2scm ("SystemStartBracket") - || entry == ly_symbol2scm ("SystemStartBar") - || entry == ly_symbol2scm ("SystemStartSquare")) - symbol_ = entry; + { + Bracket_nesting_group *node = new Bracket_nesting_group; + node->from_list (entry); + children_.push_back (node); + } + else if (scm_is_eq (entry, ly_symbol2scm ("SystemStartBrace")) + || scm_is_eq (entry, ly_symbol2scm ("SystemStartBracket")) + || scm_is_eq (entry, ly_symbol2scm ("SystemStartBar")) + || scm_is_eq (entry, ly_symbol2scm ("SystemStartSquare"))) + symbol_ = entry; else - children_.push_back (new Bracket_nesting_staff (0)); + children_.push_back (new Bracket_nesting_staff (0)); } } @@ -151,18 +150,15 @@ Bracket_nesting_group::add_staff (Grob *grob) for (vsize i = 0; i < children_.size (); i++) { if (children_[i]->add_staff (grob)) - { - Pointer_group_interface::add_grob (delimiter_, - ly_symbol2scm ("elements"), grob); - return true; - } + { + Pointer_group_interface::add_grob (delimiter_, + ly_symbol2scm ("elements"), grob); + return true; + } } return false; } - - - /****************/ class System_start_delimiter_engraver : public Engraver @@ -173,14 +169,15 @@ public: protected: Bracket_nesting_group *nesting_; - DECLARE_ACKNOWLEDGER (system_start_delimiter); - DECLARE_ACKNOWLEDGER (staff_symbol); + void acknowledge_system_start_delimiter (Grob_info); + void acknowledge_staff_symbol (Grob_info); void process_music (); virtual void finalize (); }; -System_start_delimiter_engraver::System_start_delimiter_engraver () +System_start_delimiter_engraver::System_start_delimiter_engraver (Context *c) + : Engraver (c) { nesting_ = 0; } @@ -197,7 +194,7 @@ System_start_delimiter_engraver::process_music () nesting_->from_list (hierarchy); nesting_->create_grobs (this, delimiter_name); nesting_->set_bound (LEFT, - unsmob_grob (get_property ("currentCommandColumn"))); + unsmob (get_property ("currentCommandColumn"))); } } @@ -207,7 +204,7 @@ System_start_delimiter_engraver::finalize () if (nesting_) { nesting_->set_bound (RIGHT, - unsmob_grob (get_property ("currentCommandColumn"))); + unsmob (get_property ("currentCommandColumn"))); nesting_->set_nesting_support (0); delete nesting_; @@ -233,29 +230,32 @@ System_start_delimiter_engraver::acknowledge_system_start_delimiter (Grob_info i nesting_->add_support (inf.grob ()); } -#include "translator.icc" -ADD_ACKNOWLEDGER (System_start_delimiter_engraver, staff_symbol); -ADD_ACKNOWLEDGER (System_start_delimiter_engraver, system_start_delimiter); +void +System_start_delimiter_engraver::boot () +{ + ADD_ACKNOWLEDGER (System_start_delimiter_engraver, staff_symbol); + ADD_ACKNOWLEDGER (System_start_delimiter_engraver, system_start_delimiter); +} ADD_TRANSLATOR (System_start_delimiter_engraver, - /* doc */ - "Create a system start delimiter (i.e., a" - " @code{SystemStartBar}, @code{SystemStartBrace}," - " @code{SystemStartBracket} or @code{SystemStartSquare}" - " spanner).", - - /* create */ - "SystemStartSquare " - "SystemStartBrace " - "SystemStartBracket " - "SystemStartBar ", - - /* read */ - "systemStartDelimiter " - "systemStartDelimiterHierarchy " - "currentCommandColumn ", - - /* write */ - "" - ); + /* doc */ + "Create a system start delimiter (i.e., a" + " @code{SystemStartBar}, @code{SystemStartBrace}," + " @code{SystemStartBracket} or @code{SystemStartSquare}" + " spanner).", + + /* create */ + "SystemStartSquare " + "SystemStartBrace " + "SystemStartBracket " + "SystemStartBar ", + + /* read */ + "systemStartDelimiter " + "systemStartDelimiterHierarchy " + "currentCommandColumn ", + + /* write */ + "" + );