From: JucaBlues Date: Thu, 8 May 2008 02:48:12 +0000 (+0000) Subject: Starting Summer of Code: SVG Fonts X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=58cf085f4a4de3c49fe270636169643d55db17f9;p=inkscape.git Starting Summer of Code: SVG Fonts * hkern and vkern: parameter loading. --- diff --git a/src/Makefile_insert b/src/Makefile_insert index 48201344e..35c1e49ed 100644 --- a/src/Makefile_insert +++ b/src/Makefile_insert @@ -211,6 +211,7 @@ libinkpre_a_SOURCES = \ sp-font.cpp sp-font.h \ sp-glyph.cpp sp-glyph.h \ sp-missing-glyph.cpp sp-missing-glyph.h \ + sp-glyph-kerning.cpp sp-glyph-kerning.h \ sp-gaussian-blur.cpp sp-gaussian-blur.h \ sp-gaussian-blur-fns.h \ sp-gradient-fns.h \ diff --git a/src/sp-glyph-kerning.cpp b/src/sp-glyph-kerning.cpp new file mode 100644 index 000000000..a8609f5ee --- /dev/null +++ b/src/sp-glyph-kerning.cpp @@ -0,0 +1,217 @@ +#define __SP_ANCHOR_C__ + +/* + * SVG and elements implementation + * W3C SVG 1.1 spec, page 476, section 20.7 + * + * Author: + * Felipe C. da S. Sanches + * + * Copyright (C) 2008, Felipe C. da S. Sanches + * + * Released under GNU GPL, read the file 'COPYING' for more information + */ + +#include "xml/repr.h" +#include "attributes.h" +#include "sp-glyph-kerning.h" + +#include "document.h" +#include "helper-fns.h" + +static void sp_glyph_kerning_class_init(SPGlyphKerningClass *gc); +static void sp_glyph_kerning_init(SPGlyphKerning *glyph); + +static void sp_glyph_kerning_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr); +static void sp_glyph_kerning_release(SPObject *object); +static void sp_glyph_kerning_set(SPObject *object, unsigned int key, const gchar *value); +static Inkscape::XML::Node *sp_glyph_kerning_write(SPObject *object, Inkscape::XML::Node *repr, guint flags); +static void sp_glyph_kerning_update(SPObject *object, SPCtx *ctx, guint flags); + +static SPObjectClass *parent_class; + +GType sp_glyph_kerning_get_type(void) +{ + static GType type = 0; + + if (!type) { + GTypeInfo info = { + sizeof(SPGlyphKerningClass), + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc) sp_glyph_kerning_class_init, + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof(SPGlyphKerning), + 16, /* n_preallocs */ + (GInstanceInitFunc) sp_glyph_kerning_init, + NULL, /* value_table */ + }; + type = g_type_register_static(SP_TYPE_OBJECT, "SPGlyphKerning", &info, (GTypeFlags) 0); + } + + return type; +} + +static void sp_glyph_kerning_class_init(SPGlyphKerningClass *gc) +{ + SPObjectClass *sp_object_class = (SPObjectClass *) gc; + + parent_class = (SPObjectClass*)g_type_class_peek_parent(gc); + + sp_object_class->build = sp_glyph_kerning_build; + sp_object_class->release = sp_glyph_kerning_release; + sp_object_class->set = sp_glyph_kerning_set; + sp_object_class->write = sp_glyph_kerning_write; + sp_object_class->update = sp_glyph_kerning_update; +} + +static void sp_glyph_kerning_init(SPGlyphKerning *glyph) +{ +//TODO: correct these values: + glyph->u1 = NULL; + glyph->g1 = NULL; + glyph->u2 = NULL; + glyph->g2 = NULL; + glyph->k = 0; +} + +static void sp_glyph_kerning_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr) +{ + if (((SPObjectClass *) (parent_class))->build) { + ((SPObjectClass *) (parent_class))->build(object, document, repr); + } + + 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"); +} + +static void sp_glyph_kerning_release(SPObject *object) +{ + //SPGlyphKerning *glyph = SP_GLYPH_KERNING(object); + + if (((SPObjectClass *) parent_class)->release) { + ((SPObjectClass *) parent_class)->release(object); + } +} + +static void sp_glyph_kerning_set(SPObject *object, unsigned int key, const gchar *value) +{ + SPGlyphKerning *glyphkern = SP_GLYPH_KERNING(object); + double number; + + switch (key) { + case SP_ATTR_U1: + if (glyphkern->u1) g_free(glyphkern->u1); + glyphkern->u1 = g_strdup(value);//todo: + object->requestModified(SP_OBJECT_MODIFIED_FLAG); +g_warning(": SP_ATTR_U1: %s", value); + break; + case SP_ATTR_U2: + if (glyphkern->u2) g_free(glyphkern->u2); + glyphkern->u2 = g_strdup(value);//todo: + object->requestModified(SP_OBJECT_MODIFIED_FLAG); +g_warning(": SP_ATTR_U2: %s", value); + break; + case SP_ATTR_G1: + if (glyphkern->g1) g_free(glyphkern->g1); + glyphkern->g1 = g_strdup(value);//todo: + object->requestModified(SP_OBJECT_MODIFIED_FLAG); +g_warning(": SP_ATTR_G1: %s", value); + break; + case SP_ATTR_G2: + if (glyphkern->g2) g_free(glyphkern->g2); + glyphkern->g2 = g_strdup(value);//todo: + object->requestModified(SP_OBJECT_MODIFIED_FLAG); +g_warning(": SP_ATTR_G2: %s", value); + break; + case SP_ATTR_K: + number = helperfns_read_number(value); + if (number != glyphkern->k){ + glyphkern->k = number; +g_warning(": SP_ATTR_K: %f", number); + object->requestModified(SP_OBJECT_MODIFIED_FLAG); + } + break; + default: + if (((SPObjectClass *) (parent_class))->set) { + ((SPObjectClass *) (parent_class))->set(object, key, value); + } + break; + } +} + +/** + * * Receives update notifications. + * */ +static void +sp_glyph_kerning_update(SPObject *object, SPCtx *ctx, guint flags) +{ + SPGlyphKerning *glyph = SP_GLYPH_KERNING(object); + (void)glyph; + + 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"); + } + + if (((SPObjectClass *) parent_class)->update) { + ((SPObjectClass *) parent_class)->update(object, ctx, flags); + } +} + +#define COPY_ATTR(rd,rs,key) (rd)->setAttribute((key), rs->attribute(key)); + +static Inkscape::XML::Node *sp_glyph_kerning_write(SPObject *object, Inkscape::XML::Node *repr, guint flags) +{ +// SPGlyphKerning *glyph = SP_GLYPH_KERNING(object); + + if ((flags & SP_OBJECT_WRITE_BUILD) && !repr) { + Inkscape::XML::Document *xml_doc = sp_document_repr_doc(SP_OBJECT_DOCUMENT(object)); + repr = xml_doc->createElement("svg:glyphkerning");//fix this! + } + +/* I am commenting out this part because I am not certain how does it work. I will have to study it later. Juca + repr->setAttribute("unicode", glyph->unicode); + repr->setAttribute("glyph-name", glyph->glyph_name); + repr->setAttribute("d", glyph->d); + sp_repr_set_svg_double(repr, "orientation", (double) glyph->orientation); + sp_repr_set_svg_double(repr, "arabic-form", (double) glyph->arabic_form); + repr->setAttribute("lang", glyph->lang); + sp_repr_set_svg_double(repr, "horiz-adv-x", glyph->horiz_adv_x); + sp_repr_set_svg_double(repr, "vert-origin-x", glyph->vert_origin_x); + sp_repr_set_svg_double(repr, "vert-origin-y", glyph->vert_origin_y); + sp_repr_set_svg_double(repr, "vert-adv-y", glyph->vert_adv_y); +*/ + if (repr != SP_OBJECT_REPR(object)) { + COPY_ATTR(repr, object->repr, "u1"); + COPY_ATTR(repr, object->repr, "g1"); + COPY_ATTR(repr, object->repr, "u2"); + COPY_ATTR(repr, object->repr, "g2"); + COPY_ATTR(repr, object->repr, "k"); + } + + if (((SPObjectClass *) (parent_class))->write) { + ((SPObjectClass *) (parent_class))->write(object, repr, flags); + } + + return repr; +} + +/* + Local Variables: + mode:c++ + c-file-style:"stroustrup" + c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +)) + indent-tabs-mode:nil + fill-column:99 + End: +*/ +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 : diff --git a/src/sp-glyph-kerning.h b/src/sp-glyph-kerning.h new file mode 100644 index 000000000..40a2afe0f --- /dev/null +++ b/src/sp-glyph-kerning.h @@ -0,0 +1,37 @@ +#ifndef __SP_GLYPH_KERNING_H__ +#define __SP_GLYPH_KERNING_H__ + +/* + * SVG and elements implementation + * + * Authors: + * Felipe C. da S. Sanches + * + * Copyright (C) 2008 Felipe C. da S. Sanches + * + * Released under GNU GPL, read the file 'COPYING' for more information + */ + +#include "sp-object.h" + +#define SP_TYPE_GLYPH_KERNING (sp_glyph_kerning_get_type ()) +#define SP_GLYPH_KERNING(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SP_TYPE_GLYPH_KERNING, SPGlyphKerning)) +#define SP_GLYPH_KERNING_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SP_TYPE_GLYPH_KERNING, SPGlyphKerningClass)) +#define SP_IS_GLYPH_KERNING(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SP_TYPE_GLYPH_KERNING)) +#define SP_IS_GLYPH_KERNING_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SP_TYPE_GLYPH_KERNING)) + +struct SPGlyphKerning : public SPObject { + char* u1; + char* g1; + char* u2; + char* g2; + double k; +}; + +struct SPGlyphKerningClass { + SPObjectClass parent_class; +}; + +GType sp_glyph_kerning_get_type (void); + +#endif //#ifndef __SP_GLYPH_KERNING_H__ diff --git a/src/sp-object-repr.cpp b/src/sp-object-repr.cpp index 4bd83c61d..2fc828166 100644 --- a/src/sp-object-repr.cpp +++ b/src/sp-object-repr.cpp @@ -46,6 +46,7 @@ #include "sp-font.h" #include "sp-glyph.h" #include "sp-missing-glyph.h" +#include "sp-glyph-kerning.h" #include "sp-style-elem.h" #include "sp-switch.h" #include "color-profile-fns.h" @@ -145,6 +146,7 @@ populate_dtables() { "svg:font", SP_TYPE_FONT }, { "svg:glyph", SP_TYPE_GLYPH }, { "svg:missing-glyph", SP_TYPE_MISSING_GLYPH }, + { "svg:hkern", SP_TYPE_GLYPH_KERNING }, { "svg:g", SP_TYPE_GROUP }, { "svg:feBlend", SP_TYPE_FEBLEND }, { "svg:feColorMatrix", SP_TYPE_FECOLORMATRIX },