Jan Nieuwenhuizen <janneke@gnu.org>
TODO
- Read spacing info from AFMs
Glissando
*/
+#include <ctype.h>
#include "lookup.hh"
#include "debug.hh"
#include "dimensions.hh"
#include "scalar.hh"
#include "paper-def.hh"
#include "string-convert.hh"
+#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_;
}
-Atom
-Lookup::accidental (int j) const
+Molecule
+Lookup::accidental (int j, bool cautionary) const
{
- return afm_find (String ("accidentals") + String ("-") + to_str (j));
+ Molecule m(afm_find (String ("accidentals") + String ("-") + to_str (j)));
+ if (cautionary)
+ {
+ m.add_at_edge(X_AXIS, LEFT,
+ Molecule(afm_find (String ("accidentals") + String ("-("))))
+;
+ m.add_at_edge(X_AXIS, RIGHT,
+ Molecule(afm_find (String ("accidentals") + String ("-)"))))
+;
+ }
+ return m;
}
void
symtables_p_->add (s, p);
}
+
Atom
-Lookup::afm_find (String s) const
+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);
+ 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.font_ = font_;
+
+
+ a.lambda_ = gh_list (ly_symbol ("char"),
+ gh_int2scm (m.code ()),
+ SCM_UNDEFINED);
+ a.str_ = "afm_find: " + s;
+ 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.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;
}
Atom
Lookup::beam (Real slope, Real width, Real thick) const
{
- Atom a (ps_beam (slope, width, thick));
Real height = slope * width;
Real min_y = (0 <? height) - thick/2;
Real max_y = (0 >? height) + thick/2;
-
+
+ Atom a;
+ 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;
return afm_find (String ("clefs") + String ("-") + st);
}
+SCM
+offset2scm (Offset o)
+{
+ return gh_list (gh_double2scm (o[X_AXIS]), gh_double2scm(o[Y_AXIS]),
+ SCM_UNDEFINED);
+}
+
Atom
Lookup::dashed_slur (Array<Offset> controls, Real thick, Real dash) const
{
assert (controls.size () == 8);
-
- Real dx = controls[3].x () - controls[0].x ();
- Real dy = controls[3].y () - controls[0].y ();
+ Offset d = controls[3] - controls[0];
+
+ Real dx = d[X_AXIS];
+ 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);
- // (lambda (o) (dashed-slur o '((0.1 0.2) (1.1 1.2) (2.1 2.2) (3.1 3.2))))
+ SCM sc[4];
+ for (int i=0; i< 4; i++)
+ {
+ sc[i] = offset2scm (controls[i]);
+ }
+
a.lambda_ =
- ly_append (ly_lambda_o (),
- ly_list1 (ly_append (ly_func_o ("dashed-slur"),
- gh_cons (gh_double2scm (thick), gh_cons (gh_double2scm (dash),
- ly_list1 (ly_list2 (ly_quote (),
- gh_cons (ly_list2 (gh_double2scm (controls[1].x ()), gh_double2scm (controls[1].y ())),
- gh_cons (ly_list2 (gh_double2scm (controls[2].x ()), gh_double2scm (controls[2].y ())),
- gh_cons (ly_list2 (gh_double2scm (controls[3].x ()), gh_double2scm (controls[3].y ())),
- gh_cons (ly_list2 (gh_double2scm (controls[0].x ()), gh_double2scm (controls[0].y ())),
- SCM_EOL)))))))))));
+ 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;
}
return (*symtables_p_) ("dynamics")->lookup (st);
}
+Atom
+Lookup::extender (Real width) const
+{
+ Atom a = (*symtables_p_) ("param")->lookup ("extender");
+ a.lambda_ = gh_list (ly_symbol (a.str_),
+ gh_double2scm (width),
+ SCM_UNDEFINED);
+ a.str_ = "extender";
+ a.font_ = font_name_;
+ return a;
+}
+
Atom
Lookup::fill (Box b) const
{
Lookup::flag (int j, Direction d) const
{
char c = (d == UP) ? 'u' : 'd';
- return afm_find (String ("flags") + String ("-") + to_str (c) + to_str (j));
+ Atom a = afm_find (String ("flags") + String ("-") + to_str (c) + to_str (j));
+ return a;
}
void
Atom
Lookup::rule_symbol (Real height, Real width) const
{
- Atom bs= (*symtables_p_) ("param")->lookup ("rule");
- Array<Real> args;
- args.push (height);
- args.push (width);
- bs.lambda_ = lambda_scm (bs.str_, args);
- bs.dim_.x () = Interval (0, width);
- bs.dim_.y () = Interval (0, height);
- return bs;
+ 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;
}
Atom
}
Atom
-Lookup::special_time_signature (String s, Array<Scalar> arr) const
+Lookup::special_time_signature (String s, Array<int> arr) const
{
-#if 0
- String symbolname = "timesig-"+s+"%/%";
- Atom a (afm_find (lambda_scm (symbolname, arr)));
+ // First guess: s contains only the signature style
+ assert (arr.size () >1);
+ String symbolname = "timesig-" + s + to_str (arr[0]) + "/" + to_str (arr[1]);
+
+ Atom a = afm_find (symbolname, false);
if (!a.empty ())
return a;
- // Try if the full name was given
- a = afm_find ("timesig-"+s);
+
+ // Second guess: s contains the full signature name
+ a = afm_find ("timesig-"+s, false);
if (!a.empty ())
return a;
+
// Resort to default layout with numbers
-#endif
return time_signature (arr);
}
y1 = y2;
y2 = t;
}
- Atom s;
-
- s.dim_.x () = Interval (0,0);
- s.dim_.y () = Interval (y1,y2);
+ Atom a;
- Array<Real> a;
+ a.dim_.x () = Interval (0,0);
+ a.dim_.y () = Interval (y1,y2);
Real stem_width = paper_l_->get_var ("stemthickness");
- a.push (-stem_width /2);
- a.push (stem_width);
- a.push (y2);
- a.push (-y1);
- s.lambda_ = lambda_scm ("stem", a);
- s.font_ = font_;
- return s;
+ 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;
}
Atom
return afm_find ("balls" + String ("-") +to_str (type) + "l");
}
+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> a;
+ Atom a = (*symtables_p_) ("style")->lookup (style);
- a.push (text);
- Atom s = (*symtables_p_) ("style")->lookup (style);
- s.lambda_ = lambda_scm (s.str_, a);
- s.font_ = font_;
+ 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 ();
- return s;
+ if (cmr_dict.elem_b (style))
+ {
+ style = String (cmr_dict [style]) + to_str ((int)font_h); // ugh
+ }
+ Real w = 0;
+ 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]=='\\')
+ for (i++; (i < text.length_i ()) && isalpha(text[i]); i++)
+ ;
+ else
+ {
+ int c = text[i];
+ int code = afm_l->ascii_to_metric_idx_[c];
+ if (code >=0)
+ {
+ Adobe_font_char_metric m = afm_l->char_metrics_[code];
+ 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.font_ = font_name_;
+ return a;
}
+
Atom
-Lookup::time_signature (Array<Scalar> a) const
+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 brace = (*symtables_p_) ("param")->lookup ( "brace");
- Interval ydims = brace.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> a;
- a.push (idx);
- brace.lambda_ = lambda_scm (brace.str_, a);
- brace.dim_[Y_AXIS] = Interval (-y/2,y/2);
-
- brace.font_ = font_;
-
- return 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_name_;
+ return a;
}
Atom
{
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_;
+ a.font_ = font_name_;
return a;
}
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 s;
- s.str_ = ps;
- return s;
+ Atom a;
+ a.lambda_ = gh_list(ly_symbol ("tuplet"),
+ gh_double2scm (dx),
+ gh_double2scm (dy),
+ gh_int2scm (dir), SCM_UNDEFINED);
+ return a;
}
-Atom
-Lookup::ps_beam (Real slope, Real width, Real thick) const
-{
- String ps;
- ps += to_str (width) + " "+ to_str (slope) + " " + to_str (thick)
- + " draw_beam ";
-
- Atom s;
- s.str_ = ps;
- return s;
-}
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;
-
- // (lambda (o) (slur o '((0.1 0.2) (1.1 1.2) (2.1 2.2) (3.1 3.2) .. )))
- a.lambda_ =
- ly_append (ly_lambda_o (),
- ly_list1 (ly_append (ly_func_o ("slur"),
- ly_list1 (ly_list2 (ly_quote (),
- gh_cons (ly_list2 (gh_double2scm (controls[5].x ()), gh_double2scm (controls[5].y ())),
- gh_cons (ly_list2 (gh_double2scm (controls[6].x ()), gh_double2scm (controls[6].y ())),
- gh_cons (ly_list2 (gh_double2scm (controls[7].x ()), gh_double2scm (controls[7].y ())),
- gh_cons (ly_list2 (gh_double2scm (controls[4].x ()), gh_double2scm (controls[4].y ())),
- gh_cons (ly_list2 (gh_double2scm (controls[1].x ()), gh_double2scm (controls[1].y ())),
- gh_cons (ly_list2 (gh_double2scm (controls[2].x ()), gh_double2scm (controls[2].y ())),
- gh_cons (ly_list2 (gh_double2scm (controls[3].x ()), gh_double2scm (controls[3].y ())),
- gh_cons (ly_list2 (gh_double2scm (controls[0].x ()), gh_double2scm (controls[0].y ())),
- SCM_EOL)))))))))))));
+
+ SCM scontrols [8];
+ int indices[] = {5,6,7,4,1,2,3,0};
+
+ for (int i= 0; i < 8; i++)
+ scontrols[i] = offset2scm (controls[indices[i]]);
+
+
+ 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);
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 (-interline_f, interline_f);
+ a.dim_[X_AXIS] = Interval (0, w);
+ return a;
+}
projects / lilypond.git / blobdiff