source file of the GNU LilyPond music typesetter
- (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
+
+#include "lookup.hh"
+
#include <math.h>
-#include <ctype.h>
+#include <cctype>
#include "line-interface.hh"
#include "warn.hh"
#include "file-path.hh"
#include "main.hh"
#include "lily-guile.hh"
-#include "stencil.hh"
-#include "lookup.hh"
#include "font-metric.hh"
-#include "interval.hh"
Stencil
Lookup::dot (Offset p, Real radius)
* / | v
* | /
* | /
- * (0,0) x /slope=dy/dx
+ * (0,0) x /slope = dy/dx
* | /
* |/
*
{
SCM l = SCM_EOL;
- for (int i= 4; i -- ;)
+ for (int i = 4; i -- ;)
{
l = scm_cons (ly_offset2scm (b.control_[i]), l);
}
SCM scontrols[8];
- for (int i=4; i--;)
+ for (int i =4; i--;)
scontrols[ i ] = ly_offset2scm (back.control_[i]);
- for (int i=4 ; i--;)
+ for (int i =4 ; i--;)
scontrols[i+4] = ly_offset2scm (curve.control_[i]);
/*
*/
int indices[]= {5, 6, 7, 4, 1, 2, 3, 0};
SCM list = SCM_EOL;
- for (int i= 8; i--;)
+ for (int i = 8; i--;)
{
list = scm_cons (scontrols[indices[i]], list);
}
Lookup::accordion (SCM s, Real staff_space, Font_metric *fm)
{
Stencil m;
- String sym = ly_scm2string (ly_car (s));
- String reg = ly_scm2string (ly_car (ly_cdr (s)));
+ String sym = ly_scm2string (scm_car (s));
+ String reg = ly_scm2string (scm_car (scm_cdr (s)));
if (sym == "Discant")
{
- Stencil r = fm->find_by_name ("accordion-accDiscant");
+ Stencil r = fm->find_by_name ("accordion.accDiscant");
m.add_stencil (r);
if (reg.left_string (1) == "F")
{
- Stencil d = fm->find_by_name ("accordion-accDot");
+ Stencil d = fm->find_by_name ("accordion.accDot");
d.translate_axis (staff_space * 2.5 PT, Y_AXIS);
m.add_stencil (d);
reg = reg.right_string (reg.length ()-1);
}
if (eflag & 0x02)
{
- Stencil d = fm->find_by_name ("accordion-accDot");
+ Stencil d = fm->find_by_name ("accordion.accDot");
d.translate_axis (staff_space * 1.5 PT, Y_AXIS);
m.add_stencil (d);
}
if (eflag & 0x04)
{
- Stencil d = fm->find_by_name ("accordion-accDot");
+ Stencil 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_stencil (d);
}
if (eflag & 0x01)
{
- Stencil d = fm->find_by_name ("accordion-accDot");
+ Stencil 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_stencil (d);
}
if (reg.left_string (2) == "SS")
{
- Stencil d = fm->find_by_name ("accordion-accDot");
+ Stencil 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_stencil (d);
}
if (reg.left_string (1) == "S")
{
- Stencil d = fm->find_by_name ("accordion-accDot");
+ Stencil d = fm->find_by_name ("accordion.accDot");
d.translate_axis (0.5 * staff_space PT, Y_AXIS);
m.add_stencil (d);
reg = reg.right_string (reg.length ()-1);
}
else if (sym == "Freebase")
{
- Stencil r = fm->find_by_name ("accordion-accFreebase");
+ Stencil r = fm->find_by_name ("accordion.accFreebase");
m.add_stencil (r);
if (reg.left_string (1) == "F")
{
- Stencil d = fm->find_by_name ("accordion-accDot");
+ Stencil d = fm->find_by_name ("accordion.accDot");
d.translate_axis (staff_space * 1.5 PT, Y_AXIS);
m.add_stencil (d);
reg = reg.right_string (reg.length ()-1);
}
if (reg == "E")
{
- Stencil d = fm->find_by_name ("accordion-accDot");
+ Stencil d = fm->find_by_name ("accordion.accDot");
d.translate_axis (staff_space * 0.5 PT, Y_AXIS);
m.add_stencil (d);
}
}
else if (sym == "Bayanbase")
{
- Stencil r = fm->find_by_name ("accordion-accBayanbase");
+ Stencil r = fm->find_by_name ("accordion.accBayanbase");
m.add_stencil (r);
if (reg.left_string (1) == "T")
{
- Stencil d = fm->find_by_name ("accordion-accDot");
+ Stencil d = fm->find_by_name ("accordion.accDot");
d.translate_axis (staff_space * 2.5 PT, Y_AXIS);
m.add_stencil (d);
reg = reg.right_string (reg.length ()-1);
/* include 4' reed just for completeness. You don't want to use this. */
if (reg.left_string (1) == "F")
{
- Stencil d = fm->find_by_name ("accordion-accDot");
+ Stencil d = fm->find_by_name ("accordion.accDot");
d.translate_axis (staff_space * 1.5 PT, Y_AXIS);
m.add_stencil (d);
reg = reg.right_string (reg.length ()-1);
}
if (reg.left_string (2) == "EE")
{
- Stencil d = fm->find_by_name ("accordion-accDot");
+ Stencil 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_stencil (d);
}
if (reg.left_string (1) == "E")
{
- Stencil d = fm->find_by_name ("accordion-accDot");
+ Stencil d = fm->find_by_name ("accordion.accDot");
d.translate_axis (staff_space * 0.5 PT, Y_AXIS);
m.add_stencil (d);
reg = reg.right_string (reg.length ()-1);
}
else if (sym == "Stdbase")
{
- Stencil r = fm->find_by_name ("accordion-accStdbase");
+ Stencil r = fm->find_by_name ("accordion.accStdbase");
m.add_stencil (r);
if (reg.left_string (1) == "T")
{
- Stencil d = fm->find_by_name ("accordion-accDot");
+ Stencil d = fm->find_by_name ("accordion.accDot");
d.translate_axis (staff_space * 3.5 PT, Y_AXIS);
m.add_stencil (d);
reg = reg.right_string (reg.length ()-1);
}
if (reg.left_string (1) == "F")
{
- Stencil d = fm->find_by_name ("accordion-accDot");
+ Stencil d = fm->find_by_name ("accordion.accDot");
d.translate_axis (staff_space * 2.5 PT, Y_AXIS);
m.add_stencil (d);
reg = reg.right_string (reg.length ()-1);
}
if (reg.left_string (1) == "M")
{
- Stencil d = fm->find_by_name ("accordion-accDot");
+ Stencil 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_stencil (d);
}
if (reg.left_string (1) == "E")
{
- Stencil d = fm->find_by_name ("accordion-accDot");
+ Stencil d = fm->find_by_name ("accordion.accDot");
d.translate_axis (staff_space * 1.5 PT, Y_AXIS);
m.add_stencil (d);
reg = reg.right_string (reg.length ()-1);
}
if (reg.left_string (1) == "S")
{
- Stencil d = fm->find_by_name ("accordion-accDot");
+ Stencil d = fm->find_by_name ("accordion.accDot");
d.translate_axis (staff_space * 0.5 PT, Y_AXIS);
m.add_stencil (d);
reg = reg.right_string (reg.length ()-1);
for the rectangle */
else if (sym == "SB")
{
- Stencil r = fm->find_by_name ("accordion-accSB");
+ Stencil r = fm->find_by_name ("accordion.accSB");
m.add_stencil (r);
}
else if (sym == "BB")
{
- Stencil r = fm->find_by_name ("accordion-accBB");
+ Stencil r = fm->find_by_name ("accordion.accBB");
m.add_stencil (r);
}
else if (sym == "OldEE")
{
- Stencil r = fm->find_by_name ("accordion-accOldEE");
+ Stencil r = fm->find_by_name ("accordion.accOldEE");
m.add_stencil (r);
}
else if (sym == "OldEES")
{
- Stencil r = fm->find_by_name ("accordion-accOldEES");
+ Stencil r = fm->find_by_name ("accordion.accOldEES");
m.add_stencil (r);
}
return m;
SCM sl = scm_make_real (s);
SCM thick = scm_make_real (t);
SCM slashnodot = scm_list_n (ly_symbol2scm ("repeat-slash"),
- wid, sl, thick, SCM_UNDEFINED);
+ wid, sl, thick, SCM_UNDEFINED);
Box b (Interval (0, w + sqrt (sqr (t/s) + sqr (t))),
Interval (0, w * s));
b[a] = iv;
b[other] = Interval (-1, 1) * thick * 0.5;
- Stencil m = round_filled_box (b, blot);
+ Stencil m = round_filled_box (b, blot);
b[a] = Interval (iv[UP] - thick, iv[UP]);
- Interval oi = Interval (-thick/2, thick/2 + fabs (protude)) ;
- oi *= sign (protude);
+ Interval oi = Interval (-thick/2, thick/2 + fabs (protude));
+ oi *= sign (protude);
b[other] = oi;
m.add_stencil (round_filled_box (b, blot));
- b[a] = Interval (iv[DOWN], iv[DOWN] +thick);
+ b[a] = Interval (iv[DOWN], iv[DOWN] + thick);
m.add_stencil (round_filled_box (b,blot));
return m;
Lookup::triangle (Interval iv, Real thick, Real protude)
{
Box b ;
- b[X_AXIS] = iv;
+ b[X_AXIS] = Interval (0, iv.length());
b[Y_AXIS] = Interval (0 <? protude , 0 >? protude);
- SCM s = scm_list_n (ly_symbol2scm ("symmetric-x-triangle"),
- scm_make_real (thick),
- scm_make_real (iv.length ()),
- scm_make_real (protude), SCM_UNDEFINED);
-
- return Stencil (b, s);
-}
-
-
-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}.")
-{
- SCM_ASSERT_TYPE (is_axis (a), a, SCM_ARG1, __FUNCTION__, "axis") ;
- SCM_ASSERT_TYPE (is_number_pair (iv), iv, SCM_ARG2, __FUNCTION__, "number pair") ;
- SCM_ASSERT_TYPE (scm_is_number (t), a, SCM_ARG3, __FUNCTION__, "number") ;
- SCM_ASSERT_TYPE (scm_is_number (p), a, SCM_ARG4, __FUNCTION__, "number") ;
-
-
- return Lookup::bracket ((Axis)scm_to_int (a), ly_scm2interval (iv),
- scm_to_double (t),
- scm_to_double (p),
- 0.95 * scm_to_double (t)).smobbed_copy ();
-}
+ Offset z1(iv[LEFT], 0);
+ Offset z2(iv[RIGHT], 0);
+ Offset z3((z1 + z2)[X_AXIS]/2, protude);
+ /*
+ TODO: move Triangle to Line_interface ?
+ */
+ Stencil tri = Line_interface::make_line (thick, z1, z2);
+ tri.add_stencil (Line_interface::make_line (thick, z2, z3));
+ tri.add_stencil (Line_interface::make_line (thick, z3, z1));
-LY_DEFINE (ly_filled_box ,"ly:round-filled-box",
- 3, 0, 0,
- (SCM xext, SCM yext, SCM blot),
- "Make a @code{Stencil} "
- "that prints a black box of dimensions @var{xext}, "
- "@var{yext} and roundness @var{blot}."
- )
-{
- SCM_ASSERT_TYPE (is_number_pair (xext), xext, SCM_ARG1, __FUNCTION__, "number pair") ;
- SCM_ASSERT_TYPE (is_number_pair (yext), yext, SCM_ARG2, __FUNCTION__, "number pair") ;
- SCM_ASSERT_TYPE (scm_is_number (blot), blot, SCM_ARG3, __FUNCTION__, "number") ;
-
- return Lookup::round_filled_box (Box (ly_scm2interval (xext), ly_scm2interval (yext)),
- scm_to_double (blot)).smobbed_copy ();
+ return tri;
}
projects / lilypond.git / blobdiff