diff --git a/Makefile.am b/Makefile.am index f8e252f1..a3ff6c4a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -193,8 +193,6 @@ asan: @echo '## rebuilding for ASAN' ./configure CFLAGS="-fsanitize=address,undefined -Wformat -Werror=format-security -Werror=array-bounds -g" CXXFLAGS="-fsanitize=address,undefined -Wformat -Werror=format-security -Werror=array-bounds -g" LDFLAGS="-fsanitize=address,undefined" CC="clang" CXX="clang++" --disable-shared ; OptimOff ; $(MAKE) clean ; $(MAKE) -testall : tests SVGtests - tests: $(TEST_DEBUG) $(TEST_CATALOG) $(TEST_REGEXPS) $(TEST_SCHEMATRON) Timingtests $(TEST_VTIME) $(PYTHON_TESTS) @(if [ "$(PYTHON_SUBDIR)" != "" ] ; then cd python ; \ $(MAKE) -s tests ; fi) @@ -275,26 +273,6 @@ Catatests : xmlcatalog$(EXEEXT) grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ rm -f $(srcdir)/result/catalogs/mycatalog) -SVGtests : xmllint$(EXEEXT) - @echo "## SVG parsing regression tests" - -@(for i in $(srcdir)/test/SVG/* ; do \ - name=`basename $$i`; \ - if [ ! -d $$i ] ; then \ - if [ ! -f $(srcdir)/result/SVG/$$name ] ; then \ - echo New test file $$name ; \ - $(CHECKER) $(top_builddir)/xmllint $$i > $(srcdir)/result/SVG/$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - else \ - echo Testing $$name ; \ - $(CHECKER) $(top_builddir)/xmllint $$i > result.$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - diff $(srcdir)/result/SVG/$$name result.$$name ; \ - $(CHECKER) $(top_builddir)/xmllint result.$$name > result2.$$name ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - diff result.$$name result2.$$name ; \ - rm result.$$name result2.$$name ; \ - fi ; fi ; done) - Regexptests: testRegexp$(EXEEXT) @(echo > .memdump) @echo "## Regexp regression tests" diff --git a/fuzz/Makefile.am b/fuzz/Makefile.am index f979a900..d4272417 100644 --- a/fuzz/Makefile.am +++ b/fuzz/Makefile.am @@ -15,6 +15,7 @@ XML_SEED_CORPUS_SRC = \ '$(top_srcdir)/test/errors/*.xml' \ '$(top_srcdir)/test/errors10/*.xml' \ '$(top_srcdir)/test/namespaces/*' \ + '$(top_srcdir)/test/SVG/*.xml' \ '$(top_srcdir)/test/valid/*.xml' \ '$(top_srcdir)/test/VC/*' \ '$(top_srcdir)/test/VCM/*' \ diff --git a/result/SVG/4rects.xml b/result/SVG/4rects.xml index dfaa02d3..76763510 100644 --- a/result/SVG/4rects.xml +++ b/result/SVG/4rects.xml @@ -1,10 +1,10 @@ - Four separate rectangles + Four separate rectangles - - - - + + + + diff --git a/result/SVG/a-valid.xml b/result/SVG/a-valid.xml index 8f4a2042..7693cde0 100644 --- a/result/SVG/a-valid.xml +++ b/result/SVG/a-valid.xml @@ -1,7 +1,7 @@ - This valid svg document draws a triangle which is a hyperlink + This valid svg document draws a triangle which is a hyperlink

diff --git a/result/SVG/a-wf.xml b/result/SVG/a-wf.xml index 7facfd5c..69ffacb1 100644 --- a/result/SVG/a-wf.xml +++ b/result/SVG/a-wf.xml @@ -1,6 +1,6 @@ - This well formed svg document draws a triangle which is a hyperlink + This well formed svg document draws a triangle which is a hyperlink

diff --git a/result/SVG/bike-errors.xml b/result/SVG/bike-errors.xml deleted file mode 100644 index e69de29b..00000000 diff --git a/result/SVG/bike.xml b/result/SVG/bike.xml index 410869da..2ce3060c 100644 --- a/result/SVG/bike.xml +++ b/result/SVG/bike.xml @@ -1,44 +1,40 @@ + - Kona Lavadome mountain bike + Kona Lavadome mountain bike - This picture shows a mountain bike, a human-propelled, - multi-terrain vehicle. While it can be succesfully used on moorland, - forest, roads, and large hills it is not actually suitable for going - up mountains. + This picture shows a mountain bike, a human-propelled, + multi-terrain vehicle. While it can be succesfully used on moorland, + forest, roads, and large hills it is not actually suitable for going + up mountains. - - 14/12 gauge double butted spoke - - - - black anodised low torsion hub - - - - twin wall, eyeletted rim - - - - 8 speed, wide ratio gearing - - - - double cross lacing of 32 spokes - + 14/12 gauge double butted spoke + + + black anodised low torsion hub + + + twin wall, eyeletted rim + + + 8 speed, wide ratio gearing + + + double cross lacing of 32 spokes + - + - Front wheel - The front wheel provides grip, steering and some shock absorption - + Front wheel + The front wheel provides grip, steering and some shock absorption + - - - + + + diff --git a/result/SVG/circle.xml b/result/SVG/circle.xml index ae7d5455..fc1e7810 100644 --- a/result/SVG/circle.xml +++ b/result/SVG/circle.xml @@ -1,7 +1,7 @@ - This is a blue circle with a red outline + This is a blue circle with a red outline diff --git a/result/SVG/defs.xml b/result/SVG/defs.xml index 78c6beb6..92121b80 100644 --- a/result/SVG/defs.xml +++ b/result/SVG/defs.xml @@ -7,8 +7,8 @@ - Defining things for later use + Defining things for later use - diff --git a/result/SVG/desc.xml b/result/SVG/desc.xml index 6fde9660..9ef710fd 100644 --- a/result/SVG/desc.xml +++ b/result/SVG/desc.xml @@ -1,14 +1,14 @@ - - - Company sales by region + + + Company sales by region - - This is a bar chart which shows - company sales by region. + + This is a bar chart which shows + company sales by region. - - + + diff --git a/result/SVG/ellipse.xml b/result/SVG/ellipse.xml index 1f723461..dc65d3e1 100644 --- a/result/SVG/ellipse.xml +++ b/result/SVG/ellipse.xml @@ -1,7 +1,7 @@ - This is an ellipse, axis aligned and centered on the origin + This is an ellipse, axis aligned and centered on the origin diff --git a/result/SVG/flower2.xml b/result/SVG/flower2.xml index f6cd2ba0..f714f432 100644 --- a/result/SVG/flower2.xml +++ b/result/SVG/flower2.xml @@ -2,9 +2,9 @@ This sample SVG file draws a flower - - - - + + + + diff --git a/result/SVG/gradient.xml b/result/SVG/gradient.xml index 4570b76d..c572cd8c 100644 --- a/result/SVG/gradient.xml +++ b/result/SVG/gradient.xml @@ -1,12 +1,12 @@ - Gradient example + Gradient example - + diff --git a/result/SVG/group01.xml b/result/SVG/group01.xml index f39ad880..b5a8d0f6 100644 --- a/result/SVG/group01.xml +++ b/result/SVG/group01.xml @@ -1,7 +1,7 @@ - Two groups, each of two rectangles + Two groups, each of two rectangles diff --git a/result/SVG/group02.xml b/result/SVG/group02.xml index 85e1f523..04542953 100644 --- a/result/SVG/group02.xml +++ b/result/SVG/group02.xml @@ -1,7 +1,7 @@ - Two named groups + Two named groups diff --git a/result/SVG/group03.xml b/result/SVG/group03.xml index 20d75ad4..0fcb5bc4 100644 --- a/result/SVG/group03.xml +++ b/result/SVG/group03.xml @@ -1,11 +1,12 @@ - Groups can nest + Groups can nest - - - - + + + + + diff --git a/result/SVG/image-valid.xml b/result/SVG/image-valid.xml index d45d2297..cfb75477 100644 --- a/result/SVG/image-valid.xml +++ b/result/SVG/image-valid.xml @@ -1,7 +1,7 @@ - This graphic links to an external image + This graphic links to an external image My image diff --git a/result/SVG/image-wf.xml b/result/SVG/image-wf.xml index e11a12f4..ee1acac1 100644 --- a/result/SVG/image-wf.xml +++ b/result/SVG/image-wf.xml @@ -1,8 +1,8 @@ - This links to an external image + This links to an external image - + My image diff --git a/result/SVG/lin-gradient.xml b/result/SVG/lin-gradient.xml index 645bdce3..f49f2039 100644 --- a/result/SVG/lin-gradient.xml +++ b/result/SVG/lin-gradient.xml @@ -1,7 +1,7 @@ - Linear gradient example + Linear gradient example diff --git a/result/SVG/marker.xml b/result/SVG/marker.xml index 1b41714c..88f3be58 100644 --- a/result/SVG/marker.xml +++ b/result/SVG/marker.xml @@ -4,19 +4,21 @@ - - - An double-headed arrow example using markers + + + An double-headed arrow example using markers - - + + - + + diff --git a/result/SVG/mask.xml b/result/SVG/mask.xml index 1204e069..3a2357c3 100644 --- a/result/SVG/mask.xml +++ b/result/SVG/mask.xml @@ -1,7 +1,7 @@ - Example of using a mask + Example of using a mask diff --git a/result/SVG/mathswitch.xml b/result/SVG/mathswitch.xml index b2913840..7f9b704b 100644 --- a/result/SVG/mathswitch.xml +++ b/result/SVG/mathswitch.xml @@ -1,26 +1,29 @@ - This example uses the switch element to provide a - fallback graphical representation of an equation, if - MathML is not supported. + This example uses the switch element to provide a + fallback graphical representation of an equation, if + MathML is not supported. - - - + - - + Formula goes here + diff --git a/result/SVG/parentns.xml b/result/SVG/parentns.xml index 5b2ed463..a42053c6 100644 --- a/result/SVG/parentns.xml +++ b/result/SVG/parentns.xml @@ -1,9 +1,9 @@ - + - - - - + + + + diff --git a/result/SVG/path01.xml b/result/SVG/path01.xml index 646940bd..c64bf5bc 100644 --- a/result/SVG/path01.xml +++ b/result/SVG/path01.xml @@ -1,4 +1,4 @@ - + diff --git a/result/SVG/patternfill.xml b/result/SVG/patternfill.xml index c520ae81..d6c06857 100644 --- a/result/SVG/patternfill.xml +++ b/result/SVG/patternfill.xml @@ -3,7 +3,7 @@ - diff --git a/result/SVG/polyline.xml b/result/SVG/polyline.xml index 9fa40717..6fc99038 100644 --- a/result/SVG/polyline.xml +++ b/result/SVG/polyline.xml @@ -1,7 +1,7 @@ - A sample polyline, and equivalent path + A sample polyline, and equivalent path diff --git a/result/SVG/private.xml b/result/SVG/private.xml index edfe3663..d06034fd 100644 --- a/result/SVG/private.xml +++ b/result/SVG/private.xml @@ -7,12 +7,12 @@ - + - This chart includes private data in another namespace + This chart includes private data in another namespace - diff --git a/result/SVG/rad-gradient.xml b/result/SVG/rad-gradient.xml index d5aadf0c..503cf9d3 100644 --- a/result/SVG/rad-gradient.xml +++ b/result/SVG/rad-gradient.xml @@ -1,14 +1,14 @@ - Radial gradient example with three gradient stops + Radial gradient example with three gradient stops - - - + + + diff --git a/result/SVG/rectangle.xml b/result/SVG/rectangle.xml index 919cd23b..2c2a92d3 100644 --- a/result/SVG/rectangle.xml +++ b/result/SVG/rectangle.xml @@ -1,7 +1,7 @@ - This is a rectangle + This is a rectangle diff --git a/result/SVG/richdesc.xml b/result/SVG/richdesc.xml index eba1f058..698e40dd 100644 --- a/result/SVG/richdesc.xml +++ b/result/SVG/richdesc.xml @@ -1,11 +1,11 @@ - - This is an example SVG file - The global description uses markup from the + + This is an example SVG file + The global description uses markup from the mydoc namespace. - - - - + + + + diff --git a/result/SVG/script.xml b/result/SVG/script.xml index c98af0f7..e5af1e92 100644 --- a/result/SVG/script.xml +++ b/result/SVG/script.xml @@ -2,10 +2,9 @@ - diff --git a/result/SVG/structure01.xml b/result/SVG/structure01.xml index 46af5e80..9cc9b5f4 100644 --- a/result/SVG/structure01.xml +++ b/result/SVG/structure01.xml @@ -1,8 +1,8 @@ - - - - - + + + + + diff --git a/result/SVG/style.xml b/result/SVG/style.xml index 7176912a..ef59bf94 100644 --- a/result/SVG/style.xml +++ b/result/SVG/style.xml @@ -2,8 +2,7 @@ - diff --git a/result/SVG/switch.xml b/result/SVG/switch.xml index 87eb3646..c7bfd60b 100644 --- a/result/SVG/switch.xml +++ b/result/SVG/switch.xml @@ -1,15 +1,17 @@ - - - + + diff --git a/result/SVG/symbol-use.xml b/result/SVG/symbol-use.xml index a9b395c2..ad059335 100644 --- a/result/SVG/symbol-use.xml +++ b/result/SVG/symbol-use.xml @@ -3,20 +3,25 @@ - + - Examples of inline and referenced content + + Examples of inline and referenced content - + + - + - + + - + + - + + diff --git a/result/SVG/template.xml b/result/SVG/template.xml index 607cd91f..a452896f 100644 --- a/result/SVG/template.xml +++ b/result/SVG/template.xml @@ -1,6 +1,6 @@ - This well formed svg document contains a hyperlink + This well formed svg document contains a hyperlink

diff --git a/result/SVG/text02.xml b/result/SVG/text02.xml index 9656ea51..6dac61f5 100644 --- a/result/SVG/text02.xml +++ b/result/SVG/text02.xml @@ -10,16 +10,7 @@ - - 123 - - - ABC - - - 456 - - - DEF - - + 123 + ABC + 456 + DEF diff --git a/result/SVG/toap01.xml b/result/SVG/toap01.xml index fac024c0..9aa70f8b 100644 --- a/result/SVG/toap01.xml +++ b/result/SVG/toap01.xml @@ -1,7 +1,7 @@ - Simple text on a path + Simple text on a path