source file of the GNU LilyPond music typesetter
- (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+ (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+
+ Jan Nieuwenhuizen <janneke@gnu.org>
TODO
- This doth suck. We should have PS output, and read spacing info from TFMs
-
- Glissando, bracket
-
+ Glissando
*/
-
+#include <math.h>
+#include <ctype.h>
+
+#include "warn.hh"
+#include "dimensions.hh"
+#include "bezier.hh"
+#include "string-convert.hh"
+#include "file-path.hh"
+#include "main.hh"
+#include "lily-guile.hh"
+#include "molecule.hh"
#include "lookup.hh"
-#include "debug.hh"
-#include "symtable.hh"
-#include "dimen.hh"
-#include "tex.hh"
-#include "scalar.hh"
-#include "paper-def.hh"
-
-Lookup::Lookup()
-{
- paper_l_ = 0;
- texsetting = "\\unknowntexsetting";
- symtables_ = new Symtables;
-}
+#include "font-metric.hh"
-Lookup::Lookup (Lookup const &s)
+Molecule
+Lookup::beam (Real slope, Real width, Real thick)
{
- paper_l_ = s.paper_l_;
- texsetting = s.texsetting;
- symtables_ = new Symtables (*s.symtables_);
-}
-Lookup::~Lookup()
-{
- delete symtables_;
-}
+ Real height = slope * width;
+ Real min_y = (0 <? height) - thick/2;
+ Real max_y = (0 >? height) + thick/2;
-void
-Lookup::add (String s, Symtable*p)
-{
- symtables_->add (s, p);
-}
+
-void
-Lookup::print() const
-{
-#ifndef NPRINT
- DOUT << "Lookup: " << texsetting << " {\n";
- symtables_->print();
- DOUT << "}\n";
-#endif
-}
+ Box b (Interval (0, width),
+ Interval (min_y, max_y));
-Atom
-Lookup::text (String style, String text, int dir) const
-{
- Array<String> a;
-
- a.push (text);
- Atom tsym = (*symtables_)("style")->lookup (style);
- a[0] = substitute_args (tsym.tex_,a);
-
- Atom s = (*symtables_)("align")->lookup (dir);
- s.tex_ = substitute_args (s.tex_,a);
- s.dim_ = tsym.dim_;
- return s;
+
+ SCM at = scm_list_n (ly_symbol2scm ("beam"),
+ gh_double2scm (width),
+ gh_double2scm (slope),
+ gh_double2scm (thick),
+ SCM_UNDEFINED);
+ return Molecule (b, at);
}
-
-
-Atom
-Lookup::ball (int j) const
+Molecule
+Lookup::dashed_slur (Bezier b, Real thick, Real dash)
{
- if (j > 2)
- j = 2;
+ SCM l = SCM_EOL;
- Symtable * st = (*symtables_)("balls");
- return st->lookup (String (j));
-}
+ for (int i= 4; i -- ;)
+ {
+ l = gh_cons (ly_offset2scm (b.control_[i]), l);
+ }
-Atom
-Lookup::rest (int j, bool o) const
-{
- return (*symtables_)("rests")->lookup (String (j) + (o ? "o" : ""));
-}
+ SCM at = (scm_list_n (ly_symbol2scm ("dashed-slur"),
+ gh_double2scm (thick),
+ gh_double2scm (dash),
+ ly_quote_scm (l),
+ SCM_UNDEFINED));
-Atom
-Lookup::fill (Box b) const
-{
- Atom s ((*symtables_)("param")->lookup ("fill"));
- s.dim_ = b;
- return s;
+ Box box (Interval (0,0),Interval (0,0));
+ return Molecule (box, at);
}
-Atom
-Lookup::accidental (int j) const
+Molecule
+Lookup::line (Real th, Offset f, Offset t)
{
- return (*symtables_)("accidentals")->lookup (String (j));
+ SCM at = (scm_list_n (ly_symbol2scm ("draw-line"),
+ gh_double2scm (th),
+ gh_double2scm (f[X_AXIS]),
+ gh_double2scm (f[Y_AXIS]),
+ gh_double2scm (t[X_AXIS]),
+ gh_double2scm (t[Y_AXIS]),
+ SCM_UNDEFINED));
+
+ Box box;
+ box.add_point (f);
+ box.add_point (t);
+
+ box[X_AXIS].widen (th/2);
+ box[Y_AXIS].widen (th/2);
+
+ return Molecule (box, at);
}
-Atom
-Lookup::bar (String s, Real h) const
-{
- Array<String> a;
- a.push (print_dimen (h));
- Atom ret=(*symtables_)("bars")->lookup (s);;
- ret.tex_ = substitute_args (ret.tex_, a);
- ret.dim_.y() = Interval (0, h);
- return ret;
-}
-
-Atom
-Lookup::script (String s) const
+Molecule
+Lookup::blank (Box b)
{
- return (*symtables_)("scripts")->lookup (s);
+ return Molecule (b, SCM_EOL);
}
-Atom
-Lookup::dynamic (String s) const
+Molecule
+Lookup::filledbox (Box b)
{
- return (*symtables_)("dynamics")->lookup (s);
+ SCM at = (scm_list_n (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::clef (String s) const
-{
- return (*symtables_)("clefs")->lookup (s);
-}
-
-Atom
-Lookup::dots (int j) const
+/*
+ * round filled box:
+ *
+ * __________________________________
+ * / \ ^ / \ ^
+ * | |blot | |
+ * | | |dia | | |
+ * | |meter | |
+ * |\ _ _ / v \ _ _ /| |
+ * | | |
+ * | | | Box
+ * | <------>| | extent
+ * | blot | | (Y_AXIS)
+ * | diameter| |
+ * | | |
+ * | _ _ _ _ | |
+ * |/ \ / \| |
+ * | | |
+ * | | | | |
+ * | | |
+ * x\_____/______________\_____/|_____v
+ * |(0,0) |
+ * | |
+ * | |
+ * |<-------------------------->|
+ * Box extent(X_AXIS)
+ */
+Molecule
+Lookup::roundfilledbox (Box b, Real blotdiameter)
{
- if (j>3)
+ if (b.x ().length () < blotdiameter)
{
- j = 3;
- warning ("max 3 dots"); // todo
+ programming_error (_f ("round filled box horizontal extent smaller than blot; decreasing blot"));
+ blotdiameter = b.x ().length ();
}
- return (*symtables_)("dots")->lookup (j);
+ if (b.y ().length () < blotdiameter)
+ {
+ programming_error (_f ("round filled box vertical extent smaller than blot; decreasing blot"));
+ blotdiameter = b.y ().length ();
+ }
+
+ SCM at = (scm_list_n (ly_symbol2scm ("roundfilledbox"),
+ gh_double2scm (-b[X_AXIS][LEFT]),
+ gh_double2scm (b[X_AXIS][RIGHT]),
+ gh_double2scm (-b[Y_AXIS][DOWN]),
+ gh_double2scm (b[Y_AXIS][UP]),
+ gh_double2scm (blotdiameter),
+ SCM_UNDEFINED));
+
+ return Molecule (b,at);
}
-Atom
-Lookup::flag (int j, Direction d) const
+Molecule
+Lookup::frame (Box b, Real thick)
{
- char c = (d == UP) ? 'u' : 'd';
- return (*symtables_)("flags")->lookup (c + String (j));
+ 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::streepjes (int type, int i) const
+/*
+ Make a smooth curve along the points
+ */
+Molecule
+Lookup::slur (Bezier curve, Real curvethick, Real linethick)
{
- assert (i);
+ Real alpha = (curve.control_[3] - curve.control_[0]).arg ();
+ Bezier back = curve;
+ Offset perp = curvethick * complex_exp (Offset (0, alpha + M_PI/2)) * 0.5;
+ back.reverse ();
+ back.control_[1] += perp;
+ back.control_[2] += perp;
+
+ curve.control_[1] -= perp;
+ curve.control_[2] -= perp;
- int arg;
- String idx;
-
- if (i < 0)
- {
- idx = "botlines";
- arg = -i;
- }
- else
+ 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--;)
{
- arg = i;
- idx = "toplines";
+ list = gh_cons (scontrols[indices[i]], list);
}
-
- // ugh
- Real w = paper_l_->note_width ();
- if (type <= 0)
- w *= 1.46;
-
- Atom ret = (*symtables_)("streepjes")->lookup (idx);
- Array<String> a;
- a.push (String (w) + "pt");
- a.push (arg);
- ret.tex_ = substitute_args (ret.tex_, a);
+
+ SCM at = (scm_list_n (ly_symbol2scm ("bezier-sandwich"),
+ ly_quote_scm (list),
+ gh_double2scm (linethick),
+ SCM_UNDEFINED));
+ Box b(curve.extent (X_AXIS),
+ curve.extent (Y_AXIS));
+
+ b[X_AXIS].unite (back.extent (X_AXIS));
+ b[Y_AXIS].unite (back.extent (Y_AXIS));
- return ret;
+ return Molecule (b, at);
}
-Atom
-Lookup::hairpin (Real &wid, bool decresc) const
+/*
+ * Bezier Sandwich:
+ *
+ * .|
+ * . |
+ * top . |
+ * . curve |
+ * . |
+ * . |
+ * . |
+ * | |
+ * | .|
+ * | .
+ * | bottom .
+ * | . curve
+ * | .
+ * | .
+ * | .
+ * | .
+ * |.
+ * |
+ *
+ */
+Molecule
+Lookup::bezier_sandwich (Bezier top_curve, Bezier bottom_curve)
{
- int idx = int (rint (wid / 6 PT));
- if (!idx) idx ++;
- wid = idx*6 PT;
- String idxstr = (decresc)? "decrescendosym" : "crescendosym";
- Atom ret=(*symtables_)("param")->lookup (idxstr);
-
- Array<String> a;
- a.push (idx);
- ret.tex_ = substitute_args (ret.tex_, a);
- ret.dim_.x() = Interval (0,wid);
- return ret;
+ /*
+ Need the weird order b.o. the way PS want its arguments
+ */
+ SCM list = SCM_EOL;
+ list = gh_cons (ly_offset2scm (bottom_curve.control_[3]), list);
+ list = gh_cons (ly_offset2scm (bottom_curve.control_[0]), list);
+ list = gh_cons (ly_offset2scm (bottom_curve.control_[1]), list);
+ list = gh_cons (ly_offset2scm (bottom_curve.control_[2]), list);
+ list = gh_cons (ly_offset2scm (top_curve.control_[0]), list);
+ list = gh_cons (ly_offset2scm (top_curve.control_[3]), list);
+ list = gh_cons (ly_offset2scm (top_curve.control_[2]), list);
+ list = gh_cons (ly_offset2scm (top_curve.control_[1]), list);
+
+ SCM horizontal_bend = scm_list_n (ly_symbol2scm ("bezier-sandwich"),
+ ly_quote_scm (list),
+ gh_double2scm (0.0),
+ SCM_UNDEFINED);
+
+ Interval x_extent = top_curve.extent (X_AXIS);
+ x_extent.unite (bottom_curve.extent (X_AXIS));
+ Interval y_extent = top_curve.extent (Y_AXIS);
+ y_extent.unite (bottom_curve.extent (Y_AXIS));
+ Box b (x_extent, y_extent);
+
+ return Molecule (b, horizontal_bend);
}
-Atom
-Lookup::linestaff (int lines, Real wid) const
+/*
+ * Horizontal Slope:
+ *
+ * /| ^
+ * / | |
+ * / | | height
+ * / | |
+ * / | v
+ * | /
+ * | /
+ * (0,0) x /slope=dy/dx
+ * | /
+ * |/
+ *
+ * <----->
+ * width
+ */
+Molecule
+Lookup::horizontal_slope (Real width, Real slope, Real height)
{
- Real internote_f = paper_l_ ->internote_f();
- Atom s;
- Real dy = (lines >0) ? (lines-1)*internote_f : 0;
- s.dim_ = Box (Interval (0,wid), Interval (0,dy));
-
- Array<String> a;
- a.push (lines);
- a.push (print_dimen (wid));
+ SCM width_scm = gh_double2scm (width);
+ SCM slope_scm = gh_double2scm (slope);
+ SCM height_scm = gh_double2scm (height);
+ SCM horizontal_slope = scm_list_n (ly_symbol2scm ("beam"),
+ width_scm, slope_scm,
+ height_scm, SCM_UNDEFINED);
+ Box b (Interval (0, width),
+ Interval (-height/2, height/2 + width*slope));
+ return Molecule (b, horizontal_slope);
+}
- s.tex_ = (*symtables_)("param")->lookup ("linestaf").tex_;
- s.tex_ = substitute_args (s.tex_, a);
+/*
+ TODO: junk me.
+ */
+Molecule
+Lookup::accordion (SCM s, Real staff_space, Font_metric *fm)
+{
+ Molecule m;
+ String sym = ly_scm2string (ly_car (s));
+ String reg = ly_scm2string (ly_car (ly_cdr (s)));
- return s;
+ if (sym == "Discant")
+ {
+ Molecule r = fm->find_by_name ("accordion-accDiscant");
+ m.add_molecule (r);
+ if (reg.left_str (1) == "F")
+ {
+ Molecule d = fm->find_by_name ("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 = fm->find_by_name ("accordion-accDot");
+ d.translate_axis (staff_space * 1.5 PT, Y_AXIS);
+ m.add_molecule (d);
+ }
+ if (eflag & 0x04)
+ {
+ Molecule d = fm->find_by_name ("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 = fm->find_by_name ("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 = fm->find_by_name ("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 = fm->find_by_name ("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 = fm->find_by_name ("accordion-accFreebase");
+ m.add_molecule (r);
+ if (reg.left_str (1) == "F")
+ {
+ Molecule d = fm->find_by_name ("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 = fm->find_by_name ("accordion-accDot");
+ d.translate_axis (staff_space * 0.5 PT, Y_AXIS);
+ m.add_molecule (d);
+ }
+ }
+ else if (sym == "Bayanbase")
+ {
+ Molecule r = fm->find_by_name ("accordion-accBayanbase");
+ m.add_molecule (r);
+ if (reg.left_str (1) == "T")
+ {
+ Molecule d = fm->find_by_name ("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 = fm->find_by_name ("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 = fm->find_by_name ("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 = fm->find_by_name ("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 = fm->find_by_name ("accordion-accStdbase");
+ m.add_molecule (r);
+ if (reg.left_str (1) == "T")
+ {
+ Molecule d = fm->find_by_name ("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 = fm->find_by_name ("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 = fm->find_by_name ("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 = fm->find_by_name ("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 = fm->find_by_name ("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 = fm->find_by_name ("accordion-accSB");
+ m.add_molecule (r);
+ }
+ else if (sym == "BB")
+ {
+ Molecule r = fm->find_by_name ("accordion-accBB");
+ m.add_molecule (r);
+ }
+ else if (sym == "OldEE")
+ {
+ Molecule r = fm->find_by_name ("accordion-accOldEE");
+ m.add_molecule (r);
+ }
+ else if (sym == "OldEES")
+ {
+ Molecule r = fm->find_by_name ("accordion-accOldEES");
+ m.add_molecule (r);
+ }
+ return m;
}
-
-Atom
-Lookup::meter (Array<Scalar> a) const
+Molecule
+Lookup::repeat_slash (Real w, Real s, Real t)
{
- Atom s;
- s.dim_.x() = Interval (0 PT, 10 PT);
- s.dim_.y() = Interval (0, 20 PT); // todo
- String src = (*symtables_)("param")->lookup ("meter").tex_;
- s.tex_ = substitute_args (src,a);
- return s;
-}
+ SCM wid = gh_double2scm (w);
+ SCM sl = gh_double2scm (s);
+ SCM thick = gh_double2scm (t);
+ SCM slashnodot = scm_list_n (ly_symbol2scm ("repeat-slash"),
+ wid, sl, thick, SCM_UNDEFINED);
+ Box b (Interval (0, w + sqrt (sqr(t/s) + sqr (t))),
+ Interval (0, w * s));
-Atom
-Lookup::stem (Real y1,Real y2) const
+ return Molecule (b, slashnodot); // http://slashnodot.org
+}
+
+Molecule
+Lookup::bracket (Axis a, Interval iv, Real thick, Real protude)
{
- if (y1 > y2)
- {
- Real t = y1;
- y1 = y2;
- y2 = t;
- }
- Atom s;
-
- s.dim_.x() = Interval (0,0);
- s.dim_.y() = Interval (y1,y2);
+ Box b;
+ Axis other = Axis((a+1)%2);
+ b[a] = iv;
+ b[other] = Interval(-1, 1) * thick * 0.5;
- Array<String> a;
- a.push (print_dimen (y1));
- a.push (print_dimen (y2));
-
- String src = (*symtables_)("param")->lookup ("stem").tex_;
- s.tex_ = substitute_args (src,a);
- return s;
+ Molecule m = filledbox (b);
+
+ b[a] = Interval (iv[UP] - thick, iv[UP]);
+ Interval oi = Interval (-thick/2, thick/2 + fabs (protude)) ;
+ oi *= sign (protude);
+ b[other] = oi;
+ m.add_molecule (filledbox (b));
+ b[a] = Interval (iv[DOWN], iv[DOWN] +thick);
+ m.add_molecule (filledbox(b));
+
+ return m;
}
/*
- should be handled via Tex_ code and Lookup::bar()
+ TODO: use rounded boxes.
*/
-Atom
-Lookup::vbrace (Real &y) const
+LY_DEFINE(ly_bracket ,"ly-bracket",
+ 4, 0, 0,
+ (SCM a, SCM iv, SCM t, SCM p),
+ "Make a bracket in direction @var{a}. The extent of the bracket is
+given by @var{iv}. The wings protude by an amount of @var{p}, which
+may be negative. The thickness is given by @var{t}.")
{
- if (y < 2* 20 PT)
- {
- warning ("piano brace too small (" + print_dimen (y)+ ")");
- y = 2*20 PT;
- }
- if (y > 67 * 2 PT)
- {
- warning ("piano brace too big (" + print_dimen (y)+ ")");
- y = 67 *2 PT;
- }
-
- int idx = int (rint ((y/2.0 - 20) + 148));
-
- Atom s = (*symtables_)("param")->lookup ("brace");
- {
- Array<String> a;
- a.push (idx);
- s.tex_ = substitute_args (s.tex_,a);
- s.dim_.y() = Interval (0,y);
- }
- {
- Array<String> a;
- a.push (print_dimen (y/2));
- a.push (print_dimen (0));
- a.push (s.tex_);
- s.tex_ = substitute_args ("\\placebox{%}{%}{%}", a);
- }
-
-
- return s;
+ SCM_ASSERT_TYPE(ly_axis_p (a), a, SCM_ARG1, __FUNCTION__, "axis") ;
+ SCM_ASSERT_TYPE(ly_number_pair_p (iv), iv, SCM_ARG2, __FUNCTION__, "number pair") ;
+ SCM_ASSERT_TYPE(gh_number_p (t), a, SCM_ARG3, __FUNCTION__, "number") ;
+ SCM_ASSERT_TYPE(gh_number_p(p), a, SCM_ARG4, __FUNCTION__, "number") ;
+
+
+ return Lookup::bracket ((Axis)gh_scm2int (a), ly_scm2interval (iv),
+ gh_scm2double (t),
+ gh_scm2double (p)).smobbed_copy ();
}
+
projects / lilypond.git / blobdiff