X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Ftext-engraver.cc;h=f242fa4db2a9f4412d2630c6a2c593a957036d38;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=ec8cc78071eeb2121e88af32b4426d4cf8abfaae;hpb=593c61593d668d4e6ed766cbd87bf003971d68eb;p=lilypond.git diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc index ec8cc78071..f242fa4db2 100644 --- a/lily/text-engraver.cc +++ b/lily/text-engraver.cc @@ -1,149 +1,127 @@ -/* - text-engraver.cc -- implement Text_engraver - - source file of the GNU LilyPond music typesetter - - (c) 1998--2000 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 "side-position-interface.hh" #include "item.hh" -#include "musical-request.hh" -#include "stem.hh" -#include "rhythmic-head.hh" +#include "note-column.hh" +#include "pointer-group-interface.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_; + vector scripts_; public: - VIRTUAL_COPY_CONS(Translator); + TRANSLATOR_DECLARATIONS (Text_engraver); protected: - virtual bool do_try_music (Music* m); - virtual void do_pre_move_processing (); - virtual void do_post_move_processing (); - virtual void do_process_music (); - virtual void acknowledge_element (Score_element_info); -}; + void stop_translation_timestep (); + void process_music (); + DECLARE_ACKNOWLEDGER (note_column); + DECLARE_TRANSLATOR_LISTENER (text_script); +}; -bool -Text_engraver::do_try_music (Music *m) +IMPLEMENT_TRANSLATOR_LISTENER (Text_engraver, text_script); +void +Text_engraver::listen_text_script (Stream_event *ev) { - if (Text_script_req *r = dynamic_cast (m)) - { - if (r->style_str_ == "dynamic") - return false; - - reqs_.push (r); - return true; - } - return false; + evs_.push_back (ev); } - void -Text_engraver::acknowledge_element (Score_element_info inf) +Text_engraver::process_music () { - if (Rhythmic_head::has_interface (inf.elem_l_)) - { - for (int i=0; i < texts_.size (); i++) - { - Score_element*t = texts_[i]; - Side_position::add_support (t,inf.elem_l_); - if (Side_position::get_axis( t) == X_AXIS - && !t->parent_l (Y_AXIS)) - t->set_parent (inf.elem_l_, Y_AXIS); - } - } - if (Stem::has_interface (inf.elem_l_)) + for (vsize i = 0; i < evs_.size (); i++) { - for (int i=0; i < texts_.size (); i++) - { - Side_position::add_support(texts_[i],inf.elem_l_); - } + 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; + + script->set_property ("script-priority", scm_from_int (priority)); + + Direction dir = to_dir (ev->get_property ("direction")); + if (dir) + set_grob_direction (script, dir); + + SCM mark = ev->get_property ("text"); + + script->set_property ("text", mark); } } void -Text_engraver::do_process_music () +Text_engraver::acknowledge_note_column (Grob_info info) { - for (int i=0; i < reqs_.size (); i++) + // 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"))); + + for (vsize i = 0; i < scripts_.size (); i++) { - Text_script_req * r = reqs_[i]; - - /* - Urg: Text_engraver loads TextScriptProperties - */ - Item *text = new Item (get_property ("basicTextScriptProperties")); - - - SCM axisprop = get_property ("scriptHorizontal"); - - Side_position::set_axis (text, to_boolean (axisprop) ? X_AXIS : Y_AXIS); - - /* - make sure they're in order by adding i to the priority field. - */ - text->set_elt_property ("script-priority", - gh_int2scm (200 + i)); - - if (r->get_direction ()) - Side_position::set_direction (text, r->get_direction ()); - - text->set_elt_property ("text", - ly_str02scm ( r->text_str_.ch_C ())); - - if (r->style_str_.length_i ()) - text->set_elt_property ("style", ly_str02scm (r->style_str_.ch_C())); - - /* - Text is empty by default, which means that the only condition - for not setting 'no-spacing-rods' should be: boolean && true. - - Anyway, non-empty text has been broken for some time now. - */ - - - /// URG this is broken by basicTextScriptProperties which defines - /// no-spacing-rods - /// FIXME - SCM nonempty = get_property ("textNonEmpty"); - if (!to_boolean (nonempty)) - /* - empty text: signal that no rods should be applied. - */ - text->set_elt_property ("no-spacing-rods" , SCM_BOOL_T); - - - announce_element (text, r); - texts_.push (text); + Grob *el = scripts_[i]; + + if (el && !el->get_parent (X_AXIS) && x_parent) + el->set_parent (x_parent, X_AXIS); } } void -Text_engraver::do_pre_move_processing () +Text_engraver::stop_translation_timestep () { - for (int i=0; i < texts_.size (); i++) - { - Item *ti = texts_[i]; - Side_position::add_staff_support (ti); - typeset_element (ti); - } - texts_.clear (); + evs_.clear (); + scripts_.clear (); } -void -Text_engraver::do_post_move_processing () +Text_engraver::Text_engraver () { - reqs_.clear (); } -ADD_THIS_TRANSLATOR(Text_engraver); +ADD_ACKNOWLEDGER (Text_engraver, note_column); + +ADD_TRANSLATOR (Text_engraver, + /* doc */ + "Create text scripts.", + + /* create */ + "TextScript ", + + /* read */ + "", + /* write */ + "" + );