source file of the GNU LilyPond music typesetter
- (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
TODO
Glissando
*/
-
+#include <math.h>
#include <ctype.h>
-#include "lookup.hh"
-#include "debug.hh"
+
+#include "warn.hh"
#include "dimensions.hh"
-#include "scalar.hh"
-#include "paper-def.hh"
+#include "bezier.hh"
#include "string-convert.hh"
#include "file-path.hh"
#include "main.hh"
#include "lily-guile.hh"
-#include "all-fonts.hh"
-#include "afm.hh"
-#include "scope.hh"
#include "molecule.hh"
-#include "atom.hh"
-#include "lily-guile.hh"
+#include "lookup.hh"
+#include "font-metric.hh"
-SCM
-array_to_list (SCM *a , int l)
+Molecule
+Lookup::beam (Real slope, Real width, Real thick)
{
- SCM list = SCM_EOL;
- for (int i= l; i--; )
- {
- list = gh_cons (a[i], list);
- }
- return list;
-}
+ Real height = slope * width;
+ Real min_y = (0 <? height) - thick/2;
+ Real max_y = (0 >? height) + thick/2;
+
-Lookup::Lookup ()
-{
- paper_l_ = 0;
- afm_l_ = 0;
-}
+ Box b (Interval (0, width),
+ Interval (min_y, max_y));
-Lookup::Lookup (Lookup const& s)
-{
- font_name_ = s.font_name_;
- paper_l_ = 0;
- afm_l_ = 0;
+
+ SCM at = scm_list_n (ly_symbol2scm ("beam"),
+ gh_double2scm (width),
+ gh_double2scm (slope),
+ gh_double2scm (thick),
+ SCM_UNDEFINED);
+ return Molecule (b, at);
}
-Molecule
-Lookup::ledger_line (Interval xwid) const
-{
- Molecule end (afm_find ("noteheads-ledgerending"));
- Interval ed = end.dim_[X_AXIS];
- xwid = Interval (xwid[LEFT] - ed[LEFT],
- xwid[RIGHT] - ed[RIGHT]);
- Molecule mid = filledbox (Box (xwid, end.dim_[Y_AXIS]));
- Molecule l (mid);
-
- Molecule e2 = end;
- Molecule e1 = end;
- e1.translate_axis (xwid[RIGHT], X_AXIS);
- e2.translate_axis (xwid[LEFT], X_AXIS);
-
- l.add_molecule (e1);
- l.add_molecule (e2);
- return l;
-}
-
Molecule
-Lookup::accidental (int j, bool cautionary) const
+Lookup::dashed_slur (Bezier b, Real thick, Real dash)
{
- Molecule m(afm_find (String ("accidentals-") + to_str (j)));
- if (cautionary)
+ SCM l = SCM_EOL;
+
+ for (int i= 4; i -- ;)
{
- Molecule open = afm_find (String ("accidentals-("));
- Molecule close = afm_find (String ("accidentals-)"));
- m.add_at_edge(X_AXIS, LEFT, Molecule(open), 0);
- m.add_at_edge(X_AXIS, RIGHT, Molecule(close), 0);
+ l = gh_cons (ly_offset2scm (b.control_[i]), l);
}
- return m;
+
+ SCM at = (scm_list_n (ly_symbol2scm ("dashed-slur"),
+ gh_double2scm (thick),
+ gh_double2scm (dash),
+ ly_quote_scm (l),
+ SCM_UNDEFINED));
+
+ Box box (Interval (0,0),Interval (0,0));
+ return Molecule (box, at);
}
-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 open `%s'\n", font_name_));
- warning (_f("Search path %s\n", global_path.str ().ch_C()));
- error (_f("Aborting"));
- }
- }
- Adobe_font_char_metric cm = afm_l_->find_char (s, warn);
- Molecule m;
- if (cm.code () < 0)
- return m;
-
- Atom at (gh_list (char_scm_sym,
- gh_int2scm (cm.code ()),
- SCM_UNDEFINED));
- at.font_ = ly_symbol (font_name_.ch_C());
- m.dim_ = cm.dimensions();
- m.add_atom (&at);
- return m;
-}
Molecule
-Lookup::notehead (int j, String type) const
+Lookup::blank (Box b)
{
- if (j > 2)
- j = 2;
-
- return afm_find (String ("noteheads-") + to_str (j) + type);
+ return Molecule (b, SCM_EOL);
}
+
Molecule
-Lookup::simple_bar (String type, Real h) const
+Lookup::filledbox (Box b)
{
- SCM thick = ly_symbol ("barthick_" + type);
- Real w = 0.1 PT;
- if (paper_l_->scope_p_->elem_b (thick))
- {
- w = paper_l_->get_realvar (thick);
- }
+ SCM at = (scm_list_n (ly_symbol2scm ("filledbox"),
+ gh_double2scm (-b[X_AXIS][LEFT]),
+ gh_double2scm (b[X_AXIS][RIGHT]),
+ gh_double2scm (-b[Y_AXIS][DOWN]),
+ gh_double2scm (b[Y_AXIS][UP]),
+ SCM_UNDEFINED));
- return filledbox (Box (Interval(0,w), Interval(-h/2, h/2)));
+ return Molecule (b,at);
}
-
Molecule
-Lookup::bar (String str, Real h) const
+Lookup::frame (Box b, Real thick)
{
- if (str == "[")
- return staff_bracket (h);
- else if (str == "{")
- return staff_brace (h);
-
- Real kern = paper_l_->get_var ("bar_kern");
- Real thinkern = paper_l_->get_var ("bar_thinkern");
- Molecule thin = simple_bar ("thin", h);
- Molecule thick = simple_bar ("thick", h);
- Molecule colon = afm_find ("dots-repeatcolon");
-
Molecule m;
-
- if (str == "")
- {
- return fill (Box (Interval(0, 0), Interval (-h/2, h/2)));
- }
- if (str == "scorepostbreak")
- {
- return simple_bar ("score", h);
- }
- else if (str == "|")
+ Direction d = LEFT;
+ Axis a = X_AXIS;
+ while (a < NO_AXES)
{
- return thin;
- }
- else if (str == "|.")
- {
- m.add_at_edge (X_AXIS, LEFT, thick, 0);
- m.add_at_edge (X_AXIS, LEFT, thin, kern);
- }
- else if (str == ".|")
- {
- m.add_at_edge (X_AXIS, RIGHT, thick, 0);
- m.add_at_edge (X_AXIS, RIGHT, thin, kern);
- }
- else if (str == ":|")
- {
- m.add_at_edge (X_AXIS, LEFT, thick, 0);
- m.add_at_edge (X_AXIS, LEFT, thin, kern);
- m.add_at_edge (X_AXIS, LEFT, colon, kern);
- }
- else if (str == "|:")
- {
- m.add_at_edge (X_AXIS, RIGHT, thick, 0);
- m.add_at_edge (X_AXIS, RIGHT, thin, kern);
- m.add_at_edge (X_AXIS, RIGHT, colon, kern);
- }
- else if (str == ":|:")
- {
- m.add_at_edge (X_AXIS, LEFT, thick, thinkern);
- m.add_at_edge (X_AXIS, LEFT, colon, kern);
- m.add_at_edge (X_AXIS, RIGHT, thick, kern);
- m.add_at_edge (X_AXIS, RIGHT, colon, kern);
- }
- else if (str == ".|.")
- {
- m.add_at_edge (X_AXIS, LEFT, thick, thinkern);
- m.add_at_edge (X_AXIS, RIGHT, thick, kern);
- }
- else if (str == "||")
- {
- m.add_at_edge (X_AXIS, RIGHT, thin, 0);
- m.add_at_edge (X_AXIS, RIGHT, thin, thinkern);
+ do
+ {
+ Axis o = Axis ((a+1)%NO_AXES);
+
+ Box edges;
+ edges[a] = b[a][d] + 0.5 * thick * Interval (-1, 1);
+ edges[o][DOWN] = b[o][DOWN] - thick/2;
+ edges[o][UP] = b[o][UP] + thick/2;
+
+
+ m.add_molecule (filledbox (edges));
+ }
+ while (flip (&d) != LEFT);
}
-
return m;
-}
-
-Molecule
-Lookup::beam (Real slope, Real width, Real thick) const
-{
- Real height = slope * width;
- Real min_y = (0 <? height) - thick/2;
- Real max_y = (0 >? height) + thick/2;
-
- Molecule m;
- Atom at
- (gh_list (beam_scm_sym,
- gh_double2scm (width),
- gh_double2scm (slope),
- gh_double2scm (thick),
- SCM_UNDEFINED));
-
- m.dim_[X_AXIS] = Interval (0, width);
- m.dim_[Y_AXIS] = Interval (min_y, max_y);
- m.add_atom (&at);
- return m;
-}
-
-Molecule
-Lookup::clef (String st) const
-{
- return afm_find (String ("clefs-" + st));
}
-SCM
-offset2scm (Offset o)
-{
- return gh_list (gh_double2scm (o[X_AXIS]), gh_double2scm(o[Y_AXIS]),
- SCM_UNDEFINED);
-}
+/*
+ Make a smooth curve along the points
+ */
Molecule
-Lookup::dashed_slur (Array<Offset> controls, Real thick, Real dash) const
+Lookup::slur (Bezier curve, Real curvethick, Real linethick)
{
- assert (controls.size () == 8);
- Offset d = controls[3] - controls[0];
+ Real alpha = (curve.control_[3] - curve.control_[0]).arg ();
+ Bezier back = curve;
+ Offset perp = curvethick * complex_exp (Offset (0, alpha + M_PI/2)) * 0.5;
+ back.reverse ();
+ back.control_[1] += perp;
+ back.control_[2] += perp;
+
+ curve.control_[1] -= perp;
+ curve.control_[2] -= perp;
- Real dx = d[X_AXIS];
- Real dy = d[Y_AXIS];
-
- Molecule m;
+ SCM scontrols[8];
+ for (int i=4; i--;)
+ scontrols[ i ] = ly_offset2scm (back.control_[i]);
+ for (int i=4 ; i--;)
+ scontrols[i+4] = ly_offset2scm (curve.control_[i]);
- m.dim_[X_AXIS] = Interval (0, dx);
- m.dim_[Y_AXIS] = Interval (0 <? dy, 0 >? dy);
-
- SCM sc[4];
- for (int i=0; i< 4; i++)
+ /*
+ Need the weird order b.o. the way PS want its arguments
+ */
+ int indices[]= {5, 6, 7, 4, 1, 2, 3, 0};
+ SCM list = SCM_EOL;
+ for (int i= 8; i--;)
{
- sc[i] = offset2scm (controls[i]);
+ list = gh_cons (scontrols[indices[i]], list);
}
-
- Atom at
- (gh_list (ly_symbol ("dashed-slur"),
- gh_double2scm (thick),
- gh_double2scm (dash),
- ly_quote_scm (array_to_list (sc, 4)),
- SCM_UNDEFINED));
- m.add_atom (&at);
- return m;
-}
-
-Molecule
-Lookup::dots () const
-{
- return afm_find (String ("dots-dot"));
-}
-
-
-
-Molecule
-Lookup::fill (Box b) const
-{
- Molecule m;
- m.dim_ = b;
- return m;
-}
-
-Molecule
-Lookup::flag (int j, Direction d) const
-{
- char c = (d == UP) ? 'u' : 'd';
- return afm_find (String ("flags-") + to_str (c) + to_str (j));
-}
-
-Molecule
-Lookup::rest (int j, bool o) const
-{
- return afm_find (String ("rests-") + to_str (j) + (o ? "o" : ""));
-}
-
-Molecule
-Lookup::rule_symbol (Real height, Real width) const
-{
- Atom at (gh_list (rulesym_scm_sym,
- gh_double2scm (height),
- gh_double2scm (width),
- SCM_UNDEFINED));
-
- Molecule m;
- m.dim_.x () = Interval (0, width);
- m.dim_.y () = Interval (0, height);
-
- m.add_atom (&at);
-
- return m;
-}
-
-Molecule
-Lookup::script (String str) const
-{
- return afm_find (String ("scripts-") + str);
-}
-
-Molecule
-Lookup::special_time_signature (String s, int n, int d) const
-{
- // First guess: s contains only the signature style
- String symbolname = "timesig-" + s + to_str (n) + "/" + to_str (d);
-
- Molecule m = afm_find (symbolname, false);
- if (!m.empty_b())
- return m;
+ SCM at = (scm_list_n (ly_symbol2scm ("bezier-sandwich"),
+ ly_quote_scm (list),
+ gh_double2scm (linethick),
+ SCM_UNDEFINED));
+ Box b(curve.extent (X_AXIS),
+ curve.extent (Y_AXIS));
- // Second guess: s contains the full signature name
- m = afm_find ("timesig-"+s, false);
- if (!m.empty_b ())
- return m;
+ b[X_AXIS].unite (back.extent (X_AXIS));
+ b[Y_AXIS].unite (back.extent (Y_AXIS));
- // Resort to default layout with numbers
- return time_signature (n,d);
+ return Molecule (b, at);
}
Molecule
-Lookup::filledbox (Box b ) const
+Lookup::accordion (SCM s, Real staff_space, Font_metric *fm)
{
Molecule m;
-
- Atom at (gh_list (filledbox_scm_sym,
- gh_double2scm (-b[X_AXIS][LEFT]),
- gh_double2scm (b[X_AXIS][RIGHT]),
- gh_double2scm (-b[Y_AXIS][DOWN]),
- gh_double2scm (b[Y_AXIS][UP]),
- SCM_UNDEFINED));
-
- m.dim_ = b;
- m.add_atom (&at);
- return m;
-}
-
-Molecule
-Lookup::stem (Real y1, Real y2) const
-{
- if (y1 > y2)
- {
- Real t = y1;
- y1 = y2;
- y2 = t;
- }
- Real stem_width = paper_l_->get_var ("stemthickness");
- return filledbox (Box (Interval (-stem_width/2,stem_width/2),
- Interval (y1, y2)));
-}
-
-
-
-/**
- Magnification steps. These are powers of 1.2. The numbers are
- taken from Knuth's plain.tex: */
-static Real mag_steps[] = {1, 1, 1.200, 1.440, 1.7280, 2.074, 2.488};
-
-
+ String sym = ly_scm2string (ly_car (s));
+ String reg = ly_scm2string (ly_car (ly_cdr (s)));
-Molecule
-Lookup::text (String style, String text) const
-{
- Molecule m;
-
- int font_mag = 1;
- Real font_h = paper_l_->get_var ("font_normal");
- if (paper_l_->scope_p_->elem_b ("font_" + style))
+ if (sym == "Discant")
{
- font_h = paper_l_->get_var ("font_" + style);
+ Molecule r = fm->find_by_name ("accordion-accDiscant");
+ m.add_molecule (r);
+ if (reg.left_str (1) == "F")
+ {
+ 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")
+ {
+ eflag = 0x07;
+ reg = reg.right_str (reg.length_i ()-3);
+ }
+ else if (reg.left_str (2) == "EE")
+ {
+ eflag = 0x05;
+ reg = reg.right_str (reg.length_i ()-2);
+ }
+ else if (reg.left_str (2) == "Eh")
+ {
+ eflag = 0x04;
+ reg = reg.right_str (reg.length_i ()-2);
+ }
+ else if (reg.left_str (1) == "E")
+ {
+ eflag = 0x02;
+ reg = reg.right_str (reg.length_i ()-1);
+ }
+ if (eflag & 0x02)
+ {
+ 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 = 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 = 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")
+ {
+ 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")
+ {
+ 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);
+ }
}
-
- if (paper_l_->scope_p_->elem_b ("magnification_" + style))
+ else if (sym == "Freebase")
{
- font_mag = (int)paper_l_->get_var ("magnification_" + style);
+ Molecule r = fm->find_by_name ("accordion-accFreebase");
+ m.add_molecule (r);
+ if (reg.left_str (1) == "F")
+ {
+ 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 = fm->find_by_name ("accordion-accDot");
+ d.translate_axis (staff_space * 0.5 PT, Y_AXIS);
+ m.add_molecule (d);
+ }
}
-
- SCM l = gh_eval_str (("(style-to-cmr \"" + style + "\")").ch_C());
- if (l != SCM_BOOL_F)
+ else if (sym == "Bayanbase")
{
- style = ly_scm2string (SCM_CDR(l)) +to_str ((int)font_h);
+ Molecule r = fm->find_by_name ("accordion-accBayanbase");
+ m.add_molecule (r);
+ if (reg.left_str (1) == "T")
+ {
+ 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")
+ {
+ 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")
+ {
+ 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")
+ {
+ 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);
+ }
}
-
- Real w = 0;
- Interval ydims (0,0);
-
- Font_metric* afm_l = all_fonts_global_p->find_font (style);
- DOUT << "\nChars: ";
-
- for (int i = 0; i < text.length_i (); i++)
+ else if (sym == "Stdbase")
{
- if (text[i]=='\\')
- for (i++; (i < text.length_i ()) && isalpha(text[i]); i++)
- ;
- else
+ Molecule r = fm->find_by_name ("accordion-accStdbase");
+ m.add_molecule (r);
+ if (reg.left_str (1) == "T")
{
- Character_metric *c = afm_l->get_char ((unsigned char)text[i],false);
-
- w += c->dimensions()[X_AXIS].length ();
- ydims.unite (c->dimensions()[Y_AXIS]);
+ 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")
+ {
+ 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")
+ {
+ 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")
+ {
+ 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")
+ {
+ 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);
}
}
-
- if (font_mag > 1 && font_mag < 7 )
+ /* 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")
{
- /* UGH */
- style = style + String(" scaled \\magstep ") + to_str (font_mag);
- w *= mag_steps[font_mag];
- ydims *= mag_steps[font_mag];
+ Molecule r = fm->find_by_name ("accordion-accSB");
+ m.add_molecule (r);
}
-
- DOUT << "\n" << to_str (w) << "\n";
- m.dim_.x () = Interval (0, w);
- m.dim_.y () = ydims;
-
-
- Atom at (gh_list (text_scm_sym,
- gh_str02scm (text.ch_C()),
- SCM_UNDEFINED));
- at.font_ = ly_symbol (style);
-
- m.add_atom (&at);
- return m;
-}
-
-
-/*
- */
-Molecule
-Lookup::time_signature (int num, int den) const
-{
- String sty = "number";
- Molecule n (text (sty, to_str (num)));
- Molecule d (text (sty, to_str (den)));
- n.do_center (X_AXIS);
- d.do_center (X_AXIS);
- Molecule m;
- if (den)
+ else if (sym == "BB")
{
- m.add_at_edge (Y_AXIS, UP, n, 0.0);
- m.add_at_edge (Y_AXIS, DOWN, d, 0.0);
+ Molecule r = fm->find_by_name ("accordion-accBB");
+ m.add_molecule (r);
}
- else
+ else if (sym == "OldEE")
{
- m = n;
- m.do_center (Y_AXIS);
+ Molecule r = fm->find_by_name ("accordion-accOldEE");
+ m.add_molecule (r);
}
- return m;
-}
-
-Molecule
-Lookup::staff_brace (Real y) const
-{
- Molecule m;
-
- Atom at (gh_list (pianobrace_scm_sym,
- gh_double2scm (y),
- SCM_UNDEFINED
- ));
-
- m.dim_[Y_AXIS] = Interval (-y/2,y/2);
- m.dim_[X_AXIS] = Interval (0,0);
- m.add_atom (&at);
- return m;
-}
-
-Molecule
-Lookup::hairpin (Real width, bool decresc, bool continued) const
-{
- Molecule m;
- Real height = paper_l_->staffheight_f () / 6;
-
- String hairpin = String (decresc ? "de" : "") + "crescendo";
- Atom at (gh_list (ly_symbol (hairpin),
- gh_double2scm (width),
- gh_double2scm (height),
- gh_double2scm (continued ? height/2 : 0.0),
- SCM_UNDEFINED));
- m.dim_.x () = Interval (0, width);
- m.dim_.y () = Interval (-2*height, 2*height);
-
- m.add_atom (&at);
- return m;
-}
-
-Molecule
-Lookup::plet (Real dy , Real dx, Direction dir) const
-{
- Molecule m;
- SCM thick = tuplet_thick_scm_sym;
- Real t = 0.1 PT;
- if (paper_l_->scope_p_->elem_b (thick))
+ else if (sym == "OldEES")
{
- t = paper_l_->get_realvar (thick);
+ Molecule r = fm->find_by_name ("accordion-accOldEES");
+ m.add_molecule (r);
}
-
- Atom at (gh_list(tuplet_scm_sym,
- gh_double2scm (dx),
- gh_double2scm (dy),
- gh_double2scm (t),
- gh_int2scm (dir),
- SCM_UNDEFINED));
-m.add_atom (&at);
-
- return m;
+ return m;
}
/*
- Make a smooth curve along the points
- */
-Molecule
-Lookup::slur (Array<Offset> controls) const
-{
- Offset delta_off = controls[3]- controls[0];
- Molecule m;
-
- SCM scontrols [8];
- int indices[] = {5,6,7,4,1,2,3,0};
-
- for (int i= 0; i < 8; i++)
- scontrols[i] = offset2scm (controls[indices[i]]);
-
-
- Atom at (gh_list (ly_symbol ("bezier-sandwich"),
- ly_quote_scm (array_to_list (scontrols, 8)),
- SCM_UNDEFINED));
-
- m.dim_[X_AXIS] = Interval (0, delta_off[X_AXIS]);
- m.dim_[Y_AXIS] = Interval (0 <? delta_off[Y_AXIS], 0 >? delta_off[Y_AXIS]);
- m.add_atom (&at);
- return m;
-}
-
-Molecule
-Lookup::staff_bracket (Real y) const
-{
- Molecule m;
- Atom at ( gh_list (bracket_scm_sym,
- gh_double2scm (y),
- SCM_UNDEFINED));
- m.add_atom (&at);
- m.dim_[Y_AXIS] = Interval (-y/2,y/2);
- m.dim_[X_AXIS] = Interval (0,4 PT);
-
- m.translate_axis (- 4. / 3. * m.dim_[X_AXIS].length (), X_AXIS);
- return m;
-}
-
+ TODO: should use slope instead? Angle gives nasty rad <-> degree
+ conversions.
+*/
Molecule
-Lookup::volta (Real w, bool last_b) const
+Lookup::repeat_slash (Real w, Real s, Real t)
{
- Molecule m;
- SCM thick = volta_thick_scm_sym;
- Real t = 0.1 PT;
- if (paper_l_->scope_p_->elem_b (thick))
- {
- t = paper_l_->get_realvar (thick);
- }
- Atom at (gh_list (volta_scm_sym,
- gh_double2scm (w),
- gh_double2scm (t),
- gh_int2scm (last_b),
- SCM_UNDEFINED));
-
- Real interline_f = paper_l_->get_realvar (interline_scm_sym);
+ SCM wid = gh_double2scm (w);
+ SCM sl = gh_double2scm (s);
+ SCM thick = gh_double2scm (t);
+ SCM slashnodot = scm_list_n (ly_symbol2scm ("repeat-slash"),
+ wid, sl, thick, SCM_UNDEFINED);
- m.dim_[Y_AXIS] = Interval (-interline_f, interline_f);
- m.dim_[X_AXIS] = Interval (0, w);
+ Box b (Interval (0, w + sqrt (sqr(t/s) + sqr (t))),
+ Interval (0, w * s));
- m.add_atom (&at);
- return m;
+ return Molecule (b, slashnodot); // http://slashnodot.org
}
-
-