Move libuemf to a separate directory.

Rename libunicode-convert to symbol_convert and put it in libuemf.

(bzr r12490)

38 files changed, 142 insertions, 113 deletions

diff --git a/configure.ac b/configure.ac
index 7a08d5c61..5be7a09a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1036,7 +1036,7 @@ src/libcroco/makefile
 src/libgdl/makefile
 src/libnrtype/makefile
 src/libavoid/makefile
-src/libunicode-convert/makefile
+src/libuemf/makefile
 src/livarot/makefile
 src/live_effects/makefile
 src/live_effects/parameter/makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2f6877485..57af25c3d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,35 +1,17 @@
-
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-# Generated by Waf at Sun Oct  4 01:04:56 2009
-
+# Generated by ./generate_POTFILES.sh at sob, 31 sie 2013, 17:42:59 CEST
 [encoding: UTF-8]
-
-cxxtest/cxxtestgen.py
 inkscape.desktop.in
-share/filters/i18n.py
 share/filters/filters.svg.h
-share/palettes/palettes.h
-share/patterns/i18n.py
-share/patterns/patterns.svg.h
-src/conn-avoid-ref.cpp
-src/connector-context.h
-src/live_effects/lpe-extrude.cpp
-src/sp-flowtext.cpp
 src/arc-context.cpp
 src/box3d-context.cpp
 src/box3d.cpp
 src/color-profile.cpp
 src/connector-context.cpp
 src/context-fns.cpp
-src/desktop-events.cpp
 src/desktop.cpp
-src/ui/dialog/clonetiler.cpp
-src/ui/dialog/export.cpp
-src/ui/dialog/export.h
-src/ui/dialog/spellcheck.cpp
-src/ui/dialog/text-edit.cpp
-src/ui/dialog/xml-tree.cpp
+src/desktop-events.cpp
 src/display/canvas-axonomgrid.cpp
 src/display/canvas-grid.cpp
 src/display/snap-indicator.cpp
@@ -64,8 +46,8 @@ src/extension/internal/bitmap/enhance.cpp
 src/extension/internal/bitmap/equalize.cpp
 src/extension/internal/bitmap/gaussianBlur.cpp
 src/extension/internal/bitmap/implode.cpp
-src/extension/internal/bitmap/level.cpp
 src/extension/internal/bitmap/levelChannel.cpp
+src/extension/internal/bitmap/level.cpp
 src/extension/internal/bitmap/medianFilter.cpp
 src/extension/internal/bitmap/modulate.cpp
 src/extension/internal/bitmap/negate.cpp
@@ -94,8 +76,8 @@ src/extension/internal/filter/blurs.h
 src/extension/internal/filter/bumps.h
 src/extension/internal/filter/color.h
 src/extension/internal/filter/distort.h
-src/extension/internal/filter/filter-file.cpp
 src/extension/internal/filter/filter.cpp
+src/extension/internal/filter/filter-file.cpp
 src/extension/internal/filter/image.h
 src/extension/internal/filter/morphology.h
 src/extension/internal/filter/overlays.h
@@ -108,8 +90,8 @@ src/extension/internal/gdkpixbuf-input.cpp
 src/extension/internal/gimpgrad.cpp
 src/extension/internal/grid.cpp
 src/extension/internal/javafx-out.cpp
-src/extension/internal/latex-pstricks-out.cpp
 src/extension/internal/latex-pstricks.cpp
+src/extension/internal/latex-pstricks-out.cpp
 src/extension/internal/odf.cpp
 src/extension/internal/pdf-input-cairo.cpp
 src/extension/internal/pdfinput/pdf-input.cpp
@@ -137,37 +119,55 @@ src/gradient-context.cpp
 src/gradient-drag.cpp
 src/inkscape.cpp
 src/interface.cpp
-src/io/sys.cpp
 src/knot.cpp
 src/knotholder.cpp
 src/libgdl/gdl-dock-bar.c
-src/libgdl/gdl-dock-item-grip.c
+src/libgdl/gdl-dock.c
 src/libgdl/gdl-dock-item.c
+src/libgdl/gdl-dock-item-grip.c
 src/libgdl/gdl-dock-master.c
 src/libgdl/gdl-dock-notebook.c
 src/libgdl/gdl-dock-object.c
 src/libgdl/gdl-dock-paned.c
 src/libgdl/gdl-dock-placeholder.c
 src/libgdl/gdl-dock-tablabel.c
-src/libgdl/gdl-dock.c
+src/libgdl/gdl-i18n.c
 src/libgdl/gdl-i18n.h
 src/libgdl/gdl-switcher.c
 src/libnrtype/FontFactory.cpp
 src/live_effects/effect.cpp
+src/live_effects/lpe-angle_bisector.cpp
 src/live_effects/lpe-bendpath.cpp
