X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-engraver.cc;h=6bd2356cab176959cdacb948b425604c0fb2fedd;hb=refs%2Fheads%2Fdon%2Ffix_configure_ac;hp=a448d15ef820b7972cd97a1efae7e250183746fd;hpb=a6ee9dcd388111e842064a8d46ab06c4897a00d2;p=lilypond.git diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc index a448d15ef8..6bd2356cab 100644 --- a/lily/text-engraver.cc +++ b/lily/text-engraver.cc @@ -1,149 +1,101 @@ -/* - text-engraver.cc -- implement Text_engraver - - source file of the GNU LilyPond music typesetter - - (c) 1998--2002 Han-Wen Nienhuys - - */ +/* + This file is part of LilyPond, the GNU music typesetter. + Copyright (C) 1998--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 + 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 "directional-element-interface.hh" #include "engraver.hh" -#include "side-position-interface.hh" #include "item.hh" -#include "musical-request.hh" -#include "stem.hh" -#include "rhythmic-head.hh" +#include "side-position-interface.hh" +#include "stream-event.hh" +#include "text-interface.hh" +#include "translator.icc" /** typeset directions that are plain text. - */ +*/ class Text_engraver : public Engraver { - Link_array reqs_; - Link_array texts_; + vector evs_; public: - TRANSLATOR_DECLARATIONS(Text_engraver); + TRANSLATOR_DECLARATIONS (Text_engraver); protected: - virtual bool try_music (Music* m); - virtual void stop_translation_timestep (); - virtual void start_translation_timestep (); - virtual void process_acknowledged_grobs (); - virtual void acknowledge_grob (Grob_info); -}; + void stop_translation_timestep (); + void process_music (); -bool -Text_engraver::try_music (Music *m) -{ - if (dynamic_cast (m) - && m->get_mus_property ("text-type") != ly_symbol2scm ("finger") - && m->get_mus_property ("text-type") != ly_symbol2scm ("dynamic")) - { - reqs_.push (dynamic_cast (m)); - return true; - } - return false; -} + DECLARE_TRANSLATOR_LISTENER (text_script); +}; +IMPLEMENT_TRANSLATOR_LISTENER (Text_engraver, text_script); void -Text_engraver::acknowledge_grob (Grob_info inf) +Text_engraver::listen_text_script (Stream_event *ev) { - if (Rhythmic_head::has_interface (inf.grob_)) - { - for (int i=0; i < texts_.size (); i++) - { - Grob*t = texts_[i]; - Side_position_interface::add_support (t,inf.grob_); - - /* - ugh. - */ - if (Side_position_interface::get_axis (t) == X_AXIS - && !t->get_parent (Y_AXIS)) - t->set_parent (inf.grob_, Y_AXIS); - else if (Side_position_interface::get_axis (t) == Y_AXIS - && !t->get_parent (X_AXIS)) - t->set_parent (inf.grob_, X_AXIS); - } - } - - if (Stem::has_interface (inf.grob_)) - { - for (int i=0; i < texts_.size (); i++) - { - Side_position_interface::add_support (texts_[i],inf.grob_); - } - } + evs_.push_back (ev); } void -Text_engraver::process_acknowledged_grobs () +Text_engraver::process_music () { - if (texts_.size ()) - return; - for (int i=0; i < reqs_.size (); i++) + for (vsize i = 0; i < evs_.size (); i++) { - Text_script_req * r = reqs_[i]; - + Stream_event *r = evs_[i]; + // URG: Text vs TextScript - String basic = "TextScript"; - - Item *text = new Item (get_property (basic.to_str0 ())); - - /* - FIXME -> need to use basic props. - */ - SCM axisprop = get_property ("scriptHorizontal"); - - Axis ax = to_boolean (axisprop) ? X_AXIS : Y_AXIS; - Side_position_interface::set_axis (text, ax); - - // Hmm - int priority = 200; - SCM s = text->get_grob_property ("script-priority"); - if (gh_number_p (s)) - priority = gh_scm2int (s); - - /* Make sure they're in order of user input by adding index i. */ - priority += i * (r->get_direction () ? r->get_direction () : 1); - - text->set_grob_property ("script-priority", gh_int2scm (priority)); - - if (r->get_direction ()) - Side_position_interface::set_direction (text, r->get_direction ()); - - text->set_grob_property ("text", r->get_mus_property ("text")); - announce_grob (text, r->self_scm ()); - texts_.push (text); + Item *text = make_item ("TextScript", r->self_scm ()); + + int priority = robust_scm2int (text->get_property ("script-priority"), + 200); + + /* see script-engraver.cc */ + priority += i; + + text->set_property ("script-priority", scm_from_int (priority)); + + Direction dir = to_dir (r->get_property ("direction")); + if (dir) + set_grob_direction (text, dir); + + SCM mark = r->get_property ("text"); + + text->set_property ("text", mark); } } void Text_engraver::stop_translation_timestep () { - for (int i=0; i < texts_.size (); i++) - { - Item *ti = texts_[i]; - if (!to_boolean (get_property ("scriptHorizontal"))) - Side_position_interface::add_staff_support (ti); - typeset_grob (ti); - } - texts_.clear (); + evs_.clear (); } -void -Text_engraver::start_translation_timestep () +Text_engraver::Text_engraver () { - reqs_.clear (); } +ADD_TRANSLATOR (Text_engraver, + /* doc */ + "Create text scripts.", + + /* create */ + "TextScript ", -Text_engraver::Text_engraver(){} + /* read */ + "", -ENTER_DESCRIPTION(Text_engraver, -/* descr */ "Create text-scripts", -/* creats*/ "TextScript", -/* acks */ "rhythmic-head-interface stem-interface", -/* reads */ "scriptHorizontal", -/* write */ ""); + /* write */ + "" + );