X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-engraver.cc;h=f242fa4db2a9f4412d2630c6a2c593a957036d38;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=5be1ff78ef854060819849ccff4bb7dcbe322b92;hpb=14d74ac262744d16fc753ee41042d32860d58633;p=lilypond.git diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc index 5be1ff78ef..f242fa4db2 100644 --- a/lily/text-engraver.cc +++ b/lily/text-engraver.cc @@ -1,132 +1,127 @@ -/* - text-engraver.cc -- implement Text_engraver - - source file of the GNU LilyPond music typesetter - - (c) 1998--2004 Han-Wen Nienhuys - - */ +/* + This file is part of LilyPond, the GNU music typesetter. + + Copyright (C) 1998--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 + 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 "item.hh" +#include "note-column.hh" +#include "pointer-group-interface.hh" #include "side-position-interface.hh" -#include "stem.hh" -#include "rhythmic-head.hh" -#include "text-item.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 evs_; - Link_array texts_; + vector evs_; + vector scripts_; public: TRANSLATOR_DECLARATIONS (Text_engraver); protected: - virtual bool try_music (Music* m); - virtual void stop_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 (m->is_mus_type ("text-script-event")) - { - evs_.push (m); - return true; - } - return false; -} + DECLARE_ACKNOWLEDGER (note_column); + 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 < evs_.size (); i++) + for (vsize i = 0; i < evs_.size (); i++) { - Music * r = evs_[i]; - - // URG: Text vs TextScript - Item *text = make_item ("TextScript", r->self_scm ()); - - - Axis ax = Y_AXIS; - Side_position_interface::set_axis (text, ax); - - // Hmm - int priority = 200; - SCM s = text->get_property ("script-priority"); - if (scm_is_number (s)) - priority = scm_to_int (s); - + Stream_event *ev = evs_[i]; + + Item *script = make_item ("TextScript", ev->self_scm ()); + scripts_.push_back (script); + + int priority = robust_scm2int (script->get_property ("script-priority"), + 200); + /* see script-engraver.cc */ priority += i; - - text->set_property ("script-priority", scm_int2num (priority)); - Direction dir = to_dir (r->get_property ("direction")); + script->set_property ("script-priority", scm_from_int (priority)); + + Direction dir = to_dir (ev->get_property ("direction")); if (dir) - set_grob_direction (text, dir); + set_grob_direction (script, dir); + + SCM mark = ev->get_property ("text"); + + script->set_property ("text", mark); + } +} +void +Text_engraver::acknowledge_note_column (Grob_info info) +{ + // Make note column (or rest, if there are no heads) the parent of the script. + extract_grob_set (info.grob (), "note-heads", heads); + Grob *x_parent = (heads.size () + ? info.grob () + : Grob::unsmob (info.grob ()->get_object ("rest"))); - SCM mark = r->get_property ("text"); + for (vsize i = 0; i < scripts_.size (); i++) + { + Grob *el = scripts_[i]; - text->set_property ("text", mark); - texts_.push (text); + if (el && !el->get_parent (X_AXIS) && x_parent) + el->set_parent (x_parent, X_AXIS); } } void Text_engraver::stop_translation_timestep () { - texts_.clear (); evs_.clear (); + scripts_.clear (); } - Text_engraver::Text_engraver () { } +ADD_ACKNOWLEDGER (Text_engraver, note_column); + ADD_TRANSLATOR (Text_engraver, -/* descr */ "Create text-scripts", -/* creats*/ "TextScript", -/* accepts */ "text-script-event", -/* acks */ "rhythmic-head-interface stem-interface", -/* reads */ "", -/* write */ ""); + /* doc */ + "Create text scripts.", + + /* create */ + "TextScript ", + + /* read */ + "", + + /* write */ + "" + );