X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flookup.cc;h=b01db45413ca14b3f931ec242ae3804dacf7dc76;hb=d4e71555e7e093a4da32d92378f8f475fa0d6aaa;hp=8be036fa7805a66e99fe1f24b4a1fea3f09c343f;hpb=28d97df78de5e56962730b42119c2d9b73401fa7;p=lilypond.git diff --git a/lily/lookup.cc b/lily/lookup.cc index 8be036fa78..b01db45413 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys Jan Nieuwenhuizen @@ -13,70 +13,16 @@ #include #include -#include "lookup.hh" -#include "debug.hh" +#include "warn.hh" #include "dimensions.hh" #include "bezier.hh" -#include "paper-def.hh" #include "string-convert.hh" #include "file-path.hh" #include "main.hh" #include "lily-guile.hh" -#include "all-font-metrics.hh" -#include "afm.hh" -#include "scope.hh" #include "molecule.hh" - -#include "lily-guile.hh" - - -Lookup::Lookup () -{ - afm_l_ = 0; -} - -Lookup::Lookup (Lookup const& s) -{ - font_name_ = s.font_name_; - afm_l_ = 0; -} - - - - -Molecule -Lookup::afm_find (String s, bool warn) const -{ - if (!afm_l_) - { - Lookup * me = (Lookup*)(this); - me->afm_l_ = all_fonts_global_p->find_afm (font_name_); - if (!me->afm_l_) - { - warning (_f ("can't find font: `%s'", font_name_)); - warning (_f ("(search path: `%s')", global_path.str ().ch_C())); - error (_ ("Aborting")); - } - } - AFM_CharMetricInfo const *cm = afm_l_->find_char_metric (s, warn); - - if (!cm) - { - Molecule m; - m.set_empty (false); - return m; - } - - SCM at = (gh_list (ly_symbol2scm ("char"), - gh_int2scm (cm->code), - SCM_UNDEFINED)); - - at= fontify_atom (afm_l_,at); - return Molecule ( afm_bbox_to_box (cm->charBBox), at); -} - - - +#include "lookup.hh" +#include "font-metric.hh" Molecule Lookup::beam (Real slope, Real width, Real thick) @@ -87,7 +33,7 @@ Lookup::beam (Real slope, Real width, Real thick) - Box b( Interval (0, width), + Box b (Interval (0, width), Interval (min_y, max_y)); @@ -117,7 +63,7 @@ Lookup::dashed_slur (Bezier b, Real thick, Real dash) ly_quote_scm (l), SCM_UNDEFINED)); - Box box (Interval(0,0),Interval( 0,0)); + Box box (Interval (0,0),Interval (0,0)); return Molecule (box, at); } @@ -127,14 +73,12 @@ Lookup::dashed_slur (Bezier b, Real thick, Real dash) Molecule Lookup::blank (Box b) { - Molecule m; - m.dim_ = b; - return m; + return Molecule (b, SCM_EOL); } Molecule -Lookup::filledbox (Box b ) +Lookup::filledbox (Box b) { SCM at = (gh_list (ly_symbol2scm ("filledbox"), gh_double2scm (-b[X_AXIS][LEFT]), @@ -143,7 +87,7 @@ Lookup::filledbox (Box b ) gh_double2scm (b[Y_AXIS][UP]), SCM_UNDEFINED)); - return Molecule ( b,at); + return Molecule (b,at); } Molecule @@ -173,149 +117,6 @@ Lookup::frame (Box b, Real thick) } -/* - TODO: THIS IS UGLY. - Since the user has direct access to TeX marcos, - that currently provide the only way to do - font selection, accents etc, - we try some halfbaked attempt to detect this TeX trickery. - */ -String -sanitise_TeX_string (String text) -{ - int brace_count =0; - for (int i= 0; i < text.length_i (); i++) - { - if (text[i] == '\\') - continue; - - if (text[i] == '{') - brace_count ++; - else if (text[i] == '}') - brace_count --; - } - - if(brace_count) - { - warning (_f ("Non-matching braces in text `%s', adding braces", text.ch_C())); - - if (brace_count < 0) - { - text = to_str ('{', -brace_count) + text; - } - else - { - text = text + to_str ('}', brace_count); - } - } - - return text; -} - -/** - TODO! - */ -String -sanitise_PS_string (String t) -{ - return t; -} - -/** - -*/ -Molecule -Lookup::text (String style, String text, Paper_def *paper_l) -{ - if (style.empty_b ()) - style = "roman"; - - int font_mag = 0; - Real font_h = paper_l->get_var ("font_normal"); - if (paper_l->scope_p_->elem_b ("font_" + style)) - { - font_h = paper_l->get_var ("font_" + style); - } - - - if (paper_l->scope_p_->elem_b ("magnification_" + style)) - { - font_mag = (int)paper_l->get_var ("magnification_" + style); - } - - /* - UGH. - */ - SCM l = scm_eval (gh_list (ly_symbol2scm ("style-to-cmr"), - ly_str02scm (style.ch_C()), - SCM_UNDEFINED)); - - if (l != SCM_BOOL_F) - { - style = ly_scm2string (gh_cdr(l)) +to_str ((int)font_h); - } - - - - Font_metric* metric_l = 0; - - if (font_mag) - metric_l = all_fonts_global_p->find_scaled (style, font_mag); - else - metric_l = all_fonts_global_p->find_font (style); - - - - - int i = text.index_i ("\\n"); - while (i >=0 ) - { - text = text.left_str (i) + "\n" + text.right_str (text.length_i () - i - 2); - i = text.index_i ("\\n"); - } - - Array lines = String_convert::split_arr (text, '\n'); - - Real kern = paper_l->get_var ("line_kern"); - - for (int i=0; i < lines.size (); i++) - { - String str (lines[i]); - if (output_global_ch == "tex") - str = sanitise_TeX_string (str); - else if (output_global_ch == "ps") - str = sanitise_PS_string (str); - lines[i] = str; - } - - if (!lines.size()) - return Molecule(); - - SCM first = gh_list (ly_symbol2scm ("text"), - ly_str02scm (lines[0].ch_C()), - SCM_UNDEFINED); - first = fontify_atom (metric_l, first); - - - - Molecule mol (metric_l->text_dimension (lines[0]), first); - - for (i = 1; i < lines.size (); i++) - { - SCM line = (gh_list (ly_symbol2scm ("text"), - ly_str02scm (lines[i].ch_C ()), - SCM_UNDEFINED)); - line = fontify_atom (metric_l, line); - mol.add_at_edge (Y_AXIS, DOWN, - Molecule (metric_l->text_dimension (lines[i]), line), - kern); - } - - return mol; -} - - - /* Make a smooth curve along the points */ @@ -332,7 +133,7 @@ Lookup::slur (Bezier curve, Real curvethick, Real linethick) SCM scontrols[8]; for (int i=4; i--;) - scontrols[ i ] = ly_offset2scm(back.control_[i]); + scontrols[ i ] = ly_offset2scm (back.control_[i]); for (int i=4 ; i--;) scontrols[i+4] = ly_offset2scm (curve.control_[i]); @@ -341,7 +142,7 @@ Lookup::slur (Bezier curve, Real curvethick, Real linethick) */ int indices[]= {5, 6, 7, 4, 1, 2, 3, 0}; SCM list = SCM_EOL; - for (int i= 8; i--; ) + for (int i= 8; i--;) { list = gh_cons (scontrols[indices[i]], list); } @@ -352,205 +153,223 @@ Lookup::slur (Bezier curve, Real curvethick, Real linethick) gh_double2scm (linethick), SCM_UNDEFINED)); - Box b ( curve.extent (X_AXIS), curve.extent (Y_AXIS)); + Box b (curve.extent (X_AXIS), curve.extent (Y_AXIS)); return Molecule (b, at); } Molecule -Lookup::accordion (SCM s, Real staff_space) const +Lookup::accordion (SCM s, Real staff_space, Font_metric *fm) { Molecule m; - String sym = ly_scm2string(gh_car (s)); - String reg = ly_scm2string(gh_car (gh_cdr(s))); + String sym = ly_scm2string (gh_car (s)); + String reg = ly_scm2string (gh_car (gh_cdr (s))); if (sym == "Discant") { - Molecule r = afm_find("scripts-accDiscant"); - m.add_molecule(r); - if (reg.left_str(1) == "F") + Molecule r = fm->find_by_name ("accordion-accDiscant"); + m.add_molecule (r); + if (reg.left_str (1) == "F") { - Molecule d = afm_find("scripts-accDot"); - d.translate_axis(staff_space * 2.5 PT, Y_AXIS); - m.add_molecule(d); - reg = reg.right_str(reg.length_i()-1); + Molecule d = fm->find_by_name ("accordion-accDot"); + d.translate_axis (staff_space * 2.5 PT, Y_AXIS); + m.add_molecule (d); + reg = reg.right_str (reg.length_i ()-1); } int eflag = 0x00; - if (reg.left_str(3) == "EEE") + if (reg.left_str (3) == "EEE") { eflag = 0x07; - reg = reg.right_str(reg.length_i()-3); + reg = reg.right_str (reg.length_i ()-3); } - else if (reg.left_str(2) == "EE") + else if (reg.left_str (2) == "EE") { eflag = 0x05; - reg = reg.right_str(reg.length_i()-2); + reg = reg.right_str (reg.length_i ()-2); } - else if (reg.left_str(2) == "Eh") + else if (reg.left_str (2) == "Eh") { eflag = 0x04; - reg = reg.right_str(reg.length_i()-2); + reg = reg.right_str (reg.length_i ()-2); } - else if (reg.left_str(1) == "E") + else if (reg.left_str (1) == "E") { eflag = 0x02; - reg = reg.right_str(reg.length_i()-1); + reg = reg.right_str (reg.length_i ()-1); } if (eflag & 0x02) { - Molecule d = afm_find("scripts-accDot"); - d.translate_axis(staff_space * 1.5 PT, Y_AXIS); - m.add_molecule(d); + Molecule d = fm->find_by_name ("accordion-accDot"); + d.translate_axis (staff_space * 1.5 PT, Y_AXIS); + m.add_molecule (d); } if (eflag & 0x04) { - Molecule d = afm_find("scripts-accDot"); - d.translate_axis(staff_space * 1.5 PT, Y_AXIS); - d.translate_axis(0.8 * staff_space PT, X_AXIS); - m.add_molecule(d); + Molecule d = fm->find_by_name ("accordion-accDot"); + d.translate_axis (staff_space * 1.5 PT, Y_AXIS); + d.translate_axis (0.8 * staff_space PT, X_AXIS); + m.add_molecule (d); } if (eflag & 0x01) { - Molecule d = afm_find("scripts-accDot"); - d.translate_axis(staff_space * 1.5 PT, Y_AXIS); - d.translate_axis(-0.8 * staff_space PT, X_AXIS); - m.add_molecule(d); + Molecule d = fm->find_by_name ("accordion-accDot"); + d.translate_axis (staff_space * 1.5 PT, Y_AXIS); + d.translate_axis (-0.8 * staff_space PT, X_AXIS); + m.add_molecule (d); } - if (reg.left_str(2) == "SS") + if (reg.left_str (2) == "SS") { - Molecule d = afm_find("scripts-accDot"); - d.translate_axis(0.5 * staff_space PT, Y_AXIS); - d.translate_axis(0.4 * staff_space PT, X_AXIS); - m.add_molecule(d); - d.translate_axis(-0.8 * staff_space PT, X_AXIS); - m.add_molecule(d); - reg = reg.right_str(reg.length_i()-2); + Molecule d = fm->find_by_name ("accordion-accDot"); + d.translate_axis (0.5 * staff_space PT, Y_AXIS); + d.translate_axis (0.4 * staff_space PT, X_AXIS); + m.add_molecule (d); + d.translate_axis (-0.8 * staff_space PT, X_AXIS); + m.add_molecule (d); + reg = reg.right_str (reg.length_i ()-2); } - if (reg.left_str(1) == "S") + if (reg.left_str (1) == "S") { - Molecule d = afm_find("scripts-accDot"); - d.translate_axis(0.5 * staff_space PT, Y_AXIS); - m.add_molecule(d); - reg = reg.right_str(reg.length_i()-1); + Molecule d = fm->find_by_name ("accordion-accDot"); + d.translate_axis (0.5 * staff_space PT, Y_AXIS); + m.add_molecule (d); + reg = reg.right_str (reg.length_i ()-1); } } else if (sym == "Freebase") { - Molecule r = afm_find("scripts-accFreebase"); - m.add_molecule(r); - if (reg.left_str(1) == "F") + Molecule r = fm->find_by_name ("accordion-accFreebase"); + m.add_molecule (r); + if (reg.left_str (1) == "F") { - Molecule d = afm_find("scripts-accDot"); - d.translate_axis(staff_space * 1.5 PT, Y_AXIS); - m.add_molecule(d); - reg = reg.right_str(reg.length_i()-1); + Molecule d = fm->find_by_name ("accordion-accDot"); + d.translate_axis (staff_space * 1.5 PT, Y_AXIS); + m.add_molecule (d); + reg = reg.right_str (reg.length_i ()-1); } if (reg == "E") { - Molecule d = afm_find("scripts-accDot"); - d.translate_axis(staff_space * 0.5 PT, Y_AXIS); - m.add_molecule(d); + Molecule d = fm->find_by_name ("accordion-accDot"); + d.translate_axis (staff_space * 0.5 PT, Y_AXIS); + m.add_molecule (d); } } else if (sym == "Bayanbase") { - Molecule r = afm_find("scripts-accBayanbase"); - m.add_molecule(r); - if (reg.left_str(1) == "T") + Molecule r = fm->find_by_name ("accordion-accBayanbase"); + m.add_molecule (r); + if (reg.left_str (1) == "T") { - Molecule d = afm_find("scripts-accDot"); - d.translate_axis(staff_space * 2.5 PT, Y_AXIS); - m.add_molecule(d); - reg = reg.right_str(reg.length_i()-1); + Molecule d = fm->find_by_name ("accordion-accDot"); + d.translate_axis (staff_space * 2.5 PT, Y_AXIS); + m.add_molecule (d); + reg = reg.right_str (reg.length_i ()-1); } /* include 4' reed just for completeness. You don't want to use this. */ - if (reg.left_str(1) == "F") + if (reg.left_str (1) == "F") { - Molecule d = afm_find("scripts-accDot"); - d.translate_axis(staff_space * 1.5 PT, Y_AXIS); - m.add_molecule(d); - reg = reg.right_str(reg.length_i()-1); + Molecule d = fm->find_by_name ("accordion-accDot"); + d.translate_axis (staff_space * 1.5 PT, Y_AXIS); + m.add_molecule (d); + reg = reg.right_str (reg.length_i ()-1); } - if (reg.left_str(2) == "EE") + if (reg.left_str (2) == "EE") { - Molecule d = afm_find("scripts-accDot"); - d.translate_axis(staff_space * 0.5 PT, Y_AXIS); - d.translate_axis(0.4 * staff_space PT, X_AXIS); - m.add_molecule(d); - d.translate_axis(-0.8 * staff_space PT, X_AXIS); - m.add_molecule(d); - reg = reg.right_str(reg.length_i()-2); + Molecule d = fm->find_by_name ("accordion-accDot"); + d.translate_axis (staff_space * 0.5 PT, Y_AXIS); + d.translate_axis (0.4 * staff_space PT, X_AXIS); + m.add_molecule (d); + d.translate_axis (-0.8 * staff_space PT, X_AXIS); + m.add_molecule (d); + reg = reg.right_str (reg.length_i ()-2); } - if (reg.left_str(1) == "E") + if (reg.left_str (1) == "E") { - Molecule d = afm_find("scripts-accDot"); - d.translate_axis(staff_space * 0.5 PT, Y_AXIS); - m.add_molecule(d); - reg = reg.right_str(reg.length_i()-1); + Molecule d = fm->find_by_name ("accordion-accDot"); + d.translate_axis (staff_space * 0.5 PT, Y_AXIS); + m.add_molecule (d); + reg = reg.right_str (reg.length_i ()-1); } } else if (sym == "Stdbase") { - Molecule r = afm_find("scripts-accStdbase"); - m.add_molecule(r); - if (reg.left_str(1) == "T") + Molecule r = fm->find_by_name ("accordion-accStdbase"); + m.add_molecule (r); + if (reg.left_str (1) == "T") { - Molecule d = afm_find("scripts-accDot"); - d.translate_axis(staff_space * 3.5 PT, Y_AXIS); - m.add_molecule(d); - reg = reg.right_str(reg.length_i()-1); + Molecule d = fm->find_by_name ("accordion-accDot"); + d.translate_axis (staff_space * 3.5 PT, Y_AXIS); + m.add_molecule (d); + reg = reg.right_str (reg.length_i ()-1); } - if (reg.left_str(1) == "F") + if (reg.left_str (1) == "F") { - Molecule d = afm_find("scripts-accDot"); - d.translate_axis(staff_space * 2.5 PT, Y_AXIS); - m.add_molecule(d); - reg = reg.right_str(reg.length_i()-1); + Molecule d = fm->find_by_name ("accordion-accDot"); + d.translate_axis (staff_space * 2.5 PT, Y_AXIS); + m.add_molecule (d); + reg = reg.right_str (reg.length_i ()-1); } - if (reg.left_str(1) == "M") + if (reg.left_str (1) == "M") { - Molecule d = afm_find("scripts-accDot"); - d.translate_axis(staff_space * 2 PT, Y_AXIS); - d.translate_axis(staff_space PT, X_AXIS); - m.add_molecule(d); - reg = reg.right_str(reg.length_i()-1); + Molecule d = fm->find_by_name ("accordion-accDot"); + d.translate_axis (staff_space * 2 PT, Y_AXIS); + d.translate_axis (staff_space PT, X_AXIS); + m.add_molecule (d); + reg = reg.right_str (reg.length_i ()-1); } - if (reg.left_str(1) == "E") + if (reg.left_str (1) == "E") { - Molecule d = afm_find("scripts-accDot"); - d.translate_axis(staff_space * 1.5 PT, Y_AXIS); - m.add_molecule(d); - reg = reg.right_str(reg.length_i()-1); + Molecule d = fm->find_by_name ("accordion-accDot"); + d.translate_axis (staff_space * 1.5 PT, Y_AXIS); + m.add_molecule (d); + reg = reg.right_str (reg.length_i ()-1); } - if (reg.left_str(1) == "S") + if (reg.left_str (1) == "S") { - Molecule d = afm_find("scripts-accDot"); - d.translate_axis(staff_space * 0.5 PT, Y_AXIS); - m.add_molecule(d); - reg = reg.right_str(reg.length_i()-1); + Molecule d = fm->find_by_name ("accordion-accDot"); + d.translate_axis (staff_space * 0.5 PT, Y_AXIS); + m.add_molecule (d); + reg = reg.right_str (reg.length_i ()-1); } } /* ugh maybe try to use regular font for S.B. and B.B and only use one font for the rectangle */ else if (sym == "SB") { - Molecule r = afm_find("scripts-accSB"); - m.add_molecule(r); + Molecule r = fm->find_by_name ("accordion-accSB"); + m.add_molecule (r); } else if (sym == "BB") { - Molecule r = afm_find("scripts-accBB"); - m.add_molecule(r); + Molecule r = fm->find_by_name ("accordion-accBB"); + m.add_molecule (r); } else if (sym == "OldEE") { - Molecule r = afm_find("scripts-accOldEE"); - m.add_molecule(r); + Molecule r = fm->find_by_name ("accordion-accOldEE"); + m.add_molecule (r); } else if (sym == "OldEES") { - Molecule r = afm_find("scripts-accOldEES"); - m.add_molecule(r); + Molecule r = fm->find_by_name ("accordion-accOldEES"); + m.add_molecule (r); } return m; } +/* + TODO: should use slope instead? Angle gives nasty rad <-> degree + conversions. +*/ +Molecule +Lookup::repeat_slash (Real w, Real s, Real t) +{ + SCM wid = gh_double2scm (w); + SCM sl = gh_double2scm (s); + SCM thick = gh_double2scm (t); + SCM slashnodot = gh_list (ly_symbol2scm ("repeat-slash"), + wid, sl, thick, SCM_UNDEFINED); + + Box b (Interval (0, w + sqrt (sqr(t/s) + sqr (t))), + Interval (0, w * s)); + + return Molecule (b, slashnodot); +}