source file of the GNU LilyPond music typesetter
- (c) 1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>,
+ (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>,
+
Mats Bengtsson <matsb@s3.kth.se>
*/
+/*
+ CLEAN ME UP.
+ */
+
#include <ctype.h>
+#include "staff-symbol-referencer.hh"
#include "bar.hh"
#include "clef-engraver.hh"
#include "clef-item.hh"
#include "debug.hh"
#include "command-request.hh"
-#include "time-description.hh"
+#include "timing-translator.hh"
#include "note-head.hh"
#include "key-item.hh"
#include "local-key-item.hh"
Clef_engraver::Clef_engraver()
{
+ clef_p_ = 0;
clef_req_l_ = 0;
clef_type_str_ = "";
c0_position_i_ = 0;
clef_position_i_ = 0;
octave_dir_ = CENTER;
+ create_default_b_ = true;
}
-struct Clef_settings {
- char const *name;
- char const *cleftype;
- int position;
-} clef_settings[] = {
- {"treble", "treble", -2},
- {"violin", "treble", -2},
- {"G", "treble", -2},
- {"G2", "treble", -2},
- {"scarlatti", "scarlatti", 0 },
- {"french", "treble",-4 },
- {"soprano", "alto",-4 },
- {"mezzosoprano", "alto",-2 },
- {"alto", "alto",0 },
- {"tenor", "alto",2 },
- {"baritone", "alto",4 },
- {"varbaritone", "bass",0 },
- {"bass" , "bass",2 },
- {"F", "bass", 2},
- {"subbass", "bass",4},
- {0,0,0}
-};
-
-
-
-
-/*
- Ugh. Should have support for Dictionaries in mudela.
- */
bool
Clef_engraver::set_type (String s)
{
else
octave_dir_ = CENTER;
- bool found = 0;
- for (Clef_settings *c = clef_settings; !found && c->name; c++)
+ bool found = false;
+ SCM c = get_property ("supportedClefTypes",0);
+ for (; gh_pair_p(c); c = gh_cdr (c))
{
- if (c->name == s)
- {
- clef_type_str_ = c->cleftype;
- clef_position_i_ = c->position;
- found = 1;
- }
- }
+ SCM entry = gh_car (c);
+ SCM name = gh_car (entry);
+
+ if (ly_scm2string (name) != s)
+ continue;
+
+ SCM glyph = gh_cadr (entry);
+ SCM pos = gh_caddr (entry);
+
+ clef_type_str_ = ly_scm2string (glyph);
+ clef_position_i_ = gh_scm2int (pos);
+ found = true;
+ break;
+ }
+
if (!found)
{
switch(toupper (s[0]))
c0_position_i_ = clef_position_i_;
else if (clef_type_str_ == "bass")
c0_position_i_ = clef_position_i_ + 4;
- else if (clef_type_str_ == "scarlatti")
- c0_position_i_ = 0;
else
assert (false);
return true;
}
-void
-Clef_engraver::read_req (Clef_change_req*c_l)
-{
- if (!set_type (c_l->clef_str_))
- c_l->error (_ ("unknown clef type "));
-}
-
/**
Generate a clef at the start of a measure. (when you see a Bar,
if (dynamic_cast<Bar*>(info.elem_l_)
&& clef_type_str_.length_i())
{
+ bool default_clef = !clef_p_;
create_clef();
- if (!clef_req_l_)
- for (int i=0; i < clef_p_arr_.size (); i++)
- {
- clef_p_arr_[i]->default_b_ = true;
- }
-
+ if(!default_clef)
+ clef_p_->set_elt_property("visibility-lambda",
+ ly_eval_str ("all-visibility"));
}
/* ugh; should make Clef_referenced baseclass */
{
if (Note_head * h = dynamic_cast<Note_head*>(it_l))
{
- h->position_i_ += c0_position_i_;
+ Staff_symbol_referencer_interface si (h);
+ si.set_position (int (si.position_f ()) + c0_position_i_);
}
else if (Local_key_item *i = dynamic_cast<Local_key_item*> (it_l))
{
void
Clef_engraver::do_creation_processing()
{
- Scalar def = get_property ("defaultClef", 0);
- if (def.to_bool ()) // egcs: Scalar to bool is ambiguous
- set_type (def);
+ create_default_b_ = true; // should read property.
+ SCM def = get_property ("createInitdefaultClef", 0);
+ if (gh_string_p (def))
+ set_type (ly_scm2string (def));
if (clef_type_str_.length_i ())
{
create_clef();
- for (int i=0; i < clef_p_arr_.size (); i++)
-
- clef_p_arr_[i]->default_b_ = false;
+ clef_p_->set_elt_property ("non-default", SCM_BOOL_T);
}
}
if (Clef_change_req *cl = dynamic_cast <Clef_change_req *> (r_l))
{
clef_req_l_ = cl;
- read_req (clef_req_l_);
+ if (!set_type (cl->clef_str_))
+ cl->error (_ ("unknown clef type"));
+
return true;
}
else
void
Clef_engraver::create_clef()
{
- if (clef_type_str_ == "scarlatti")
+ if (!clef_p_)
{
- while (clef_p_arr_.size () < 2)
- {
- Clef_item *ct= new Clef_item;
- ct->break_priority_i_ = -2; // UGH
- announce_element (Score_element_info (ct, clef_req_l_));
- clef_p_arr_.push (ct);
- }
- clef_p_arr_[0]->symbol_ = "treble";
- clef_p_arr_[0]->y_position_i_ = 4;
- clef_p_arr_[1]->symbol_ = "bass";
- clef_p_arr_[1]->y_position_i_ = -4;
+ Clef_item *c= new Clef_item;
+ c->set_elt_property ("breakable", SCM_BOOL_T);
+ c->set_elt_property ("break-aligned", SCM_BOOL_T);
+ announce_element (Score_element_info (c, clef_req_l_));
+
+ Staff_symbol_referencer_interface si(c);
+ si.set_interface ();
+
+ clef_p_ = c;
}
- else
+ Staff_symbol_referencer_interface si(clef_p_);
+ clef_p_->symbol_ = clef_type_str_;
+ si.set_position (clef_position_i_);
+ if (octave_dir_)
{
- if (!clef_p_arr_.size ())
- {
- Clef_item *c= new Clef_item;
- c->break_priority_i_ = -2; // ugh
- announce_element (Score_element_info (c, clef_req_l_));
- clef_p_arr_.push (c);
- }
-
- for (int i=0; i < clef_p_arr_.size (); i++)
- {
- clef_p_arr_[i]->symbol_ = clef_type_str_;
- clef_p_arr_[i]->y_position_i_ = clef_position_i_;
- clef_p_arr_[i]->octave_dir_ = octave_dir_;
- }
+ clef_p_->set_elt_property ("octave-dir", gh_int2scm (octave_dir_));
}
}
if (clef_req_l_)
{
create_clef();
- for (int i=0; i < clef_p_arr_.size (); i++)
- clef_p_arr_[i]->default_b_ = false;
+ }
+ else if (create_default_b_)
+ {
+ SCM type = get_property ("defaultClef", 0);
+ if (gh_string_p (type))
+ set_type (ly_scm2string (type));
+ else
+ set_type ( "treble");
+ create_clef ();
+ create_default_b_ = false;
}
}
void
Clef_engraver::do_pre_move_processing()
{
- for (int i=0; i <clef_p_arr_.size (); i++)
+ if (clef_p_)
{
- typeset_element (clef_p_arr_[i]);
+ typeset_element (clef_p_);
+ clef_p_ =0;
}
- clef_p_arr_.clear ();
+ create_default_b_ = false;
}
void
void
Clef_engraver::do_removal_processing()
{
- if (clef_p_arr_.size ())
- {
- assert (false);
- }
+ assert (!clef_p_);
}
ADD_THIS_TRANSLATOR(Clef_engraver);
+
projects / lilypond.git / blobdiff