Unduplicate some code in the metafile printing extensions

(bzr r12499)

1 files changed, 640 insertions, 1081 deletions

diff --git a/src/extension/internal/emf-print.cpp b/src/extension/internal/emf-print.cpp
index 1e9b0cd88..826a52ade 100644
--- a/src/extension/internal/emf-print.cpp
+++ b/src/extension/internal/emf-print.cpp
@@ -1,7 +1,7 @@
 /** @file
  * @brief Enhanced Metafile printing
- */
-/* Authors:
+ *//*
+ * Authors:
  *   Ulf Erikson <ulferikson@users.sf.net>
  *   Jon A. Cruz <jon@joncruz.org>
  *   Abhishek Sharma
@@ -10,8 +10,7 @@
  * Copyright (C) 2006-2009 Authors
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
- */
-/*
+ *
  * References:
  *  - How to Create & Play Enhanced Metafiles in Win32
  *      http://support.microsoft.com/kb/q145999/
@@ -23,20 +22,19 @@
  *      http://msdn.microsoft.com/library/en-us/gdi/metafile_5hkj.asp
  */
 
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include <string.h>
+#include <glibmm/miscutils.h>
+#include <libuemf/symbol_convert.h>
+#include <2geom/sbasis-to-bezier.h>
+#include <2geom/path.h>
+#include <2geom/pathvector.h>
+#include <2geom/rect.h>
+#include <2geom/curves.h>
 
-#include "2geom/sbasis-to-bezier.h"
-#include "2geom/svg-elliptical-arc.h"
-
-#include "2geom/path.h"
-#include "2geom/pathvector.h"
-#include "2geom/rect.h"
-#include "2geom/bezier-curve.h"
-#include "2geom/hvlinesegment.h"
 #include "helper/geom.h"
 #include "helper/geom-curves.h"
 #include "sp-item.h"
@@ -62,9 +60,6 @@
 
 #include "emf-print.h"
 
-#include <string.h>
-#include <libuemf/symbol_convert.h>
-
 
 namespace Inkscape {
 namespace Extension {
@@ -73,219 +68,56 @@ namespace Internal {
 #define PXPERMETER 2835
 
 
-enum drawmode {DRAW_PAINT, DRAW_PATTERN, DRAW_IMAGE, DRAW_LINEAR_GRADIENT, DRAW_RADIAL_GRADIENT};
-
-struct FFNEXUS {
-    char        *fontname;   //Font name
-    FFNEXUS     *next;       //link to next nexus, NULL if this is the last
-    double       f1;         //Vertical (rotating) offset factor (* font height)
-    double       f2;         //Vertical (nonrotating) offset factor (* font height)
-    double       f3;         //Horizontal (nonrotating) offset factor (* font height)
-};
-
-struct GRADVALUES{
-    Geom::Point  p1;         // center   or start
-    Geom::Point  p2;         // xhandle  or end
-    Geom::Point  p3;         // yhandle  or unused
-    double       r;          // radius   or unused
-    void        *grad;       // to access the stops information
-    int          mode;       // DRAW_LINEAR_GRADIENT or DRAW_RADIAL_GRADIENT, if GRADVALUES is valid, else any value
-    U_COLORREF   bgc;        // document background color, this is as good a place as any to keep it
-    float        rgb[3];     // also background color, but as 0-1 float.
-};
-
 /* globals */
 static double       PX2WORLD = 20.0f;
 static U_XFORM      worldTransform;
 static bool         FixPPTCharPos, FixPPTDashLine, FixPPTGrad2Polys, FixPPTPatternAsHatch, FixImageRot;
-static FFNEXUS     *emf_short_fflist = NULL;  //only those fonts so far encountered.  This is SHARED with wmf-print.cpp
-static FFNEXUS     *emf_long_fflist  = NULL;   //all the fonts described in ...\share\extensions\fontfix.conf
 static EMFTRACK    *et               = NULL;
 static EMFHANDLES  *eht              = NULL;
-static GRADVALUES   gv;
-
-void PrintEmf::read_system_fflist(void){  //this is not called by any other source files
-    FFNEXUS        *temp=NULL;
-    FFNEXUS        *ptr=NULL;
-    std::fstream    fffile;
-    std::string     instr;
-    char            fontname[128];
-    double          f1,f2,f3;
-    std::string     path_to_ffconf;
-
-    if(emf_long_fflist)return;
-    char *oldlocale = g_strdup(setlocale(LC_NUMERIC, NULL));
-    setlocale(LC_NUMERIC, "C");
-
-    path_to_ffconf=INKSCAPE_EXTENSIONDIR;
-#ifdef WIN32
-    path_to_ffconf.append("\\fontfix.conf"); //Windows path syntax
-#else
-    path_to_ffconf.append("/fontfix.conf"); //Unix/linx path syntax
-#endif
-    //open the input
-    fffile.open(path_to_ffconf.c_str(), std::ios::in);
-    if(!fffile.is_open()){
-        g_error("Unable to open file: %s\n", path_to_ffconf.c_str());
-    }
-    while (std::getline(fffile,instr)){
-        if(instr[0]=='#')continue;
-        // not a comment, get the 4 values from the line
-        int elements=sscanf(instr.c_str(),"%lf %lf %lf %127[^\n]",&f1,&f2,&f3, &fontname[0]);
-        if(elements!=4){
-            g_error("Expected \"f1 f2 f3 Fontname\" but did not find it in file: %s\n", path_to_ffconf.c_str());
-        }
-        temp=(FFNEXUS *) calloc(1,sizeof(FFNEXUS)); //This will never be freed
-        temp->f1=f1;
-        temp->f2=f2;
-        temp->f3=f3;
-        temp->fontname=strdup(fontname); //This will never be freed
-        temp->next=NULL;  //just to be explicit, it is already 0
-        if(ptr){
-            ptr->next=temp;
-            ptr=temp;
-        }
-        else {
-            emf_long_fflist=ptr=temp;
-        }
-    }
-    fffile.close();
-
-    setlocale(LC_NUMERIC, oldlocale);
-    g_free(oldlocale);
-}
-
-/* Looks for the fontname in the long list.  If it does not find it, it adds the default values
-to the short list with this fontname.  If it does find it, then it adds the specified values.
-*/
-void PrintEmf::search_long_fflist(const char *fontname, double *f1, double *f2, double *f3){  //this is not called by any other source files
-    FFNEXUS *ptr=NULL;
-    FFNEXUS *tmp=emf_long_fflist;
-    if(!emf_long_fflist){
-        g_error("Programming error search_long_fflist called before read_system_fflist\n");
-    }
-    ptr=emf_long_fflist;
-    while(ptr){
-        if(!strcmp(ptr->fontname,fontname)){ tmp=ptr; break; }
-        ptr=ptr->next;
-    }
-    //tmp points at either the found name, or the default, the first entry in long_fflist
-    if(!emf_short_fflist){
-        ptr=emf_short_fflist=(FFNEXUS *) malloc(sizeof(FFNEXUS));
-    }
-    else {
-        ptr=emf_short_fflist;
-        while(ptr->next){ ptr=ptr->next; }
-        ptr->next=(FFNEXUS *) malloc(sizeof(FFNEXUS));
-        ptr=ptr->next;
-    }
-    ptr->fontname=strdup(tmp->fontname);
-    *f1 = ptr->f1 = tmp->f1;
-    *f2 = ptr->f2 = tmp->f2;
-    *f3 = ptr->f3 = tmp->f3;
-    ptr->next=NULL;
-}
 
-/* Looks for the fontname in the short list.  If it does not find it, it looks in the long_fflist.
-Either way it returns the f1, f2, f3 parameters for the font, even if these are for the default.
-*/
-void PrintEmf::search_short_fflist(const char *fontname, double *f1, double *f2, double *f3){  //this is not called by any other source files
-    FFNEXUS *ptr=NULL;
-    static FFNEXUS *last=NULL;
-
-    if(!emf_long_fflist){
-        g_error("Programming error search_short_fflist called before read_system_fflist\n");
-    }
-    // This speeds things up a lot - if the same font is called twice in a row, pull it out immediately
-    if(last && !strcmp(last->fontname,fontname)){ ptr=last;         }
-    else {                                        ptr=emf_short_fflist; }  // short_fflist may still be NULL
-    while(ptr){
-        if(!strcmp(ptr->fontname,fontname)){ *f1=ptr->f1; *f2=ptr->f2; *f3=ptr->f3; last=ptr; return; }
-        ptr=ptr->next;
-    }
-    //reach this point only if there is no match
-    search_long_fflist(fontname, f1, f2, f3);
-}
-
-void PrintEmf::smuggle_adxkyrtl_out(const char *string, uint32_t **adx, double *ky, int *rtl, int *ndx, float scale){
+void PrintEmf::smuggle_adxkyrtl_out(const char *string, uint32_t **adx, double *ky, int *rtl, int *ndx, float scale)
+{
     float       fdx;
     int         i;
     uint32_t   *ladx;
-    const char *cptr=&string[strlen(string)+1]; // this works because of the first fake terminator
+    const char *cptr = &string[strlen(string) + 1]; // this works because of the first fake terminator
 
     *adx = NULL;
     *ky  = 0.0;       // set a default value
-    sscanf(cptr,"%7d",ndx);
-    if(!*ndx)return;  // this could happen with an empty string
+    sscanf(cptr, "%7d", ndx);
+    if (!*ndx) {
+        return;    // this could happen with an empty string
+    }
     cptr += 7;
-    ladx = (uint32_t *) malloc(*ndx * sizeof(uint32_t) );
-    if(!ladx)g_message("Out of memory");
-    *adx=ladx;
-    for(i=0; i<*ndx; i++,cptr+=7, ladx++){
-        sscanf(cptr,"%7f",&fdx);
-        *ladx=(uint32_t) round(fdx * scale);
+    ladx = (uint32_t *) malloc(*ndx * sizeof(uint32_t));
+    if (!ladx) {
+        g_message("Out of memory");
+    }
+    *adx = ladx;
+    for (i = 0; i < *ndx; i++, cptr += 7, ladx++) {
+        sscanf(cptr, "%7f", &fdx);
+        *ladx = (uint32_t) round(fdx * scale);
     }
     cptr++; // skip 2nd fake terminator
-    sscanf(cptr,"%7f",&fdx);
-    *ky=fdx;
+    sscanf(cptr, "%7f", &fdx);
+    *ky = fdx;
     cptr += 7;  // advance over ky and its space
-    sscanf(cptr,"%07d",rtl);
-}
-
-/* convert an  0RGB color to EMF U_COLORREF.
-inverse of sethexcolor() in emf-inout.cpp
-*/
-U_COLORREF  PrintEmf::gethexcolor(uint32_t color){
-    U_COLORREF out;
-    out =   U_RGB( 
-                (color >> 16) & 0xFF,
-                (color >>  8) & 0xFF,
-                (color >>  0) & 0xFF
-            );
-    return(out);
-}
-
-
-/* Translate inkscape weights to EMF weights.
-*/
-uint32_t PrintEmf::transweight(const unsigned int inkweight){
-    if(inkweight == SP_CSS_FONT_WEIGHT_400)return(U_FW_NORMAL);
-    if(inkweight == SP_CSS_FONT_WEIGHT_100)return(U_FW_THIN);
-    if(inkweight == SP_CSS_FONT_WEIGHT_200)return(U_FW_EXTRALIGHT);
-    if(inkweight == SP_CSS_FONT_WEIGHT_300)return(U_FW_LIGHT);
-    // 400 is tested first, as it is the most common case
-    if(inkweight == SP_CSS_FONT_WEIGHT_500)return(U_FW_MEDIUM);
-    if(inkweight == SP_CSS_FONT_WEIGHT_600)return(U_FW_SEMIBOLD);
-    if(inkweight == SP_CSS_FONT_WEIGHT_700)return(U_FW_BOLD);
-    if(inkweight == SP_CSS_FONT_WEIGHT_800)return(U_FW_EXTRABOLD);
-    if(inkweight == SP_CSS_FONT_WEIGHT_900)return(U_FW_HEAVY);
-    return(U_FW_NORMAL);
+    sscanf(cptr, "%07d", rtl);
 }
 
-PrintEmf::PrintEmf (void)
+PrintEmf::PrintEmf()
 {
     // all of the class variables are initialized elsewhere, many in PrintEmf::Begin,
 }
 
 
-PrintEmf::~PrintEmf (void)
-{
-
-    /* restore default signal handling for SIGPIPE */
-#if !defined(_WIN32) && !defined(__WIN32__)
-    (void) signal(SIGPIPE, SIG_DFL);
-#endif
-    return;
-}
-
-
-unsigned int PrintEmf::setup (Inkscape::Extension::Print * /*mod*/)
+unsigned int PrintEmf::setup(Inkscape::Extension::Print * /*mod*/)
 {
     return TRUE;
 }
 
 
-unsigned int PrintEmf::begin (Inkscape::Extension::Print *mod, SPDocument *doc)
+unsigned int PrintEmf::begin(Inkscape::Extension::Print *mod, SPDocument *doc)
 {
     U_SIZEL         szlDev, szlMm;
     U_RECTL         rclBounds, rclFrame;
@@ -313,16 +145,18 @@ unsigned int PrintEmf::begin (Inkscape::Extension::Print *mod, SPDocument *doc)
     htextalignment = U_TA_BASELINE | U_TA_LEFT;
     use_stroke = use_fill = simple_shape = usebk = false;
 
-    Inkscape::XML::Node *nv = sp_repr_lookup_name (doc->rroot, "sodipodi:namedview");
-    if(nv){
+    Inkscape::XML::Node *nv = sp_repr_lookup_name(doc->rroot, "sodipodi:namedview");
+    if (nv) {
         const char *p1 = nv->attribute("pagecolor");
         char *p2;
-        uint32_t lc = strtoul( &p1[1], &p2, 16 );  // it looks like "#ABC123"
-        if(*p2)lc=0;
-        gv.bgc = gethexcolor(lc);
-        gv.rgb[0] = (float) U_RGBAGetR(gv.bgc)/255.0;
-        gv.rgb[1] = (float) U_RGBAGetG(gv.bgc)/255.0;
-        gv.rgb[2] = (float) U_RGBAGetB(gv.bgc)/255.0;
+        uint32_t lc = strtoul(&p1[1], &p2, 16);    // it looks like "#ABC123"
+        if (*p2) {
+            lc = 0;
+        }
+        gv.bgc = _gethexcolor(lc);
+        gv.rgb[0] = (float) U_RGBAGetR(gv.bgc) / 255.0;
+        gv.rgb[1] = (float) U_RGBAGetG(gv.bgc) / 255.0;
+        gv.rgb[2] = (float) U_RGBAGetB(gv.bgc) / 255.0;
     }
 
     bool pageBoundingBox;
@@ -332,9 +166,11 @@ unsigned int PrintEmf::begin (Inkscape::Extension::Print *mod, SPDocument *doc)
     if (pageBoundingBox) {
         d = Geom::Rect::from_xywh(0, 0, _width, _height);
     } else {
-        SPItem* doc_item = doc->getRoot();
+        SPItem *doc_item = doc->getRoot();
         Geom::OptRect bbox = doc_item->desktopVisualBounds();
-        if (bbox) d = *bbox;
+        if (bbox) {
+            d = *bbox;
+        }
     }
 
     d *= Geom::Scale(Inkscape::Util::Quantity::convert(1, "px", "in"));
@@ -343,71 +179,72 @@ unsigned int PrintEmf::begin (Inkscape::Extension::Print *mod, SPDocument *doc)
     float dwInchesY = d.height();
 
     // dwInchesX x dwInchesY in micrometer units, dpi=90 -> 3543.3 dpm
-    (void) drawing_size((int) ceil(dwInchesX*25.4), (int) ceil(dwInchesY*25.4), 3.543307, &rclBounds, &rclFrame);
+    (void) drawing_size((int) ceil(dwInchesX * 25.4), (int) ceil(dwInchesY * 25.4), 3.543307, &rclBounds, &rclFrame);
 
     // set up the reference device as 100 X A4 horizontal, (1200 dpi/25.4 -> dpmm).  Extra digits maintain dpi better in EMF
     int MMX = 21600;
     int MMY = 27900;
-    (void) device_size(MMX, MMY, 1200.0/25.4, &szlDev, &szlMm);
+    (void) device_size(MMX, MMY, 1200.0 / 25.4, &szlDev, &szlMm);
     int PixelsX = szlDev.cx;
     int PixelsY = szlDev.cy;
 
-    // set up the description:  (version string)0(file)00 
+    // set up the description:  (version string)0(file)00
     char buff[1024];
-    memset(buff,0, sizeof(buff));
+    memset(buff, 0, sizeof(buff));
     char *p1 = strrchr(ansi_uri, '\\');
     char *p2 = strrchr(ansi_uri, '/');
     char *p = MAX(p1, p2);
-    if (p)
+    if (p) {
         p++;
-    else
+    } else {
         p = ansi_uri;
-    snprintf(buff, sizeof(buff)-1, "Inkscape %s (%s)\1%s\1", Inkscape::version_string, __DATE__,p);
-    uint16_t *Description = U_Utf8ToUtf16le(buff, 0, NULL); 
+    }
+    snprintf(buff, sizeof(buff) - 1, "Inkscape %s (%s)\1%s\1", Inkscape::version_string, __DATE__, p);
+    uint16_t *Description = U_Utf8ToUtf16le(buff, 0, NULL);
     int cbDesc = 2 + wchar16len(Description);      // also count the final terminator
     (void) U_Utf16leEdit(Description, '\1', '\0'); // swap the temporary \1 characters for nulls
-    
+
     // construct the EMRHEADER record and append it to the EMF in memory
-    rec = U_EMRHEADER_set( rclBounds,  rclFrame,  NULL, cbDesc, Description, szlDev, szlMm, 0);
+    rec = U_EMRHEADER_set(rclBounds,  rclFrame,  NULL, cbDesc, Description, szlDev, szlMm, 0);
     free(Description);
-    if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
+    if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
         g_error("Fatal programming error in PrintEmf::begin at EMRHEADER");
     }
 
 
     // Simplest mapping mode, supply all coordinates in pixels
     rec = U_EMRSETMAPMODE_set(U_MM_TEXT);
-    if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
+    if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
         g_error("Fatal programming error in PrintEmf::begin at EMRSETMAPMODE");
     }
-    
+
 
     //  Correct for dpi in EMF (1200) vs dpi in Inkscape (always 90).
     //  Also correct for the scaling in PX2WORLD, which is set to 20.
 
-    worldTransform.eM11 = 1200./(90.0*PX2WORLD);
+    worldTransform.eM11 = 1200. / (90.0 * PX2WORLD);
     worldTransform.eM12 = 0.0;
     worldTransform.eM21 = 0.0;
-    worldTransform.eM22 = 1200./(90.0*PX2WORLD);
+    worldTransform.eM22 = 1200. / (90.0 * PX2WORLD);
     worldTransform.eDx  = 0;
     worldTransform.eDy  = 0;
 
     rec = U_EMRMODIFYWORLDTRANSFORM_set(worldTransform, U_MWT_LEFTMULTIPLY);
-    if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
+    if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
         g_error("Fatal programming error in PrintEmf::begin at EMRMODIFYWORLDTRANSFORM");
     }
 
 
     if (1) {
-        snprintf(buff, sizeof(buff)-1, "Screen=%dx%dpx, %dx%dmm", PixelsX, PixelsY, MMX, MMY);
+        snprintf(buff, sizeof(buff) - 1, "Screen=%dx%dpx, %dx%dmm", PixelsX, PixelsY, MMX, MMY);
         rec = textcomment_set(buff);
-        if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
+        if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
             g_error("Fatal programming error in PrintEmf::begin at textcomment_set 1");
         }
 
-        snprintf(buff, sizeof(buff)-1, "Drawing=%.1lfx%.1lfpx, %.1lfx%.1lfmm", _width, _height, dwInchesX * Inkscape::Util::Quantity::convert(1, "in", "mm"), dwInchesY * Inkscape::Util::Quantity::convert(1, "in", "mm"));
+        snprintf(buff, sizeof(buff) - 1, "Drawing=%.1lfx%.1lfpx, %.1lfx%.1lfmm", _width, _height, dwInchesX * Inkscape::Util::Quantity::convert(1, "in", "mm"), dwInchesY * Inkscape::Util::Quantity::convert(1, "in", "mm"));
         rec = textcomment_set(buff);
-        if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
+        if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
             g_error("Fatal programming error in PrintEmf::begin at textcomment_set 1");
         }
     }
@@ -415,13 +252,13 @@ unsigned int PrintEmf::begin (Inkscape::Extension::Print *mod, SPDocument *doc)
     /* set some parameters, else the program that reads the EMF may default to other values */
 
     rec = U_EMRSETBKMODE_set(U_TRANSPARENT);
-    if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
+    if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
         g_error("Fatal programming error in PrintEmf::begin at U_EMRSETBKMODE_set");
     }
 
-    hpolyfillmode=U_WINDING;
+    hpolyfillmode = U_WINDING;
     rec = U_EMRSETPOLYFILLMODE_set(U_WINDING);
-    if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
+    if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
         g_error("Fatal programming error in PrintEmf::begin at U_EMRSETPOLYFILLMODE_set");
     }
 
