source file of the GNU LilyPond music typesetter
- (c) 1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2000 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 "warn.hh"
#include "dimensions.hh"
-#include "symtable.hh"
-#include "scalar.hh"
+#include "bezier.hh"
#include "paper-def.hh"
#include "string-convert.hh"
#include "file-path.hh"
#include "main.hh"
#include "lily-guile.hh"
+#include "all-font-metrics.hh"
+#include "afm.hh"
+#include "scope.hh"
+#include "molecule.hh"
+
+
+#include "ly-smobs.icc"
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)
+SCM
+Lookup::mark_smob (SCM s)
{
- font_ = s.font_;
- font_path_ = s.font_path_;
- paper_l_ = 0;
- symtables_p_ = new Symtables (s);
- afm_p_ = 0;
+ return s;
}
-Lookup::~Lookup ()
+int
+Lookup::print_smob (SCM s, SCM p, scm_print_state*)
{
- delete afm_p_;
- delete symtables_p_;
+ scm_puts ("#<Lookup >#", p);
+ return 1;
}
-Molecule
-Lookup::accidental (int j, bool cautionary) const
-{
- 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
-Lookup::add (String s, Symtable*p)
+IMPLEMENT_UNSMOB(Lookup, lookup);
+IMPLEMENT_SIMPLE_SMOBS(Lookup);
+IMPLEMENT_DEFAULT_EQUAL_P(Lookup);
+
+SCM
+Lookup::make_lookup ()
{
- symtables_p_->add (s, p);
+ Lookup * l = new Lookup;
+ return l->smobbed_self();
}
-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 find font: `%s'", font_name_));
+ warning (_f ("(search path: `%s')", global_path.str ().ch_C()));
+ error (_ ("Aborting"));
+ }
}
- Adobe_font_char_metric m = afm_p_->find_char (s, warn);
+ AFM_CharMetricInfo const *cm = afm_l_->find_char_metric (s, warn);
- Atom a;
- if (m.code () < 0)
- return a;
+ if (!cm)
+ {
+ Molecule m;
+ m.set_empty (false);
+ return m;
+ }
- 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.str_ = "afm_find: " + s;
- a.font_ = font_;
- return a;
-}
+ SCM at = (gh_list (ly_symbol2scm ("char"),
+ gh_int2scm (cm->code),
+ SCM_UNDEFINED));
-Atom
-Lookup::ball (int j) const
-{
- if (j > 2)
- j = 2;
- return afm_find (String ("balls") + String ("-") + to_str (j));
+ at= fontify_atom (afm_l_,at);
+ return Molecule ( afm_bbox_to_box (cm->charBBox), at);
}
-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.dim_.y () = Interval (-h/2, h/2);
- a.font_ = font_;
- return a;
-}
+
+
-Atom
-Lookup::beam (Real slope, Real width, Real thick) const
+Molecule
+Lookup::beam (Real slope, Real width, Real thick)
{
Real height = slope * width;
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.dim_[X_AXIS] = Interval (0, width);
- a.dim_[Y_AXIS] = Interval (min_y, max_y);
- return a;
-}
+
-Atom
-Lookup::clef (String st) const
-{
- return afm_find (String ("clefs") + String ("-") + st);
-}
+ Box b( Interval (0, width),
+ Interval (min_y, max_y));
-SCM
-offset2scm (Offset o)
-{
- return gh_list (gh_double2scm (o[X_AXIS]), gh_double2scm(o[Y_AXIS]), SCM_UNDEFINED);
+
+ SCM at = gh_list (ly_symbol2scm ("beam"),
+ gh_double2scm (width),
+ gh_double2scm (slope),
+ gh_double2scm (thick),
+ SCM_UNDEFINED);
+ return Molecule (b, at);
}
-Atom
-Lookup::dashed_slur (Array<Offset> controls, Real thick, Real dash) const
-{
- assert (controls.size () == 8);
- Offset d = controls[3] - controls[0];
-
- 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);
- SCM sc[4];
- for (int i=0; i< 4; i++)
+Molecule
+Lookup::dashed_slur (Bezier b, Real thick, Real dash)
+{
+ SCM l = SCM_EOL;
+
+ for (int i= 4; i -- ;)
{
- sc[i] = offset2scm (controls[i]);
+ l = gh_cons (ly_offset2scm (b.control_[i]), l);
}
- // (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));
+ SCM at = (gh_list (ly_symbol2scm ("dashed-slur"),
+ gh_double2scm (thick),
+ gh_double2scm (dash),
+ ly_quote_scm (l),
+ SCM_UNDEFINED));
- a.str_ = "dashed_slur";
- return a;
+ Box box (Interval(0,0),Interval( 0,0));
+ return Molecule (box, at);
}
-Atom
-Lookup::dots () const
-{
- return afm_find (String ("dots") + String ("-") + String ("dot"));
-}
-Atom
-Lookup::dynamic (String st) const
-{
- return (*symtables_p_) ("dynamics")->lookup (st);
-}
-Atom
-Lookup::fill (Box b) const
-{
- Atom a;
- a.dim_ = b;
- return a;
-}
-Atom
-Lookup::flag (int j, Direction d) const
+Molecule
+Lookup::blank (Box b)
{
- char c = (d == UP) ? 'u' : 'd';
- Atom a = afm_find (String ("flags") + String ("-") + to_str (c) + to_str (j));
- return a;
+ return Molecule (b, SCM_EOL);
}
-void
-Lookup::print () const
+
+Molecule
+Lookup::filledbox (Box b )
{
-#ifndef NPRINT
- DOUT << "Lookup {\n";
- symtables_p_->print ();
- DOUT << "}\n";
-#endif
+ SCM at = (gh_list (ly_symbol2scm ("filledbox"),
+ 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));
+
+ return Molecule ( b,at);
}
-Atom
-Lookup::rest (int j, bool o) const
+Molecule
+Lookup::frame (Box b, Real thick)
{
- return afm_find (String ("rests")
- + String ("-") + to_str (j) + (o ? "o" : ""));
+ Molecule m;
+ Direction d = LEFT;
+ Axis a = X_AXIS;
+ while (a < NO_AXES)
+ {
+ do
+ {
+ Axis o = Axis ((a+1)%NO_AXES);
+
+ Box edges;
+ edges[a] = b[a][d] + 0.5 * thick * Interval (-1, 1);
+ edges[o][DOWN] = b[o][DOWN] - thick/2;
+ edges[o][UP] = b[o][UP] + thick/2;
+
+
+ m.add_molecule (filledbox (edges));
+ }
+ while (flip (&d) != LEFT);
+ }
+ return m;
+
}
-Atom
-Lookup::rule_symbol (Real height, Real width) const
+
+/*
+ TODO: THIS IS UGLY.
+ Since the user has direct access to TeX marcos,
+ that currently provide the only way to do
+ font selection, accents etc,
+ we try some halfbaked attempt to detect this TeX trickery.
+ */
+String
+sanitise_TeX_string (String text)
{
- 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";
- a.dim_.x () = Interval (0, width);
- a.dim_.y () = Interval (0, height);
- return a;
+ int brace_count =0;
+ for (int i= 0; i < text.length_i (); i++)
+ {
+ if (text[i] == '\\')
+ continue;
+
+ if (text[i] == '{')
+ brace_count ++;
+ else if (text[i] == '}')
+ brace_count --;
+ }
+
+ 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);
+ }
+ }
+
+ return text;
}
-Atom
-Lookup::script (String str) const
+/**
+ TODO!
+ */
+String
+sanitise_PS_string (String t)
{
- return afm_find (String ("scripts") + String ("-") + str);
+ return t;
}
-Atom
-Lookup::special_time_signature (String s, Array<int> arr) const
+/**
+TODO: move into Text_item. UGH: paper_l argument shoudl be junked.
+*/
+Molecule
+Lookup::text (String style, String text, Paper_def *paper_l)
{
- // First guess: s contains only the signature style
- assert (arr.size () >1);
- String symbolname = "timesig-" + s + to_str (arr[0]) + "/" + to_str (arr[1]);
+ if (style.empty_b ())
+ style = "roman";
- Atom a = afm_find (symbolname, false);
- if (!a.empty ())
- return a;
-
- // Second guess: s contains the full signature name
- a = afm_find ("timesig-"+s, false);
- if (!a.empty ())
- return a;
+ 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);
+ }
- // Resort to default layout with numbers
- return time_signature (arr);
-}
-Atom
-Lookup::stem (Real y1, Real y2) const
-{
- if (y1 > y2)
+ if (paper_l->scope_p_->elem_b ("magnification_" + style))
{
- Real t = y1;
- y1 = y2;
- y2 = t;
+ font_mag = (int)paper_l->get_var ("magnification_" + style);
}
- Atom a;
- a.dim_.x () = Interval (0,0);
- a.dim_.y () = Interval (y1,y2);
+ /*
+ FIXME !
+ */
+
+ SCM l = scm_assoc (ly_str02scm (style.ch_C()),
+ scm_eval2 (ly_symbol2scm ("cmr-alist"), SCM_EOL));
- Array<Real> arr;
+ if (l != SCM_BOOL_F)
+ {
+ style = ly_scm2string (gh_cdr(l)) +to_str ((int)font_h);
+ }
- Real stem_width = paper_l_->get_var ("stemthickness");
- arr.push (-stem_width /2);
- arr.push (stem_width);
- arr.push (y2);
- arr.push (-y1);
+ Font_metric* metric_l = 0;
- a.lambda_ = (lambda_scm ("stem", arr));
- a.str_ = "stem";
- a.font_ = font_;
- return a;
-}
+ if (font_mag)
+ metric_l = all_fonts_global_p->find_scaled (style, font_mag);
+ else
+ metric_l = all_fonts_global_p->find_font (style);
+
+
+
-Atom
-Lookup::streepje (int type) const
-{
- if (type > 2)
- type = 2;
+ int i = text.index_i ("\\n");
+ while (i >=0 )
+ {
+ text = text.left_str (i) + "\n" + text.right_str (text.length_i () - i - 2);
+ i = text.index_i ("\\n");
+ }
+
+ Array<String> lines = String_convert::split_arr (text, '\n');
+
+ Real kern = paper_l->get_var ("line_kern");
+
+ for (int i=0; i < lines.size (); i++)
+ {
+ String str (lines[i]);
+ if (output_global_ch == "tex")
+ str = sanitise_TeX_string (str);
+ else if (output_global_ch == "ps")
+ str = sanitise_PS_string (str);
+ lines[i] = str;
+ }
- return afm_find ("balls" + String ("-") +to_str (type) + "l");
-}
+ if (!lines.size())
+ return Molecule();
-Dictionary<String> cmr_dict;
-Dictionary<Adobe_font_metric*> afm_p_dict;
+ SCM first = gh_list (ly_symbol2scm ("text"),
+ ly_str02scm (lines[0].ch_C()),
+ SCM_UNDEFINED);
+ first = fontify_atom (metric_l, first);
-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);
- Real font_w = a.dim_.x ().length ();
- Real font_h = a.dim_.y ().length ();
+ Molecule mol (metric_l->text_dimension (lines[0]), first);
-// urg
-// if (!cmr_dict.length_i ())
- if (!cmr_dict.elem_b ("roman"))
+ for (i = 1; i < lines.size (); i++)
{
- //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";
+ SCM line = (gh_list (ly_symbol2scm ("text"),
+ ly_str02scm (lines[i].ch_C ()),
+ SCM_UNDEFINED));
+ line = fontify_atom (metric_l, line);
+ mol.add_at_edge (Y_AXIS, DOWN,
+ Molecule (metric_l->text_dimension (lines[i]), line),
+ kern);
}
- if (!afm_p_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;
- }
- Real w = 0;
- Adobe_font_metric* afm_p = afm_p_dict.elem (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
- {
- if (afm_p)
- {
- Adobe_font_char_metric m = afm_p->char_metrics_[(int)text[i]];
- 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_;
- return a;
+ return mol;
}
-Atom
-Lookup::time_signature (Array<int> a) const
-{
- Atom s ((*symtables_p_) ("param")->lookup ("time_signature"));
- s.lambda_ = (lambda_scm (s.str_, a));
-
- return s;
-}
/*
- should be handled via Tex_ code and Lookup::bar ()
+ Make a smooth curve along the points
*/
-Atom
-Lookup::vbrace (Real &y) const
+Molecule
+Lookup::slur (Bezier curve, Real curvethick, Real linethick)
{
- 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)
+ Real alpha = (curve.control_[3] - curve.control_[0]).arg ();
+ Bezier back = curve;
+
+ back.reverse ();
+ back.control_[1] += curvethick * complex_exp (Offset (0, alpha + M_PI/2));
+ back.control_[2] += curvethick * complex_exp (Offset (0, alpha + M_PI/2));
+
+ SCM scontrols[8];
+
+ for (int i=4; i--;)
+ scontrols[ i ] = ly_offset2scm(back.control_[i]);
+ for (int i=4 ; i--;)
+ scontrols[i+4] = ly_offset2scm (curve.control_[i]);
+
+ /*
+ Need the weird order b.o. the way PS want its arguments
+ */
+ int indices[]= {5, 6, 7, 4, 1, 2, 3, 0};
+ SCM list = SCM_EOL;
+ for (int i= 8; i--; )
{
- warning (_ ("piano brace")
- + " " + _ ("too small") + " (" + print_dimen (y) + ")");
- y = min_y;
+ list = gh_cons (scontrols[indices[i]], list);
}
- 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";
- a.dim_[Y_AXIS] = Interval (-y/2,y/2);
- a.font_ = font_;
- return a;
-}
-
-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;
-}
+ SCM at = (gh_list (ly_symbol2scm ("bezier-sandwich"),
+ ly_quote_scm (list),
+ gh_double2scm (linethick),
+ SCM_UNDEFINED));
-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;
- return a;
+ Box b ( curve.extent (X_AXIS), curve.extent (Y_AXIS));
+ return Molecule (b, at);
}
-Atom
-Lookup::slur (Array<Offset> controls) const
+Molecule
+Lookup::accordion (SCM s, Real staff_space) const
{
- assert (controls.size () == 8);
+ Molecule m;
+ String sym = ly_scm2string(gh_car (s));
+ String reg = ly_scm2string(gh_car (gh_cdr(s)));
- String ps;
-
- Real dx = controls[3].x () - controls[0].x ();
- Real dy = controls[3].y () - controls[0].y ();
- Atom a;
-
- 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_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.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 a;
- Real min_y = paper_l_->staffheight_f ();
- if (y < min_y)
+ if (sym == "Discant")
+ {
+ Molecule r = afm_find("accordion-accDiscant");
+ m.add_molecule(r);
+ if (reg.left_str(1) == "F")
+ {
+ Molecule d = afm_find("accordion-accDot");
+ d.translate_axis(staff_space * 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("accordion-accDot");
+ d.translate_axis(staff_space * 1.5 PT, Y_AXIS);
+ m.add_molecule(d);
+ }
+ if (eflag & 0x04)
+ {
+ Molecule d = afm_find("accordion-accDot");
+ d.translate_axis(staff_space * 1.5 PT, Y_AXIS);
+ d.translate_axis(0.8 * staff_space PT, X_AXIS);
+ m.add_molecule(d);
+ }
+ if (eflag & 0x01)
+ {
+ Molecule d = afm_find("accordion-accDot");
+ d.translate_axis(staff_space * 1.5 PT, Y_AXIS);
+ d.translate_axis(-0.8 * staff_space PT, X_AXIS);
+ m.add_molecule(d);
+ }
+ if (reg.left_str(2) == "SS")
+ {
+ Molecule d = afm_find("accordion-accDot");
+ d.translate_axis(0.5 * staff_space PT, Y_AXIS);
+ d.translate_axis(0.4 * staff_space PT, X_AXIS);
+ m.add_molecule(d);
+ d.translate_axis(-0.8 * staff_space 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("accordion-accDot");
+ d.translate_axis(0.5 * staff_space PT, Y_AXIS);
+ m.add_molecule(d);
+ reg = reg.right_str(reg.length_i()-1);
+ }
+ }
+ else if (sym == "Freebase")
+ {
+ Molecule r = afm_find("accordion-accFreebase");
+ m.add_molecule(r);
+ if (reg.left_str(1) == "F")
+ {
+ Molecule d = afm_find("accordion-accDot");
+ d.translate_axis(staff_space * 1.5 PT, Y_AXIS);
+ m.add_molecule(d);
+ reg = reg.right_str(reg.length_i()-1);
+ }
+ if (reg == "E")
+ {
+ Molecule d = afm_find("accordion-accDot");
+ d.translate_axis(staff_space * 0.5 PT, Y_AXIS);
+ m.add_molecule(d);
+ }
+ }
+ else if (sym == "Bayanbase")
+ {
+ Molecule r = afm_find("accordion-accBayanbase");
+ m.add_molecule(r);
+ if (reg.left_str(1) == "T")
+ {
+ Molecule d = afm_find("accordion-accDot");
+ d.translate_axis(staff_space * 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("accordion-accDot");
+ d.translate_axis(staff_space * 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("accordion-accDot");
+ d.translate_axis(staff_space * 0.5 PT, Y_AXIS);
+ d.translate_axis(0.4 * staff_space PT, X_AXIS);
+ m.add_molecule(d);
+ d.translate_axis(-0.8 * staff_space 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("accordion-accDot");
+ d.translate_axis(staff_space * 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("accordion-accStdbase");
+ m.add_molecule(r);
+ if (reg.left_str(1) == "T")
+ {
+ Molecule d = afm_find("accordion-accDot");
+ d.translate_axis(staff_space * 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("accordion-accDot");
+ d.translate_axis(staff_space * 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("accordion-accDot");
+ d.translate_axis(staff_space * 2 PT, Y_AXIS);
+ d.translate_axis(staff_space 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("accordion-accDot");
+ d.translate_axis(staff_space * 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("accordion-accDot");
+ d.translate_axis(staff_space * 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("accordion-accSB");
+ m.add_molecule(r);
+ }
+ else if (sym == "BB")
{
- warning (_ ("bracket")
- + " " + _ ("too small") + " (" + print_dimen (y) + ")");
- // y = min_y;
+ Molecule r = afm_find("accordion-accBB");
+ m.add_molecule(r);
}
- Array<Real> arr;
- arr.push (y);
- a.lambda_ = (lambda_scm ("bracket", arr));
- a.str_ = "vbracket";
- a.dim_[Y_AXIS] = Interval (-y/2,y/2);
- a.dim_[X_AXIS] = Interval (0,4 PT);
- return a;
+ else if (sym == "OldEE")
+ {
+ Molecule r = afm_find("accordion-accOldEE");
+ m.add_molecule(r);
+ }
+ else if (sym == "OldEES")
+ {
+ Molecule r = afm_find("accordion-accOldEES");
+ m.add_molecule(r);
+ }
+ return m;
}
-
projects / lilypond.git / blobdiff