Rename LPE: mirror reflect --> mirror symmetry

[inkscape.git] / src / display / nr-svgfonts.h

diff --git a/src/display/nr-svgfonts.h b/src/display/nr-svgfonts.h
index 3873d2324ac814379a3dd68aa6e0ff88f7f9365b..58840e414e729711d7256146837a9a339bdcc9c2 100644 (file)
--- a/src/display/nr-svgfonts.h
+++ b/src/display/nr-svgfonts.h
@@ -1,7 +1,6 @@
 #include "config.h"
-#ifdef ENABLE_SVG_FONTS
-#ifndef __SVGFONTS_H__
-#define __SVGFONTS_H__
+#ifndef NR_SVGFONTS_H_SEEN
+#define NR_SVGFONTS_H_SEEN
 /*
  * SVGFonts rendering headear
  *
@@ -14,7 +13,6 @@
  * Read the file 'COPYING' for more information.
  */
 
-#include "../sp-font.h"
 #include "cairo.h"
 #include <gtkmm.h>
 
@@ -26,8 +24,10 @@
 #include "../sp-glyph.h"
 #include "../sp-missing-glyph.h"
 #include "../sp-font.h"
+#include "../sp-glyph-kerning.h"
 
 class SvgFont;
+struct SPFont;
 
 class UserFont{
 public:
@@ -40,7 +40,7 @@ public:
 SvgFont(SPFont* spfont);
 cairo_font_face_t* get_font_face();
 cairo_status_t scaled_font_init (cairo_scaled_font_t *scaled_font, cairo_font_extents_t *metrics);
-cairo_status_t scaled_font_unicode_to_glyph (cairo_scaled_font_t *scaled_font, unsigned long unicode, unsigned long *glyph);
+cairo_status_t scaled_font_text_to_glyphs (cairo_scaled_font_t *scaled_font, const char *utf8, cairo_glyph_t **glyphs, int *num_glyphs);
 cairo_status_t scaled_font_render_glyph (cairo_scaled_font_t *scaled_font, unsigned long glyph, cairo_t *cr, cairo_text_extents_t *metrics);
 
 private:
@@ -52,6 +52,4 @@ SPMissingGlyph* missingglyph;
 bool drawing_expose_cb (Gtk::Widget *widget, GdkEventExpose *event, gpointer data);
 };
 
-#endif //#ifndef __SVGFONTS_H__
-#endif //#ifdef ENABLE_SVG_FONTS
-
+#endif //#ifndef NR_SVGFONTS_H_SEEN