return SCM_UNSPECIFIED;
}
-Array<Box>
+vector<Box>
Accidental_interface::accurate_boxes (Grob *a, Grob **common)
{
Box b;
b[X_AXIS] = a->extent (a, X_AXIS);
b[Y_AXIS] = a->extent (a, Y_AXIS);
- Array<Box> boxes;
+ vector<Box> boxes;
bool parens = false;
if (to_boolean (a->get_property ("cautionary")))
stem[Y_AXIS] *= 1.1;
bulb[Y_AXIS][UP] *= .35;
- boxes.push (bulb);
- boxes.push (stem);
+ boxes.push_back (bulb);
+ boxes.push_back (stem);
}
break;
case NATURAL:
rstem[X_AXIS][LEFT] = rstem[X_AXIS].linear_combination (1.0 / 3.0);
lstem[Y_AXIS][DOWN] = belly[Y_AXIS][DOWN];
rstem[Y_AXIS][UP] = belly[Y_AXIS][UP];
- boxes.push (belly);
- boxes.push (lstem);
- boxes.push (rstem);
+ boxes.push_back (belly);
+ boxes.push_back (lstem);
+ boxes.push_back (rstem);
}
break;
/*
}
if (!boxes.size ())
- boxes.push (b);
+ boxes.push_back (b);
Offset o (a->relative_coordinate (common[X_AXIS], X_AXIS),
a->relative_coordinate (common[Y_AXIS], Y_AXIS));
- for (int i = boxes.size (); i--;)
+ for (vsize i = boxes.size (); i--;)
boxes[i].translate (o);
return boxes;
/*
todo: this sort of stuff in Scheme. --hwn.
*/
-std::string
-Accidental_interface::get_fontcharname (std::string style, int alteration)
+string
+Accidental_interface::get_fontcharname (string style, int alteration)
{
if (alteration == DOUBLE_FLAT
|| alteration == DOUBLE_SHARP)
}
SCM scm_style = me->get_property ("style");
- std::string style;
+ string style;
if (scm_is_symbol (scm_style))
style = ly_symbol2string (scm_style);
else
scm_is_pair (s); s = scm_cdr (s))
{
int alteration = scm_to_int (scm_car (s));
- std::string font_char = get_fontcharname (style, alteration);
+ string font_char = get_fontcharname (style, alteration);
Stencil acc (fm->find_by_name ("accidentals." + font_char));
if (acc.is_empty ())