TODO
Glissando
*/
-
+#include <math.h>
#include <ctype.h>
#include "lookup.hh"
#include "debug.hh"
Lookup::Lookup ()
{
- paper_l_ = 0;
afm_l_ = 0;
}
Lookup::Lookup (Lookup const& s)
{
font_name_ = s.font_name_;
- paper_l_ = 0;
afm_l_ = 0;
}
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::simple_bar (String type, Real h) const
+Lookup::simple_bar (String type, Real h, Paper_def* paper_l) const
{
SCM thick = ly_symbol ("barthick_" + type);
Real w = 0.0;
- if (paper_l_->scope_p_->elem_b (thick))
+ if (paper_l->scope_p_->elem_b (thick))
{
- w = paper_l_->get_realvar (thick);
+ w = paper_l->get_realvar (thick);
}
else
{
Molecule
-Lookup::bar (String str, Real h) const
+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);
-
- 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");
+ 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);
Molecule m;
}
if (str == "scorepostbreak")
{
- return simple_bar ("score", h);
+ return simple_bar ("score", h, paper_l);
}
else if (str == "|")
{
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
{
Molecule
-Lookup::special_time_signature (String s, int n, int d) const
+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);
return m;
// Resort to default layout with numbers
- return time_signature (n,d);
+ return time_signature (n,d,pap);
}
Molecule
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};
+
/**
TODO: THIS IS UGLY. Since the user has direct access to TeX
*/
Molecule
-Lookup::text (String style, String text) const
+Lookup::text (String style, String text, Paper_def *paper_l) const
{
Molecule m;
if (style.empty_b ())
style = "roman";
- int font_mag = 1;
- Real font_h = paper_l_->get_var ("font_normal");
- if (paper_l_->scope_p_->elem_b ("font_" + style))
+ 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);
+ font_h = paper_l->get_var ("font_" + style);
}
-
- if (paper_l_->scope_p_->elem_b ("magnification_" + style))
+
+
+ Real realmag = 1.0;
+ if (paper_l->scope_p_->elem_b ("magnification_" + style))
{
- font_mag = (int)paper_l_->get_var ("magnification_" + style);
+ font_mag = (int)paper_l->get_var ("magnification_" + style);
+ realmag = pow (1.2, font_mag);
}
/*
for (int i = 0; i < text.length_i (); i++)
{
- if (text[i]=='\\')
- for (i++; (i < text.length_i ()) && isalpha(text[i]); i++)
- ;
+ if (text[i]=='\\')
+ {
+ for (i++; (i < text.length_i ()) && isalpha(text[i]); i++)
+ ;
+ i--; // Compensate for the increment in the outer loop!
+ }
else
{
if (text[i] == '{')
}
}
- 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::time_signature (int num, int den) const
+Lookup::time_signature (int num, int den, Paper_def *paper_l) const
{
String sty = "number";
- Molecule n (text (sty, to_str (num)));
- Molecule d (text (sty, to_str (den)));
+ 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;
}
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, bool decresc, bool continued) const
+Lookup::hairpin (Real width, Real height, Real thick, 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 (thick),
gh_double2scm (width),
gh_double2scm (height),
gh_double2scm (continued ? height/2 : 0.0),
}
Molecule
-Lookup::plet (Real dy , Real dx, Direction dir) const
+Lookup::tuplet_bracket (Real dy , Real dx, Real thick, Real gap, Real interline_f, Direction dir) const
{
Molecule m;
- SCM thick = tuplet_thick_scm_sym;
- Real t = 0.1 PT;
- if (paper_l_->scope_p_->elem_b (thick))
- {
- t = paper_l_->get_realvar (thick);
- }
- Real interline_f = paper_l_->get_realvar (interline_scm_sym);
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 (t),
+ gh_double2scm (thick),
gh_int2scm (dir),
SCM_UNDEFINED));
m.add_atom (&at);
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, bool last_b) const
+Lookup::volta (Real h, Real w, Real thick, bool vert_start, bool vert_end) const
{
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 (h),
gh_double2scm (w),
- gh_double2scm (t),
- gh_int2scm (last_b),
+ gh_double2scm (thick),
+ gh_int2scm (vert_start),
+ gh_int2scm (vert_end),
SCM_UNDEFINED));
- Real interline_f = paper_l_->get_realvar (interline_scm_sym);
-
- 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);
}
Molecule
-Lookup::accordion (SCM s) const
+Lookup::accordion (SCM s, Real interline_f) const
{
Molecule m;
String sym = ly_scm2string(SCM_CAR(s));
String reg = ly_scm2string(SCM_CAR(SCM_CDR(s)));
- Real interline_f = paper_l_->get_realvar(interline_scm_sym);
+
if (sym == "Discant")
{
Molecule r = afm_find("scripts-accDiscant");