#include "main.hh"
#include "lily-guile.hh"
+SCM
+array_to_list (SCM *a , int l)
+{
+ SCM list = SCM_EOL;
+ for (int i= l; i--; )
+ {
+ list = gh_cons (a[i], list);
+ }
+ return list;
+}
+
Lookup::Lookup ()
{
a.dim_ = m.B_;
a.dim_[X_AXIS] *= 1 / 1000.0;
a.dim_[Y_AXIS] *= 1 / 1000.0;
- Array<Real> arr;
- arr.push (m.code ());
- a.lambda_ = (lambda_scm ("char", arr));
+
+
+ a.lambda_ = gh_list (ly_symbol ("char"),
+ gh_int2scm (m.code ()),
+ SCM_UNDEFINED);
a.str_ = "afm_find: " + s;
a.font_ = font_;
return a;
Atom
Lookup::bar (String str, Real h) const
{
- Array<Real> arr;
- arr.push (h);
+
Atom a = (*symtables_p_) ("bars")->lookup (str);
- a.lambda_ = (lambda_scm (a.str_, arr));
- a.str_ = "bar";
+
+
+ a.lambda_ = gh_list (ly_symbol (a.str_.ch_C()),
+ gh_double2scm (h),
+ SCM_UNDEFINED);
+
+
a.dim_.y () = Interval (-h/2, h/2);
a.font_ = font_;
return a;
Real min_y = (0 <? height) - thick/2;
Real max_y = (0 >? height) + thick/2;
- Array<Real> arr;
- arr.push (width);
- arr.push (slope);
- arr.push (thick);
-
Atom a;
- a.lambda_ = (lambda_scm ("beam", arr));
- a.str_ = "beam";
+ a.lambda_ = gh_list (ly_symbol ("beam"),
+ gh_double2scm (width),
+ gh_double2scm (slope),
+ gh_double2scm (thick),
+ SCM_UNDEFINED);
+
a.dim_[X_AXIS] = Interval (0, width);
a.dim_[Y_AXIS] = Interval (min_y, max_y);
return a;
SCM
offset2scm (Offset o)
{
- return gh_list (gh_double2scm (o[X_AXIS]), gh_double2scm(o[Y_AXIS]), SCM_UNDEFINED);
+ return gh_list (gh_double2scm (o[X_AXIS]), gh_double2scm(o[Y_AXIS]),
+ SCM_UNDEFINED);
}
Atom
sc[i] = offset2scm (controls[i]);
}
- // (lambda (o) (dashed-slur o thick dash '(stuff))
a.lambda_ =
- ly_append (ly_lambda_o (),
- gh_list (ly_append (ly_func_o ("dashed-slur"),
- gh_cons (gh_double2scm (thick),
- gh_cons (gh_double2scm (dash),
- gh_list (ly_quote_scm (gh_list (sc[1], sc[2], sc[3], sc[0], SCM_UNDEFINED)), SCM_UNDEFINED)))), SCM_UNDEFINED));
+ gh_list (ly_symbol ("dashed-slur"),
+ gh_double2scm (thick),
+ gh_double2scm (dash),
+ ly_quote_scm (array_to_list (sc, 4)),
+ SCM_UNDEFINED);
a.str_ = "dashed_slur";
return a;
Lookup::extender (Real width) const
{
Atom a = (*symtables_p_) ("param")->lookup ("extender");
- Array<Real> arr;
- arr.push (width);
- a.lambda_ = (lambda_scm (a.str_, arr));
+ a.lambda_ = gh_list (ly_symbol (a.str_),
+ gh_double2scm (width),
+ SCM_UNDEFINED);
a.str_ = "extender";
a.font_ = font_;
return a;
Atom
Lookup::rule_symbol (Real height, Real width) const
{
- Atom a = (*symtables_p_) ("param")->lookup ("rule");
- Array<Real> arr;
- arr.push (height);
- arr.push (width);
- a.lambda_ = (lambda_scm (a.str_, arr));
- a.str_ = "rule_symbol";
+ Atom a;
+ a.lambda_ = gh_list (ly_symbol ("rulesym"),
+ gh_double2scm (height),
+ gh_double2scm (width),
+ SCM_UNDEFINED);
a.dim_.x () = Interval (0, width);
a.dim_.y () = Interval (0, height);
return a;
a.dim_.x () = Interval (0,0);
a.dim_.y () = Interval (y1,y2);
- Array<Real> arr;
-
Real stem_width = paper_l_->get_var ("stemthickness");
- arr.push (-stem_width /2);
- arr.push (stem_width);
- arr.push (y2);
- arr.push (-y1);
- a.lambda_ = (lambda_scm ("stem", arr));
- a.str_ = "stem";
+ a.lambda_ = gh_list (ly_symbol ("stem"),
+ gh_double2scm(-stem_width /2),
+ gh_double2scm(stem_width),
+ gh_double2scm(y2),
+ gh_double2scm(-y1),
+ SCM_UNDEFINED);
+
a.font_ = font_;
return a;
}
Atom
Lookup::text (String style, String text) const
{
- Array<Scalar> arr;
-
- arr.push (text);
Atom a = (*symtables_p_) ("style")->lookup (style);
- a.lambda_ = lambda_scm (a.str_, arr);
+
+ a.lambda_ = gh_list(ly_symbol (a.str_),
+ gh_str02scm (text.ch_C()),
+ SCM_UNDEFINED);
+
Real font_w = a.dim_.x ().length ();
Real font_h = a.dim_.y ().length ();
-// urg
-// if (!cmr_dict.length_i ())
if (!cmr_dict.elem_b ("roman"))
{
//brrrr
;
else
{
- if (afm_p)
+ int c = text[i];
+ if (afm_p && ((c >= 0) && (c < afm_p->char_metrics_.size ())))
{
- Adobe_font_char_metric m = afm_p->char_metrics_[(int)text[i]];
+ Adobe_font_char_metric m = afm_p->char_metrics_[c];
w += m.B_.x ().length ();
DOUT << to_str (m.B_.x ().length ()) << " ";
}
}
DOUT << "\n" << to_str (w) << "\n";
a.dim_.x () = Interval (0, w);
- a.str_ = "text";
a.font_ = font_;
return a;
}
Lookup::time_signature (Array<int> a) const
{
Atom s ((*symtables_p_) ("param")->lookup ("time_signature"));
- s.lambda_ = (lambda_scm (s.str_, a));
-
+ s.lambda_ = gh_list (ly_symbol (s.str_),
+ gh_int2scm (a[0]),
+ gh_int2scm (a[1]),
+ SCM_UNDEFINED);
return s;
}
-/*
- should be handled via Tex_ code and Lookup::bar ()
- */
Atom
Lookup::vbrace (Real &y) const
{
- Atom a = (*symtables_p_) ("param")->lookup ( "brace");
- Interval ydims = a.dim_[Y_AXIS];
- Real min_y = ydims[LEFT];
- Real max_y = ydims[RIGHT];
- Real step = 1.0 PT;
-
- if (y < min_y)
- {
- warning (_ ("piano brace")
- + " " + _ ("too small") + " (" + print_dimen (y) + ")");
- y = min_y;
- }
- if (y > max_y)
- {
- warning (_ ("piano brace")
- + " " + _ ("too big") + " (" + print_dimen (y) + ")");
- y = max_y;
- }
-
-
- int idx = int (rint ( (y- min_y)/step)) + 1;
-
- Array<Real> arr;
- arr.push (idx);
- a.lambda_ = (lambda_scm (a.str_, arr));
- a.str_ = "brace";
+ Atom a;
+ a.lambda_ = gh_list (ly_symbol ("pianobrace"),
+ gh_double2scm (y),
+ SCM_UNDEFINED
+ );
a.dim_[Y_AXIS] = Interval (-y/2,y/2);
a.font_ = font_;
return a;
{
Atom a;
Real height = paper_l_->staffheight_f () / 6;
- String ps;
- ps += to_str (width) + " "
- + to_str (height) + " "
- + to_str (continued ? height/2 : 0) +
- + " draw_" + String (decresc ? "de" : "") + "cresc\n";
- a.str_ = ps;
+
+ String hairpin = String (decresc ? "de" : "") + "crescendo";
+ a.lambda_ = gh_list (ly_symbol (hairpin),
+ gh_double2scm (width),
+ gh_double2scm (height),
+ gh_double2scm (continued ? height/2 : 0.0),
+ SCM_UNDEFINED);
a.dim_.x () = Interval (0, width);
a.dim_.y () = Interval (-2*height, 2*height);
a.font_ = font_;
Atom
Lookup::plet (Real dy , Real dx, Direction dir) const
{
- String ps;
-
- ps += String_convert::double_str (dx) + " "
- + String_convert::double_str (dy) + " "
- + String_convert::int_str ( (int)dir) +
- " draw_plet ";
-
Atom a;
- a.str_ = ps;
+ a.lambda_ = gh_list(ly_symbol ("tuplet"),
+ gh_double2scm (dx),
+ gh_double2scm (dy),
+ gh_int2scm (dir), SCM_UNDEFINED);
return a;
}
+
Atom
Lookup::slur (Array<Offset> controls) const
{
assert (controls.size () == 8);
-
- String ps;
-
Real dx = controls[3].x () - controls[0].x ();
Real dy = controls[3].y () - controls[0].y ();
Atom a;
scontrols[i] = offset2scm (controls[indices[i]]);
- a.lambda_ =
- gh_append2 (ly_lambda_o (),
- gh_list (gh_append2 (ly_func_o ("slur"),
- gh_list (ly_quote_scm (gh_list (scontrols[0],
- scontrols[1],
- scontrols[2],
- scontrols[3],
- scontrols[4],
- scontrols[5],
- scontrols[6],
- scontrols[7],
- SCM_UNDEFINED)),
- SCM_UNDEFINED)
- ),
- SCM_UNDEFINED)
- );
-
-
- a.str_ = "slur";
+ a.lambda_ =gh_list (ly_symbol ("slur"),
+ ly_quote_scm (array_to_list (scontrols, 8)),
+ SCM_UNDEFINED);
a.dim_[X_AXIS] = Interval (0, dx);
a.dim_[Y_AXIS] = Interval (0 <? dy, 0 >? dy);
+ " " + _ ("too small") + " (" + print_dimen (y) + ")");
// y = min_y;
}
- Array<Real> arr;
- arr.push (y);
- a.lambda_ = (lambda_scm ("bracket", arr));
+
+ a.lambda_ = gh_list (ly_symbol ("bracket"),
+ gh_double2scm (y),
+ SCM_UNDEFINED);
a.str_ = "vbracket";
a.dim_[Y_AXIS] = Interval (-y/2,y/2);
a.dim_[X_AXIS] = Interval (0,4 PT);
return a;
}
+Atom
+Lookup::volta (Real w, bool last_b) const
+{
+ Atom a;
+ a.lambda_ = gh_list (ly_symbol ("volta"),
+ gh_double2scm (w),
+ gh_int2scm (last_b),
+ SCM_UNDEFINED);
+ a.str_ = "volta";
+ Real interline_f = paper_l_->interline_f ();
+// a.dim_[Y_AXIS] = Interval (0, 2 * interline_f);
+ a.dim_[Y_AXIS] = Interval (-interline_f, interline_f);
+ a.dim_[X_AXIS] = Interval (0, w);
+ return a;
+}
projects / lilypond.git / blobdiff