index 1c439be19aa365e9cb6088860f8a7c9377eece13..b3d0e8cbae681ec12985c36e1cd2fb6ce7998a65 100644 (file)
--- a/src/sp-glyph-kerning.cpp
+++ b/src/sp-glyph-kerning.cpp
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#ifdef ENABLE_SVG_FONTS
#define __SP_ANCHOR_C__
#include "document.h"
#include "helper-fns.h"
+#include <string>
static void sp_glyph_kerning_class_init(SPGlyphKerningClass *gc);
static void sp_glyph_kerning_init(SPGlyphKerning *glyph);
}
}
+GlyphNames::GlyphNames(const gchar* value){
+ if (value) this->names = strdup(value);
+}
+
+GlyphNames::~GlyphNames(){
+ if (this->names) g_free(this->names);
+}
+
+bool GlyphNames::contains(gchar* name){
+ if (!(this->names) || !name) return false;
+ std::istringstream is(this->names);
+ std::string str;
+ std::string s(name);
+ while (is >> str){
+ if (str == s) return true;
+ }
+ return false;
+}
+
static void sp_glyph_kerning_set(SPObject *object, unsigned int key, const gchar *value)
{
SPGlyphKerning * glyphkern = (SPGlyphKerning*) object; //even if it is a VKern this will work. I did it this way just to avoind warnings.
@@ -131,26 +154,26 @@ static void sp_glyph_kerning_set(SPObject *object, unsigned int key, const gchar
switch (key) {
case SP_ATTR_U1:
- if (glyphkern->u1) g_free(glyphkern->u1);
+ if (glyphkern->u1) delete glyphkern->u1;
glyphkern->u1 = new UnicodeRange(value);
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
g_warning("<%s>: SP_ATTR_U1: %s", tag, value);
break;
case SP_ATTR_U2:
- if (glyphkern->u2) g_free(glyphkern->u2);
+ if (glyphkern->u2) delete glyphkern->u2;
glyphkern->u2 = new UnicodeRange(value);
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
g_warning("<%s>: SP_ATTR_U2: %s", tag, value);
break;
case SP_ATTR_G1:
- if (glyphkern->g1) g_free(glyphkern->g1);
- glyphkern->g1 = g_strdup(value);//todo:
+ if (glyphkern->g1) delete glyphkern->g1;
+ glyphkern->g1 = new GlyphNames(value);
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
g_warning("<%s>: SP_ATTR_G1: %s", tag, value);
break;
case SP_ATTR_G2:
- if (glyphkern->g2) g_free(glyphkern->g2);
- glyphkern->g2 = g_strdup(value);//todo:
+ if (glyphkern->g2) delete glyphkern->g2;
+ glyphkern->g2 = new GlyphNames(value);
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
g_warning("<%s>: SP_ATTR_G2: %s", tag, value);
break;