+src/live_effects/lpe-boolops.cpp
+src/live_effects/lpe-circle_with_radius.cpp
 src/live_effects/lpe-clone-original.cpp
 src/live_effects/lpe-constructgrid.cpp
+src/live_effects/lpe-copy_rotate.cpp
 src/live_effects/lpe-curvestitch.cpp
+src/live_effects/lpe-dynastroke.cpp
 src/live_effects/lpe-envelope.cpp
+src/live_effects/lpe-extrude.cpp
 src/live_effects/lpe-gears.cpp
 src/live_effects/lpe-interpolate.cpp
 src/live_effects/lpe-knot.cpp
+src/live_effects/lpe-lattice.cpp
+src/live_effects/lpe-line_segment.cpp
+src/live_effects/lpe-mirror_symmetry.cpp
 src/live_effects/lpe-offset.cpp
+src/live_effects/lpe-parallel.cpp
+src/live_effects/lpe-path_length.cpp
 src/live_effects/lpe-patternalongpath.cpp
+src/live_effects/lpe-perp_bisector.cpp
+src/live_effects/lpe-perspective_path.cpp
 src/live_effects/lpe-powerstroke.cpp
+src/live_effects/lpe-recursiveskeleton.cpp
 src/live_effects/lpe-rough-hatches.cpp
 src/live_effects/lpe-ruler.cpp
+src/live_effects/lpe-skeleton.cpp
 src/live_effects/lpe-sketch.cpp
+src/live_effects/lpe-tangent_to_curve.cpp
+src/live_effects/lpe-test-doEffect-stack.cpp
+src/live_effects/lpe-text_label.cpp
 src/live_effects/lpe-vonkoch.cpp
 src/live_effects/parameter/bool.cpp
 src/live_effects/parameter/enum.h
@@ -180,17 +180,18 @@ src/live_effects/parameter/random.cpp
 src/live_effects/parameter/text.cpp
 src/live_effects/parameter/unit.cpp
 src/live_effects/parameter/vector.cpp
+src/lpe-tool-context.cpp
 src/main-cmdlineact.cpp
 src/main.cpp
 src/menus-skeleton.h
 src/mesh-context.cpp
 src/object-edit.cpp
 src/path-chemistry.cpp
-src/pen-context.cpp
 src/pencil-context.cpp
+src/pen-context.cpp
 src/persp3d.cpp
-src/preferences-skeleton.h
 src/preferences.cpp
+src/preferences-skeleton.h
 src/rdf.cpp
 src/rect-context.cpp
 src/resource-manager.cpp
@@ -200,31 +201,32 @@ src/selection-describer.cpp
 src/seltrans.cpp
 src/seltrans-handles.cpp
 src/shortcuts.cpp
-src/shape-editor.cpp
 src/sp-anchor.cpp
 src/sp-ellipse.cpp
 src/sp-flowregion.cpp
+src/sp-flowtext.cpp
 src/sp-guide.cpp
 src/sp-image.cpp
-src/sp-item-group.cpp
+src/spiral-context.cpp
 src/sp-item.cpp
+src/sp-item-group.cpp
 src/sp-line.cpp
+src/splivarot.cpp
 src/sp-lpe-item.cpp
 src/sp-namedview.cpp
 src/sp-offset.cpp
 src/sp-path.cpp
 src/sp-polygon.cpp
 src/sp-polyline.cpp
+src/spray-context.cpp
 src/sp-rect.cpp
 src/sp-spiral.cpp
 src/sp-star.cpp
+src/sp-switch.cpp
 src/sp-text.cpp
 src/sp-tref.cpp
 src/sp-tspan.cpp
 src/sp-use.cpp
-src/spiral-context.cpp
-src/splivarot.cpp
-src/spray-context.cpp
 src/star-context.cpp
 src/text-chemistry.cpp
 src/text-context.cpp
@@ -237,10 +239,12 @@ src/ui/clipboard.cpp
 src/ui/dialog/aboutbox.cpp
 src/ui/dialog/align-and-distribute.cpp
 src/ui/dialog/calligraphic-profile-rename.cpp
+src/ui/dialog/clonetiler.cpp
 src/ui/dialog/color-item.cpp
 src/ui/dialog/debug.cpp
 src/ui/dialog/document-metadata.cpp
 src/ui/dialog/document-properties.cpp
+src/ui/dialog/export.cpp
 src/ui/dialog/extension-editor.cpp
 src/ui/dialog/filedialogimpl-gtkmm.cpp
 src/ui/dialog/filedialogimpl-win32.cpp
@@ -255,28 +259,31 @@ src/ui/dialog/inkscape-preferences.cpp
 src/ui/dialog/input.cpp
 src/ui/dialog/layer-properties.cpp
 src/ui/dialog/layers.cpp
