source file of the GNU LilyPond music typesetter
- (c) 1996,1997 Han-Wen Nienhuys <hanwen@stack.nl>
+ (c) 1996, 1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
keyplacement by Mats Bengtsson
*/
#include "molecule.hh"
#include "paper-def.hh"
#include "lookup.hh"
-
-#include "key-grav.hh"
+#include "musical-pitch.hh"
const int FLAT_TOP_PITCH=2; /* fes,ges,as and bes typeset in lower octave */
const int SHARP_TOP_PITCH=4; /* ais and bis typeset in lower octave */
-Key_item::Key_item (int c)
+Key_item::Key_item ()
{
breakable_b_ =true;
default_b_ = false;
- set_c_position (c);
+ set_c_position (0);
}
void
-Key_item::read (Key_engraver const & key_grav_r)
+Key_item::set (bool multi_octave_b,
+ Array<Musical_pitch> const &idx_arr,
+ Array<Musical_pitch> const &old_idx_arr)
{
- assert (!key_grav_r.key_.multi_octave_b_);
- const Array<int> &idx_arr =key_grav_r.accidental_idx_arr_;
- for (int i = 0 ; i< idx_arr.size(); i++)
+ multi_octave_b_ =multi_octave_b;
+
+ for (int i = 0; i < idx_arr.size(); i++)
{
- int note = idx_arr[i];
- int acc = ((Key &) key_grav_r.key_).oct (0).acc (note);
+ Musical_pitch m_l =idx_arr[i];
+ if (multi_octave_b_)
+ add (m_l);
+ else
+ add (m_l.notename_i_, m_l.accidental_i_);
+ }
- add (note, acc);
+ for (int i = 0 ; i< old_idx_arr.size(); i++)
+ {
+ Musical_pitch m_l =old_idx_arr[i];
+ if (multi_octave_b_)
+ add_old (m_l);
+ else
+ add_old (m_l.notename_i_, m_l.accidental_i_);
}
}
void
Key_item::set_c_position (int c0)
{
- int octaves =(abs (c0) / 7) +1 ;
- c_position=(c0 + 7*octaves)%7;
+ c0_position = c0;
+ // Find the c in the range -4 through 2
+ int from_bottom_pos = c0 + 4;
+ from_bottom_pos = from_bottom_pos%7;
+ from_bottom_pos = (from_bottom_pos + 7)%7; // Precaution to get positive.
+ c_position = from_bottom_pos - 4;
}
void
Key_item::add (int p, int a)
{
- if ((a<0 && p>FLAT_TOP_PITCH) ||
- (a>0 && p>SHARP_TOP_PITCH))
- {
- p -= 7; /* Typeset below c_position */
- }
- pitch.push (p);
- acc.push (a);
+ pitch_arr_.push (p);
+ acc_arr_.push (a);
+}
+
+void
+Key_item::add (const Musical_pitch& pitch_r)
+{
+ pitch_arr_.push (pitch_r.steps());
+ acc_arr_.push (pitch_r.accidental_i_);
}
+void
+Key_item::add_old (int p, int a)
+{
+ old_pitch_arr_.push (p);
+ old_acc_arr_.push (a);
+}
+void
+Key_item::add_old (const Musical_pitch& pitch_r)
+{
+ old_pitch_arr_.push (pitch_r.steps());
+ old_acc_arr_.push (pitch_r.accidental_i_);
+}
+
+int
+Key_item::calculate_position(int p, int a) const
+{
+ if (multi_octave_b_)
+ {
+ return p + c0_position;
+ }
+ else {
+ if ((a<0 && ((p>FLAT_TOP_PITCH) || (p+c_position>4)) && (p+c_position>1))
+ ||
+ (a>0 && ((p>SHARP_TOP_PITCH) || (p+c_position>5)) && (p+c_position>2)))
+ {
+ p -= 7; /* Typeset below c_position */
+ }
+ return p + c_position;
+ }
+}
+
+/*
+ TODO space the `natural' signs wider
+ */
Molecule*
-Key_item::brew_molecule_p()const
+Key_item::brew_molecule_p() const
{
Molecule*output = new Molecule;
Real inter = paper()->internote_f ();
- for (int i =0; i < pitch.size(); i++)
+ int j;
+ if ((break_status_dir_ == LEFT || break_status_dir_ == CENTER)
+ || old_pitch_arr_.size ())
+ {
+ for (int i =0; i < old_pitch_arr_.size(); i++)
+ {
+ for (j =0; (j < pitch_arr_.size())
+ && (old_pitch_arr_[i] != pitch_arr_[j]); j++)
+ ;
+
+ if (j == pitch_arr_.size()
+ || (old_pitch_arr_[i] == pitch_arr_[j]
+ && old_acc_arr_[i] != acc_arr_[j]))
+ {
+ Atom a =lookup_l ()->accidental (0);
+ a.translate_axis (calculate_position(old_pitch_arr_[i], old_acc_arr_[i]) * inter, Y_AXIS);
+ Molecule m (a);
+ output->add_at_edge (X_AXIS, RIGHT, m);
+ }
+ }
+
+ /*
+ Add half a space between cancellation and key sig.
+
+ As suggested by [Ross], p.148.
+ */
+ Interval x(0, inter);
+ Interval y(0,0);
+
+ output->add_at_edge (X_AXIS, RIGHT, lookup_l()->fill (Box(x,y)));
+ }
+
+ for (int i =0; i < pitch_arr_.size(); i++)
{
- Symbol s= paper()->lookup_l ()->accidental (acc[i]);
- Atom a (s);
- a.translate ((c_position + pitch[i]) * inter, Y_AXIS);
- Molecule m (a);
- output->add_right (m);
+ Atom a =lookup_l ()->accidental (acc_arr_[i]);
+ a.translate_axis (calculate_position(pitch_arr_[i], acc_arr_[i]) * inter, Y_AXIS);
+ Molecule m (a);
+ output->add_at_edge (X_AXIS, RIGHT, m);
}
- if ( pitch.size())
+ if (pitch_arr_.size())
{
- Molecule m (paper()->lookup_l ()->fill (Box (
- Interval (0, paper()->note_width ()),
- Interval (0,0))));
-
- output->add_right (m);
+ Molecule m (lookup_l ()->fill (Box (
+ Interval (0, paper()->note_width ()),
+ Interval (0,0))));
+
+ output->add_at_edge (X_AXIS, RIGHT, m);
}
return output;
}
{
if (default_b_)
{
- empty_b_ = transparent_b_ = (break_status_i() != 1);
+ transparent_b_ = (break_status_dir() != RIGHT);
+ set_empty (transparent_b_);
}
}
projects / lilypond.git / blobdiff