From: JucaBlues Date: Thu, 28 Feb 2008 03:50:33 +0000 (+0000) Subject: a bit more boilerplate code for SVGFonts X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ba77596ac37222f7d2adbf220a236dbea700e3d5;p=inkscape.git a bit more boilerplate code for SVGFonts added --- diff --git a/src/Makefile_insert b/src/Makefile_insert index 10b5efe42..132f81ac0 100644 --- a/src/Makefile_insert +++ b/src/Makefile_insert @@ -207,6 +207,7 @@ libinkpre_a_SOURCES = \ sp-flowtext.h sp-flowtext.cpp \ sp-font.cpp sp-font.h \ sp-glyph.cpp sp-glyph.h \ + sp-missing-glyph.cpp sp-missing-glyph.h \ sp-gaussian-blur.cpp sp-gaussian-blur.h \ sp-gaussian-blur-fns.h \ sp-gradient-fns.h \ diff --git a/src/sp-font.cpp b/src/sp-font.cpp index f87053613..b96b37858 100644 --- a/src/sp-font.cpp +++ b/src/sp-font.cpp @@ -108,7 +108,7 @@ static void sp_font_set(SPObject *object, unsigned int key, const gchar *value) number = helperfns_read_number(value); if (number != font->horiz_origin_x){ font->horiz_origin_x = number; -g_warning("SP_ATTR_HORIZ_ORIGIN_X: %f", number); +g_warning(": SP_ATTR_HORIZ_ORIGIN_X: %f", number); object->requestModified(SP_OBJECT_MODIFIED_FLAG); } break; @@ -116,7 +116,7 @@ g_warning("SP_ATTR_HORIZ_ORIGIN_X: %f", number); number = helperfns_read_number(value); if (number != font->horiz_origin_y){ font->horiz_origin_y = number; -g_warning("SP_ATTR_HORIZ_ORIGIN_Y: %f", number); +g_warning(": SP_ATTR_HORIZ_ORIGIN_Y: %f", number); object->requestModified(SP_OBJECT_MODIFIED_FLAG); } break; @@ -124,7 +124,7 @@ g_warning("SP_ATTR_HORIZ_ORIGIN_Y: %f", number); number = helperfns_read_number(value); if (number != font->horiz_adv_x){ font->horiz_adv_x = number; -g_warning("SP_ATTR_HORIZ_ADV_X: %f", number); +g_warning(": SP_ATTR_HORIZ_ADV_X: %f", number); object->requestModified(SP_OBJECT_MODIFIED_FLAG); } break; @@ -132,7 +132,7 @@ g_warning("SP_ATTR_HORIZ_ADV_X: %f", number); number = helperfns_read_number(value); if (number != font->vert_origin_x){ font->vert_origin_x = number; -g_warning("SP_ATTR_VERT_ORIGIN_X: %f", number); +g_warning(": SP_ATTR_VERT_ORIGIN_X: %f", number); object->requestModified(SP_OBJECT_MODIFIED_FLAG); } break; @@ -140,7 +140,7 @@ g_warning("SP_ATTR_VERT_ORIGIN_X: %f", number); number = helperfns_read_number(value); if (number != font->vert_origin_y){ font->vert_origin_y = number; -g_warning("SP_ATTR_VERT_ORIGIN_Y: %f", number); +g_warning(": SP_ATTR_VERT_ORIGIN_Y: %f", number); object->requestModified(SP_OBJECT_MODIFIED_FLAG); } break; @@ -148,7 +148,7 @@ g_warning("SP_ATTR_VERT_ORIGIN_Y: %f", number); number = helperfns_read_number(value); if (number != font->vert_adv_y){ font->vert_adv_y = number; -g_warning("SP_ATTR_VERT_ADV_Y: %f", number); +g_warning(": SP_ATTR_VERT_ADV_Y: %f", number); object->requestModified(SP_OBJECT_MODIFIED_FLAG); } break; diff --git a/src/sp-glyph.cpp b/src/sp-glyph.cpp index eaae6d4de..cbddb2192 100644 --- a/src/sp-glyph.cpp +++ b/src/sp-glyph.cpp @@ -147,19 +147,19 @@ static void sp_glyph_set(SPObject *object, unsigned int key, const gchar *value) if (glyph->unicode) g_free(glyph->unicode); glyph->unicode = g_strdup(value); object->requestModified(SP_OBJECT_MODIFIED_FLAG); -g_warning("SP_ATTR_UNICODE: %s", value); +g_warning(": SP_ATTR_UNICODE: %s", value); break; case SP_ATTR_GLYPH_NAME: if (glyph->glyph_name) g_free(glyph->glyph_name); glyph->glyph_name = g_strdup(value); object->requestModified(SP_OBJECT_MODIFIED_FLAG); -g_warning("SP_ATTR_GLYPH_NAME: %s", value); +g_warning(": SP_ATTR_GLYPH_NAME: %s", value); break; case SP_ATTR_D: if (glyph->d) g_free(glyph->d); glyph->d = g_strdup(value); object->requestModified(SP_OBJECT_MODIFIED_FLAG); -g_warning("SP_ATTR_D: %s", value); +g_warning(": SP_ATTR_D: %s", value); break; case SP_ATTR_ORIENTATION: orient = sp_glyph_read_orientation(value); @@ -167,7 +167,7 @@ g_warning("SP_ATTR_D: %s", value); glyph->orientation = orient; object->requestModified(SP_OBJECT_MODIFIED_FLAG); } -g_warning("SP_ATTR_ORIENTATION: %d", orient); +g_warning(": SP_ATTR_ORIENTATION: %d", orient); break; case SP_ATTR_ARABIC_FORM: form = sp_glyph_read_arabic_form(value); @@ -175,19 +175,19 @@ g_warning("SP_ATTR_ORIENTATION: %d", orient); glyph->arabic_form = form; object->requestModified(SP_OBJECT_MODIFIED_FLAG); } -g_warning("SP_ATTR_ARABIC_FORM: %d", glyph->arabic_form); +g_warning(": SP_ATTR_ARABIC_FORM: %d", glyph->arabic_form); break; case SP_ATTR_LANG: if (glyph->lang) g_free(glyph->lang); glyph->lang = g_strdup(value); -g_warning("SP_ATTR_LANG: %s", value); +g_warning(": SP_ATTR_LANG: %s", value); object->requestModified(SP_OBJECT_MODIFIED_FLAG); break; case SP_ATTR_HORIZ_ADV_X: number = helperfns_read_number(value); if (number != glyph->horiz_adv_x){ glyph->horiz_adv_x = number; -g_warning("SP_ATTR_HORIZ_ADV_X: %f", number); +g_warning(": SP_ATTR_HORIZ_ADV_X: %f", number); object->requestModified(SP_OBJECT_MODIFIED_FLAG); } break; @@ -195,7 +195,7 @@ g_warning("SP_ATTR_HORIZ_ADV_X: %f", number); number = helperfns_read_number(value); if (number != glyph->vert_origin_x){ glyph->vert_origin_x = number; -g_warning("SP_ATTR_VERT_ORIGIN_X: %f", number); +g_warning(": SP_ATTR_VERT_ORIGIN_X: %f", number); object->requestModified(SP_OBJECT_MODIFIED_FLAG); } break; @@ -203,7 +203,7 @@ g_warning("SP_ATTR_VERT_ORIGIN_X: %f", number); number = helperfns_read_number(value); if (number != glyph->vert_origin_y){ glyph->vert_origin_y = number; -g_warning("SP_ATTR_VERT_ORIGIN_Y: %f", number); +g_warning(": SP_ATTR_VERT_ORIGIN_Y: %f", number); object->requestModified(SP_OBJECT_MODIFIED_FLAG); } break; @@ -211,7 +211,7 @@ g_warning("SP_ATTR_VERT_ORIGIN_Y: %f", number); number = helperfns_read_number(value); if (number != glyph->vert_adv_y){ glyph->vert_adv_y = number; -g_warning("SP_ATTR_VERT_ADV_Y: %f", number); +g_warning(": SP_ATTR_VERT_ADV_Y: %f", number); object->requestModified(SP_OBJECT_MODIFIED_FLAG); } break; diff --git a/src/sp-missing-glyph.cpp b/src/sp-missing-glyph.cpp new file mode 100644 index 000000000..4f3329b7c --- /dev/null +++ b/src/sp-missing-glyph.cpp @@ -0,0 +1,191 @@ +#define __SP_ANCHOR_C__ + +/* + * SVG element implementation + * + * 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-missing-glyph.h" +#include "document.h" +#include "helper-fns.h" + +static void sp_missing_glyph_class_init(SPMissingGlyphClass *gc); +static void sp_missing_glyph_init(SPMissingGlyph *glyph); + +static void sp_missing_glyph_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr); +static void sp_missing_glyph_release(SPObject *object); +static void sp_missing_glyph_set(SPObject *object, unsigned int key, const gchar *value); +static Inkscape::XML::Node *sp_missing_glyph_write(SPObject *object, Inkscape::XML::Node *repr, guint flags); + +static SPObjectClass *parent_class; + +GType sp_missing_glyph_get_type(void) +{ + static GType type = 0; + + if (!type) { + GTypeInfo info = { + sizeof(SPMissingGlyphClass), + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc) sp_missing_glyph_class_init, + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof(SPMissingGlyph), + 16, /* n_preallocs */ + (GInstanceInitFunc) sp_missing_glyph_init, + NULL, /* value_table */ + }; + type = g_type_register_static(SP_TYPE_OBJECT, "SPMissingGlyph", &info, (GTypeFlags) 0); + } + + return type; +} + +static void sp_missing_glyph_class_init(SPMissingGlyphClass *gc) +{ + SPObjectClass *sp_object_class = (SPObjectClass *) gc; + + parent_class = (SPObjectClass *) g_type_class_ref(SP_TYPE_OBJECT); + + sp_object_class->build = sp_missing_glyph_build; + sp_object_class->release = sp_missing_glyph_release; + sp_object_class->set = sp_missing_glyph_set; + sp_object_class->write = sp_missing_glyph_write; +} + +static void sp_missing_glyph_init(SPMissingGlyph *glyph) +{ +//TODO: correct these values: + glyph->d = NULL; + glyph->horiz_adv_x = 0; + glyph->vert_origin_x = 0; + glyph->vert_origin_y = 0; + glyph->vert_adv_y = 0; +} + +static void sp_missing_glyph_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, "d"); + sp_object_read_attr(object, "horiz-adv-x"); + sp_object_read_attr(object, "vert-origin-x"); + sp_object_read_attr(object, "vert-origin-y"); + sp_object_read_attr(object, "vert-adv-y"); +} + +static void sp_missing_glyph_release(SPObject *object) +{ + //SPMissingGlyph *glyph = SP_MISSING_GLYPH(object); + + if (((SPObjectClass *) parent_class)->release) { + ((SPObjectClass *) parent_class)->release(object); + } +} + +static void sp_missing_glyph_set(SPObject *object, unsigned int key, const gchar *value) +{ + SPMissingGlyph *glyph = SP_MISSING_GLYPH(object); + double number; + + switch (key) { + case SP_ATTR_D: + if (glyph->d) g_free(glyph->d); + glyph->d = g_strdup(value); + object->requestModified(SP_OBJECT_MODIFIED_FLAG); +g_warning(": SP_ATTR_D: %s", value); + break; + case SP_ATTR_HORIZ_ADV_X: + number = helperfns_read_number(value); + if (number != glyph->horiz_adv_x){ + glyph->horiz_adv_x = number; +g_warning(": SP_ATTR_HORIZ_ADV_X: %f", number); + object->requestModified(SP_OBJECT_MODIFIED_FLAG); + } + break; + case SP_ATTR_VERT_ORIGIN_X: + number = helperfns_read_number(value); + if (number != glyph->vert_origin_x){ + glyph->vert_origin_x = number; +g_warning(": SP_ATTR_VERT_ORIGIN_X: %f", number); + object->requestModified(SP_OBJECT_MODIFIED_FLAG); + } + break; + case SP_ATTR_VERT_ORIGIN_Y: + number = helperfns_read_number(value); + if (number != glyph->vert_origin_y){ + glyph->vert_origin_y = number; +g_warning(": SP_ATTR_VERT_ORIGIN_Y: %f", number); + object->requestModified(SP_OBJECT_MODIFIED_FLAG); + } + break; + case SP_ATTR_VERT_ADV_Y: + number = helperfns_read_number(value); + if (number != glyph->vert_adv_y){ + glyph->vert_adv_y = number; +g_warning(": SP_ATTR_VERT_ADV_Y: %f", number); + object->requestModified(SP_OBJECT_MODIFIED_FLAG); + } + break; + default: + if (((SPObjectClass *) (parent_class))->set) { + ((SPObjectClass *) (parent_class))->set(object, key, value); + } + break; + } +} + +#define COPY_ATTR(rd,rs,key) (rd)->setAttribute((key), rs->attribute(key)); + +static Inkscape::XML::Node *sp_missing_glyph_write(SPObject *object, Inkscape::XML::Node *repr, guint flags) +{ +// SPMissingGlyph *glyph = SP_MISSING_GLYPH(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:glyph"); + } + +/* 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("d", glyph->d); + 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, "d"); + COPY_ATTR(repr, object->repr, "horiz-adv-x"); + COPY_ATTR(repr, object->repr, "vert-origin-x"); + COPY_ATTR(repr, object->repr, "vert-origin-y"); + COPY_ATTR(repr, object->repr, "vert-adv-y"); + } + + 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-missing-glyph.h b/src/sp-missing-glyph.h new file mode 100644 index 000000000..41b988ab1 --- /dev/null +++ b/src/sp-missing-glyph.h @@ -0,0 +1,37 @@ +#ifndef __SP_MISSING_GLYPH_H__ +#define __SP_MISSING_GLYPH_H__ + +/* + * SVG element 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_MISSING_GLYPH (sp_missing_glyph_get_type ()) +#define SP_MISSING_GLYPH(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SP_TYPE_MISSING_GLYPH, SPMissingGlyph)) +#define SP_MISSING_GLYPH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SP_TYPE_MISSING_GLYPH, SPMissingGlyphClass)) +#define SP_IS_MISSING_GLYPH(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SP_TYPE_MISSING_GLYPH)) +#define SP_IS_MISSING_GLYPH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SP_TYPE_MISSING_GLYPH)) + +struct SPMissingGlyph : public SPObject { + char* d; + double horiz_adv_x; + double vert_origin_x; + double vert_origin_y; + double vert_adv_y; +}; + +struct SPMissingGlyphClass { + SPObjectClass parent_class; +}; + +GType sp_missing_glyph_get_type (void); + +#endif //#ifndef __SP_MISSING_GLYPH_H__ diff --git a/src/sp-object-repr.cpp b/src/sp-object-repr.cpp index 5a49c35aa..4bd83c61d 100644 --- a/src/sp-object-repr.cpp +++ b/src/sp-object-repr.cpp @@ -45,6 +45,7 @@ #include "sp-flowtext.h" #include "sp-font.h" #include "sp-glyph.h" +#include "sp-missing-glyph.h" #include "sp-style-elem.h" #include "sp-switch.h" #include "color-profile-fns.h" @@ -143,6 +144,7 @@ populate_dtables() { "svg:flowSpan", SP_TYPE_FLOWTSPAN }, { "svg:font", SP_TYPE_FONT }, { "svg:glyph", SP_TYPE_GLYPH }, + { "svg:missing-glyph", SP_TYPE_MISSING_GLYPH }, { "svg:g", SP_TYPE_GROUP }, { "svg:feBlend", SP_TYPE_FEBLEND }, { "svg:feColorMatrix", SP_TYPE_FECOLORMATRIX },