-src/ui/dialog/livepatheffect-editor.cpp
 src/ui/dialog/livepatheffect-add.cpp
+src/ui/dialog/livepatheffect-editor.cpp
 src/ui/dialog/memory.cpp
 src/ui/dialog/messages.cpp
 src/ui/dialog/new-from-template.cpp
-src/ui/dialog/template-load-tab.cpp
-src/ui/dialog/template-widget.cpp
 src/ui/dialog/object-attributes.cpp
 src/ui/dialog/object-properties.cpp
 src/ui/dialog/ocaldialogs.cpp
-src/ui/dialog/print.cpp
 src/ui/dialog/print-colors-preview-dialog.cpp
+src/ui/dialog/print.cpp
+src/ui/dialog/spellcheck.cpp
 src/ui/dialog/svg-fonts-dialog.cpp
-src/ui/dialog/symbols.cpp
 src/ui/dialog/swatches.cpp
+src/ui/dialog/symbols.cpp
+src/ui/dialog/template-load-tab.cpp
+src/ui/dialog/template-widget.cpp
+src/ui/dialog/text-edit.cpp
 src/ui/dialog/tile.cpp
 src/ui/dialog/tracedialog.cpp
 src/ui/dialog/transformation.cpp
+src/ui/dialog/xml-tree.cpp
 src/ui/tool/curve-drag-point.cpp
 src/ui/tool/multi-path-manipulator.cpp
-src/ui/tool/node-tool.cpp
 src/ui/tool/node.cpp
+src/ui/tool/node-tool.cpp
 src/ui/tool/path-manipulator.cpp
 src/ui/tool/transform-handle-set.cpp
 src/ui/widget/combo-enums.h
@@ -294,6 +301,7 @@ src/ui/widget/selected-style.cpp
 src/ui/widget/spin-scale.cpp
 src/ui/widget/spin-slider.cpp
 src/ui/widget/style-swatch.cpp
+src/util/ege-tags.cpp
 src/util/enums.h
 src/vanishing-point.cpp
 src/verbs.cpp
@@ -321,24 +329,23 @@ src/widgets/pencil-toolbar.cpp
 src/widgets/rect-toolbar.cpp
 src/widgets/ruler.cpp
 src/widgets/select-toolbar.cpp
-src/widgets/spiral-toolbar.cpp
-src/widgets/spray-toolbar.cpp
 src/widgets/sp-attribute-widget.cpp
 src/widgets/sp-color-icc-selector.cpp
 src/widgets/sp-color-notebook.cpp
 src/widgets/sp-color-scales.cpp
 src/widgets/sp-color-selector.cpp
 src/widgets/sp-color-wheel-selector.cpp
+src/widgets/spiral-toolbar.cpp
+src/widgets/spray-toolbar.cpp
 src/widgets/sp-xmlview-attr-list.cpp
 src/widgets/sp-xmlview-content.cpp
 src/widgets/star-toolbar.cpp
-src/widgets/stroke-style.cpp
 src/widgets/stroke-marker-selector.cpp
+src/widgets/stroke-style.cpp
 src/widgets/swatch-selector.cpp
 src/widgets/text-toolbar.cpp
 src/widgets/toolbox.cpp
 src/widgets/tweak-toolbar.cpp
-src/widgets/zoom-toolbar.cpp
 share/extensions/convert2dashes.py
 share/extensions/dimension.py
 share/extensions/draw_from_triangle.py
@@ -355,7 +362,6 @@ share/extensions/gimp_xcf.py
 share/extensions/guides_creator.py
 share/extensions/guillotine.py
 share/extensions/hpgl_input.py
-share/extensions/dxf_outlines.py
 share/extensions/inkex.py
 share/extensions/interp_att_g.py
 share/extensions/jessyInk_autoTexts.py
@@ -376,7 +382,6 @@ share/extensions/pathscatter.py
 share/extensions/perspective.py
 share/extensions/polyhedron_3d.py
 share/extensions/print_win32_vector.py
-share/extensions/render_alphabetsoup.py
 share/extensions/render_barcode_datamatrix.py
 share/extensions/render_barcode_qrcode.py
 share/extensions/replace_font.py
@@ -388,7 +393,6 @@ share/extensions/uniconv_output.py
 share/extensions/voronoi2svg.py
 share/extensions/web-set-att.py
 share/extensions/webslicer_create_group.py
-share/extensions/webslicer_create_rect.py
 share/extensions/webslicer_export.py
 share/extensions/web-transmit-att.py
 share/extensions/wireframe_sphere.py
@@ -421,6 +425,7 @@ share/extensions/wireframe_sphere.py
 [type: gettext/xml] share/extensions/color_replace.inx
 [type: gettext/xml] share/extensions/color_rgbbarrel.inx
 [type: gettext/xml] share/extensions/convert2dashes.inx