@@ -431,37 +268,39 @@ unsigned int PrintEmf::begin (Inkscape::Extension::Print *mod, SPDocument *doc)
     //   - for this reason, the EMF text alignment must always be TA_BASELINE|TA_LEFT.
     htextalignment = U_TA_BASELINE | U_TA_LEFT;
     rec = U_EMRSETTEXTALIGN_set(U_TA_BASELINE | U_TA_LEFT);
-    if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
+    if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
         g_error("Fatal programming error in PrintEmf::begin at U_EMRSETTEXTALIGN_set");
     }
 
-    htextcolor_rgb[0] = htextcolor_rgb[1] = htextcolor_rgb[2] = 0.0; 
-    rec = U_EMRSETTEXTCOLOR_set(U_RGB(0,0,0));
-    if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
+    htextcolor_rgb[0] = htextcolor_rgb[1] = htextcolor_rgb[2] = 0.0;
+    rec = U_EMRSETTEXTCOLOR_set(U_RGB(0, 0, 0));
+    if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
         g_error("Fatal programming error in PrintEmf::begin at U_EMRSETTEXTCOLOR_set");
     }
 
     rec = U_EMRSETROP2_set(U_R2_COPYPEN);
-    if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
+    if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
         g_error("Fatal programming error in PrintEmf::begin at U_EMRSETROP2_set");
     }
-    
+
     /* miterlimit is set with eah pen, so no need to check for it changes as in WMF */
 
     return 0;
 }
 
 
-unsigned int PrintEmf::finish (Inkscape::Extension::Print * /*mod*/)
+unsigned int PrintEmf::finish(Inkscape::Extension::Print * /*mod*/)
 {
     char *rec;
-    if (!et) return 0;
+    if (!et) {
+        return 0;
+    }
+
 
-    
     // earlier versions had flush of fill here, but it never executed and was removed
 
-    rec = U_EMREOF_set(0,NULL,et);  // generate the EOF record
-    if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
+    rec = U_EMREOF_set(0, NULL, et); // generate the EOF record
+    if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
         g_error("Fatal programming error in PrintEmf::finish");
     }
     (void) emf_finish(et, eht); // Finalize and write out the EMF
@@ -472,176 +311,19 @@ unsigned int PrintEmf::finish (Inkscape::Extension::Print * /*mod*/)
 }
 
 
