fixing to trunk

(bzr r12588.1.34)

4 files changed, 119 insertions, 147 deletions

diff --git a/src/extension/implementation/implementation.h b/src/extension/implementation/implementation.h
index 9d679982a..fb323cd78 100644
--- a/src/extension/implementation/implementation.h
+++ b/src/extension/implementation/implementation.h
@@ -29,7 +29,7 @@ namespace Gtk {
 }
 
 class SPDocument;
-struct SPStyle;
+class SPStyle;
 
 namespace Inkscape {
 
diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp
index f0fd3711b..99c882a01 100644
--- a/src/extension/implementation/script.cpp
+++ b/src/extension/implementation/script.cpp
@@ -1,28 +1,18 @@
-/** \file
- * Code for handling extensions (i.e.\ scripts).
- */
-/*
+/**
+ * Code for handling extensions (i.e. scripts).
+ *
  * Authors:
  *   Bryce Harrington <bryce@osdl.org>
  *   Ted Gould <ted@gould.cx>
  *   Jon A. Cruz <jon@joncruz.org>
  *   Abhishek Sharma
  *
- * Copyright (C) 2002-2005,2007 Authors
+ * Copyright (C) 2002-2007 Authors
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#define __INKSCAPE_EXTENSION_IMPLEMENTATION_SCRIPT_C__
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
-#include <glibmm/threads.h>
-#endif
-
+#include <glibmm.h>
 #include <gtkmm/messagedialog.h>
 #include <gtkmm/main.h>
 #include <gtkmm/scrolledwindow.h>
@@ -32,44 +22,38 @@
 #include <unistd.h>
 
 #include <errno.h>
-#include <glib.h>
 #include <glib/gstdio.h>
 
-#include "ui/view/view.h"
 #include "desktop-handles.h"
 #include "desktop.h"
-#include "selection.h"
-#include "sp-namedview.h"
-#include "io/sys.h"
-#include "preferences.h"
-#include "../system.h"
+#include "ui/dialog-events.h"
 #include "extension/effect.h"
 #include "extension/output.h"
 #include "extension/input.h"
 #include "extension/db.h"
-#include "script.h"
-#include "dialogs/dialog-events.h"
 #include "inkscape.h"
+#include "io/sys.h"
+#include "preferences.h"
+#include "script.h"
+#include "selection.h"
+#include "sp-namedview.h"
+#include "extension/system.h"
+#include "ui/view/view.h"
 #include "xml/node.h"
 #include "xml/attribute-record.h"
 
 #include "util/glib-list-iterators.h"
 #include "path-prefix.h"
 
-
 #ifdef WIN32
 #include <windows.h>
 #include <sys/stat.h>
 #include "registrytool.h"
 #endif
 
-
-
 /** This is the command buffer that gets allocated from the stack */
 #define BUFSIZE (255)
 
-
-
 /* Namespaces */
 namespace Inkscape {
 namespace Extension {
@@ -742,12 +726,12 @@ void Script::effect(Inkscape::Extension::Effect *module,
             vd->emitReconstructionStart();
             copy_doc(vd->rroot, mydoc->rroot);
             vd->emitReconstructionFinish();
-            SPObject *layer = NULL;
-            
+
             // Getting the named view from the document generated by the extension
             SPNamedView *nv = sp_document_namedview(mydoc, NULL);
             
             //Check if it has a default layer set up
+            SPObject *layer = NULL;
             if ( nv != NULL)
             {
                 if( nv->default_layer_id != 0 ) {
@@ -776,19 +760,21 @@ void Script::effect(Inkscape::Extension::Effect *module,
 
 
 /**
-    \brief  A function to take all the svg elements from one document
-            and put them in another.
-    \param  oldroot  The root node of the document to be replaced
-    \param  newroot  The root node of the document to replace it with
-
-    This function first deletes all of the data in the old document.  It
-    does this by creating a list of what needs to be deleted, and then
-    goes through the list.  This two pass approach removes issues with
-    the list being change while parsing through it.  Lots of nasty bugs.
-
-    Then, it goes through the new document, duplicating all of the
-    elements and putting them into the old document.  The copy
-    is then complete.
+    \brief  A function to replace all the elements in an old document
+            by those from a new document.
+            document and repinserts them into an emptied old document.
+    \param  oldroot  The root node of the old (destination) document.
+    \param  newroot  The root node of the new (source) document.
+
+    This function first deletes all the elements in the old document by
+    making two pass, the first to create a list of the old elements and
+    the second to actually delete them. This two pass approach removes issues
+    with the list being change while parsing through it... lots of nasty bugs.
+
+    Then, it copies all the element in the new document into the old document.
+
+    Finally, it replaces the attributes in the root element of the old document
+    by the attributes in root of the new document.
 */
 void Script::copy_doc (Inkscape::XML::Node * oldroot, Inkscape::XML::Node * newroot)
 {
@@ -797,9 +783,21 @@ void Script::copy_doc (Inkscape::XML::Node * oldroot, Inkscape::XML::Node * newr
         g_warning("Error on copy_doc: NULL pointer input.");
         return;
     }
+
+    // For copying attributes in root and in namedview
+    using Inkscape::Util::List;
+    using Inkscape::XML::AttributeRecord;
+
+    // Question: Why is the "sodipodi:namedview" special? Treating it as a normal
+    // elmement results in crashes.
+    // Seems to be a bug:
+    // http://inkscape.13.x6.nabble.com/Effect-that-modifies-the-document-properties-tt2822126.html
+
     std::vector<Inkscape::XML::Node *> delete_list;
     Inkscape::XML::Node * oldroot_namedview = NULL;
+    Inkscape::XML::Node * newroot_namedview = NULL;
 
+    // Make list
     for (Inkscape::XML::Node * child = oldroot->firstChild();
             child != NULL;
             child = child->next()) {
@@ -814,14 +812,18 @@ void Script::copy_doc (Inkscape::XML::Node * oldroot, Inkscape::XML::Node * newr
             delete_list.push_back(child);
         }
     }
+
+    // Unparent (delete)
     for (unsigned int i = 0; i < delete_list.size(); i++) {
         sp_repr_unparent(delete_list[i]);
     }
 
+    // Copy
     for (Inkscape::XML::Node * child = newroot->firstChild();
             child != NULL;
             child = child->next()) {
         if (!strcmp("sodipodi:namedview", child->name())) {
+            newroot_namedview = child;
             if (oldroot_namedview != NULL) {
                 for (Inkscape::XML::Node * newroot_namedview_child = child->firstChild();
                         newroot_namedview_child != NULL;
@@ -834,26 +836,44 @@ void Script::copy_doc (Inkscape::XML::Node * oldroot, Inkscape::XML::Node * newr
         }
     }
 
-    {
-        using Inkscape::Util::List;
-        using Inkscape::XML::AttributeRecord;
-        std::vector<gchar const *> attribs;
+    std::vector<gchar const *> attribs;
 
-        // Make a list of all attributes of the old root node.
-        for (List<AttributeRecord const> iter = oldroot->attributeList(); iter; ++iter) {
-            attribs.push_back(g_quark_to_string(iter->key));
-        }
+    // Must explicitly copy root attributes.
 
-        // Delete the attributes of the old root nodes.
-        for (std::vector<gchar const *>::const_iterator it = attribs.begin(); it != attribs.end(); ++it) {
-            oldroot->setAttribute(*it, NULL);
-        }
+    // Make a list of all attributes of the old root node.
+    for (List<AttributeRecord const> iter = oldroot->attributeList(); iter; ++iter) {
+        attribs.push_back(g_quark_to_string(iter->key));
+    }
 
-        // Set the new attributes.
-        for (List<AttributeRecord const> iter = newroot->attributeList(); iter; ++iter) {
-            gchar const *name = g_quark_to_string(iter->key);
-            oldroot->setAttribute(name, newroot->attribute(name));
-        }
+    // Delete the attributes of the old root node.
+    for (std::vector<gchar const *>::const_iterator it = attribs.begin(); it != attribs.end(); ++it) {
+        oldroot->setAttribute(*it, NULL);
+    }
+
+    // Set the new attributes.
+    for (List<AttributeRecord const> iter = newroot->attributeList(); iter; ++iter) {
+        gchar const *name = g_quark_to_string(iter->key);
+        oldroot->setAttribute(name, newroot->attribute(name));
+    }
+
+    attribs.clear();
+
+    // Must explicitly copy namedview attributes.
+
+    // Make a list of all attributes of the old namedview node.
+    for (List<AttributeRecord const> iter = oldroot_namedview->attributeList(); iter; ++iter) {
+        attribs.push_back(g_quark_to_string(iter->key));
+    }
+
+    // Delete the attributes of the old namedview node.
+    for (std::vector<gchar const *>::const_iterator it = attribs.begin(); it != attribs.end(); ++it) {
+        oldroot_namedview->setAttribute(*it, NULL);
+    }
+
+    // Set the new attributes.
+    for (List<AttributeRecord const> iter = newroot_namedview->attributeList(); iter; ++iter) {
+        gchar const *name = g_quark_to_string(iter->key);
+        oldroot_namedview->setAttribute(name, newroot_namedview->attribute(name));
     }
 
     /** \todo  Restore correct layer */
@@ -1063,4 +1083,4 @@ int Script::execute (const std::list<std::string> &in_command,
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8 :
diff --git a/src/extension/implementation/script.h b/src/extension/implementation/script.h
index 270c361af..6a7d0c3b8 100644
--- a/src/extension/implementation/script.h
+++ b/src/extension/implementation/script.h
@@ -22,81 +22,30 @@
 namespace Inkscape {
 namespace XML {
 class Node;
-}
-}
+} // namespace XML
 
-
-namespace Inkscape {
 namespace Extension {
 namespace Implementation {
 
-
 /**
  * Utility class used for loading and launching script extensions
  */
 class Script : public Implementation {
-
 public:
 
-    /**
-     *
-     */
     Script(void);
-
-    /**
-     *
-     */
     virtual ~Script();
-
-
-    /**
-     *
-     */
     virtual bool load(Inkscape::Extension::Extension *module);
-
-    /**
-     *
-     */
     virtual void unload(Inkscape::Extension::Extension *module);
-
-    /**
-     *
-     */
     virtual bool check(Inkscape::Extension::Extension *module);
 
     ImplementationDocumentCache * newDocCache(Inkscape::Extension::Extension * ext, Inkscape::UI::View::View * view);
 
-    /**
-     *
-     */
-    virtual Gtk::Widget *prefs_input(Inkscape::Extension::Input *module,
-                                     gchar const *filename);
-
-    /**
-     *
-     */
-    virtual SPDocument *open(Inkscape::Extension::Input *module,
-                             gchar const *filename);
-
-    /**
-     *
-     */
+    virtual Gtk::Widget *prefs_input(Inkscape::Extension::Input *module, gchar const *filename);
+    virtual SPDocument *open(Inkscape::Extension::Input *module, gchar const *filename);
     virtual Gtk::Widget *prefs_output(Inkscape::Extension::Output *module);
-
-    /**
-     *
-     */
-    virtual void save(Inkscape::Extension::Output *module,
-                      SPDocument *doc,
-                      gchar const *filename);
-
-    /**
-     *
-     */
-    virtual void effect(Inkscape::Extension::Effect *module,
-                        Inkscape::UI::View::View *doc,
-                        ImplementationDocumentCache * docCache);
-
+    virtual void save(Inkscape::Extension::Output *module, SPDocument *doc, gchar const *filename);
+    virtual void effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::View *doc, ImplementationDocumentCache * docCache);
     virtual bool cancelProcessing (void);
 
 private:
@@ -105,7 +54,7 @@ private:
     Glib::RefPtr<Glib::MainLoop> _main_loop;
 
     /**
-     * The command that has been dirived from
+     * The command that has been derived from
      * the configuration file with appropriate directories
      */
     std::list<std::string> command;
@@ -117,13 +66,10 @@ private:
       */
     Glib::ustring helper_extension;
 
-    std::string solve_reldir (Inkscape::XML::Node *reprin);
-    bool check_existence (const std::string &command);
-    void copy_doc (Inkscape::XML::Node * olddoc,
-                   Inkscape::XML::Node * newdoc);
-    void checkStderr (const Glib::ustring &filename,
-                      Gtk::MessageType type,
-                      const Glib::ustring &message);
+    std::string solve_reldir(Inkscape::XML::Node *repr_in);
+    bool check_existence (std::string const& command);
+    void copy_doc(Inkscape::XML::Node * olddoc, Inkscape::XML::Node * newdoc);
+    void checkStderr (Glib::ustring const& filename, Gtk::MessageType type, Glib::ustring const& message);
 
     class file_listener {
         Glib::ustring _string;
@@ -140,6 +86,7 @@ private:
 
         bool isDead () { return _dead; }
 
+        // TODO move these definitions into script.cpp
         void init (int fd, Glib::RefPtr<Glib::MainLoop> main) {
             _channel = Glib::IOChannel::create_from_fd(fd);
             _channel->set_encoding();
@@ -202,11 +149,6 @@ private:
     std::string resolveInterpreterExecutable(const Glib::ustring &interpNameArg);
 
 }; // class Script
-
-
-
-
-
 }  // namespace Implementation
 }  // namespace Extension
 }  // namespace Inkscape
diff --git a/src/extension/implementation/xslt.cpp b/src/extension/implementation/xslt.cpp
index bcea06cb5..85ae9efde 100644
--- a/src/extension/implementation/xslt.cpp
+++ b/src/extension/implementation/xslt.cpp
@@ -20,6 +20,7 @@
 #include "xslt.h"
 #include "../extension.h"
 #include "../output.h"
+#include "extension/input.h"
 
 #include "xml/repr.h"
 #include "io/sys.h"
@@ -53,8 +54,7 @@ XSLT::XSLT(void) :
 {
 }
 
-Glib::ustring
-XSLT::solve_reldir(Inkscape::XML::Node *reprin) {
+Glib::ustring XSLT::solve_reldir(Inkscape::XML::Node *reprin) {
 
     gchar const *s = reprin->attribute("reldir");
 
@@ -90,8 +90,7 @@ XSLT::solve_reldir(Inkscape::XML::Node *reprin) {
     return "";
 }
 
-bool
-XSLT::check(Inkscape::Extension::Extension *module)
+bool XSLT::check(Inkscape::Extension::Extension *module)
 {
     if (load(module)) {
         unload(module);
@@ -101,8 +100,7 @@ XSLT::check(Inkscape::Extension::Extension *module)
     }
 }
 
-bool
-XSLT::load(Inkscape::Extension::Extension *module)
+bool XSLT::load(Inkscape::Extension::Extension *module)
 {
     if (module->loaded()) { return true; }
 
@@ -130,8 +128,7 @@ XSLT::load(Inkscape::Extension::Extension *module)
     return true;
 }
 
-void
-XSLT::unload(Inkscape::Extension::Extension *module)
+void XSLT::unload(Inkscape::Extension::Extension *module)
 {
     if (!module->loaded()) { return; }
     xsltFreeStylesheet(_stylesheet);
@@ -139,8 +136,8 @@ XSLT::unload(Inkscape::Extension::Extension *module)
     return;
 }
 
-SPDocument *
-XSLT::open(Inkscape::Extension::Input */*module*/, gchar const *filename)
+SPDocument * XSLT::open(Inkscape::Extension::Input */*module*/,
+                        gchar const *filename)
 {
     xmlDocPtr filein = xmlParseFile(filename);
     if (filein == NULL) { return NULL; }
@@ -184,8 +181,7 @@ XSLT::open(Inkscape::Extension::Input */*module*/, gchar const *filename)
     return doc;
 }
 
-void
-XSLT::save(Inkscape::Extension::Output */*module*/, SPDocument *doc, gchar const *filename)
+void XSLT::save(Inkscape::Extension::Output *module, SPDocument *doc, gchar const *filename)
 {
     /* TODO: Should we assume filename to be in utf8 or to be a raw filename?
      * See JavaFXOutput::save for discussion. */
@@ -214,10 +210,24 @@ XSLT::save(Inkscape::Extension::Output */*module*/, SPDocument *doc, gchar const
         return;
     }
 
-    const char * params[1];
-    params[0] = NULL;
+    std::list<std::string> params;
+    module->paramListString(params);
+    const int max_parameters = params.size() * 2;
+    const char * xslt_params[max_parameters+1] ;
+
+    int count = 0;
+    for(std::list<std::string>::iterator t=params.begin(); t != params.end(); ++t) {
+        std::size_t pos = t->find("=");
+        std::ostringstream parameter;
+        std::ostringstream value;
+        parameter << t->substr(2,pos-2);
+        value << t->substr(pos+1);
+        xslt_params[count++] = g_strdup_printf("%s", parameter.str().c_str());
+        xslt_params[count++] = g_strdup_printf("'%s'", value.str().c_str());
+    }
+    xslt_params[count] = NULL;
 
-    xmlDocPtr newdoc = xsltApplyStylesheet(_stylesheet, svgdoc, params);
+    xmlDocPtr newdoc = xsltApplyStylesheet(_stylesheet, svgdoc, xslt_params);
     //xmlSaveFile(filename, newdoc);
     int success = xsltSaveResultToFilename(filename, newdoc, _stylesheet, 0);