diff options
| author | Daniel Veillard <veillard@src.gnome.org> | 2008-03-25 16:52:41 +0000 |
|---|---|---|
| committer | Daniel Veillard <veillard@src.gnome.org> | 2008-03-25 16:52:41 +0000 |
| commit | 97c9ce2e991de1df49b326c7315b4e61fe6cfc2c (patch) | |
| tree | a70f0ad8da8eb67a3f0ecbdc595dfbbe43a87dcd /result | |
| parent | e54c3173b85d2d7eb90fb3b95d96dc761018c15b (diff) | |
| download | android_external_libxml2-97c9ce2e991de1df49b326c7315b4e61fe6cfc2c.tar.gz android_external_libxml2-97c9ce2e991de1df49b326c7315b4e61fe6cfc2c.tar.bz2 android_external_libxml2-97c9ce2e991de1df49b326c7315b4e61fe6cfc2c.zip | |
fix various attribute normalisation problems reported by Ashwin this
* parser.c: fix various attribute normalisation problems reported
by Ashwin
* result/c14n/without-comments/example-4
result/c14n/with-comments/example-4: this impacted the result of
two c14n tests :-\
* test/att9 test/att10 test/att11 result//att9* result//att10*
result//att11*: added 3 specific regression tests coming from the
XML spec revision and from Ashwin
Daniel
svn path=/trunk/; revision=3715
Diffstat (limited to 'result')
| -rw-r--r-- | result/att10 | 18 | ||||
| -rw-r--r-- | result/att10.rde | 23 | ||||
| -rw-r--r-- | result/att10.rdr | 23 | ||||
| -rw-r--r-- | result/att10.sax | 61 | ||||
| -rw-r--r-- | result/att10.sax2 | 57 | ||||
| -rw-r--r-- | result/att11 | 9 | ||||
| -rw-r--r-- | result/att11.rde | 2 | ||||
| -rw-r--r-- | result/att11.rdr | 2 | ||||
| -rw-r--r-- | result/att11.sax | 21 | ||||
| -rw-r--r-- | result/att11.sax2 | 20 | ||||
| -rw-r--r-- | result/att9 | 6 | ||||
| -rw-r--r-- | result/att9.rde | 2 | ||||
| -rw-r--r-- | result/att9.rdr | 2 | ||||
| -rw-r--r-- | result/att9.sax | 9 | ||||
| -rw-r--r-- | result/att9.sax2 | 9 | ||||
| -rw-r--r-- | result/c14n/with-comments/example-4 | 2 | ||||
| -rw-r--r-- | result/c14n/without-comments/example-4 | 2 | ||||
| -rw-r--r-- | result/noent/att10 | 18 | ||||
| -rw-r--r-- | result/noent/att11 | 9 | ||||
| -rw-r--r-- | result/noent/att9 | 6 |
20 files changed, 299 insertions, 2 deletions
diff --git a/result/att10 b/result/att10 new file mode 100644 index 00000000..5b29bf82 --- /dev/null +++ b/result/att10 @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<!DOCTYPE doc [ +<!ELEMENT doc (tst)*> +<!ELEMENT tst (#PCDATA)> +<!ATTLIST tst a NMTOKENS #IMPLIED> +<!ATTLIST tst b CDATA #IMPLIED> +<!ENTITY d "
"> +<!ENTITY a "
"> +<!ENTITY da "
"> +]> +<doc> +<tst a="xyz" b=" xyz"/> +<tst a="&d;&d;A&a; &a;B&da;" b="&d;&d;A&a; &a;B&da;"/> +<tst a=" A B " b=" A B "/> +<tst a="x y" b=" x y "/> +<tst a="a b" b=" a b "/> +<tst a="a b" b=" a b "/> +</doc> diff --git a/result/att10.rde b/result/att10.rde new file mode 100644 index 00000000..2ca79054 --- /dev/null +++ b/result/att10.rde @@ -0,0 +1,23 @@ +0 10 doc 0 0 +0 1 doc 0 0 +1 14 #text 0 1 + +1 1 tst 1 0 +1 14 #text 0 1 + +1 1 tst 1 0 +1 14 #text 0 1 + +1 1 tst 1 0 +1 14 #text 0 1 + +1 1 tst 1 0 +1 14 #text 0 1 + +1 1 tst 1 0 +1 14 #text 0 1 + +1 1 tst 1 0 +1 14 #text 0 1 + +0 15 doc 0 0 diff --git a/result/att10.rdr b/result/att10.rdr new file mode 100644 index 00000000..2ca79054 --- /dev/null +++ b/result/att10.rdr @@ -0,0 +1,23 @@ +0 10 doc 0 0 +0 1 doc 0 0 +1 14 #text 0 1 + +1 1 tst 1 0 +1 14 #text 0 1 + +1 1 tst 1 0 +1 14 #text 0 1 + +1 1 tst 1 0 +1 14 #text 0 1 + +1 1 tst 1 0 +1 14 #text 0 1 + +1 1 tst 1 0 +1 14 #text 0 1 + +1 1 tst 1 0 +1 14 #text 0 1 + +0 15 doc 0 0 diff --git a/result/att10.sax b/result/att10.sax new file mode 100644 index 00000000..2df49a57 --- /dev/null +++ b/result/att10.sax @@ -0,0 +1,61 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.internalSubset(doc, , ) +SAX.elementDecl(doc, 4, ...) +SAX.elementDecl(tst, 3, ...) +SAX.attributeDecl(tst, a, 8, 3, NULL, ...) +SAX.attributeDecl(tst, b, 1, 3, NULL, ...) +SAX.entityDecl(d, 1, (null), (null),
) +SAX.getEntity(d) +SAX.entityDecl(a, 1, (null), (null), +) +SAX.getEntity(a) +SAX.entityDecl(da, 1, (null), (null),
+) +SAX.getEntity(da) +SAX.externalSubset(doc, , ) +SAX.startElement(doc) +SAX.characters( +, 1) +SAX.startElement(tst, a=' xyz', b=' xyz') +SAX.endElement(tst) +SAX.characters( +, 1) +SAX.getEntity(d) +SAX.getEntity(d) +SAX.getEntity(a) +SAX.getEntity(a) +SAX.getEntity(da) +SAX.getEntity(d) +SAX.getEntity(d) +SAX.getEntity(a) +SAX.getEntity(a) +SAX.getEntity(da) +SAX.startElement(tst, a='&d;&d;A&a; &a;B&da;', b='&d;&d;A&a; &a;B&da;') +SAX.endElement(tst) +SAX.characters( +, 1) +SAX.startElement(tst, a='
A + +B
+', b='
A + +B
+') +SAX.endElement(tst) +SAX.characters( +, 1) +SAX.startElement(tst, a=' x y ', b=' x y ') +SAX.endElement(tst) +SAX.characters( +, 1) +SAX.startElement(tst, a=' a b ', b=' a b ') +SAX.endElement(tst) +SAX.characters( +, 1) +SAX.startElement(tst, a=' a b ', b=' a b ') +SAX.endElement(tst) +SAX.characters( +, 1) +SAX.endElement(doc) +SAX.endDocument() diff --git a/result/att10.sax2 b/result/att10.sax2 new file mode 100644 index 00000000..7c6f61de --- /dev/null +++ b/result/att10.sax2 @@ -0,0 +1,57 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.internalSubset(doc, , ) +SAX.elementDecl(doc, 4, ...) +SAX.elementDecl(tst, 3, ...) +SAX.attributeDecl(tst, a, 8, 3, NULL, ...) +SAX.attributeDecl(tst, b, 1, 3, NULL, ...) +SAX.entityDecl(d, 1, (null), (null),
) +SAX.getEntity(d) +SAX.entityDecl(a, 1, (null), (null), +) +SAX.getEntity(a) +SAX.entityDecl(da, 1, (null), (null),
+) +SAX.getEntity(da) +SAX.externalSubset(doc, , ) +SAX.startElementNs(doc, NULL, NULL, 0, 0, 0) +SAX.characters( +, 1) +SAX.startElementNs(tst, NULL, NULL, 0, 2, 0, a='xyz"...', 3, b=' xy...', 5) +SAX.endElementNs(tst, NULL, NULL) +SAX.characters( +, 1) +SAX.getEntity(d) +SAX.getEntity(d) +SAX.getEntity(a) +SAX.getEntity(a) +SAX.getEntity(da) +SAX.getEntity(d) +SAX.getEntity(d) +SAX.getEntity(a) +SAX.getEntity(a) +SAX.getEntity(da) +SAX.startElementNs(tst, NULL, NULL, 0, 2, 0, a='&d;&...', 19, b='&d;&...', 19) +SAX.endElementNs(tst, NULL, NULL) +SAX.characters( +, 1) +SAX.startElementNs(tst, NULL, NULL, 0, 2, 0, a='
A +...', 8, b='
A +...', 8) +SAX.endElementNs(tst, NULL, NULL) +SAX.characters( +, 1) +SAX.startElementNs(tst, NULL, NULL, 0, 2, 0, a='x y...', 3, b=' x ...', 6) +SAX.endElementNs(tst, NULL, NULL) +SAX.characters( +, 1) +SAX.startElementNs(tst, NULL, NULL, 0, 2, 0, a='a b ...', 3, b=' a b...', 5) +SAX.endElementNs(tst, NULL, NULL) +SAX.characters( +, 1) +SAX.startElementNs(tst, NULL, NULL, 0, 2, 0, a='a b...', 3, b=' a ...', 8) +SAX.endElementNs(tst, NULL, NULL) +SAX.characters( +, 1) +SAX.endElementNs(doc, NULL, NULL) +SAX.endDocument() diff --git a/result/att11 b/result/att11 new file mode 100644 index 00000000..121b06df --- /dev/null +++ b/result/att11 @@ -0,0 +1,9 @@ +<?xml version="1.0" standalone="yes"?> +<!DOCTYPE attributes [ +<!ELEMENT attributes EMPTY> +<!ATTLIST attributes nmtoken NMTOKEN #IMPLIED> +<!ATTLIST attributes nmtokens NMTOKENS #IMPLIED> +<!ENTITY ent " entity&recursive; "> +<!ENTITY recursive "reference"> +]> +<attributes nmtoken="&ent; &ent; &ent;" nmtokens="Test this normalization"/> diff --git a/result/att11.rde b/result/att11.rde new file mode 100644 index 00000000..cc83bea4 --- /dev/null +++ b/result/att11.rde @@ -0,0 +1,2 @@ +0 10 attributes 0 0 +0 1 attributes 1 0 diff --git a/result/att11.rdr b/result/att11.rdr new file mode 100644 index 00000000..cc83bea4 --- /dev/null +++ b/result/att11.rdr @@ -0,0 +1,2 @@ +0 10 attributes 0 0 +0 1 attributes 1 0 diff --git a/result/att11.sax b/result/att11.sax new file mode 100644 index 00000000..67dcf22d --- /dev/null +++ b/result/att11.sax @@ -0,0 +1,21 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.internalSubset(attributes, , ) +SAX.elementDecl(attributes, 1, ...) +SAX.attributeDecl(attributes, nmtoken, 7, 3, NULL, ...) +SAX.attributeDecl(attributes, nmtokens, 8, 3, NULL, ...) +SAX.entityDecl(ent, 1, (null), (null), entity&recursive; ) +SAX.getEntity(ent) +SAX.entityDecl(recursive, 1, (null), (null), reference) +SAX.getEntity(recursive) +SAX.externalSubset(attributes, , ) +SAX.getEntity(ent) +SAX.getEntity(recursive) +SAX.getEntity(ent) +SAX.getEntity(recursive) +SAX.getEntity(ent) +SAX.getEntity(recursive) +SAX.startElement(attributes, nmtoken=' &ent; &ent; &ent; ', nmtokens=' Test
+ this normalization ') +SAX.endElement(attributes) +SAX.endDocument() diff --git a/result/att11.sax2 b/result/att11.sax2 new file mode 100644 index 00000000..859a9704 --- /dev/null +++ b/result/att11.sax2 @@ -0,0 +1,20 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.internalSubset(attributes, , ) +SAX.elementDecl(attributes, 1, ...) +SAX.attributeDecl(attributes, nmtoken, 7, 3, NULL, ...) +SAX.attributeDecl(attributes, nmtokens, 8, 3, NULL, ...) +SAX.entityDecl(ent, 1, (null), (null), entity&recursive; ) +SAX.getEntity(ent) +SAX.entityDecl(recursive, 1, (null), (null), reference) +SAX.getEntity(recursive) +SAX.externalSubset(attributes, , ) +SAX.getEntity(ent) +SAX.getEntity(recursive) +SAX.getEntity(ent) +SAX.getEntity(recursive) +SAX.getEntity(ent) +SAX.getEntity(recursive) +SAX.startElementNs(attributes, NULL, NULL, 0, 2, 0, nmtoken='&ent...', 17, nmtokens='Test...', 25) +SAX.endElementNs(attributes, NULL, NULL) +SAX.endDocument() diff --git a/result/att9 b/result/att9 new file mode 100644 index 00000000..e4982a29 --- /dev/null +++ b/result/att9 @@ -0,0 +1,6 @@ +<?xml version="1.0"?> +<!DOCTYPE doc [ +<!ATTLIST doc a1 NMTOKENS "1 2"> +<!ELEMENT doc (#PCDATA)> +]> +<doc/> diff --git a/result/att9.rde b/result/att9.rde new file mode 100644 index 00000000..9b0a34db --- /dev/null +++ b/result/att9.rde @@ -0,0 +1,2 @@ +0 10 doc 0 0 +0 1 doc 1 0 diff --git a/result/att9.rdr b/result/att9.rdr new file mode 100644 index 00000000..9b0a34db --- /dev/null +++ b/result/att9.rdr @@ -0,0 +1,2 @@ +0 10 doc 0 0 +0 1 doc 1 0 diff --git a/result/att9.sax b/result/att9.sax new file mode 100644 index 00000000..0fe14a14 --- /dev/null +++ b/result/att9.sax @@ -0,0 +1,9 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.internalSubset(doc, , ) +SAX.attributeDecl(doc, a1, 8, 1, 1 2, ...) +SAX.elementDecl(doc, 3, ...) +SAX.externalSubset(doc, , ) +SAX.startElement(doc) +SAX.endElement(doc) +SAX.endDocument() diff --git a/result/att9.sax2 b/result/att9.sax2 new file mode 100644 index 00000000..09b3a04c --- /dev/null +++ b/result/att9.sax2 @@ -0,0 +1,9 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.internalSubset(doc, , ) +SAX.attributeDecl(doc, a1, 8, 1, 1 2, ...) +SAX.elementDecl(doc, 3, ...) +SAX.externalSubset(doc, , ) +SAX.startElementNs(doc, NULL, NULL, 0, 1, 1, a1='1 2...', 3) +SAX.endElementNs(doc, NULL, NULL) +SAX.endDocument() diff --git a/result/c14n/with-comments/example-4 b/result/c14n/with-comments/example-4 index 26937c87..19a25592 100644 --- a/result/c14n/with-comments/example-4 +++ b/result/c14n/with-comments/example-4 @@ -5,5 +5,5 @@ Second line</text> <compute>value>"0" && value<"10" ?"valid":"error"</compute> <compute expr="value>"0" && value<"10" ?"valid":"error"">valid</compute> <norm attr=" ' 
	 ' "></norm> - <normId id="' 
	 '"></normId> + <normId id="' 
	 '"></normId> </doc>
\ No newline at end of file diff --git a/result/c14n/without-comments/example-4 b/result/c14n/without-comments/example-4 index 26937c87..19a25592 100644 --- a/result/c14n/without-comments/example-4 +++ b/result/c14n/without-comments/example-4 @@ -5,5 +5,5 @@ Second line</text> <compute>value>"0" && value<"10" ?"valid":"error"</compute> <compute expr="value>"0" && value<"10" ?"valid":"error"">valid</compute> <norm attr=" ' 
	 ' "></norm> - <normId id="' 
	 '"></normId> + <normId id="' 
	 '"></normId> </doc>
\ No newline at end of file diff --git a/result/noent/att10 b/result/noent/att10 new file mode 100644 index 00000000..cc1c6b0a --- /dev/null +++ b/result/noent/att10 @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<!DOCTYPE doc [ +<!ELEMENT doc (tst)*> +<!ELEMENT tst (#PCDATA)> +<!ATTLIST tst a NMTOKENS #IMPLIED> +<!ATTLIST tst b CDATA #IMPLIED> +<!ENTITY d "
"> +<!ENTITY a "
"> +<!ENTITY da "
"> +]> +<doc> +<tst a="xyz" b=" xyz"/> +<tst a=" A B " b=" A B "/> +<tst a=" A B " b=" A B "/> +<tst a="x y" b=" x y "/> +<tst a="a b" b=" a b "/> +<tst a="a b" b=" a b "/> +</doc> diff --git a/result/noent/att11 b/result/noent/att11 new file mode 100644 index 00000000..3646e62b --- /dev/null +++ b/result/noent/att11 @@ -0,0 +1,9 @@ +<?xml version="1.0" standalone="yes"?> +<!DOCTYPE attributes [ +<!ELEMENT attributes EMPTY> +<!ATTLIST attributes nmtoken NMTOKEN #IMPLIED> +<!ATTLIST attributes nmtokens NMTOKENS #IMPLIED> +<!ENTITY ent " entity&recursive; "> +<!ENTITY recursive "reference"> +]> +<attributes nmtoken="entityreference entityreference entityreference" nmtokens="Test this normalization"/> diff --git a/result/noent/att9 b/result/noent/att9 new file mode 100644 index 00000000..e4982a29 --- /dev/null +++ b/result/noent/att9 @@ -0,0 +1,6 @@ +<?xml version="1.0"?> +<!DOCTYPE doc [ +<!ATTLIST doc a1 NMTOKENS "1 2"> +<!ELEMENT doc (#PCDATA)> +]> +<doc/> |