X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fextension%2Finternal%2Fpdfinput%2Fsvg-builder.cpp;h=e28264eff9aa2166476c14103418e9ef47c7605d;hb=17d87f5698f5c2958d38c6a6207c7b322a7adaf9;hp=429a0cd4a542b328b16641be9836fc25e12be283;hpb=920fbbf5386a5d3b1d0a1304cb71eb48112abe0d;p=inkscape.git diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp index 429a0cd4a..e28264eff 100644 --- a/src/extension/internal/pdfinput/svg-builder.cpp +++ b/src/extension/internal/pdfinput/svg-builder.cpp @@ -33,6 +33,7 @@ #include "unit-constants.h" #include "io/stringstream.h" #include "io/base64stream.h" +#include "display/nr-filter-utils.h" #include "libnr/nr-matrix-ops.h" #include "libnr/nr-macros.h" #include "libnrtype/font-instance.h" @@ -55,20 +56,26 @@ namespace Internal { #define TRACE(_args) IFTRACE(g_print _args) +/** + * \struct SvgTransparencyGroup + * \brief Holds information about a PDF transparency group + */ +struct SvgTransparencyGroup { + double bbox[6]; + Inkscape::XML::Node *container; + + bool isolated; + bool knockout; + bool for_softmask; + + SvgTransparencyGroup *next; +}; + /** * \class SvgBuilder * */ -SvgBuilder::SvgBuilder() { - _in_text_object = false; - _need_font_update = true; - _invalidated_style = true; - _font_style = NULL; - _current_font = NULL; - _current_state = NULL; -} - SvgBuilder::SvgBuilder(SPDocument *document, gchar *docname, XRef *xref) { _is_top_level = true; _doc = document; @@ -77,7 +84,11 @@ SvgBuilder::SvgBuilder(SPDocument *document, gchar *docname, XRef *xref) { _xml_doc = sp_document_repr_doc(_doc); _container = _root = _doc->rroot; _root->setAttribute("xml:space", "preserve"); - SvgBuilder(); + _init(); + + // Set default preference settings + _preferences = _xml_doc->createElement("svgbuilder:prefs"); + _preferences->setAttribute("embedImages", "1"); } SvgBuilder::SvgBuilder(SvgBuilder *parent, Inkscape::XML::Node *root) { @@ -86,13 +97,30 @@ SvgBuilder::SvgBuilder(SvgBuilder *parent, Inkscape::XML::Node *root) { _docname = parent->_docname; _xref = parent->_xref; _xml_doc = parent->_xml_doc; + _preferences = parent->_preferences; _container = this->_root = root; - SvgBuilder(); + _init(); } SvgBuilder::~SvgBuilder() { } +void SvgBuilder::_init() { + _in_text_object = false; + _need_font_update = true; + _invalidated_style = true; + _font_style = NULL; + _current_font = NULL; + _current_state = NULL; + + _transp_group_stack = NULL; + SvgGraphicsState initial_state; + initial_state.softmask = NULL; + initial_state.group_depth = 0; + _state_stack.push_back(initial_state); + _node_stack.push_back(_container); +} + void SvgBuilder::setDocumentSize(double width, double height) { sp_repr_set_svg_double(_root, "width", width); sp_repr_set_svg_double(_root, "height", height); @@ -110,24 +138,54 @@ void SvgBuilder::setAsLayer(char *layer_name) { } } +/** + * \brief Sets the current container's opacity + */ +void SvgBuilder::setGroupOpacity(double opacity) { + sp_repr_set_svg_double(_container, "opacity", CLAMP(opacity, 0.0, 1.0)); +} + void SvgBuilder::saveState() { - _group_depth.push_back(0); + SvgGraphicsState new_state; + new_state.group_depth = 0; + new_state.softmask = _state_stack.back().softmask; + _state_stack.push_back(new_state); pushGroup(); } void SvgBuilder::restoreState() { - while (_group_depth.back() > 0) { + while( _state_stack.back().group_depth > 0 ) { popGroup(); } - _group_depth.pop_back(); + _state_stack.pop_back(); } -Inkscape::XML::Node *SvgBuilder::pushGroup() { - Inkscape::XML::Node *node = _xml_doc->createElement("svg:g"); - _container->appendChild(node); +Inkscape::XML::Node *SvgBuilder::pushNode(const char *name) { + Inkscape::XML::Node *node = _xml_doc->createElement(name); + _node_stack.push_back(node); _container = node; + return node; +} + +Inkscape::XML::Node *SvgBuilder::popNode() { + Inkscape::XML::Node *node = NULL; + if ( _node_stack.size() > 1 ) { + node = _node_stack.back(); + _node_stack.pop_back(); + _container = _node_stack.back(); // Re-set container + } else { + TRACE(("popNode() called when stack is empty\n")); + node = _root; + } + return node; +} + +Inkscape::XML::Node *SvgBuilder::pushGroup() { + Inkscape::XML::Node *saved_container = _container; + Inkscape::XML::Node *node = pushNode("svg:g"); + saved_container->appendChild(node); Inkscape::GC::release(node); - _group_depth.back()++; + _state_stack.back().group_depth++; // Set as a layer if this is a top-level group if ( _container->parent() == _root && _is_top_level ) { static int layer_count = 1; @@ -145,8 +203,8 @@ Inkscape::XML::Node *SvgBuilder::pushGroup() { Inkscape::XML::Node *SvgBuilder::popGroup() { if (_container != _root) { // Pop if the current container isn't root - _container = _container->parent(); - _group_depth[_group_depth.size()-1] = --_group_depth.back(); + popNode(); + _state_stack.back().group_depth--; } return _container; @@ -160,32 +218,27 @@ static gchar *svgConvertRGBToText(double r, double g, double b) { static gchar tmp[1023] = {0}; snprintf(tmp, 1023, "#%02x%02x%02x", - CLAMP(SP_COLOR_F_TO_U(r), 0, 255), - CLAMP(SP_COLOR_F_TO_U(g), 0, 255), - CLAMP(SP_COLOR_F_TO_U(b), 0, 255)); + NR::clamp(SP_COLOR_F_TO_U(r)), + NR::clamp(SP_COLOR_F_TO_U(g)), + NR::clamp(SP_COLOR_F_TO_U(b))); return (gchar *)&tmp; } static gchar *svgConvertGfxRGB(GfxRGB *color) { - double r = color->r / 65535.0; - double g = color->g / 65535.0; - double b = color->b / 65535.0; + double r = (double)color->r / 65535.0; + double g = (double)color->g / 65535.0; + double b = (double)color->b / 65535.0; return svgConvertRGBToText(r, g, b); } static void svgSetTransform(Inkscape::XML::Node *node, double c0, double c1, - double c2, double c3, double c4, double c5) { - NR::Matrix matrix(c0, c1, c2, c3, c4, c5); + double c2, double c3, double c4, double c5) { + Geom::Matrix matrix(c0, c1, c2, c3, c4, c5); gchar *transform_text = sp_svg_transform_write(matrix); node->setAttribute("transform", transform_text); g_free(transform_text); } -static void svgSetTransform(Inkscape::XML::Node *node, double *transform) { - svgSetTransform(node, transform[0], transform[1], transform[2], transform[3], - transform[4], transform[5]); -} - /** * \brief Generates a SVG path string from poppler's data structure */ @@ -382,6 +435,63 @@ void SvgBuilder::addPath(GfxState *state, bool fill, bool stroke, bool even_odd) Inkscape::GC::release(path); } +/** + * \brief Emits the current path in poppler's GfxState data structure + * The path is set to be filled with the given shading. + */ +void SvgBuilder::addShadedFill(GfxShading *shading, double *matrix, GfxPath *path, + bool even_odd) { + + Inkscape::XML::Node *path_node = _xml_doc->createElement("svg:path"); + gchar *pathtext = svgInterpretPath(path); + path_node->setAttribute("d", pathtext); + g_free(pathtext); + + // Set style + SPCSSAttr *css = sp_repr_css_attr_new(); + gchar *id = _createGradient(shading, matrix, true); + if (id) { + gchar *urltext = g_strdup_printf ("url(#%s)", id); + sp_repr_css_set_property(css, "fill", urltext); + g_free(urltext); + g_free(id); + } else { + sp_repr_css_attr_unref(css); + Inkscape::GC::release(path_node); + return; + } + if (even_odd) { + sp_repr_css_set_property(css, "fill-rule", "evenodd"); + } + sp_repr_css_set_property(css, "stroke", "none"); + sp_repr_css_change(path_node, css, "style"); + sp_repr_css_attr_unref(css); + + _container->appendChild(path_node); + Inkscape::GC::release(path_node); + + // Remove the clipping path emitted before the 'sh' operator + int up_walk = 0; + Inkscape::XML::Node *node = _container->parent(); + while( node && node->childCount() == 1 && up_walk < 3 ) { + gchar const *clip_path_url = node->attribute("clip-path"); + if (clip_path_url) { + // Obtain clipping path's id from the URL + gchar clip_path_id[32]; + strncpy(clip_path_id, clip_path_url + 5, strlen(clip_path_url) - 6); + SPObject *clip_obj = _doc->getObjectById(clip_path_id); + if (clip_obj) { + clip_obj->deleteObject(); + node->setAttribute("clip-path", NULL); + TRACE(("removed clipping path: %s\n", clip_path_id)); + } + break; + } + node = node->parent(); + up_walk++; + } +} + /** * \brief Clips to the current path set in GfxState * \param state poppler's data structure @@ -420,7 +530,7 @@ void SvgBuilder::setClipPath(GfxState *state, bool even_odd) { * \return true on success; false on invalid transformation */ bool SvgBuilder::getTransform(double *transform) { - NR::Matrix svd; + Geom::Matrix svd; gchar const *tr = _container->attribute("transform"); bool valid = sp_svg_transform_read(tr, &svd); if (valid) { @@ -439,11 +549,15 @@ bool SvgBuilder::getTransform(double *transform) { void SvgBuilder::setTransform(double c0, double c1, double c2, double c3, double c4, double c5) { + // Avoid transforming a group with an already set clip-path + if ( _container->attribute("clip-path") != NULL ) { + pushGroup(); + } TRACE(("setTransform: %f %f %f %f %f %f\n", c0, c1, c2, c3, c4, c5)); svgSetTransform(_container, c0, c1, c2, c3, c4, c5); } -void SvgBuilder::setTransform(double *transform) { +void SvgBuilder::setTransform(double const *transform) { setTransform(transform[0], transform[1], transform[2], transform[3], transform[4], transform[5]); } @@ -480,7 +594,9 @@ gchar *SvgBuilder::_createPattern(GfxPattern *pattern, GfxState *state, bool is_ gchar *id = NULL; if ( pattern != NULL ) { if ( pattern->getType() == 2 ) { // Shading pattern - id = _createGradient((GfxShadingPattern*)pattern); + GfxShadingPattern *shading_pattern = (GfxShadingPattern*)pattern; + id = _createGradient(shading_pattern->getShading(), + shading_pattern->getMatrix()); } else if ( pattern->getType() == 1 ) { // Tiling pattern id = _createTilingPattern((GfxTilingPattern*)pattern, state, is_stroke); } @@ -503,7 +619,7 @@ gchar *SvgBuilder::_createTilingPattern(GfxTilingPattern *tiling_pattern, Inkscape::XML::Node *pattern_node = _xml_doc->createElement("svg:pattern"); // Set pattern transform matrix double *p2u = tiling_pattern->getMatrix(); - NR::Matrix pat_matrix(p2u[0], p2u[1], p2u[2], p2u[3], p2u[4], p2u[5]); + Geom::Matrix pat_matrix(p2u[0], p2u[1], p2u[2], p2u[3], p2u[4], p2u[5]); gchar *transform_text = sp_svg_transform_write(pat_matrix); pattern_node->setAttribute("patternTransform", transform_text); g_free(transform_text); @@ -556,10 +672,12 @@ gchar *SvgBuilder::_createTilingPattern(GfxTilingPattern *tiling_pattern, /** * \brief Creates a linear or radial gradient from poppler's data structure + * \param shading poppler's data structure for the shading + * \param matrix gradient transformation, can be null + * \param for_shading true if we're creating this for a shading operator; false otherwise * \return id of the created object */ -gchar *SvgBuilder::_createGradient(GfxShadingPattern *shading_pattern) { - GfxShading *shading = shading_pattern->getShading(); +gchar *SvgBuilder::_createGradient(GfxShading *shading, double *matrix, bool for_shading) { Inkscape::XML::Node *gradient; Function *func; int num_funcs; @@ -597,20 +715,24 @@ gchar *SvgBuilder::_createGradient(GfxShadingPattern *shading_pattern) { return NULL; } gradient->setAttribute("gradientUnits", "userSpaceOnUse"); - // Flip the gradient transform around the y axis - double *p2u = shading_pattern->getMatrix(); - NR::Matrix pat_matrix(p2u[0], p2u[1], p2u[2], p2u[3], p2u[4], p2u[5]); - NR::Matrix flip(1.0, 0.0, 0.0, -1.0, 0.0, _height * PT_PER_PX); - pat_matrix *= flip; - gchar *transform_text = sp_svg_transform_write(pat_matrix); - gradient->setAttribute("gradientTransform", transform_text); - g_free(transform_text); + // If needed, flip the gradient transform around the y axis + if (matrix) { + Geom::Matrix pat_matrix(matrix[0], matrix[1], matrix[2], matrix[3], + matrix[4], matrix[5]); + if ( !for_shading && _is_top_level ) { + Geom::Matrix flip(1.0, 0.0, 0.0, -1.0, 0.0, _height * PT_PER_PX); + pat_matrix *= flip; + } + gchar *transform_text = sp_svg_transform_write(pat_matrix); + gradient->setAttribute("gradientTransform", transform_text); + g_free(transform_text); + } if ( extend0 && extend1 ) { gradient->setAttribute("spreadMethod", "pad"); } - if ( num_funcs > 1 || !_addStopsToGradient(gradient, func, 1.0) ) { + if ( num_funcs > 1 || !_addGradientStops(gradient, shading, func) ) { Inkscape::GC::release(gradient); return NULL; } @@ -624,86 +746,91 @@ gchar *SvgBuilder::_createGradient(GfxShadingPattern *shading_pattern) { } #define EPSILON 0.0001 -bool SvgBuilder::_addSamplesToGradient(Inkscape::XML::Node *gradient, - SampledFunction *func, double offset0, - double offset1, double opacity) { - - // Check whether this sampled function can be converted to color stops - int sample_size = func->getSampleSize(0); - if ( sample_size != 2 ) - return false; - int num_comps = func->getOutputSize(); - if ( num_comps != 3 ) - return false; - - double *samples = func->getSamples(); - unsigned stop_count = gradient->childCount(); - bool is_continuation = false; - // Check if this sampled function is the continuation of the previous one - if ( stop_count > 0 ) { - // Get previous stop - Inkscape::XML::Node *prev_stop = gradient->nthChild(stop_count-1); - // Read its properties - double prev_offset; - sp_repr_get_double(prev_stop, "offset", &prev_offset); - SPCSSAttr *css = sp_repr_css_attr(prev_stop, "style"); - guint32 prev_stop_color = sp_svg_read_color(sp_repr_css_property(css, "stop-color", NULL), 0); - sp_repr_css_attr_unref(css); - // Convert colors - double r = SP_RGBA32_R_F (prev_stop_color); - double g = SP_RGBA32_G_F (prev_stop_color); - double b = SP_RGBA32_B_F (prev_stop_color); - if ( fabs(prev_offset - offset0) < EPSILON && - fabs(samples[0] - r) < EPSILON && - fabs(samples[1] - g) < EPSILON && - fabs(samples[2] - b) < EPSILON ) { - - is_continuation = true; - } +/** + * \brief Adds a stop with the given properties to the gradient's representation + */ +void SvgBuilder::_addStopToGradient(Inkscape::XML::Node *gradient, double offset, + GfxRGB *color, double opacity) { + Inkscape::XML::Node *stop = _xml_doc->createElement("svg:stop"); + SPCSSAttr *css = sp_repr_css_attr_new(); + Inkscape::CSSOStringStream os_opacity; + gchar *color_text = NULL; + if ( _transp_group_stack != NULL && _transp_group_stack->for_softmask ) { + double gray = (double)color->r / 65535.0; + gray = CLAMP(gray, 0.0, 1.0); + os_opacity << gray; + color_text = (char*) "#ffffff"; + } else { + os_opacity << opacity; + color_text = svgConvertGfxRGB(color); } + sp_repr_css_set_property(css, "stop-opacity", os_opacity.str().c_str()); + sp_repr_css_set_property(css, "stop-color", color_text); - int i = is_continuation ? num_comps : 0; - while (i < sample_size*num_comps) { - Inkscape::XML::Node *stop = _xml_doc->createElement("svg:stop"); - SPCSSAttr *css = sp_repr_css_attr_new(); - Inkscape::CSSOStringStream os_opacity; - os_opacity << opacity; - sp_repr_css_set_property(css, "stop-opacity", os_opacity.str().c_str()); - gchar c[64]; - sp_svg_write_color (c, 64, SP_RGBA32_F_COMPOSE (samples[i], samples[i+1], samples[i+2], 1.0)); - sp_repr_css_set_property(css, "stop-color", c); - sp_repr_css_change(stop, css, "style"); - sp_repr_css_attr_unref(css); - sp_repr_set_css_double(stop, "offset", ( i < num_comps ) ? offset0 : offset1); + sp_repr_css_change(stop, css, "style"); + sp_repr_css_attr_unref(css); + sp_repr_set_css_double(stop, "offset", offset); + + gradient->appendChild(stop); + Inkscape::GC::release(stop); +} - gradient->appendChild(stop); - Inkscape::GC::release(stop); - i += num_comps; +static bool svgGetShadingColorRGB(GfxShading *shading, double offset, GfxRGB *result) { + GfxColorSpace *color_space = shading->getColorSpace(); + GfxColor temp; + if ( shading->getType() == 2 ) { // Axial shading + ((GfxAxialShading*)shading)->getColor(offset, &temp); + } else if ( shading->getType() == 3 ) { // Radial shading + ((GfxRadialShading*)shading)->getColor(offset, &temp); + } else { + return false; } - + // Convert it to RGB + color_space->getRGB(&temp, result); + return true; } -bool SvgBuilder::_addStopsToGradient(Inkscape::XML::Node *gradient, Function *func, - double opacity) { - +#define INT_EPSILON 8 +bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *shading, + Function *func) { int type = func->getType(); - if ( type == 0 ) { // Sampled - SampledFunction *sampledFunc = (SampledFunction*)func; - _addSamplesToGradient(gradient, sampledFunc, 0.0, 1.0, opacity); + if ( type == 0 || type == 2 ) { // Sampled or exponential function + GfxRGB stop1, stop2; + if ( !svgGetShadingColorRGB(shading, 0.0, &stop1) || + !svgGetShadingColorRGB(shading, 1.0, &stop2) ) { + return false; + } else { + _addStopToGradient(gradient, 0.0, &stop1, 1.0); + _addStopToGradient(gradient, 1.0, &stop2, 1.0); + } } else if ( type == 3 ) { // Stitching StitchingFunction *stitchingFunc = (StitchingFunction*)func; double *bounds = stitchingFunc->getBounds(); int num_funcs = stitchingFunc->getNumFuncs(); - // Add samples from all the stitched functions + // Add stops from all the stitched functions for ( int i = 0 ; i < num_funcs ; i++ ) { - Function *func = stitchingFunc->getFunc(i); - if ( func->getType() != 0 ) // Only sampled functions are supported - continue; - - SampledFunction *sampledFunc = (SampledFunction*)func; - _addSamplesToGradient(gradient, sampledFunc, bounds[i], - bounds[i+1], opacity); + GfxRGB color; + svgGetShadingColorRGB(shading, bounds[i], &color); + bool is_continuation = false; + if ( i > 0 ) { // Compare to previous stop + GfxRGB prev_color; + svgGetShadingColorRGB(shading, bounds[i-1], &prev_color); + if ( abs(color.r - prev_color.r) < INT_EPSILON && + abs(color.g - prev_color.g) < INT_EPSILON && + abs(color.b - prev_color.b) < INT_EPSILON ) { + is_continuation = true; + } + } + // Add stops + if ( !is_continuation ) { + _addStopToGradient(gradient, bounds[i], &color, 1.0); + } + if ( is_continuation || ( i == num_funcs - 1 ) ) { + GfxRGB next_color; + svgGetShadingColorRGB(shading, bounds[i+1], &next_color); + _addStopToGradient(gradient, bounds[i+1], &next_color, 1.0); + } } } else { // Unsupported function type return false; @@ -727,22 +854,22 @@ void SvgBuilder::updateStyle(GfxState *state) { * This array holds info about translating font weight names to more or less CSS equivalents */ static char *font_weight_translator[][2] = { - {"bold", "bold"}, - {"light", "300"}, - {"black", "900"}, - {"heavy", "900"}, - {"ultrabold", "800"}, - {"extrabold", "800"}, - {"demibold", "600"}, - {"semibold", "600"}, - {"medium", "500"}, - {"book", "normal"}, - {"regular", "normal"}, - {"roman", "normal"}, - {"normal", "normal"}, - {"ultralight", "200"}, - {"extralight", "200"}, - {"thin", "100"} + {(char*) "bold", (char*) "bold"}, + {(char*) "light", (char*) "300"}, + {(char*) "black", (char*) "900"}, + {(char*) "heavy", (char*) "900"}, + {(char*) "ultrabold", (char*) "800"}, + {(char*) "extrabold", (char*) "800"}, + {(char*) "demibold", (char*) "600"}, + {(char*) "semibold", (char*) "600"}, + {(char*) "medium", (char*) "500"}, + {(char*) "book", (char*) "normal"}, + {(char*) "regular", (char*) "normal"}, + {(char*) "roman", (char*) "normal"}, + {(char*) "normal", (char*) "normal"}, + {(char*) "ultralight", (char*) "200"}, + {(char*) "extralight", (char*) "200"}, + {(char*) "thin", (char*) "100"} }; /** @@ -752,6 +879,7 @@ void SvgBuilder::updateFont(GfxState *state) { TRACE(("updateFont()\n")); _need_font_update = false; + updateTextMatrix(state); // Ensure that we have a text matrix built if (_font_style) { //sp_repr_css_attr_unref(_font_style); @@ -764,7 +892,7 @@ void SvgBuilder::updateFont(GfxState *state) { } else if (font->getName()) { _font_specification = font->getName()->getCString(); } else { - _font_specification = "Arial"; + _font_specification = (char*) "Arial"; } // Prune the font name to get the correct font family name @@ -814,9 +942,9 @@ void SvgBuilder::updateFont(GfxState *state) { char *css_font_weight = NULL; if ( font_weight != GfxFont::WeightNotDefined ) { if ( font_weight == GfxFont::W400 ) { - css_font_weight = "normal"; + css_font_weight = (char*) "normal"; } else if ( font_weight == GfxFont::W700 ) { - css_font_weight = "bold"; + css_font_weight = (char*) "bold"; } else { gchar weight_num[4] = "100"; weight_num[0] = (gchar)( '1' + (font_weight - GfxFont::W100) ); @@ -831,7 +959,7 @@ void SvgBuilder::updateFont(GfxState *state) { } } } else { - css_font_weight = "normal"; + css_font_weight = (char*) "normal"; } if (css_font_weight) { sp_repr_css_set_property(_font_style, "font-weight", css_font_weight); @@ -846,31 +974,31 @@ void SvgBuilder::updateFont(GfxState *state) { gchar *stretch_value = NULL; switch (font_stretch) { case GfxFont::UltraCondensed: - stretch_value = "ultra-condensed"; + stretch_value = (char*) "ultra-condensed"; break; case GfxFont::ExtraCondensed: - stretch_value = "extra-condensed"; + stretch_value = (char*) "extra-condensed"; break; case GfxFont::Condensed: - stretch_value = "condensed"; + stretch_value = (char*) "condensed"; break; case GfxFont::SemiCondensed: - stretch_value = "semi-condensed"; + stretch_value = (char*) "semi-condensed"; break; case GfxFont::Normal: - stretch_value = "normal"; + stretch_value = (char*) "normal"; break; case GfxFont::SemiExpanded: - stretch_value = "semi-expanded"; + stretch_value = (char*) "semi-expanded"; break; case GfxFont::Expanded: - stretch_value = "expanded"; + stretch_value = (char*) "expanded"; break; case GfxFont::ExtraExpanded: - stretch_value = "extra-expanded"; + stretch_value = (char*) "extra-expanded"; break; case GfxFont::UltraExpanded: - stretch_value = "ultra-expanded"; + stretch_value = (char*) "ultra-expanded"; break; default: break; @@ -881,23 +1009,13 @@ void SvgBuilder::updateFont(GfxState *state) { // Font size Inkscape::CSSOStringStream os_font_size; - double *text_matrix = state->getTextMat(); - double w_scale = sqrt( text_matrix[0] * text_matrix[0] + text_matrix[2] * text_matrix[2] ); - double h_scale = sqrt( text_matrix[1] * text_matrix[1] + text_matrix[3] * text_matrix[3] ); - double max_scale; - if ( w_scale > h_scale ) { - max_scale = w_scale; - } else { - max_scale = h_scale; - } - double css_font_size = max_scale * state->getFontSize(); + double css_font_size = _font_scaling * state->getFontSize(); if ( font->getType() == fontType3 ) { double *font_matrix = font->getFontMatrix(); if ( font_matrix[0] != 0.0 ) { css_font_size *= font_matrix[3] / font_matrix[0]; } } - os_font_size << css_font_size; sp_repr_css_set_property(_font_style, "font-size", os_font_size.str().c_str()); @@ -908,20 +1026,6 @@ void SvgBuilder::updateFont(GfxState *state) { sp_repr_css_set_property(_font_style, "writing-mode", "tb"); } - // Calculate new text matrix - NR::Matrix new_text_matrix(text_matrix[0] * state->getHorizScaling(), - text_matrix[1] * state->getHorizScaling(), - -text_matrix[2], -text_matrix[3], - 0.0, 0.0); - - if ( fabs( max_scale - 1.0 ) > EPSILON ) { - // Cancel out scaling by font size in text matrix - for ( int i = 0 ; i < 4 ; i++ ) { - new_text_matrix[i] /= max_scale; - } - } - _text_matrix = new_text_matrix; - _font_scaling = max_scale; _current_font = font; _invalidated_style = true; } @@ -942,7 +1046,7 @@ void SvgBuilder::updateTextShift(GfxState *state, double shift) { * \brief Updates current text position */ void SvgBuilder::updateTextPosition(double tx, double ty) { - NR::Point new_position(tx, ty); + Geom::Point new_position(tx, ty); _text_position = new_position; } @@ -951,7 +1055,30 @@ void SvgBuilder::updateTextPosition(double tx, double ty) { */ void SvgBuilder::updateTextMatrix(GfxState *state) { _flushText(); - updateFont(state); // Update text matrix + // Update text matrix + double *text_matrix = state->getTextMat(); + double w_scale = sqrt( text_matrix[0] * text_matrix[0] + text_matrix[2] * text_matrix[2] ); + double h_scale = sqrt( text_matrix[1] * text_matrix[1] + text_matrix[3] * text_matrix[3] ); + double max_scale; + if ( w_scale > h_scale ) { + max_scale = w_scale; + } else { + max_scale = h_scale; + } + // Calculate new text matrix + Geom::Matrix new_text_matrix(text_matrix[0] * state->getHorizScaling(), + text_matrix[1] * state->getHorizScaling(), + -text_matrix[2], -text_matrix[3], + 0.0, 0.0); + + if ( fabs( max_scale - 1.0 ) > EPSILON ) { + // Cancel out scaling by font size in text matrix + for ( int i = 0 ; i < 4 ; i++ ) { + new_text_matrix[i] /= max_scale; + } + } + _text_matrix = new_text_matrix; + _font_scaling = max_scale; } /** @@ -974,7 +1101,7 @@ void SvgBuilder::_flushText() { Inkscape::XML::Node *text_node = _xml_doc->createElement("svg:text"); // Set text matrix - NR::Matrix text_transform(_text_matrix); + Geom::Matrix text_transform(_text_matrix); text_transform[4] = first_glyph.position[0]; text_transform[5] = first_glyph.position[1]; gchar *transform = sp_svg_transform_write(text_transform); @@ -982,12 +1109,13 @@ void SvgBuilder::_flushText() { g_free(transform); bool new_tspan = true; + bool same_coords[2] = {true, true}; + Geom::Point last_delta_pos; unsigned int glyphs_in_a_row = 0; Inkscape::XML::Node *tspan_node = NULL; Glib::ustring x_coords; Glib::ustring y_coords; Glib::ustring text_buffer; - bool is_vertical = !strcmp(sp_repr_css_property(_font_style, "writing-mode", "lr"), "tb"); // FIXME // Output all buffered glyphs while (1) { @@ -1010,8 +1138,16 @@ void SvgBuilder::_flushText() { if ( new_tspan || i == _glyphs.end() ) { if (tspan_node) { // Set the x and y coordinate arrays - tspan_node->setAttribute("x", x_coords.c_str()); - tspan_node->setAttribute("y", y_coords.c_str()); + if ( same_coords[0] ) { + sp_repr_set_svg_double(tspan_node, "x", last_delta_pos[0]); + } else { + tspan_node->setAttribute("x", x_coords.c_str()); + } + if ( same_coords[1] ) { + sp_repr_set_svg_double(tspan_node, "y", last_delta_pos[1]); + } else { + tspan_node->setAttribute("y", y_coords.c_str()); + } TRACE(("tspan content: %s\n", text_buffer.c_str())); if ( glyphs_in_a_row > 1 ) { tspan_node->setAttribute("sodipodi:role", "line"); @@ -1033,7 +1169,14 @@ void SvgBuilder::_flushText() { break; } else { tspan_node = _xml_doc->createElement("svg:tspan"); - tspan_node->setAttribute("inkscape:font-specification", glyph.font_specification); + + /////// + // Create a font specification string and save the attribute in the style + PangoFontDescription *descr = pango_font_description_from_string(glyph.font_specification); + Glib::ustring properFontSpec = font_factory::Default()->ConstructFontSpecification(descr); + pango_font_description_free(descr); + sp_repr_css_set_property(glyph.style, "-inkscape-font-specification", properFontSpec.c_str()); + // Set style and unref SPCSSAttr if it won't be needed anymore sp_repr_css_change(tspan_node, glyph.style, "style"); if ( glyph.style_changed && i != _glyphs.begin() ) { // Free previous style @@ -1045,9 +1188,16 @@ void SvgBuilder::_flushText() { if ( glyphs_in_a_row > 0 ) { x_coords.append(" "); y_coords.append(" "); + // Check if we have the same coordinates + const SvgGlyph& prev_glyph = (*prev_iterator); + for ( int p = 0 ; p < 2 ; p++ ) { + if ( glyph.text_position[p] != prev_glyph.text_position[p] ) { + same_coords[p] = false; + } + } } // Append the coordinates to their respective strings - NR::Point delta_pos( glyph.text_position - first_glyph.text_position ); + Geom::Point delta_pos( glyph.text_position - first_glyph.text_position ); delta_pos[1] += glyph.rise; delta_pos[1] *= -1.0; // flip it delta_pos *= _font_scaling; @@ -1057,6 +1207,7 @@ void SvgBuilder::_flushText() { Inkscape::CSSOStringStream os_y; os_y << delta_pos[1]; y_coords.append(os_y.str()); + last_delta_pos = delta_pos; // Append the character to the text buffer text_buffer.append((char *)&glyph.code, 1); @@ -1094,25 +1245,25 @@ void SvgBuilder::addChar(GfxState *state, double x, double y, bool is_space = ( uLen == 1 && u[0] == 32 ); // Skip beginning space if ( is_space && _glyphs.size() < 1 ) { - NR::Point delta(dx, dy); + Geom::Point delta(dx, dy); _text_position += delta; return; } // Allow only one space in a row if ( is_space && _glyphs[_glyphs.size() - 1].code_size == 1 && _glyphs[_glyphs.size() - 1].code[0] == 32 ) { - NR::Point delta(dx, dy); + Geom::Point delta(dx, dy); _text_position += delta; return; } SvgGlyph new_glyph; new_glyph.is_space = is_space; - new_glyph.position = NR::Point( x - originX, y - originY ); + new_glyph.position = Geom::Point( x - originX, y - originY ); new_glyph.text_position = _text_position; new_glyph.dx = dx; new_glyph.dy = dy; - NR::Point delta(dx, dy); + Geom::Point delta(dx, dy); _text_position += delta; // Convert the character to UTF-8 since that's our SVG document's encoding @@ -1210,13 +1361,15 @@ Inkscape::XML::Node *SvgBuilder::_createImage(Stream *str, int width, int height png_destroy_write_struct(&png_ptr, &info_ptr); return NULL; } - + // Decide whether we should embed this image + double attr_value = 1.0; + sp_repr_get_double(_preferences, "embedImages", &attr_value); + bool embed_image = ( attr_value != 0.0 ); // Set read/write functions Inkscape::IO::StringOutputStream base64_string; Inkscape::IO::Base64OutputStream base64_stream(base64_string); - FILE *fp; - gchar *file_name; - bool embed_image = true; + FILE *fp = NULL; + gchar *file_name = NULL; if (embed_image) { base64_stream.setColumnWidth(0); // Disable line breaks png_set_write_fn(png_ptr, &base64_stream, png_write_base64stream, png_flush_base64stream); @@ -1282,39 +1435,25 @@ Inkscape::XML::Node *SvgBuilder::_createImage(Stream *str, int width, int height image_stream->reset(); // Convert grayscale values - unsigned char *buffer = NULL; - if ( color_map || invert_alpha ) { - buffer = new unsigned char[width]; - } - if ( color_map ) { - for ( int y = 0 ; y < height ; y++ ) { - unsigned char *row = image_stream->getLine(); + unsigned char *buffer = new unsigned char[width]; + int invert_bit = invert_alpha ? 1 : 0; + for ( int y = 0 ; y < height ; y++ ) { + unsigned char *row = image_stream->getLine(); + if (color_map) { color_map->getGrayLine(row, buffer, width); - if (invert_alpha) { - unsigned char *buf_ptr = buffer; - for ( int x = 0 ; x < width ; x++ ) { - *buf_ptr++ = ~(*buf_ptr); + } else { + unsigned char *buf_ptr = buffer; + for ( int x = 0 ; x < width ; x++ ) { + if ( row[x] ^ invert_bit ) { + *buf_ptr++ = 0; + } else { + *buf_ptr++ = 255; } } - png_write_row(png_ptr, (png_bytep)buffer); } - } else { - for ( int y = 0 ; y < height ; y++ ) { - unsigned char *row = image_stream->getLine(); - if (invert_alpha) { - unsigned char *buf_ptr = buffer; - for ( int x = 0 ; x < width ; x++ ) { - *buf_ptr++ = ~row[x]; - } - png_write_row(png_ptr, (png_bytep)buffer); - } else { - png_write_row(png_ptr, (png_bytep)row); - } - } - } - if (buffer) { - delete buffer; + png_write_row(png_ptr, (png_bytep)buffer); } + delete buffer; } else if (color_map) { image_stream = new ImageStream(str, width, color_map->getNumPixelComps(), @@ -1414,7 +1553,6 @@ Inkscape::XML::Node *SvgBuilder::_createMask(double width, double height) { } else { // Work around for renderer bug when mask isn't defined in pattern static int mask_count = 0; Inkscape::XML::Node *defs = _root->firstChild(); - Inkscape::XML::Node *result = NULL; if ( !( defs && !strcmp(defs->name(), "svg:defs") ) ) { // Create node defs = _xml_doc->createElement("svg:defs"); @@ -1493,7 +1631,7 @@ void SvgBuilder::addMaskedImage(GfxState *state, Stream *str, int width, int hei mask_image_node->setAttribute("transform", NULL); mask_node->appendChild(mask_image_node); // Scale the mask to the size of the image - NR::Matrix mask_transform((double)width, 0.0, 0.0, (double)height, 0.0, 0.0); + Geom::Matrix mask_transform((double)width, 0.0, 0.0, (double)height, 0.0, 0.0); gchar *transform_text = sp_svg_transform_write(mask_transform); mask_node->setAttribute("maskTransform", transform_text); g_free(transform_text); @@ -1539,6 +1677,77 @@ void SvgBuilder::addSoftMaskedImage(GfxState *state, Stream *str, int width, int } } +/** + * \brief Starts building a new transparency group + */ +void SvgBuilder::pushTransparencyGroup(GfxState *state, double *bbox, + GfxColorSpace *blending_color_space, + bool isolated, bool knockout, + bool for_softmask) { + + // Push node stack + pushNode("svg:g"); + + // Setup new transparency group + SvgTransparencyGroup *transpGroup = new SvgTransparencyGroup; + memcpy(&transpGroup->bbox, bbox, sizeof(bbox)); + transpGroup->isolated = isolated; + transpGroup->knockout = knockout; + transpGroup->for_softmask = for_softmask; + transpGroup->container = _container; + + // Push onto the stack + transpGroup->next = _transp_group_stack; + _transp_group_stack = transpGroup; +} + +void SvgBuilder::popTransparencyGroup(GfxState *state) { + // Restore node stack + popNode(); +} + +/** + * \brief Places the current transparency group into the current container + */ +void SvgBuilder::paintTransparencyGroup(GfxState *state, double *bbox) { + SvgTransparencyGroup *transpGroup = _transp_group_stack; + _container->appendChild(transpGroup->container); + Inkscape::GC::release(transpGroup->container); + // Pop the stack + _transp_group_stack = transpGroup->next; + delete transpGroup; +} + +/** + * \brief Creates a mask using the current transparency group as its content + */ +void SvgBuilder::setSoftMask(GfxState *state, double *bbox, bool alpha, + Function *transfer_func, GfxColor *backdrop_color) { + + // Create mask + Inkscape::XML::Node *mask_node = _createMask(1.0, 1.0); + // Add the softmask content to it + SvgTransparencyGroup *transpGroup = _transp_group_stack; + mask_node->appendChild(transpGroup->container); + Inkscape::GC::release(transpGroup->container); + // Apply the mask + _state_stack.back().softmask = mask_node; + pushGroup(); + gchar *mask_url = g_strdup_printf("url(#%s)", mask_node->attribute("id")); + _container->setAttribute("mask", mask_url); + g_free(mask_url); + // Pop the stack + _transp_group_stack = transpGroup->next; + delete transpGroup; +} + +void SvgBuilder::clearSoftMask(GfxState *state) { + if (_state_stack.back().softmask) { + _state_stack.back().softmask = NULL; + popGroup(); + } +} + } } } /* namespace Inkscape, Extension, Internal */ #endif /* HAVE_POPPLER */