Index: src/.cvsignore
===================================================================
RCS file: /cvsroot/inkscape/inkscape/src/.cvsignore,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 .cvsignore
--- src/.cvsignore	13 Nov 2004 07:08:50 -0000	1.9
+++ src/.cvsignore	5 Feb 2005 17:52:24 -0000
@@ -12,3 +12,4 @@ inkview
 spsvgview
 inkscape.def
 *.dll
+*-test
Index: src/Makefile.am
===================================================================
RCS file: /cvsroot/inkscape/inkscape/src/Makefile.am,v
retrieving revision 1.90
diff -u -p -u -p -r1.90 Makefile.am
--- ../gold/src/Makefile.am	2004-12-28 11:49:44.000000000 -0800
+++ src/Makefile.am	2005-02-05 10:28:31.000000000 -0800
@@ -82,6 +82,8 @@
 	helper/makefile.in	\
 	inkjar/makefile.in	\
 	io/makefile.in  	\
+	io/crystalegg.xml  	\
+	io/doc2html.xsl  	\
 	libnr/makefile.in	\
 	libnrtype/makefile.in	\
 	livarot/makefile.in	\
@@ -129,7 +131,8 @@
 	libnr/nr-translate-test$(EXEEXT)	\
 	libnr/nr-types-test$(EXEEXT)	\
 	xml/quote-test$(EXEEXT)	\
-	xml/repr-action-test$(EXEEXT)
+	xml/repr-action-test$(EXEEXT) \
+	io/streamtest$(EXEEXT)
 
 # automake adds $(EXEEXT) to check_PROGRAMS items but not to TESTS items:
 # TESTS items can be scripts etc.
@@ -153,7 +156,8 @@
 	libnr/nr-translate-test	\
 	libnr/nr-types-test	\
 	xml/quote-test	\
-	xml/repr-action-test
+	xml/repr-action-test \
+	io/streamtest
 
 
 # ################################################
Index: src/Makefile_insert
===================================================================
RCS file: /cvsroot/inkscape/inkscape/src/Makefile_insert,v
retrieving revision 1.83
diff -u -p -u -p -r1.83 Makefile_insert
--- src/Makefile_insert	10 Jan 2005 01:52:06 -0000	1.83
+++ src/Makefile_insert	5 Feb 2005 17:52:25 -0000
@@ -61,12 +61,6 @@ libinkpre_a_SOURCES =	\
 	file.cpp file.h	\
 	fontsize-expansion.cpp fontsize-expansion.h	\
 	forward.h	\
-	gc-alloc.h \
-	gc-anchored.h gc-anchored.cpp \
-	gc-core.h \
-	gc-finalized.h \
-	gc-managed.h \
-	gc.cpp \
 	geom.cpp geom.h	\
 	help.cpp help.h	\
 	inkscape-stock.cpp inkscape-stock.h\
@@ -203,6 +197,9 @@ libinkpre_a_SOURCES =	\
 	view.cpp view.h	\
 	zoom-context.cpp zoom-context.h
 
+# Force libinkpost.a to be rebuilt if we add files to libinkpost_a_SOURCES.
+libinkpost_a_DEPENDENCIES = Makefile_insert
+
 # libinkpost.a: Any object file that needs to be near the end of the link line.
 # gradient-chemistry.o is called by some things in display/.
 libinkpost_a_SOURCES =	\
@@ -210,6 +207,12 @@ libinkpost_a_SOURCES =	\
 	decimal-round.h	\
 	fill-or-stroke.h	\
 	fixes.cpp \
+	gc-alloc.h	\
+	gc-anchored.h gc-anchored.cpp	\
+	gc-core.h	\
+	gc-finalized.h	\
+	gc-managed.h	\
+	gc.cpp	\
 	gradient-chemistry.cpp gradient-chemistry.h	\
 	memeq.h	\
 	round.h	\
Index: src/make.exclude
===================================================================
RCS file: /cvsroot/inkscape/inkscape/src/make.exclude,v
retrieving revision 1.35
diff -u -p -u -p -r1.35 make.exclude
--- src/make.exclude	30 Jan 2005 20:00:45 -0000	1.35
+++ src/make.exclude	5 Feb 2005 17:52:25 -0000
@@ -47,4 +47,5 @@ winmain.cpp
 xml/quote-test.cpp
 xml/repr-action-test.cpp
 xpath
+io/streamtest.cpp
 
Index: src/display/.cvsignore
===================================================================
RCS file: /cvsroot/inkscape/inkscape/src/display/.cvsignore,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 .cvsignore
--- src/display/.cvsignore	25 Apr 2004 02:34:03 -0000	1.5
+++ src/display/.cvsignore	5 Feb 2005 17:52:25 -0000
@@ -4,3 +4,4 @@
 Makefile
 Makefile.in
 makefile
