("style" . "text")
*/
Molecule
-Chord_name::ly_word2molecule (SCM word) const
+Chord_name::ly_word2molecule (SCM scm) const
{
- Dictionary<SCM> option_dict;
- if (gh_pair_p (word))
+ String style;
+ if (gh_pair_p (scm))
{
- SCM options = gh_cdr (word);
- word = gh_car (word);
- while (gh_pair_p (options))
- {
- SCM option = gh_car (options);
- if (option != SCM_UNDEFINED && option != SCM_BOOL_F
- && gh_pair_p (option))
- {
- SCM key = gh_car (option);
- SCM val = gh_cdr (option);
- String k;
- if (gh_symbol_p (key))
- k = ly_symbol2string (key);
- else if (gh_string_p (key))
- k = ly_scm2string (key);
- else
- continue;
- option_dict[k] = val;
- }
- options = gh_cdr (options);
- }
- }
- Real ex = lookup_l ()->text ("", "x", paper_l ()).extent
- ()[Y_AXIS].length ();
- if (gh_string_p (word))
- {
- String w = ly_scm2string (word);
- Molecule mol;
- Offset offset;
-
- int size = 0;
- if (option_dict.elem_b ("size"))
- size = gh_scm2int (option_dict["size"]);
-
- String style;
- if (option_dict.elem_b ("style"))
- style = ly_scm2string (option_dict["style"]);
-
- if (option_dict.elem_b ("type")
- && ly_scm2string (option_dict["type"]) == "super")
- {
- Real super_y = ex / 2;
- //super_y += -acc.extent ()[Y_AXIS][MIN];
- offset = Offset (0, super_y);
- if (!size)
- size = -2;
- }
- if (option_dict.elem_b ("offset"))
- {
- // hmm
- SCM s = option_dict["offset"];
- if (gh_pair_p (s))
- offset = Offset (gh_scm2double (gh_car (s)),
- gh_scm2double (gh_cdr (s))) * ex;
- }
- if (option_dict.elem_b ("font")
- && ly_scm2string (option_dict["font"]) == "feta")
- mol = paper_l ()->lookup_l (size)->afm_find (w);
- else
- mol = paper_l ()->lookup_l (size)->text (style, w, paper_l ());
-
- mol.translate (offset);
- return mol;
+ SCM s = gh_car (scm);
+ if (gh_string_p (s))
+ style = ly_scm2string (s);
+ scm = gh_cdr (scm);
}
+ if (gh_string_p (scm))
+ return lookup_l ()->text (style, ly_scm2string (scm), paper_l ());
return Molecule ();
}
/*
- ;; text: list of word
- ;; word: string + optional list of property
- ;; property: align, kern, font (?), size
+ scm is word or list of words:
+ word
+ (word word)
*/
Molecule
-Chord_name::ly_text2molecule (SCM text) const
+Chord_name::ly_text2molecule (SCM scm) const
{
Molecule mol;
- if (gh_list_p (text))
+ if (gh_list_p (scm))
{
- while (gh_cdr (text) != SCM_EOL)
+ while (gh_cdr (scm) != SCM_EOL)
{
- Molecule m = ly_word2molecule (gh_car (text));
+ Molecule m = ly_word2molecule (gh_car (scm));
if (!m.empty_b ())
mol.add_at_edge (X_AXIS, RIGHT, m, 0);
- text = gh_cdr (text);
+ scm = gh_cdr (scm);
}
- text = gh_car (text);
+ scm = gh_car (scm);
}
- Molecule m = ly_word2molecule (text);
+ Molecule m = ly_word2molecule (scm);
if (!m.empty_b ())
mol.add_at_edge (X_AXIS, RIGHT, m, 0);
return mol;
}
+Molecule
+Chord_name::pitch2molecule (Musical_pitch p) const
+{
+ SCM name = scm_eval (gh_list (ly_symbol2scm ("user-pitch-name"),
+ ly_quote_scm (p.to_scm ()),
+ SCM_UNDEFINED));
+
+ if (name != SCM_UNSPECIFIED)
+ {
+ return ly_text2molecule (name);
+ }
+
+ Molecule mol = lookup_l ()->text ("", p.str ().left_str (1).upper_str (), paper_l ());
+
+ /*
+ We want the smaller size, even if we're big ourselves.
+ */
+ if (p.accidental_i_)
+ {
+ Molecule acc = paper_l ()->lookup_l (-3)->afm_find
+ (String ("accidentals-") + to_str (p.accidental_i_));
+ // urg, howto get a good superscript_y?
+ Real super_y = lookup_l ()->text ("", "x", paper_l ()).extent
+ ()[Y_AXIS].length () / 2;
+ super_y += -acc.extent ()[Y_AXIS][MIN];
+ acc.translate_axis (super_y, Y_AXIS);
+ mol.add_at_edge (X_AXIS, RIGHT, acc, 0.0);
+ }
+
+ return mol;
+}
+
+Musical_pitch
+diff_pitch (Musical_pitch tonic, Musical_pitch p)
+{
+ Musical_pitch diff (p.notename_i_ - tonic.notename_i_,
+ p.accidental_i_ - tonic.accidental_i_,
+ p.octave_i_ - tonic.octave_i_);
+
+ while (diff.notename_i_ >= 7)
+ {
+ diff.notename_i_ -= 7;
+ diff.octave_i_ ++;
+ }
+ while (diff.notename_i_ < 0)
+ {
+ diff.notename_i_ += 7;
+ diff.octave_i_ --;
+ }
+
+ diff.accidental_i_ -= (tonic.semitone_pitch () + diff.semitone_pitch ())
+ - p.semitone_pitch ();
+
+ return diff;
+}
+
+/*
+ JUNKME
+ */
+bool
+Chord_name::user_chord_name (Array<Musical_pitch> pitch_arr, Chord_mol* name_p) const
+{
+ Array<Musical_pitch> chord_type = pitch_arr;
+ Chord::rebuild_transpose (&chord_type, diff_pitch (pitch_arr[0], Musical_pitch (0)), false);
+
+ SCM chord = SCM_EOL;
+ for (int i= chord_type.size (); i--; )
+ chord = gh_cons (chord_type[i].to_scm (), chord);
+
+
+ SCM name = scm_eval (gh_list (ly_symbol2scm ("user-chord-name"),
+ ly_quote_scm (chord),
+ SCM_UNDEFINED));
+ if (gh_pair_p (name))
+ {
+ name_p->modifier_mol = ly_text2molecule (gh_car (name));
+ name_p->addition_mol = ly_text2molecule (gh_cdr (name));
+ return true;
+ }
+ return false;
+}
+
+void
+Chord_name::banter (Array<Musical_pitch> pitch_arr, Chord_mol* name_p) const
+{
+ Array<Musical_pitch> add_arr;
+ Array<Musical_pitch> sub_arr;
+ Chord::find_additions_and_subtractions (pitch_arr, &add_arr, &sub_arr);
+
+ Array<Musical_pitch> scale;
+ for (int i=0; i < 7; i++)
+ scale.push (Musical_pitch (i));
+
+ Musical_pitch tonic = pitch_arr[0];
+ Chord::rebuild_transpose (&scale, tonic, true);
+
+ /*
+ Does chord include this step? -1 if flat
+ */
+ int has[16];
+ for (int i=0; i<16; i++)
+ has[i] = 0;
+
+ String mod_str;
+ String add_str;
+ String sep_str;
+ for (int i = 0; i < add_arr.size (); i++)
+ {
+ Musical_pitch p = add_arr[i];
+ int step = Chord::step_i (tonic, p);
+ int accidental = p.accidental_i_ - scale[(step - 1) % 7].accidental_i_;
+ if ((step < 16) && (has[step] != -1))
+ has[step] = accidental == -1 ? -1 : 1;
+ // only from guile table ?
+ if ((step == 3) && (accidental == -1))
+ {
+ mod_str = "m";
+ }
+ else if (accidental
+ || (!(step % 2)
+ || ((i == add_arr.size () - 1) && (step > 5))))
+ {
+ add_str += sep_str;
+ sep_str = "/";
+ if ((step == 7) && (accidental == 1))
+ {
+ add_str += "maj7";
+ }
+ else
+ {
+ add_str += to_str (step);
+ if (accidental)
+ add_str += accidental < 0 ? "-" : "+";
+ }
+ }
+ }
+
+ for (int i = 0; i < sub_arr.size (); i++)
+ {
+ Musical_pitch p = sub_arr[i];
+ int step = Chord::step_i (tonic, p);
+ /*
+ if additions include 2 or 4, assume sus2/4 and don't display 'no3'
+ */
+ if (!((step == 3) && (has[2] || has[4])))
+ {
+ add_str += sep_str + "no" + to_str (step);
+ sep_str = "/";
+ }
+ }
+
+ if (mod_str.length_i ())
+ name_p->modifier_mol.add_at_edge (X_AXIS, RIGHT,
+ lookup_l ()->text ("roman", mod_str, paper_l ()), 0);
+ if (add_str.length_i ())
+ {
+ if (!name_p->addition_mol.empty_b ())
+ add_str = "/" + add_str;
+ name_p->addition_mol.add_at_edge (X_AXIS, RIGHT,
+ lookup_l ()->text ("script", add_str, paper_l ()), 0);
+ }
+}
+
+/*
+ TODO:
+ fix silly to-and-fro scm conversions
+ */
Molecule
Chord_name::do_brew_molecule () const
{
- SCM style = get_elt_property ("style");
- if (style == SCM_UNDEFINED)
- style = ly_str02scm ("banter");
+ Array<Musical_pitch> pitch_arr;
+
+ for (SCM s = get_elt_property ("pitches"); s != SCM_EOL; s = gh_cdr (s))
+ pitch_arr.push (Musical_pitch (gh_car (s)));
+
+ Musical_pitch tonic = pitch_arr[0];
+
+ Chord_mol name;
+ name.tonic_mol = pitch2molecule (tonic);
+
+ /*
+ if user has explicitely listed chord name, use that
+
+ TODO
+ urg
+ maybe we should check all sub-lists of pitches, not
+ just full list and base triad?
+ */
+ if (!user_chord_name (pitch_arr, &name))
+ {
+ /*
+ else, check if user has listed base triad
+ use user base name and add banter for remaining part
+ */
+ if ((pitch_arr.size () > 2)
+ && user_chord_name (pitch_arr.slice (0, 3), &name))
+ {
+ Array<Musical_pitch> base = Chord::base_arr (tonic);
+ base.concat (pitch_arr.slice (3, pitch_arr.size ()));
+ banter (base, &name);
+ }
+ /*
+ else, use pure banter
+ */
+ else
+ {
+ banter (pitch_arr, &name);
+ }
+ }
- SCM inversion = get_elt_property ("inversion");
- if (inversion == SCM_UNDEFINED)
- inversion = SCM_BOOL_F;
+ SCM s = get_elt_property ("inversion");
+ if (s != SCM_UNDEFINED)
+ {
+ name.inversion_mol = lookup_l ()->text ("", "/", paper_l ());
+ Musical_pitch p (s);
- SCM bass = get_elt_property ("bass");
- if (bass == SCM_UNDEFINED)
- bass = SCM_BOOL_F;
+ Molecule mol = pitch2molecule (p);
+ name.inversion_mol.add_at_edge (X_AXIS, RIGHT, mol, 0);
+ }
- SCM pitches = get_elt_property ("pitches");
+ s = get_elt_property ("bass");
+ if (s != SCM_UNDEFINED)
+ {
+ name.bass_mol = lookup_l ()->text ("", "/", paper_l ());
+ Musical_pitch p (s);
+ Molecule mol = pitch2molecule (p);
+ name.bass_mol.add_at_edge (X_AXIS, RIGHT, mol, 0);
+ }
- SCM text = scm_eval (gh_list (ly_symbol2scm ("chord::user-name"),
- style,
- ly_quote_scm (pitches),
- ly_quote_scm (gh_cons (inversion, bass)),
- SCM_UNDEFINED));
+ // urg, howto get a good superscript_y?
+ Real super_y = lookup_l ()->text ("", "x", paper_l ()).extent
+ ()[Y_AXIS].length () / 2;
+ if (!name.addition_mol.empty_b ())
+ name.addition_mol.translate (Offset (0, super_y));
+
+ Molecule mol;
+ mol.add_at_edge (X_AXIS, RIGHT, name.tonic_mol, 0);
+ // huh?
+ if (!name.modifier_mol.empty_b ())
+ mol.add_at_edge (X_AXIS, RIGHT, name.modifier_mol, 0);
+ if (!name.addition_mol.empty_b ())
+ mol.add_at_edge (X_AXIS, RIGHT, name.addition_mol, 0);
+ if (!name.inversion_mol.empty_b ())
+ mol.add_at_edge (X_AXIS, RIGHT, name.inversion_mol, 0);
+ if (!name.bass_mol.empty_b ())
+ mol.add_at_edge (X_AXIS, RIGHT, name.bass_mol, 0);
- return ly_text2molecule (text);
+ s = get_elt_property ("word-space");
+ if (gh_number_p (s))
+ mol.dim_.interval_a_[X_AXIS][RIGHT] += gh_scm2double (s)
+ * staff_symbol_referencer (this).staff_space ();
+
+ return mol;
}
projects / lilypond.git / blobdiff