CodingStyle: const placement

[inkscape.git] / src / sp-flowtext.cpp

diff --git a/src/sp-flowtext.cpp b/src/sp-flowtext.cpp
index fbf0efabd5b5da992b7f75a642f72991cce13dad..3f70f53cec89ffee730d345a6b89c9d59945b58d 100644 (file)
--- a/src/sp-flowtext.cpp
+++ b/src/sp-flowtext.cpp
@@ -103,6 +103,7 @@ sp_flowtext_class_init(SPFlowtextClass *klass)
 static void
 sp_flowtext_init(SPFlowtext *group)
 {
+    group->par_indent = 0;
     new (&group->layout) Inkscape::Text::Layout();
 }
 
@@ -171,7 +172,7 @@ sp_flowtext_update(SPObject *object, SPCtx *ctx, unsigned flags)
 
     group->rebuildLayout();
 
-    // pass the bbox of the flowtext object as paintbox (used for paintserver fills)   
+    // pass the bbox of the flowtext object as paintbox (used for paintserver fills)
     NRRect paintbox;
     sp_item_invoke_bbox(group, &paintbox, NR::identity(), TRUE);
     for (SPItemView *v = group->display; v != NULL; v = v->next) {
@@ -252,6 +253,7 @@ sp_flowtext_set(SPObject *object, unsigned key, gchar const *value)
                     }
                 }
             }
+            */
             {   // This would probably translate to padding-left, if SPStyle had it.
                 gchar const *val = sp_repr_css_property(opts, "par-indent", NULL);
                 if ( val == NULL ) {
@@ -260,7 +262,6 @@ sp_flowtext_set(SPObject *object, unsigned key, gchar const *value)
                     sp_repr_get_double((Inkscape::XML::Node*)opts, "par-indent", &group->par_indent);
                 }
             }
-            */
             sp_repr_css_attr_unref(opts);
             object->requestModified(SP_OBJECT_MODIFIED_FLAG);
             break;
@@ -283,7 +284,7 @@ sp_flowtext_write(SPObject *object, Inkscape::XML::Node *repr, guint flags)
             Inkscape::XML::Node *c_repr = NULL;
             if ( SP_IS_FLOWDIV(child) || SP_IS_FLOWPARA(child) || SP_IS_FLOWREGION(child) || SP_IS_FLOWREGIONEXCLUDE(child)) {
                 c_repr = child->updateRepr(NULL, flags);
-            } 
+            }
             if ( c_repr ) l = g_slist_prepend(l, c_repr);
         }
         while ( l ) {
@@ -337,9 +338,9 @@ static gchar *sp_flowtext_description(SPItem *item)
     Inkscape::Text::Layout const &layout = SP_FLOWTEXT(item)->layout;
     int const nChars = layout.iteratorToCharIndex(layout.end());
     if (SP_FLOWTEXT(item)->has_internal_frame())
-        return g_strdup_printf(_("<b>Flowed text</b> (%d characters)"), nChars);
-    else 
-        return g_strdup_printf(_("<b>Linked flowed text</b> (%d characters)"), nChars);
+        return g_strdup_printf(ngettext("<b>Flowed text</b> (%d character)", "<b>Flowed text</b> (%d characters)", nChars), nChars);
+    else
+        return g_strdup_printf(ngettext("<b>Linked flowed text</b> (%d character)", "<b>Linked flowed text</b> (%d characters)", nChars), nChars);
 }
 
 static NRArenaItem *
@@ -349,7 +350,7 @@ sp_flowtext_show(SPItem *item, NRArena *arena, unsigned/* key*/, unsigned /*flag
     NRArenaGroup *flowed = NRArenaGroup::create(arena);
     nr_arena_group_set_transparent(flowed, FALSE);
 
-    // pass the bbox of the flowtext object as paintbox (used for paintserver fills)   
+    // pass the bbox of the flowtext object as paintbox (used for paintserver fills)
     NRRect paintbox;
     sp_item_invoke_bbox(item, &paintbox, NR::identity(), TRUE);
     group->layout.show(flowed, &paintbox);
@@ -371,11 +372,31 @@ sp_flowtext_hide(SPItem *item, unsigned int key)
 
 void SPFlowtext::_buildLayoutInput(SPObject *root, Shape const *exclusion_shape, std::list<Shape> *shapes, SPObject **pending_line_break_object)
 {
+    Inkscape::Text::Layout::OptionalTextTagAttrs pi;
+    bool with_indent = false;
+
+    if (SP_IS_FLOWPARA(root)) {
+        // emulate par-indent with the first char's kern
+        SPObject *t = root;
+        for ( ; t != NULL && !SP_IS_FLOWTEXT(t); t = SP_OBJECT_PARENT(t));
+        if (SP_IS_FLOWTEXT(t)) {
+            double indent = SP_FLOWTEXT(t)->par_indent;
+            if (indent != 0) {
+                with_indent = true;
+                SVGLength sl;
+                sl.value = sl.computed = indent;
+                sl._set = true;
+                pi.dx.push_back(sl);
+            }
+        }
+    }
+
     if (*pending_line_break_object) {
-        if (SP_IS_FLOWREGIONBREAK(*pending_line_break_object))
+        if (SP_IS_FLOWREGIONBREAK(*pending_line_break_object)) {
             layout.appendControlCode(Inkscape::Text::Layout::SHAPE_BREAK, *pending_line_break_object);
-        else
+        } else {
             layout.appendControlCode(Inkscape::Text::Layout::PARAGRAPH_BREAK, *pending_line_break_object);
+        }
         *pending_line_break_object = NULL;
     }
 
@@ -384,11 +405,15 @@ void SPFlowtext::_buildLayoutInput(SPObject *root, Shape const *exclusion_shape,
             if (*pending_line_break_object) {
                 if (SP_IS_FLOWREGIONBREAK(*pending_line_break_object))
                     layout.appendControlCode(Inkscape::Text::Layout::SHAPE_BREAK, *pending_line_break_object);
-                else
+                else {
                     layout.appendControlCode(Inkscape::Text::Layout::PARAGRAPH_BREAK, *pending_line_break_object);
+                }
                 *pending_line_break_object = NULL;
             }
-            layout.appendText(SP_STRING(child)->string, root->style, child);
+            if (with_indent)
+                layout.appendText(SP_STRING(child)->string, root->style, child, &pi);
+            else
+                layout.appendText(SP_STRING(child)->string, root->style, child);
         } else if (SP_IS_FLOWREGION(child)) {
             std::vector<Shape*> const &computed = SP_FLOWREGION(child)->computed;
             for (std::vector<Shape*>::const_iterator it = computed.begin() ; it != computed.end() ; it++) {
@@ -478,7 +503,7 @@ void SPFlowtext::convert_to_text()
     sp_repr_set_svg_double(repr, "y", anchor_point[NR::Y]);
 
     for (Inkscape::Text::Layout::iterator it = group->layout.begin() ; it != group->layout.end() ; ) {
-        
+
            Inkscape::XML::Node *line_tspan = sp_repr_new("svg:tspan");
         line_tspan->setAttribute("sodipodi:role", "line");