Rename LPE: mirror reflect --> mirror symmetry

[inkscape.git] / src / display / nr-arena-glyphs.cpp

diff --git a/src/display/nr-arena-glyphs.cpp b/src/display/nr-arena-glyphs.cpp
index 9456e8a7e635d57c193bd130618dc1dd2ddc2d41..9295beccdf63ae539666dd91a278f7cade6ddaf3 100644 (file)
--- a/src/display/nr-arena-glyphs.cpp
+++ b/src/display/nr-arena-glyphs.cpp
@@ -21,6 +21,8 @@
 #include <libnr/n-art-bpath.h>
 #include <libnr/nr-matrix-ops.h>
 #include <libnr/nr-matrix-fns.h>
+#include <libnr/nr-convert2geom.h>
+#include <2geom/matrix.h>
 #include "../style.h"
 #include "nr-arena.h"
 #include "nr-arena-glyphs.h"
@@ -37,6 +39,10 @@
 void nr_pixblock_render_shape_mask_or(NRPixBlock &m, Shape *theS);
 #endif
 
+#ifdef ENABLE_SVG_FONTS
+#include "nr-svgfonts.h"
+#endif //#ifdef ENABLE_SVG_FONTS
+
 static void nr_arena_glyphs_class_init(NRArenaGlyphsClass *klass);
 static void nr_arena_glyphs_init(NRArenaGlyphs *glyphs);
 static void nr_arena_glyphs_finalize(NRObject *object);
@@ -444,7 +450,7 @@ nr_arena_glyphs_group_render(cairo_t *ct, NRArenaItem *item, NRRectL *area, NRPi
 
     guint ret = item->state;
 
-    if (item->arena->rendermode == RENDERMODE_OUTLINE) {
+    if (item->arena->rendermode == Inkscape::RENDERMODE_OUTLINE) {
 
         if (!ct)
             return item->state;
@@ -458,11 +464,11 @@ nr_arena_glyphs_group_render(cairo_t *ct, NRArenaItem *item, NRRectL *area, NRPi
         for (child = group->children; child != NULL; child = child->next) {
             NRArenaGlyphs *g = NR_ARENA_GLYPHS(child);
 
-            NArtBpath *bpath = (NArtBpath *) g->font->ArtBPath(g->glyph);
+            Geom::PathVector const * pathv = g->font->PathVector(g->glyph);
 
             cairo_new_path(ct);
-            NR::Matrix g_t(g->g_transform);
-            feed_curve_to_cairo (ct, bpath, g_t * group->ctm, (pb->area).upgrade(), false, 0);
+            Geom::Matrix transform = to_2geom(g->g_transform * group->ctm);
+            feed_pathvector_to_cairo (ct, *pathv, transform, (pb->area).upgrade(), false, 0);
             cairo_fill(ct);
             pb->empty = FALSE;
         }
@@ -473,7 +479,7 @@ nr_arena_glyphs_group_render(cairo_t *ct, NRArenaItem *item, NRRectL *area, NRPi
 
 
     /* Fill */
-    if (!style->fill.isNone() || item->arena->rendermode == RENDERMODE_OUTLINE) {
+    if (!style->fill.isNone() || item->arena->rendermode == Inkscape::RENDERMODE_OUTLINE) {
         NRPixBlock m;
         nr_pixblock_setup_fast(&m, NR_PIXBLOCK_MODE_A8, area->x0, area->y0, area->x1, area->y1, TRUE);
 
@@ -499,9 +505,9 @@ nr_arena_glyphs_group_render(cairo_t *ct, NRArenaItem *item, NRRectL *area, NRPi
             if (ggroup->fill_painter) {
                 nr_arena_render_paintserver_fill(pb, area, ggroup->fill_painter, SP_SCALE24_TO_FLOAT(style->fill_opacity.value), &m);
             }
-        } else if (style->fill.isColor() || item->arena->rendermode == RENDERMODE_OUTLINE) {
+        } else if (style->fill.isColor() || item->arena->rendermode == Inkscape::RENDERMODE_OUTLINE) {
             guint32 rgba;
-            if (item->arena->rendermode == RENDERMODE_OUTLINE) {
+            if (item->arena->rendermode == Inkscape::RENDERMODE_OUTLINE) {
                 // In outline mode, render fill only, using outlinecolor
                 rgba = item->arena->outlinecolor;
             } else if ( item->render_opacity ) {
@@ -518,7 +524,7 @@ nr_arena_glyphs_group_render(cairo_t *ct, NRArenaItem *item, NRRectL *area, NRPi
     }
 
     /* Stroke */
-    if (!style->stroke.isNone() && !(item->arena->rendermode == RENDERMODE_OUTLINE)) {
+    if (!style->stroke.isNone() && !(item->arena->rendermode == Inkscape::RENDERMODE_OUTLINE)) {
         NRPixBlock m;
         guint32 rgba;
         nr_pixblock_setup_fast(&m, NR_PIXBLOCK_MODE_A8, area->x0, area->y0, area->x1, area->y1, TRUE);
@@ -606,15 +612,13 @@ void
 nr_arena_glyphs_group_add_component(NRArenaGlyphsGroup *sg, font_instance *font, int glyph, NR::Matrix const *transform)
 {
     NRArenaGroup *group;
-    NRBPath bpath;
 
     group = NR_ARENA_GROUP(sg);
 
-    bpath.path = ( font
-                   ? (NArtBpath *) font->ArtBPath(glyph)
-                   : NULL );
-    if ( bpath.path ) {
-
+    Geom::PathVector const * pathv = ( font
+                                       ? font->PathVector(glyph)
+                                       : NULL );
+    if ( pathv ) {
         nr_arena_item_request_render(NR_ARENA_ITEM(group));
 
         NRArenaItem *new_arena = NRArenaGlyphs::create(group->arena);