source file of the GNU LilyPond music typesetter
- (c) 1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
+ (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
- TODO
- This doth suck. We should have PS output, and read spacing info from TFMs
-
- Glissando,
+ Jan Nieuwenhuizen <janneke@gnu.org>
+ TODO
+ Glissando
*/
-
+#include <math.h>
+#include <ctype.h>
#include "lookup.hh"
#include "debug.hh"
-#include "symtable.hh"
-#include "dimen.hh"
-#include "tex.hh"
-#include "scalar.hh"
+#include "dimensions.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 "atom.hh"
+#include "lily-guile.hh"
-Lookup::Lookup()
+
+Lookup::Lookup ()
{
- paper_l_ = 0;
- texsetting = "\\unknowntexsetting";
- symtables_p_ = new Symtables;
+ afm_l_ = 0;
}
-Lookup::Lookup (Lookup const &s)
+Lookup::Lookup (Lookup const& s)
{
- paper_l_ = s.paper_l_;
- texsetting = s.texsetting;
- symtables_p_ = new Symtables (*s.symtables_p_);
+ font_name_ = s.font_name_;
+ afm_l_ = 0;
}
-Lookup::~Lookup()
+
+
+
+
+Molecule
+Lookup::afm_find (String s, bool warn) const
{
- delete symtables_p_;
+ if (!afm_l_)
+ {
+ 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"));
+ }
+ }
+ AFM_CharMetricInfo const *cm = afm_l_->find_char_metric (s, warn);
+ Molecule m;
+ if (!cm)
+ {
+ m.set_empty (false);
+ return m;
+ }
+
+ SCM at = (gh_list (ly_symbol2scm ("char"),
+ gh_int2scm (cm->code),
+ SCM_UNDEFINED));
+
+ at= fontify_atom (afm_l_,at);
+ m.dim_ = afm_bbox_to_box (cm->charBBox);
+ m.add_atom (at);
+ return m;
}
-void
-Lookup::add (String s, Symtable*p)
+Molecule
+Lookup::simple_bar (String type, Real h, Paper_def* paper_l) const
{
- symtables_p_->add (s, p);
+ SCM thick = ly_symbol2scm (("barthick_" + type).ch_C());
+ 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)));
}
-void
-Lookup::print() const
+
+Molecule
+Lookup::bar (String str, Real h, Paper_def *paper_l) const
{
-#ifndef NPRINT
- DOUT << "Lookup: " << texsetting << " {\n";
- symtables_p_->print();
- DOUT << "}\n";
-#endif
+ if (str == "bracket")
+ return staff_bracket (h, paper_l);
+ 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);
+ }
+
+ return m;
}
-Atom
-Lookup::text (String style, String text, int dir) const
+Molecule
+Lookup::beam (Real slope, Real width, Real thick)
{
- Array<String> a;
+ Real height = slope * width;
+ Real min_y = (0 <? height) - thick/2;
+ Real max_y = (0 >? height) + thick/2;
- a.push (text);
- Atom tsym = (*symtables_p_)("style")->lookup (style);
- a[0] = substitute_args (tsym.tex_,a);
+
+ Molecule m;
+ m.dim_[X_AXIS] = Interval (0, width);
+ m.dim_[Y_AXIS] = Interval (min_y, max_y);
- Atom s = (*symtables_p_)("align")->lookup (dir);
- s.tex_ = substitute_args (s.tex_,a);
- s.dim_ = tsym.dim_;
- return s;
+
+ SCM at = (gh_list (ly_symbol2scm ("beam"),
+ gh_double2scm (width),
+ gh_double2scm (slope),
+ gh_double2scm (thick),
+ SCM_UNDEFINED));
+
+ m.add_atom (at);
+ return m;
}
-Atom
-Lookup::ball (int j) const
+Molecule
+Lookup::dashed_slur (Bezier b, Real thick, Real dash)
{
- if (j > 2)
- j = 2;
-
- Symtable * st = (*symtables_p_)("balls");
- return st->lookup (String (j));
-}
+ SCM l = SCM_EOL;
+ for (int i= 4; i -- ;)
+ {
+ l = gh_cons (ly_offset2scm (b.control_[i]), l);
+ }
-Atom
-Lookup::rest (int j, bool o) const
-{
- return (*symtables_p_)("rests")->lookup (String (j) + (o ? "o" : ""));
+ SCM at = (gh_list (ly_symbol2scm ("dashed-slur"),
+ gh_double2scm (thick),
+ gh_double2scm (dash),
+ ly_quote_scm (l),
+ SCM_UNDEFINED));
+ Molecule m;
+ m.add_atom (at);
+ return m;
}
-Atom
-Lookup::fill (Box b) const
-{
- Atom s ((*symtables_p_)("param")->lookup ("fill"));
- s.dim_ = b;
- return s;
-}
-Atom
-Lookup::accidental (int j) const
-{
- return (*symtables_p_)("accidentals")->lookup (String (j));
-}
-Atom
-Lookup::bar (String s, Real h) const
+Molecule
+Lookup::fill (Box b)
{
- 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);
- return ret;
+ Molecule m;
+ m.dim_ = b;
+ return m;
}
-Atom
-Lookup::script (String s) const
-{
- return (*symtables_p_)("scripts")->lookup (s);
-}
-Atom
-Lookup::dynamic (String s) const
+Molecule
+Lookup::filledbox (Box b )
{
- return (*symtables_p_)("dynamics")->lookup (s);
+ Molecule m;
+
+ 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));
+
+ m.dim_ = b;
+ m.add_atom (at);
+ return m;
}
-Atom
-Lookup::clef (String s) const
+Molecule
+Lookup::frame (Box b, Real thick)
{
- return (*symtables_p_)("clefs")->lookup (s);
+ 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::dots () const
-{
- return (*symtables_p_)("dots")->lookup ("dot");
-}
-Atom
-Lookup::flag (int j, Direction d) const
+/*
+ TODO: THIS IS UGLY. Since the user has direct access to TeX
+ strings, we try some halfbaked attempt to detect TeX trickery.
+ */
+String
+sanitise_TeX_string (String text)
{
- char c = (d == UP) ? 'u' : 'd';
- return (*symtables_p_)("flags")->lookup (c + String (j));
+ 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::dashed_slur (Array<Offset> controls, Real thick, Real dash) const
+/**
+ TODO!
+ */
+String
+sanitise_PS_string (String t)
{
- 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);
- return s;
+ return t;
}
-Atom
-Lookup::slur (Array<Offset> controls) const
-{
- assert (controls.size () == 8);
+/**
- String ps = "\\embeddedps{\n";
+*/
+Molecule
+Lookup::text (String style, String text, Paper_def *paper_l)
+{
+ Molecule m;
+ if (style.empty_b ())
+ style = "roman";
- Real dx = controls[3].x () - controls[0].x ();
- Real dy = controls[3].y () - controls[0].y ();
+ 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);
+ }
- for (int i = 5; i < 8; i++)
- ps += String_convert::double_str (controls[i].x ()) + " "
- + String_convert::double_str (controls[i].y ()) + " ";
- ps += String_convert::double_str (controls[4].x ()) + " "
- + String_convert::double_str (controls[4].y ()) + " ";
+ if (paper_l->scope_p_->elem_b ("magnification_" + style))
+ {
+ font_mag = (int)paper_l->get_var ("magnification_" + style);
+ }
- for (int i = 1; i < 4; i++)
- ps += String_convert::double_str (controls[i].x ()) + " "
- + String_convert::double_str (controls[i].y ()) + " ";
+ /*
+ UGH.
+ */
+ SCM l = ly_eval_str (("(style-to-cmr \"" + style + "\")").ch_C());
+ if (l != SCM_BOOL_F)
+ {
+ style = ly_scm2string (gh_cdr(l)) +to_str ((int)font_h);
+ }
- ps += String_convert::double_str (controls[0].x ()) + " "
- + String_convert::double_str (controls[0].y ()) + " ";
+
- ps += " draw_slur}";
+ Font_metric* metric_l = 0;
- Atom s;
- s.tex_ = ps;
+ if (font_mag)
+ metric_l = all_fonts_global_p->find_scaled (style, font_mag);
+ else
+ metric_l = all_fonts_global_p->find_font (style);
- s.dim_[X_AXIS] = Interval (0, dx);
- s.dim_[Y_AXIS] = Interval (0 <? dy, 0 >? dy);
- return s;
+
+ if (output_global_ch == "tex")
+ text = sanitise_TeX_string (text);
+ else if (output_global_ch == "ps")
+ text = sanitise_PS_string (text);
+
+ m.dim_ = metric_l->text_dimension (text);
+
+ SCM at = (gh_list (ly_symbol2scm ("text"),
+ ly_str02scm (text.ch_C()),
+ SCM_UNDEFINED));
+ at = fontify_atom (metric_l,at);
+
+ m.add_atom (at);
+ return m;
}
+
-Atom
-Lookup::streepje (int type) const
-{
- if (type > 2)
- type = 2;
- Symtable * st = (*symtables_p_)("balls");
+Molecule
+Lookup::staff_brace (Real y, int staff_size)
+{
+ Molecule m;
+
+ // URG
+ 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 l = ly_eval_str ("(style-to-cmr \"brace\")");
+ String nm = "feta-braces";
+ if (l != SCM_BOOL_F)
+ nm = ly_scm2string (gh_cdr (l));
+ nm += to_str (staff_size);
+ SCM e =gh_list (ly_symbol2scm ("char"), gh_int2scm (idx), SCM_UNDEFINED);
+ SCM at = (e);
+
+ at = fontify_atom (all_fonts_global_p->find_font (nm), at);
- return st->lookup (String (type) + 'l');
+ 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
+/*
+ Make a smooth curve along the points
+ */
+Molecule
+Lookup::slur (Bezier curve, Real curvethick, Real linethick)
{
- String embed;
- Atom ret;
- Real height = paper_l_->staffheight_f () / 6;
- embed = "\\embeddedps{\n" ;
- embed += String (width) + " "
- + String (height) + " "
- + String (continued ? height/2 : 0) +
- + " draw_" + String(decresc ? "de" : "") + "cresc}\n";
- ret.tex_ = embed;
-
-
- ret.dim_.x () = Interval (0, width);
- ret.dim_.y () = Interval (-2*height, 2*height);
-
- return ret;
+ 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--; )
+ {
+ list = gh_cons (scontrols[indices[i]], list);
+ }
+
+
+ SCM at = (gh_list (ly_symbol2scm ("bezier-sandwich"),
+ ly_quote_scm (list),
+ gh_double2scm (linethick),
+ SCM_UNDEFINED));
+
+ Molecule m;
+ m.dim_[X_AXIS] = curve.extent (X_AXIS);
+ m.dim_[Y_AXIS] = curve.extent (Y_AXIS);
+ m.add_atom (at);
+ return m;
}
-Atom
-Lookup::meter (Array<Scalar> a) const
+Molecule
+Lookup::staff_bracket (Real height, Paper_def* paper_l)
{
- Atom s((*symtables_p_)("param")->lookup ("meter"));
- s.tex_ = substitute_args (s.tex_,a);
- return s;
+ Molecule m;
+ SCM at = ( gh_list (ly_symbol2scm ("bracket"),
+ gh_double2scm (paper_l->get_var("bracket_arch_angle")),
+ gh_double2scm (paper_l->get_var("bracket_arch_width")),
+ gh_double2scm (paper_l->get_var("bracket_arch_height")),
+ gh_double2scm (paper_l->get_var("bracket_width")),
+ gh_double2scm (height),
+ gh_double2scm (paper_l->get_var("bracket_arch_thick")),
+ gh_double2scm (paper_l->get_var("bracket_thick")),
+ SCM_UNDEFINED));
+
+ m.add_atom (at);
+ m.dim_[Y_AXIS] = Interval (-height/2,height/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::stem (Real y1,Real y2) const
+Molecule
+Lookup::accordion (SCM s, Real staff_space) const
{
- if (y1 > y2)
+ Molecule m;
+ String sym = ly_scm2string(gh_car (s));
+ String reg = ly_scm2string(gh_car (gh_cdr(s)));
+
+ if (sym == "Discant")
{
- Real t = y1;
- y1 = y2;
- y2 = t;
+ 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(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("scripts-accDot");
+ d.translate_axis(staff_space * 1.5 PT, Y_AXIS);
+ m.add_molecule(d);
+ }
+ if (eflag & 0x04)
+ {
+ Molecule d = afm_find("scripts-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("scripts-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("scripts-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("scripts-accDot");
+ d.translate_axis(0.5 * staff_space PT, Y_AXIS);
+ m.add_molecule(d);
+ reg = reg.right_str(reg.length_i()-1);
+ }
}
- 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));
-
- String src = (*symtables_p_)("param")->lookup ("stem").tex_;
- s.tex_ = substitute_args (src,a);
- 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)
+ else if (sym == "Freebase")
{
- warning (_("piano brace too small (") + print_dimen (y)+ ")");
- y = min_y;
+ 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(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("scripts-accDot");
+ d.translate_axis(staff_space * 0.5 PT, Y_AXIS);
+ m.add_molecule(d);
+ }
}
- if (y > max_y)
+ else if (sym == "Bayanbase")
{
- warning (_("piano brace too big (") + print_dimen (y)+ ")");
- y = max_y;
+ 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(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("scripts-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("scripts-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("scripts-accDot");
+ d.translate_axis(staff_space * 0.5 PT, Y_AXIS);
+ m.add_molecule(d);
+ reg = reg.right_str(reg.length_i()-1);
+ }
}
-
-
- int idx = int (rint ((y- min_y)/step)) + 1;
-
- {
- Array<String> a;
- a.push (idx);
- brace.tex_ = substitute_args (brace.tex_,a);
- brace.dim_[Y_AXIS] = Interval (-y/2,y/2);
- }
-
- return brace;
-}
-
-Atom
-Lookup::vbracket (Real &y) const
-{
- Atom psbracket;
- psbracket.tex_ = String ("\\embeddedps{ ") + y + " draw_bracket}";
- psbracket.dim_[Y_AXIS] = Interval (-y/2,y/2);
- psbracket.dim_[X_AXIS] = Interval (0,4 PT);
- return psbracket;
- Atom bracket = (*symtables_p_)("param")->lookup ("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)
+ else if (sym == "Stdbase")
{
- warning (_("bracket too small (") + print_dimen (y)+ ")");
- y = min_y;
+ 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(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("scripts-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("scripts-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("scripts-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("scripts-accDot");
+ d.translate_axis(staff_space * 0.5 PT, Y_AXIS);
+ m.add_molecule(d);
+ reg = reg.right_str(reg.length_i()-1);
+ }
}
- if (y > max_y)
+ /* 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")
{
- warning (_("bracket too big (") + print_dimen (y)+ ")");
- y = max_y;
+ Molecule r = afm_find("scripts-accSB");
+ m.add_molecule(r);
}
-
-
- int idx = int (rint ((y- min_y)/step)) + 1;
-
- {
- Array<String> a;
- a.push (idx);
- bracket.tex_ = substitute_args (bracket.tex_,a);
- bracket.dim_[Y_AXIS] = Interval (-y/2,y/2);
- }
-
- return bracket;
+ 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