Index: configure.ac =================================================================== RCS file: /cvsroot/inkscape/inkscape/configure.ac,v retrieving revision 1.28 diff -u -p -u -r1.28 configure.ac --- configure.ac 29 Jan 2005 03:29:03 -0000 1.28 +++ configure.ac 5 Feb 2005 12:21:36 -0000 @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.50) -AC_INIT(inkscape, 0.40+cvs) +AC_INIT(inkscape, 0.41pre1) dnl N.B. After 0.40, please change to `0.40+cvs' instead of `0.41cvs'. dnl Rationale: (i) placate simple version comparison software such as dnl `dpkg --compare-versions'. (ii) We don't always know what the next Index: src/Makefile.am =================================================================== RCS file: /cvsroot/inkscape/inkscape/src/Makefile.am,v retrieving revision 1.90 diff -u -p -u -r1.90 Makefile.am --- src/Makefile.am 28 Dec 2004 19:49:44 -0000 1.90 +++ src/Makefile.am 5 Feb 2005 12:21:36 -0000 @@ -129,7 +129,8 @@ TESTS = \ 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 +154,8 @@ check_PROGRAMS = \ 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 -r1.83 Makefile_insert --- src/Makefile_insert 10 Jan 2005 01:52:06 -0000 1.83 +++ src/Makefile_insert 5 Feb 2005 12:21:36 -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/attributes-test.cpp =================================================================== RCS file: /cvsroot/inkscape/inkscape/src/attributes-test.cpp,v retrieving revision 1.3 diff -u -p -u -r1.3 attributes-test.cpp --- src/attributes-test.cpp 22 Dec 2004 10:57:27 -0000 1.3 +++ src/attributes-test.cpp 5 Feb 2005 12:21:36 -0000 @@ -22,6 +22,7 @@ static struct {char const *attr; bool su {"additive", true}, {"font", true}, {"marker", true}, + {"line-height", true}, {"accent-height", false}, {"accumulate", true}, @@ -437,7 +438,7 @@ test_attributes() for (unsigned id = 1; id < n_ids; ++id) { if (!ids[id]) { unsigned char const *str = sp_attribute_name(id); - printf("%s\n", str); + printf("%s\n", (char const *)str); found = true; } } Index: src/splivarot.cpp =================================================================== RCS file: /cvsroot/inkscape/inkscape/src/splivarot.cpp,v retrieving revision 1.101 diff -u -p -u -r1.101 splivarot.cpp --- src/splivarot.cpp 4 Feb 2005 21:17:44 -0000 1.101 +++ src/splivarot.cpp 5 Feb 2005 12:21:37 -0000 @@ -42,18 +42,14 @@ #include "libnr/nr-matrix.h" #include "libnr/nr-point.h" #include "xml/repr.h" -#include "xml/sp-repr-iterators.h" - -#include "algorithms/longest-common-suffix.h" +#include "xml/repr-sorting.h" #include "livarot/Path.h" #include "livarot/Shape.h" #include "livarot/LivarotDefs.h" Path *Path_for_item (SPItem * item,bool doTransformation, bool transformFull = true); -SPRepr *LCA (SPRepr * a, SPRepr * b); bool Ancetre (SPRepr * a, SPRepr * who); -SPRepr *AncetreFils (SPRepr * a, SPRepr * d); void sp_selected_path_boolop (bool_op bop); void sp_selected_path_do_offset (bool expand, double prefOffset); @@ -1491,15 +1487,6 @@ sp_selected_path_simplify (void) // fonctions utilitaires -SPRepr * -AncetreFils (SPRepr * a, SPRepr * d) -{ - if (a == NULL || d == NULL) - return NULL; - if (sp_repr_parent (a) == d) - return a; - return AncetreFils (sp_repr_parent (a), d); -} bool Ancetre (SPRepr * a, SPRepr * who) @@ -1511,28 +1498,6 @@ Ancetre (SPRepr * a, SPRepr * who) return Ancetre (sp_repr_parent (a), who); } -namespace { - -bool same_repr(SPRepr &a, SPRepr &b) { - return &a == &b; -} - -} - -SPRepr * -LCA (SPRepr * a, SPRepr * b) -{ - using Inkscape::Algorithms::longest_common_suffix; - SPRepr *ancestor=longest_common_suffix( - a, b, NULL, &same_repr - ); - if ( ancestor && ancestor->type() != SP_XML_DOCUMENT_NODE ) { - return ancestor; - } else { - return NULL; - } -} - Path * Path_for_item (SPItem * item, bool doTransformation, bool transformFull) { Index: src/style-test.cpp =================================================================== RCS file: /cvsroot/inkscape/inkscape/src/style-test.cpp,v retrieving revision 1.5 diff -u -p -u -r1.5 style-test.cpp --- src/style-test.cpp 9 Jan 2005 07:27:43 -0000 1.5 +++ src/style-test.cpp 5 Feb 2005 12:21:37 -0000 @@ -412,7 +412,7 @@ test_style() {"writing-mode", "lr-tb", "lr-tb", enum_val, writing_mode_vals, true} }; - char const str0_all_exp[] = "font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;opacity:1.0000000;color:#000000;fill:#000000;fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1.0000000;visibility:visible;display:inline;font-family:Bitstream Vera Sans;letter-spacing:normal;text-anchor:start;writing-mode:lr-tb"; + char const str0_all_exp[] = "font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;opacity:1.0000000;color:#000000;fill:#000000;fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans;letter-spacing:normal;text-anchor:start;writing-mode:lr-tb"; utest_start("style"); UTEST_TEST("sp_style_new, sp_style_write_string") { 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 -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 12:21:37 -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/io/Makefile_insert =================================================================== RCS file: /cvsroot/inkscape/inkscape/src/io/Makefile_insert,v retrieving revision 1.3 diff -u -p -u -r1.3 Makefile_insert --- src/io/Makefile_insert 30 Jan 2005 01:52:54 -0000 1.3 +++ src/io/Makefile_insert 5 Feb 2005 12:21:37 -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,7 @@ io_libio_a_SOURCES = \ io/xsltstream.cpp \ io/xsltstream.h +io_streamtest_SOURCES = io/streamtest.cpp +io_streamtest_LDADD = $(all_libs) + +EXTRA_DIST = crystalegg.xml Index: src/io/streamtest.cpp =================================================================== RCS file: /cvsroot/inkscape/inkscape/src/io/streamtest.cpp,v retrieving revision 1.4 diff -u -p -u -r1.4 streamtest.cpp --- src/io/streamtest.cpp 30 Dec 2004 12:49:16 -0000 1.4 +++ src/io/streamtest.cpp 5 Feb 2005 12:21:37 -0000 @@ -1,6 +1,10 @@ #include +#include // realpath +#include // mkdtemp, realpath +#include // chdir +#include // strlen, strncpy, strrchr #include "inkscapestream.h" #include "base64stream.h" @@ -9,10 +13,21 @@ #include "uristream.h" #include "xsltstream.h" +// quick way to pass the name of the executable into the test +char myself[PATH_MAX]; + +// names and path storage for other tests +char *xmlname = "crystalegg.xml"; +char xmlpath[PATH_MAX]; +char *xslname = "doc2html.xsl"; +char xslpath[PATH_MAX]; +char *gzname = "test.gz"; +char gzpath[PATH_MAX]; + bool testUriStream() { printf("######### UriStream copy ############\n"); - Inkscape::URI inUri("streamtest"); + Inkscape::URI inUri(myself); Inkscape::IO::UriInputStream ins(inUri); Inkscape::URI outUri("streamtest.copy"); Inkscape::IO::UriOutputStream outs(outUri); @@ -53,7 +68,7 @@ bool testStdWriter() bool testBase64() { printf("######### Base64 Out ############\n"); - Inkscape::URI plainInUri("crystalegg.xml"); + Inkscape::URI plainInUri(xmlpath); Inkscape::IO::UriInputStream ins1(plainInUri); Inkscape::URI b64OutUri("crystalegg.xml.b64"); @@ -84,12 +99,12 @@ bool testBase64() bool testXslt() { printf("######### XSLT Sheet ############\n"); - Inkscape::URI xsltSheetUri("doc2html.xsl"); + Inkscape::URI xsltSheetUri(xslpath); Inkscape::IO::UriInputStream xsltSheetIns(xsltSheetUri); Inkscape::IO::XsltStyleSheet stylesheet(xsltSheetIns); xsltSheetIns.close(); - Inkscape::URI sourceUri("crystalegg.xml"); + Inkscape::URI sourceUri(xmlpath); Inkscape::IO::UriInputStream xmlIns(sourceUri); printf("######### XSLT Input ############\n"); @@ -121,8 +136,8 @@ bool testGzip() { printf("######### Gzip Output ############\n"); - Inkscape::URI gzUri("test.gz"); - Inkscape::URI sourceUri("crystalegg.xml"); + Inkscape::URI gzUri(gzpath); + Inkscape::URI sourceUri(xmlpath); Inkscape::IO::UriInputStream sourceIns(sourceUri); Inkscape::IO::UriOutputStream gzOuts(gzUri); @@ -174,12 +189,55 @@ bool doTest() return true; } +void path_init(char *path, char *name) +{ + if (strlen(name)>PATH_MAX-strlen(myself)) + { + printf("merging paths would be too long\n"); + exit(1); + } + strncpy(path,myself,PATH_MAX); + char * ptr = strrchr(path,'/'); + if (!ptr) + { + printf("path '%s' is missing any slashes\n",path); + exit(1); + } + strncpy(ptr+1,name,strlen(name)+1); + printf("'%s'\n",path); +} + int main(int argc, char **argv) { + if (!realpath(argv[0],myself)) + { + perror("realpath"); + return 1; + } + path_init(xmlpath,xmlname); + path_init(xslpath,xslname); + path_init(gzpath,gzname); + + // create temp files somewhere else instead of current dir + // TODO: clean them up too + char * testpath = strdup("/tmp/streamtest-XXXXXX"); + testpath = mkdtemp(testpath); + if (!testpath) + { + perror("mkdtemp"); + return 1; + } + if (chdir(testpath)) + { + perror("chdir"); + return 1; + } + if (!doTest()) { printf("#### Test failed\n"); + return 1; } else { Index: src/xml/Makefile_insert =================================================================== RCS file: /cvsroot/inkscape/inkscape/src/xml/Makefile_insert,v retrieving revision 1.16 diff -u -p -u -r1.16 Makefile_insert --- src/xml/Makefile_insert 23 Jan 2005 19:16:58 -0000 1.16 +++ src/xml/Makefile_insert 5 Feb 2005 12:21:37 -0000 @@ -23,7 +23,8 @@ xml_libspxml_a_SOURCES = \ xml/repr-get-children.cpp \ xml/repr-get-children.h \ xml/repr-io.cpp \ - xml/repr-private.h \ + xml/repr-sorting.cpp \ + xml/repr-sorting.h \ xml/repr-util.cpp \ xml/repr.cpp \ xml/repr.h \ @@ -36,6 +37,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 \ @@ -48,7 +50,7 @@ xml_libspxml_a_SOURCES = \ xml/xml-forward.h xml_repr_action_test_SOURCES = xml/repr-action-test.cpp -xml_repr_action_test_LDADD = gc.o xml/libspxml.a util/libinkutil.a libinkpost.a $(INKSCAPE_LIBS) +xml_repr_action_test_LDADD = xml/libspxml.a util/libinkutil.a libinkpost.a $(INKSCAPE_LIBS) xml_quote_test_SOURCES = xml/quote-test.cpp xml_quote_test_LDADD = $(INKSCAPE_LIBS) Index: src/xml/repr-util.cpp =================================================================== RCS file: /cvsroot/inkscape/inkscape/src/xml/repr-util.cpp,v retrieving revision 1.36 diff -u -p -u -r1.36 repr-util.cpp --- src/xml/repr-util.cpp 26 Jan 2005 20:28:22 -0000 1.36 +++ src/xml/repr-util.cpp 5 Feb 2005 12:21:37 -0000 @@ -34,6 +34,7 @@ #include "svg/stringstream.h" #include "xml/repr.h" +#include "xml/repr-sorting.h" #include "xml/sp-repr-attr.h" struct SPXMLNs { @@ -64,12 +65,6 @@ struct SPXMLNs { static void sp_xml_ns_register_defaults (); static char *sp_xml_ns_auto_prefix (const char *uri); -// The following are in splivarot.cpp but probably should be moved -// here... -SPRepr *LCA (SPRepr * a, SPRepr * b); -bool Ancetre (SPRepr * a, SPRepr * who); -SPRepr *AncetreFils (SPRepr * a, SPRepr * d); - /*##################### # UTILITY #####################*/