source file of the GNU LilyPond music typesetter
- (c) 1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
TODO
- Read spacing info from AFMs
Glissando
*/
-
+#include <math.h>
#include <ctype.h>
#include "lookup.hh"
#include "debug.hh"
#include "dimensions.hh"
-#include "symtable.hh"
#include "scalar.hh"
#include "paper-def.hh"
#include "string-convert.hh"
#include "file-path.hh"
#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;
-}
+#include "all-fonts.hh"
+#include "afm.hh"
+#include "scope.hh"
+#include "molecule.hh"
+#include "atom.hh"
+#include "lily-guile.hh"
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_;
- paper_l_ = s.paper_l_;
- symtables_p_ = new Symtables (*s.symtables_p_);
- afm_p_ = 0;
+ font_name_ = s.font_name_;
+ afm_l_ = 0;
}
-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 ()
+/*
+ build a ledger line for small pieces.
+ */
+Molecule
+Lookup::ledger_line (Interval xwid) const
{
- delete afm_p_;
- delete symtables_p_;
+ Drul_array<Molecule> endings;
+ endings[LEFT] = afm_find ("noteheads-ledgerending");
+ Molecule * e = &endings[LEFT];
+ endings[RIGHT] = *e;
+
+ Real thick = e->dim_[Y_AXIS].length();
+ Real len = e->dim_[X_AXIS].length () - thick;
+
+ Molecule total;
+ Direction d = LEFT;
+ do {
+ endings[d].translate_axis (xwid[d] - endings[d].dim_[X_AXIS][d], X_AXIS);
+ total.add_molecule (endings[d]);
+ } while ((flip(&d)) != LEFT);
+
+ Real xpos = xwid [LEFT] + len;
+
+ while (xpos + len + thick /2 <= xwid[RIGHT])
+ {
+ e->translate_axis (len, X_AXIS);
+ total.add_molecule (*e);
+ xpos += len;
+ }
+
+ return total;
}
+
Molecule
Lookup::accidental (int j, bool cautionary) const
{
- Molecule m(afm_find (String ("accidentals") + String ("-") + to_str (j)));
+ Molecule m(afm_find (String ("accidentals-") + 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 ("-)"))))
-;
+ Molecule open = afm_find (String ("accidentals-("));
+ Molecule close = afm_find (String ("accidentals-)"));
+ m.add_at_edge(X_AXIS, LEFT, Molecule(open), 0);
+ m.add_at_edge(X_AXIS, RIGHT, Molecule(close), 0);
}
return m;
}
-void
-Lookup::add (String s, Symtable*p)
-{
- symtables_p_->add (s, p);
-}
-Atom
+
+Molecule
Lookup::afm_find (String s, bool warn) const
{
- if (!afm_p_)
+ if (!afm_l_)
{
- *mlog << "[" << font_path_;
- ( (Lookup*)this)->afm_p_ = new Adobe_font_metric (read_afm (font_path_));
- *mlog << "]" << flush ;
- DOUT << this->afm_p_->str ();
+ Lookup * me = (Lookup*)(this);
+ me->afm_l_ = all_fonts_global_p->find_afm (font_name_);
+ if (!me->afm_l_)
+ {
+ warning (_f("Can't open `%s'\n", font_name_));
+ warning (_f("Search path %s\n", global_path.str ().ch_C()));
+ error (_f("Aborting"));
+ }
+ }
+ Adobe_font_char_metric cm = afm_l_->find_char (s, warn);
+ Molecule m;
+ if (cm.code () < 0)
+ {
+ /*
+ don't want people relying on this kind of dimension.
+ */
+ m.set_empty (false);
+ return m;
}
- Adobe_font_char_metric m = afm_p_->find_char (s, warn);
-
- Atom a;
- if (m.code () < 0)
- return a;
- a.dim_ = m.B_;
- a.dim_[X_AXIS] *= 1 / 1000.0;
- a.dim_[Y_AXIS] *= 1 / 1000.0;
-
+ Atom at (gh_list (char_scm_sym,
+ gh_int2scm (cm.code ()),
+ SCM_UNDEFINED));
+ at.font_ = ly_symbol (font_name_.ch_C());
+ at.magn_ = gh_int2scm (0);
- a.lambda_ = gh_list (ly_symbol ("char"),
- gh_int2scm (m.code ()),
- SCM_UNDEFINED);
- a.str_ = "afm_find: " + s;
- a.font_ = font_;
- return a;
+ m.dim_ = cm.dimensions();
+ m.add_atom (&at);
+ return m;
}
-Atom
-Lookup::ball (int j) const
+Molecule
+Lookup::notehead (int j, String type) const
{
if (j > 2)
j = 2;
- return afm_find (String ("balls") + String ("-") + to_str (j));
+ return afm_find (String ("noteheads-") + to_str (j) + type);
}
-Atom
-Lookup::bar (String str, Real h) const
+Molecule
+Lookup::simple_bar (String type, Real h, Paper_def* paper_l) const
{
-
- Atom a = (*symtables_p_) ("bars")->lookup (str);
+ SCM thick = ly_symbol ("barthick_" + type);
+ Real w = 0.0;
+ if (paper_l->scope_p_->elem_b (thick))
+ {
+ w = paper_l->get_realvar (thick);
+ }
+ else
+ {
+ programming_error ("No bar thickness set ! ");
+ w = 1 PT;
+ }
+ return filledbox (Box (Interval(0,w), Interval(-h/2, h/2)));
+}
+
- a.lambda_ = gh_list (ly_symbol (a.str_.ch_C()),
- gh_double2scm (h),
- SCM_UNDEFINED);
+Molecule
+Lookup::bar (String str, Real h, Paper_def *paper_l) const
+{
+ if (str == "bracket")
+ return staff_bracket (h);
+ 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 == "")
+ {
+ return fill (Box (Interval(0, 0), Interval (-h/2, h/2)));
+ }
+ if (str == "scorepostbreak")
+ {
+ return simple_bar ("score", h, paper_l);
+ }
+ else if (str == "|")
+ {
+ return thin;
+ }
+ else if (str == "|.")
+ {
+ m.add_at_edge (X_AXIS, LEFT, thick, 0);
+ m.add_at_edge (X_AXIS, LEFT, thin, kern);
+ }
+ else if (str == ".|")
+ {
+ m.add_at_edge (X_AXIS, RIGHT, thick, 0);
+ m.add_at_edge (X_AXIS, RIGHT, thin, kern);
+ }
+ else if (str == ":|")
+ {
+ m.add_at_edge (X_AXIS, LEFT, thick, 0);
+ m.add_at_edge (X_AXIS, LEFT, thin, kern);
+ m.add_at_edge (X_AXIS, LEFT, colon, kern);
+ }
+ else if (str == "|:")
+ {
+ m.add_at_edge (X_AXIS, RIGHT, thick, 0);
+ m.add_at_edge (X_AXIS, RIGHT, thin, kern);
+ m.add_at_edge (X_AXIS, RIGHT, colon, kern);
+ }
+ else if (str == ":|:")
+ {
+ m.add_at_edge (X_AXIS, LEFT, thick, thinkern);
+ m.add_at_edge (X_AXIS, LEFT, colon, kern);
+ m.add_at_edge (X_AXIS, RIGHT, thick, kern);
+ m.add_at_edge (X_AXIS, RIGHT, colon, kern);
+ }
+ else if (str == ".|.")
+ {
+ m.add_at_edge (X_AXIS, LEFT, thick, thinkern);
+ m.add_at_edge (X_AXIS, RIGHT, thick, kern);
+ }
+ else if (str == "||")
+ {
+ m.add_at_edge (X_AXIS, RIGHT, thin, 0);
+ m.add_at_edge (X_AXIS, RIGHT, thin, thinkern);
+ }
- a.dim_.y () = Interval (-h/2, h/2);
- a.font_ = font_;
- return a;
+ return m;
}
-Atom
+Molecule
Lookup::beam (Real slope, Real width, Real thick) const
{
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;
+
+ Molecule m;
+ Atom at
+ (gh_list (beam_scm_sym,
+ gh_double2scm (width),
+ gh_double2scm (slope),
+ gh_double2scm (thick),
+ SCM_UNDEFINED));
+
+ m.dim_[X_AXIS] = Interval (0, width);
+ m.dim_[Y_AXIS] = Interval (min_y, max_y);
+ m.add_atom (&at);
+ return m;
}
-Atom
+Molecule
Lookup::clef (String st) const
{
- return afm_find (String ("clefs") + String ("-") + st);
+ return afm_find (String ("clefs-" + st));
}
SCM
SCM_UNDEFINED);
}
-Atom
+Molecule
Lookup::dashed_slur (Array<Offset> controls, Real thick, Real dash) const
{
assert (controls.size () == 8);
Real dx = d[X_AXIS];
Real dy = d[Y_AXIS];
- Atom a;
- a.font_ = font_;
- a.dim_[X_AXIS] = Interval (0, dx);
- a.dim_[Y_AXIS] = Interval (0 <? dy, 0 >? dy);
+ Molecule m;
+
+
+ m.dim_[X_AXIS] = Interval (0, dx);
+ m.dim_[Y_AXIS] = Interval (0 <? dy, 0 >? dy);
SCM sc[4];
for (int i=0; i< 4; i++)
sc[i] = offset2scm (controls[i]);
}
- a.lambda_ =
- 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;
+ Atom at
+ (gh_list (ly_symbol ("dashed-slur"),
+ gh_double2scm (thick),
+ gh_double2scm (dash),
+ ly_quote_scm (array_to_list (sc, 4)),
+ SCM_UNDEFINED));
+
+
+ m.add_atom (&at);
+ return m;
}
-Atom
+Molecule
Lookup::dots () const
{
- return afm_find (String ("dots") + String ("-") + String ("dot"));
+ return afm_find (String ("dots-dot"));
}
-Atom
-Lookup::dynamic (String st) const
-{
- 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_;
- return a;
-}
-Atom
+Molecule
Lookup::fill (Box b) const
{
- Atom a;
- a.dim_ = b;
- return a;
-}
-
-Atom
-Lookup::flag (int j, Direction d) const
-{
- char c = (d == UP) ? 'u' : 'd';
- Atom a = afm_find (String ("flags") + String ("-") + to_str (c) + to_str (j));
- return a;
-}
-
-void
-Lookup::print () const
-{
-#ifndef NPRINT
- DOUT << "Lookup {\n";
- symtables_p_->print ();
- DOUT << "}\n";
-#endif
+ Molecule m;
+ m.dim_ = b;
+ return m;
}
-Atom
-Lookup::rest (int j, bool o) const
+Molecule
+Lookup::rest (int j, bool o, String style) const
{
- return afm_find (String ("rests")
- + String ("-") + to_str (j) + (o ? "o" : ""));
+ return afm_find (String ("rests-") + to_str (j) + (o ? "o" : "") + style);
}
-Atom
-Lookup::rule_symbol (Real height, Real width) const
-{
- 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
-Lookup::script (String str) const
-{
- return afm_find (String ("scripts") + String ("-") + str);
-}
-
-Atom
-Lookup::special_time_signature (String s, Array<int> arr) const
+Molecule
+Lookup::special_time_signature (String s, int n, int d, Paper_def*pap) const
{
// First guess: s contains only the signature style
- assert (arr.size () >1);
- String symbolname = "timesig-" + s + to_str (arr[0]) + "/" + to_str (arr[1]);
+ String symbolname = "timesig-" + s + to_str (n) + "/" + to_str (d);
- Atom a = afm_find (symbolname, false);
- if (!a.empty ())
- return a;
+ Molecule m = afm_find (symbolname, false);
+ if (!m.empty_b())
+ return m;
// Second guess: s contains the full signature name
- a = afm_find ("timesig-"+s, false);
- if (!a.empty ())
- return a;
+ m = afm_find ("timesig-"+s, false);
+ if (!m.empty_b ())
+ return m;
// Resort to default layout with numbers
- return time_signature (arr);
+ return time_signature (n,d,pap);
}
-Atom
-Lookup::stem (Real y1, Real y2) const
+Molecule
+Lookup::filledbox (Box b ) const
{
- if (y1 > y2)
- {
- Real t = y1;
- y1 = y2;
- y2 = t;
- }
- Atom a;
-
- a.dim_.x () = Interval (0,0);
- a.dim_.y () = Interval (y1,y2);
+ Molecule m;
+
+ Atom at (gh_list (filledbox_scm_sym,
+ gh_double2scm (-b[X_AXIS][LEFT]),
+ gh_double2scm (b[X_AXIS][RIGHT]),
+ gh_double2scm (-b[Y_AXIS][DOWN]),
+ gh_double2scm (b[Y_AXIS][UP]),
+ SCM_UNDEFINED));
+
+ m.dim_ = b;
+ m.add_atom (&at);
+ return m;
+}
- Real stem_width = paper_l_->get_var ("stemthickness");
- 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;
-}
+/**
+ Magnification steps. These are powers of 1.2. The numbers are
+ taken from Knuth's plain.tex: */
-Atom
-Lookup::streepje (int type) const
-{
- if (type > 2)
- type = 2;
-
- return afm_find ("balls" + String ("-") +to_str (type) + "l");
-}
-Dictionary<String> cmr_dict;
-Dictionary<Adobe_font_metric*> afm_p_dict;
+/**
+ TODO: THIS IS UGLY. Since the user has direct access to TeX
+ strings, we try some halfbaked attempt to detect TeX trickery.
-Atom
-Lookup::text (String style, String text) const
+*/
+Molecule
+Lookup::text (String style, String text, Paper_def *paper_l) const
{
- Atom a = (*symtables_p_) ("style")->lookup (style);
-
- a.lambda_ = gh_list(ly_symbol (a.str_),
- gh_str02scm (text.ch_C()),
- SCM_UNDEFINED);
+ Molecule m;
+ if (style.empty_b ())
+ style = "roman";
- Real font_w = a.dim_.x ().length ();
- Real font_h = a.dim_.y ().length ();
+ 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);
+ }
+
- if (!cmr_dict.elem_b ("roman"))
+ Real realmag = 1.0;
+ if (paper_l->scope_p_->elem_b ("magnification_" + style))
{
- //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";
+ font_mag = (int)paper_l->get_var ("magnification_" + style);
+ realmag = pow (1.2, font_mag);
}
- if (!afm_p_dict.elem_b (style))
+ /*
+ UGH.
+ */
+ SCM l = gh_eval_str (("(style-to-cmr \"" + style + "\")").ch_C());
+ if (l != SCM_BOOL_F)
{
- 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 = ly_scm2string (SCM_CDR(l)) +to_str ((int)font_h);
}
+
Real w = 0;
- Adobe_font_metric* afm_p = afm_p_dict.elem (style);
+ Interval ydims (0,0);
+
+ Font_metric* afm_l = all_fonts_global_p->find_font (style);
DOUT << "\nChars: ";
+
+
+ int brace_count =0;
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
{
- int c = text[i];
- if (afm_p && ((c >= 0) && (c < afm_p->char_metrics_.size ())))
- {
- Adobe_font_char_metric m = afm_p->char_metrics_[c];
- w += m.B_.x ().length ();
- DOUT << to_str (m.B_.x ().length ()) << " ";
- }
- else
- w += font_w;
+ if (text[i] == '{')
+ brace_count ++;
+ else if (text[i] == '}')
+ brace_count --;
+ Character_metric *c = afm_l->get_char ((unsigned char)text[i],false);
+
+ w += c->dimensions()[X_AXIS].length ();
+ ydims.unite (c->dimensions()[Y_AXIS]);
}
}
- DOUT << "\n" << to_str (w) << "\n";
- a.dim_.x () = Interval (0, w);
- a.font_ = font_;
- return a;
+
+ if(brace_count)
+ {
+ warning (_f ("Non-matching braces in text `%s', adding braces.", text.ch_C()));
+
+ if (brace_count < 0)
+ {
+ text = to_str ('{', -brace_count) + text;
+ }
+ else
+ {
+ text = text + to_str ('}', brace_count);
+ }
+ }
+
+ ydims *= realmag;
+ m.dim_.x () = Interval (0, w*realmag);
+ m.dim_.y () = ydims;
+
+
+ Atom at (gh_list (text_scm_sym,
+ gh_str02scm (text.ch_C()),
+ SCM_UNDEFINED));
+ at.font_ = ly_symbol (style);
+ at.magn_ = gh_int2scm (font_mag);
+
+ m.add_atom (&at);
+ return m;
}
-Atom
-Lookup::time_signature (Array<int> a) const
-{
- Atom s ((*symtables_p_) ("param")->lookup ("time_signature"));
- s.lambda_ = gh_list (ly_symbol (s.str_),
- gh_int2scm (a[0]),
- gh_int2scm (a[1]),
- SCM_UNDEFINED);
- return s;
+Molecule
+Lookup::time_signature (int num, int den, Paper_def *paper_l) const
+{
+ String sty = "number";
+ 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;
+ if (den)
+ {
+ m.add_at_edge (Y_AXIS, UP, n, 0.0);
+ m.add_at_edge (Y_AXIS, DOWN, d, 0.0);
+ }
+ else
+ {
+ m = n;
+ m.align_to (Y_AXIS, CENTER);
+ }
+ return m;
}
-Atom
-Lookup::vbrace (Real &y) const
-{
- 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;
+Molecule
+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;
+
+ 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);
+ m.add_atom (&at);
+ return m;
}
-Atom
-Lookup::hairpin (Real width, bool decresc, bool continued) const
+Molecule
+Lookup::hairpin (Real width, Real height, Real thick, bool decresc, bool continued) const
{
- Atom a;
- Real height = paper_l_->staffheight_f () / 6;
-
- String hairpin = String (decresc ? "de" : "") + "crescendo\n";
- 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_;
- return a;
+ Molecule m;
+
+ 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),
+ SCM_UNDEFINED));
+ m.dim_.x () = Interval (0, width);
+ m.dim_.y () = Interval (-2*height, 2*height);
+
+ m.add_atom (&at);
+ return m;
}
-Atom
-Lookup::plet (Real dy , Real dx, Direction dir) const
+Molecule
+Lookup::tuplet_bracket (Real dy , Real dx, Real thick, Real gap, Real interline_f, Direction dir) const
{
- Atom a;
- a.lambda_ = gh_list(ly_symbol ("tuplet"),
- gh_double2scm (dx),
- gh_double2scm (dy),
- gh_int2scm (dir));
- return a;
-}
+ Molecule m;
+ Atom at (gh_list(tuplet_scm_sym,
+ gh_double2scm (interline_f),
+ gh_double2scm (gap),
+ gh_double2scm (dx),
+ gh_double2scm (dy),
+ gh_double2scm (thick),
+ gh_int2scm (dir),
+ SCM_UNDEFINED));
+ m.add_atom (&at);
-Atom
-Lookup::slur (Array<Offset> controls) const
+ return m;
+}
+
+/*
+ Make a smooth curve along the points
+ */
+Molecule
+Lookup::slur (Array<Offset> controls, Real linethick) const
{
- assert (controls.size () == 8);
- Real dx = controls[3].x () - controls[0].x ();
- Real dy = controls[3].y () - controls[0].y ();
- Atom a;
+ Offset delta_off = controls[3]- controls[0];
+ Molecule m;
SCM scontrols [8];
int indices[] = {5,6,7,4,1,2,3,0};
scontrols[i] = offset2scm (controls[indices[i]]);
- a.lambda_ =gh_list (ly_symbol ("slur"),
- ly_quote_scm (array_to_list (scontrols, 8)),
- SCM_UNDEFINED);
+ Atom at (gh_list (ly_symbol ("bezier-sandwich"),
+ ly_quote_scm (array_to_list (scontrols, 8)),
+ gh_double2scm (linethick),
+ SCM_UNDEFINED));
- a.dim_[X_AXIS] = Interval (0, dx);
- a.dim_[Y_AXIS] = Interval (0 <? dy, 0 >? dy);
- a.font_ = font_;
- return a;
+ m.dim_[X_AXIS] = Interval (0, delta_off[X_AXIS]);
+ m.dim_[Y_AXIS] = Interval (0 <? delta_off[Y_AXIS], 0 >? delta_off[Y_AXIS]);
+ m.add_atom (&at);
+ return m;
}
-Atom
-Lookup::vbracket (Real &y) const
+Molecule
+Lookup::staff_bracket (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;
- }
-
- 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;
+ Molecule m;
+ Atom at ( gh_list (bracket_scm_sym,
+ gh_double2scm (y),
+ SCM_UNDEFINED));
+ m.add_atom (&at);
+ m.dim_[Y_AXIS] = Interval (-y/2,y/2);
+ m.dim_[X_AXIS] = Interval (0,4 PT);
+
+ m.translate_axis (- 4. / 3. * m.dim_[X_AXIS].length (), X_AXIS);
+ return m;
}
-Atom
-Lookup::volta (Real w, bool last_b) const
+Molecule
+Lookup::volta (Real h, Real w, Real thick, bool vert_start, bool vert_end) const
{
- Atom a;
- a.lambda_ = gh_list (ly_symbol ("volta"),
- gh_double2scm (w),
- gh_int2scm (last_b),
- SCM_UNDEFINED);
- a.str_ = "volta";
- return a;
+ Molecule m;
+
+ Atom at (gh_list (volta_scm_sym,
+ gh_double2scm (h),
+ gh_double2scm (w),
+ gh_double2scm (thick),
+ gh_int2scm (vert_start),
+ gh_int2scm (vert_end),
+ SCM_UNDEFINED));
+
+ m.dim_[Y_AXIS] = Interval (- h/2, h/2);
+ m.dim_[X_AXIS] = Interval (0, w);
+
+ m.add_atom (&at);
+ return m;
}
+Molecule
+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)));
+
+ if (sym == "Discant")
+ {
+ Molecule r = afm_find("scripts-accDiscant");
+ m.add_molecule(r);
+ if (reg.left_str(1) == "F")
+ {
+ Molecule d = afm_find("scripts-accDot");
+ d.translate_axis(interline_f * 2.5 PT, Y_AXIS);
+ m.add_molecule(d);
+ reg = reg.right_str(reg.length_i()-1);
+ }
+ int eflag = 0x00;
+ if (reg.left_str(3) == "EEE")
+ {
+ eflag = 0x07;
+ reg = reg.right_str(reg.length_i()-3);
+ }
+ else if (reg.left_str(2) == "EE")
+ {
+ eflag = 0x05;
+ reg = reg.right_str(reg.length_i()-2);
+ }
+ else if (reg.left_str(2) == "Eh")
+ {
+ eflag = 0x04;
+ reg = reg.right_str(reg.length_i()-2);
+ }
+ else if (reg.left_str(1) == "E")
+ {
+ eflag = 0x02;
+ reg = reg.right_str(reg.length_i()-1);
+ }
+ if (eflag & 0x02)
+ {
+ Molecule d = afm_find("scripts-accDot");
+ d.translate_axis(interline_f * 1.5 PT, Y_AXIS);
+ m.add_molecule(d);
+ }
+ if (eflag & 0x04)
+ {
+ Molecule d = afm_find("scripts-accDot");
+ d.translate_axis(interline_f * 1.5 PT, Y_AXIS);
+ d.translate_axis(0.8 * interline_f PT, X_AXIS);
+ m.add_molecule(d);
+ }
+ if (eflag & 0x01)
+ {
+ Molecule d = afm_find("scripts-accDot");
+ d.translate_axis(interline_f * 1.5 PT, Y_AXIS);
+ d.translate_axis(-0.8 * interline_f PT, X_AXIS);
+ m.add_molecule(d);
+ }
+ if (reg.left_str(2) == "SS")
+ {
+ Molecule d = afm_find("scripts-accDot");
+ d.translate_axis(0.5 * interline_f PT, Y_AXIS);
+ d.translate_axis(0.4 * interline_f PT, X_AXIS);
+ m.add_molecule(d);
+ d.translate_axis(-0.8 * interline_f PT, X_AXIS);
+ m.add_molecule(d);
+ reg = reg.right_str(reg.length_i()-2);
+ }
+ if (reg.left_str(1) == "S")
+ {
+ Molecule d = afm_find("scripts-accDot");
+ d.translate_axis(0.5 * interline_f PT, Y_AXIS);
+ m.add_molecule(d);
+ reg = reg.right_str(reg.length_i()-1);
+ }
+ }
+ else if (sym == "Freebase")
+ {
+ Molecule r = afm_find("scripts-accFreebase");
+ m.add_molecule(r);
+ if (reg.left_str(1) == "F")
+ {
+ Molecule d = afm_find("scripts-accDot");
+ d.translate_axis(interline_f * 1.5 PT, Y_AXIS);
+ m.add_molecule(d);
+ reg = reg.right_str(reg.length_i()-1);
+ }
+ if (reg == "E")
+ {
+ Molecule d = afm_find("scripts-accDot");
+ d.translate_axis(interline_f * 0.5 PT, Y_AXIS);
+ m.add_molecule(d);
+ }
+ }
+ else if (sym == "Bayanbase")
+ {
+ Molecule r = afm_find("scripts-accBayanbase");
+ m.add_molecule(r);
+ if (reg.left_str(1) == "T")
+ {
+ Molecule d = afm_find("scripts-accDot");
+ d.translate_axis(interline_f * 2.5 PT, Y_AXIS);
+ m.add_molecule(d);
+ reg = reg.right_str(reg.length_i()-1);
+ }
+ /* include 4' reed just for completeness. You don't want to use this. */
+ if (reg.left_str(1) == "F")
+ {
+ Molecule d = afm_find("scripts-accDot");
+ d.translate_axis(interline_f * 1.5 PT, Y_AXIS);
+ m.add_molecule(d);
+ reg = reg.right_str(reg.length_i()-1);
+ }
+ if (reg.left_str(2) == "EE")
+ {
+ Molecule d = afm_find("scripts-accDot");
+ d.translate_axis(interline_f * 0.5 PT, Y_AXIS);
+ d.translate_axis(0.4 * interline_f PT, X_AXIS);
+ m.add_molecule(d);
+ d.translate_axis(-0.8 * interline_f PT, X_AXIS);
+ m.add_molecule(d);
+ reg = reg.right_str(reg.length_i()-2);
+ }
+ if (reg.left_str(1) == "E")
+ {
+ Molecule d = afm_find("scripts-accDot");
+ d.translate_axis(interline_f * 0.5 PT, Y_AXIS);
+ m.add_molecule(d);
+ reg = reg.right_str(reg.length_i()-1);
+ }
+ }
+ else if (sym == "Stdbase")
+ {
+ Molecule r = afm_find("scripts-accStdbase");
+ m.add_molecule(r);
+ if (reg.left_str(1) == "T")
+ {
+ Molecule d = afm_find("scripts-accDot");
+ d.translate_axis(interline_f * 3.5 PT, Y_AXIS);
+ m.add_molecule(d);
+ reg = reg.right_str(reg.length_i()-1);
+ }
+ if (reg.left_str(1) == "F")
+ {
+ Molecule d = afm_find("scripts-accDot");
+ d.translate_axis(interline_f * 2.5 PT, Y_AXIS);
+ m.add_molecule(d);
+ reg = reg.right_str(reg.length_i()-1);
+ }
+ if (reg.left_str(1) == "M")
+ {
+ Molecule d = afm_find("scripts-accDot");
+ d.translate_axis(interline_f * 2 PT, Y_AXIS);
+ d.translate_axis(interline_f PT, X_AXIS);
+ m.add_molecule(d);
+ reg = reg.right_str(reg.length_i()-1);
+ }
+ if (reg.left_str(1) == "E")
+ {
+ Molecule d = afm_find("scripts-accDot");
+ d.translate_axis(interline_f * 1.5 PT, Y_AXIS);
+ m.add_molecule(d);
+ reg = reg.right_str(reg.length_i()-1);
+ }
+ if (reg.left_str(1) == "S")
+ {
+ Molecule d = afm_find("scripts-accDot");
+ d.translate_axis(interline_f * 0.5 PT, Y_AXIS);
+ m.add_molecule(d);
+ reg = reg.right_str(reg.length_i()-1);
+ }
+ }
+ /* ugh maybe try to use regular font for S.B. and B.B and only use one font
+ for the rectangle */
+ else if (sym == "SB")
+ {
+ Molecule r = afm_find("scripts-accSB");
+ m.add_molecule(r);
+ }
+ else if (sym == "BB")
+ {
+ Molecule r = afm_find("scripts-accBB");
+ m.add_molecule(r);
+ }
+ else if (sym == "OldEE")
+ {
+ Molecule r = afm_find("scripts-accOldEE");
+ m.add_molecule(r);
+ }
+ else if (sym == "OldEES")
+ {
+ Molecule r = afm_find("scripts-accOldEES");
+ m.add_molecule(r);
+ }
+ return m;
+}
projects / lilypond.git / blobdiff