Fix self-snapping when dragging the transformation center of a selection containing...

[inkscape.git] / src / sp-glyph-kerning.cpp

diff --git a/src/sp-glyph-kerning.cpp b/src/sp-glyph-kerning.cpp
index c8138731ebcced61ab60de7c60c051367b380e7f..d62fbb2c295f8a7e7464be7ce725c070e661f7e7 100644 (file)
--- a/src/sp-glyph-kerning.cpp
+++ b/src/sp-glyph-kerning.cpp
@@ -1,4 +1,7 @@
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #ifdef ENABLE_SVG_FONTS
 #define __SP_ANCHOR_C__
 
@@ -7,7 +10,7 @@
  * W3C SVG 1.1 spec, page 476, section 20.7
  *
  * Author:
- *   Felipe C. da S. Sanches <felipe.sanches@gmail.com>
+ *   Felipe C. da S. Sanches <juca@members.fsf.org>
  *
  * Copyright (C) 2008, Felipe C. da S. Sanches
  *
@@ -19,7 +22,6 @@
 #include "sp-glyph-kerning.h"
 
 #include "document.h"
-#include "helper-fns.h"
 #include <string>
 
 static void sp_glyph_kerning_class_init(SPGlyphKerningClass *gc);
@@ -132,7 +134,7 @@ GlyphNames::~GlyphNames(){
     if (this->names) g_free(this->names);
 }
 
-bool GlyphNames::contains(gchar* name){
+bool GlyphNames::contains(const char* name){
     if (!(this->names) || !name) return false;
     std::istringstream is(this->names);
     std::string str;
@@ -146,49 +148,61 @@ bool GlyphNames::contains(gchar* name){
 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.
-    double number;
-    const char* tag = (SP_IS_HKERN(object) ? "hkern" : "vkern");
 
     switch (key) {
         case SP_ATTR_U1:
-            if (glyphkern->u1) delete 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;
+            break;
+        }
         case SP_ATTR_U2:
-            if (glyphkern->u2) delete 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;
+            break;
+        }
         case SP_ATTR_G1:
-            if (glyphkern->g1) delete glyphkern->g1;
+        {
+            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;
+            break;
+        }
         case SP_ATTR_G2:
-            if (glyphkern->g2) delete glyphkern->g2;
+        {
+            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;
-       case SP_ATTR_K:
-            number = helperfns_read_number(value);
+        }
+        case SP_ATTR_K:
+        {
+            double number = value ? g_ascii_strtod(value, 0) : 0;
             if (number != glyphkern->k){
                 glyphkern->k = number;
-g_warning("<%s>: SP_ATTR_K: %f", tag, number);
                 object->requestModified(SP_OBJECT_MODIFIED_FLAG);
             }
             break;
-       default:
+        }
+        default:
+        {
             if (((SPObjectClass *) (parent_class))->set) {
                 ((SPObjectClass *) (parent_class))->set(object, key, value);
             }
             break;
+        }
     }
-///should free tag?
 }
 
 /**
@@ -203,7 +217,6 @@ sp_glyph_kerning_update(SPObject *object, SPCtx *ctx, guint flags)
     if (flags & SP_OBJECT_MODIFIED_FLAG) {
         /* do something to trigger redisplay, updates? */
             sp_object_read_attr(object, "u1");
-            sp_object_read_attr(object, "g1");
             sp_object_read_attr(object, "u2");
             sp_object_read_attr(object, "g2");
             sp_object_read_attr(object, "k");