+*-test
Index: src/extension/script/Makefile_insert
===================================================================
RCS file: /cvsroot/inkscape/inkscape/src/extension/script/Makefile_insert,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 Makefile_insert
--- src/extension/script/Makefile_insert	23 Dec 2004 20:37:32 -0000	1.10
+++ src/extension/script/Makefile_insert	5 Feb 2005 17:52:25 -0000
@@ -24,7 +24,7 @@ python_sources = \
 	extension/script/InkscapePython.cpp \
 	extension/script/inkscape_py_wrap.cpp \
 	extension/script/inkscape_py.py \
-	extension/script/iinkscape_py.py.h
+	extension/script/inkscape_py.py.h
 endif
 
 extension_script_libscript_a_SOURCES =	\
Index: src/helper/.cvsignore
===================================================================
RCS file: /cvsroot/inkscape/inkscape/src/helper/.cvsignore,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 .cvsignore
--- src/helper/.cvsignore	22 Apr 2004 21:19:42 -0000	1.5
+++ src/helper/.cvsignore	5 Feb 2005 17:52:26 -0000
@@ -1,7 +1,9 @@
 Makefile
 Makefile.in
 .deps
+.libs
 sp-marshal.cpp
 sp-marshal.h
 makefile
 .dirstamp
+*-test
Index: src/io/.cvsignore
===================================================================
RCS file: /cvsroot/inkscape/inkscape/src/io/.cvsignore,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 .cvsignore
--- src/io/.cvsignore	29 Dec 2004 21:12:21 -0000	1.1
+++ src/io/.cvsignore	5 Feb 2005 17:52:26 -0000
@@ -1,3 +1,5 @@
 .deps
 .dirstamp
+.libs
 makefile
+streamtest
Index: src/io/Makefile_insert
===================================================================
RCS file: /cvsroot/inkscape/inkscape/src/io/Makefile_insert,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile_insert
--- src/io/Makefile_insert	30 Jan 2005 01:52:54 -0000	1.3
+++ src/io/Makefile_insert	5 Feb 2005 17:52:26 -0000
@@ -6,13 +6,14 @@ io/clean:
 	rm -f io/libio.a $(io_libio_a_OBJECTS)
 
 io_libio_a_SOURCES = \
+	io/base64stream.h \
+	io/base64stream.cpp \
 	io/ftos.cpp \
 	io/ftos.h \
 	io/gzipstream.cpp \
 	io/gzipstream.h \
 	io/inkscapestream.cpp \
 	io/inkscapestream.h \
-	io/streamtest.cpp \
 	io/stringstream.cpp \
 	io/stringstream.h \
 	io/sys.h \
@@ -22,3 +23,5 @@ io_libio_a_SOURCES = \
 	io/xsltstream.cpp \
 	io/xsltstream.h
 
+io_streamtest_SOURCES = io/streamtest.cpp
+io_streamtest_LDADD =   $(all_libs)
Index: src/libnr/.cvsignore
===================================================================
RCS file: /cvsroot/inkscape/inkscape/src/libnr/.cvsignore,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 .cvsignore
--- src/libnr/.cvsignore	22 Apr 2004 21:19:42 -0000	1.5
+++ src/libnr/.cvsignore	5 Feb 2005 17:52:26 -0000
@@ -7,3 +7,4 @@ testnr
 gen_nr_config
 makefile
 .dirstamp
+*-test
Index: src/xml/.cvsignore
===================================================================
RCS file: /cvsroot/inkscape/inkscape/src/xml/.cvsignore,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 .cvsignore
--- src/xml/.cvsignore	25 Apr 2004 02:34:03 -0000	1.5
+++ src/xml/.cvsignore	5 Feb 2005 17:52:26 -0000
@@ -4,3 +4,4 @@
 Makefile
 Makefile.in
 makefile
+*-test
Index: src/xml/Makefile_insert
===================================================================
RCS file: /cvsroot/inkscape/inkscape/src/xml/Makefile_insert,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 Makefile_insert
--- src/xml/Makefile_insert	23 Jan 2005 19:16:58 -0000	1.16
+++ src/xml/Makefile_insert	5 Feb 2005 17:52:26 -0000
@@ -23,7 +23,6 @@ xml_libspxml_a_SOURCES =	\
 	xml/repr-get-children.cpp	\
 	xml/repr-get-children.h	\
 	xml/repr-io.cpp	\
-	xml/repr-private.h	\
 	xml/repr-util.cpp	\
 	xml/repr.cpp	\
 	xml/repr.h	\
@@ -36,6 +35,7 @@ xml_libspxml_a_SOURCES =	\
 	xml/simple-session.h \
 	xml/sp-repr.h \
 	xml/sp-repr-attr.h \
+	xml/sp-css-attr.h \
 	xml/sp-repr-action.cpp	\
 	xml/sp-repr-action.h	\
 	xml/sp-repr-action-fns.h	\