-unsigned int PrintEmf::comment (
+unsigned int PrintEmf::comment(
     Inkscape::Extension::Print * /*module*/,
     const char * /*comment*/)
 {
-    if (!et) return 0;
+    if (!et) {
+        return 0;
+    }
 
     // earlier versions had flush of fill here, but it never executed and was removed
 
     return 0;
 }
 
-// Extract hatchType, hatchColor from a name like
-// EMFhatch<hatchType>_<hatchColor>
-// Where the first one is a number and the second a color in hex.
-// hatchType and hatchColor have been set with defaults before this is called.
-//
-void PrintEmf::hatch_classify(char *name, int *hatchType, U_COLORREF *hatchColor, U_COLORREF *bkColor){
-    int      val;
-    uint32_t hcolor=0;
-    uint32_t bcolor=0;
-
-    // name should be EMFhatch or WMFhatch but *MFhatch will be accepted
-    if(0!=strncmp(&name[1],"MFhatch",7)){ return; } // not anything we can parse
-    name += 8; // EMFhatch already detected
-    val   = 0;
-    while(*name && isdigit(*name)){ 
-        val = 10*val + *name - '0';
-        name++;
-    }
-    *hatchType = val;
-    if(*name != '_' || val > U_HS_DITHEREDBKCLR){ // wrong syntax, cannot classify
-        *hatchType = -1;
-    }
-    else {
-        name++;
-        if(2 != sscanf(name,"%X_%X", &hcolor, &bcolor)){ // not a pattern with background
-            if(1 != sscanf(name,"%X", &hcolor)){ *hatchType = -1; } // not a pattern, cannot classify
-            *hatchColor = gethexcolor(hcolor);
-        }
-        else {
-            *hatchColor = gethexcolor(hcolor);
-            *bkColor    = gethexcolor(bcolor);
-            usebk       = true;
-        }
-    }
-    /* Everything > U_HS_SOLIDCLR is solid, just specify the color in the brush rather than messing around with background or textcolor */
-    if(*hatchType > U_HS_SOLIDCLR)*hatchType = U_HS_SOLIDCLR;
-}
-
-//
-//  Recurse down from a brush pattern, try to figure out what it is. 
-//  If an image is found set a pointer to the epixbuf, else set that to NULL
-//  If a pattern is found with a name like [EW]MFhatch3_3F7FFF return hatchType=3, hatchColor=3F7FFF (as a uint32_t),
-//    otherwise hatchType is set to -1 and hatchColor is not defined.
-//
-
-void PrintEmf::brush_classify(SPObject *parent, int depth, GdkPixbuf **epixbuf, int *hatchType, U_COLORREF *hatchColor, U_COLORREF *bkColor){
-    if(depth==0){
-        *epixbuf    = NULL;
-        *hatchType  = -1;
-        *hatchColor = U_RGB(0,0,0);
-        *bkColor    = U_RGB(255,255,255);
-    }
-    depth++;
-    // first look along the pattern chain, if there is one 
-    if(SP_IS_PATTERN(parent)){
-        for (SPPattern *pat_i = SP_PATTERN(parent); pat_i != NULL; pat_i = pat_i->ref ? pat_i->ref->getObject() : NULL) {
-            if(SP_IS_IMAGE(pat_i)){
-                *epixbuf = ((SPImage *)pat_i)->pixbuf;
-                return;
-            }
-            char temp[32];  // large enough
-            temp[31]='\0';
-            strncpy(temp,pat_i->getAttribute("id"),31);  // Some names may be longer than [EW]MFhatch#_###### 
-            hatch_classify(temp, hatchType, hatchColor, bkColor);
-            if(*hatchType != -1)return;
-
-            // still looking?  Look at this pattern's children, if there are any
-            SPObject *child = pat_i->firstChild();
-            while(child && !(*epixbuf) && (*hatchType == -1)){
-                brush_classify(child, depth, epixbuf, hatchType, hatchColor, bkColor);
-                child = child->getNext();
-            }
-        }
-    }
-    else if(SP_IS_IMAGE(parent)){
-        *epixbuf = ((SPImage *)parent)->pixbuf;
-        return;
-    }
-    else { // some inkscape rearrangements pass through nodes between pattern and image which are not classified as either.
-        SPObject *child = parent->firstChild();
-        while(child && !(*epixbuf) && (*hatchType == -1)){
-            brush_classify(child, depth, epixbuf, hatchType, hatchColor, bkColor);
-            child = child->getNext();
-        }
-    }
-}
-
-//swap R/B in 4 byte pixel
-void PrintEmf::swapRBinRGBA(char *px, int pixels){
-    char tmp;
-    for(int i=0;i<pixels*4;px+=4,i+=4){
-        tmp=px[2];
-        px[2]=px[0];
-        px[0]=tmp;
-    }
-}
-
-/* opacity weighting of two colors as float.  v1 is the color, op is its opacity, v2 is the background color */
-inline float opweight(float v1, float v2, float op){
-    return v1*op + v2*(1.0-op);
-}
-
-U_COLORREF PrintEmf::avg_stop_color(SPGradient *gr){
-    U_COLORREF cr;
-    int last = gr->vector.stops.size() -1;
-    if(last>=1){
-        float rgbs[3];
-        float rgbe[3];
-        float ops,ope;
-
-        ops = gr->vector.stops[0   ].opacity;
-        ope = gr->vector.stops[last].opacity;
-        sp_color_get_rgb_floatv(&gr->vector.stops[0   ].color, rgbs);
-        sp_color_get_rgb_floatv(&gr->vector.stops[last].color, rgbe);
-
-        /* Replace opacity at start & stop with that fraction background color, then average those two for final color. */
-        cr =    U_RGB(
-                    255*(( opweight(rgbs[0],gv.rgb[0],ops)   +   opweight(rgbe[0],gv.rgb[0],ope) )/2.0),
-                    255*(( opweight(rgbs[1],gv.rgb[1],ops)   +   opweight(rgbe[1],gv.rgb[1],ope) )/2.0),
-                    255*(( opweight(rgbs[2],gv.rgb[2],ops)   +   opweight(rgbe[2],gv.rgb[2],ope) )/2.0)
-                );
-    }
-    else {
-        cr = U_RGB(0, 0, 0);  // The default fill
-    }
-    return cr;
-}
-
-int PrintEmf::hold_gradient(void *gr, int mode){
-    gv.mode = mode;
-    gv.grad = gr;
-    if(mode==DRAW_RADIAL_GRADIENT){
-        SPRadialGradient *rg = (SPRadialGradient *) gr;
-        gv.r  = rg->r.computed;                                 // radius, but of what???
-        gv.p1 = Geom::Point(rg->cx.computed, rg->cy.computed);  // center
-        gv.p2 = Geom::Point(gv.r, 0) + gv.p1;                   // xhandle
-        gv.p3 = Geom::Point(0, -gv.r) + gv.p1;                  // yhandle
-        if (rg->gradientTransform_set) {
-            gv.p1 = gv.p1 * rg->gradientTransform;
-            gv.p2 = gv.p2 * rg->gradientTransform;
-            gv.p3 = gv.p3 * rg->gradientTransform;
-        }
-    }
-    else if(mode==DRAW_LINEAR_GRADIENT){
-        SPLinearGradient *lg = (SPLinearGradient *) gr;
-        gv.r = 0;                                               // unused
-        gv.p1 = Geom::Point (lg->x1.computed, lg->y1.computed); // start
-        gv.p2 = Geom::Point (lg->x2.computed, lg->y2.computed); // end
-        gv.p3 = Geom::Point (0, 0);                             // unused
-        if (lg->gradientTransform_set) {
-            gv.p1 = gv.p1 * lg->gradientTransform;
-            gv.p2 = gv.p2 * lg->gradientTransform;
-        }
-    }
-    else {
-        g_error("Fatal programming error, hold_gradient() in emf-print.cpp called with invalid draw mode");
-    }
-    return 1;
-}
 
 // fcolor is defined when gradients are being expanded, it is the color of one stripe or ring.
 int PrintEmf::create_brush(SPStyle const *style, PU_COLORREF fcolor)
@@ -650,7 +332,7 @@ int PrintEmf::create_brush(SPStyle const *style, PU_COLORREF fcolor)
     char         *rec;
     U_LOGBRUSH    lb;
     uint32_t      brush, fmode;
-    enum drawmode fill_mode;
+    MFDrawMode    fill_mode;
     GdkPixbuf    *pixbuf;
     uint32_t      brushStyle;
     int           hatchType;
@@ -659,7 +341,9 @@ int PrintEmf::create_brush(SPStyle const *style, PU_COLORREF fcolor)
     uint32_t      width  = 0; // quiets a harmless compiler warning, initialization not otherwise required.
     uint32_t      height = 0;
 
-    if (!et) return 0;
+    if (!et) {
+        return 0;
+    }
 
     // set a default fill in case we can't figure out a better way to do it
     fmode      = U_ALTERNATE;
@@ -667,138 +351,144 @@ int PrintEmf::create_brush(SPStyle const *style, PU_COLORREF fcolor)
     brushStyle = U_BS_SOLID;
     hatchType  = U_HS_SOLIDCLR;
     bkColor    = U_RGB(0, 0, 0);
-    if(fcolor){ hatchColor = *fcolor;        }
-    else {      hatchColor = U_RGB(0, 0, 0); }
+    if (fcolor) {
+        hatchColor = *fcolor;
+    } else {
+        hatchColor = U_RGB(0, 0, 0);
+    }
 
     if (!fcolor && style) {
-        if(style->fill.isColor()){
+        if (style->fill.isColor()) {
             fill_mode = DRAW_PAINT;
             float opacity = SP_SCALE24_TO_FLOAT(style->fill_opacity.value);
-            if (opacity <= 0.0)opacity = 0.0;  // basically the same as no fill
+            if (opacity <= 0.0) {
+                opacity = 0.0;    // basically the same as no fill
+            }
 
-            sp_color_get_rgb_floatv( &style->fill.value.color, rgb );
-            hatchColor = U_RGB(255*rgb[0], 255*rgb[1], 255*rgb[2]);
+            sp_color_get_rgb_floatv(&style->fill.value.color, rgb);
+            hatchColor = U_RGB(255 * rgb[0], 255 * rgb[1], 255 * rgb[2]);
 
             fmode = style->fill_rule.computed == 0 ? U_WINDING : (style->fill_rule.computed == 2 ? U_ALTERNATE : U_ALTERNATE);
-        }
-        else if(SP_IS_PATTERN(SP_STYLE_FILL_SERVER(style))){ // must be paint-server
+        } else if (SP_IS_PATTERN(SP_STYLE_FILL_SERVER(style))) { // must be paint-server
             SPPaintServer *paintserver = style->fill.value.href->getObject();
-            SPPattern *pat = SP_PATTERN (paintserver);
+            SPPattern *pat = SP_PATTERN(paintserver);
             double dwidth  = pattern_width(pat);
             double dheight = pattern_height(pat);
             width  = dwidth;
             height = dheight;
-            brush_classify(pat,0,&pixbuf,&hatchType,&hatchColor,&bkColor);
-            if(pixbuf){ fill_mode = DRAW_IMAGE;  }
-            else {  // pattern
+            brush_classify(pat, 0, &pixbuf, &hatchType, &hatchColor, &bkColor);
+            if (pixbuf) {
+                fill_mode = DRAW_IMAGE;
+            } else { // pattern
                 fill_mode = DRAW_PATTERN;
-                if(hatchType == -1){  // Not a standard hatch, so force it to something
+                if (hatchType == -1) { // Not a standard hatch, so force it to something
                     hatchType  = U_HS_CROSS;
-                    hatchColor = U_RGB(0xFF,0xC3,0xC3);
+                    hatchColor = U_RGB(0xFF, 0xC3, 0xC3);
                 }
             }
-            if(FixPPTPatternAsHatch){
-                if(hatchType == -1){  // image or unclassified 
+            if (FixPPTPatternAsHatch) {
+                if (hatchType == -1) { // image or unclassified
                     fill_mode  = DRAW_PATTERN;
                     hatchType  = U_HS_DIAGCROSS;
-                    hatchColor = U_RGB(0xFF,0xC3,0xC3);
-                } 
+                    hatchColor = U_RGB(0xFF, 0xC3, 0xC3);
+                }
             }
             brushStyle = U_BS_HATCHED;
-        }
-        else if(SP_IS_GRADIENT(SP_STYLE_FILL_SERVER(style))){ // must be a gradient
+        } else if (SP_IS_GRADIENT(SP_STYLE_FILL_SERVER(style))) { // must be a gradient
             // currently we do not do anything with gradients, the code below just sets the color to the average of the stops
             SPPaintServer *paintserver = style->fill.value.href->getObject();
             SPLinearGradient *lg = NULL;
             SPRadialGradient *rg = NULL;
 
-            if (SP_IS_LINEARGRADIENT (paintserver)) {
+            if (SP_IS_LINEARGRADIENT(paintserver)) {
                 lg = SP_LINEARGRADIENT(paintserver);
                 SP_GRADIENT(lg)->ensureVector(); // when exporting from commandline, vector is not built
                 fill_mode = DRAW_LINEAR_GRADIENT;
-            }
-            else if (SP_IS_RADIALGRADIENT (paintserver)) {
+            } else if (SP_IS_RADIALGRADIENT(paintserver)) {
                 rg = SP_RADIALGRADIENT(paintserver);
                 SP_GRADIENT(rg)->ensureVector(); // when exporting from commandline, vector is not built
                 fill_mode = DRAW_RADIAL_GRADIENT;
-            }
-            else {
+            } else {
                 // default fill
             }
 
-            if(rg){
-                if(FixPPTGrad2Polys){  return hold_gradient(rg, fill_mode); }
-                else {                 hatchColor = avg_stop_color(rg);  }
-            }
-            else if(lg){
-                if(FixPPTGrad2Polys){  return hold_gradient(lg, fill_mode); }
-                else {                 hatchColor = avg_stop_color(lg);   }
+            if (rg) {
+                if (FixPPTGrad2Polys) {
+                    return hold_gradient(rg, fill_mode);
+                } else {
+                    hatchColor = avg_stop_color(rg);
+                }
+            } else if (lg) {
+                if (FixPPTGrad2Polys) {
+                    return hold_gradient(lg, fill_mode);
+                } else {
+                    hatchColor = avg_stop_color(lg);
+                }
             }
         }
-    } 
-    else { // if (!style)
-      // default fill
+    } else { // if (!style)
+        // default fill
     }
 
     lb   = logbrush_set(brushStyle, hatchColor, hatchType);
 
-    switch(fill_mode){
-        case DRAW_LINEAR_GRADIENT: // fill with average color unless gradients are converted to slices
-        case DRAW_RADIAL_GRADIENT: // ditto
-        case DRAW_PAINT:
-        case DRAW_PATTERN:
-            // SVG text has no background attribute, so OPAQUE mode ALWAYS cancels after the next draw, otherwise it would mess up future text output.
-            if(usebk){
-                rec = U_EMRSETBKCOLOR_set(bkColor);
-                if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
-                    g_error("Fatal programming error in PrintEmf::create_brush at U_EMRSETBKCOLOR_set");
-                }
-                rec = U_EMRSETBKMODE_set(U_OPAQUE);
-                if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
-                    g_error("Fatal programming error in PrintEmf::create_brush at U_EMRSETBKMODE_set");
-                }
+    switch (fill_mode) {
+    case DRAW_LINEAR_GRADIENT: // fill with average color unless gradients are converted to slices
+    case DRAW_RADIAL_GRADIENT: // ditto
+    case DRAW_PAINT:
+    case DRAW_PATTERN:
+        // SVG text has no background attribute, so OPAQUE mode ALWAYS cancels after the next draw, otherwise it would mess up future text output.
+        if (usebk) {
+            rec = U_EMRSETBKCOLOR_set(bkColor);
+            if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
+                g_error("Fatal programming error in PrintEmf::create_brush at U_EMRSETBKCOLOR_set");
             }
-            rec = createbrushindirect_set(&brush, eht, lb);
-            if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
-                g_error("Fatal programming error in PrintEmf::create_brush at createbrushindirect_set");
-            }
-            break;
-        case DRAW_IMAGE:
-            char                *px;
-            char                *rgba_px;
-            uint32_t             cbPx;
-            uint32_t             colortype;
-            PU_RGBQUAD           ct;
-            int                  numCt;
-            U_BITMAPINFOHEADER   Bmih;
-            PU_BITMAPINFO        Bmi;
-            rgba_px = (char *) gdk_pixbuf_get_pixels(pixbuf); // Do NOT free this!!!
-            colortype = U_BCBM_COLOR32;
-            (void) RGBA_to_DIB(&px, &cbPx, &ct, &numCt,  rgba_px,  width, height, width*4, colortype, 0, 1);
-            // Not sure why the next swap is needed because the preceding does it, and the code is identical
-            // to that in stretchdibits_set, which does not need this.
-            swapRBinRGBA(px, width*height);
-            Bmih = bitmapinfoheader_set(width, height, 1, colortype, U_BI_RGB, 0, PXPERMETER, PXPERMETER, numCt, 0);
-            Bmi = bitmapinfo_set(Bmih, ct);
-            rec = createdibpatternbrushpt_set(&brush, eht, U_DIB_RGB_COLORS, Bmi, cbPx, px);
-            if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
-                g_error("Fatal programming error in PrintEmf::create_brush at createdibpatternbrushpt_set");
+            rec = U_EMRSETBKMODE_set(U_OPAQUE);
+            if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
+                g_error("Fatal programming error in PrintEmf::create_brush at U_EMRSETBKMODE_set");
             }
-            free(px);
-            free(Bmi); // ct will be NULL because of colortype
-            break;
+        }
+        rec = createbrushindirect_set(&brush, eht, lb);
+        if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
+            g_error("Fatal programming error in PrintEmf::create_brush at createbrushindirect_set");
+        }
+        break;
+    case DRAW_IMAGE:
+        char                *px;
+        char                *rgba_px;
+        uint32_t             cbPx;
+        uint32_t             colortype;
+        PU_RGBQUAD           ct;
+        int                  numCt;
+        U_BITMAPINFOHEADER   Bmih;
+        PU_BITMAPINFO        Bmi;
+        rgba_px = (char *) gdk_pixbuf_get_pixels(pixbuf); // Do NOT free this!!!
+        colortype = U_BCBM_COLOR32;
+        (void) RGBA_to_DIB(&px, &cbPx, &ct, &numCt,  rgba_px,  width, height, width * 4, colortype, 0, 1);
+        // Not sure why the next swap is needed because the preceding does it, and the code is identical
+        // to that in stretchdibits_set, which does not need this.
+        swapRBinRGBA(px, width * height);
+        Bmih = bitmapinfoheader_set(width, height, 1, colortype, U_BI_RGB, 0, PXPERMETER, PXPERMETER, numCt, 0);
+        Bmi = bitmapinfo_set(Bmih, ct);
+        rec = createdibpatternbrushpt_set(&brush, eht, U_DIB_RGB_COLORS, Bmi, cbPx, px);
+        if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
+            g_error("Fatal programming error in PrintEmf::create_brush at createdibpatternbrushpt_set");
+        }
+        free(px);
+        free(Bmi); // ct will be NULL because of colortype
+        break;
     }
 
     hbrush = brush;  // need this later for destroy_brush
     rec = selectobject_set(brush, eht);
-    if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
+    if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
         g_error("Fatal programming error in PrintEmf::create_brush at selectobject_set");
     }
 
-    if(fmode != hpolyfillmode){
-        hpolyfillmode=fmode;
-        rec = U_EMRSETPOLYFILLMODE_set(fmode); 
-        if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
+    if (fmode != hpolyfillmode) {
+        hpolyfillmode = fmode;
+        rec = U_EMRSETPOLYFILLMODE_set(fmode);
+        if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
             g_error("Fatal programming error in PrintEmf::create_brush at U_EMRSETPOLYdrawmode_set");
         }
     }
@@ -814,12 +504,12 @@ void PrintEmf::destroy_brush()
     // select in a stock object to deselect this one, the stock object should
     // never be used because we always select in a new one before drawing anythingrestore previous brush, necessary??? Would using a default stock object not work?
     rec = selectobject_set(U_NULL_BRUSH, eht);
-    if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
+    if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
         g_error("Fatal programming error in PrintEmf::destroy_brush at selectobject_set");
     }
