source file of the GNU LilyPond music typesetter
- (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
keyplacement by Mats Bengtsson
*/
#include "item.hh"
-#include "molecule.hh"
-#include "paper-def.hh"
+#include "stencil.hh"
+#include "output-def.hh"
#include "font-interface.hh"
#include "staff-symbol-referencer.hh"
#include "lookup.hh"
struct Key_signature_interface
{
- DECLARE_SCHEME_CALLBACK (brew_molecule, (SCM ));
+ DECLARE_SCHEME_CALLBACK (print, (SCM ));
static bool has_interface (Grob*);
};
the thinking to other parties.
- TODO: put this in Scheme
-
- - lots of values trivially shared (key doesn't change very
- often). Compute those once, and use that as cache for the rest.
+
+ TODO: can we do without c0pos? it's partly musical.
*/
int
alteration_pos (SCM what, int alter, int c0p)
{
- if (gh_pair_p (what))
- return gh_scm2int (ly_car (what)) * 7 + gh_scm2int (ly_cdr (what)) + c0p;
+ if (ly_c_pair_p (what))
+ return ly_scm2int (ly_car (what)) * 7 + ly_scm2int (ly_cdr (what)) + c0p;
- int p = gh_scm2int (what);
+ int p = ly_scm2int (what);
// Find the c in the range -4 through 2
int from_bottom_pos = c0p + 4;
{
p -= 7; /* Typeset below c_position */
}
+
/* Provide for the four cases in which there's a glitch
it's a hack, but probably not worth
the effort of finding a nicer solution.
TODO
- space the `natural' signs wider
*/
-MAKE_SCHEME_CALLBACK (Key_signature_interface,brew_molecule,1);
+MAKE_SCHEME_CALLBACK (Key_signature_interface,print,1);
SCM
-Key_signature_interface::brew_molecule (SCM smob)
+Key_signature_interface::print (SCM smob)
{
Grob*me =unsmob_grob (smob);
Real inter = Staff_symbol_referencer::staff_space (me)/2.0;
- SCM scm_style = me->get_grob_property ("style");
+ SCM scm_style = me->get_property ("style");
String style;
- if (gh_symbol_p (scm_style))
+ if (ly_c_symbol_p (scm_style))
{
style = ly_symbol2string (scm_style);
}
style = "";
}
- SCM newas = me->get_grob_property ("new-accidentals");
- Molecule mol;
+ SCM newas = me->get_property ("new-accidentals");
+ Stencil mol;
- SCM c0s = me->get_grob_property ("c0-position");
+ SCM c0s = me->get_property ("c0-position");
int c0p = 0;
- if (gh_number_p (c0s))
- c0p = gh_scm2int (c0s);
+ if (ly_c_number_p (c0s))
+ c0p = ly_scm2int (c0s);
/*
SCM lists are stacks, so we work from right to left, ending with
*/
Font_metric *fm = Font_interface::get_default_font (me);
- for (SCM s = newas; gh_pair_p (s); s = ly_cdr (s))
+ for (SCM s = newas; ly_c_pair_p (s); s = ly_cdr (s))
{
- int alteration = gh_scm2int (ly_cdar (s));
+ int alteration = ly_scm2int (ly_cdar (s));
String font_char =
Accidental_interface::get_fontcharname (style, alteration);
- Molecule acc (fm->find_by_name ("accidentals-" + font_char));
+ Stencil acc (fm->find_by_name ("accidentals-" + font_char));
- if (acc.empty_b())
+ if (acc.is_empty ())
{
me->warning (_f ("accidental `%s' not found", font_char));
}
SCM what = ly_caar (s);
int pos = alteration_pos (what, alteration, c0p);
acc.translate_axis (pos * inter, Y_AXIS);
- mol.add_at_edge (X_AXIS, LEFT, acc, 0);
+ mol.add_at_edge (X_AXIS, LEFT, acc, 0, 0);
}
}
Item *it = dynamic_cast<Item*> (me) ;
if (it->break_status_dir () != RIGHT)
{
- SCM old = me->get_grob_property ("old-accidentals");
+ SCM old = me->get_property ("old-accidentals");
/*
Add half a space between cancellation and key sig.
Interval x (0, inter);
Interval y (0,0);
- mol.add_at_edge (X_AXIS, LEFT, Lookup::blank (Box (x,y)),0);
+ mol.add_at_edge (X_AXIS, LEFT, Lookup::blank (Box (x,y)), 0, 0);
- Molecule natural;
- if (gh_pair_p (old))
+ Stencil natural;
+ if (ly_c_pair_p (old))
natural=Font_interface::get_default_font (me)->
find_by_name (String ("accidentals-") + style + String ("0"));
- for (; gh_pair_p (old); old = ly_cdr (old))
+ for (; ly_c_pair_p (old); old = ly_cdr (old))
{
SCM found = scm_assoc (ly_caar (old), newas);
if (found == SCM_BOOL_F
int alteration = 0;
int pos = alteration_pos (what, alteration, c0p);
- Molecule m = natural;
+ Stencil m = natural;
m.translate_axis (pos* inter, Y_AXIS);
/*
needed to prevent collisions.
*/
Real padding = 0.1 ;
- mol.add_at_edge (X_AXIS, LEFT, m, padding);
+ mol.add_at_edge (X_AXIS, LEFT, m, padding, 0);
}
}
}
ADD_INTERFACE (Key_signature_interface, "key-signature-interface",
"A group of accidentals, to be printed as signature sign.",
- "c0-position old-accidentals new-accidentals");
+ "style c0-position old-accidentals new-accidentals");