#define dprintf(args...)
#endif
+#ifndef PANGO_FC_AFM_DECODER_TEST
+#define PUA_OFFSET 0xe00
+#else
+#define PUA_OFFSET 0
+#endif
+
struct _PangoFcAfmDecoderPrivate
{
GString encoding[256];
- //GString file_name;
char const *file_name;
PangoFcFont *fc_font;
};
static PangoFcDecoderClass *parent_class;
-#if 0
-/* ugly warning */
G_DEFINE_TYPE (PangoFcAfmDecoder, pango_fc_afm_decoder, PANGO_TYPE_FC_DECODER);
-#else
-GType
-pango_fc_afm_decoder_get_type (void)
-{
- static GType object_type = 0;
-
- if (!object_type)
- {
- static const GTypeInfo object_info =
- {
- sizeof (PangoFcAfmDecoderClass),
- (GBaseInitFunc) 0,
- (GBaseFinalizeFunc) 0,
- (GClassInitFunc) pango_fc_afm_decoder_class_init,
- 0, /* class_finalize */
- 0, /* class_data */
- sizeof (PangoFcAfmDecoder),
- 0, /* n_preallocs */
- (GInstanceInitFunc) pango_fc_afm_decoder_init,
- 0, /* value table */
- };
-
- object_type = g_type_register_static (PANGO_TYPE_FC_DECODER,
- "PangoFcAfmDecoder",
- &object_info, (GTypeFlags)0);
- }
-
- return object_type;
-}
-#endif
static void
pango_fc_afm_decoder_init (PangoFcAfmDecoder *fcafmdecoder)
= G_TYPE_INSTANCE_GET_PRIVATE (fcafmdecoder,
PANGO_TYPE_FC_AFM_DECODER,
PangoFcAfmDecoderPrivate);
- /*
- init members
- */
}
static void
static void
pango_fc_afm_decoder_finalize (GObject *object)
{
-#if 0
- PangoFcAfmDecoder *fcafmdecoder = PANGO_FC_AFM_DECODER (object);
- PangoFcAfmDecoderPrivate *priv = fcafmdecoder->priv;
-#endif
-
- /*
- destroy members
- */
G_OBJECT_CLASS (parent_class)->finalize (object);
}
pango_fc_afm_get_charset (PangoFcDecoder *decoder, PangoFcFont *fcfont)
{
(void) decoder;
- //dprintf ("get charset: %s\n", fcfont->font_pattern);
dprintf ("get charset: \n");
#if 0
FcCharSet *charset = 0;
FcPatternGetCharSet (fcfont->font_pattern, FC_CHARSET, 0, &charset);
#else
/* Return plain, undecoded charset.
- TODO:
- - actually read AFM?
- - caching?
- - PUA mapping ? */
+ FIXME:
+ - actually read AFM
+ - caching */
(void) fcfont;
int i;
FcChar32 chr = 0;
dprintf ("get glyph! 0x%x --> 0x%x\n", wc, (unsigned)g);
#else
(void) fcfont;
- /* TODO:
- - PUA mapping?
-
- Shortcut PUA mapping/AFM reading: The Feta charsets are encoded
- without any gaps, starting at 0x21. *grin*
-
- FIXME: +1 what has changed? -- jcn
- */
- return wc - 0x21 + 1;
+ /* FIXME
+ Use direct privat usage area (PUA) mapping as shortcut for
+ actual AFM reading. The Feta charsets are encoded without any
+ gaps, and mappend onto PUA. */
+ return wc - PUA_OFFSET;
#endif
}
int text_item = gnome_canvas_text_get_type ();
GnomeCanvasGroup *root = gnome_canvas_root (canvas);
- char const *g_clef_utf8 = "\302\220";
+ char const *g_clef_utf8 = "p";
gnome_canvas_text (45.0, 122.5, "LilyPond-feta-nummer 16", "3");
gnome_canvas_text (45.0, 142.5, "LilyPond-feta-nummer, r 16", "4");