-    if (hbrush){
+    if (hbrush) {
         rec = deleteobject_set(&hbrush, eht);
-        if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
+        if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
             g_error("Fatal programming error in PrintEmf::destroy_brush");
         }
         hbrush = 0;
@@ -842,17 +532,19 @@ int PrintEmf::create_pen(SPStyle const *style, const Geom::Affine &transform)
     int                  hatchType;
     U_COLORREF           hatchColor;
     U_COLORREF           bkColor;
-    uint32_t             width,height;
-    char                *px=NULL;
+    uint32_t             width, height;
+    char                *px = NULL;
     char                *rgba_px;
-    uint32_t             cbPx=0;
+    uint32_t             cbPx = 0;
     uint32_t             colortype;
-    PU_RGBQUAD           ct=NULL;
-    int                  numCt=0;
+    PU_RGBQUAD           ct = NULL;
+    int                  numCt = 0;
     U_BITMAPINFOHEADER   Bmih;
-    PU_BITMAPINFO        Bmi=NULL;
-  
-    if (!et) return 0;
+    PU_BITMAPINFO        Bmi = NULL;
+
+    if (!et) {
+        return 0;
+    }
 
     // set a default stroke  in case we can't figure out a better way to do it
     brushStyle = U_BS_SOLID;
@@ -863,75 +555,72 @@ int PrintEmf::create_pen(SPStyle const *style, const Geom::Affine &transform)
     if (style) {
         float rgb[3];
 
-        if(SP_IS_PATTERN(SP_STYLE_STROKE_SERVER(style))){ // must be paint-server
+        if (SP_IS_PATTERN(SP_STYLE_STROKE_SERVER(style))) { // must be paint-server
             SPPaintServer *paintserver = style->stroke.value.href->getObject();
-            SPPattern *pat = SP_PATTERN (paintserver);
+            SPPattern *pat = SP_PATTERN(paintserver);
             double dwidth  = pattern_width(pat);
             double dheight = pattern_height(pat);
             width  = dwidth;
             height = dheight;
-            brush_classify(pat,0,&pixbuf,&hatchType,&hatchColor,&bkColor);
-            if(pixbuf){
+            brush_classify(pat, 0, &pixbuf, &hatchType, &hatchColor, &bkColor);
+            if (pixbuf) {
                 brushStyle    = U_BS_DIBPATTERN;
                 rgba_px = (char *) gdk_pixbuf_get_pixels(pixbuf); // Do NOT free this!!!
                 colortype = U_BCBM_COLOR32;
-                (void) RGBA_to_DIB(&px, &cbPx, &ct, &numCt,  rgba_px,  width, height, width*4, colortype, 0, 1);
+                (void) RGBA_to_DIB(&px, &cbPx, &ct, &numCt,  rgba_px,  width, height, width * 4, colortype, 0, 1);
                 // Not sure why the next swap is needed because the preceding does it, and the code is identical
                 // to that in stretchdibits_set, which does not need this.
-                swapRBinRGBA(px, width*height);
+                swapRBinRGBA(px, width * height);
                 Bmih = bitmapinfoheader_set(width, height, 1, colortype, U_BI_RGB, 0, PXPERMETER, PXPERMETER, numCt, 0);
                 Bmi = bitmapinfo_set(Bmih, ct);
-            }
-            else {  // pattern
+            } else { // pattern
                 brushStyle    = U_BS_HATCHED;
-                if(usebk){  // OPAQUE mode ALWAYS cancels after the next draw, otherwise it would mess up future text output.
+                if (usebk) { // OPAQUE mode ALWAYS cancels after the next draw, otherwise it would mess up future text output.
                     rec = U_EMRSETBKCOLOR_set(bkColor);
-                    if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
+                    if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
                         g_error("Fatal programming error in PrintEmf::create_pen at U_EMRSETBKCOLOR_set");
                     }
                     rec = U_EMRSETBKMODE_set(U_OPAQUE);
-                    if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
+                    if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
                         g_error("Fatal programming error in PrintEmf::create_pen at U_EMRSETBKMODE_set");
                     }
                 }
-                if(hatchType == -1){  // Not a standard hatch, so force it to something
+                if (hatchType == -1) { // Not a standard hatch, so force it to something
                     hatchType  = U_HS_CROSS;
-                    hatchColor = U_RGB(0xFF,0xC3,0xC3);
+                    hatchColor = U_RGB(0xFF, 0xC3, 0xC3);
                 }
             }
-            if(FixPPTPatternAsHatch){
-                if(hatchType == -1){  // image or unclassified 
+            if (FixPPTPatternAsHatch) {
+                if (hatchType == -1) { // image or unclassified
                     brushStyle   = U_BS_HATCHED;
                     hatchType    = U_HS_DIAGCROSS;
-                    hatchColor   = U_RGB(0xFF,0xC3,0xC3);
-                } 
+                    hatchColor   = U_RGB(0xFF, 0xC3, 0xC3);
+                }
             }
-        }
-        else if(SP_IS_GRADIENT(SP_STYLE_STROKE_SERVER(style))){ // must be a gradient
+        } else if (SP_IS_GRADIENT(SP_STYLE_STROKE_SERVER(style))) { // must be a gradient
             // currently we do not do anything with gradients, the code below has no net effect.
 
             SPPaintServer *paintserver = style->stroke.value.href->getObject();
-            if (SP_IS_LINEARGRADIENT (paintserver)) {
-                SPLinearGradient *lg=SP_LINEARGRADIENT(paintserver);
+            if (SP_IS_LINEARGRADIENT(paintserver)) {
+                SPLinearGradient *lg = SP_LINEARGRADIENT(paintserver);
 
                 SP_GRADIENT(lg)->ensureVector(); // when exporting from commandline, vector is not built
 
-                Geom::Point p1 (lg->x1.computed, lg->y1.computed);
-                Geom::Point p2 (lg->x2.computed, lg->y2.computed);
+                Geom::Point p1(lg->x1.computed, lg->y1.computed);
+                Geom::Point p2(lg->x2.computed, lg->y2.computed);
 
                 if (lg->gradientTransform_set) {
                     p1 = p1 * lg->gradientTransform;
                     p2 = p2 * lg->gradientTransform;
                 }
                 hatchColor = avg_stop_color(lg);
-             }
-            else if (SP_IS_RADIALGRADIENT (paintserver)) {
-                SPRadialGradient *rg=SP_RADIALGRADIENT(paintserver);
+            } else if (SP_IS_RADIALGRADIENT(paintserver)) {
+                SPRadialGradient *rg = SP_RADIALGRADIENT(paintserver);
 
                 SP_GRADIENT(rg)->ensureVector(); // when exporting from commandline, vector is not built
                 double r = rg->r.computed;
 
-                Geom::Point c (rg->cx.computed, rg->cy.computed);
+                Geom::Point c(rg->cx.computed, rg->cy.computed);
                 Geom::Point xhandle_point(r, 0);
                 Geom::Point yhandle_point(0, -r);
                 yhandle_point += c;
@@ -942,18 +631,15 @@ int PrintEmf::create_pen(SPStyle const *style, const Geom::Affine &transform)
                     xhandle_point = xhandle_point * rg->gradientTransform;
                 }
                 hatchColor = avg_stop_color(rg);
-            }
-            else {
+            } else {
                 // default fill
             }
-        }
-        else if(style->stroke.isColor()){ // test last, always seems to be set, even for other types above
-            sp_color_get_rgb_floatv( &style->stroke.value.color, rgb );
+        } else if (style->stroke.isColor()) { // test last, always seems to be set, even for other types above
+            sp_color_get_rgb_floatv(&style->stroke.value.color, rgb);
             brushStyle = U_BS_SOLID;
-            hatchColor = U_RGB(255*rgb[0], 255*rgb[1], 255*rgb[2]);
+            hatchColor = U_RGB(255 * rgb[0], 255 * rgb[1], 255 * rgb[2]);
             hatchType  = U_HS_SOLIDCLR;
-        }
-        else {
+        } else {
             // default fill
         }
 
@@ -968,30 +654,40 @@ int PrintEmf::create_pen(SPStyle const *style, const Geom::Affine &transform)
         Geom::Point p1(one * transform);
         Geom::Point p(p1 - p0);
 
-        double scale = sqrt( (p[X]*p[X]) + (p[Y]*p[Y]) ) / sqrt(2);
-
-        if(!style->stroke_width.computed){return 0;}  //if width is 0 do not (reset) the pen, it should already be NULL_PEN
-        uint32_t linewidth = MAX( 1, (uint32_t) round(scale * style->stroke_width.computed * PX2WORLD) );
+        double scale = sqrt((p[X] * p[X]) + (p[Y] * p[Y])) / sqrt(2);
 
-        if (     style->stroke_linecap.computed == 0){   linecap = U_PS_ENDCAP_FLAT;   }
-        else if (style->stroke_linecap.computed == 1){   linecap = U_PS_ENDCAP_ROUND;  }
-        else if (style->stroke_linecap.computed == 2){   linecap = U_PS_ENDCAP_SQUARE; }
+        if (!style->stroke_width.computed) {
+            return 0;   //if width is 0 do not (reset) the pen, it should already be NULL_PEN
+        }
+        uint32_t linewidth = MAX(1, (uint32_t) round(scale * style->stroke_width.computed * PX2WORLD));
+
+        if (style->stroke_linecap.computed == 0) {
+            linecap = U_PS_ENDCAP_FLAT;
+        } else if (style->stroke_linecap.computed == 1) {
+            linecap = U_PS_ENDCAP_ROUND;
+        } else if (style->stroke_linecap.computed == 2) {
+            linecap = U_PS_ENDCAP_SQUARE;
+        }
 
-        if (     style->stroke_linejoin.computed == 0){  linejoin = U_PS_JOIN_MITER;   }
-        else if (style->stroke_linejoin.computed == 1){  linejoin = U_PS_JOIN_ROUND;   }
-        else if (style->stroke_linejoin.computed == 2){  linejoin = U_PS_JOIN_BEVEL;   }
+        if (style->stroke_linejoin.computed == 0) {
+            linejoin = U_PS_JOIN_MITER;
+        } else if (style->stroke_linejoin.computed == 1) {
+            linejoin = U_PS_JOIN_ROUND;
+        } else if (style->stroke_linejoin.computed == 2) {
+            linejoin = U_PS_JOIN_BEVEL;
+        }
 
         if (style->stroke_dash.n_dash   &&
-            style->stroke_dash.dash       )
-        {
-            if(FixPPTDashLine){ // will break up line into many smaller lines.  Override gradient if that was set, cannot do both.
+                style->stroke_dash.dash) {
+            if (FixPPTDashLine) { // will break up line into many smaller lines.  Override gradient if that was set, cannot do both.
                 brushStyle = U_BS_SOLID;
                 hatchType  = U_HS_HORIZONTAL;
-            }
-            else {
+            } else {
                 int i = 0;
-                while ( (linestyle != U_PS_USERSTYLE) && (i < style->stroke_dash.n_dash) ){
-                    if (style->stroke_dash.dash[i] > 0.00000001){ linestyle = U_PS_USERSTYLE; }
+                while ((linestyle != U_PS_USERSTYLE) && (i < style->stroke_dash.n_dash)) {
+                    if (style->stroke_dash.dash[i] > 0.00000001) {
+                        linestyle = U_PS_USERSTYLE;
+                    }
                     i++;
                 }
 
@@ -999,44 +695,47 @@ int PrintEmf::create_pen(SPStyle const *style, const Geom::Affine &transform)
                     n_dash = style->stroke_dash.n_dash;
                     dash = new uint32_t[n_dash];
                     for (i = 0; i < style->stroke_dash.n_dash; i++) {
-                        dash[i] = (uint32_t) (style->stroke_dash.dash[i]);
+                        dash[i] = (uint32_t)(style->stroke_dash.dash[i]);
                     }
                 }
-             }
+            }
         }
 
         elp = extlogpen_set(
-            U_PS_GEOMETRIC | linestyle | linecap | linejoin,
-            linewidth,
-            brushStyle,
-            hatchColor,
-            hatchType,
-            n_dash,
-            dash);
-
-    }
-    else { // if (!style)
-        linejoin=0;
+                  U_PS_GEOMETRIC | linestyle | linecap | linejoin,
+                  linewidth,
+                  brushStyle,
+                  hatchColor,
+                  hatchType,
+                  n_dash,
+                  dash);
+
+    } else { // if (!style)
+        linejoin = 0;
         elp = extlogpen_set(
-            linestyle,
-            1,
-            U_BS_SOLID,
-            U_RGB(0,0,0),
-            U_HS_HORIZONTAL,
-            0,
-            NULL);
+                  linestyle,
+                  1,
+                  U_BS_SOLID,
+                  U_RGB(0, 0, 0),
+                  U_HS_HORIZONTAL,
+                  0,
+                  NULL);
     }
 
-    rec = extcreatepen_set(&pen, eht,  Bmi, cbPx, px, elp );
-    if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
+    rec = extcreatepen_set(&pen, eht,  Bmi, cbPx, px, elp);
+    if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
         g_error("Fatal programming error in PrintEmf::create_pen at extcreatepen_set");
     }
     free(elp);
-    if(Bmi)free(Bmi);
-    if(px)free(px);  // ct will always be NULL
+    if (Bmi) {
+        free(Bmi);
+    }
+    if (px) {
+        free(px);    // ct will always be NULL
+    }
 
     rec = selectobject_set(pen, eht);
-    if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
+    if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
         g_error("Fatal programming error in PrintEmf::create_pen at selectobject_set");
     }
     hpen = pen;  // need this later for destroy_pen
@@ -1044,15 +743,19 @@ int PrintEmf::create_pen(SPStyle const *style, const Geom::Affine &transform)
     if (linejoin == U_PS_JOIN_MITER) {
         float miterlimit = style->stroke_miterlimit.value;  // This is a ratio.
 
-        if (miterlimit < 1)miterlimit = 1;
+        if (miterlimit < 1) {
+            miterlimit = 1;
+        }
 
         rec = U_EMRSETMITERLIMIT_set((uint32_t) miterlimit);
-        if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
+        if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
             g_error("Fatal programming error in PrintEmf::create_pen at U_EMRSETMITERLIMIT_set");
         }
     }
 
-    if (n_dash) { delete[] dash; }
+    if (n_dash) {
+        delete[] dash;
+    }
     return 0;
 }
 
@@ -1064,12 +767,12 @@ void PrintEmf::destroy_pen()
     // select in a stock object to deselect this one, the stock object should
     // never be used because we always select in a new one before drawing anythingrestore previous brush, necessary??? Would using a default stock object not work?
     rec = selectobject_set(U_NULL_PEN, eht);
-    if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
+    if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
         g_error("Fatal programming error in PrintEmf::destroy_pen at selectobject_set");
     }
-    if (hpen){
+    if (hpen) {
         rec = deleteobject_set(&hpen, eht);
-        if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
+        if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
             g_error("Fatal programming error in PrintEmf::destroy_pen");
         }
         hpen = 0;
@@ -1077,169 +780,6 @@ void PrintEmf::destroy_pen()
 }
 
 
