source file of the GNU LilyPond music typesetter
- (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>,
+ (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>,
Mats Bengtsson <matsb@s3.kth.se>
*/
-#include <ctype.h>
+#include <cctype>
+using namespace std;
-#include "translator-group.hh"
+#include "item.hh"
+#include "context.hh"
#include "bar-line.hh"
#include "staff-symbol-referencer.hh"
#include "engraver.hh"
#include "direction.hh"
#include "side-position-interface.hh"
-#include "item.hh"
-class Clef_engraver : public Engraver
+#include "translator.icc"
+
+class Clef_engraver : public Engraver
{
public:
- TRANSLATOR_DECLARATIONS(Clef_engraver);
+ TRANSLATOR_DECLARATIONS (Clef_engraver);
Direction octave_dir_;
protected:
- virtual void stop_translation_timestep ();
- virtual void start_translation_timestep ();
- virtual void process_music ();
- virtual void acknowledge_grob (Grob_info);
+ void stop_translation_timestep ();
+ void process_music ();
+ DECLARE_ACKNOWLEDGER (bar_line);
+
+ virtual void derived_mark () const;
private:
- Item * clef_;
- Item * octavate_;
+ Item *clef_;
+ Item *octavate_;
SCM prev_glyph_;
SCM prev_cpos_;
void inspect_clef_properties ();
};
+void
+Clef_engraver::derived_mark () const
+{
+ scm_gc_mark (prev_octavation_);
+ scm_gc_mark (prev_cpos_);
+ scm_gc_mark (prev_glyph_);
+}
+
Clef_engraver::Clef_engraver ()
{
clef_ = 0;
/*
will trigger a clef at the start since #f != ' ()
- */
- prev_cpos_ = prev_glyph_ = SCM_BOOL_F;
+ */
+ prev_octavation_ = prev_cpos_ = prev_glyph_ = SCM_BOOL_F;
}
void
Clef_engraver::set_glyph ()
{
- SCM glyph_sym = ly_symbol2scm ("glyph-name");
- SCM glyph = get_property ("clefGlyph");
-
+ SCM glyph_sym = ly_symbol2scm ("glyph");
SCM basic = ly_symbol2scm ("Clef");
-
- daddy_trans_->execute_single_pushpop_property (basic, glyph_sym, SCM_UNDEFINED);
- daddy_trans_->execute_single_pushpop_property (basic, glyph_sym, glyph);
+
+ execute_pushpop_property (context (), basic, glyph_sym, SCM_UNDEFINED);
+ execute_pushpop_property (context (), basic, glyph_sym, get_property ("clefGlyph"));
}
-/**
- Generate a clef at the start of a measure. (when you see a Bar,
- ie. a breakpoint)
- */
+/**
+ Generate a clef at the start of a measure. (when you see a Bar,
+ ie. a breakpoint)
+*/
void
-Clef_engraver::acknowledge_grob (Grob_info info)
+Clef_engraver::acknowledge_bar_line (Grob_info info)
{
- Item * item =dynamic_cast <Item *> (info.grob_);
- if (item)
- {
- if (Bar_line::has_interface (info.grob_)
- && gh_string_p (get_property ("clefGlyph")))
- create_clef ();
- }
+ Item *item = dynamic_cast<Item *> (info.grob ());
+ if (item && scm_is_string (get_property ("clefGlyph")))
+ create_clef ();
}
void
{
if (!clef_)
{
- Item *c= new Item (get_property ("Clef"));
- announce_grob(c, SCM_EOL);
+ Item *c = make_item ("Clef", SCM_EOL);
clef_ = c;
SCM cpos = get_property ("clefPosition");
- if (gh_number_p (cpos))
- Staff_symbol_referencer::set_position (clef_, gh_scm2int (cpos));
+ if (scm_is_number (cpos))
+ clef_->set_property ("staff-position", cpos);
- SCM oct = get_property ("clefOctavation");
- if (gh_number_p (oct) && gh_scm2int (oct))
+ SCM oct = get_property ("clefOctavation");
+ if (scm_is_number (oct) && scm_to_int (oct))
{
- Item * g = new Item (get_property ("OctavateEight"));
+ Item *g = make_item ("OctavateEight", SCM_EOL);
+
+ int abs_oct = scm_to_int (oct);
+ int dir = sign (abs_oct);
+ abs_oct = abs (abs_oct) + 1;
+
+ SCM txt = scm_number_to_string (scm_from_int (abs_oct),
+ scm_from_int (10));
- Side_position_interface::add_support (g,clef_);
+ g->set_property ("text",
+ scm_list_n (ly_lily_module_constant ("vcenter-markup"),
+ txt, SCM_UNDEFINED));
+ Side_position_interface::add_support (g, clef_);
g->set_parent (clef_, Y_AXIS);
g->set_parent (clef_, X_AXIS);
-
- g->set_grob_property ("direction", scm_int2num (sign (gh_scm2int (oct))));
+ g->set_property ("direction", scm_from_int (dir));
octavate_ = g;
- announce_grob(octavate_, SCM_EOL);
}
}
}
SCM clefpos = get_property ("clefPosition");
SCM octavation = get_property ("clefOctavation");
SCM force_clef = get_property ("forceClef");
-
+
if (clefpos == SCM_EOL
|| scm_equal_p (glyph, prev_glyph_) == SCM_BOOL_F
|| scm_equal_p (clefpos, prev_cpos_) == SCM_BOOL_F
|| scm_equal_p (octavation, prev_octavation_) == SCM_BOOL_F
- || to_boolean (force_clef)
-)
+ || to_boolean (force_clef))
{
+ set_context_property_on_children (context (),
+ ly_symbol2scm ("localKeySignature"),
+ get_property ("keySignature"));
+
set_glyph ();
- create_clef ();
+ if (prev_cpos_ != SCM_BOOL_F || to_boolean (get_property ("firstClef")))
+ create_clef ();
- clef_->set_grob_property ("non-default", SCM_BOOL_T);
+ if (clef_)
+ clef_->set_property ("non-default", SCM_BOOL_T);
prev_cpos_ = clefpos;
prev_glyph_ = glyph;
if (to_boolean (force_clef))
{
- Translator_group * w = daddy_trans_->where_defined (ly_symbol2scm ("forceClef"));
+ SCM prev;
+ Context *w = context ()->where_defined (ly_symbol2scm ("forceClef"), &prev);
w->set_property ("forceClef", SCM_EOL);
}
}
-
void
Clef_engraver::stop_translation_timestep ()
{
if (clef_)
{
- SCM vis = 0;
- if (to_boolean (clef_->get_grob_property ("non-default")))
- {
- vis = get_property ("explicitClefVisibility");
- }
+ SCM vis = 0;
+ if (to_boolean (clef_->get_property ("non-default")))
+ vis = get_property ("explicitClefVisibility");
if (vis)
{
- clef_->set_grob_property ("break-visibility", vis);
+ clef_->set_property ("break-visibility", vis);
if (octavate_)
- {
- octavate_->set_grob_property ("break-visibility", vis);
-
- }
+ octavate_->set_property ("break-visibility", vis);
}
-
- typeset_grob (clef_);
- clef_ =0;
- if (octavate_)
- {
- Side_position_interface::add_staff_support (octavate_);
- typeset_grob (octavate_);
- }
+ clef_ = 0;
octavate_ = 0;
}
}
-void
-Clef_engraver::start_translation_timestep ()
-{
-}
-
-
-
-ENTER_DESCRIPTION(Clef_engraver,
-/* descr */ "Determine and set reference point for pitches",
-/* creats*/ "Clef OctavateEight",
-/* accepts */ "",
-/* acks */ "bar-line-interface",
-/* reads */ "clefPosition clefGlyph centralCPosition clefOctavation explicitClefVisibility",
-/* write */ "");
+ADD_ACKNOWLEDGER (Clef_engraver, bar_line);
+ADD_TRANSLATOR (Clef_engraver,
+ /* doc */
+ "Determine and set reference point for pitches.",
+
+ /* create */
+ "Clef "
+ "OctavateEight ",
+
+ /* read */
+ "clefGlyph "
+ "clefOctavation "
+ "clefPosition "
+ "explicitClefVisibility "
+ "forceClef ",
+
+ /* write */
+ ""
+ );
projects / lilypond.git / blobdiff