wok rev 17714

inkscape: remove obsolate patches
author Pascal Bellard <pascal.bellard@slitaz.org>
date Wed Mar 04 10:06:37 2015 +0100 (2015-03-04)
parents bd1b2ae8dac1
children 23b382a886ad
files inkscape/stuff/patches/0001-Fix_Datamatrix_UI_issue.patch inkscape/stuff/patches/0003-Fix_LP_-911146.patch inkscape/stuff/patches/0004-Fix_FTBFS_on_gcc-4.8.patch inkscape/stuff/patches/0005-Fix_FTBFS_due_to_tests.patch inkscape/stuff/patches/0006-Update_to_new_libwpg.patch inkscape/stuff/patches/series
line diff
     1.1 --- a/inkscape/stuff/patches/0001-Fix_Datamatrix_UI_issue.patch	Wed Mar 04 00:19:44 2015 -0300
     1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.3 @@ -1,158 +0,0 @@
     1.4 -From: JazzyNico <nicoduf@yahoo.fr>
     1.5 -Date: Tue, 2 Jul 2013 10:47:34 +0200
     1.6 -Subject: Fix_Datamatrix_UI_issue
     1.7 -
     1.8 -Prevent invalid input in Datamatrix extension dialog.
     1.9 -
    1.10 -As reference:
    1.11 -- Origin: upstream, https://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/10127
    1.12 -- Bug: https://launchpad.net/bugs/738108
    1.13 -- Bug-Debian: http://bugs.debian.org/618835
    1.14 -- Bug-Ubuntu: https://launchpad.net/bugs/738108
    1.15 -- Last-Update: 2011-06-02
    1.16 -
    1.17 -Signed-off-by: Matteo F. Vescovi <mfv.debian@gmail.com>
    1.18 ----
    1.19 - share/extensions/render_barcode_datamatrix.inx | 38 +++++++++++++++++---
    1.20 - share/extensions/render_barcode_datamatrix.py  | 49 ++++++++++++++++++++++++--
    1.21 - 2 files changed, 80 insertions(+), 7 deletions(-)
    1.22 -
    1.23 -diff --git a/share/extensions/render_barcode_datamatrix.inx b/share/extensions/render_barcode_datamatrix.inx
    1.24 -index ea2aa47..ede179e 100644
    1.25 ---- a/share/extensions/render_barcode_datamatrix.inx
    1.26 -+++ b/share/extensions/render_barcode_datamatrix.inx
    1.27 -@@ -4,10 +4,40 @@
    1.28 - 	<id>il.datamatrix</id>
    1.29 - 	<dependency type="executable" location="extensions">render_barcode_datamatrix.py</dependency>
    1.30 - 	<dependency type="executable" location="extensions">inkex.py</dependency>
    1.31 --	<param name="text" type="string" _gui-text="Text">Inkscape</param>
    1.32 --	<param name="rows" type="int" min="8" max="144" _gui-text="Rows">10</param>
    1.33 --	<param name="cols" type="int" min="10" max="144" _gui-text="Cols">10</param>
    1.34 --	<param name="size" type="int" min="1" max="1000" _gui-text="Square Size / px">4</param>
    1.35 -+	<param name="text" type="string" _gui-text="Text:">Inkscape</param>
    1.36 -+  <param name="symbol" _gui-text="Size, in unit squares:" type="enum">
    1.37 -+    <item value="sq10">10x10</item>
    1.38 -+    <item value="sq12">12x12</item>
    1.39 -+    <item value="sq14">14x14</item>
    1.40 -+    <item value="sq16">16x16</item>
    1.41 -+    <item value="sq18">18x18</item>
    1.42 -+    <item value="sq20">20x20</item>
    1.43 -+    <item value="sq22">22x22</item>
    1.44 -+    <item value="sq24">24x24</item>
    1.45 -+    <item value="sq26">26x26</item>
    1.46 -+    <item value="sq32">32x32</item>
    1.47 -+    <item value="sq36">36x36</item>
    1.48 -+    <item value="sq40">40x40</item>
    1.49 -+    <item value="sq44">44x44</item>
    1.50 -+    <item value="sq48">48x48</item>
    1.51 -+    <item value="sq52">52x52</item>
    1.52 -+    <item value="sq64">64x64</item>
    1.53 -+    <item value="sq72">72x72</item>
    1.54 -+    <item value="sq80">80x80</item>
    1.55 -+    <item value="sq88">88x88</item>
    1.56 -+    <item value="sq96">96x96</item>
    1.57 -+    <item value="sq104">104x104</item>
    1.58 -+    <item value="sq120">120x120</item>
    1.59 -+    <item value="sq132">132x132</item>
    1.60 -+    <item value="sq144">144x144</item>
    1.61 -+    <item value="rect8x18">8x18</item>
    1.62 -+    <item value="rect8x32">8x32</item>
    1.63 -+    <item value="rect12x26">12x26</item>
    1.64 -+    <item value="rect12x36">12x36</item>
    1.65 -+    <item value="rect16x36">16x36</item>
    1.66 -+    <item value="rect16x48">16x48</item>
    1.67 -+  </param>
    1.68 -+	<param name="size" type="int" min="1" max="1000" _gui-text="Square Size (px):">4</param>
    1.69 - 	<effect>
    1.70 - 		<object-type>all</object-type>
    1.71 - 		<effects-menu>
    1.72 -diff --git a/share/extensions/render_barcode_datamatrix.py b/share/extensions/render_barcode_datamatrix.py
    1.73 -index e536554..20bcf94 100755
    1.74 ---- a/share/extensions/render_barcode_datamatrix.py
    1.75 -+++ b/share/extensions/render_barcode_datamatrix.py
    1.76 -@@ -57,6 +57,39 @@ import inkex, simplestyle
    1.77 - import gettext
    1.78 - _ = gettext.gettext
    1.79 -     
    1.80 -+symbols = {
    1.81 -+    'sq10': (10, 10),
    1.82 -+    'sq12': (12, 12),
    1.83 -+    'sq14': (14, 14),
    1.84 -+    'sq16': (16, 16),
    1.85 -+    'sq18': (18, 18),
    1.86 -+    'sq20': (20, 20),
    1.87 -+    'sq22': (22, 22),
    1.88 -+    'sq24': (24, 24),
    1.89 -+    'sq26': (26, 26),
    1.90 -+    'sq32': (32, 32),
    1.91 -+    'sq36': (36, 36),
    1.92 -+    'sq40': (40, 40),
    1.93 -+    'sq44': (44, 44),
    1.94 -+    'sq48': (48, 48),
    1.95 -+    'sq52': (52, 52),
    1.96 -+    'sq64': (64, 64),
    1.97 -+    'sq72': (72, 72),
    1.98 -+    'sq80': (80, 80),
    1.99 -+    'sq88': (88, 88),
   1.100 -+    'sq96': (96, 96),
   1.101 -+    'sq104': (104, 104),
   1.102 -+    'sq120': (120, 120),
   1.103 -+    'sq132': (132, 132),
   1.104 -+    'sq144': (144, 144),
   1.105 -+    'rect8x18': (8, 18),
   1.106 -+    'rect8x32': (8, 32),
   1.107 -+    'rect12x26': (12, 26),
   1.108 -+    'rect12x36': (12, 36),
   1.109 -+    'rect16x36': (16, 36),
   1.110 -+    'rect16x48': (16, 48),
   1.111 -+}
   1.112 -+
   1.113 - #ENCODING ROUTINES ===================================================
   1.114 - #   Take an input string and convert it to a sequence (or sequences)
   1.115 - #   of codewords as specified in ISO/IEC 16022:2006 (section 5.2.3)
   1.116 -@@ -167,6 +200,7 @@ def get_parameters(nrow, ncol):
   1.117 -     #RETURN ERROR
   1.118 -     else:
   1.119 -         inkex.errormsg(_('Unrecognised DataMatrix size'))
   1.120 -+        exit(0)
   1.121 -     
   1.122 -     return None
   1.123 -     
   1.124 -@@ -616,6 +650,9 @@ class DataMatrix(inkex.Effect):
   1.125 -         self.OptionParser.add_option("--text",
   1.126 -             action="store", type="string",
   1.127 -             dest="TEXT", default='Inkscape')
   1.128 -+        self.OptionParser.add_option("--symbol",
   1.129 -+            action="store", type="string",
   1.130 -+            dest="SYMBOL", default='')
   1.131 -         self.OptionParser.add_option("--rows",
   1.132 -             action="store", type="int",
   1.133 -             dest="ROWS", default=10)
   1.134 -@@ -630,6 +667,12 @@ class DataMatrix(inkex.Effect):
   1.135 -         
   1.136 -         so = self.options
   1.137 -         
   1.138 -+        rows = so.ROWS
   1.139 -+        cols = so.COLS
   1.140 -+        if (so.SYMBOL != '' and (so.SYMBOL in symbols)):
   1.141 -+            rows = symbols[so.SYMBOL][0]
   1.142 -+            cols = symbols[so.SYMBOL][1]
   1.143 -+        
   1.144 -         if so.TEXT == '':  #abort if converting blank text
   1.145 -             inkex.errormsg(_('Please enter an input string'))
   1.146 -         else:
   1.147 -@@ -644,11 +687,11 @@ class DataMatrix(inkex.Effect):
   1.148 -             grp = inkex.etree.SubElement(self.current_layer, 'g', grp_attribs)#the group to put everything in
   1.149 -             
   1.150 -             #GENERATE THE DATAMATRIX
   1.151 --            encoded = encode( so.TEXT, (so.ROWS, so.COLS) ) #get the pattern of squares
   1.152 --            render_data_matrix( encoded, so.SIZE, so.COLS*so.SIZE*1.5, grp )    # generate the SVG elements
   1.153 -+            encoded = encode( so.TEXT, (rows, cols) ) #get the pattern of squares
   1.154 -+            render_data_matrix( encoded, so.SIZE, cols*so.SIZE*1.5, grp )    # generate the SVG elements
   1.155 -             
   1.156 - if __name__ == '__main__':
   1.157 -     e = DataMatrix()
   1.158 -     e.affect()
   1.159 - 
   1.160 --# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
   1.161 -+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
     2.1 --- a/inkscape/stuff/patches/0003-Fix_LP_-911146.patch	Wed Mar 04 00:19:44 2015 -0300
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,32 +0,0 @@
     2.4 -From: Michael Karcher <debian@mkarcher.dialup.fu-berlin.de>
     2.5 -Date: Tue, 2 Jul 2013 11:02:23 +0200
     2.6 -Subject: Fix_LP_#911146
     2.7 -
     2.8 -Ensures that filenames passed to extensions are made absolute
     2.9 -before changing the current working directory.
    2.10 -
    2.11 -Signed-off-by: Matteo F. Vescovi <mfv.debian@gmail.com>
    2.12 ----
    2.13 - src/extension/implementation/script.cpp | 9 ++++++++-
    2.14 - 1 file changed, 8 insertions(+), 1 deletion(-)
    2.15 -
    2.16 -diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp
    2.17 -index 5c485a6..b4e9847 100644
    2.18 ---- a/src/extension/implementation/script.cpp
    2.19 -+++ b/src/extension/implementation/script.cpp
    2.20 -@@ -956,7 +956,14 @@ int Script::execute (const std::list<std::string> &in_command,
    2.21 -     // assemble the rest of argv
    2.22 -     std::copy(in_params.begin(), in_params.end(), std::back_inserter(argv));
    2.23 -     if (!filein.empty()) {
    2.24 --        argv.push_back(filein);
    2.25 -+        if(Glib::path_is_absolute(filein))
    2.26 -+            argv.push_back(filein);
    2.27 -+        else {
    2.28 -+            std::vector<std::string> buildargs;
    2.29 -+            buildargs.push_back(Glib::get_current_dir());
    2.30 -+            buildargs.push_back(filein);
    2.31 -+            argv.push_back(Glib::build_filename(buildargs));
    2.32 -+        }
    2.33 -     }
    2.34 - 
    2.35 -     int stdout_pipe, stderr_pipe;
     3.1 --- a/inkscape/stuff/patches/0004-Fix_FTBFS_on_gcc-4.8.patch	Wed Mar 04 00:19:44 2015 -0300
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,77 +0,0 @@
     3.4 -From: Mattia Rizzolo <mattia@mapreri.org>
     3.5 -Date: Tue, 8 Jul 2014 12:33:57 +0200
     3.6 -Subject: Fix_FTBFS_on_gcc-4.8
     3.7 -
     3.8 -Last-Update: 2014-07-02
     3.9 -
    3.10 -Signed-off-by: Matteo F. Vescovi <mfvescovi@gmail.com>
    3.11 ----
    3.12 - src/libavoid/vpsc.cpp        | 2 +-
    3.13 - src/libcola/straightener.cpp | 6 +++---
    3.14 - src/libcroco/cr-parser.c     | 2 +-
    3.15 - src/libvpsc/block.cpp        | 2 +-
    3.16 - 4 files changed, 6 insertions(+), 6 deletions(-)
    3.17 -
    3.18 -diff --git a/src/libavoid/vpsc.cpp b/src/libavoid/vpsc.cpp
    3.19 -index 19d3603..1646dda 100644
    3.20 ---- a/src/libavoid/vpsc.cpp
    3.21 -+++ b/src/libavoid/vpsc.cpp
    3.22 -@@ -422,7 +422,7 @@ Constraint* IncSolver::mostViolated(Constraints &l) {
    3.23 -     // downwards.  There is always at least 1 element in the
    3.24 -     // vector because of search.
    3.25 -     // TODO check this logic and add parens:
    3.26 --    if((deletePoint != end) && ((minSlack < ZERO_UPPERBOUND) && !v->active || v->equality)) {
    3.27 -+    if((deletePoint != end) && (((minSlack < ZERO_UPPERBOUND) && !v->active) || v->equality)) {
    3.28 -         *deletePoint = l[l.size()-1];
    3.29 -         l.resize(l.size()-1);
    3.30 -     }
    3.31 -diff --git a/src/libcola/straightener.cpp b/src/libcola/straightener.cpp
    3.32 -index e237c03..7c73cb9 100644
    3.33 ---- a/src/libcola/straightener.cpp
    3.34 -+++ b/src/libcola/straightener.cpp
    3.35 -@@ -108,7 +108,7 @@ namespace straightener {
    3.36 -     int compare_events(const void *a, const void *b) {
    3.37 -         Event *ea=*(Event**)a;
    3.38 -         Event *eb=*(Event**)b;
    3.39 --        if(ea->v!=NULL&&ea->v==eb->v||ea->e!=NULL&&ea->e==eb->e) {
    3.40 -+        if((ea->v!=NULL&&ea->v==eb->v)||(ea->e!=NULL&&ea->e==eb->e)) {
    3.41 -             // when comparing opening and closing from object
    3.42 -             // open must come first
    3.43 -             if(ea->type==Open) return -1;
    3.44 -@@ -263,8 +263,8 @@ namespace straightener {
    3.45 -                         // node is on an edge
    3.46 -                         Edge *edge=(*i)->edge;
    3.47 -                         if(!edge->isEnd(v->id)
    3.48 --                                &&(l!=NULL&&!edge->isEnd(l->id)||l==NULL)
    3.49 --                                &&(r!=NULL&&!edge->isEnd(r->id)||r==NULL)) {
    3.50 -+                                &&((l!=NULL&&!edge->isEnd(l->id))||l==NULL)
    3.51 -+                                &&((r!=NULL&&!edge->isEnd(r->id))||r==NULL)) {
    3.52 -                             if(lastNode!=NULL) {
    3.53 -                                 //printf("  Rule A: Constraint: v%d +g <= v%d\n",lastNode->id,(*i)->id);
    3.54 -                                 cs.push_back(createConstraint(lastNode,*i,dim));
    3.55 -diff --git a/src/libcroco/cr-parser.c b/src/libcroco/cr-parser.c
    3.56 -index 5b0a56f..a8e2de5 100644
    3.57 ---- a/src/libcroco/cr-parser.c
    3.58 -+++ b/src/libcroco/cr-parser.c
    3.59 -@@ -2408,7 +2408,7 @@ cr_parser_parse_stylesheet (CRParser * a_this)
    3.60 -                                                  import_string,
    3.61 -                                                  NULL, &location) ;
    3.62 - 
    3.63 --                                        if ((PRIVATE (a_this)->sac_handler->resolve_import == TRUE)) {
    3.64 -+                                        if (PRIVATE (a_this)->sac_handler->resolve_import == TRUE) {
    3.65 -                                                 /*
    3.66 -                                                  *TODO: resolve the
    3.67 -                                                  *import rule.
    3.68 -diff --git a/src/libvpsc/block.cpp b/src/libvpsc/block.cpp
    3.69 -index 221df53..0bd662f 100644
    3.70 ---- a/src/libvpsc/block.cpp
    3.71 -+++ b/src/libvpsc/block.cpp
    3.72 -@@ -72,7 +72,7 @@ void Block::setUpConstraintHeap(PairingHeap<Constraint*>* &h,bool in) {
    3.73 - 		for (Cit j=cs->begin();j!=cs->end();++j) {
    3.74 - 			Constraint *c=*j;
    3.75 - 			c->timeStamp=blockTimeCtr;
    3.76 --			if (c->left->block != this && in || c->right->block != this && !in) {
    3.77 -+			if ((c->left->block != this && in) || (c->right->block != this && !in)) {
    3.78 - 				h->insert(c);
    3.79 - 			}
    3.80 - 		}
     4.1 --- a/inkscape/stuff/patches/0005-Fix_FTBFS_due_to_tests.patch	Wed Mar 04 00:19:44 2015 -0300
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,482 +0,0 @@
     4.4 -From: Mattia Rizzolo <mattia@mapreri.org>
     4.5 -Date: Tue, 8 Jul 2014 14:14:42 +0200
     4.6 -Subject: Fix_FTBFS_due_to_tests
     4.7 -
     4.8 -Fix FTBFS in the test suite, to let the tests run.
     4.9 -
    4.10 -Last-Update: 2014-07-02
    4.11 -
    4.12 -Signed-off-by: Matteo F. Vescovi <mfvescovi@gmail.com>
    4.13 ----
    4.14 - src/cxxtests.cpp | 124 +++++++++++++++++++++++++++----------------------------
    4.15 - 1 file changed, 62 insertions(+), 62 deletions(-)
    4.16 -
    4.17 -diff --git a/src/cxxtests.cpp b/src/cxxtests.cpp
    4.18 -index 7324466..76ff6a7 100644
    4.19 ---- a/src/cxxtests.cpp
    4.20 -+++ b/src/cxxtests.cpp
    4.21 -@@ -23,12 +23,12 @@ int main( int argc, char *argv[] )
    4.22 - #include <cxxtest/TestRunner.h>
    4.23 - #include <cxxtest/RealDescriptions.h>
    4.24 - 
    4.25 --#include "../../src/attributes-test.h"
    4.26 -+#include "attributes-test.h"
    4.27 - 
    4.28 - static AttributesTest *suite_AttributesTest = 0;
    4.29 - 
    4.30 - static CxxTest::List Tests_AttributesTest = { 0, 0 };
    4.31 --CxxTest::DynamicSuiteDescription<AttributesTest> suiteDescription_AttributesTest( "../../src/attributes-test.h", 13, "AttributesTest", Tests_AttributesTest, suite_AttributesTest, 24, 25 );
    4.32 -+CxxTest::DynamicSuiteDescription<AttributesTest> suiteDescription_AttributesTest( "attributes-test.h", 13, "AttributesTest", Tests_AttributesTest, suite_AttributesTest, 24, 25 );
    4.33 - 
    4.34 - static class TestDescription_AttributesTest_testAttributes : public CxxTest::RealTestDescription {
    4.35 - public:
    4.36 -@@ -36,12 +36,12 @@ public:
    4.37 -  void runTest() { if ( suite_AttributesTest ) suite_AttributesTest->testAttributes(); }
    4.38 - } testDescription_AttributesTest_testAttributes;
    4.39 - 
    4.40 --#include "../../src/color-profile-test.h"
    4.41 -+#include "color-profile-test.h"
    4.42 - 
    4.43 - static ColorProfileTest *suite_ColorProfileTest = 0;
    4.44 - 
    4.45 - static CxxTest::List Tests_ColorProfileTest = { 0, 0 };
    4.46 --CxxTest::DynamicSuiteDescription<ColorProfileTest> suiteDescription_ColorProfileTest( "../../src/color-profile-test.h", 13, "ColorProfileTest", Tests_ColorProfileTest, suite_ColorProfileTest, 45, 51 );
    4.47 -+CxxTest::DynamicSuiteDescription<ColorProfileTest> suiteDescription_ColorProfileTest( "color-profile-test.h", 13, "ColorProfileTest", Tests_ColorProfileTest, suite_ColorProfileTest, 45, 51 );
    4.48 - 
    4.49 - static class TestDescription_ColorProfileTest_testSetRenderingIntent : public CxxTest::RealTestDescription {
    4.50 - public:
    4.51 -@@ -61,12 +61,12 @@ public:
    4.52 -  void runTest() { if ( suite_ColorProfileTest ) suite_ColorProfileTest->testSetName(); }
    4.53 - } testDescription_ColorProfileTest_testSetName;
    4.54 - 
    4.55 --#include "../../src/dir-util-test.h"
    4.56 -+#include "dir-util-test.h"
    4.57 - 
    4.58 - static DirUtilTest suite_DirUtilTest;
    4.59 - 
    4.60 - static CxxTest::List Tests_DirUtilTest = { 0, 0 };
    4.61 --CxxTest::StaticSuiteDescription suiteDescription_DirUtilTest( "../../src/dir-util-test.h", 9, "DirUtilTest", suite_DirUtilTest, Tests_DirUtilTest );
    4.62 -+CxxTest::StaticSuiteDescription suiteDescription_DirUtilTest( "dir-util-test.h", 9, "DirUtilTest", suite_DirUtilTest, Tests_DirUtilTest );
    4.63 - 
    4.64 - static class TestDescription_DirUtilTest_testBase : public CxxTest::RealTestDescription {
    4.65 - public:
    4.66 -@@ -74,12 +74,12 @@ public:
    4.67 -  void runTest() { suite_DirUtilTest.testBase(); }
    4.68 - } testDescription_DirUtilTest_testBase;
    4.69 - 
    4.70 --#include "../../src/extract-uri-test.h"
    4.71 -+#include "extract-uri-test.h"
    4.72 - 
    4.73 - static ExtractURITest suite_ExtractURITest;
    4.74 - 
    4.75 - static CxxTest::List Tests_ExtractURITest = { 0, 0 };
    4.76 --CxxTest::StaticSuiteDescription suiteDescription_ExtractURITest( "../../src/extract-uri-test.h", 9, "ExtractURITest", suite_ExtractURITest, Tests_ExtractURITest );
    4.77 -+CxxTest::StaticSuiteDescription suiteDescription_ExtractURITest( "extract-uri-test.h", 9, "ExtractURITest", suite_ExtractURITest, Tests_ExtractURITest );
    4.78 - 
    4.79 - static class TestDescription_ExtractURITest_testBase : public CxxTest::RealTestDescription {
    4.80 - public:
    4.81 -@@ -99,12 +99,12 @@ public:
    4.82 -  void runTest() { suite_ExtractURITest.testQuoted(); }
    4.83 - } testDescription_ExtractURITest_testQuoted;
    4.84 - 
    4.85 --#include "../../src/marker-test.h"
    4.86 -+#include "marker-test.h"
    4.87 - 
    4.88 - static MarkerTest suite_MarkerTest;
    4.89 - 
    4.90 - static CxxTest::List Tests_MarkerTest = { 0, 0 };
    4.91 --CxxTest::StaticSuiteDescription suiteDescription_MarkerTest( "../../src/marker-test.h", 14, "MarkerTest", suite_MarkerTest, Tests_MarkerTest );
    4.92 -+CxxTest::StaticSuiteDescription suiteDescription_MarkerTest( "marker-test.h", 14, "MarkerTest", suite_MarkerTest, Tests_MarkerTest );
    4.93 - 
    4.94 - static class TestDescription_MarkerTest_testMarkerLoc : public CxxTest::RealTestDescription {
    4.95 - public:
    4.96 -@@ -112,12 +112,12 @@ public:
    4.97 -  void runTest() { suite_MarkerTest.testMarkerLoc(); }
    4.98 - } testDescription_MarkerTest_testMarkerLoc;
    4.99 - 
   4.100 --#include "../../src/mod360-test.h"
   4.101 -+#include "mod360-test.h"
   4.102 - 
   4.103 - static Mod360Test suite_Mod360Test;
   4.104 - 
   4.105 - static CxxTest::List Tests_Mod360Test = { 0, 0 };
   4.106 --CxxTest::StaticSuiteDescription suiteDescription_Mod360Test( "../../src/mod360-test.h", 12, "Mod360Test", suite_Mod360Test, Tests_Mod360Test );
   4.107 -+CxxTest::StaticSuiteDescription suiteDescription_Mod360Test( "mod360-test.h", 12, "Mod360Test", suite_Mod360Test, Tests_Mod360Test );
   4.108 - 
   4.109 - static class TestDescription_Mod360Test_testMod360 : public CxxTest::RealTestDescription {
   4.110 - public:
   4.111 -@@ -125,12 +125,12 @@ public:
   4.112 -  void runTest() { suite_Mod360Test.testMod360(); }
   4.113 - } testDescription_Mod360Test_testMod360;
   4.114 - 
   4.115 --#include "../../src/round-test.h"
   4.116 -+#include "round-test.h"
   4.117 - 
   4.118 - static RoundTest *suite_RoundTest = 0;
   4.119 - 
   4.120 - static CxxTest::List Tests_RoundTest = { 0, 0 };
   4.121 --CxxTest::DynamicSuiteDescription<RoundTest> suiteDescription_RoundTest( "../../src/round-test.h", 10, "RoundTest", Tests_RoundTest, suite_RoundTest, 50, 51 );
   4.122 -+CxxTest::DynamicSuiteDescription<RoundTest> suiteDescription_RoundTest( "round-test.h", 10, "RoundTest", Tests_RoundTest, suite_RoundTest, 50, 51 );
   4.123 - 
   4.124 - static class TestDescription_RoundTest_testNonNegRound : public CxxTest::RealTestDescription {
   4.125 - public:
   4.126 -@@ -144,12 +144,12 @@ public:
   4.127 -  void runTest() { if ( suite_RoundTest ) suite_RoundTest->testNonPosRoung(); }
   4.128 - } testDescription_RoundTest_testNonPosRoung;
   4.129 - 
   4.130 --#include "../../src/preferences-test.h"
   4.131 -+#include "preferences-test.h"
   4.132 - 
   4.133 - static PreferencesTest suite_PreferencesTest;
   4.134 - 
   4.135 - static CxxTest::List Tests_PreferencesTest = { 0, 0 };
   4.136 --CxxTest::StaticSuiteDescription suiteDescription_PreferencesTest( "../../src/preferences-test.h", 29, "PreferencesTest", suite_PreferencesTest, Tests_PreferencesTest );
   4.137 -+CxxTest::StaticSuiteDescription suiteDescription_PreferencesTest( "preferences-test.h", 29, "PreferencesTest", suite_PreferencesTest, Tests_PreferencesTest );
   4.138 - 
   4.139 - static class TestDescription_PreferencesTest_testStartingState : public CxxTest::RealTestDescription {
   4.140 - public:
   4.141 -@@ -193,12 +193,12 @@ public:
   4.142 -  void runTest() { suite_PreferencesTest.testPreferencesEntryMethods(); }
   4.143 - } testDescription_PreferencesTest_testPreferencesEntryMethods;
   4.144 - 
   4.145 --#include "../../src/sp-style-elem-test.h"
   4.146 -+#include "sp-style-elem-test.h"
   4.147 - 
   4.148 - static SPStyleElemTest *suite_SPStyleElemTest = 0;
   4.149 - 
   4.150 - static CxxTest::List Tests_SPStyleElemTest = { 0, 0 };
   4.151 --CxxTest::DynamicSuiteDescription<SPStyleElemTest> suiteDescription_SPStyleElemTest( "../../src/sp-style-elem-test.h", 12, "SPStyleElemTest", Tests_SPStyleElemTest, suite_SPStyleElemTest, 43, 48 );
   4.152 -+CxxTest::DynamicSuiteDescription<SPStyleElemTest> suiteDescription_SPStyleElemTest( "sp-style-elem-test.h", 12, "SPStyleElemTest", Tests_SPStyleElemTest, suite_SPStyleElemTest, 43, 48 );
   4.153 - 
   4.154 - static class TestDescription_SPStyleElemTest_testSetType : public CxxTest::RealTestDescription {
   4.155 - public:
   4.156 -@@ -224,12 +224,12 @@ public:
   4.157 -  void runTest() { if ( suite_SPStyleElemTest ) suite_SPStyleElemTest->testReadContent(); }
   4.158 - } testDescription_SPStyleElemTest_testReadContent;
   4.159 - 
   4.160 --#include "../../src/style-test.h"
   4.161 -+#include "style-test.h"
   4.162 - 
   4.163 - static StyleTest *suite_StyleTest = 0;
   4.164 - 
   4.165 - static CxxTest::List Tests_StyleTest = { 0, 0 };
   4.166 --CxxTest::DynamicSuiteDescription<StyleTest> suiteDescription_StyleTest( "../../src/style-test.h", 11, "StyleTest", Tests_StyleTest, suite_StyleTest, 37, 43 );
   4.167 -+CxxTest::DynamicSuiteDescription<StyleTest> suiteDescription_StyleTest( "style-test.h", 11, "StyleTest", Tests_StyleTest, suite_StyleTest, 37, 43 );
   4.168 - 
   4.169 - static class TestDescription_StyleTest_testOne : public CxxTest::RealTestDescription {
   4.170 - public:
   4.171 -@@ -237,12 +237,12 @@ public:
   4.172 -  void runTest() { if ( suite_StyleTest ) suite_StyleTest->testOne(); }
   4.173 - } testDescription_StyleTest_testOne;
   4.174 - 
   4.175 --#include "../../src/verbs-test.h"
   4.176 -+#include "verbs-test.h"
   4.177 - 
   4.178 - static VerbsTest suite_VerbsTest;
   4.179 - 
   4.180 - static CxxTest::List Tests_VerbsTest = { 0, 0 };
   4.181 --CxxTest::StaticSuiteDescription suiteDescription_VerbsTest( "../../src/verbs-test.h", 7, "VerbsTest", suite_VerbsTest, Tests_VerbsTest );
   4.182 -+CxxTest::StaticSuiteDescription suiteDescription_VerbsTest( "verbs-test.h", 7, "VerbsTest", suite_VerbsTest, Tests_VerbsTest );
   4.183 - 
   4.184 - static class TestDescription_VerbsTest_testEnumLength : public CxxTest::RealTestDescription {
   4.185 - public:
   4.186 -@@ -262,12 +262,12 @@ public:
   4.187 -  void runTest() { suite_VerbsTest.testFetch(); }
   4.188 - } testDescription_VerbsTest_testFetch;
   4.189 - 
   4.190 --#include "../../src/display/curve-test.h"
   4.191 -+#include "display/curve-test.h"
   4.192 - 
   4.193 - static CurveTest *suite_CurveTest = 0;
   4.194 - 
   4.195 - static CxxTest::List Tests_CurveTest = { 0, 0 };
   4.196 --CxxTest::DynamicSuiteDescription<CurveTest> suiteDescription_CurveTest( "../../src/display/curve-test.h", 8, "CurveTest", Tests_CurveTest, suite_CurveTest, 35, 36 );
   4.197 -+CxxTest::DynamicSuiteDescription<CurveTest> suiteDescription_CurveTest( "display/curve-test.h", 8, "CurveTest", Tests_CurveTest, suite_CurveTest, 35, 36 );
   4.198 - 
   4.199 - static class TestDescription_CurveTest_testGetSegmentCount : public CxxTest::RealTestDescription {
   4.200 - public:
   4.201 -@@ -329,12 +329,12 @@ public:
   4.202 -  void runTest() { if ( suite_CurveTest ) suite_CurveTest->testPenultimatePoint(); }
   4.203 - } testDescription_CurveTest_testPenultimatePoint;
   4.204 - 
   4.205 --#include "../../src/helper/units-test.h"
   4.206 -+#include "helper/units-test.h"
   4.207 - 
   4.208 - static UnitsTest *suite_UnitsTest = 0;
   4.209 - 
   4.210 - static CxxTest::List Tests_UnitsTest = { 0, 0 };
   4.211 --CxxTest::DynamicSuiteDescription<UnitsTest> suiteDescription_UnitsTest( "../../src/helper/units-test.h", 7, "UnitsTest", Tests_UnitsTest, suite_UnitsTest, 17, 18 );
   4.212 -+CxxTest::DynamicSuiteDescription<UnitsTest> suiteDescription_UnitsTest( "helper/units-test.h", 7, "UnitsTest", Tests_UnitsTest, suite_UnitsTest, 17, 18 );
   4.213 - 
   4.214 - static class TestDescription_UnitsTest_testConversions : public CxxTest::RealTestDescription {
   4.215 - public:
   4.216 -@@ -348,12 +348,12 @@ public:
   4.217 -  void runTest() { if ( suite_UnitsTest ) suite_UnitsTest->testUnitTable(); }
   4.218 - } testDescription_UnitsTest_testUnitTable;
   4.219 - 
   4.220 --#include "../../src/libnr/in-svg-plane-test.h"
   4.221 -+#include "libnr/in-svg-plane-test.h"
   4.222 - 
   4.223 - static InSvgPlaneTest *suite_InSvgPlaneTest = 0;
   4.224 - 
   4.225 - static CxxTest::List Tests_InSvgPlaneTest = { 0, 0 };
   4.226 --CxxTest::DynamicSuiteDescription<InSvgPlaneTest> suiteDescription_InSvgPlaneTest( "../../src/libnr/in-svg-plane-test.h", 9, "InSvgPlaneTest", Tests_InSvgPlaneTest, suite_InSvgPlaneTest, 31, 32 );
   4.227 -+CxxTest::DynamicSuiteDescription<InSvgPlaneTest> suiteDescription_InSvgPlaneTest( "libnr/in-svg-plane-test.h", 9, "InSvgPlaneTest", Tests_InSvgPlaneTest, suite_InSvgPlaneTest, 31, 32 );
   4.228 - 
   4.229 - static class TestDescription_InSvgPlaneTest_testInSvgPlane : public CxxTest::RealTestDescription {
   4.230 - public:
   4.231 -@@ -361,12 +361,12 @@ public:
   4.232 -  void runTest() { if ( suite_InSvgPlaneTest ) suite_InSvgPlaneTest->testInSvgPlane(); }
   4.233 - } testDescription_InSvgPlaneTest_testInSvgPlane;
   4.234 - 
   4.235 --#include "../../src/libnr/nr-compose-test.h"
   4.236 -+#include "libnr/nr-compose-test.h"
   4.237 - 
   4.238 - static NrComposeTest *suite_NrComposeTest = 0;
   4.239 - 
   4.240 - static CxxTest::List Tests_NrComposeTest = { 0, 0 };
   4.241 --CxxTest::DynamicSuiteDescription<NrComposeTest> suiteDescription_NrComposeTest( "../../src/libnr/nr-compose-test.h", 35, "NrComposeTest", Tests_NrComposeTest, suite_NrComposeTest, 110, 111 );
   4.242 -+CxxTest::DynamicSuiteDescription<NrComposeTest> suiteDescription_NrComposeTest( "libnr/nr-compose-test.h", 35, "NrComposeTest", Tests_NrComposeTest, suite_NrComposeTest, 110, 111 );
   4.243 - 
   4.244 - static class TestDescription_NrComposeTest_testnr_R8G8B8A8_N_EMPTY_R8G8B8A8_N : public CxxTest::RealTestDescription {
   4.245 - public:
   4.246 -@@ -518,12 +518,12 @@ public:
   4.247 -  void runTest() { if ( suite_NrComposeTest ) suite_NrComposeTest->testnr_R8G8B8_R8G8B8_R8G8B8A8_P_A8(); }
   4.248 - } testDescription_NrComposeTest_testnr_R8G8B8_R8G8B8_R8G8B8A8_P_A8;
   4.249 - 
   4.250 --#include "../../src/libnr/nr-matrix-test.h"
   4.251 -+#include "libnr/nr-matrix-test.h"
   4.252 - 
   4.253 - static NrMatrixTest *suite_NrMatrixTest = 0;
   4.254 - 
   4.255 - static CxxTest::List Tests_NrMatrixTest = { 0, 0 };
   4.256 --CxxTest::DynamicSuiteDescription<NrMatrixTest> suiteDescription_NrMatrixTest( "../../src/libnr/nr-matrix-test.h", 23, "NrMatrixTest", Tests_NrMatrixTest, suite_NrMatrixTest, 44, 45 );
   4.257 -+CxxTest::DynamicSuiteDescription<NrMatrixTest> suiteDescription_NrMatrixTest( "libnr/nr-matrix-test.h", 23, "NrMatrixTest", Tests_NrMatrixTest, suite_NrMatrixTest, 44, 45 );
   4.258 - 
   4.259 - static class TestDescription_NrMatrixTest_testCtorsAssignmentOp : public CxxTest::RealTestDescription {
   4.260 - public:
   4.261 -@@ -585,12 +585,12 @@ public:
   4.262 -  void runTest() { if ( suite_NrMatrixTest ) suite_NrMatrixTest->testMatrixStarScale(); }
   4.263 - } testDescription_NrMatrixTest_testMatrixStarScale;
   4.264 - 
   4.265 --#include "../../src/libnr/nr-point-fns-test.h"
   4.266 -+#include "libnr/nr-point-fns-test.h"
   4.267 - 
   4.268 - static NrPointFnsTest *suite_NrPointFnsTest = 0;
   4.269 - 
   4.270 - static CxxTest::List Tests_NrPointFnsTest = { 0, 0 };
   4.271 --CxxTest::DynamicSuiteDescription<NrPointFnsTest> suiteDescription_NrPointFnsTest( "../../src/libnr/nr-point-fns-test.h", 12, "NrPointFnsTest", Tests_NrPointFnsTest, suite_NrPointFnsTest, 37, 38 );
   4.272 -+CxxTest::DynamicSuiteDescription<NrPointFnsTest> suiteDescription_NrPointFnsTest( "libnr/nr-point-fns-test.h", 12, "NrPointFnsTest", Tests_NrPointFnsTest, suite_NrPointFnsTest, 37, 38 );
   4.273 - 
   4.274 - static class TestDescription_NrPointFnsTest_testL1 : public CxxTest::RealTestDescription {
   4.275 - public:
   4.276 -@@ -634,12 +634,12 @@ public:
   4.277 -  void runTest() { if ( suite_NrPointFnsTest ) suite_NrPointFnsTest->testIsUnitVector(); }
   4.278 - } testDescription_NrPointFnsTest_testIsUnitVector;
   4.279 - 
   4.280 --#include "../../src/libnr/nr-rotate-test.h"
   4.281 -+#include "libnr/nr-rotate-test.h"
   4.282 - 
   4.283 - static NrRotateTest *suite_NrRotateTest = 0;
   4.284 - 
   4.285 - static CxxTest::List Tests_NrRotateTest = { 0, 0 };
   4.286 --CxxTest::DynamicSuiteDescription<NrRotateTest> suiteDescription_NrRotateTest( "../../src/libnr/nr-rotate-test.h", 13, "NrRotateTest", Tests_NrRotateTest, suite_NrRotateTest, 29, 30 );
   4.287 -+CxxTest::DynamicSuiteDescription<NrRotateTest> suiteDescription_NrRotateTest( "libnr/nr-rotate-test.h", 13, "NrRotateTest", Tests_NrRotateTest, suite_NrRotateTest, 29, 30 );
   4.288 - 
   4.289 - static class TestDescription_NrRotateTest_testCtorsCompares : public CxxTest::RealTestDescription {
   4.290 - public:
   4.291 -@@ -677,12 +677,12 @@ public:
   4.292 -  void runTest() { if ( suite_NrRotateTest ) suite_NrRotateTest->testOpDivRotateRotate(); }
   4.293 - } testDescription_NrRotateTest_testOpDivRotateRotate;
   4.294 - 
   4.295 --#include "../../src/libnr/nr-rotate-fns-test.h"
   4.296 -+#include "libnr/nr-rotate-fns-test.h"
   4.297 - 
   4.298 - static NrRotateFnsTest *suite_NrRotateFnsTest = 0;
   4.299 - 
   4.300 - static CxxTest::List Tests_NrRotateFnsTest = { 0, 0 };
   4.301 --CxxTest::DynamicSuiteDescription<NrRotateFnsTest> suiteDescription_NrRotateFnsTest( "../../src/libnr/nr-rotate-fns-test.h", 8, "NrRotateFnsTest", Tests_NrRotateFnsTest, suite_NrRotateFnsTest, 19, 20 );
   4.302 -+CxxTest::DynamicSuiteDescription<NrRotateFnsTest> suiteDescription_NrRotateFnsTest( "libnr/nr-rotate-fns-test.h", 8, "NrRotateFnsTest", Tests_NrRotateFnsTest, suite_NrRotateFnsTest, 19, 20 );
   4.303 - 
   4.304 - static class TestDescription_NrRotateFnsTest_testRotateDegrees : public CxxTest::RealTestDescription {
   4.305 - public:
   4.306 -@@ -690,12 +690,12 @@ public:
   4.307 -  void runTest() { if ( suite_NrRotateFnsTest ) suite_NrRotateFnsTest->testRotateDegrees(); }
   4.308 - } testDescription_NrRotateFnsTest_testRotateDegrees;
   4.309 - 
   4.310 --#include "../../src/libnr/nr-scale-test.h"
   4.311 -+#include "libnr/nr-scale-test.h"
   4.312 - 
   4.313 - static NrScaleTest *suite_NrScaleTest = 0;
   4.314 - 
   4.315 - static CxxTest::List Tests_NrScaleTest = { 0, 0 };
   4.316 --CxxTest::DynamicSuiteDescription<NrScaleTest> suiteDescription_NrScaleTest( "../../src/libnr/nr-scale-test.h", 6, "NrScaleTest", Tests_NrScaleTest, suite_NrScaleTest, 20, 21 );
   4.317 -+CxxTest::DynamicSuiteDescription<NrScaleTest> suiteDescription_NrScaleTest( "libnr/nr-scale-test.h", 6, "NrScaleTest", Tests_NrScaleTest, suite_NrScaleTest, 20, 21 );
   4.318 - 
   4.319 - static class TestDescription_NrScaleTest_testXY_CtorArrayOperator : public CxxTest::RealTestDescription {
   4.320 - public:
   4.321 -@@ -739,12 +739,12 @@ public:
   4.322 -  void runTest() { if ( suite_NrScaleTest ) suite_NrScaleTest->testOpDivScaleScale(); }
   4.323 - } testDescription_NrScaleTest_testOpDivScaleScale;
   4.324 - 
   4.325 --#include "../../src/libnr/nr-translate-test.h"
   4.326 -+#include "libnr/nr-translate-test.h"
   4.327 - 
   4.328 - static NrTranslateTest *suite_NrTranslateTest = 0;
   4.329 - 
   4.330 - static CxxTest::List Tests_NrTranslateTest = { 0, 0 };
   4.331 --CxxTest::DynamicSuiteDescription<NrTranslateTest> suiteDescription_NrTranslateTest( "../../src/libnr/nr-translate-test.h", 11, "NrTranslateTest", Tests_NrTranslateTest, suite_NrTranslateTest, 28, 29 );
   4.332 -+CxxTest::DynamicSuiteDescription<NrTranslateTest> suiteDescription_NrTranslateTest( "libnr/nr-translate-test.h", 11, "NrTranslateTest", Tests_NrTranslateTest, suite_NrTranslateTest, 28, 29 );
   4.333 - 
   4.334 - static class TestDescription_NrTranslateTest_testCtorsArrayOperator : public CxxTest::RealTestDescription {
   4.335 - public:
   4.336 -@@ -776,12 +776,12 @@ public:
   4.337 -  void runTest() { if ( suite_NrTranslateTest ) suite_NrTranslateTest->testIdentity(); }
   4.338 - } testDescription_NrTranslateTest_testIdentity;
   4.339 - 
   4.340 --#include "../../src/libnr/nr-types-test.h"
   4.341 -+#include "libnr/nr-types-test.h"
   4.342 - 
   4.343 - static NrTypesTest *suite_NrTypesTest = 0;
   4.344 - 
   4.345 - static CxxTest::List Tests_NrTypesTest = { 0, 0 };
   4.346 --CxxTest::DynamicSuiteDescription<NrTypesTest> suiteDescription_NrTypesTest( "../../src/libnr/nr-types-test.h", 8, "NrTypesTest", Tests_NrTypesTest, suite_NrTypesTest, 23, 24 );
   4.347 -+CxxTest::DynamicSuiteDescription<NrTypesTest> suiteDescription_NrTypesTest( "libnr/nr-types-test.h", 8, "NrTypesTest", Tests_NrTypesTest, suite_NrTypesTest, 23, 24 );
   4.348 - 
   4.349 - static class TestDescription_NrTypesTest_testXYValues : public CxxTest::RealTestDescription {
   4.350 - public:
   4.351 -@@ -843,12 +843,12 @@ public:
   4.352 -  void runTest() { if ( suite_NrTypesTest ) suite_NrTypesTest->testNormalize(); }
   4.353 - } testDescription_NrTypesTest_testNormalize;
   4.354 - 
   4.355 --#include "../../src/svg/css-ostringstream-test.h"
   4.356 -+#include "svg/css-ostringstream-test.h"
   4.357 - 
   4.358 - static CSSOStringStreamTest *suite_CSSOStringStreamTest = 0;
   4.359 - 
   4.360 - static CxxTest::List Tests_CSSOStringStreamTest = { 0, 0 };
   4.361 --CxxTest::DynamicSuiteDescription<CSSOStringStreamTest> suiteDescription_CSSOStringStreamTest( "../../src/svg/css-ostringstream-test.h", 20, "CSSOStringStreamTest", Tests_CSSOStringStreamTest, suite_CSSOStringStreamTest, 26, 27 );
   4.362 -+CxxTest::DynamicSuiteDescription<CSSOStringStreamTest> suiteDescription_CSSOStringStreamTest( "svg/css-ostringstream-test.h", 20, "CSSOStringStreamTest", Tests_CSSOStringStreamTest, suite_CSSOStringStreamTest, 26, 27 );
   4.363 - 
   4.364 - static class TestDescription_CSSOStringStreamTest_testFloats : public CxxTest::RealTestDescription {
   4.365 - public:
   4.366 -@@ -868,12 +868,12 @@ public:
   4.367 -  void runTest() { if ( suite_CSSOStringStreamTest ) suite_CSSOStringStreamTest->testConcat(); }
   4.368 - } testDescription_CSSOStringStreamTest_testConcat;
   4.369 - 
   4.370 --#include "../../src/svg/stringstream-test.h"
   4.371 -+#include "svg/stringstream-test.h"
   4.372 - 
   4.373 - static StringStreamTest *suite_StringStreamTest = 0;
   4.374 - 
   4.375 - static CxxTest::List Tests_StringStreamTest = { 0, 0 };
   4.376 --CxxTest::DynamicSuiteDescription<StringStreamTest> suiteDescription_StringStreamTest( "../../src/svg/stringstream-test.h", 21, "StringStreamTest", Tests_StringStreamTest, suite_StringStreamTest, 27, 28 );
   4.377 -+CxxTest::DynamicSuiteDescription<StringStreamTest> suiteDescription_StringStreamTest( "svg/stringstream-test.h", 21, "StringStreamTest", Tests_StringStreamTest, suite_StringStreamTest, 27, 28 );
   4.378 - 
   4.379 - static class TestDescription_StringStreamTest_testFloats : public CxxTest::RealTestDescription {
   4.380 - public:
   4.381 -@@ -893,12 +893,12 @@ public:
   4.382 -  void runTest() { if ( suite_StringStreamTest ) suite_StringStreamTest->testConcat(); }
   4.383 - } testDescription_StringStreamTest_testConcat;
   4.384 - 
   4.385 --#include "../../src/svg/svg-affine-test.h"
   4.386 -+#include "svg/svg-affine-test.h"
   4.387 - 
   4.388 - static SvgAffineTest *suite_SvgAffineTest = 0;
   4.389 - 
   4.390 - static CxxTest::List Tests_SvgAffineTest = { 0, 0 };
   4.391 --CxxTest::DynamicSuiteDescription<SvgAffineTest> suiteDescription_SvgAffineTest( "../../src/svg/svg-affine-test.h", 12, "SvgAffineTest", Tests_SvgAffineTest, suite_SvgAffineTest, 46, 47 );
   4.392 -+CxxTest::DynamicSuiteDescription<SvgAffineTest> suiteDescription_SvgAffineTest( "svg/svg-affine-test.h", 12, "SvgAffineTest", Tests_SvgAffineTest, suite_SvgAffineTest, 46, 47 );
   4.393 - 
   4.394 - static class TestDescription_SvgAffineTest_testReadIdentity : public CxxTest::RealTestDescription {
   4.395 - public:
   4.396 -@@ -984,12 +984,12 @@ public:
   4.397 -  void runTest() { if ( suite_SvgAffineTest ) suite_SvgAffineTest->testReadFailures(); }
   4.398 - } testDescription_SvgAffineTest_testReadFailures;
   4.399 - 
   4.400 --#include "../../src/svg/svg-color-test.h"
   4.401 -+#include "svg/svg-color-test.h"
   4.402 - 
   4.403 - static SVGColorTest *suite_SVGColorTest = 0;
   4.404 - 
   4.405 - static CxxTest::List Tests_SVGColorTest = { 0, 0 };
   4.406 --CxxTest::DynamicSuiteDescription<SVGColorTest> suiteDescription_SVGColorTest( "../../src/svg/svg-color-test.h", 9, "SVGColorTest", Tests_SVGColorTest, suite_SVGColorTest, 35, 36 );
   4.407 -+CxxTest::DynamicSuiteDescription<SVGColorTest> suiteDescription_SVGColorTest( "svg/svg-color-test.h", 9, "SVGColorTest", Tests_SVGColorTest, suite_SVGColorTest, 35, 36 );
   4.408 - 
   4.409 - static class TestDescription_SVGColorTest_testWrite : public CxxTest::RealTestDescription {
   4.410 - public:
   4.411 -@@ -1009,12 +1009,12 @@ public:
   4.412 -  void runTest() { if ( suite_SVGColorTest ) suite_SVGColorTest->testIccColor(); }
   4.413 - } testDescription_SVGColorTest_testIccColor;
   4.414 - 
   4.415 --#include "../../src/svg/svg-length-test.h"
   4.416 -+#include "svg/svg-length-test.h"
   4.417 - 
   4.418 - static SvgLengthTest *suite_SvgLengthTest = 0;
   4.419 - 
   4.420 - static CxxTest::List Tests_SvgLengthTest = { 0, 0 };
   4.421 --CxxTest::DynamicSuiteDescription<SvgLengthTest> suiteDescription_SvgLengthTest( "../../src/svg/svg-length-test.h", 10, "SvgLengthTest", Tests_SvgLengthTest, suite_SvgLengthTest, 29, 30 );
   4.422 -+CxxTest::DynamicSuiteDescription<SvgLengthTest> suiteDescription_SvgLengthTest( "svg/svg-length-test.h", 10, "SvgLengthTest", Tests_SvgLengthTest, suite_SvgLengthTest, 29, 30 );
   4.423 - 
   4.424 - static class TestDescription_SvgLengthTest_testRead : public CxxTest::RealTestDescription {
   4.425 - public:
   4.426 -@@ -1058,12 +1058,12 @@ public:
   4.427 -  void runTest() { if ( suite_SvgLengthTest ) suite_SvgLengthTest->testPlaces(); }
   4.428 - } testDescription_SvgLengthTest_testPlaces;
   4.429 - 
   4.430 --#include "../../src/svg/svg-path-geom-test.h"
   4.431 -+#include "svg/svg-path-geom-test.h"
   4.432 - 
   4.433 - static SvgPathGeomTest *suite_SvgPathGeomTest = 0;
   4.434 - 
   4.435 - static CxxTest::List Tests_SvgPathGeomTest = { 0, 0 };
   4.436 --CxxTest::DynamicSuiteDescription<SvgPathGeomTest> suiteDescription_SvgPathGeomTest( "../../src/svg/svg-path-geom-test.h", 13, "SvgPathGeomTest", Tests_SvgPathGeomTest, suite_SvgPathGeomTest, 69, 70 );
   4.437 -+CxxTest::DynamicSuiteDescription<SvgPathGeomTest> suiteDescription_SvgPathGeomTest( "svg/svg-path-geom-test.h", 13, "SvgPathGeomTest", Tests_SvgPathGeomTest, suite_SvgPathGeomTest, 69, 70 );
   4.438 - 
   4.439 - static class TestDescription_SvgPathGeomTest_testReadRectanglesAbsoluteClosed : public CxxTest::RealTestDescription {
   4.440 - public:
   4.441 -@@ -1179,12 +1179,12 @@ public:
   4.442 -  void runTest() { if ( suite_SvgPathGeomTest ) suite_SvgPathGeomTest->testMinexpPrecision(); }
   4.443 - } testDescription_SvgPathGeomTest_testMinexpPrecision;
   4.444 - 
   4.445 --#include "../../src/xml/repr-action-test.h"
   4.446 -+#include "xml/repr-action-test.h"
   4.447 - 
   4.448 - static XmlReprActionTest *suite_XmlReprActionTest = 0;
   4.449 - 
   4.450 - static CxxTest::List Tests_XmlReprActionTest = { 0, 0 };
   4.451 --CxxTest::DynamicSuiteDescription<XmlReprActionTest> suiteDescription_XmlReprActionTest( "../../src/xml/repr-action-test.h", 11, "XmlReprActionTest", Tests_XmlReprActionTest, suite_XmlReprActionTest, 33, 34 );
   4.452 -+CxxTest::DynamicSuiteDescription<XmlReprActionTest> suiteDescription_XmlReprActionTest( "xml/repr-action-test.h", 11, "XmlReprActionTest", Tests_XmlReprActionTest, suite_XmlReprActionTest, 33, 34 );
   4.453 - 
   4.454 - static class TestDescription_XmlReprActionTest_testRollbackOfNodeAddition : public CxxTest::RealTestDescription {
   4.455 - public:
   4.456 -@@ -1204,12 +1204,12 @@ public:
   4.457 -  void runTest() { if ( suite_XmlReprActionTest ) suite_XmlReprActionTest->testRollbackOfNodeReordering(); }
   4.458 - } testDescription_XmlReprActionTest_testRollbackOfNodeReordering;
   4.459 - 
   4.460 --#include "../../src/xml/quote-test.h"
   4.461 -+#include "xml/quote-test.h"
   4.462 - 
   4.463 - static XmlQuoteTest *suite_XmlQuoteTest = 0;
   4.464 - 
   4.465 - static CxxTest::List Tests_XmlQuoteTest = { 0, 0 };
   4.466 --CxxTest::DynamicSuiteDescription<XmlQuoteTest> suiteDescription_XmlQuoteTest( "../../src/xml/quote-test.h", 15, "XmlQuoteTest", Tests_XmlQuoteTest, suite_XmlQuoteTest, 26, 27 );
   4.467 -+CxxTest::DynamicSuiteDescription<XmlQuoteTest> suiteDescription_XmlQuoteTest( "xml/quote-test.h", 15, "XmlQuoteTest", Tests_XmlQuoteTest, suite_XmlQuoteTest, 26, 27 );
   4.468 - 
   4.469 - static class TestDescription_XmlQuoteTest_testXmlQuotedStrlen : public CxxTest::RealTestDescription {
   4.470 - public:
   4.471 -@@ -1223,12 +1223,12 @@ public:
   4.472 -  void runTest() { if ( suite_XmlQuoteTest ) suite_XmlQuoteTest->testXmlQuoteStrdup(); }
   4.473 - } testDescription_XmlQuoteTest_testXmlQuoteStrdup;
   4.474 - 
   4.475 --#include "../../src/util/list-container-test.h"
   4.476 -+#include "util/list-container-test.h"
   4.477 - 
   4.478 - static ListContainerTest *suite_ListContainerTest = 0;
   4.479 - 
   4.480 - static CxxTest::List Tests_ListContainerTest = { 0, 0 };
   4.481 --CxxTest::DynamicSuiteDescription<ListContainerTest> suiteDescription_ListContainerTest( "../../src/util/list-container-test.h", 28, "ListContainerTest", Tests_ListContainerTest, suite_ListContainerTest, 38, 39 );
   4.482 -+CxxTest::DynamicSuiteDescription<ListContainerTest> suiteDescription_ListContainerTest( "util/list-container-test.h", 28, "ListContainerTest", Tests_ListContainerTest, suite_ListContainerTest, 38, 39 );
   4.483 - 
   4.484 - static class TestDescription_ListContainerTest_testRangeConstructor : public CxxTest::RealTestDescription {
   4.485 - public: