X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Ftext-engraver.cc;h=6bbcdc379479006055ef417679bc7cac439c095c;hb=4051d4410364b9984faa181659a3bfe2763a9736;hp=3fdc1a3f71e1495885e91f863e51a64332a2d2b9;hpb=94375d04f45b415ad705fd444fdb344416f116d9;p=lilypond.git diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc index 3fdc1a3f71..6bbcdc3794 100644 --- a/lily/text-engraver.cc +++ b/lily/text-engraver.cc @@ -1,168 +1,133 @@ -/* - text-engraver.cc -- implement Text_engraver - - source file of the GNU LilyPond music typesetter - - (c) 1998--2001 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: - 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 create_grobs (); - virtual void acknowledge_grob (Grob_info); + void stop_translation_timestep (); + void process_music (); + + void acknowledge_note_column (Grob_info); + void listen_text_script (Stream_event *); }; -bool -Text_engraver::try_music (Music *m) +void +Text_engraver::listen_text_script (Stream_event *ev) { - if (dynamic_cast (m) - && m->get_mus_property ("text-type") != ly_symbol2scm ("dynamic")) - { - reqs_.push (dynamic_cast (m)); - return true; - } - return false; + evs_.push_back (ev); } void -Text_engraver::acknowledge_grob (Grob_info inf) +Text_engraver::process_music () { - if (Rhythmic_head::has_interface (inf.grob_l_)) + for (vsize i = 0; i < evs_.size (); i++) { - for (int i=0; i < texts_.size (); i++) - { - Grob*t = texts_[i]; - Side_position_interface::add_support (t,inf.grob_l_); - - /* - ugh. - */ - if (Side_position_interface::get_axis (t) == X_AXIS - && !t->parent_l (Y_AXIS)) - t->set_parent (inf.grob_l_, Y_AXIS); - else if (Side_position_interface::get_axis (t) == Y_AXIS - && !t->parent_l (X_AXIS)) - t->set_parent (inf.grob_l_, X_AXIS); - } - } - - if (Stem::has_interface (inf.grob_l_)) - { - for (int i=0; i < texts_.size (); i++) - { - Side_position_interface::add_support (texts_[i],inf.grob_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::create_grobs () +Text_engraver::acknowledge_note_column (Grob_info info) { - if (texts_.size ()) - return; - 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 () + : unsmob (info.grob ()->get_object ("rest"))); + + for (vsize i = 0; i < scripts_.size (); i++) { - Text_script_req * r = reqs_[i]; - - // URG: Text vs TextScript - String basic = "TextScript"; - - if (r->get_mus_property ("text-type") == ly_symbol2scm ("finger")) - { - basic = "Fingering"; - } - - Item *text = new Item (get_property (basic.ch_C ())); - - /* - 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); - -#if 0 - if (r->style_str_ == "finger" && ax == Y_AXIS) - { - /* - nicely center the scripts. - */ - text->add_offset_callback (Side_position_interface::aligned_on_self_proc, X_AXIS); - text->add_offset_callback (Side_position_interface::centered_on_parent_proc, X_AXIS); - } -#endif - - - - /* - make sure they're in order by adding i to the priority field. - */ - text->set_grob_property ("script-priority", - gh_int2scm (200 + i)); - - if (r->get_direction ()) - Side_position_interface::set_direction (text, r->get_direction ()); - - text->set_grob_property ("text", r->get_mus_property ("text")); - - SCM nonempty = get_property ("textNonEmpty"); - if (to_boolean (nonempty)) - /* - empty text: signal that no rods should be applied. - */ - text->set_grob_property ("no-spacing-rods" , SCM_BOOL_F); - - announce_grob (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::stop_translation_timestep () { - for (int i=0; i < texts_.size (); i++) - { - Item *ti = texts_[i]; - Side_position_interface::add_staff_support (ti); - typeset_grob (ti); - } - texts_.clear (); + evs_.clear (); + scripts_.clear (); } +Text_engraver::Text_engraver (Context *c) + : Engraver (c) +{ +} + + void -Text_engraver::start_translation_timestep () +Text_engraver::boot () { - reqs_.clear (); + ADD_LISTENER (Text_engraver, text_script); + ADD_ACKNOWLEDGER (Text_engraver, note_column); } +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 textNonEmpty", -/* write */ ""); + /* write */ + "" + );