Jan Nieuwenhuizen <janneke@gnu.org>
TODO
- Read spacing info from AFMs
Glissando
*/
#include "file-path.hh"
#include "main.hh"
#include "lily-guile.hh"
+#include "all-fonts.hh"
+#include "afm.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 ()
{
paper_l_ = 0;
symtables_p_ = new Symtables;
- afm_p_ =0;
+ afm_l_ = 0;
}
Lookup::Lookup (Lookup const& s)
{
- font_ = s.font_;
- font_path_ = s.font_path_;
+ font_name_ = s.font_name_;
paper_l_ = s.paper_l_;
symtables_p_ = new Symtables (*s.symtables_p_);
- afm_p_ = 0;
+ afm_l_ = 0;
}
Lookup::Lookup (Symtables const& s)
{
- font_ = s.font_;
- font_path_ = s.font_path_;
+ font_name_ = s.font_name_;
paper_l_ = 0;
symtables_p_ = new Symtables (s);
- afm_p_ = 0;
+ afm_l_ = 0;
}
Lookup::~Lookup ()
{
- delete afm_p_;
delete symtables_p_;
}
symtables_p_->add (s, p);
}
+
Atom
Lookup::afm_find (String s, bool warn) const
{
- if (!afm_p_)
- {
- *mlog << "[" << font_path_;
- ( (Lookup*)this)->afm_p_ = new Adobe_font_metric (read_afm (font_path_));
- *mlog << "]" << flush ;
- DOUT << this->afm_p_->str ();
- }
- Adobe_font_char_metric m = afm_p_->find_char (s, warn);
+ if (!afm_l_)
+ ((Lookup*)this)->afm_l_ = all_fonts_global_p->find_font (font_name_);
+
+ Adobe_font_char_metric m = afm_l_->find_char (s, warn);
Atom a;
if (m.code () < 0)
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_;
+ a.font_ = font_name_;
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_;
+ a.font_ = font_name_;
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
Real dy = d[Y_AXIS];
Atom a;
- a.font_ = font_;
+ a.font_ = font_name_;
a.dim_[X_AXIS] = Interval (0, dx);
a.dim_[Y_AXIS] = Interval (0 <? dy, 0 >? dy);
sc[i] = offset2scm (controls[i]);
}
- // (lambda (o) (dashed-slur o thick dash '(stuff))
a.lambda_ =
- gh_append2 (ly_lambda_o (),
- gh_list (gh_append2 (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_;
+ a.font_ = font_name_;
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.font_ = font_;
+
+ 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_name_;
return a;
}
return afm_find ("balls" + String ("-") +to_str (type) + "l");
}
-Dictionary<String> cmr_dict;
-Dictionary<Adobe_font_metric*> afm_p_dict;
+static Dict_initialiser<char const*> cmr_init[] = {
+ {"bold", "cmbx"},
+ {"dynamic", "feta-din"},
+ {"finger", "feta-nummer"},
+ {"italic", "cmti"},
+ {"roman", "cmr"},
+ {0,0}
+};
+
+static Dictionary<char const *> cmr_dict (cmr_init);
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
- cmr_dict.elem ("bold") = "cmbx";
- cmr_dict.elem ("dynamic") = "feta-din";
- cmr_dict.elem ("finger") = "feta-nummer";
- cmr_dict.elem ("italic") = "cmti";
- cmr_dict.elem ("roman") = "cmr";
- }
-
- if (!afm_p_dict.elem_b (style))
+ if (cmr_dict.elem_b (style))
{
- Adobe_font_metric* afm_p = 0;
- String cmr_str = cmr_dict.elem (style) + to_str ((int) font_h) + ".afm";
- String font_path = global_path.find (cmr_str);
- if (!font_path.length_i ())
- {
- warning (_f("can't open file: `%s'", cmr_str.ch_C ()));
- warning (_f("guessing dimensions for font style: `%s'", style.ch_C ()));
- }
- else
- {
- *mlog << "[" << font_path;
- afm_p = new Adobe_font_metric (read_afm (font_path));
- DOUT << afm_p->str ();
- *mlog << "]" << flush ;
- }
- afm_p_dict.elem (style) = afm_p;
+ style = String (cmr_dict [style]) + to_str ((int)font_h); // ugh
}
Real w = 0;
- Adobe_font_metric* afm_p = afm_p_dict.elem (style);
+ Adobe_font_metric* afm_l = all_fonts_global_p->find_font (style);
DOUT << "\nChars: ";
+
for (int i = 0; i < text.length_i (); i++)
{
if (text[i]=='\\')
else
{
int c = text[i];
- if (afm_p && ((c >= 0) && (c < afm_p->char_metrics_.size ())))
+ int code = afm_l->ascii_to_metric_idx_[c];
+ if (code >=0)
{
- Adobe_font_char_metric m = afm_p->char_metrics_[c];
+ Adobe_font_char_metric m = afm_l->char_metrics_[code];
w += m.B_.x ().length ();
DOUT << to_str (m.B_.x ().length ()) << " ";
}
- else
- w += font_w;
}
}
DOUT << "\n" << to_str (w) << "\n";
a.dim_.x () = Interval (0, w);
- a.str_ = "text";
- a.font_ = font_;
+ a.font_ = font_name_;
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_;
+ a.font_ = font_name_;
return a;
}
{
Atom a;
Real height = paper_l_->staffheight_f () / 6;
- Array<Real> arr;
- arr.push (width);
- arr.push (height);
- arr.push (continued ? height/2 : 0);
- String hairpin = String (decresc ? "de" : "") + "crescendo\n";
- a.lambda_ = (lambda_scm (hairpin, arr));
- a.str_ = "hairpin";
+
+ 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_;
+ a.font_ = font_name_;
return a;
}
Atom
Lookup::plet (Real dy , Real dx, Direction dir) const
{
- Array<Real> arr;
- arr.push (dx);
- arr.push (dy);
- arr.push (dir);
Atom a;
- a.lambda_ = (lambda_scm ("tuplet", arr));
- a.str_ = "plet";
+ 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);
-
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);
- a.font_ = font_;
+ a.font_ = font_name_;
return a;
}
Lookup::vbracket (Real &y) const
{
Atom a;
- Real min_y = paper_l_->staffheight_f ();
- if (y < min_y)
- {
- warning (_ ("bracket")
- + " " + _ ("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);
Atom
Lookup::volta (Real w, bool last_b) const
{
- Array<Real> arr;
- arr.push (w);
- arr.push (last_b);
Atom a;
- a.lambda_ = (lambda_scm ("volta", arr));
+ 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 (-interline_f, interline_f);
+ a.dim_[X_AXIS] = Interval (0, w);
return a;
}
projects / lilypond.git / blobdiff