source file of the GNU LilyPond music typesetter
- (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
#include "atom.hh"
#include "lily-guile.hh"
-SCM
-ly_offset2scm (Offset o)
-{
- return gh_list (gh_double2scm (o[X_AXIS]), gh_double2scm(o[Y_AXIS]),
- SCM_UNDEFINED);
-}
Lookup::Lookup ()
{
}
-/*
- build a ledger line for small pieces.
- */
-Molecule
-Lookup::ledger_line (Interval xwid) const
-{
- Drul_array<Molecule> endings;
- endings[LEFT] = afm_find ("noteheads-ledgerending");
- Molecule * e = &endings[LEFT];
- endings[RIGHT] = *e;
-
- Real thick = e->dim_[Y_AXIS].length();
- Real len = e->dim_[X_AXIS].length () - thick;
-
- Molecule total;
- Direction d = LEFT;
- do {
- endings[d].translate_axis (xwid[d] - endings[d].dim_[X_AXIS][d], X_AXIS);
- total.add_molecule (endings[d]);
- } while ((flip(&d)) != LEFT);
-
- Real xpos = xwid [LEFT] + len;
-
- while (xpos + len + thick /2 <= xwid[RIGHT])
- {
- e->translate_axis (len, X_AXIS);
- total.add_molecule (*e);
- xpos += len;
- }
-
- return total;
-}
-
-
Molecule
if (!me->afm_l_)
{
warning (_f ("Can't find font: `%s'", font_name_));
- warning (_f ("(search path: `%s')", global_path.str ().ch_C()));
+ warning (_f ("(search path `%s')", global_path.str ().ch_C()));
error (_ ("Aborting"));
}
}
- Adobe_font_char_metric cm = afm_l_->find_char (s, warn);
+ AFM_CharMetricInfo const *cm = afm_l_->find_char_metric (s, warn);
Molecule m;
- if (cm.code () < 0)
+ if (!cm)
{
- /*
- don't want people relying on this kind of dimension.
- */
m.set_empty (false);
return m;
}
- Atom at (gh_list (ly_symbol2scm ("char"),
- gh_int2scm (cm.code ()),
+ SCM at = (gh_list (ly_symbol2scm ("char"),
+ gh_int2scm (cm->code),
SCM_UNDEFINED));
- at.fontify (afm_l_);
- m.dim_ = cm.dimensions();
- m.add_atom (&at);
+ at= fontify_atom (afm_l_,at);
+ m.dim_ = afm_bbox_to_box (cm->charBBox);
+ m.add_atom (at);
return m;
}
}
Molecule
-Lookup::beam (Real slope, Real width, Real thick) const
+Lookup::beam (Real slope, Real width, Real thick)
{
Real height = slope * width;
Real min_y = (0 <? height) - thick/2;
Molecule m;
- Atom at
- (gh_list (ly_symbol2scm ("beam"),
+ m.dim_[X_AXIS] = Interval (0, width);
+ m.dim_[Y_AXIS] = Interval (min_y, max_y);
+
+
+ SCM at = (gh_list (ly_symbol2scm ("beam"),
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);
+ m.add_atom (at);
return m;
}
-/*
- FIXME.
- */
Molecule
-Lookup::dashed_slur (Bezier b, Real thick, Real dash) const
+Lookup::dashed_slur (Bezier b, Real thick, Real dash)
{
SCM l = SCM_EOL;
for (int i= 4; i -- ;)
l = gh_cons (ly_offset2scm (b.control_[i]), l);
}
- Atom at (gh_list (ly_symbol2scm ("dashed-slur"),
- gh_double2scm (thick),
- gh_double2scm (dash),
- ly_quote_scm (l),
- SCM_UNDEFINED));
+ SCM at = (gh_list (ly_symbol2scm ("dashed-slur"),
+ gh_double2scm (thick),
+ gh_double2scm (dash),
+ ly_quote_scm (l),
+ SCM_UNDEFINED));
Molecule m;
- m.add_atom (&at);
+ m.add_atom (at);
return m;
}
Molecule
-Lookup::fill (Box b) const
+Lookup::fill (Box b)
{
Molecule m;
m.dim_ = b;
}
-
-Molecule
-Lookup::special_time_signature (String s, int n, int d, Paper_def*pap) 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;
-
- // Second guess: s contains the full signature name
- m = afm_find ("timesig-"+s, false);
- if (!m.empty_b ())
- return m;
-
- // Resort to default layout with numbers
- return time_signature (n,d,pap);
-}
-
Molecule
-Lookup::filledbox (Box b ) const
+Lookup::filledbox (Box b )
{
Molecule m;
- Atom at (gh_list (ly_symbol2scm ("filledbox"),
+ SCM at = (gh_list (ly_symbol2scm ("filledbox"),
gh_double2scm (-b[X_AXIS][LEFT]),
gh_double2scm (b[X_AXIS][RIGHT]),
gh_double2scm (-b[Y_AXIS][DOWN]),
SCM_UNDEFINED));
m.dim_ = b;
- m.add_atom (&at);
+ m.add_atom (at);
return m;
}
+Molecule
+Lookup::frame (Box b, Real thick)
+{
+ Molecule m;
+ Direction d = LEFT;
+ Axis a = X_AXIS;
+ while (a < NO_AXES)
+ {
+ 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;
+
+}
+
+
/*
TODO: THIS IS UGLY. Since the user has direct access to TeX
strings, we try some halfbaked attempt to detect TeX trickery.
*/
Molecule
-Lookup::text (String style, String text, Paper_def *paper_l) const
+Lookup::text (String style, String text, Paper_def *paper_l)
{
Molecule m;
if (style.empty_b ())
m.dim_ = metric_l->text_dimension (text);
- Atom at (gh_list (ly_symbol2scm ("text"),
+ SCM at = (gh_list (ly_symbol2scm ("text"),
ly_str02scm (text.ch_C()),
SCM_UNDEFINED));
- at.fontify (metric_l);
+ at = fontify_atom (metric_l,at);
- m.add_atom (&at);
+ m.add_atom (at);
return m;
}
-
-Molecule
-Lookup::time_signature (int num, int den, Paper_def *paper_l) const
-{
- String sty = "number";
- Molecule n (text (sty, to_str (num), paper_l));
- Molecule d (text (sty, to_str (den), paper_l));
- n.align_to (X_AXIS, CENTER);
- d.align_to (X_AXIS, CENTER);
- Molecule m;
- if (den)
- {
- m.add_at_edge (Y_AXIS, UP, n, 0.0);
- m.add_at_edge (Y_AXIS, DOWN, d, 0.0);
- }
- else
- {
- m = n;
- m.align_to (Y_AXIS, CENTER);
- }
- return m;
-}
-
Molecule
-Lookup::staff_brace (Real y, int staff_size) const
+Lookup::staff_brace (Real y, int staff_size)
{
Molecule m;
+ // URG
Real step = 1.0;
int minht = 2 * staff_size;
int maxht = 7 * minht;
int idx = int (((maxht - step) <? y - minht) / step);
idx = idx >? 0;
-
- String nm = String ("feta-braces" + to_str (staff_size));
+ SCM l = ly_eval_str ("(style-to-cmr \"brace\")");
+ String nm = "feta-braces";
+ if (l != SCM_BOOL_F)
+ nm = ly_scm2string (gh_cdr (l));
+ nm += to_str (staff_size);
SCM e =gh_list (ly_symbol2scm ("char"), gh_int2scm (idx), SCM_UNDEFINED);
- Atom at (e);
+ SCM at = (e);
- at.fontify (all_fonts_global_p->find_font (nm));
+ at = fontify_atom (all_fonts_global_p->find_font (nm), at);
m.dim_[Y_AXIS] = Interval (-y/2,y/2);
m.dim_[X_AXIS] = Interval (0,0);
- m.add_atom (&at);
- return m;
-}
-
-
-
-Molecule
-Lookup::tuplet_bracket (Real dy , Real dx, Real thick, Real gap,
- Real height, Direction dir) const
-{
- Molecule m;
-
- Atom at (gh_list(ly_symbol2scm ("tuplet"),
- gh_double2scm (height),
- gh_double2scm (gap),
- gh_double2scm (dx),
- gh_double2scm (dy),
- gh_double2scm (thick),
- gh_int2scm (dir),
- SCM_UNDEFINED));
- m.add_atom (&at);
-
+ m.add_atom (at);
return m;
}
+
/*
Make a smooth curve along the points
*/
Molecule
-Lookup::slur (Bezier curve, Real curvethick, Real linethick) const
+Lookup::slur (Bezier curve, Real curvethick, Real linethick)
{
Real alpha = (curve.control_[3] - curve.control_[0]).arg ();
Bezier back = curve;
}
- Atom at (gh_list (ly_symbol2scm ("bezier-sandwich"),
+ SCM at = (gh_list (ly_symbol2scm ("bezier-sandwich"),
ly_quote_scm (list),
gh_double2scm (linethick),
SCM_UNDEFINED));
Molecule m;
m.dim_[X_AXIS] = curve.extent (X_AXIS);
m.dim_[Y_AXIS] = curve.extent (Y_AXIS);
- m.add_atom (&at);
+ m.add_atom (at);
return m;
}
Molecule
-Lookup::staff_bracket (Real height, Paper_def* paper_l) const
+Lookup::staff_bracket (Real height, Paper_def* paper_l)
{
Molecule m;
- Atom at ( gh_list (ly_symbol2scm ("bracket"),
+ SCM at = ( gh_list (ly_symbol2scm ("bracket"),
gh_double2scm (paper_l->get_var("bracket_arch_angle")),
gh_double2scm (paper_l->get_var("bracket_arch_width")),
gh_double2scm (paper_l->get_var("bracket_arch_height")),
gh_double2scm (paper_l->get_var("bracket_thick")),
SCM_UNDEFINED));
- m.add_atom (&at);
+ m.add_atom (at);
m.dim_[Y_AXIS] = Interval (-height/2,height/2);
m.dim_[X_AXIS] = Interval (0,4 PT);
return m;
}
-Molecule
-Lookup::volta (Real h, Real w, Real thick, bool vert_start, bool vert_end) const
-{
- Molecule m;
-
- Atom at (gh_list (ly_symbol2scm ("volta"),
- gh_double2scm (h),
- gh_double2scm (w),
- gh_double2scm (thick),
- gh_int2scm (vert_start),
- gh_int2scm (vert_end),
- SCM_UNDEFINED));
-
- m.dim_[Y_AXIS] = Interval (- h/2, h/2);
- m.dim_[X_AXIS] = Interval (0, w);
-
- m.add_atom (&at);
- return m;
-}
Molecule
-Lookup::accordion (SCM s, Real interline_f) const
+Lookup::accordion (SCM s, Real staff_space) const
{
Molecule m;
String sym = ly_scm2string(gh_car (s));
if (reg.left_str(1) == "F")
{
Molecule d = afm_find("scripts-accDot");
- d.translate_axis(interline_f * 2.5 PT, Y_AXIS);
+ d.translate_axis(staff_space * 2.5 PT, Y_AXIS);
m.add_molecule(d);
reg = reg.right_str(reg.length_i()-1);
}
if (eflag & 0x02)
{
Molecule d = afm_find("scripts-accDot");
- d.translate_axis(interline_f * 1.5 PT, Y_AXIS);
+ 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(interline_f * 1.5 PT, Y_AXIS);
- d.translate_axis(0.8 * interline_f PT, X_AXIS);
+ 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(interline_f * 1.5 PT, Y_AXIS);
- d.translate_axis(-0.8 * interline_f PT, X_AXIS);
+ 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 = afm_find("scripts-accDot");
- d.translate_axis(0.5 * interline_f PT, Y_AXIS);
- d.translate_axis(0.4 * interline_f PT, X_AXIS);
+ 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 * interline_f PT, X_AXIS);
+ 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 = afm_find("scripts-accDot");
- d.translate_axis(0.5 * interline_f PT, Y_AXIS);
+ d.translate_axis(0.5 * staff_space PT, Y_AXIS);
m.add_molecule(d);
reg = reg.right_str(reg.length_i()-1);
}
if (reg.left_str(1) == "F")
{
Molecule d = afm_find("scripts-accDot");
- d.translate_axis(interline_f * 1.5 PT, Y_AXIS);
+ 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(interline_f * 0.5 PT, Y_AXIS);
+ d.translate_axis(staff_space * 0.5 PT, Y_AXIS);
m.add_molecule(d);
}
}
if (reg.left_str(1) == "T")
{
Molecule d = afm_find("scripts-accDot");
- d.translate_axis(interline_f * 2.5 PT, Y_AXIS);
+ 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) == "F")
{
Molecule d = afm_find("scripts-accDot");
- d.translate_axis(interline_f * 1.5 PT, Y_AXIS);
+ 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 = afm_find("scripts-accDot");
- d.translate_axis(interline_f * 0.5 PT, Y_AXIS);
- d.translate_axis(0.4 * interline_f PT, X_AXIS);
+ 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 * interline_f PT, X_AXIS);
+ 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 = afm_find("scripts-accDot");
- d.translate_axis(interline_f * 0.5 PT, Y_AXIS);
+ d.translate_axis(staff_space * 0.5 PT, Y_AXIS);
m.add_molecule(d);
reg = reg.right_str(reg.length_i()-1);
}
if (reg.left_str(1) == "T")
{
Molecule d = afm_find("scripts-accDot");
- d.translate_axis(interline_f * 3.5 PT, Y_AXIS);
+ 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 = afm_find("scripts-accDot");
- d.translate_axis(interline_f * 2.5 PT, Y_AXIS);
+ 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 = afm_find("scripts-accDot");
- d.translate_axis(interline_f * 2 PT, Y_AXIS);
- d.translate_axis(interline_f PT, X_AXIS);
+ 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 = afm_find("scripts-accDot");
- d.translate_axis(interline_f * 1.5 PT, Y_AXIS);
+ 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 = afm_find("scripts-accDot");
- d.translate_axis(interline_f * 0.5 PT, Y_AXIS);
+ d.translate_axis(staff_space * 0.5 PT, Y_AXIS);
m.add_molecule(d);
reg = reg.right_str(reg.length_i()-1);
}
projects / lilypond.git / blobdiff