X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-name.cc;h=3ffc591bd83f649988cef92f41f53138cca542c4;hb=dafdaf6f564e4b658de316f629484cbeecf3c803;hp=3bd520d66a34ec7fec12ff2cdfef57d2f882be4a;hpb=083af6fa3417381bcc28747fedd852ad526800de;p=lilypond.git diff --git a/lily/chord-name.cc b/lily/chord-name.cc index 3bd520d66a..3ffc591bd8 100644 --- a/lily/chord-name.cc +++ b/lily/chord-name.cc @@ -3,314 +3,38 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Jan Nieuwenhuizen + (c) 1999--2007 Jan Nieuwenhuizen */ #include "chord-name.hh" -#include "musical-request.hh" -#include "warn.hh" -#include "debug.hh" -#include "molecule.hh" -#include "paper-def.hh" -#include "lookup.hh" -#include "staff-symbol-referencer.hh" - - -/* - TODO: move text lookup out of Chord_name - */ - -/* - word is roman text or styled text: - "text" - ("style" . "text") - */ -Molecule -Chord_name::ly_word2molecule (SCM scm) const -{ - String style; - if (gh_pair_p (scm)) - { - style = ly_scm2string (gh_car (scm)); - scm = gh_cdr (scm); - } - String text = ly_scm2string (scm); - return lookup_l ()->text (style, text, paper_l ()); -} - -/* - scm is word or list of words: - word - (word word) - */ -Molecule -Chord_name::ly_text2molecule (SCM scm) const -{ - Molecule mol; - if (gh_list_p (scm)) - { - while (gh_cdr (scm) != SCM_EOL) - { - mol.add_at_edge (X_AXIS, RIGHT, ly_word2molecule (gh_car (scm)), 0); - scm = gh_cdr (scm); - } - scm = gh_car (scm); - } - mol.add_at_edge (X_AXIS, RIGHT, ly_word2molecule (scm), 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; -} +#include "output-def.hh" +#include "font-interface.hh" +#include "paper-column.hh" +#include "system.hh" +#include "staff-symbol-referencer.hh" +#include "text-interface.hh" -/* - JUNKME - */ -bool -Chord_name::user_chord_name (Array pitch_arr, Chord_mol* name_p) const +MAKE_SCHEME_CALLBACK (Chord_name, after_line_breaking, 1); +SCM +Chord_name::after_line_breaking (SCM smob) { - Array 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); + Item *me = unsmob_item (smob); + assert (me); - - SCM name = scm_eval (gh_list (ly_symbol2scm ("user-chord-name"), - ly_quote_scm (chord), - SCM_UNDEFINED)); - if (gh_pair_p (name)) + SCM s = me->get_property ("begin-of-line-visible"); + if (to_boolean (s)) { - name_p->modifier_mol = ly_text2molecule (gh_car (name)); - name_p->addition_mol = ly_text2molecule (gh_cdr (name)); - return true; + if (me->get_column ()->get_rank () + - me->get_system ()->spanned_rank_interval ()[LEFT] > 1) + me->suicide (); } - return false; + return SCM_UNSPECIFIED; } -void -Chord_name::banter (Array pitch_arr, Chord_mol* name_p) const -{ - Array add_arr; - Array sub_arr; - Chord::find_additions_and_subtractions (pitch_arr, &add_arr, &sub_arr); - - Array 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 ? "-" : "+"; - } - } - } +ADD_INTERFACE (Chord_name, + "A chord name.", - 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 -{ - Array 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 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 s = get_elt_property ("inversion"); - if (s != SCM_UNDEFINED) - { - name.inversion_mol = lookup_l ()->text ("", "/", paper_l ()); - Musical_pitch p (s); - - Molecule mol = pitch2molecule (p); - name.inversion_mol.add_at_edge (X_AXIS, RIGHT, mol, 0); - } - - 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); - } - - // 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); - - 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; -} + /* properties */ + "begin-of-line-visible " + );