+[type: gettext/xml] share/extensions/dhw_input.inx
 [type: gettext/xml] share/extensions/dia.inx
 [type: gettext/xml] share/extensions/dimension.inx
 [type: gettext/xml] share/extensions/dots.inx
@@ -460,6 +465,8 @@ share/extensions/wireframe_sphere.py
 [type: gettext/xml] share/extensions/guides_creator.inx
 [type: gettext/xml] share/extensions/guillotine.inx
 [type: gettext/xml] share/extensions/handles.inx
+[type: gettext/xml] share/extensions/hershey.inx
+[type: gettext/xml] share/extensions/hpgl_input.inx
 [type: gettext/xml] share/extensions/hpgl_output.inx
 [type: gettext/xml] share/extensions/ink2canvas.inx
 [type: gettext/xml] share/extensions/inkscape_follow_link.inx
@@ -505,16 +512,16 @@ share/extensions/wireframe_sphere.py
 [type: gettext/xml] share/extensions/plt_output.inx
 [type: gettext/xml] share/extensions/polyhedron_3d.inx
 [type: gettext/xml] share/extensions/previous_glyph_layer.inx
-[type: gettext/xml] share/extensions/print_win32_vector.inx
 [type: gettext/xml] share/extensions/printing_marks.inx
+[type: gettext/xml] share/extensions/print_win32_vector.inx
 [type: gettext/xml] share/extensions/ps_input.inx
 [type: gettext/xml] share/extensions/radiusrand.inx
 [type: gettext/xml] share/extensions/render_alphabetsoup.inx
-[type: gettext/xml] share/extensions/render_barcode.inx
 [type: gettext/xml] share/extensions/render_barcode_datamatrix.inx
+[type: gettext/xml] share/extensions/render_barcode.inx
 [type: gettext/xml] share/extensions/render_barcode_qrcode.inx
-[type: gettext/xml] share/extensions/render_gears.inx
 [type: gettext/xml] share/extensions/render_gear_rack.inx
+[type: gettext/xml] share/extensions/render_gears.inx
 [type: gettext/xml] share/extensions/replace_font.inx
 [type: gettext/xml] share/extensions/restack.inx
 [type: gettext/xml] share/extensions/rtree.inx
@@ -546,10 +553,10 @@ share/extensions/wireframe_sphere.py
 [type: gettext/xml] share/extensions/triangle.inx
 [type: gettext/xml] share/extensions/txt2svg.inx
 [type: gettext/xml] share/extensions/voronoi2svg.inx
+[type: gettext/xml] share/extensions/web-set-att.inx
 [type: gettext/xml] share/extensions/webslicer_create_group.inx
 [type: gettext/xml] share/extensions/webslicer_create_rect.inx
 [type: gettext/xml] share/extensions/webslicer_export.inx
-[type: gettext/xml] share/extensions/web-set-att.inx
 [type: gettext/xml] share/extensions/web-transmit-att.inx
 [type: gettext/xml] share/extensions/whirl.inx
 [type: gettext/xml] share/extensions/wireframe_sphere.inx
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4f7592119..edc02658e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -555,6 +555,7 @@ add_subdirectory(libavoid)
 add_subdirectory(libcola)
 add_subdirectory(libcroco)
 add_subdirectory(libgdl)
+add_subdirectory(libuemf)
 add_subdirectory(libvpsc)
 add_subdirectory(livarot)
 add_subdirectory(libnrtype)