-
-unsigned int PrintEmf::bind(Inkscape::Extension::Print * /*mod*/, Geom::Affine const &transform, float /*opacity*/)
-{   
-    if (!m_tr_stack.empty()) {
-        Geom::Affine tr_top = m_tr_stack.top();
-        m_tr_stack.push(transform * tr_top);
-    } else {
-        m_tr_stack.push(transform);
-    }
-
-    return 1;
-}
-
-unsigned int PrintEmf::release(Inkscape::Extension::Print * /*mod*/)
-{
-    m_tr_stack.pop();
-    return 1;
-}
-
-#define clrweight(a,b,t) ((1-t)*((double) a) + (t)*((double) b))
-inline U_COLORREF PrintEmf::weight_opacity(U_COLORREF c1){
-    float opa = c1.Reserved/255.0;
-    U_COLORREF result = U_RGB(
-        255*opweight((float)c1.Red  /255.0, gv.rgb[0], opa),
-        255*opweight((float)c1.Green/255.0, gv.rgb[1], opa),
-        255*opweight((float)c1.Blue /255.0, gv.rgb[2], opa)
-    );
-    return result;
-}
-
-
-// return the color between c1 and c2, c1 for t=0, c2 for t=1.0
-U_COLORREF PrintEmf::weight_colors(U_COLORREF c1, U_COLORREF c2, double t){
-    U_COLORREF result;
-    result.Red      = clrweight(c1.Red,      c2.Red,      t);
-    result.Green    = clrweight(c1.Green,    c2.Green,    t);
-    result.Blue     = clrweight(c1.Blue,     c2.Blue,     t);
-    result.Reserved = clrweight(c1.Reserved, c2.Reserved, t);
-
-    // now handle the opacity, mix the RGB with background at the weighted opacity
-    
-    if(result.Reserved != 255)result = weight_opacity(result);
-
-    return result;
-}
-
-/*  convert from center ellipse to SVGEllipticalArc ellipse
-   
-    From:
-    http://www.w3.org/TR/SVG/implnote.html#ArcConversionEndpointToCenter
-    A point (x,y) on the arc can be found by:
-
-    {x,y} = {cx,cy} + {cosF,-sinF,sinF,cosF} x {rxcosT,rysinT}
-
-    where 
-      {cx,cy} is the center of the ellipse
-      F       is the rotation angle of the X axis of the ellipse from the true X axis
-      T       is the rotation angle around the ellipse
-      {,,,}   is the rotation matrix
-      rx,ry   are the radii of the ellipse's axes
-
-    For SVG parameterization need two points.  
-    Arbitrarily we can use T=0 and T=pi
-    Since the sweep is 180 the flags are always 0:
-
-    F is in RADIANS, but the SVGEllipticalArc needs degrees!
-
-*/
-Geom::PathVector PrintEmf::center_ellipse_as_SVG_PathV(Geom::Point ctr, double rx, double ry, double F){
-    using Geom::X;
-    using Geom::Y;
-    double x1,y1,x2,y2;
-    Geom::Path SVGep;
- 
-    x1 = ctr[X]  +  cos(F) * rx * cos(0)      +   sin(-F) * ry * sin(0);
-    y1 = ctr[Y]  +  sin(F) * rx * cos(0)      +   cos(F)  * ry * sin(0);
-    x2 = ctr[X]  +  cos(F) * rx * cos(M_PI)   +   sin(-F) * ry * sin(M_PI);
-    y2 = ctr[Y]  +  sin(F) * rx * cos(M_PI)   +   cos(F)  * ry * sin(M_PI);
-
-    char text[256];
-    sprintf(text," M %f,%f A %f %f %f 0 0 %f %f A %f %f %f 0 0 %f %f z",x1,y1,  rx,ry,F*360./(2.*M_PI),x2,y2,   rx,ry,F*360./(2.*M_PI),x1,y1);
-    std::vector<Geom::Path> outres =  Geom::parse_svg_path(text);
-    return outres;
-}
-
-
-/*  rx2,ry2 must be larger than rx1,ry1!
-    angle is in RADIANS
-*/
-Geom::PathVector PrintEmf::center_elliptical_ring_as_SVG_PathV(Geom::Point ctr, double rx1, double ry1, double rx2, double ry2, double F){
-    using Geom::X;
-    using Geom::Y;
-    double x11,y11,x12,y12;
-    double x21,y21,x22,y22;
-    double degrot = F*360./(2.*M_PI);
- 
-    x11 = ctr[X]  +  cos(F) * rx1 * cos(0)      +   sin(-F) * ry1 * sin(0);
-    y11 = ctr[Y]  +  sin(F) * rx1 * cos(0)      +   cos(F)  * ry1 * sin(0);
-    x12 = ctr[X]  +  cos(F) * rx1 * cos(M_PI)   +   sin(-F) * ry1 * sin(M_PI);
-    y12 = ctr[Y]  +  sin(F) * rx1 * cos(M_PI)   +   cos(F)  * ry1 * sin(M_PI);
-
-    x21 = ctr[X]  +  cos(F) * rx2 * cos(0)      +   sin(-F) * ry2 * sin(0);
-    y21 = ctr[Y]  +  sin(F) * rx2 * cos(0)      +   cos(F)  * ry2 * sin(0);
-    x22 = ctr[X]  +  cos(F) * rx2 * cos(M_PI)   +   sin(-F) * ry2 * sin(M_PI);
-    y22 = ctr[Y]  +  sin(F) * rx2 * cos(M_PI)   +   cos(F)  * ry2 * sin(M_PI);
-
-    char text[512];
-    sprintf(text," M %f,%f A %f %f %f 0 1 %f %f A %f %f %f 0 1 %f %f z M %f,%f  A %f %f %f 0 0 %f %f A %f %f %f 0 0 %f %f z",
-      x11,y11,  rx1,ry1,degrot,x12,y12,   rx1,ry1,degrot,x11,y11,
-      x21,y21,  rx2,ry2,degrot,x22,y22,   rx2,ry2,degrot,x21,y21);
-    std::vector<Geom::Path> outres =  Geom::parse_svg_path(text);
-
-    return outres;
-}
-
-/* Elliptical hole in a large square extending from -50k to +50k */
-Geom::PathVector PrintEmf::center_elliptical_hole_as_SVG_PathV(Geom::Point ctr, double rx, double ry, double F){
-    using Geom::X;
-    using Geom::Y;
-    double x1,y1,x2,y2;
-    Geom::Path SVGep;
- 
-    x1 = ctr[X]  +  cos(F) * rx * cos(0)      +   sin(-F) * ry * sin(0);
-    y1 = ctr[Y]  +  sin(F) * rx * cos(0)      +   cos(F)  * ry * sin(0);
-    x2 = ctr[X]  +  cos(F) * rx * cos(M_PI)   +   sin(-F) * ry * sin(M_PI);
-    y2 = ctr[Y]  +  sin(F) * rx * cos(M_PI)   +   cos(F)  * ry * sin(M_PI);
-
-    char text[256];
-    sprintf(text," M %f,%f A %f %f %f 0 0 %f %f A %f %f %f 0 0 %f %f z M 50000,50000 50000,-50000 -50000,-50000 -50000,50000 z",
-     x1,y1,  rx,ry,F*360./(2.*M_PI),x2,y2,   rx,ry,F*360./(2.*M_PI),x1,y1);
-    std::vector<Geom::Path> outres =  Geom::parse_svg_path(text);
-    return outres;
-}
-
-/* rectangular cutter. 
-ctr    "center" of rectangle (might not actually be in the center with respect to leading/trailing edges
-pos    vector from center to leading edge
-neg    vector from center to trailing edge
-width  vector to side edge 
-*/
-Geom::PathVector PrintEmf::rect_cutter(Geom::Point ctr, Geom::Point pos, Geom::Point neg, Geom::Point width){
-    std::vector<Geom::Path> outres;
-    Geom::Path cutter;
-    cutter.start(                       ctr + pos - width);
-    cutter.appendNew<Geom::LineSegment>(ctr + pos + width);
-    cutter.appendNew<Geom::LineSegment>(ctr + neg + width);
-    cutter.appendNew<Geom::LineSegment>(ctr + neg - width);
-    cutter.close();
-    outres.push_back(cutter);
-    return outres;
-}
-
-/*  Convert from SPWindRule to livarot's FillRule
-    This is similar to what sp_selected_path_boolop() does
-*/
-FillRule PrintEmf::SPWR_to_LVFR(SPWindRule wr){
-    FillRule fr;
-    if(wr ==  SP_WIND_RULE_EVENODD){ fr = fill_oddEven; }
-    else {                           fr = fill_nonZero; }
-    return fr;
-}
-
-
 unsigned int PrintEmf::fill(
     Inkscape::Extension::Print * /*mod*/,
     Geom::PathVector const &pathv, Geom::Affine const & /*transform*/, SPStyle const *style,
@@ -1255,7 +795,7 @@ unsigned int PrintEmf::fill(
 
     fill_transform = tf;
 
-    if (create_brush(style, NULL)){ // only happens if the style is a gradient
+    if (create_brush(style, NULL)) { // only happens if the style is a gradient
         /*
             Handle gradients.  Uses modified livarot as 2geom boolops is currently broken.
             Can handle gradients with multiple stops.
@@ -1267,36 +807,36 @@ unsigned int PrintEmf::fill(
         destroy_pen();  //this sets the NULL_PEN, otherwise gradient slices may display with boundaries, see longer explanation below
         Geom::Path cutter;
         float      rgb[3];
-        U_COLORREF wc,c1,c2;
-        FillRule   frb = SPWR_to_LVFR( (SPWindRule) style->fill_rule.computed);
-        double     doff,doff_base,doff_range;
-        double     divisions= 128.0;
+        U_COLORREF wc, c1, c2;
+        FillRule   frb = SPWR_to_LVFR((SPWindRule) style->fill_rule.computed);
+        double     doff, doff_base, doff_range;
+        double     divisions = 128.0;
         int        nstops;
         int        istop =     1;
         float      opa;                     // opacity at stop
 
-        SPRadialGradient *tg = (SPRadialGradient *) (gv.grad);  // linear/radial are the same here
+        SPRadialGradient *tg = (SPRadialGradient *)(gv.grad);   // linear/radial are the same here
         nstops = tg->vector.stops.size();
         sp_color_get_rgb_floatv(&tg->vector.stops[0].color, rgb);
         opa    = tg->vector.stops[0].opacity;
-        c1     = U_RGBA( 255*rgb[0], 255*rgb[1], 255*rgb[2], 255*opa );
-        sp_color_get_rgb_floatv(&tg->vector.stops[nstops-1].color, rgb);
-        opa    = tg->vector.stops[nstops-1].opacity;
-        c2     = U_RGBA( 255*rgb[0], 255*rgb[1], 255*rgb[2], 255*opa );
+        c1     = U_RGBA(255 * rgb[0], 255 * rgb[1], 255 * rgb[2], 255 * opa);
+        sp_color_get_rgb_floatv(&tg->vector.stops[nstops - 1].color, rgb);
+        opa    = tg->vector.stops[nstops - 1].opacity;
+        c2     = U_RGBA(255 * rgb[0], 255 * rgb[1], 255 * rgb[2], 255 * opa);
 
         doff       = 0.0;
         doff_base  = 0.0;
         doff_range = tg->vector.stops[1].offset;              // next or last stop
 
-        if(gv.mode==DRAW_RADIAL_GRADIENT){
+        if (gv.mode == DRAW_RADIAL_GRADIENT) {
             Geom::Point xv = gv.p2 - gv.p1;           // X'  vector
             Geom::Point yv = gv.p3 - gv.p1;           // Y'  vector
             Geom::Point xuv = Geom::unit_vector(xv);  // X' unit vector
-            double rx = hypot(xv[X],xv[Y]);
-            double ry = hypot(yv[X],yv[Y]);
-            double range    = fmax(rx,ry);            // length along the gradient
-            double step     = range/divisions;        // adequate approximation for gradient
-            double overlap  = step/4.0;               // overlap slices slightly
+            double rx = hypot(xv[X], xv[Y]);
+            double ry = hypot(yv[X], yv[Y]);
+            double range    = fmax(rx, ry);           // length along the gradient
+            double step     = range / divisions;      // adequate approximation for gradient
+            double overlap  = step / 4.0;             // overlap slices slightly
             double start;
             double stop;
             Geom::PathVector pathvc, pathvr;
@@ -1304,103 +844,108 @@ unsigned int PrintEmf::fill(
             /*  radial gradient might stop part way through the shape, fill with outer color from there to "infinity".
                 Do this first so that outer colored ring will overlay it.
             */
-            pathvc = center_elliptical_hole_as_SVG_PathV(gv.p1, rx*(1.0 - overlap/range), ry*(1.0 - overlap/range), asin(xuv[Y]));
+            pathvc = center_elliptical_hole_as_SVG_PathV(gv.p1, rx * (1.0 - overlap / range), ry * (1.0 - overlap / range), asin(xuv[Y]));
             pathvr = sp_pathvector_boolop(pathvc, pathv, bool_op_inters, (FillRule) fill_oddEven, frb);
-            wc = weight_opacity(c2); 
+            wc = weight_opacity(c2);
             (void) create_brush(style, &wc);
             print_pathv(pathvr, fill_transform);
 
             sp_color_get_rgb_floatv(&tg->vector.stops[istop].color, rgb);
             opa = tg->vector.stops[istop].opacity;
-            c2 = U_RGBA( 255*rgb[0], 255*rgb[1], 255*rgb[2], 255*opa );
+            c2 = U_RGBA(255 * rgb[0], 255 * rgb[1], 255 * rgb[2], 255 * opa);
 
-            for(start = 0.0; start < range; start += step, doff += 1./divisions){
+            for (start = 0.0; start < range; start += step, doff += 1. / divisions) {
                 stop = start + step + overlap;
-                if(stop > range)stop=range;
-                wc = weight_colors(c1, c2, (doff - doff_base)/(doff_range-doff_base) );
+                if (stop > range) {
+                    stop = range;
+                }
+                wc = weight_colors(c1, c2, (doff - doff_base) / (doff_range - doff_base));
                 (void) create_brush(style, &wc);
 
-                pathvc = center_elliptical_ring_as_SVG_PathV(gv.p1, rx*start/range, ry*start/range, rx*stop/range, ry*stop/range, asin(xuv[Y]));
+                pathvc = center_elliptical_ring_as_SVG_PathV(gv.p1, rx * start / range, ry * start / range, rx * stop / range, ry * stop / range, asin(xuv[Y]));
 
                 pathvr = sp_pathvector_boolop(pathvc, pathv, bool_op_inters, (FillRule) fill_nonZero, frb);
                 print_pathv(pathvr, fill_transform);  // show the intersection
 
-                if(doff >= doff_range - doff_base){
+                if (doff >= doff_range - doff_base) {
                     istop++;
-                    if(istop >= nstops)continue; // could happen on a rounding error
+                    if (istop >= nstops) {
+                        continue;    // could happen on a rounding error
+                    }
                     doff_base  = doff_range;
                     doff_range = tg->vector.stops[istop].offset;  // next or last stop
-                    c1=c2;
+                    c1 = c2;
                     sp_color_get_rgb_floatv(&tg->vector.stops[istop].color, rgb);
                     opa = tg->vector.stops[istop].opacity;
-                    c2 = U_RGBA( 255*rgb[0], 255*rgb[1], 255*rgb[2], 255*opa );
+                    c2 = U_RGBA(255 * rgb[0], 255 * rgb[1], 255 * rgb[2], 255 * opa);
                 }
             }
-        }
-        else if(gv.mode == DRAW_LINEAR_GRADIENT){
+        } else if (gv.mode == DRAW_LINEAR_GRADIENT) {
             Geom::Point uv  = Geom::unit_vector(gv.p2 - gv.p1);  // unit vector
             Geom::Point puv = uv.cw();                           // perp. to unit vector
-            double range    = Geom::distance(gv.p1,gv.p2);       // length along the gradient
-            double step     = range/divisions;                   // adequate approximation for gradient
-            double overlap  = step/4.0;                          // overlap slices slightly
+            double range    = Geom::distance(gv.p1, gv.p2);      // length along the gradient
+            double step     = range / divisions;                 // adequate approximation for gradient
+            double overlap  = step / 4.0;                        // overlap slices slightly
             double start;
             double stop;
             Geom::PathVector pathvc, pathvr;
 
             /* before lower end of gradient, overlap first slice position */
-            wc = weight_opacity(c1); 
+            wc = weight_opacity(c1);
             (void) create_brush(style, &wc);
-            pathvc = rect_cutter(gv.p1, uv*(overlap), uv*(-50000.0), puv*50000.0);
+            pathvc = rect_cutter(gv.p1, uv * (overlap), uv * (-50000.0), puv * 50000.0);
             pathvr = sp_pathvector_boolop(pathvc, pathv, bool_op_inters, (FillRule) fill_nonZero, frb);
             print_pathv(pathvr, fill_transform);
 
             /* after high end of gradient, overlap last slice poosition */
-            wc = weight_opacity(c2); 
+            wc = weight_opacity(c2);
             (void) create_brush(style, &wc);
-            pathvc = rect_cutter(gv.p2, uv*(-overlap), uv*(50000.0), puv*50000.0);
+            pathvc = rect_cutter(gv.p2, uv * (-overlap), uv * (50000.0), puv * 50000.0);
             pathvr = sp_pathvector_boolop(pathvc, pathv, bool_op_inters, (FillRule) fill_nonZero, frb);
             print_pathv(pathvr, fill_transform);
 
             sp_color_get_rgb_floatv(&tg->vector.stops[istop].color, rgb);
             opa = tg->vector.stops[istop].opacity;
-            c2 = U_RGBA( 255*rgb[0], 255*rgb[1], 255*rgb[2], 255*opa );
+            c2 = U_RGBA(255 * rgb[0], 255 * rgb[1], 255 * rgb[2], 255 * opa);
 
-            for(start = 0.0; start < range; start += step, doff += 1./divisions){
+            for (start = 0.0; start < range; start += step, doff += 1. / divisions) {
                 stop = start + step + overlap;
-                if(stop > range)stop=range;
-                pathvc = rect_cutter(gv.p1, uv*start, uv*stop, puv*50000.0);
+                if (stop > range) {
+                    stop = range;
+                }
+                pathvc = rect_cutter(gv.p1, uv * start, uv * stop, puv * 50000.0);
 
-                wc = weight_colors(c1, c2, (doff - doff_base)/(doff_range-doff_base) );
+                wc = weight_colors(c1, c2, (doff - doff_base) / (doff_range - doff_base));
                 (void) create_brush(style, &wc);
                 Geom::PathVector pathvr = sp_pathvector_boolop(pathvc, pathv, bool_op_inters, (FillRule) fill_nonZero, frb);
                 print_pathv(pathvr, fill_transform);  // show the intersection
 
-                if(doff >= doff_range - doff_base){
+                if (doff >= doff_range - doff_base) {
                     istop++;
-                    if(istop >= nstops)continue; // could happen on a rounding error
+                    if (istop >= nstops) {
+                        continue;    // could happen on a rounding error
+                    }
                     doff_base  = doff_range;
                     doff_range = tg->vector.stops[istop].offset;  // next or last stop
-                    c1=c2;
+                    c1 = c2;
                     sp_color_get_rgb_floatv(&tg->vector.stops[istop].color, rgb);
                     opa = tg->vector.stops[istop].opacity;
-                    c2 = U_RGBA( 255*rgb[0], 255*rgb[1], 255*rgb[2], 255*opa );
+                    c2 = U_RGBA(255 * rgb[0], 255 * rgb[1], 255 * rgb[2], 255 * opa);
                 }
             }
-        }
-        else {
+        } else {
             g_error("Fatal programming error in PrintEmf::fill, invalid gradient type detected");
         }
         use_fill = false;  // gradients handled, be sure stroke does not use stroke and fill
-    }
-    else {
+    } else {
         /*
-            Inkscape was not calling create_pen for objects with no border. 
+            Inkscape was not calling create_pen for objects with no border.
             This was because it never called stroke() (next method).
             PPT, and presumably others, pick whatever they want for the border if it is not specified, so no border can
             become a visible border.
             To avoid this force the pen to NULL_PEN if we can determine that no pen will be needed after the fill.
         */
-        if (style->stroke.noneSet || style->stroke_width.computed == 0.0){
+        if (style->stroke.noneSet || style->stroke_width.computed == 0.0) {
             destroy_pen();  //this sets the NULL_PEN
         }
 
@@ -1408,16 +953,18 @@ unsigned int PrintEmf::fill(
             Dashes converted to line segments will "open" a closed path.
         */
         bool all_closed = true;
-        for (Geom::PathVector::const_iterator pit = pathv.begin(); pit != pathv.end(); ++pit){
-            for (Geom::Path::const_iterator cit = pit->begin(); cit != pit->end_open(); ++cit){
-                if (pit->end_default() != pit->end_closed()) { all_closed=false; }
+        for (Geom::PathVector::const_iterator pit = pathv.begin(); pit != pathv.end(); ++pit) {
+            for (Geom::Path::const_iterator cit = pit->begin(); cit != pit->end_open(); ++cit) {
+                if (pit->end_default() != pit->end_closed()) {
+                    all_closed = false;
+                }
             }
         }
         if (
             (style->stroke.isNone() || style->stroke.noneSet || style->stroke_width.computed == 0.0) ||
             (style->stroke_dash.n_dash   &&  style->stroke_dash.dash  && FixPPTDashLine)             ||
             !all_closed
-        ){
+        ) {
             print_pathv(pathv, fill_transform);  // do any fills. side effect: clears fill_pathv
             use_fill = false;
         }
@@ -1427,63 +974,71 @@ unsigned int PrintEmf::fill(
 }
 
 
-unsigned int PrintEmf::stroke (
+unsigned int PrintEmf::stroke(
     Inkscape::Extension::Print * /*mod*/,
     Geom::PathVector const &pathv, const Geom::Affine &/*transform*/, const SPStyle *style,
     Geom::OptRect const &/*pbox*/, Geom::OptRect const &/*dbox*/, Geom::OptRect const &/*bbox*/)
 {
-    
+
     char *rec = NULL;
     Geom::Affine tf = m_tr_stack.top();
 
     use_stroke = true;
-//  use_fill was set in ::fill, if it is needed
+    //  use_fill was set in ::fill, if it is needed
+
+    if (create_pen(style, tf)) {
+        return 0;
+    }
 
-    if (create_pen(style, tf))return 0;
-    
-    if (style->stroke_dash.n_dash   &&  style->stroke_dash.dash  && FixPPTDashLine  ){
+    if (style->stroke_dash.n_dash   &&  style->stroke_dash.dash  && FixPPTDashLine) {
         // convert the path, gets its complete length, and then make a new path with parameter length instead of t
         Geom::Piecewise<Geom::D2<Geom::SBasis> > tmp_pathpw;  // pathv-> sbasis
         Geom::Piecewise<Geom::D2<Geom::SBasis> > tmp_pathpw2; // sbasis using arc length parameter
         Geom::Piecewise<Geom::D2<Geom::SBasis> > tmp_pathpw3; // new (discontinuous) path, composed of dots/dashes
         Geom::Piecewise<Geom::D2<Geom::SBasis> > first_frag;  // first fragment, will be appended at end
         int n_dash = style->stroke_dash.n_dash;
-        int i=0; //dash index
+        int i = 0; //dash index
         double tlength;                                       // length of tmp_pathpw
-        double slength=0.0;                                   // start of gragment
+        double slength = 0.0;                                 // start of gragment
         double elength;                                       // end of gragment
-        for (unsigned int i=0; i < pathv.size(); i++) {
+        for (unsigned int i = 0; i < pathv.size(); i++) {
             tmp_pathpw.concat(pathv[i].toPwSb());
         }
-        tlength = length(tmp_pathpw,0.1);
+        tlength = length(tmp_pathpw, 0.1);
         tmp_pathpw2 = arc_length_parametrization(tmp_pathpw);
 
         // go around the dash array repeatedly until the entire path is consumed (but not beyond).
-        while(slength < tlength){
+        while (slength < tlength) {
             elength = slength + style->stroke_dash.dash[i++];
-            if(elength > tlength)elength = tlength;
+            if (elength > tlength) {
+                elength = tlength;
+            }
             Geom::Piecewise<Geom::D2<Geom::SBasis> > fragment(portion(tmp_pathpw2, slength, elength));
-            if(slength){  tmp_pathpw3.concat(fragment); }
-            else {        first_frag = fragment;        }
+            if (slength) {
+                tmp_pathpw3.concat(fragment);
+            } else {
+                first_frag = fragment;
+            }
             slength = elength;
             slength += style->stroke_dash.dash[i++];  // the gap
-            if(i>=n_dash)i=0;
+            if (i >= n_dash) {
+                i = 0;
+            }
         }
         tmp_pathpw3.concat(first_frag); // may merge line around start point
-        Geom::PathVector out_pathv = Geom::path_from_piecewise(tmp_pathpw3, 0.01); 
+        Geom::PathVector out_pathv = Geom::path_from_piecewise(tmp_pathpw3, 0.01);
         print_pathv(out_pathv, tf);
-    }
-    else {
+    } else {
         print_pathv(pathv, tf);
     }
 
     use_stroke = false;
     use_fill   = false;
 
-    if(usebk){  // OPAQUE was set, revert to TRANSPARENT
+    if (usebk) { // OPAQUE was set, revert to TRANSPARENT
         usebk = false;
         rec = U_EMRSETBKMODE_set(U_TRANSPARENT);
-        if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
+        if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
             g_error("Fatal programming error in PrintEmf::stroke at U_EMRSETBKMODE_set");
         }
     }
@@ -1498,39 +1053,40 @@ unsigned int PrintEmf::stroke (
 bool PrintEmf::print_simple_shape(Geom::PathVector const &pathv, const Geom::Affine &transform)
 {
 
-    Geom::PathVector pv = pathv_to_linear_and_cubic_beziers( pathv * transform );
-    
+    Geom::PathVector pv = pathv_to_linear_and_cubic_beziers(pathv * transform);
+
     int nodes  = 0;
     int moves  = 0;
     int lines  = 0;
     int curves = 0;
     char *rec  = NULL;
 
-    for (Geom::PathVector::const_iterator pit = pv.begin(); pit != pv.end(); ++pit)
-    {
+    for (Geom::PathVector::const_iterator pit = pv.begin(); pit != pv.end(); ++pit) {
         moves++;
         nodes++;
-        
-        for (Geom::Path::const_iterator cit = pit->begin(); cit != pit->end_open(); ++cit)
-        {
+
+        for (Geom::Path::const_iterator cit = pit->begin(); cit != pit->end_open(); ++cit) {
             nodes++;
-            
-            if ( is_straight_curve(*cit) ) { lines++;  }
-            else if(&*cit) {                 curves++; }
+
+            if (is_straight_curve(*cit)) {
+                lines++;
+            } else if (&*cit) {
+                curves++;
+            }
         }
     }
 
-    if (!nodes)
+    if (!nodes) {
         return false;
-    
-    U_POINT *lpPoints = new U_POINT[moves + lines + curves*3];
+    }
+
+    U_POINT *lpPoints = new U_POINT[moves + lines + curves * 3];
     int i = 0;
 
     /**
      * For all Subpaths in the <path>
      */
-    for (Geom::PathVector::const_iterator pit = pv.begin(); pit != pv.end(); ++pit)
-    {
+    for (Geom::PathVector::const_iterator pit = pv.begin(); pit != pv.end(); ++pit) {
         using Geom::X;
         using Geom::Y;
 
@@ -1538,7 +1094,7 @@ bool PrintEmf::print_simple_shape(Geom::PathVector const &pathv, const Geom::Aff
 
         p0[X] = (p0[X] * PX2WORLD);
         p0[Y] = (p0[Y] * PX2WORLD);
-        
+
         int32_t const x0 = (int32_t) round(p0[X]);
         int32_t const y0 = (int32_t) round(p0[Y]);
 
@@ -1549,10 +1105,8 @@ bool PrintEmf::print_simple_shape(Geom::PathVector const &pathv, const Geom::Aff
         /**
          * For all segments in the subpath
          */
-        for (Geom::Path::const_iterator cit = pit->begin(); cit != pit->end_open(); ++cit)
-        {
-            if ( is_straight_curve(*cit) )
-            {
+        for (Geom::Path::const_iterator cit = pit->begin(); cit != pit->end_open(); ++cit) {
+            if (is_straight_curve(*cit)) {
                 //Geom::Point p0 = cit->initialPoint();
                 Geom::Point p1 = cit->finalPoint();
 
@@ -1569,9 +1123,7 @@ bool PrintEmf::print_simple_shape(Geom::PathVector const &pathv, const Geom::Aff
                 lpPoints[i].x = x1;
                 lpPoints[i].y = y1;
                 i = i + 1;
-            }
-            else if (Geom::CubicBezier const *cubic = dynamic_cast<Geom::CubicBezier const*>(&*cit))
-            {
+            } else if (Geom::CubicBezier const *cubic = dynamic_cast<Geom::CubicBezier const *>(&*cit)) {
                 std::vector<Geom::Point> points = cubic->points();
                 //Geom::Point p0 = points[0];
                 Geom::Point p1 = points[1];
@@ -1586,7 +1138,7 @@ bool PrintEmf::print_simple_shape(Geom::PathVector const &pathv, const Geom::Aff
                 p1[Y] = (p1[Y] * PX2WORLD);
                 p2[Y] = (p2[Y] * PX2WORLD);
                 p3[Y] = (p3[Y] * PX2WORLD);
-                
+
                 //int32_t const x0 = (int32_t) round(p0[X]);
                 //int32_t const y0 = (int32_t) round(p0[Y]);
                 int32_t const x1 = (int32_t) round(p1[X]);
@@ -1598,107 +1150,110 @@ bool PrintEmf::print_simple_shape(Geom::PathVector const &pathv, const Geom::Aff
 
                 lpPoints[i].x = x1;
                 lpPoints[i].y = y1;
-                lpPoints[i+1].x = x2;
-                lpPoints[i+1].y = y2;
-                lpPoints[i+2].x = x3;
-                lpPoints[i+2].y = y3;
+                lpPoints[i + 1].x = x2;
+                lpPoints[i + 1].y = y2;
+                lpPoints[i + 2].x = x3;
+                lpPoints[i + 2].y = y3;
                 i = i + 3;
             }
         }
     }
 
     bool done = false;
-    bool closed = (lpPoints[0].x == lpPoints[i-1].x) && (lpPoints[0].y == lpPoints[i-1].y);
+    bool closed = (lpPoints[0].x == lpPoints[i - 1].x) && (lpPoints[0].y == lpPoints[i - 1].y);
     bool polygon = false;
     bool rectangle = false;
     bool ellipse = false;
-    
-    if (moves == 1 && moves+lines == nodes && closed) {
+
+    if (moves == 1 && moves + lines == nodes && closed) {
         polygon = true;
-//        if (nodes==5) {                             // disable due to LP Bug 407394
-//            if (lpPoints[0].x == lpPoints[3].x && lpPoints[1].x == lpPoints[2].x &&
-//                lpPoints[0].y == lpPoints[1].y && lpPoints[2].y == lpPoints[3].y)
-//            {
-//                rectangle = true;
-//            }
-//        }
-    }
-    else if (moves == 1 && nodes == 5 && moves+curves == nodes && closed) {
-//        if (lpPoints[0].x == lpPoints[1].x && lpPoints[1].x == lpPoints[11].x &&
-//            lpPoints[5].x == lpPoints[6].x && lpPoints[6].x == lpPoints[7].x &&
-//            lpPoints[2].x == lpPoints[10].x && lpPoints[3].x == lpPoints[9].x && lpPoints[4].x == lpPoints[8].x &&
-//            lpPoints[2].y == lpPoints[3].y && lpPoints[3].y == lpPoints[4].y &&
-//            lpPoints[8].y == lpPoints[9].y && lpPoints[9].y == lpPoints[10].y &&
-//            lpPoints[5].y == lpPoints[1].y && lpPoints[6].y == lpPoints[0].y && lpPoints[7].y == lpPoints[11].y)
-//        {                                           // disable due to LP Bug 407394
-//            ellipse = true;
-//        }
+        //        if (nodes==5) {                             // disable due to LP Bug 407394
+        //            if (lpPoints[0].x == lpPoints[3].x && lpPoints[1].x == lpPoints[2].x &&
+        //                lpPoints[0].y == lpPoints[1].y && lpPoints[2].y == lpPoints[3].y)
+        //            {
+        //                rectangle = true;
+        //            }
+        //        }
+    } else if (moves == 1 && nodes == 5 && moves + curves == nodes && closed) {
+        //        if (lpPoints[0].x == lpPoints[1].x && lpPoints[1].x == lpPoints[11].x &&
+        //            lpPoints[5].x == lpPoints[6].x && lpPoints[6].x == lpPoints[7].x &&
+        //            lpPoints[2].x == lpPoints[10].x && lpPoints[3].x == lpPoints[9].x && lpPoints[4].x == lpPoints[8].x &&
+        //            lpPoints[2].y == lpPoints[3].y && lpPoints[3].y == lpPoints[4].y &&
+        //            lpPoints[8].y == lpPoints[9].y && lpPoints[9].y == lpPoints[10].y &&
+        //            lpPoints[5].y == lpPoints[1].y && lpPoints[6].y == lpPoints[0].y && lpPoints[7].y == lpPoints[11].y)
+        //        {                                           // disable due to LP Bug 407394
+        //            ellipse = true;
+        //        }
     }
 
     if (polygon || ellipse) {
- 
+
         if (use_fill && !use_stroke) {  // only fill
             rec = selectobject_set(U_NULL_PEN, eht);
-            if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
+            if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
                 g_error("Fatal programming error in PrintEmf::print_simple_shape at selectobject_set pen");
             }
-        }
-        else if(!use_fill && use_stroke) { // only stroke
+        } else if (!use_fill && use_stroke) { // only stroke
             rec = selectobject_set(U_NULL_BRUSH, eht);
-            if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
+            if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
                 g_error("Fatal programming error in PrintEmf::print_simple_shape at selectobject_set brush");
             }
         }
 
         if (polygon) {
-            if (rectangle){
-                U_RECTL rcl = rectl_set((U_POINTL) {lpPoints[0].x, lpPoints[0].y}, (U_POINTL) {lpPoints[2].x, lpPoints[2].y});
+            if (rectangle) {
+                U_RECTL rcl = rectl_set((U_POINTL) {
+                    lpPoints[0].x, lpPoints[0].y
+                }, (U_POINTL) {
+                    lpPoints[2].x, lpPoints[2].y
+                });
                 rec = U_EMRRECTANGLE_set(rcl);
-            }
-            else {
+            } else {
                 rec = U_EMRPOLYGON_set(U_RCL_DEF, nodes, lpPoints);
             }
-        }
-        else if (ellipse) {
-            U_RECTL rcl = rectl_set((U_POINTL) {lpPoints[6].x, lpPoints[3].y}, (U_POINTL) {lpPoints[0].x, lpPoints[9].y});
+        } else if (ellipse) {
+            U_RECTL rcl = rectl_set((U_POINTL) {
+                lpPoints[6].x, lpPoints[3].y
+            }, (U_POINTL) {
+                lpPoints[0].x, lpPoints[9].y
+            });
             rec = U_EMRELLIPSE_set(rcl);
         }
-        if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
+        if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
             g_error("Fatal programming error in PrintEmf::print_simple_shape at retangle/ellipse/polygon");
         }
-        
+
         done = true;
 
         // replace the handle we moved above, assuming there was something set already
         if (use_fill && !use_stroke && hpen) { // only fill
             rec = selectobject_set(hpen, eht);
-            if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
+            if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
                 g_error("Fatal programming error in PrintEmf::print_simple_shape at selectobject_set pen");
             }
-        }
-        else if (!use_fill && use_stroke && hbrush){ // only stroke
+        } else if (!use_fill && use_stroke && hbrush) { // only stroke
             rec = selectobject_set(hbrush, eht);
-            if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
+            if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
                 g_error("Fatal programming error in PrintEmf::print_simple_shape at selectobject_set brush");
             }
         }
     }
 
     delete[] lpPoints;
-    
+
     return done;
 }
 
 /** Some parts based on win32.cpp by Lauris Kaplinski <lauris@kaplinski.com>.  Was a part of Inkscape
     in the past (or will be in the future?)  Not in current trunk. (4/19/2012)
-   
+
     Limitations of this code:
     1.  Transparency is lost on export.  (Apparently a limitation of the EMF format.)
     2.  Probably messes up if row stride != w*4
     3.  There is still a small memory leak somewhere, possibly in a pixbuf created in a routine
         that calls this one and passes px, but never removes the rest of the pixbuf.  The first time
         this is called it leaked 5M (in one test) and each subsequent call leaked around 200K more.
-        If this routine is reduced to 
+        If this routine is reduced to
           if(1)return(0);
         and called for a single 1280 x 1024 image then the program leaks 11M per call, or roughly the
         size of two bitmaps.
@@ -1713,20 +1268,20 @@ unsigned int PrintEmf::image(
     Geom::Affine const &/*tf_ignore*/,  /** WRONG affine transform, use the one from m_tr_stack */
     SPStyle const *style)  /** provides indirect link to image object */
 {
-    double x1,y1,dw,dh;
+    double x1, y1, dw, dh;
     char *rec = NULL;
     Geom::Affine tf = m_tr_stack.top();
 
     rec = U_EMRSETSTRETCHBLTMODE_set(U_COLORONCOLOR);
-    if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
-       g_error("Fatal programming error in PrintEmf::image at EMRHEADER");
+    if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
+        g_error("Fatal programming error in PrintEmf::image at EMRHEADER");
     }
 
-    x1= atof(style->object->getAttribute("x"));
-    y1= atof(style->object->getAttribute("y"));
-    dw= atof(style->object->getAttribute("width"));
-    dh= atof(style->object->getAttribute("height"));
-    Geom::Point pLL(x1,y1);
+    x1 = atof(style->object->getAttribute("x"));
+    y1 = atof(style->object->getAttribute("y"));
+    dw = atof(style->object->getAttribute("width"));
+    dh = atof(style->object->getAttribute("height"));
+    Geom::Point pLL(x1, y1);
     Geom::Point pLL2 = pLL * tf;  //location of LL corner in Inkscape coordinates
 
     char                *px;
@@ -1737,15 +1292,15 @@ unsigned int PrintEmf::image(
     U_BITMAPINFOHEADER   Bmih;
     PU_BITMAPINFO        Bmi;
     colortype = U_BCBM_COLOR32;
-    (void) RGBA_to_DIB(&px, &cbPx, &ct, &numCt,  (char *) rgba_px,  w, h, w*4, colortype, 0, 1);
+    (void) RGBA_to_DIB(&px, &cbPx, &ct, &numCt, (char *) rgba_px,  w, h, w * 4, colortype, 0, 1);
     Bmih = bitmapinfoheader_set(w, h, 1, colortype, U_BI_RGB, 0, PXPERMETER, PXPERMETER, numCt, 0);
     Bmi = bitmapinfo_set(Bmih, ct);
 
     U_POINTL Dest  = pointl_set(round(pLL2[Geom::X] * PX2WORLD), round(pLL2[Geom::Y] * PX2WORLD));
     U_POINTL cDest = pointl_set(round(dw * PX2WORLD), round(dh * PX2WORLD));
-    U_POINTL Src   = pointl_set(0,0);
-    U_POINTL cSrc  = pointl_set(w,h);
-    if(!FixImageRot){  /* Rotate images - some programs cannot read them in correctly if they are rotated */
+    U_POINTL Src   = pointl_set(0, 0);
+    U_POINTL cSrc  = pointl_set(w, h);
+    if (!FixImageRot) { /* Rotate images - some programs cannot read them in correctly if they are rotated */
         tf[4] = tf[5] = 0.0;  // get rid of the offset in the transform
         Geom::Point pLL2prime = pLL2 * tf;
         U_XFORM tmpTransform;
@@ -1753,58 +1308,64 @@ unsigned int PrintEmf::image(
         tmpTransform.eM12 =  tf[1];
         tmpTransform.eM21 =  tf[2];
         tmpTransform.eM22 =  tf[3];
-        tmpTransform.eDx  =  (pLL2[Geom::X] - pLL2prime[Geom::X]) * PX2WORLD;  //map pLL2 (now in EMF coordinates) back onto itself after the rotation
-        tmpTransform.eDy  =  (pLL2[Geom::Y] - pLL2prime[Geom::Y]) * PX2WORLD;
+        tmpTransform.eDx  = (pLL2[Geom::X] - pLL2prime[Geom::X]) * PX2WORLD;   //map pLL2 (now in EMF coordinates) back onto itself after the rotation
+        tmpTransform.eDy  = (pLL2[Geom::Y] - pLL2prime[Geom::Y]) * PX2WORLD;
 
-        rec=U_EMRSAVEDC_set();
-        if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
+        rec = U_EMRSAVEDC_set();
+        if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
             g_error("Fatal programming error in PrintEmf::image at U_EMRSAVEDC_set");
         }
 
         rec = U_EMRMODIFYWORLDTRANSFORM_set(tmpTransform, U_MWT_LEFTMULTIPLY);
-        if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
+        if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
             g_error("Fatal programming error in PrintEmf::image at EMRMODIFYWORLDTRANSFORM");
         }
     }
     rec = U_EMRSTRETCHDIBITS_set(
-            U_RCL_DEF,           //! Bounding rectangle in device units
-            Dest,                //! Destination UL corner in logical units
-            cDest,               //! Destination W & H in logical units
-            Src,                 //! Source UL corner in logical units
-            cSrc,                //! Source W & H in logical units
-            U_DIB_RGB_COLORS,    //! DIBColors Enumeration
-            U_SRCCOPY,           //! RasterOPeration Enumeration
-            Bmi,                 //! (Optional) bitmapbuffer (U_BITMAPINFO section)
-            h*rs,                //! size in bytes of px          
-            px                   //! (Optional) bitmapbuffer (U_BITMAPINFO section)
-    );
-    if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
+              U_RCL_DEF,           //! Bounding rectangle in device units
+              Dest,                //! Destination UL corner in logical units
+              cDest,               //! Destination W & H in logical units
+              Src,                 //! Source UL corner in logical units
+              cSrc,                //! Source W & H in logical units
+              U_DIB_RGB_COLORS,    //! DIBColors Enumeration
+              U_SRCCOPY,           //! RasterOPeration Enumeration
+              Bmi,                 //! (Optional) bitmapbuffer (U_BITMAPINFO section)
+              h * rs,              //! size in bytes of px
+              px                   //! (Optional) bitmapbuffer (U_BITMAPINFO section)
+          );
+    if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
         g_error("Fatal programming error in PrintEmf::image at U_EMRSTRETCHDIBITS_set");
     }
     free(px);
     free(Bmi);
-    if(numCt)free(ct);
-    
-    if(!FixImageRot){
-       rec=U_EMRRESTOREDC_set(-1);
-       if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
-          g_error("Fatal programming error in PrintEmf::image at U_EMRRESTOREDC_set");
-       }
-    }
-       
+    if (numCt) {
+        free(ct);
+    }
+
+    if (!FixImageRot) {
+        rec = U_EMRRESTOREDC_set(-1);
+        if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
+            g_error("Fatal programming error in PrintEmf::image at U_EMRRESTOREDC_set");
+        }
+    }
+
     return 0;
 }
 
 // may also be called with a simple_shape or an empty path, whereupon it just returns without doing anything
 unsigned int PrintEmf::print_pathv(Geom::PathVector const &pathv, const Geom::Affine &transform)
 {
-     Geom::Affine tf = transform;
-     char *rec = NULL;
+    Geom::Affine tf = transform;
+    char *rec = NULL;
 
     simple_shape = print_simple_shape(pathv, tf);
-    if (simple_shape || pathv.empty()){
-        if (use_fill){    destroy_brush(); }  // these must be cleared even if nothing is drawn or hbrush,hpen fill up
-        if (use_stroke){  destroy_pen();   }
+    if (simple_shape || pathv.empty()) {
+        if (use_fill) {
+            destroy_brush();    // these must be cleared even if nothing is drawn or hbrush,hpen fill up
+        }
+        if (use_stroke) {
+            destroy_pen();
+        }
         return TRUE;
     }
 
@@ -1812,40 +1373,37 @@ unsigned int PrintEmf::print_pathv(Geom::PathVector const &pathv, const Geom::Af
         that is handled by the EMF MODIFYWORLDTRANSFORM record
     */
 
-    Geom::PathVector pv = pathv_to_linear_and_cubic_beziers( pathv * tf );
-    
+    Geom::PathVector pv = pathv_to_linear_and_cubic_beziers(pathv * tf);
+
     rec = U_EMRBEGINPATH_set();
-    if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
+    if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
         g_error("Fatal programming error in PrintEmf::print_pathv at U_EMRBEGINPATH_set");
     }
 
     /**
      * For all Subpaths in the <path>
      */
-    for (Geom::PathVector::const_iterator pit = pv.begin(); pit != pv.end(); ++pit)
-    {
+    for (Geom::PathVector::const_iterator pit = pv.begin(); pit != pv.end(); ++pit) {
         using Geom::X;
         using Geom::Y;
 
- 
+
         Geom::Point p0 = pit->initialPoint();
 
         p0[X] = (p0[X] * PX2WORLD);
         p0[Y] = (p0[Y] * PX2WORLD);
-        
+
         U_POINTL ptl = pointl_set((int32_t) round(p0[X]), (int32_t) round(p0[Y]));
         rec = U_EMRMOVETOEX_set(ptl);
-        if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
+        if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
             g_error("Fatal programming error in PrintEmf::print_pathv at U_EMRMOVETOEX_set");
         }
 
         /**
          * For all segments in the subpath
          */
-        for (Geom::Path::const_iterator cit = pit->begin(); cit != pit->end_open(); ++cit)
-        {
-            if ( is_straight_curve(*cit) )
-            {
+        for (Geom::Path::const_iterator cit = pit->begin(); cit != pit->end_open(); ++cit) {
+            if (is_straight_curve(*cit)) {
                 //Geom::Point p0 = cit->initialPoint();
                 Geom::Point p1 = cit->finalPoint();
 
@@ -1853,18 +1411,16 @@ unsigned int PrintEmf::print_pathv(Geom::PathVector const &pathv, const Geom::Af
                 p1[X] = (p1[X] * PX2WORLD);
                 //p0[Y] = (p0[Y] * PX2WORLD);
                 p1[Y] = (p1[Y] * PX2WORLD);
-                
+
                 //int32_t const x0 = (int32_t) round(p0[X]);
                 //int32_t const y0 = (int32_t) round(p0[Y]);
 
                 ptl = pointl_set((int32_t) round(p1[X]), (int32_t) round(p1[Y]));
                 rec = U_EMRLINETO_set(ptl);
-                if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
+                if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
                     g_error("Fatal programming error in PrintEmf::print_pathv at U_EMRLINETO_set");
                 }
-            }
-            else if (Geom::CubicBezier const *cubic = dynamic_cast<Geom::CubicBezier const*>(&*cit))
-            {
+            } else if (Geom::CubicBezier const *cubic = dynamic_cast<Geom::CubicBezier const *>(&*cit)) {
                 std::vector<Geom::Point> points = cubic->points();
                 //Geom::Point p0 = points[0];
                 Geom::Point p1 = points[1];
@@ -1879,7 +1435,7 @@ unsigned int PrintEmf::print_pathv(Geom::PathVector const &pathv, const Geom::Af
                 p1[Y] = (p1[Y] * PX2WORLD);
                 p2[Y] = (p2[Y] * PX2WORLD);
                 p3[Y] = (p3[Y] * PX2WORLD);
-                
+
                 //int32_t const x0 = (int32_t) round(p0[X]);
                 //int32_t const y0 = (int32_t) round(p0[Y]);
                 int32_t const x1 = (int32_t) round(p1[X]);
@@ -1898,19 +1454,17 @@ unsigned int PrintEmf::print_pathv(Geom::PathVector const &pathv, const Geom::Af
                 pt[2].y = y3;
 
                 rec = U_EMRPOLYBEZIERTO_set(U_RCL_DEF, 3, pt);
-                if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
+                if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
                     g_error("Fatal programming error in PrintEmf::print_pathv at U_EMRPOLYBEZIERTO_set");
                 }
-            }
-            else
-            {
+            } else {
                 g_warning("logical error, because pathv_to_linear_and_cubic_beziers was used");
             }
         }
 
         if (pit->end_default() == pit->end_closed()) {  // there may be multiples of this on a single path
             rec = U_EMRCLOSEFIGURE_set();
-            if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
+            if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
                 g_error("Fatal programming error in PrintEmf::print_pathv at U_EMRCLOSEFIGURE_set");
             }
         }
@@ -1918,35 +1472,33 @@ unsigned int PrintEmf::print_pathv(Geom::PathVector const &pathv, const Geom::Af
     }
 
     rec = U_EMRENDPATH_set();  // there may be only be one of these on a single path
-    if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
+    if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
         g_error("Fatal programming error in PrintEmf::print_pathv at U_EMRENDPATH_set");
     }
 
     // explicit FILL/STROKE commands are needed for each sub section of the path
-    if (use_fill && !use_stroke){
+    if (use_fill && !use_stroke) {
         rec = U_EMRFILLPATH_set(U_RCL_DEF);
-        if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
-          g_error("Fatal programming error in PrintEmf::fill at U_EMRFILLPATH_set");
+        if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
+            g_error("Fatal programming error in PrintEmf::fill at U_EMRFILLPATH_set");
         }
-    }
-    else if (use_fill && use_stroke) {
+    } else if (use_fill && use_stroke) {
         rec  = U_EMRSTROKEANDFILLPATH_set(U_RCL_DEF);
-        if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){                        
-            g_error("Fatal programming error in PrintEmf::stroke at U_EMRSTROKEANDFILLPATH_set"); 
-        }                                                                                     
-    }
-    else if (!use_fill && use_stroke){
+        if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
+            g_error("Fatal programming error in PrintEmf::stroke at U_EMRSTROKEANDFILLPATH_set");
+        }
+    } else if (!use_fill && use_stroke) {
         rec  = U_EMRSTROKEPATH_set(U_RCL_DEF);
-        if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){                        
-            g_error("Fatal programming error in PrintEmf::stroke at U_EMRSTROKEPATH_set"); 
-        }                                                                                     
+        if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
+            g_error("Fatal programming error in PrintEmf::stroke at U_EMRSTROKEPATH_set");
+        }
     }
 
     // clean out brush and pen, but only after all parts of the draw complete
-    if (use_fill){
+    if (use_fill) {
         destroy_brush();
     }
-    if (use_stroke){
+    if (use_stroke) {
         destroy_pen();
     }
 
@@ -1954,45 +1506,44 @@ unsigned int PrintEmf::print_pathv(Geom::PathVector const &pathv, const Geom::Af
 }
 
 
-bool PrintEmf::textToPath(Inkscape::Extension::Print * ext)
-{
-    return ext->get_param_bool("textToPath");
-}
-
 unsigned int PrintEmf::text(Inkscape::Extension::Print * /*mod*/, char const *text, Geom::Point const &p,
-                    SPStyle const *const style)
+                            SPStyle const *const style)
 {
-    if (!et) return 0;
+    if (!et) {
+        return 0;
+    }
 
     char *rec = NULL;
-    int ccount,newfont;
-    int fix90n=0;
+    int ccount, newfont;
+    int fix90n = 0;
     uint32_t hfont = 0;
     Geom::Affine tf = m_tr_stack.top();
-    double rot = -1800.0*std::atan2(tf[1], tf[0])/M_PI;    // 0.1 degree rotation,  - sign for MM_TEXT
+    double rot = -1800.0 * std::atan2(tf[1], tf[0]) / M_PI; // 0.1 degree rotation,  - sign for MM_TEXT
     double rotb = -std::atan2(tf[1], tf[0]);  // rotation for baseline offset for superscript/subscript, used below
-    double dx,dy;
-    double f1,f2,f3;
+    double dx, dy;
     double ky;
 
     // the dx array is smuggled in like: text<nul>w1 w2 w3 ...wn<nul><nul>, where the widths are floats 7 characters wide, including the space
     int ndx, rtl;
     uint32_t *adx;
-    smuggle_adxkyrtl_out(text, &adx, &ky, &rtl, &ndx, PX2WORLD * std::min(tf.expansionX(),tf.expansionY())); // side effect: free() adx
-    
+    smuggle_adxkyrtl_out(text, &adx, &ky, &rtl, &ndx, PX2WORLD * std::min(tf.expansionX(), tf.expansionY())); // side effect: free() adx
+
     uint32_t textalignment;
-    if(rtl > 0){ textalignment = U_TA_BASELINE | U_TA_LEFT;                    }
-    else {       textalignment = U_TA_BASELINE | U_TA_RIGHT | U_TA_RTLREADING; }
-    if(textalignment != htextalignment){
+    if (rtl > 0) {
+        textalignment = U_TA_BASELINE | U_TA_LEFT;
+    } else {
+        textalignment = U_TA_BASELINE | U_TA_RIGHT | U_TA_RTLREADING;
+    }
+    if (textalignment != htextalignment) {
         htextalignment = textalignment;
         rec = U_EMRSETTEXTALIGN_set(textalignment);
-        if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
+        if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
             g_error("Fatal programming error in PrintEmf::text at U_EMRSETTEXTALIGN_set");
         }
     }
 
     char *text2 = strdup(text);  // because U_Utf8ToUtf16le calls iconv which does not like a const char *
-    uint16_t *unicode_text = U_Utf8ToUtf16le( text2, 0, NULL );
+    uint16_t *unicode_text = U_Utf8ToUtf16le(text2, 0, NULL);
     free(text2);
     //translates Unicode to NonUnicode, if possible.  If any translate, all will, and all to
     //the same font, because of code in Layout::print
@@ -2002,85 +1553,92 @@ unsigned int PrintEmf::text(Inkscape::Extension::Print * /*mod*/, char const *te
     //Some funky ones:  Arial, Times New Roman
     //Some not funky ones: Symbol and Verdana.
     //Without a huge table we cannot catch them all, so just the most common problem ones.
-    if(FixPPTCharPos){
-      switch(newfont){
+    FontfixParams params;
+
+    if (FixPPTCharPos) {
+        switch (newfont) {
         case CVTSYM:
-          search_short_fflist("Convert To Symbol", &f1, &f2, &f3);
-          break;
+            _lookup_ppt_fontfix("Convert To Symbol", params);
+            break;
         case CVTZDG:
-          search_short_fflist("Convert To Zapf Dingbats", &f1, &f2, &f3);
-          break;
+            _lookup_ppt_fontfix("Convert To Zapf Dingbats", params);
+            break;
         case CVTWDG:
-          search_short_fflist("Convert To Wingdings", &f1, &f2, &f3);
-          break;
+            _lookup_ppt_fontfix("Convert To Wingdings", params);
+            break;
         default:  //also CVTNON
-          search_short_fflist(style->text->font_family.value, &f1, &f2, &f3);
-          break;
-      }
-      if(f2 || f3){
-        int irem = ((int) round(rot)) % 900 ;
-        if(irem <=9 && irem >= -9){
-          fix90n=1; //assume vertical
-          rot  = (double) (((int) round(rot)) - irem);
-          rotb =  rot*M_PI/1800.0;
-          if( abs(rot) == 900.0 ){ fix90n = 2; }
+            _lookup_ppt_fontfix(style->text->font_family.value, params);
+            break;
+        }
+        if (params.f2 != 0 || params.f3 != 0) {
+            int irem = ((int) round(rot)) % 900 ;
+            if (irem <= 9 && irem >= -9) {
+                fix90n = 1; //assume vertical
+                rot  = (double)(((int) round(rot)) - irem);
+                rotb =  rot * M_PI / 1800.0;
+                if (abs(rot) == 900.0) {
+                    fix90n = 2;
+                }
+            }
         }
-      }
     }
 
-    /*  Note that text font sizes are stored into the EMF as fairly small integers and that limits their precision.  
+    /*  Note that text font sizes are stored into the EMF as fairly small integers and that limits their precision.
         The EMF output files produced here have been designed so that the integer valued pt sizes
         land right on an integer value in the EMF file, so those are exact.  However, something like 18.1 pt will be
-        somewhat off, so that when it is read back in it becomes 18.11 pt.  (For instance.)   
+        somewhat off, so that when it is read back in it becomes 18.11 pt.  (For instance.)
     */
-    int textheight = round(-style->font_size.computed * PX2WORLD * std::min(tf.expansionX(),tf.expansionY()));
-    if (!hfont) {
+    int textheight = round(-style->font_size.computed * PX2WORLD * std::min(tf.expansionX(), tf.expansionY()));
 
+    if (!hfont) {
         // Get font face name.  Use changed font name if unicode mapped to one
         // of the special fonts.
         uint16_t *wfacename;
-        if(!newfont){ wfacename = U_Utf8ToUtf16le(style->text->font_family.value, 0, NULL); }
-        else {        wfacename = U_Utf8ToUtf16le(FontName(newfont), 0, NULL);              }
+        if (!newfont) {
+            wfacename = U_Utf8ToUtf16le(style->text->font_family.value, 0, NULL);
+        } else {
+            wfacename = U_Utf8ToUtf16le(FontName(newfont), 0, NULL);
+        }
 
         // Scale the text to the minimum stretch. (It tends to stay within bounding rectangles even if
         // it was streteched asymmetrically.)  Few applications support text from EMF which is scaled
-        // differently by height/width, so leave lfWidth alone.  
+        // differently by height/width, so leave lfWidth alone.
 
         U_LOGFONT lf = logfont_set(
-            textheight, 
-            0,        
-            round(rot),
-            round(rot),
-            transweight(style->font_weight.computed),
-            (style->font_style.computed == SP_CSS_FONT_STYLE_ITALIC),
-            style->text_decoration_line.underline,
-            style->text_decoration_line.line_through,
-            U_DEFAULT_CHARSET,
-            U_OUT_DEFAULT_PRECIS,
-            U_CLIP_DEFAULT_PRECIS,
-            U_DEFAULT_QUALITY,
-            U_DEFAULT_PITCH | U_FF_DONTCARE,
-            wfacename);
-    free(wfacename);
-       
-        rec  = extcreatefontindirectw_set(&hfont, eht,  (char *) &lf, NULL);
-        if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
+                           textheight,
+                           0,
+                           round(rot),
+                           round(rot),
+                           _translate_weight(style->font_weight.computed),
+                           (style->font_style.computed == SP_CSS_FONT_STYLE_ITALIC),
+                           style->text_decoration_line.underline,
+                           style->text_decoration_line.line_through,
+                           U_DEFAULT_CHARSET,
+                           U_OUT_DEFAULT_PRECIS,
+                           U_CLIP_DEFAULT_PRECIS,
+                           U_DEFAULT_QUALITY,
+                           U_DEFAULT_PITCH | U_FF_DONTCARE,
+                           wfacename);
+        free(wfacename);
+
+        rec  = extcreatefontindirectw_set(&hfont, eht, (char *) &lf, NULL);
+        if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
             g_error("Fatal programming error in PrintEmf::text at extcreatefontindirectw_set");
         }
     }
-    
+
     rec = selectobject_set(hfont, eht);
-    if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
+    if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
         g_error("Fatal programming error in PrintEmf::text at selectobject_set");
     }
 
     float rgb[3];
-    sp_color_get_rgb_floatv( &style->fill.value.color, rgb );
-    // only change the text color when it needs to be changed 
-    if(memcmp(htextcolor_rgb,rgb,3*sizeof(float))){
-        memcpy(htextcolor_rgb,rgb,3*sizeof(float));
-        rec = U_EMRSETTEXTCOLOR_set(U_RGB(255*rgb[0], 255*rgb[1], 255*rgb[2]));
-        if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
+    sp_color_get_rgb_floatv(&style->fill.value.color, rgb);
+    // only change the text color when it needs to be changed
+    if (memcmp(htextcolor_rgb, rgb, 3 * sizeof(float))) {
+        memcpy(htextcolor_rgb, rgb, 3 * sizeof(float));
+        rec = U_EMRSETTEXTCOLOR_set(U_RGB(255 * rgb[0], 255 * rgb[1], 255 * rgb[2]));
+        if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
             g_error("Fatal programming error in PrintEmf::text at U_EMRSETTEXTCOLOR_set");
         }
     }
@@ -2088,26 +1646,24 @@ unsigned int PrintEmf::text(Inkscape::Extension::Print * /*mod*/, char const *te
     Geom::Point p2 = p * tf;
 
     //Handle super/subscripts and vertical kerning
-/*  Previously used this, but vertical kerning was not supported
-    p2[Geom::X] -= style->baseline_shift.computed * std::sin( rotb );
-    p2[Geom::Y] -= style->baseline_shift.computed * std::cos( rotb );
-*/
-    p2[Geom::X] += ky * std::sin( rotb );
-    p2[Geom::Y] += ky * std::cos( rotb );
+    /*  Previously used this, but vertical kerning was not supported
+        p2[Geom::X] -= style->baseline_shift.computed * std::sin( rotb );
+        p2[Geom::Y] -= style->baseline_shift.computed * std::cos( rotb );
+    */
+    p2[Geom::X] += ky * std::sin(rotb);
+    p2[Geom::Y] += ky * std::cos(rotb);
 
     //Conditionally handle compensation for PPT EMF import bug (affects PPT 2003-2010, at least)
-    if(FixPPTCharPos){
-        if(fix90n==1){ //vertical
-            dx= 0.0;
-            dy= f3 * style->font_size.computed * std::cos( rotb );
-        }
-        else if(fix90n==2){ //horizontal
-            dx= f2 * style->font_size.computed * std::sin( rotb );
-            dy= 0.0;
-        }
-        else {
-            dx= f1 * style->font_size.computed * std::sin( rotb );
-            dy= f1 * style->font_size.computed * std::cos( rotb );
+    if (FixPPTCharPos) {
+        if (fix90n == 1) { //vertical
+            dx = 0.0;
+            dy = params.f3 * style->font_size.computed * std::cos(rotb);
+        } else if (fix90n == 2) { //horizontal
+            dx = params.f2 * style->font_size.computed * std::sin(rotb);
+            dy = 0.0;
+        } else {
+            dx = params.f1 * style->font_size.computed * std::sin(rotb);
+            dy = params.f1 * style->font_size.computed * std::cos(rotb);
         }
         p2[Geom::X] += dx;
         p2[Geom::Y] += dy;
@@ -2120,48 +1676,51 @@ unsigned int PrintEmf::text(Inkscape::Extension::Print * /*mod*/, char const *te
     int32_t const ypos = (int32_t) round(p2[Geom::Y]);
 
 
-    // The number of characters in the string is a bit fuzzy.  ndx, the number of entries in adx is 
+    // The number of characters in the string is a bit fuzzy.  ndx, the number of entries in adx is
     // the number of VISIBLE characters, since some may combine from the UTF (8 originally,
     // now 16) encoding.  Conversely strlen() or wchar16len() would give the absolute number of
     // encoding characters.  Unclear if emrtext wants the former or the latter but for now assume the former.
-    
-//    This is currently being smuggled in from caller as part of text, works
-//    MUCH better than the fallback hack below
-//    uint32_t *adx = dx_set(textheight,  U_FW_NORMAL, slen);  // dx is needed, this makes one up
+
+    //    This is currently being smuggled in from caller as part of text, works
+    //    MUCH better than the fallback hack below
+    //    uint32_t *adx = dx_set(textheight,  U_FW_NORMAL, slen);  // dx is needed, this makes one up
     char *rec2;
-    if(rtl>0){
-        rec2 = emrtext_set( (U_POINTL) {xpos, ypos}, ndx, 2, unicode_text, U_ETO_NONE, U_RCL_DEF, adx);
-    }
-    else {  // RTL text, U_TA_RTLREADING should be enough, but set this one too just in case
-        rec2 = emrtext_set( (U_POINTL) {xpos, ypos}, ndx, 2, unicode_text, U_ETO_RTLREADING, U_RCL_DEF, adx);
+    if (rtl > 0) {
+        rec2 = emrtext_set((U_POINTL) {
+            xpos, ypos
+        }, ndx, 2, unicode_text, U_ETO_NONE, U_RCL_DEF, adx);
+    } else { // RTL text, U_TA_RTLREADING should be enough, but set this one too just in case
+        rec2 = emrtext_set((U_POINTL) {
+            xpos, ypos
+        }, ndx, 2, unicode_text, U_ETO_RTLREADING, U_RCL_DEF, adx);
     }
     free(unicode_text);
     free(adx);
-    rec = U_EMREXTTEXTOUTW_set(U_RCL_DEF,U_GM_COMPATIBLE,1.0,1.0,(PU_EMRTEXT)rec2);
+    rec = U_EMREXTTEXTOUTW_set(U_RCL_DEF, U_GM_COMPATIBLE, 1.0, 1.0, (PU_EMRTEXT)rec2);
     free(rec2);
-    if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
+    if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
         g_error("Fatal programming error in PrintEmf::text at U_EMREXTTEXTOUTW_set");
     }
 
     // Must deselect an object before deleting it.  Put the default font (back) in.
     rec = selectobject_set(U_DEVICE_DEFAULT_FONT, eht);
-    if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
+    if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
         g_error("Fatal programming error in PrintEmf::text at selectobject_set");
     }
 
-    if(hfont){
+    if (hfont) {
         rec = deleteobject_set(&hfont, eht);
-        if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
+        if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
             g_error("Fatal programming error in PrintEmf::text at deleteobject_set");
         }
     }
-    
+
     return 0;
 }
 
-void PrintEmf::init (void)
+void PrintEmf::init(void)
 {
-    read_system_fflist();
+    _load_ppt_fontfix_data();
 
     /* EMF print */
     Inkscape::Extension::build_from_mem(