/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2001--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 2001--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Stencil
parenthesize (Grob *me, Stencil m)
{
- Font_metric * font
- = Font_interface::get_default_font (me);
+ Font_metric *font
+ = Font_interface::get_default_font (me);
Stencil open
= font->find_by_name ("accidentals.leftparen");
Stencil close
SCM
Accidental_interface::pure_height (SCM smob, SCM start_scm, SCM)
{
- Item *me = dynamic_cast<Item*> (unsmob_grob (smob));
+ Item *me = dynamic_cast<Item *> (unsmob_grob (smob));
int start = scm_to_int (start_scm);
int rank = me->get_column ()->get_rank ();
if (to_boolean (me->get_property ("forced"))
|| !unsmob_grob (me->get_object ("tie"))
|| (rank == start + 1 && /* we are at the start of a line */
- !to_boolean (me->get_property ("hide-tied-accidental-after-break"))))
+ !to_boolean (me->get_property ("hide-tied-accidental-after-break"))))
{
Stencil *s = unsmob_stencil (get_stencil (me));
if (s)
- return ly_interval2scm (s->extent (Y_AXIS));
+ return ly_interval2scm (s->extent (Y_AXIS));
}
return ly_interval2scm (Interval ());
SCM alist = me->get_property ("glyph-name-alist");
SCM alt = me->get_property ("alteration");
string glyph_name = robust_scm2string (ly_assoc_get (alt, alist, SCM_BOOL_F),
- "");
-
+ "");
+
if (glyph_name == "accidentals.flat"
- || glyph_name == "accidentals.mirroredflat")
- {
- Box stem = b;
- Box bulb = b;
-
- /*
- we could make the stem thinner, but that places the flats
- really close.
- */
- Direction bulb_dir =
- glyph_name == "accidentals.mirroredflat" ? LEFT : RIGHT;
- stem[X_AXIS][bulb_dir] = stem[X_AXIS].center ();
-
- /*
- To prevent vertical alignment for 6ths
- */
- stem[Y_AXIS] *= 1.1;
- bulb[Y_AXIS][UP] *= .35;
-
- boxes.push_back (bulb);
- boxes.push_back (stem);
- }
- else if (glyph_name == "accidentals.natural")
- {
- Box lstem = b;
- Box rstem = b;
- Box belly = b;
-
- lstem[Y_AXIS] *= 1.1;
- rstem[Y_AXIS] *= 1.1;
-
- belly[Y_AXIS] *= 0.75;
- lstem[X_AXIS][RIGHT] *= .33;
- 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_back (belly);
- boxes.push_back (lstem);
- boxes.push_back (rstem);
- }
+ || glyph_name == "accidentals.mirroredflat")
+ {
+ Box stem = b;
+ Box bulb = b;
+
+ /*
+ we could make the stem thinner, but that places the flats
+ really close.
+ */
+ Direction bulb_dir
+ = glyph_name == "accidentals.mirroredflat" ? LEFT : RIGHT;
+ stem[X_AXIS][bulb_dir] = stem[X_AXIS].center ();
+
+ /*
+ To prevent vertical alignment for 6ths
+ */
+ stem[Y_AXIS] *= 1.1;
+ bulb[Y_AXIS][UP] *= .35;
+
+ boxes.push_back (bulb);
+ boxes.push_back (stem);
+ }
+ else if (glyph_name == "accidentals.natural")
+ {
+ Box lstem = b;
+ Box rstem = b;
+ Box belly = b;
+
+ lstem[Y_AXIS] *= 1.1;
+ rstem[Y_AXIS] *= 1.1;
+
+ belly[Y_AXIS] *= 0.75;
+ lstem[X_AXIS][RIGHT] *= .33;
+ 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_back (belly);
+ boxes.push_back (lstem);
+ boxes.push_back (rstem);
+ }
/*
- TODO: add support for, double flat.
+ TODO: add support for, double flat.
*/
}
boxes.push_back (b);
Offset o (me->relative_coordinate (common[X_AXIS], X_AXIS),
- me->relative_coordinate (common[Y_AXIS], Y_AXIS));
+ me->relative_coordinate (common[Y_AXIS], Y_AXIS));
for (vsize i = boxes.size (); i--;)
boxes[i].translate (o);
Grob *me = unsmob_grob (smob);
Grob *tie = unsmob_grob (me->get_object ("tie"));
- if (tie &&
- (to_boolean (me->get_property ("hide-tied-accidental-after-break"))
- || (!tie->original () && !to_boolean (me->get_property ("forced")))))
+ if (tie
+ && (to_boolean (me->get_property ("hide-tied-accidental-after-break"))
+ || (!tie->original () && !to_boolean (me->get_property ("forced")))))
{
me->suicide ();
return SCM_EOL;
SCM alist = me->get_property ("glyph-name-alist");
SCM alt = me->get_property ("alteration");
SCM glyph_name = ly_assoc_get (alt, alist, SCM_BOOL_F);
-
+
if (!scm_is_string (glyph_name))
{
me->warning (_f ("Could not find glyph-name for alteration %s",
- ly_scm_write_string (alt).c_str ()));
+ ly_scm_write_string (alt).c_str ()));
return SCM_EOL;
}
-
+
Stencil mol (fm->find_by_name (ly_scm2string (glyph_name)));
if (to_boolean (me->get_property ("restore-first")))
{
/*
- this isn't correct for ancient accidentals, but they don't
- use double flats/sharps anyway.
- */
+ this isn't correct for ancient accidentals, but they don't
+ use double flats/sharps anyway.
+ */
Stencil acc (fm->find_by_name ("accidentals.natural"));
if (acc.is_empty ())
- me->warning (_ ("natural alteration glyph not found"));
+ me->warning (_ ("natural alteration glyph not found"));
else
- mol.add_at_edge (X_AXIS, LEFT, acc, 0.1);
+ mol.add_at_edge (X_AXIS, LEFT, acc, 0.1);
}
-
+
if (to_boolean (me->get_property ("parenthesized")))
mol = parenthesize (me, mol);
return mol.smobbed_copy ();
}
-
ADD_INTERFACE (Accidental_interface,
- "A single accidental.",
-
- /* properties */
- "alteration "
- "avoid-slur "
- "forced "
- "glyph-name-alist "
- "hide-tied-accidental-after-break "
- "parenthesized "
- "restore-first "
- "tie "
- );
+ "A single accidental.",
+
+ /* properties */
+ "alteration "
+ "avoid-slur "
+ "forced "
+ "glyph-name-alist "
+ "hide-tied-accidental-after-break "
+ "parenthesized "
+ "restore-first "
+ "tie "
+ );
projects / lilypond.git / blobdiff