/*
accidental.cc -- implement Accidental_interface
- (c) 2001--2004 Han-Wen Nienhuys
+ source file of the GNU LilyPond music typesetter
- */
+ (c) 2001--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
+
#include "font-interface.hh"
#include "item.hh"
#include "stencil.hh"
#include "accidental-interface.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
#include "pitch.hh"
/*
+
TODO: insert support for smaller cautionaries, tie-break-reminders.
Either here or in new-accidental-engraver.
accidental-placement.cc
*/
-
-
Stencil
parenthesize (Grob*me, Stencil m)
{
- Stencil open = Font_interface::get_default_font (me)->find_by_name (String ("accidentals-leftparen"));
- Stencil close = Font_interface::get_default_font (me)->find_by_name (String ("accidentals-rightparen"));
- m.add_at_edge (X_AXIS, LEFT, Stencil (open), 0,0);
- m.add_at_edge (X_AXIS, RIGHT, Stencil (close), 0,0);
+ Stencil open = Font_interface::get_default_font (me)->find_by_name ("accidentals.leftparen");
+ Stencil close = Font_interface::get_default_font (me)->find_by_name ("accidentals.rightparen");
+
+ m.add_at_edge (X_AXIS, LEFT, Stencil (open), 0, 0);
+ m.add_at_edge (X_AXIS, RIGHT, Stencil (close), 0, 0);
return m;
}
-MAKE_SCHEME_CALLBACK (Accidental_interface,after_line_breaking,1);
+MAKE_SCHEME_CALLBACK (Accidental_interface, after_line_breaking, 1);
SCM
Accidental_interface::after_line_breaking (SCM smob)
{
Grob *me = unsmob_grob (smob);
- Grob *tie = unsmob_grob (me->get_grob_property ("tie"));
+ Grob *tie = unsmob_grob (me->get_property ("tie"));
if (tie && !tie->original_)
{
}
Array<Box>
-Accidental_interface::accurate_boxes (Grob *a,Grob**common)
+Accidental_interface::accurate_boxes (Grob *a, Grob**common)
{
Box b;
b[X_AXIS] = a->extent (a, X_AXIS);
Array<Box> boxes;
bool parens = false;
- if (to_boolean (a->get_grob_property ("cautionary")))
+ if (to_boolean (a->get_property ("cautionary")))
{
- SCM cstyle = a->get_grob_property ("cautionary-style");
- parens = gh_equal_p (cstyle, ly_symbol2scm ("parentheses"));
-
+ SCM cstyle = a->get_property ("cautionary-style");
+ parens = ly_c_equal_p (cstyle, ly_symbol2scm ("parentheses"));
}
- SCM accs = a->get_grob_property ("accidentals");
- SCM scm_style = a->get_grob_property ("style");
- if (!gh_symbol_p (scm_style)
+ SCM accs = a->get_property ("accidentals");
+ SCM scm_style = a->get_property ("style");
+ if (!scm_is_symbol (scm_style)
&& !parens
&& scm_ilength (accs) == 1)
{
- if (gh_scm2int (gh_car (accs)) == FLAT)
+ if (scm_to_int (scm_car (accs)) == FLAT)
{
Box stem = b;
Box bulb = b;
really close.
*/
stem[X_AXIS][RIGHT] *= .5;
+
+ /*
+ To prevent vertical alignment for 6ths
+ */
+ stem[Y_AXIS] *= 1.1;
bulb[Y_AXIS][UP] *= .35;
boxes.push (bulb);
*/
}
- if (!boxes.size())
+ if (!boxes.size ())
boxes.push (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 (int i = boxes.size (); i--;)
{
- boxes[i].translate(o);
+ boxes[i].translate (o);
}
return boxes;
case SHARP: return "mensural1";
}
- if (style == "neo_mensural")
+ if (style == "neomensural")
style = ""; // currently same as default
if (style == "default")
style = "";
return style + to_string (alteration);
}
-MAKE_SCHEME_CALLBACK (Accidental_interface,print,1);
+MAKE_SCHEME_CALLBACK (Accidental_interface, print, 1);
SCM
Accidental_interface::print (SCM smob)
{
bool smaller = false;
bool parens = false;
- bool caut = to_boolean (me->get_grob_property ("cautionary"));
+ bool caut = to_boolean (me->get_property ("cautionary"));
if (caut)
{
- SCM cstyle = me->get_grob_property ("cautionary-style");
- parens = gh_equal_p (cstyle, ly_symbol2scm ("parentheses"));
- smaller = gh_equal_p (cstyle, ly_symbol2scm ("smaller"));
+ SCM cstyle = me->get_property ("cautionary-style");
+ parens = ly_c_equal_p (cstyle, ly_symbol2scm ("parentheses"));
+ smaller = ly_c_equal_p (cstyle, ly_symbol2scm ("smaller"));
}
- SCM scm_style = me->get_grob_property ("style");
+ SCM scm_style = me->get_property ("style");
String style;
- if (gh_symbol_p (scm_style))
+ if (scm_is_symbol (scm_style))
{
style = ly_symbol2string (scm_style);
}
Font_metric *fm = 0;
if (smaller)
{
- SCM ac = Font_interface::font_alist_chain (me);
- ac = gh_cons (gh_cons (gh_cons
- (ly_symbol2scm ("font-size"),
- scm_int2num (-2)), SCM_EOL),
- ac);
- fm = select_font (me->get_paper (), ac);
+ SCM ac = Font_interface::music_font_alist_chain (me);
+ /*
+ TODO: should calc font-size by adding -2 to current font-size
+ */
+ ac = scm_cons (scm_list_1 (scm_cons
+ (ly_symbol2scm ("font-size"),
+ scm_int2num (-2))),
+ ac);
+ fm = select_font (me->get_layout (), ac);
}
else
fm = Font_interface::get_default_font (me);
Stencil mol;
- for (SCM s = me->get_grob_property ("accidentals");
- gh_pair_p (s); s = gh_cdr (s))
+ for (SCM s = me->get_property ("accidentals");
+ scm_is_pair (s); s = scm_cdr (s))
{
- int alteration = gh_scm2int (gh_car (s));
+ int alteration = scm_to_int (scm_car (s));
String font_char = get_fontcharname (style, alteration);
- Stencil acc (fm->find_by_name ("accidentals-" + font_char));
+ Stencil acc (fm->find_by_name ("accidentals." + font_char));
if (acc.is_empty ())
{
}
else
{
- mol.add_at_edge (X_AXIS, RIGHT, acc, 0.1,0);
+ mol.add_at_edge (X_AXIS, RIGHT, acc, 0.1, 0);
}
}
if (parens)
mol = parenthesize (me, mol);
- return mol.smobbed_copy();
+ return mol.smobbed_copy ();
}
-
+/*
+ TODO: should move inside-slur into item?
+
+ */
ADD_INTERFACE (Accidental_interface, "accidental-interface",
"a single accidental",
- "cautionary cautionary-style style tie accidentals");
+ "inside-slur cautionary cautionary-style style tie accidentals");