source file of the GNU LilyPond music typesetter
- (c) 1996--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
keyplacement by Mats Bengtsson
*/
+#include "accidental-interface.hh"
+#include "font-interface.hh"
+#include "international.hh"
#include "item.hh"
+#include "lookup.hh"
#include "output-def.hh"
-#include "font-interface.hh"
#include "staff-symbol-referencer.hh"
-#include "lookup.hh"
-#include "accidental-interface.hh"
struct Key_signature_interface
{
DECLARE_SCHEME_CALLBACK (print, (SCM));
- static bool has_interface (Grob *);
+ DECLARE_GROB_INTERFACE();
};
/*
/*
TODO: look this up. I'm not sure where the naturals ought to go.
+
+ COMMENT: Current implementation does not use the NATURAL_TOP_PITCH for anything,
+ always typesets naturals in the same place as the thing they cancel. -rz
*/
const int NATURAL_TOP_PITCH = 4;
Real inter = Staff_symbol_referencer::staff_space (me) / 2.0;
SCM scm_style = me->get_property ("style");
- String style;
+ string style;
if (scm_is_symbol (scm_style))
style = ly_symbol2string (scm_style);
else
if (scm_is_number (c0s))
c0p = scm_to_int (c0s);
+ bool is_cancellation = me->internal_has_interface
+ (ly_symbol2scm ("key-cancellation-interface"));
+
/*
SCM lists are stacks, so we work from right to left, ending with
the cancellation signature.
for (SCM s = newas; scm_is_pair (s); s = scm_cdr (s))
{
int alteration = scm_to_int (scm_cdar (s));
- String font_char
- = Accidental_interface::get_fontcharname (style, alteration);
+ string font_char
+ = Accidental_interface::get_fontcharname (style,
+ is_cancellation
+ ? 0
+ : alteration);
Stencil acc (fm->find_by_name ("accidentals." + font_char));
if (acc.is_empty ())
needed to prevent collisions.
*/
Real padding = 0.0;
- if (alteration == 0
+ if (is_cancellation
&& last_pos < pos + 2
&& last_pos > pos - 6)
padding = 0.3;
return mol.smobbed_copy ();
}
-ADD_INTERFACE (Key_signature_interface, "key-signature-interface",
+ADD_INTERFACE (Key_signature_interface,
"A group of accidentals, to be printed as signature sign.",
- "style c0-position alteration-alist");
+
+ "c0-position "
+ "style "
+ "alteration-alist "
+ );