@@ -594,6 +595,7 @@ target_link_libraries(inkscape
 	cola_LIB
 	vpsc_LIB
 	livarot_LIB
+	uemf_LIB
 	2geom_LIB
 
 	${INKSCAPE_LIBS}
diff --git a/src/Makefile.am b/src/Makefile.am
index 3350f2438..77ba1f567 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,6 +28,7 @@ noinst_LIBRARIES =	\
 	libcroco/libcroco.a	\
 	libavoid/libavoid.a	\
 	$(internal_GDL)		\
+	libuemf/libuemf.a   \
 	libcola/libcola.a	\
 	libvpsc/libvpsc.a	\
 	livarot/libvarot.a	\
@@ -124,7 +125,7 @@ include live_effects/Makefile_insert
 include live_effects/parameter/Makefile_insert
 include libvpsc/Makefile_insert
 include libcola/Makefile_insert
-include libunicode-convert/Makefile_insert
+include libuemf/Makefile_insert
 include svg/Makefile_insert
 include widgets/Makefile_insert
 include debug/Makefile_insert
@@ -141,9 +142,7 @@ include 2geom/Makefile_insert
 
 # Extra files not mentioned as sources to include in the source tarball
 EXTRA_DIST +=	\
-	$(top_srcdir)/Doxyfile	\
-	sp-skeleton.cpp sp-skeleton.h	\
-	util/makefile.in	\
+	2geom/makefile.in	\
 	debug/makefile.in	\
 	dialogs/makefile.in	\
 	display/makefile.in	\
@@ -154,32 +153,36 @@ EXTRA_DIST +=	\
 	filters/makefile.in \
 	helper/makefile.in	\
 	io/makefile.in	\
-	io/crystalegg.xml	\
-	io/doc2html.xsl 	\
-	libgdl/makefile.in	\
+	libavoid/makefile.in	\
 	libcroco/makefile.in	\
+	libgdl/makefile.in	\
 	libnrtype/makefile.in	\
-	libavoid/makefile.in	\
+	libuemf/makefile.in \
 	livarot/makefile.in	\
 	live_effects/makefile.in	\
 	live_effects/parameter/makefile.in	\
 	svg/makefile.in		\
 	trace/makefile.in	\
-	ui/makefile.in		\
 	ui/cache/makefile.in	\
 	ui/dialog/makefile.in	\
+	ui/makefile.in		\
 	ui/view/makefile.in	\
 	ui/widget/makefile.in	\
 	util/makefile.in	\
+	util/makefile.in	\
 	widgets/makefile.in	\
 	xml/makefile.in		\
-	2geom/makefile.in	\
+	\
+	$(top_srcdir)/Doxyfile \
 	extension/internal/emf-inout.cpp  \
 	extension/internal/emf-inout.h    \
 	extension/internal/emf-print.cpp  \
 	extension/internal/emf-print.h    \
 	helper/sp-marshal.list	\
+	io/crystalegg.xml	\
+	io/doc2html.xsl 	\
 	show-preview.bmp \
+	sp-skeleton.cpp sp-skeleton.h	\
 	winconsole.cpp \
 	$(CXXTEST_TEMPLATE)
 
diff --git a/src/extension/internal/Makefile_insert b/src/extension/internal/Makefile_insert
index 341973870..98093a297 100644
--- a/src/extension/internal/Makefile_insert
+++ b/src/extension/internal/Makefile_insert
@@ -158,16 +158,6 @@ ink_common_sources +=	\
 	extension/internal/filter/filter.h \
 	extension/internal/text_reassemble.c \
 	extension/internal/text_reassemble.h \
-	extension/internal/uemf.c \
-	extension/internal/uemf.h \
-	extension/internal/uemf_utf.c \
-	extension/internal/uemf_utf.h \
-	extension/internal/uemf_endian.c \
-	extension/internal/uemf_endian.h \
-	extension/internal/uwmf.c \
-	extension/internal/uwmf.h \
-	extension/internal/uwmf_endian.c \
-	extension/internal/uwmf_endian.h \
 	extension/internal/emf-print.h \
 	extension/internal/emf-print.cpp \
 	extension/internal/emf-inout.h \
diff --git a/src/extension/internal/emf-inout.cpp b/src/extension/internal/emf-inout.cpp
index 9dba3b77c..eeecc8e59 100644
--- a/src/extension/internal/emf-inout.cpp
+++ b/src/extension/internal/emf-inout.cpp
@@ -30,7 +30,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
-#define  EMF_DRIVER // work around for SPStyle issue
+#include <libuemf/symbol_convert.h>
+
 #include "sp-root.h"
 #include "sp-path.h"
 #include "style.h"
@@ -44,7 +45,6 @@
 #include "display/drawing-item.h"
 #include "clear-n_.h"
 #include "document.h"
-#include "libunicode-convert/unicode-convert.h"
 #include "util/units.h"
 
 #include "emf-print.h"
diff --git a/src/extension/internal/emf-inout.h b/src/extension/internal/emf-inout.h
index b723f067f..787a2fdb3 100644
--- a/src/extension/internal/emf-inout.h
+++ b/src/extension/internal/emf-inout.h
@@ -13,9 +13,9 @@
 
 #define PNG_SKIP_SETJMP_CHECK // else any further png.h include blows up in the compiler
 #include <png.h>
+#include <libuemf/uemf.h>
 #include "extension/implementation/implementation.h"
 #include "style.h"
-#include "uemf.h"
 #include "text_reassemble.h"
 
 namespace Inkscape {
diff --git a/src/extension/internal/emf-print.cpp b/src/extension/internal/emf-print.cpp
index 33834bea8..1e9b0cd88 100644
--- a/src/extension/internal/emf-print.cpp
+++ b/src/extension/internal/emf-print.cpp
@@ -62,11 +62,8 @@
 
 #include "emf-print.h"
 
-
 #include <string.h>
-extern "C" {
-#include "libunicode-convert/unicode-convert.h"
-}
+#include <libuemf/symbol_convert.h>
 
 
 namespace Inkscape {
@@ -2064,7 +2061,7 @@ unsigned int PrintEmf::text(Inkscape::Extension::Print * /*mod*/, char const *te
             U_DEFAULT_QUALITY,
             U_DEFAULT_PITCH | U_FF_DONTCARE,
             wfacename);
-	free(wfacename);
+    free(wfacename);
        
         rec  = extcreatefontindirectw_set(&hfont, eht,  (char *) &lf, NULL);
         if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
diff --git a/src/extension/internal/emf-print.h b/src/extension/internal/emf-print.h
index d42ba8a58..482503f71 100644
--- a/src/extension/internal/emf-print.h
+++ b/src/extension/internal/emf-print.h
@@ -16,7 +16,7 @@
 # include "config.h"
 #endif
 
-#include "uemf.h"
+#include <libuemf/uemf.h>
 
 #include "extension/implementation/implementation.h"
 //#include "extension/extension.h"
diff --git a/src/extension/internal/text_reassemble.c b/src/extension/internal/text_reassemble.c
index d16c060de..9ed6c9c3a 100644
--- a/src/extension/internal/text_reassemble.c
+++ b/src/extension/internal/text_reassemble.c
@@ -79,7 +79,7 @@ extern "C" {
 #endif
 
 #include "text_reassemble.h"
-#include "uemf_utf.h"  /* For a couple of text functions.  Exact copy from libUEMF. */
+#include <libuemf/uemf_utf.h>  /* For a couple of text functions.  Exact copy from libUEMF. */
 #include <float.h>
 
 /* Code generated by make_ucd_mn_table.c using:
diff --git a/src/extension/internal/wmf-inout.cpp b/src/extension/internal/wmf-inout.cpp
index 7147b3433..2f211cac9 100644
--- a/src/extension/internal/wmf-inout.cpp
+++ b/src/extension/internal/wmf-inout.cpp
@@ -30,7 +30,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
-#define  EMF_DRIVER //work around SPStyle issue, MUST be EMF, not WMF
+#include <libuemf/symbol_convert.h>
+
 #include "sp-root.h"
 #include "sp-path.h"
 #include "style.h"
@@ -45,7 +46,6 @@
 #include "util/units.h"
 #include "clear-n_.h"
 #include "document.h"
-#include "libunicode-convert/unicode-convert.h"
 
 
 #include "wmf-inout.h"
diff --git a/src/extension/internal/wmf-inout.h b/src/extension/internal/wmf-inout.h
index 07543e940..90f424c46 100644
--- a/src/extension/internal/wmf-inout.h
+++ b/src/extension/internal/wmf-inout.h
@@ -13,9 +13,9 @@
 
 #define PNG_SKIP_SETJMP_CHECK // else any further png.h include blows up in the compiler
 #include <png.h>
+#include <libuemf/uwmf.h>
 #include "extension/implementation/implementation.h"
 #include "style.h"
-#include "uwmf.h"
 #include "text_reassemble.h"
 
 namespace Inkscape {
diff --git a/src/extension/internal/wmf-print.cpp b/src/extension/internal/wmf-print.cpp
index b7ab49b57..be99cd54f 100644
--- a/src/extension/internal/wmf-print.cpp
+++ b/src/extension/internal/wmf-print.cpp
@@ -63,12 +63,8 @@
 
 #include "wmf-print.h"
 
-
 #include <string.h>
-extern "C" {
-#include "libunicode-convert/unicode-convert.h"
-}
-
+#include <libuemf/symbol_convert.h>
 
 namespace Inkscape {
 namespace Extension {
@@ -1859,7 +1855,7 @@ unsigned int PrintWmf::text(Inkscape::Extension::Print * /*mod*/, char const *te
             U_DEFAULT_QUALITY,
             U_DEFAULT_PITCH | U_FF_DONTCARE,
             facename);
-	free(facename);
+    free(facename);
        
         rec  = wcreatefontindirect_set( &hfont, wht, puf); 
         if(!rec || wmf_append((PU_METARECORD)rec, wt, U_REC_FREE)){
diff --git a/src/extension/internal/wmf-print.h b/src/extension/internal/wmf-print.h
index 5fe316417..7b0f1b3b7 100644
--- a/src/extension/internal/wmf-print.h
+++ b/src/extension/internal/wmf-print.h
@@ -16,7 +16,7 @@
 # include "config.h"
 #endif
 
-#include "uwmf.h"
+#include <libuemf/uwmf.h>
 
 #include "extension/implementation/implementation.h"
 //#include "extension/extension.h"
diff --git a/src/libnrtype/Layout-TNG-Output.cpp b/src/libnrtype/Layout-TNG-Output.cpp
index 162400aab..f7f910c2f 100644
--- a/src/libnrtype/Layout-TNG-Output.cpp
+++ b/src/libnrtype/Layout-TNG-Output.cpp
@@ -20,7 +20,7 @@
 #include "extension/internal/cairo-render-context.h"
 #include "display/curve.h"
 #include <2geom/pathvector.h>
-#include "libunicode-convert/unicode-convert.h"
+#include <libuemf/symbol_convert.h>
 
 
 namespace Inkscape {
diff --git a/src/libuemf/CMakeLists.txt b/src/libuemf/CMakeLists.txt
new file mode 100644
index 000000000..d7e757ad1
--- /dev/null
+++ b/src/libuemf/CMakeLists.txt
@@ -0,0 +1,23 @@
+
+set(libuemf_SRC
+	symbol_convert.c
+	uemf.c
+	uemf_endian.c
+	uemf_print.c
+	uemf_utf.c
+	uwmf.c
+	uwmf_endian.c
+	uwmf_print.c
+
+	# -------
+	# Headers
+	uemf.h
+	uemf_endian.h
+	uemf_print.h
+	uemf_utf.h
+	uwmf.h
+	uwmf_endian.h
+	uwmf_print.h
+)
+
+add_inkscape_lib(uemf_LIB "${libuemf_SRC}")
diff --git a/src/libuemf/Makefile_insert b/src/libuemf/Makefile_insert
new file mode 100644
index 000000000..ca14ed19f
--- /dev/null
+++ b/src/libuemf/Makefile_insert
@@ -0,0 +1,24 @@
+## Makefile.am fragment sourced by src/Makefile.am.
+
+libuemf/all: libuemf.a
+
+libuemf/clean:
+	rm -f libuemf/libuemf.a $(libuemf_libuemf_a_OBJECTS)
+
+libuemf_libuemf_a_SOURCES = \
+	libuemf/uemf.c \
+	libuemf/uemf.h \
+	libuemf/uemf_endian.c \
+	libuemf/uemf_endian.h \
+	libuemf/uemf_print.c \
+	libuemf/uemf_print.h \
+	libuemf/uemf_utf.c \
+	libuemf/uemf_utf.h \
+	libuemf/uwmf.c \
+	libuemf/uwmf.h \
+	libuemf/uwmf_endian.c \
+	libuemf/uwmf_endian.h \
+	libuemf/uwmf_print.c \
+	libuemf/uwmf_print.h \
+	libuemf/symbol_convert.c \
+	libuemf/symbol_convert.h
diff --git a/src/libuemf/README b/src/libuemf/README
new file mode 100644
index 000000000..53e2469e3
--- /dev/null
+++ b/src/libuemf/README
@@ -0,0 +1,5 @@
+Theis directory contains the libUEMF library,
+a cross-platform library for Windows Metafile and Enhanced Metafile
+handling, created by David Mathog.
+
+http://sourceforge.net/projects/libuemf/
diff --git a/src/libunicode-convert/makefile.in b/src/libuemf/makefile.in
index ca0d7dc1e..f1a595e1d 100644
--- a/src/libunicode-convert/makefile.in
+++ b/src/libuemf/makefile.in
@@ -6,10 +6,10 @@ OBJEXT = @OBJEXT@
 
 # Explicit so that it's the default rule.
 all:
-	cd .. && $(MAKE) libunicode-convert/all
+	cd .. && $(MAKE) libuemf/all
 
 clean %.a %.$(OBJEXT):
-	cd .. && $(MAKE) libunicode-convert/$@
+	cd .. && $(MAKE) libuemf/$@
 
 .PHONY: all clean
 
diff --git a/src/libunicode-convert/unicode-convert.c b/src/libuemf/symbol_convert.c
index c8d2de064..650f4332d 100644
--- a/src/libunicode-convert/unicode-convert.c
+++ b/src/libuemf/symbol_convert.c
@@ -32,7 +32,7 @@ extern "C" {
 #endif
 
 #include <string.h>
-#include "unicode-convert.h"
+#include "symbol_convert.h"
 
 
 static bool hold_symb=0;  // if any of these change, (re)generate the map table
diff --git a/src/libunicode-convert/unicode-convert.h b/src/libuemf/symbol_convert.h
index ac1795092..ac1795092 100644
--- a/src/libunicode-convert/unicode-convert.h
+++ b/src/libuemf/symbol_convert.h
diff --git a/src/extension/internal/uemf.c b/src/libuemf/uemf.c
index b06990dbd..b06990dbd 100644
--- a/src/extension/internal/uemf.c
+++ b/src/libuemf/uemf.c
diff --git a/src/extension/internal/uemf.h b/src/libuemf/uemf.h
index 4d620b424..4d620b424 100644
--- a/src/extension/internal/uemf.h
+++ b/src/libuemf/uemf.h
diff --git a/src/extension/internal/uemf_endian.c b/src/libuemf/uemf_endian.c
index cdae07a3d..cdae07a3d 100644
--- a/src/extension/internal/uemf_endian.c
+++ b/src/libuemf/uemf_endian.c
diff --git a/src/extension/internal/uemf_endian.h b/src/libuemf/uemf_endian.h
index 9866aacaf..9866aacaf 100644
--- a/src/extension/internal/uemf_endian.h
+++ b/src/libuemf/uemf_endian.h
diff --git a/src/extension/internal/uemf_print.c b/src/libuemf/uemf_print.c
index 1d6bebc40..1d6bebc40 100644
--- a/src/extension/internal/uemf_print.c
+++ b/src/libuemf/uemf_print.c
diff --git a/src/extension/internal/uemf_print.h b/src/libuemf/uemf_print.h
index 238e0e659..238e0e659 100644
--- a/src/extension/internal/uemf_print.h
+++ b/src/libuemf/uemf_print.h
diff --git a/src/extension/internal/uemf_utf.c b/src/libuemf/uemf_utf.c
index 48d2510f0..48d2510f0 100644
--- a/src/extension/internal/uemf_utf.c
+++ b/src/libuemf/uemf_utf.c
diff --git a/src/extension/internal/uemf_utf.h b/src/libuemf/uemf_utf.h
index e42de23e6..e42de23e6 100644
--- a/src/extension/internal/uemf_utf.h
+++ b/src/libuemf/uemf_utf.h
diff --git a/src/extension/internal/uwmf.c b/src/libuemf/uwmf.c
index 9d916ecee..9d916ecee 100644
--- a/src/extension/internal/uwmf.c
+++ b/src/libuemf/uwmf.c
diff --git a/src/extension/internal/uwmf.h b/src/libuemf/uwmf.h
index a97648eb1..a97648eb1 100644
--- a/src/extension/internal/uwmf.h
+++ b/src/libuemf/uwmf.h
diff --git a/src/extension/internal/uwmf_endian.c b/src/libuemf/uwmf_endian.c
index e14c7aa77..e14c7aa77 100644
--- a/src/extension/internal/uwmf_endian.c
+++ b/src/libuemf/uwmf_endian.c
diff --git a/src/extension/internal/uwmf_endian.h b/src/libuemf/uwmf_endian.h
index dc01c0d07..dc01c0d07 100644
--- a/src/extension/internal/uwmf_endian.h
+++ b/src/libuemf/uwmf_endian.h
diff --git a/src/extension/internal/uwmf_print.c b/src/libuemf/uwmf_print.c
index bb9f3eb36..bb9f3eb36 100644
--- a/src/extension/internal/uwmf_print.c
+++ b/src/libuemf/uwmf_print.c
diff --git a/src/extension/internal/uwmf_print.h b/src/libuemf/uwmf_print.h
index 31a8df5dc..31a8df5dc 100644
--- a/src/extension/internal/uwmf_print.h
+++ b/src/libuemf/uwmf_print.h
diff --git a/src/libunicode-convert/Makefile_insert b/src/libunicode-convert/Makefile_insert
deleted file mode 100644
index e69049310..000000000
--- a/src/libunicode-convert/Makefile_insert
+++ /dev/null
@@ -1,5 +0,0 @@
-## Makefile.am fragment sourced by src/Makefile.am.
-
-ink_common_sources +=   \
-	libunicode-convert/unicode-convert.c	\
-	libunicode-convert/unicode-convert.h
diff --git a/src/libunicode-convert/README b/src/libunicode-convert/README
deleted file mode 100644
index 51d96970d..000000000
--- a/src/libunicode-convert/README
+++ /dev/null
@@ -1 +0,0 @@
-Some simple routines for converting between Unicode and nonunicode fonts.
diff --git a/src/style.h b/src/style.h
index c992e9dd2..bc4df96e2 100644
--- a/src/style.h
+++ b/src/style.h
@@ -164,18 +164,6 @@ struct SPIPaint {
     void setColor( SPColor const& color ) {value.color = color; colorSet = true;}
 
     void read( gchar const *str, SPStyle &tyle, SPDocument *document = 0);
-
-/* EMF_DRIVER is a temp work-around
-The problem is that SPIPaint is private, but is included in the SPStyle struct, and that is needed in emf-inout.cpp, but the compiler
-won't accept it there.  If the two conditional lines are moved out of the "private" they end up generating undefined reference
-errors.
-*/
-
-private:
-#ifndef EMF_DRIVER
-    SPIPaint(SPIPaint const&);
-    SPIPaint &operator=(SPIPaint const &);
-#endif // EMF_DRIVER
 };
 
 /// Filter type internal to SPStyle