(c) 1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
- TODO
- This doth suck. We should have PS output, and read spacing info from AFMs
-
- Glissando,
+ Jan Nieuwenhuizen <janneke@gnu.org>
+ TODO
+ Read spacing info from AFMs
+ Glissando
*/
#include "lookup.hh"
#include "debug.hh"
+#include "dimensions.hh"
#include "symtable.hh"
-#include "dimension.hh"
-#include "tex.hh"
#include "scalar.hh"
#include "paper-def.hh"
#include "string-convert.hh"
#include "main.hh"
+#include "lily-guile.hh"
-Lookup::Lookup()
+Lookup::Lookup ()
{
paper_l_ = 0;
symtables_p_ = new Symtables;
afm_p_ =0;
}
-Lookup::Lookup (Lookup const &s)
+Lookup::Lookup (Lookup const& s)
{
font_ = s.font_;
font_path_ = s.font_path_;
afm_p_ = 0;
}
-Lookup::~Lookup()
+Lookup::Lookup (Symtables const& s)
+{
+ font_ = s.font_;
+ font_path_ = s.font_path_;
+ paper_l_ = 0;
+ symtables_p_ = new Symtables (s);
+ afm_p_ = 0;
+}
+
+Lookup::~Lookup ()
{
delete afm_p_;
delete symtables_p_;
}
+Atom
+Lookup::accidental (int j) const
+{
+ return afm_find (String ("accidentals") + String ("-") + to_str (j));
+}
+
+void
+Lookup::add (String s, Symtable*p)
+{
+ symtables_p_->add (s, p);
+}
+
Atom
Lookup::afm_find (String s) const
{
if (!afm_p_)
{
*mlog << "[" << font_path_;
- ((Lookup*)this)->afm_p_ = new Adobe_font_metric (read_afm (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);
Atom a;
- a.tex_ = String_convert::form_str ("\\char%d", m.code ());
+ if (m.code () < 0)
+ return a;
+
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_;
return a;
}
-void
-Lookup::add (String s, Symtable*p)
+Atom
+Lookup::ball (int j) const
{
- symtables_p_->add (s, p);
-}
+ if (j > 2)
+ j = 2;
-void
-Lookup::print() const
-{
-#ifndef NPRINT
- DOUT << "Lookup {\n";
- symtables_p_->print();
- DOUT << "}\n";
-#endif
+ return afm_find (String ("balls") + String ("-") + to_str (j));
}
Atom
-Lookup::text (String style, String text) const
+Lookup::bar (String str, Real h) const
{
- Array<String> a;
-
- a.push (text);
- Atom tsym = (*symtables_p_)("style")->lookup (style);
- tsym.tex_ = substitute_args (tsym.tex_,a);
- tsym.font_ = font_;
-
- return tsym;
+ Array<Real> arr;
+ arr.push (h);
+ Atom a = (*symtables_p_) ("bars")->lookup (str);
+ a.lambda_ = lambda_scm (a.str_, arr);
+ a.dim_.y () = Interval (-h/2, h/2);
+ a.font_ = font_;
+ 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;
+
+ a.dim_[X_AXIS] = Interval (0, width);
+ a.dim_[Y_AXIS] = Interval (min_y, max_y);
+ return a;
+}
Atom
-Lookup::ball (int j) const
+Lookup::clef (String st) const
{
- if (j > 2)
- j = 2;
-
- Atom s = afm_find (String ("balls") + String ("-") + to_str (j));
- return s;
+ return afm_find (String ("clefs") + String ("-") + st);
}
Atom
-Lookup::rest (int j, bool o) const
+Lookup::dashed_slur (Array<Offset> controls, Real thick, Real dash) const
{
- Atom s =afm_find (String ("rests")
- + String ("-") + to_str (j) + (o ? "o" : ""));
+ assert (controls.size () == 8);
- return s;
+ Real dx = controls[3].x () - controls[0].x ();
+ Real dy = controls[3].y () - controls[0].y ();
+
+ Atom a;
+ a.font_ = font_;
+ 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))))
+ 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)))))))))));
+
+ return a;
}
Atom
-Lookup::fill (Box b) const
+Lookup::dots () const
{
- Atom s;
- s.tex_ = "";
- s.dim_ = b;
-
- return s;
+ return afm_find (String ("dots") + String ("-") + String ("dot"));
}
Atom
-Lookup::accidental (int j) const
+Lookup::dynamic (String st) const
{
- Atom s= afm_find (String ("accidentals") + String ("-") + to_str (j));
- return s;
+ return (*symtables_p_) ("dynamics")->lookup (st);
}
-
Atom
-Lookup::bar (String s, Real h) const
+Lookup::fill (Box b) const
{
- Array<String> a;
- a.push (print_dimen (h));
- Atom ret=(*symtables_p_)("bars")->lookup (s);
- ret.tex_ = substitute_args (ret.tex_, a);
- ret.dim_.y() = Interval (-h/2, h/2);
- ret.font_ = font_;
- return ret;
+ Atom a;
+ a.dim_ = b;
+ return a;
}
Atom
-Lookup::script (String st) const
+Lookup::flag (int j, Direction d) const
{
- Atom s= afm_find (String ("scripts") + String ("-") + st);
-
- return s;
+ char c = (d == UP) ? 'u' : 'd';
+ return afm_find (String ("flags") + String ("-") + to_str (c) + to_str (j));
}
-Atom
-Lookup::dynamic (String st) const
+void
+Lookup::print () const
{
- return (*symtables_p_) ("dynamics")->lookup (st);
+#ifndef NPRINT
+ DOUT << "Lookup {\n";
+ symtables_p_->print ();
+ DOUT << "}\n";
+#endif
}
Atom
-Lookup::clef (String st) const
+Lookup::rest (int j, bool o) const
{
- Atom s=afm_find (String ("clefs") + String ("-") + st);
-
- return s;
+ return afm_find (String ("rests")
+ + String ("-") + to_str (j) + (o ? "o" : ""));
}
Atom
-Lookup::dots () const
+Lookup::rule_symbol (Real height, Real width) const
{
- Atom s=afm_find (String ("dots") + String ("-") + String("dot"));
-
- return s;
+ 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
-Lookup::flag (int j, Direction d) const
+Lookup::script (String str) const
{
- char c = (d == UP) ? 'u' : 'd';
- Atom s=afm_find (String ("flags") + String ("-") + to_str (c) + to_str (j));
-
- return s;
+ return afm_find (String ("scripts") + String ("-") + str);
}
Atom
-Lookup::dashed_slur (Array<Offset> controls, Real thick, Real dash) const
+Lookup::special_time_signature (String s, Array<Scalar> arr) const
{
- assert (controls.size () == 8);
-
- String ps = "\\embeddedps{\n";
-
- Real dx = controls[3].x () - controls[0].x ();
- Real dy = controls[3].y () - controls[0].y ();
-
- for (int i = 1; i < 4; i++)
- ps += String_convert::double_str (controls[i].x ()) + " "
- + String_convert::double_str (controls[i].y ()) + " ";
-
- ps += String_convert::double_str (controls[0].x ()) + " "
- + String_convert::double_str (controls[0].y ()) + " ";
-
- ps += String_convert::double_str (thick) + " ";
- Real on = dash > 1? thick * dash - thick : 0;
- Real off = 2 * thick;
- ps += "[" + String_convert::double_str (on) + " ";
- ps += String_convert::double_str (off) + "] ";
- ps += String_convert::int_str (0) + " ";
- ps += " draw_dashed_slur}";
-
- Atom s;
- s.tex_ = ps;
-
- s.dim_[X_AXIS] = Interval (0, dx);
- s.dim_[Y_AXIS] = Interval (0 <? dy, 0 >? dy);
- s.font_ = font_;
- return s;
+#if 0
+ String symbolname = "timesig-"+s+"%/%";
+ Atom a (afm_find (lambda_scm (symbolname, arr)));
+ if (!a.empty ())
+ return a;
+ // Try if the full name was given
+ a = afm_find ("timesig-"+s);
+ if (!a.empty ())
+ return a;
+ // Resort to default layout with numbers
+#endif
+ return time_signature (arr);
}
Atom
-Lookup::slur (Array<Offset> controls) const
+Lookup::stem (Real y1, Real y2) const
{
- assert (controls.size () == 8);
-
- String ps = "\\embeddedps{\n";
-
- Real dx = controls[3].x () - controls[0].x ();
- Real dy = controls[3].y () - controls[0].y ();
-
- for (int i = 5; i < 8; i++)
- ps += String_convert::double_str (controls[i].x ()) + " "
- + String_convert::double_str (controls[i].y ()) + " ";
+ if (y1 > y2)
+ {
+ Real t = y1;
+ y1 = y2;
+ y2 = t;
+ }
+ Atom s;
- ps += String_convert::double_str (controls[4].x ()) + " "
- + String_convert::double_str (controls[4].y ()) + " ";
-
- for (int i = 1; i < 4; i++)
- ps += String_convert::double_str (controls[i].x ()) + " "
- + String_convert::double_str (controls[i].y ()) + " ";
+ s.dim_.x () = Interval (0,0);
+ s.dim_.y () = Interval (y1,y2);
- ps += String_convert::double_str (controls[0].x ()) + " "
- + String_convert::double_str (controls[0].y ()) + " ";
+ Array<Real> a;
- ps += " draw_slur}";
+ Real stem_width = paper_l_->get_var ("stemthickness");
+ a.push (-stem_width /2);
+ a.push (stem_width);
+ a.push (y2);
+ a.push (-y1);
- Atom s;
- s.tex_ = ps;
-
- s.dim_[X_AXIS] = Interval (0, dx);
- s.dim_[Y_AXIS] = Interval (0 <? dy, 0 >? dy);
+ s.lambda_ = lambda_scm ("stem", a);
s.font_ = font_;
return s;
-
}
Atom
}
Atom
-Lookup::hairpin (Real width, bool decresc, bool continued) const
+Lookup::text (String style, String text) const
{
- String embed;
- Atom ret;
- Real height = paper_l_->staffheight_f () / 6;
- embed = "\\embeddedps{\n" ;
- embed += to_str (width) + " "
- + to_str (height) + " "
- + to_str (continued ? height/2 : 0) +
- + " draw_" + String(decresc ? "de" : "") + "cresc}\n";
- ret.tex_ = embed;
-
+ Array<Scalar> a;
- ret.dim_.x () = Interval (0, width);
- ret.dim_.y () = Interval (-2*height, 2*height);
- ret.font_ = font_;
- return ret;
-}
-
-Atom
-Lookup::time_signature (Array<Scalar> a) const
-{
- Atom s((*symtables_p_)("param")->lookup ("time_signature"));
- s.tex_ = substitute_args (s.tex_,a);
+ a.push (text);
+ Atom s = (*symtables_p_) ("style")->lookup (style);
+ s.lambda_ = lambda_scm (s.str_, a);
+ s.font_ = font_;
return s;
}
-
Atom
-Lookup::stem (Real y1,Real y2) const
+Lookup::time_signature (Array<Scalar> a) const
{
- if (y1 > y2)
- {
- Real t = y1;
- y1 = y2;
- y2 = t;
- }
- Atom s;
-
- s.dim_.x() = Interval (0,0);
- s.dim_.y() = Interval (y1,y2);
-
- Array<String> a;
- a.push (print_dimen (y1));
- a.push (print_dimen (y2));
+ Atom s ((*symtables_p_) ("param")->lookup ("time_signature"));
+ s.lambda_ = lambda_scm (s.str_, a);
- String src = (*symtables_p_)("param")->lookup ("stem").tex_;
- s.tex_ = substitute_args (src,a);
- s.font_ = font_;
return s;
}
/*
- should be handled via Tex_ code and Lookup::bar()
+ should be handled via Tex_ code and Lookup::bar ()
*/
Atom
Lookup::vbrace (Real &y) const
if (y < min_y)
{
warning (_ ("piano brace")
- + " " + _ ("too small") + "(" + print_dimen (y) + ")");
+ + " " + _ ("too small") + " (" + print_dimen (y) + ")");
y = min_y;
}
if (y > max_y)
{
warning (_ ("piano brace")
- + " " + _ ("too big") + "(" + print_dimen (y)+ ")");
+ + " " + _ ("too big") + " (" + print_dimen (y) + ")");
y = max_y;
}
- int idx = int (rint ((y- min_y)/step)) + 1;
+ int idx = int (rint ( (y- min_y)/step)) + 1;
- {
- Array<String> a;
- a.push (to_str (idx));
- brace.tex_ = substitute_args (brace.tex_,a);
- brace.dim_[Y_AXIS] = Interval (-y/2,y/2);
- }
+ 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
+Lookup::hairpin (Real width, bool decresc, bool continued) const
+{
+ 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;
+
+
+ a.dim_.x () = Interval (0, width);
+ a.dim_.y () = Interval (-2*height, 2*height);
+ a.font_ = font_;
+ 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
+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)))))))))))));
+
+ a.dim_[X_AXIS] = Interval (0, dx);
+ a.dim_[Y_AXIS] = Interval (0 <? dy, 0 >? dy);
+ a.font_ = font_;
+ return a;
+}
+
Atom
Lookup::vbracket (Real &y) const
{
- Atom psbracket;
+ Atom a;
Real min_y = paper_l_->staffheight_f ();
if (y < min_y)
{
warning (_ ("bracket")
- + " " + _ ("too small") + "(" + print_dimen (y) + ")");
+ + " " + _ ("too small") + " (" + print_dimen (y) + ")");
// y = min_y;
}
- psbracket.tex_ = String ("\\embeddedps{ ") + to_str (y) + " draw_bracket}";
- psbracket.dim_[Y_AXIS] = Interval (-y/2,y/2);
- psbracket.dim_[X_AXIS] = Interval (0,4 PT);
- return psbracket;
-#if 0
- Atom bracket = afm_find (String ("param") + "bracket");
- Interval ydims = bracket.dim_[Y_AXIS];
-
- Real min_y = ydims[LEFT];
- Real max_y = ydims[RIGHT];
- Real step = 1.0 PT;
-
- if (y < min_y)
- {
- warning (_ ("bracket")
- + " " + _ ("too small") + "(" + print_dimen (y) + ")");
- y = min_y;
- }
- if (y > max_y)
- {
- warning (_ ("bracket")
- + " " + _ ("too big") + "(" + print_dimen (y)+ ")");
- y = max_y;
- }
-
-
- int idx = int (rint ((y- min_y)/step)) + 1;
-
- {
- Array<String> a;
- a.push (to_str (idx));
- bracket.tex_ = substitute_args (bracket.tex_,a);
- bracket.dim_[Y_AXIS] = Interval (-y/2,y/2);
- }
-
- return bracket;
-#endif
+ Array<Real> arr;
+ arr.push (y);
+ a.lambda_ = lambda_scm ("bracket", arr);
+ a.dim_[Y_AXIS] = Interval (-y/2,y/2);
+ a.dim_[X_AXIS] = Interval (0,4 PT);
+ return a;
}
+
projects / lilypond.git / blobdiff