TODO
Glissando
*/
-
+#include <math.h>
#include <ctype.h>
#include "lookup.hh"
#include "debug.hh"
gh_int2scm (cm.code ()),
SCM_UNDEFINED));
at.font_ = ly_symbol (font_name_.ch_C());
+ at.magn_ = gh_int2scm (0);
+
m.dim_ = cm.dimensions();
m.add_atom (&at);
return m;
Molecule
Lookup::bar (String str, Real h, Paper_def *paper_l) const
{
- if (str == "[")
+ if (str == "bracket")
return staff_bracket (h);
- else if (str == "{")
- return staff_brace (h);
-
+ else if (str == "brace")
+ {
+ Real staffht = paper_l->get_var ("staffheight");
+ return staff_brace (h,staffht);
+ }
Real kern = paper_l->get_var ("bar_kern");
Real thinkern = paper_l->get_var ("bar_thinkern");
-
+
Molecule thin = simple_bar ("thin", h, paper_l);
Molecule thick = simple_bar ("thick", h, paper_l);
Molecule colon = afm_find ("dots-repeatcolon", paper_l);
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, String style) const
{
/**
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};
+
/**
TODO: THIS IS UGLY. Since the user has direct access to TeX
if (style.empty_b ())
style = "roman";
- int font_mag = 1;
+ 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);
}
-
+
+
+ Real realmag = 1.0;
if (paper_l->scope_p_->elem_b ("magnification_" + style))
{
font_mag = (int)paper_l->get_var ("magnification_" + style);
+ realmag = pow (1.2, font_mag);
}
/*
}
}
- if (font_mag > 1 && font_mag < 7 )
- {
- /* UGH */
- style = style + String(" scaled \\magstep ") + to_str (font_mag);
- w *= mag_steps[font_mag];
- ydims *= mag_steps[font_mag];
- }
-
if(brace_count)
{
warning (_f ("Non-matching braces in text `%s', adding braces.", text.ch_C()));
}
}
-
- DOUT << "\n" << to_str (w) << "\n";
- m.dim_.x () = Interval (0, w);
+ ydims *= realmag;
+ m.dim_.x () = Interval (0, w*realmag);
m.dim_.y () = ydims;
gh_str02scm (text.ch_C()),
SCM_UNDEFINED));
at.font_ = ly_symbol (style);
+ at.magn_ = gh_int2scm (font_mag);
m.add_atom (&at);
return m;
}
Molecule
-Lookup::staff_brace (Real y) const
+Lookup::staff_brace (Real y, int staff_size) const
{
Molecule m;
+ /*
+ (define (pianobrace y staffht)
+ (let* ((step 1.0)
+ (minht (* 2 staffht))
+ (maxht (* 7 minht))
+ )
+ (string-append
+ (select-font (string-append "feta-braces" (number->string (inexact->exact staffht))) 0)
+ (char (max 0 (/ (- (min y (- maxht step)) minht) step))))
+ )
+ )
+ */
+
+ Real step = 1.0;
+ int minht = 2 * staff_size;
+ int maxht = 7 * minht;
+ int idx = int (((maxht - step) <? y - minht) / step);
+ idx = idx >? 0;
- Atom at (gh_list (pianobrace_scm_sym,
- gh_double2scm (y),
- SCM_UNDEFINED
- ));
+ SCM f = ly_symbol (String ("feta-braces" + to_str (staff_size)));
+ SCM e =gh_list (char_scm_sym, gh_int2scm (idx), SCM_UNDEFINED);
+ Atom at (e);
+ at.font_ = f;
m.dim_[Y_AXIS] = Interval (-y/2,y/2);
m.dim_[X_AXIS] = Interval (0,0);
}
Molecule
-Lookup::hairpin (Real width, Real height, bool decresc, bool continued) const
+Lookup::hairpin (Real width, Real height, Real thick, bool decresc, bool continued) const
{
Molecule m;
String hairpin = String (decresc ? "de" : "") + "crescendo";
Atom at (gh_list (ly_symbol (hairpin),
+ gh_double2scm (thick),
gh_double2scm (width),
gh_double2scm (height),
gh_double2scm (continued ? height/2 : 0.0),
}
Molecule
-Lookup::tuplet_bracket (Real dy , Real dx, Real thick, Real interline_f, Direction dir) const
+Lookup::tuplet_bracket (Real dy , Real dx, Real thick, Real gap, Real interline_f, Direction dir) const
{
Molecule m;
Atom at (gh_list(tuplet_scm_sym,
- gh_double2scm (interline_f),
+ gh_double2scm (interline_f),
+ gh_double2scm (gap),
gh_double2scm (dx),
gh_double2scm (dy),
gh_double2scm (thick),
Make a smooth curve along the points
*/
Molecule
-Lookup::slur (Array<Offset> controls) const
+Lookup::slur (Array<Offset> controls, Real linethick) const
{
Offset delta_off = controls[3]- controls[0];
Molecule m;
Atom at (gh_list (ly_symbol ("bezier-sandwich"),
ly_quote_scm (array_to_list (scontrols, 8)),
+ gh_double2scm (linethick),
SCM_UNDEFINED));
m.dim_[X_AXIS] = Interval (0, delta_off[X_AXIS]);
}
Molecule
-Lookup::volta (Real w, Real thick, Real interline_f, bool last_b) const
+Lookup::volta (Real h, Real w, Real thick, bool vert_start, bool vert_end) const
{
Molecule m;
Atom at (gh_list (volta_scm_sym,
+ gh_double2scm (h),
gh_double2scm (w),
gh_double2scm (thick),
- gh_int2scm (last_b),
+ gh_int2scm (vert_start),
+ gh_int2scm (vert_end),
SCM_UNDEFINED));
- m.dim_[Y_AXIS] = Interval (-interline_f, interline_f);
+ m.dim_[Y_AXIS] = Interval (- h/2, h/2);
m.dim_[X_AXIS] = Interval (0, w);
m.add_atom (&at);