X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Flibnrtype%2FLayout-TNG-Input.cpp;h=2ee0051a4b80fd544a24670bd16db3d32cd6ac5f;hb=6c3e745a94ef6b25a4ef9f018d350a7535aa45af;hp=30a1050af52ac72026051466547b09498e9d318c;hpb=3bb876375c03f804407536f66dbc66f415c82a99;p=inkscape.git diff --git a/src/libnrtype/Layout-TNG-Input.cpp b/src/libnrtype/Layout-TNG-Input.cpp old mode 100755 new mode 100644 index 30a1050af..2ee0051a4 --- a/src/libnrtype/Layout-TNG-Input.cpp +++ b/src/libnrtype/Layout-TNG-Input.cpp @@ -9,6 +9,8 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#define PANGO_ENABLE_ENGINE + #include #include "Layout-TNG.h" #include "style.h" @@ -52,6 +54,14 @@ void Layout::appendText(Glib::ustring const &text, SPStyle *style, void *source_ _copyInputVector(optional_attributes->dx, optional_attributes_offset, &new_source->dx, new_source->text_length); _copyInputVector(optional_attributes->dy, optional_attributes_offset, &new_source->dy, new_source->text_length); _copyInputVector(optional_attributes->rotate, optional_attributes_offset, &new_source->rotate, new_source->text_length); + if (!optional_attributes->rotate.empty() && optional_attributes_offset >= optional_attributes->rotate.size()) { + SVGLength last_rotate; + last_rotate = 0.f; + for (std::vector::const_iterator it = optional_attributes->rotate.begin() ; it != optional_attributes->rotate.end() ; ++it) + if (it->_set) + last_rotate = *it; + new_source->rotate.resize(1, last_rotate); + } } _input_stream.push_back(new_source); @@ -177,7 +187,7 @@ Layout::Direction Layout::InputStreamTextSource::styleGetBlockProgression() cons } -static Layout::Alignment text_anchor_to_alignment(unsigned anchor, Layout::Direction para_direction) +static Layout::Alignment text_anchor_to_alignment(unsigned anchor, Layout::Direction /*para_direction*/) { switch (anchor) { default: