Build fixes to get 0.49 in shape to release

(bzr r11898)

22 files changed, 144 insertions, 545 deletions

diff --git a/Makefile.am b/Makefile.am
index 98010486e..3b9a4b76c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -209,21 +209,8 @@ EXTRA_DIST = \
 	packaging/win32/portable/App/AppInfo/appicon_32.png \
 	packaging/win32/portable/App/AppInfo/appinfo.ini \
 	packaging/win32/portable/App/AppInfo/installer.ini \
-	packaging/win32/portable/Other/Help/images/donation_button.png \
-	packaging/win32/portable/Other/Help/images/favicon.ico \
-	packaging/win32/portable/Other/Help/images/help_background_footer.png \
-	packaging/win32/portable/Other/Help/images/help_background_header.png \
-	packaging/win32/portable/Other/Help/images/help_logo_top.png \
-	packaging/win32/portable/Other/Source/InkscapePortable.ini \
-	packaging/win32/portable/Other/Source/InkscapePortable.jpg \
-	packaging/win32/portable/Other/Source/InkscapePortable.nsi \
-	packaging/win32/portable/Other/Source/License.txt \
-	packaging/win32/portable/Other/Source/PortableApps.comInstallerCustom.nsh \
-	packaging/win32/portable/Other/Source/PortableApps.comLauncherLANG_ENGLISH.nsh \
-	packaging/win32/portable/Other/Source/Readme.txt \
-	packaging/win32/portable/Other/Source/ReplaceInFileWithTextReplace.nsh \
-        po/inkscape.pot \
-        po/update_po_files.sh \
+	po/inkscape.pot \
+	po/update_po_files.sh \
 	src/inkscape.rc	src/inkview.rc
 
 # We want the built inkscape.1 to go in the distributed .tar.gz so
diff --git a/doc/Makefile.am b/doc/Makefile.am
index fa7983706..ecbda2edb 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -10,7 +10,6 @@ EXTRA_DIST = README.document \
 	HACKING.txt \
 	keys.css \
 	keys.README \
-	keys.be.html \
 	keys.de.html \
 	keys.el.html \
 	keys.en.html \
diff --git a/packaging/win32/portable/Other/Help/images/donation_button.png b/packaging/win32/portable/Other/Help/images/donation_button.png
deleted file mode 100644
index 53bf471e2..000000000
--- a/packaging/win32/portable/Other/Help/images/donation_button.png
+++ /dev/null
diff --git a/packaging/win32/portable/Other/Help/images/favicon.ico b/packaging/win32/portable/Other/Help/images/favicon.ico
deleted file mode 100644
index 9e08ee0d5..000000000
--- a/packaging/win32/portable/Other/Help/images/favicon.ico
+++ /dev/null
diff --git a/packaging/win32/portable/Other/Help/images/help_background_footer.png b/packaging/win32/portable/Other/Help/images/help_background_footer.png
deleted file mode 100644
index abb6f814e..000000000
--- a/packaging/win32/portable/Other/Help/images/help_background_footer.png
+++ /dev/null
diff --git a/packaging/win32/portable/Other/Help/images/help_background_header.png b/packaging/win32/portable/Other/Help/images/help_background_header.png
deleted file mode 100644
index 0fe013e30..000000000
--- a/packaging/win32/portable/Other/Help/images/help_background_header.png
+++ /dev/null
diff --git a/packaging/win32/portable/Other/Help/images/help_logo_top.png b/packaging/win32/portable/Other/Help/images/help_logo_top.png
deleted file mode 100644
index 8d06ee22c..000000000
--- a/packaging/win32/portable/Other/Help/images/help_logo_top.png
+++ /dev/null
diff --git a/packaging/win32/portable/Other/Source/AppNamePortable.ini b/packaging/win32/portable/Other/Source/AppNamePortable.ini
deleted file mode 100644
index e85e60f6a..000000000
--- a/packaging/win32/portable/Other/Source/AppNamePortable.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-AdditionalParameters=

-DisableSplashScreen=false

-RunLocally=false

-

-# The above options are explained in the included readme.txt

-# This INI file is an example only and is not used unless it is placed as described in the included readme.txt

diff --git a/packaging/win32/portable/Other/Source/LauncherLicense.txt b/packaging/win32/portable/Other/Source/LauncherLicense.txt
deleted file mode 100644
index 89e08fb00..000000000
--- a/packaging/win32/portable/Other/Source/LauncherLicense.txt
+++ /dev/null
@@ -1,339 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE

-                       Version 2, June 1991

-

- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,

- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

- Everyone is permitted to copy and distribute verbatim copies

- of this license document, but changing it is not allowed.

-

-                            Preamble

-

-  The licenses for most software are designed to take away your

-freedom to share and change it.  By contrast, the GNU General Public

-License is intended to guarantee your freedom to share and change free

-software--to make sure the software is free for all its users.  This

-General Public License applies to most of the Free Software

-Foundation's software and to any other program whose authors commit to

-using it.  (Some other Free Software Foundation software is covered by

-the GNU Lesser General Public License instead.)  You can apply it to

-your programs, too.

-

-  When we speak of free software, we are referring to freedom, not

-price.  Our General Public Licenses are designed to make sure that you

-have the freedom to distribute copies of free software (and charge for

-this service if you wish), that you receive source code or can get it

-if you want it, that you can change the software or use pieces of it

-in new free programs; and that you know you can do these things.

-

-  To protect your rights, we need to make restrictions that forbid

-anyone to deny you these rights or to ask you to surrender the rights.

-These restrictions translate to certain responsibilities for you if you

-distribute copies of the software, or if you modify it.

-

-  For example, if you distribute copies of such a program, whether

-gratis or for a fee, you must give the recipients all the rights that

-you have.  You must make sure that they, too, receive or can get the

-source code.  And you must show them these terms so they know their

-rights.

-

-  We protect your rights with two steps: (1) copyright the software, and

-(2) offer you this license which gives you legal permission to copy,

-distribute and/or modify the software.

-

-  Also, for each author's protection and ours, we want to make certain

-that everyone understands that there is no warranty for this free

-software.  If the software is modified by someone else and passed on, we

-want its recipients to know that what they have is not the original, so

-that any problems introduced by others will not reflect on the original

-authors' reputations.

-

-  Finally, any free program is threatened constantly by software

-patents.  We wish to avoid the danger that redistributors of a free

-program will individually obtain patent licenses, in effect making the

-program proprietary.  To prevent this, we have made it clear that any

-patent must be licensed for everyone's free use or not licensed at all.

-

-  The precise terms and conditions for copying, distribution and

-modification follow.

-

-                    GNU GENERAL PUBLIC LICENSE

-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

-

-  0. This License applies to any program or other work which contains

-a notice placed by the copyright holder saying it may be distributed

-under the terms of this General Public License.  The "Program", below,

-refers to any such program or work, and a "work based on the Program"

-means either the Program or any derivative work under copyright law:

-that is to say, a work containing the Program or a portion of it,

-either verbatim or with modifications and/or translated into another

-language.  (Hereinafter, translation is included without limitation in

-the term "modification".)  Each licensee is addressed as "you".

-

-Activities other than copying, distribution and modification are not

-covered by this License; they are outside its scope.  The act of

-running the Program is not restricted, and the output from the Program

-is covered only if its contents constitute a work based on the

-Program (independent of having been made by running the Program).

-Whether that is true depends on what the Program does.

-

-  1. You may copy and distribute verbatim copies of the Program's

-source code as you receive it, in any medium, provided that you

-conspicuously and appropriately publish on each copy an appropriate

-copyright notice and disclaimer of warranty; keep intact all the

-notices that refer to this License and to the absence of any warranty;

-and give any other recipients of the Program a copy of this License

-along with the Program.

-

-You may charge a fee for the physical act of transferring a copy, and

-you may at your option offer warranty protection in exchange for a fee.

-

-  2. You may modify your copy or copies of the Program or any portion

-of it, thus forming a work based on the Program, and copy and

-distribute such modifications or work under the terms of Section 1

-above, provided that you also meet all of these conditions:

-

-    a) You must cause the modified files to carry prominent notices

-    stating that you changed the files and the date of any change.

-

-    b) You must cause any work that you distribute or publish, that in

-    whole or in part contains or is derived from the Program or any

-    part thereof, to be licensed as a whole at no charge to all third

-    parties under the terms of this License.

-

-    c) If the modified program normally reads commands interactively

-    when run, you must cause it, when started running for such

-    interactive use in the most ordinary way, to print or display an

-    announcement including an appropriate copyright notice and a

-    notice that there is no warranty (or else, saying that you provide

-    a warranty) and that users may redistribute the program under

-    these conditions, and telling the user how to view a copy of this

-    License.  (Exception: if the Program itself is interactive but

-    does not normally print such an announcement, your work based on

-    the Program is not required to print an announcement.)

-

-These requirements apply to the modified work as a whole.  If

-identifiable sections of that work are not derived from the Program,

-and can be reasonably considered independent and separate works in

-themselves, then this License, and its terms, do not apply to those

-sections when you distribute them as separate works.  But when you

-distribute the same sections as part of a whole which is a work based

-on the Program, the distribution of the whole must be on the terms of

-this License, whose permissions for other licensees extend to the

-entire whole, and thus to each and every part regardless of who wrote it.

-

-Thus, it is not the intent of this section to claim rights or contest

-your rights to work written entirely by you; rather, the intent is to

-exercise the right to control the distribution of derivative or

-collective works based on the Program.

-

-In addition, mere aggregation of another work not based on the Program

-with the Program (or with a work based on the Program) on a volume of

-a storage or distribution medium does not bring the other work under

-the scope of this License.

-

-  3. You may copy and distribute the Program (or a work based on it,

-under Section 2) in object code or executable form under the terms of

-Sections 1 and 2 above provided that you also do one of the following:

-

-    a) Accompany it with the complete corresponding machine-readable

-    source code, which must be distributed under the terms of Sections

-    1 and 2 above on a medium customarily used for software interchange; or,

-

-    b) Accompany it with a written offer, valid for at least three

-    years, to give any third party, for a charge no more than your

-    cost of physically performing source distribution, a complete

-    machine-readable copy of the corresponding source code, to be

-    distributed under the terms of Sections 1 and 2 above on a medium

-    customarily used for software interchange; or,

-

-    c) Accompany it with the information you received as to the offer

-    to distribute corresponding source code.  (This alternative is

-    allowed only for noncommercial distribution and only if you

-    received the program in object code or executable form with such

-    an offer, in accord with Subsection b above.)

-

-The source code for a work means the preferred form of the work for

-making modifications to it.  For an executable work, complete source

-code means all the source code for all modules it contains, plus any

-associated interface definition files, plus the scripts used to

-control compilation and installation of the executable.  However, as a

-special exception, the source code distributed need not include

-anything that is normally distributed (in either source or binary

-form) with the major components (compiler, kernel, and so on) of the

-operating system on which the executable runs, unless that component

-itself accompanies the executable.

-

-If distribution of executable or object code is made by offering

-access to copy from a designated place, then offering equivalent

-access to copy the source code from the same place counts as

-distribution of the source code, even though third parties are not

-compelled to copy the source along with the object code.

-

-  4. You may not copy, modify, sublicense, or distribute the Program

-except as expressly provided under this License.  Any attempt

-otherwise to copy, modify, sublicense or distribute the Program is

-void, and will automatically terminate your rights under this License.

-However, parties who have received copies, or rights, from you under

-this License will not have their licenses terminated so long as such

-parties remain in full compliance.

-

-  5. You are not required to accept this License, since you have not

-signed it.  However, nothing else grants you permission to modify or

-distribute the Program or its derivative works.  These actions are

-prohibited by law if you do not accept this License.  Therefore, by

-modifying or distributing the Program (or any work based on the

-Program), you indicate your acceptance of this License to do so, and

-all its terms and conditions for copying, distributing or modifying

-the Program or works based on it.

-

-  6. Each time you redistribute the Program (or any work based on the

-Program), the recipient automatically receives a license from the

-original licensor to copy, distribute or modify the Program subject to

-these terms and conditions.  You may not impose any further

-restrictions on the recipients' exercise of the rights granted herein.

-You are not responsible for enforcing compliance by third parties to

-this License.

-

-  7. If, as a consequence of a court judgment or allegation of patent

-infringement or for any other reason (not limited to patent issues),

-conditions are imposed on you (whether by court order, agreement or

-otherwise) that contradict the conditions of this License, they do not

-excuse you from the conditions of this License.  If you cannot

-distribute so as to satisfy simultaneously your obligations under this

-License and any other pertinent obligations, then as a consequence you

-may not distribute the Program at all.  For example, if a patent

-license would not permit royalty-free redistribution of the Program by

-all those who receive copies directly or indirectly through you, then

-the only way you could satisfy both it and this License would be to

-refrain entirely from distribution of the Program.

-

-If any portion of this section is held invalid or unenforceable under

-any particular circumstance, the balance of the section is intended to

-apply and the section as a whole is intended to apply in other

-circumstances.

-

-It is not the purpose of this section to induce you to infringe any

-patents or other property right claims or to contest validity of any

-such claims; this section has the sole purpose of protecting the

-integrity of the free software distribution system, which is

-implemented by public license practices.  Many people have made

-generous contributions to the wide range of software distributed

-through that system in reliance on consistent application of that

-system; it is up to the author/donor to decide if he or she is willing

-to distribute software through any other system and a licensee cannot

-impose that choice.

-

-This section is intended to make thoroughly clear what is believed to

-be a consequence of the rest of this License.

-

-  8. If the distribution and/or use of the Program is restricted in

-certain countries either by patents or by copyrighted interfaces, the

-original copyright holder who places the Program under this License

-may add an explicit geographical distribution limitation excluding

-those countries, so that distribution is permitted only in or among

-countries not thus excluded.  In such case, this License incorporates

-the limitation as if written in the body of this License.

-

-  9. The Free Software Foundation may publish revised and/or new versions

-of the General Public License from time to time.  Such new versions will

-be similar in spirit to the present version, but may differ in detail to

-address new problems or concerns.

-

-Each version is given a distinguishing version number.  If the Program

-specifies a version number of this License which applies to it and "any

-later version", you have the option of following the terms and conditions

-either of that version or of any later version published by the Free

-Software Foundation.  If the Program does not specify a version number of

-this License, you may choose any version ever published by the Free Software

-Foundation.

-

-  10. If you wish to incorporate parts of the Program into other free

-programs whose distribution conditions are different, write to the author

-to ask for permission.  For software which is copyrighted by the Free

-Software Foundation, write to the Free Software Foundation; we sometimes

-make exceptions for this.  Our decision will be guided by the two goals

-of preserving the free status of all derivatives of our free software and

-of promoting the sharing and reuse of software generally.

-

-                            NO WARRANTY

-

-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY

-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN

-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES

-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED

-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS

-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE

-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,

-REPAIR OR CORRECTION.

-

-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING

-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR

-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,

-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING

-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED

-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY

-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER

-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE

-POSSIBILITY OF SUCH DAMAGES.

-

-                     END OF TERMS AND CONDITIONS

-

-            How to Apply These Terms to Your New Programs

-

-  If you develop a new program, and you want it to be of the greatest

-possible use to the public, the best way to achieve this is to make it

-free software which everyone can redistribute and change under these terms.

-

-  To do so, attach the following notices to the program.  It is safest

-to attach them to the start of each source file to most effectively

-convey the exclusion of warranty; and each file should have at least

-the "copyright" line and a pointer to where the full notice is found.

-

-    <one line to give the program's name and a brief idea of what it does.>

-    Copyright (C) <year>  <name of author>

-

-    This program is free software; you can redistribute it and/or modify

-    it under the terms of the GNU General Public License as published by

-    the Free Software Foundation; either version 2 of the License, or

-    (at your option) any later version.

-

-    This program is distributed in the hope that it will be useful,

-    but WITHOUT ANY WARRANTY; without even the implied warranty of

-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-    GNU General Public License for more details.

-

-    You should have received a copy of the GNU General Public License along

-    with this program; if not, write to the Free Software Foundation, Inc.,

-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

-

-Also add information on how to contact you by electronic and paper mail.

-

-If the program is interactive, make it output a short notice like this

-when it starts in an interactive mode:

-

-    Gnomovision version 69, Copyright (C) year name of author

-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.

-    This is free software, and you are welcome to redistribute it

-    under certain conditions; type `show c' for details.

-

-The hypothetical commands `show w' and `show c' should show the appropriate

-parts of the General Public License.  Of course, the commands you use may

-be called something other than `show w' and `show c'; they could even be

-mouse-clicks or menu items--whatever suits your program.

-

-You should also get your employer (if you work as a programmer) or your

-school, if any, to sign a "copyright disclaimer" for the program, if

-necessary.  Here is a sample; alter the names:

-

-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program

-  `Gnomovision' (which makes passes at compilers) written by James Hacker.

-

-  <signature of Ty Coon>, 1 April 1989

-  Ty Coon, President of Vice

-

-This General Public License does not permit incorporating your program into

-proprietary programs.  If your program is a subroutine library, you may

-consider it more useful to permit linking proprietary applications with the

-library.  If this is what you want to do, use the GNU Lesser General

-Public License instead of this License.

diff --git a/packaging/win32/portable/Other/Source/Readme.txt b/packaging/win32/portable/Other/Source/Readme.txt
deleted file mode 100644
index 7c03cdaf2..000000000
--- a/packaging/win32/portable/Other/Source/Readme.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-The base application's source code is available from the portable app's

-homepage listed in the help.html file (if applicable).

-

-Details of most other things are available there as well.

-

-LICENSE

-=======

-

-This package's installer and launcher are released under the GPL. The launcher

-is the PortableApps.com Launcher, available with full source and documentation

-from http://portableapps.com/development. We request that developers using the

-PortableApps.com Launcher please leave this directory intact and unchanged.

-

-USER CONFIGURATION

-==================

-

-Some configuration in the PortableApps.com Launcher can be overridden by the

-user in an INI file next to **AppID**Portable.exe called **AppID**Portable.ini.

-If you are happy with the default options, it is not necessary, though.  There

-is an example INI included with this package to get you started.  To use it,

-copy AppNamePortable.ini from this directory to **AppID**Portable.ini next to

-**AppID**Portable.exe. The options in the INI file are as follows:

-

-   AdditionalParameters=

-   DisableSplashScreen=false

-   RunLocally=false

-

-(There is no need for an INI header in this file; if you have one, though, it

-won't damage anything.)

-

-The AdditionalParameters entry allows you to pass additional command-line

-parameters to the application.

-

-The DisableSplashScreen entry allows you to run the launcher without the splash

-screen showing up.  The default is false.

-

-The RunLocally entry allows you to run the portable application from a read-

-only medium. This is known as Live mode. It copies what it needs to to a

-temporary directory on the host computer, runs the application, and then

-deletes it afterwards, leaving nothing behind. This can be useful for running

-the application from a CD or if you work on a computer that may have spyware or

-viruses and you'd like to keep your device set to read-only. As a consequence

-of this technique, any changes you make during the Live mode session aren't

-saved back to your device.  The default is false.

-

-There may be other values also permitted in the user configuration file by the

-portable application; refer to help.html for any details of them.

diff --git a/share/extensions/test/Makefile.am b/share/extensions/test/Makefile.am
index eb63f357b..f7c59970f 100644
--- a/share/extensions/test/Makefile.am
+++ b/share/extensions/test/Makefile.am
@@ -42,7 +42,6 @@ EXTRA_DIST = \
 		perfectboundcover.test.py \
 		perspective.test.py \
 		polyhedron_3d.test.py \
-		printing-marks.test.py \
 		radiusrand.test.py \
 		render_alphabetsoup.test.py \
 		render_barcode.test.py \
diff --git a/src/2geom/Makefile_insert b/src/2geom/Makefile_insert
index e3b6fcdab..07e066df5 100644
--- a/src/2geom/Makefile_insert
+++ b/src/2geom/Makefile_insert
@@ -6,112 +6,129 @@
 	rm -f 2geom/lib2geom.a $(2geom_lib2geom_a_OBJECTS)
 
 2geom_lib2geom_a_SOURCES = \
-	2geom/affine.h	\
-	2geom/affine.cpp	\
-	2geom/angle.h	\
-	2geom/basic-intersection.cpp	\
-	2geom/basic-intersection.h	\
-	2geom/bezier-clipping.cpp	\
-	2geom/bezier-curve.cpp	\
-	2geom/bezier-curve.h	\
-	2geom/bezier.h	\
-	2geom/bezier-to-sbasis.h	\
-	2geom/bezier-utils.cpp	\
-	2geom/bezier-utils.h	\
-	2geom/choose.h	\
-	2geom/circle-circle.cpp	\
-	2geom/circle.cpp	\
-	2geom/circle.h	\
-	2geom/circulator.h	\
-	2geom/concepts.h	\
-	2geom/conjugate_gradient.cpp	\
-	2geom/conjugate_gradient.h	\
-	2geom/convex-cover.cpp	\
-	2geom/convex-cover.h	\
-	2geom/coord.h	\
-	2geom/crossing.cpp	\
-	2geom/crossing.h	\
+	2geom/2geom.h \
+	2geom/affine.cpp \
+	2geom/affine.h \
+	2geom/angle.h \
+	2geom/basic-intersection.cpp \
+	2geom/basic-intersection.h \
+	2geom/bezier-clipping.cpp \
+	2geom/bezier-curve.cpp \
+	2geom/bezier-curve.h \
+	2geom/bezier.h \
+	2geom/bezier-to-sbasis.h \
+	2geom/bezier-utils.cpp \
+	2geom/bezier-utils.h \
+	2geom/choose.h \
+	2geom/circle-circle.cpp \
+	2geom/circle.cpp \
+	2geom/circle.h \
+	2geom/circulator.h \
+	2geom/CMakeLists.txt \
+	2geom/concepts.h \
+	2geom/conicsec.cpp \
+	2geom/conicsec.h \
+	2geom/conic_section_clipper_cr.h \
+	2geom/conic_section_clipper.h \
+	2geom/conic_section_clipper_impl.cpp \
+	2geom/conic_section_clipper_impl.h \
+	2geom/conjugate_gradient.cpp \
+	2geom/conjugate_gradient.h \
+	2geom/convex-cover.cpp \
+	2geom/convex-cover.h \
+	2geom/coord.h \
+	2geom/crossing.cpp \
+	2geom/crossing.h \
 	2geom/curve.cpp \
-	2geom/curve.h	\
-	2geom/curves.h	\
-	2geom/d2.h	\
-	2geom/d2-sbasis.cpp	\
-	2geom/d2-sbasis.h	\
-	2geom/ellipse.cpp	\
-	2geom/ellipse.h	\
-	2geom/elliptical-arc.cpp	\
-	2geom/elliptical-arc.h	\
-	2geom/exception.h	\
-	2geom/forward.h	\
-	2geom/geom.cpp	\
-	2geom/geom.h	\
-	2geom/hvlinesegment.h	\
-	2geom/interval.h	\
-	2geom/isnan.h	\
-	2geom/linear.h	\
-	2geom/line.cpp	\
-	2geom/line.h	\
-	2geom/nearest-point.cpp	\
-	2geom/nearest-point.h	\
-	2geom/numeric/fitting-model.h	\
-	2geom/numeric/fitting-tool.h	\
-	2geom/numeric/linear_system.h	\
-	2geom/numeric/matrix.cpp	\
-	2geom/numeric/matrix.h	\
-	2geom/numeric/vector.h	\
-	2geom/ord.h	\
-	2geom/path.cpp	\
-	2geom/path.h	\
-	2geom/path-intersection.cpp	\
-	2geom/path-intersection.h	\
-	2geom/pathvector.cpp	\
-	2geom/pathvector.h	\
-	2geom/piecewise.cpp	\
-	2geom/piecewise.h	\
-	2geom/point.cpp	\
-	2geom/point.h	\
-	2geom/point-l.h	\
-	2geom/point-ops.h	\
-	2geom/poly.cpp	\
-	2geom/poly.h	\
-	2geom/quadtree.cpp	\
-	2geom/quadtree.h	\
-	2geom/ray.h	\
-	2geom/rect.cpp	\
-	2geom/rect.h	\
-	2geom/region.cpp	\
-	2geom/region.h	\
-	2geom/sbasis-2d.cpp	\
-	2geom/sbasis-2d.h	\
-	2geom/sbasis.cpp	\
-	2geom/sbasis-curve.h	\
-	2geom/sbasis-geometric.cpp	\
-	2geom/sbasis-geometric.h	\
-	2geom/sbasis.h	\
-	2geom/sbasis-math.cpp	\
-	2geom/sbasis-math.h	\
-	2geom/sbasis-poly.cpp	\
-	2geom/sbasis-poly.h	\
-	2geom/sbasis-roots.cpp	\
-	2geom/sbasis-to-bezier.cpp	\
-	2geom/sbasis-to-bezier.h	\
-	2geom/shape.cpp	\
-	2geom/shape.h	\
-	2geom/solve-bezier.cpp	\
-	2geom/solve-bezier-one-d.cpp	\
-	2geom/solve-bezier-parametric.cpp	\
-	2geom/solver.h	\
-	2geom/sturm.h	\
-	2geom/svg-elliptical-arc.cpp	\
-	2geom/svg-elliptical-arc.h	\
-	2geom/svg-path.cpp	\
-	2geom/svg-path.h	\
-	2geom/svg-path-parser.cpp	\
-	2geom/svg-path-parser.h	\
-	2geom/sweep.cpp	\
-	2geom/sweep.h	\
-	2geom/transforms.cpp	\
-	2geom/transforms.h	\
-	2geom/utils.cpp	\
-	2geom/utils.h
+	2geom/curve.h \
+	2geom/curves.h \
+	2geom/d2.h \
+	2geom/d2-sbasis.cpp \
+	2geom/d2-sbasis.h \
+	2geom/ellipse.cpp \
+	2geom/ellipse.h \
+	2geom/elliptical-arc.cpp \
+	2geom/elliptical-arc.h \
+	2geom/exception.h \
+	2geom/forward.h \
+	2geom/generic-interval.h \
+	2geom/generic-rect.h \
+	2geom/geom.cpp \
+	2geom/geom.h \
+	2geom/hvlinesegment.h \
+	2geom/interval.h \
+	2geom/int-interval.h \
+	2geom/int-point.h \
+	2geom/int-rect.h \
+	2geom/linear.h \
+	2geom/line.cpp \
+	2geom/line.h \
+	2geom/math-utils.h \
+	2geom/nearest-point.cpp \
+	2geom/nearest-point.h \
+	2geom/ord.h \
+	2geom/path.cpp \
+	2geom/path.h \
+	2geom/path-intersection.cpp \
+	2geom/path-intersection.h \
+	2geom/pathvector.cpp \
+	2geom/pathvector.h \
+	2geom/piecewise.cpp \
+	2geom/piecewise.h \
+	2geom/point.cpp \
+	2geom/point.h \
+	2geom/point-ops.h \
+	2geom/poly.cpp \
+	2geom/poly.h \
+	2geom/quadtree.cpp \
+	2geom/quadtree.h \
+	2geom/ray.h \
+	2geom/rect.cpp \
+	2geom/rect.h \
+	2geom/recursive-bezier-intersection.cpp \
+	2geom/region.cpp \
+	2geom/region.h \
+	2geom/sbasis-2d.cpp \
+	2geom/sbasis-2d.h \
+	2geom/sbasis.cpp \
+	2geom/sbasis-curve.h \
+	2geom/sbasis-geometric.cpp \
+	2geom/sbasis-geometric.h \
+	2geom/sbasis.h \
+	2geom/sbasis-math.cpp \
+	2geom/sbasis-math.h \
+	2geom/sbasis-poly.cpp \
+	2geom/sbasis-poly.h \
+	2geom/sbasis-roots.cpp \
+	2geom/sbasis-to-bezier.cpp \
+	2geom/sbasis-to-bezier.h \
+	2geom/shape.cpp \
+	2geom/shape.h \
+	2geom/solve-bezier.cpp \
+	2geom/solve-bezier-one-d.cpp \
+	2geom/solve-bezier-parametric.cpp \
+	2geom/solver.h \
+	2geom/svg-elliptical-arc.cpp \
+	2geom/svg-elliptical-arc.h \
+	2geom/svg-path.cpp \
+	2geom/svg-path.h \
+	2geom/svg-path-parser.cpp \
+	2geom/svg-path-parser.h \
+	2geom/sweep.cpp \
+	2geom/sweep.h \
+	2geom/toposweep.cpp \
+	2geom/toposweep.h \
+	2geom/transforms.cpp \
+	2geom/transforms.h \
+	2geom/utils.cpp \
+	2geom/utils.h \
+	2geom/numeric/fitting-model.h \
+	2geom/numeric/fitting-tool.h \
+	2geom/numeric/linear_system.h \
+	2geom/numeric/matrix.cpp \
+	2geom/numeric/matrix.h \
+	2geom/numeric/symmetric-matrix-fs.h \
+	2geom/numeric/symmetric-matrix-fs-operation.h \
+	2geom/numeric/symmetric-matrix-fs-trace.h \
+	2geom/numeric/vector.h
 
diff --git a/src/Makefile.am b/src/Makefile.am
index fc1065b34..46c655f9c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,9 +16,6 @@ bin_PROGRAMS = inkscape inkview
 # Libraries which should be compiled by "make" but not installed.
 # Use this only for libraries that are really standalone, rather than for
 # source tree subdirectories.
-#if WITH_INKBOARD
-#libpedro = pedro/libpedro.a
-#endif
 
 if !WITH_EXT_GDL
 internal_GDL = libgdl/libgdl.a
@@ -35,7 +32,6 @@ noinst_LIBRARIES =	\
 	libvpsc/libvpsc.a	\
 	livarot/libvarot.a	\
 	2geom/lib2geom.a	\
-	$(libpedro)		\
 	libinkversion.a
 
 all_libs =			\
@@ -109,11 +105,6 @@ win32ldflags = -lcomdlg32 -lmscms
 mwindows = -mwindows
 endif 
 
-if INKJAR
-inkjar_dir = inkjar
-inkjar_libs = inkjar/libinkjar.a
-endif
-
 # Include all partial makefiles from subdirectories
 include Makefile_insert
 include bind/Makefile_insert
@@ -156,7 +147,6 @@ EXTRA_DIST +=	\
 	$(top_srcdir)/Doxyfile	\
 	sp-skeleton.cpp sp-skeleton.h	\
 	util/makefile.in	\
-	application/makefile.in	\
 	bind/makefile.in	\
 	debug/makefile.in	\
 	dialogs/makefile.in	\
@@ -171,11 +161,8 @@ EXTRA_DIST +=	\
 	io/makefile.in	\
 	io/crystalegg.xml	\
 	io/doc2html.xsl 	\
-	pedro/makefile.in	\
-	jabber_whiteboard/makefile.in	\
 	libgdl/makefile.in	\
 	libcroco/makefile.in	\
-	libnr/makefile.in	\
 	libnrtype/makefile.in	\
 	libavoid/makefile.in	\
 	livarot/makefile.in	\
@@ -199,7 +186,6 @@ EXTRA_DIST +=	\
 	helper/sp-marshal.list	\
 	show-preview.bmp \
 	winconsole.cpp \
-	$(jabber_whiteboard_SOURCES) \
 	$(CXXTEST_TEMPLATE)
 
 # Extra files to remove when doing "make distclean"
diff --git a/src/Makefile_insert b/src/Makefile_insert
index 36e05270a..2d557158b 100644
--- a/src/Makefile_insert
+++ b/src/Makefile_insert
@@ -40,7 +40,7 @@ ink_common_sources +=	\
 	dir-util.cpp dir-util.h						\
 	document.cpp document.h document-private.h			\
 	document-subset.cpp document-subset.h				\
-	document-undo.cpp						\
+	document-undo.cpp document-undo.h \
 	doxygen-main.cpp						\
 	draw-anchor.cpp	draw-anchor.h					\
 	draw-context.cpp draw-context.h					\
@@ -61,7 +61,6 @@ ink_common_sources +=	\
 	filter-enums.cpp filter-enums.h					\
 	fixes.cpp							\
 	flood-context.cpp flood-context.h				\
-	forward.h							\
 	gc-alloc.h							\
 	gc-anchored.h gc-anchored.cpp					\
 	gc-core.h							\
diff --git a/src/display/Makefile_insert b/src/display/Makefile_insert
index cf211108f..abbd89a68 100644
--- a/src/display/Makefile_insert
+++ b/src/display/Makefile_insert
@@ -47,7 +47,6 @@ ink_common_sources += \
 	display/guideline.h	\
 	display/nr-3dutils.cpp \
 	display/nr-3dutils.h \
-	display/nr-arena-forward.h	\
 	display/nr-filter-blend.cpp     \
 	display/nr-filter-blend.h       \
 	display/nr-filter-colormatrix.cpp	\
@@ -107,6 +106,8 @@ ink_common_sources += \
 	display/sodipodi-ctrlrect.h	\
 	display/sp-canvas.cpp	\
 	display/sp-canvas.h	\
+	display/sp-canvas-item.h \
+	display/sp-canvas-group.h \
 	display/sp-canvas-util.cpp	\
 	display/sp-canvas-util.h	\
 	display/sp-ctrlcurve.cpp	\
diff --git a/src/extension/Makefile_insert b/src/extension/Makefile_insert
index ffcee5f9a..4e75de13a 100644
--- a/src/extension/Makefile_insert
+++ b/src/extension/Makefile_insert
@@ -3,7 +3,6 @@
 ink_common_sources +=	\
     extension/extension.cpp	\
     extension/extension.h	\
-    extension/extension-forward.h	\
     extension/db.cpp	\
     extension/db.h	\
     extension/dependency.cpp \
diff --git a/src/extension/internal/Makefile_insert b/src/extension/internal/Makefile_insert
index a0fda8e10..1ea6caca9 100644
--- a/src/extension/internal/Makefile_insert
+++ b/src/extension/internal/Makefile_insert
@@ -132,12 +132,24 @@ ink_common_sources +=	\
 	extension/internal/latex-pstricks.h	\
 	extension/internal/latex-pstricks-out.cpp	\
 	extension/internal/latex-pstricks-out.h	\
+	extension/internal/filter/bevels.h	\
+	extension/internal/filter/blurs.h \
+	extension/internal/filter/bumps.h \
+	extension/internal/filter/color.h \
+	extension/internal/filter/distort.h \
+	extension/internal/filter/filter.h \
+	extension/internal/filter/image.h \
+	extension/internal/filter/morphology.h \
+	extension/internal/filter/overlays.h \
+	extension/internal/filter/paint.h \
+	extension/internal/filter/protrusions.h \
+	extension/internal/filter/shadows.h \
+	extension/internal/filter/textures.h \
+	extension/internal/filter/transparency.h \
 	extension/internal/filter/filter-all.cpp \
 	extension/internal/filter/filter-file.cpp \
 	extension/internal/filter/filter.cpp \
 	extension/internal/filter/filter.h \
-	extension/internal/filter/drop-shadow.h \
-	extension/internal/filter/snow.h \
 	extension/internal/emf-win32-print.h \
 	extension/internal/emf-win32-print.cpp \
 	extension/internal/emf-win32-inout.h \
diff --git a/src/helper/Makefile_insert b/src/helper/Makefile_insert
index 0efb5d6ce..2be40e0e0 100644
--- a/src/helper/Makefile_insert
+++ b/src/helper/Makefile_insert
@@ -12,7 +12,6 @@ ink_common_sources +=	\
 	helper/geom-nodetype.h	\
 	helper/gnome-utils.cpp	\
 	helper/gnome-utils.h	\
-	helper/helper-forward.h	\
 	helper/png-write.cpp	\
 	helper/png-write.h	\
 	helper/sp-marshal.cpp	\
diff --git a/src/libgdl/Makefile_insert b/src/libgdl/Makefile_insert
index 788df0673..3f5228a20 100644
--- a/src/libgdl/Makefile_insert
+++ b/src/libgdl/Makefile_insert
@@ -3,7 +3,6 @@
 if WITH_EXT_GDL
 
 EXTRA_DIST += \
-        libgdl/gdl-tools.h		\
 	libgdl/gdl-dock-object.h	\
 	libgdl/gdl-dock-master.h	\
 	libgdl/gdl-dock.h		\
@@ -13,7 +12,6 @@ EXTRA_DIST += \
 	libgdl/gdl-dock-tablabel.h	\
 	libgdl/gdl-dock-placeholder.h	\
 	libgdl/gdl-dock-bar.h		\
-	libgdl/gdl-stock-icons.h	\
 	libgdl/gdl-i18n.h		\
 	libgdl/gdl-i18n.c		\
 	libgdl/gdl-dock-object.c	\
@@ -47,7 +45,6 @@ libgdl/clean:
 	rm -f libgdl/libgdl.a $(libgdl_gdl_a_OBJECTS)
 
 libgdl_libgdl_a_SOURCES =	\
-	libgdl/gdl-tools.h		\
 	libgdl/gdl-dock-object.h	\
 	libgdl/gdl-dock-master.h	\
 	libgdl/gdl-dock.h		\
@@ -57,7 +54,6 @@ libgdl_libgdl_a_SOURCES =	\
 	libgdl/gdl-dock-tablabel.h	\
 	libgdl/gdl-dock-placeholder.h	\
 	libgdl/gdl-dock-bar.h		\
-	libgdl/gdl-stock-icons.h	\
 	libgdl/gdl-i18n.h		\
 	libgdl/gdl-i18n.c		\
 	libgdl/gdl-dock-object.c	\
diff --git a/src/libnrtype/Makefile_insert b/src/libnrtype/Makefile_insert
index 7cd99e1a8..0ce8f1fd5 100644
--- a/src/libnrtype/Makefile_insert
+++ b/src/libnrtype/Makefile_insert
@@ -11,7 +11,6 @@ ink_common_sources +=	\
 	libnrtype/nr-type-pos-def.h	\
 	libnrtype/nr-type-primitives.cpp	\
 	libnrtype/nr-type-primitives.h	\
-	libnrtype/nrtype-forward.h	\
 	libnrtype/FontFactory.cpp \
 	libnrtype/FontFactory.h \
 	libnrtype/FontInstance.cpp \
diff --git a/src/livarot/Makefile_insert b/src/livarot/Makefile_insert
index e4d88efd5..69078d073 100644
--- a/src/livarot/Makefile_insert
+++ b/src/livarot/Makefile_insert
@@ -37,6 +37,5 @@ livarot_libvarot_a_SOURCES =	\
 	livarot/sweep-event.cpp \
 	livarot/sweep-event.h	\
 	livarot/sweep-event-queue.h	\
-	livarot/livarot-forward.h \
 	livarot/path-description.h \
 	livarot/path-description.cpp
diff --git a/src/xml/Makefile_insert b/src/xml/Makefile_insert
index b10f2448b..da55d7f7e 100644
--- a/src/xml/Makefile_insert
+++ b/src/xml/Makefile_insert
@@ -40,8 +40,7 @@ ink_common_sources +=	\
 	xml/subtree.cpp	\
 	xml/subtree.h	\
 	xml/text-node.h \
-	xml/invalid-operation-exception.h \
-	xml/xml-forward.h
+	xml/invalid-operation-exception.h
 
 # ######################
 # ### CxxTest stuff ####