diff options
author | Daniel Veillard <veillard@src.gnome.org> | 2008-08-28 15:36:32 +0000 |
---|---|---|
committer | Daniel Veillard <veillard@src.gnome.org> | 2008-08-28 15:36:32 +0000 |
commit | 0161e638c697890020c410dbedec9bb516d0fe49 (patch) | |
tree | 94453bdcdfaedf9e12ddd3a98e8ff37f847242b9 /result | |
parent | 49d4405a6d76a91d61dbbd9e228bf31034c8da29 (diff) | |
download | libxml2-0161e638c697890020c410dbedec9bb516d0fe49.tar.gz |
completely different fix for the recursion detection based on entity
* parser.c include/libxml/parser.h: completely different fix for
the recursion detection based on entity density, big cleanups
in the entity parsing code too
* result/*.sax*: the parser should not ask for used defined versions
of the predefined entities
* testrecurse.c: automatic test for entity recursion checks
* Makefile.am: added testrecurse
* test/recurse/lol* test/recurse/good*: a first set of tests for
the recursion
Daniel
svn path=/trunk/; revision=3783
Diffstat (limited to 'result')
-rw-r--r-- | result/att5.sax | 20 | ||||
-rw-r--r-- | result/att5.sax2 | 20 | ||||
-rw-r--r-- | result/att6.sax | 2 | ||||
-rw-r--r-- | result/att6.sax2 | 2 | ||||
-rw-r--r-- | result/att8.sax | 2 | ||||
-rw-r--r-- | result/att8.sax2 | 2 | ||||
-rw-r--r-- | result/attrib.xml.sax | 1 | ||||
-rw-r--r-- | result/attrib.xml.sax2 | 1 | ||||
-rw-r--r-- | result/cdata2.sax | 1 | ||||
-rw-r--r-- | result/cdata2.sax2 | 1 | ||||
-rw-r--r-- | result/ent3.sax | 1 | ||||
-rw-r--r-- | result/ent3.sax2 | 1 | ||||
-rw-r--r-- | result/ent4.sax | 2 | ||||
-rw-r--r-- | result/ent4.sax2 | 2 | ||||
-rw-r--r-- | result/ent8.sax | 2 | ||||
-rw-r--r-- | result/ent8.sax2 | 2 | ||||
-rw-r--r-- | result/isolat3.sax | 1 | ||||
-rw-r--r-- | result/isolat3.sax2 | 1 | ||||
-rw-r--r-- | result/p3p.sax | 1 | ||||
-rw-r--r-- | result/p3p.sax2 | 1 | ||||
-rw-r--r-- | result/rdf1.sax | 4 | ||||
-rw-r--r-- | result/rdf1.sax2 | 4 | ||||
-rw-r--r-- | result/rdf2.sax | 6 | ||||
-rw-r--r-- | result/rdf2.sax2 | 6 | ||||
-rw-r--r-- | result/xhtml1.sax | 1 | ||||
-rw-r--r-- | result/xhtml1.sax2 | 1 | ||||
-rw-r--r-- | result/xml1.sax | 1 | ||||
-rw-r--r-- | result/xml1.sax2 | 1 |
28 files changed, 0 insertions, 90 deletions
diff --git a/result/att5.sax b/result/att5.sax index ebd96f55..49d85fb1 100644 --- a/result/att5.sax +++ b/result/att5.sax @@ -29,52 +29,42 @@ SAX.startElement(norm, attr='foobar ') SAX.endElement(norm) SAX.characters( , 3) -SAX.getEntity(amp) SAX.startElement(norm, attr=' & ') SAX.endElement(norm) SAX.characters( , 3) -SAX.getEntity(amp) SAX.startElement(norm, attr=' foo&bar ') SAX.endElement(norm) SAX.characters( , 3) -SAX.getEntity(amp) SAX.startElement(norm, attr=' foobar&') SAX.endElement(norm) SAX.characters( , 3) -SAX.getEntity(amp) SAX.startElement(norm, attr='&foo bar ') SAX.endElement(norm) SAX.characters( , 3) -SAX.getEntity(amp) SAX.startElement(norm, attr='foobar &') SAX.endElement(norm) SAX.characters( , 3) -SAX.getEntity(lt) SAX.startElement(norm, attr=' < ') SAX.endElement(norm) SAX.characters( , 3) -SAX.getEntity(lt) SAX.startElement(norm, attr=' foo<bar ') SAX.endElement(norm) SAX.characters( , 3) -SAX.getEntity(lt) SAX.startElement(norm, attr=' foobar<') SAX.endElement(norm) SAX.characters( , 3) -SAX.getEntity(lt) SAX.startElement(norm, attr='<foo bar ') SAX.endElement(norm) SAX.characters( , 3) -SAX.getEntity(lt) SAX.startElement(norm, attr='foobar <') SAX.endElement(norm) SAX.characters( @@ -107,52 +97,42 @@ SAX.startElement(normId, attr='foobar ') SAX.endElement(normId) SAX.characters( , 3) -SAX.getEntity(amp) SAX.startElement(normId, attr=' & ') SAX.endElement(normId) SAX.characters( , 3) -SAX.getEntity(amp) SAX.startElement(normId, attr=' foo&bar ') SAX.endElement(normId) SAX.characters( , 3) -SAX.getEntity(amp) SAX.startElement(normId, attr=' foobar&') SAX.endElement(normId) SAX.characters( , 3) -SAX.getEntity(amp) SAX.startElement(normId, attr='&foo bar ') SAX.endElement(normId) SAX.characters( , 3) -SAX.getEntity(amp) SAX.startElement(normId, attr='foobar &') SAX.endElement(normId) SAX.characters( , 3) -SAX.getEntity(lt) SAX.startElement(normId, attr=' < ') SAX.endElement(normId) SAX.characters( , 3) -SAX.getEntity(lt) SAX.startElement(normId, attr=' foo<bar ') SAX.endElement(normId) SAX.characters( , 3) -SAX.getEntity(lt) SAX.startElement(normId, attr=' foobar<') SAX.endElement(normId) SAX.characters( , 3) -SAX.getEntity(lt) SAX.startElement(normId, attr='<foo bar ') SAX.endElement(normId) SAX.characters( , 3) -SAX.getEntity(lt) SAX.startElement(normId, attr='foobar <') SAX.endElement(normId) SAX.characters( diff --git a/result/att5.sax2 b/result/att5.sax2 index ce3a96b0..8300a1d4 100644 --- a/result/att5.sax2 +++ b/result/att5.sax2 @@ -29,52 +29,42 @@ SAX.startElementNs(norm, NULL, NULL, 0, 1, 0, attr='foob...', 8) SAX.endElementNs(norm, NULL, NULL) SAX.characters( , 3) -SAX.getEntity(amp) SAX.startElementNs(norm, NULL, NULL, 0, 1, 0, attr=' ...', 7) SAX.endElementNs(norm, NULL, NULL) SAX.characters( , 3) -SAX.getEntity(amp) SAX.startElementNs(norm, NULL, NULL, 0, 1, 0, attr=' f...', 17) SAX.endElementNs(norm, NULL, NULL) SAX.characters( , 3) -SAX.getEntity(amp) SAX.startElementNs(norm, NULL, NULL, 0, 1, 0, attr=' fo...', 13) SAX.endElementNs(norm, NULL, NULL) SAX.characters( , 3) -SAX.getEntity(amp) SAX.startElementNs(norm, NULL, NULL, 0, 1, 0, attr='&...', 13) SAX.endElementNs(norm, NULL, NULL) SAX.characters( , 3) -SAX.getEntity(amp) SAX.startElementNs(norm, NULL, NULL, 0, 1, 0, attr='foob...', 13) SAX.endElementNs(norm, NULL, NULL) SAX.characters( , 3) -SAX.getEntity(lt) SAX.startElementNs(norm, NULL, NULL, 0, 1, 0, attr=' < ...', 3) SAX.endElementNs(norm, NULL, NULL) SAX.characters( , 3) -SAX.getEntity(lt) SAX.startElementNs(norm, NULL, NULL, 0, 1, 0, attr=' f...', 13) SAX.endElementNs(norm, NULL, NULL) SAX.characters( , 3) -SAX.getEntity(lt) SAX.startElementNs(norm, NULL, NULL, 0, 1, 0, attr=' fo...', 9) SAX.endElementNs(norm, NULL, NULL) SAX.characters( , 3) -SAX.getEntity(lt) SAX.startElementNs(norm, NULL, NULL, 0, 1, 0, attr='<foo...', 9) SAX.endElementNs(norm, NULL, NULL) SAX.characters( , 3) -SAX.getEntity(lt) SAX.startElementNs(norm, NULL, NULL, 0, 1, 0, attr='foob...', 9) SAX.endElementNs(norm, NULL, NULL) SAX.characters( @@ -108,52 +98,42 @@ SAX.startElementNs(normId, NULL, NULL, 0, 1, 0, attr='foob...', 6) SAX.endElementNs(normId, NULL, NULL) SAX.characters( , 3) -SAX.getEntity(amp) SAX.startElementNs(normId, NULL, NULL, 0, 1, 0, attr='&...', 5) SAX.endElementNs(normId, NULL, NULL) SAX.characters( , 3) -SAX.getEntity(amp) SAX.startElementNs(normId, NULL, NULL, 0, 1, 0, attr='foo&...', 11) SAX.endElementNs(normId, NULL, NULL) SAX.characters( , 3) -SAX.getEntity(amp) SAX.startElementNs(normId, NULL, NULL, 0, 1, 0, attr='foob...', 11) SAX.endElementNs(normId, NULL, NULL) SAX.characters( , 3) -SAX.getEntity(amp) SAX.startElementNs(normId, NULL, NULL, 0, 1, 0, attr='&...', 12) SAX.endElementNs(normId, NULL, NULL) SAX.characters( , 3) -SAX.getEntity(amp) SAX.startElementNs(normId, NULL, NULL, 0, 1, 0, attr='foob...', 12) SAX.endElementNs(normId, NULL, NULL) SAX.characters( , 3) -SAX.getEntity(lt) SAX.startElementNs(normId, NULL, NULL, 0, 1, 0, attr='<...', 1) SAX.endElementNs(normId, NULL, NULL) SAX.characters( , 3) -SAX.getEntity(lt) SAX.startElementNs(normId, NULL, NULL, 0, 1, 0, attr='foo<...', 7) SAX.endElementNs(normId, NULL, NULL) SAX.characters( , 3) -SAX.getEntity(lt) SAX.startElementNs(normId, NULL, NULL, 0, 1, 0, attr='foob...', 7) SAX.endElementNs(normId, NULL, NULL) SAX.characters( , 3) -SAX.getEntity(lt) SAX.startElementNs(normId, NULL, NULL, 0, 1, 0, attr='<foo...', 8) SAX.endElementNs(normId, NULL, NULL) SAX.characters( , 3) -SAX.getEntity(lt) SAX.startElementNs(normId, NULL, NULL, 0, 1, 0, attr='foob...', 8) SAX.endElementNs(normId, NULL, NULL) SAX.characters( diff --git a/result/att6.sax b/result/att6.sax index 8b05a2ed..4ab9521c 100644 --- a/result/att6.sax +++ b/result/att6.sax @@ -6,10 +6,8 @@ SAX.characters( SAX.startElement(cat:ReferencedOrder) SAX.characters( , 7) -SAX.getEntity(gt) SAX.startElement(cat:SellersOrderID, schemeID='pvalue->ReferencedOrder.SellersOrderID.schemeID', schemeAgencyID='pvalue->ReferencedOrder.SellersOrderID.schemeAgencyID', schemeVersionID='pvalue->ReferencedOrder.SellersOrderID.schemeVersionID', schemeAgencySchemeID='pvalue->ReferencedOrder.SellersOrderID.schemeAgencySchemeID', schemeAgencySchemeAgencyID='pvalue->ReferencedOrder.SellersOrderID.schemeAgencySchemeAgencyID', schemeDataURI='pvalue->ReferencedOrder.SellersOrderID.schemeDataURI', schemeURI='pvalue->ReferencedOrder.SellersOrderID.schemeURI', UID='pvalue->ReferencedOrder.SellersOrderID.UID', UIDRef='pvalue->ReferencedOrder.SellersOrderID.UIDRef', UIDRefs='pvalue->ReferencedOrder.SellersOrderID.UIDRefs0', language='pvalue->ReferencedOrder.SellersOrderID.language') SAX.characters(pvalue-, 7) -SAX.getEntity(gt) SAX.characters(>, 1) SAX.characters(ReferencedOrder.SellersOrderID, 30) SAX.endElement(cat:SellersOrderID) diff --git a/result/att6.sax2 b/result/att6.sax2 index 2b11d1bb..54dd6d30 100644 --- a/result/att6.sax2 +++ b/result/att6.sax2 @@ -6,10 +6,8 @@ SAX.characters( SAX.startElementNs(ReferencedOrder, cat, 'urn:oasis:names:tc:ubl:CommonAggregateTypes:1.0:0.70', 0, 0, 0) SAX.characters( , 7) -SAX.getEntity(gt) SAX.startElementNs(SellersOrderID, cat, 'urn:oasis:names:tc:ubl:CommonAggregateTypes:1.0:0.70', 0, 11, 0, schemeID='pval...', 47, schemeAgencyID='pval...', 53, schemeVersionID='pval...', 54, schemeAgencySchemeID='pval...', 59, schemeAgencySchemeAgencyID='pval...', 65, schemeDataURI='pval...', 52, schemeURI='pval...', 48, UID='pval...', 42, UIDRef='pval...', 45, UIDRefs='pval...', 47, language='pval...', 47) SAX.characters(pvalue-, 7) -SAX.getEntity(gt) SAX.characters(>, 1) SAX.characters(ReferencedOrder.SellersOrderID, 30) SAX.endElementNs(SellersOrderID, cat, 'urn:oasis:names:tc:ubl:CommonAggregateTypes:1.0:0.70') diff --git a/result/att8.sax b/result/att8.sax index a3666c77..12e378a7 100644 --- a/result/att8.sax +++ b/result/att8.sax @@ -3,10 +3,8 @@ SAX.startDocument() SAX.startElement(ino:response, xmlns:ino='http://namespaces.softwareag.com/tamino/response2', xmlns:xql='http://metalab.unc.edu/xql/', ino:sessionid='556', ino:sessionkey='1590469677') SAX.startElement(xql:query) SAX.characters(/bsk:DocPart[@docId=, 20) -SAX.getEntity(apos) SAX.characters(', 1) SAX.characters(20040308152601345236, 20) -SAX.getEntity(apos) SAX.characters(', 1) SAX.characters( and @docPartNo=1], 18) SAX.endElement(xql:query) diff --git a/result/att8.sax2 b/result/att8.sax2 index f5da6629..1f2344a9 100644 --- a/result/att8.sax2 +++ b/result/att8.sax2 @@ -3,10 +3,8 @@ SAX.startDocument() SAX.startElementNs(response, ino, 'http://namespaces.softwareag.com/tamino/response2', 2, xmlns:ino='http://namespaces.softwareag.com/tamino/response2', xmlns:xql='http://metalab.unc.edu/xql/', 2, 0, ino:sessionid='556"...', 3, ino:sessionkey='1590...', 10) SAX.startElementNs(query, xql, 'http://metalab.unc.edu/xql/', 0, 0, 0) SAX.characters(/bsk:DocPart[@docId=, 20) -SAX.getEntity(apos) SAX.characters(', 1) SAX.characters(20040308152601345236, 20) -SAX.getEntity(apos) SAX.characters(', 1) SAX.characters( and @docPartNo=1], 18) SAX.endElementNs(query, xql, 'http://metalab.unc.edu/xql/') diff --git a/result/attrib.xml.sax b/result/attrib.xml.sax index 35e0462f..50ad8e1d 100644 --- a/result/attrib.xml.sax +++ b/result/attrib.xml.sax @@ -1,6 +1,5 @@ SAX.setDocumentLocator() SAX.startDocument() -SAX.getEntity(apos) SAX.startElement(item, title='Icrontic.com - Warning: Breakdancing midget with tourette's syndrome on-board ', url='http://www.icrontic.com/', first_time='985034339', last_time='985034339', visits='1') SAX.endElement(item) SAX.endDocument() diff --git a/result/attrib.xml.sax2 b/result/attrib.xml.sax2 index a0521f44..c7d2c872 100644 --- a/result/attrib.xml.sax2 +++ b/result/attrib.xml.sax2 @@ -1,6 +1,5 @@ SAX.setDocumentLocator() SAX.startDocument() -SAX.getEntity(apos) SAX.startElementNs(item, NULL, NULL, 0, 5, 0, title='Icro...', 173, url='http...', 24, first_time='9850...', 9, last_time='9850...', 9, visits='1"/>...', 1) SAX.endElementNs(item, NULL, NULL) SAX.endDocument() diff --git a/result/cdata2.sax b/result/cdata2.sax index 46b025e8..7fcc8638 100644 --- a/result/cdata2.sax +++ b/result/cdata2.sax @@ -7,7 +7,6 @@ SAX.startElement(test) SAX.pcdata( <![CDATA[abc], 18) SAX.characters(], 1) -SAX.getEntity(gt) SAX.characters(>, 1) SAX.pcdata( , 3) diff --git a/result/cdata2.sax2 b/result/cdata2.sax2 index a859276d..d1420e93 100644 --- a/result/cdata2.sax2 +++ b/result/cdata2.sax2 @@ -7,7 +7,6 @@ SAX.startElementNs(test, NULL, NULL, 0, 0, 0) SAX.pcdata( <![CDATA[abc], 18) SAX.characters(], 1) -SAX.getEntity(gt) SAX.characters(>, 1) SAX.pcdata( , 3) diff --git a/result/ent3.sax b/result/ent3.sax index 859199f5..407d24bb 100644 --- a/result/ent3.sax +++ b/result/ent3.sax @@ -4,7 +4,6 @@ SAX.internalSubset(EXAMPLE, , example.dtd) SAX.entityDecl(xml, 1, (null), (null), Extensible Markup Language) SAX.getEntity(xml) SAX.externalSubset(EXAMPLE, , example.dtd) -SAX.getEntity(amp) SAX.getEntity(xml) SAX.startElement(EXAMPLE, prop1='a&b', prop2='&xml;') SAX.characters( diff --git a/result/ent3.sax2 b/result/ent3.sax2 index 2278b630..de5ff15a 100644 --- a/result/ent3.sax2 +++ b/result/ent3.sax2 @@ -4,7 +4,6 @@ SAX.internalSubset(EXAMPLE, , example.dtd) SAX.entityDecl(xml, 1, (null), (null), Extensible Markup Language) SAX.getEntity(xml) SAX.externalSubset(EXAMPLE, , example.dtd) -SAX.getEntity(amp) SAX.getEntity(xml) SAX.startElementNs(EXAMPLE, NULL, NULL, 0, 2, 0, prop1='a...', 7, prop2='&xml...', 5) SAX.characters( diff --git a/result/ent4.sax b/result/ent4.sax index d28cc877..20bc28ea 100644 --- a/result/ent4.sax +++ b/result/ent4.sax @@ -7,10 +7,8 @@ SAX.externalSubset(EXAMPLE, , example.dtd) SAX.startElement(EXAMPLE) SAX.characters( Test of , 11) -SAX.getEntity(amp) SAX.characters(&, 1) SAX.characters(amp; behaviour a, 16) -SAX.getEntity(amp) SAX.characters(&, 1) SAX.characters(b . , 4) diff --git a/result/ent4.sax2 b/result/ent4.sax2 index bbed374d..b0a6b089 100644 --- a/result/ent4.sax2 +++ b/result/ent4.sax2 @@ -7,10 +7,8 @@ SAX.externalSubset(EXAMPLE, , example.dtd) SAX.startElementNs(EXAMPLE, NULL, NULL, 0, 0, 0) SAX.characters( Test of , 11) -SAX.getEntity(amp) SAX.characters(&, 1) SAX.characters(amp; behaviour a, 16) -SAX.getEntity(amp) SAX.characters(&, 1) SAX.characters(b . , 4) diff --git a/result/ent8.sax b/result/ent8.sax index b4e40c36..4639441e 100644 --- a/result/ent8.sax +++ b/result/ent8.sax @@ -18,9 +18,7 @@ SAX.endElement(Content) SAX.characters( , 4) SAX.startElement(Content) -SAX.getEntity(lt) SAX.characters(<, 1) -SAX.getEntity(gt) SAX.characters(>, 1) SAX.endElement(Content) SAX.characters( diff --git a/result/ent8.sax2 b/result/ent8.sax2 index 3dddaee5..301f9a48 100644 --- a/result/ent8.sax2 +++ b/result/ent8.sax2 @@ -18,9 +18,7 @@ SAX.endElementNs(Content, NULL, NULL) SAX.characters( , 4) SAX.startElementNs(Content, NULL, NULL, 0, 0, 0) -SAX.getEntity(lt) SAX.characters(<, 1) -SAX.getEntity(gt) SAX.characters(>, 1) SAX.endElementNs(Content, NULL, NULL) SAX.characters( diff --git a/result/isolat3.sax b/result/isolat3.sax index 17952bba..7c40e6e1 100644 --- a/result/isolat3.sax +++ b/result/isolat3.sax @@ -20,7 +20,6 @@ SAX.characters(©, 2) SAX.characters( 1947 , 6) SAX.characters(É, 2) SAX.characters(ditions Gallimard. , 19) -SAX.getEntity(amp) SAX.characters(&, 1) SAX.characters(rights;, 7) SAX.endElement(eg) diff --git a/result/isolat3.sax2 b/result/isolat3.sax2 index b6306d0e..31296afd 100644 --- a/result/isolat3.sax2 +++ b/result/isolat3.sax2 @@ -20,7 +20,6 @@ SAX.characters(©, 2) SAX.characters( 1947 , 6) SAX.characters(É, 2) SAX.characters(ditions Gallimard. , 19) -SAX.getEntity(amp) SAX.characters(&, 1) SAX.characters(rights;, 7) SAX.endElementNs(eg, NULL, NULL) diff --git a/result/p3p.sax b/result/p3p.sax index 2522809e..e36629ad 100644 --- a/result/p3p.sax +++ b/result/p3p.sax @@ -41,7 +41,6 @@ SAX.characters( SAX.startElement(USES) SAX.characters( , 3) -SAX.getEntity(amp) SAX.startElement(STATEMENT, action='read&write', purp='0', recpnt='0', id='1') SAX.characters( , 5) diff --git a/result/p3p.sax2 b/result/p3p.sax2 index fc634344..e62ae6bb 100644 --- a/result/p3p.sax2 +++ b/result/p3p.sax2 @@ -42,7 +42,6 @@ SAX.characters( SAX.startElementNs(USES, NULL, NULL, 0, 0, 0) SAX.characters( , 3) -SAX.getEntity(amp) SAX.startElementNs(STATEMENT, NULL, NULL, 0, 4, 0, action='read...', 14, purp='0" r...', 1, recpnt='0" i...', 1, id='1"> ...', 1) SAX.characters( diff --git a/result/rdf1.sax b/result/rdf1.sax index bc9d7b5a..e2359737 100644 --- a/result/rdf1.sax +++ b/result/rdf1.sax @@ -43,10 +43,8 @@ SAX.characters( , 5) SAX.startElement(RPM:Packager) SAX.characters(Red Hat Software , 17) -SAX.getEntity(lt) SAX.characters(<, 1) SAX.characters(bugs@redhat.com, 15) -SAX.getEntity(gt) SAX.characters(>, 1) SAX.endElement(RPM:Packager) SAX.characters( @@ -73,10 +71,8 @@ SAX.characters( , 5) SAX.startElement(RPM:Changelog) SAX.characters(* Sun May 10 1998 Prospector S, 36) -SAX.getEntity(lt) SAX.characters(<, 1) SAX.characters(bugs@redhat.com, 15) -SAX.getEntity(gt) SAX.characters(>, 1) SAX.characters( - translations modified for, 42) diff --git a/result/rdf1.sax2 b/result/rdf1.sax2 index a9afd2d5..24822e14 100644 --- a/result/rdf1.sax2 +++ b/result/rdf1.sax2 @@ -43,10 +43,8 @@ SAX.characters( , 5) SAX.startElementNs(Packager, RPM, 'http://www.rpm.org/', 0, 0, 0) SAX.characters(Red Hat Software , 17) -SAX.getEntity(lt) SAX.characters(<, 1) SAX.characters(bugs@redhat.com, 15) -SAX.getEntity(gt) SAX.characters(>, 1) SAX.endElementNs(Packager, RPM, 'http://www.rpm.org/') SAX.characters( @@ -73,10 +71,8 @@ SAX.characters( , 5) SAX.startElementNs(Changelog, RPM, 'http://www.rpm.org/', 0, 0, 0) SAX.characters(* Sun May 10 1998 Prospector S, 36) -SAX.getEntity(lt) SAX.characters(<, 1) SAX.characters(bugs@redhat.com, 15) -SAX.getEntity(gt) SAX.characters(>, 1) SAX.characters( - translations modified for, 42) diff --git a/result/rdf2.sax b/result/rdf2.sax index 0ee7c3c7..f6686c12 100644 --- a/result/rdf2.sax +++ b/result/rdf2.sax @@ -43,16 +43,12 @@ SAX.characters( , 5) SAX.startElement(RPM:Packager) SAX.characters(Till Bubeck , 12) -SAX.getEntity(lt) SAX.characters(<, 1) SAX.characters(bubeck@delix.de, 15) -SAX.getEntity(gt) SAX.characters(>, 1) SAX.characters(, Ngo Than , 11) -SAX.getEntity(lt) SAX.characters(<, 1) SAX.characters(than@delix.de, 13) -SAX.getEntity(gt) SAX.characters(>, 1) SAX.endElement(RPM:Packager) SAX.characters( @@ -75,10 +71,8 @@ Routinen zur Ansteuerung, 57) SAX.characters(ü, 2) SAX.characters(gung, die speziell optimiert s, 57) -SAX.getEntity(apos) SAX.characters(', 1) SAX.characters(new curses, 10) -SAX.getEntity(apos) SAX.characters(', 1) SAX.characters( (ncurses) Variante und ist de, 51) SAX.characters(ü, 2) diff --git a/result/rdf2.sax2 b/result/rdf2.sax2 index ff61d09e..388174f3 100644 --- a/result/rdf2.sax2 +++ b/result/rdf2.sax2 @@ -43,16 +43,12 @@ SAX.characters( , 5) SAX.startElementNs(Packager, RPM, 'http://www.rpm.org/', 0, 0, 0) SAX.characters(Till Bubeck , 12) -SAX.getEntity(lt) SAX.characters(<, 1) SAX.characters(bubeck@delix.de, 15) -SAX.getEntity(gt) SAX.characters(>, 1) SAX.characters(, Ngo Than , 11) -SAX.getEntity(lt) SAX.characters(<, 1) SAX.characters(than@delix.de, 13) -SAX.getEntity(gt) SAX.characters(>, 1) SAX.endElementNs(Packager, RPM, 'http://www.rpm.org/') SAX.characters( @@ -75,10 +71,8 @@ Routinen zur Ansteuerung, 57) SAX.characters(ü, 2) SAX.characters(gung, die speziell optimiert s, 57) -SAX.getEntity(apos) SAX.characters(', 1) SAX.characters(new curses, 10) -SAX.getEntity(apos) SAX.characters(', 1) SAX.characters( (ncurses) Variante und ist de, 51) SAX.characters(ü, 2) diff --git a/result/xhtml1.sax b/result/xhtml1.sax index 0dae3fbb..624fa389 100644 --- a/result/xhtml1.sax +++ b/result/xhtml1.sax @@ -23,7 +23,6 @@ SAX.characters( SAX.startElement(script, type='text/javascript') SAX.characters( ... unescaped script , 24) -SAX.getEntity(lt) SAX.characters(<, 1) SAX.characters( content ... , 15) diff --git a/result/xhtml1.sax2 b/result/xhtml1.sax2 index 969162ec..e6952c86 100644 --- a/result/xhtml1.sax2 +++ b/result/xhtml1.sax2 @@ -23,7 +23,6 @@ SAX.characters( SAX.startElementNs(script, NULL, NULL, 0, 1, 0, type='text...', 15) SAX.characters( ... unescaped script , 24) -SAX.getEntity(lt) SAX.characters(<, 1) SAX.characters( content ... , 15) diff --git a/result/xml1.sax b/result/xml1.sax index 915b19f7..13f881b7 100644 --- a/result/xml1.sax +++ b/result/xml1.sax @@ -15,7 +15,6 @@ SAX.characters() may be escaped numerically , 31) SAX.characters(&, 1) SAX.characters(#38;) or with a general entity, 34) -SAX.getEntity(amp) SAX.characters(&, 1) SAX.characters(amp;)., 6) SAX.endElement(p) diff --git a/result/xml1.sax2 b/result/xml1.sax2 index 475d40f2..7b220f23 100644 --- a/result/xml1.sax2 +++ b/result/xml1.sax2 @@ -15,7 +15,6 @@ SAX.characters() may be escaped numerically , 31) SAX.characters(&, 1) SAX.characters(#38;) or with a general entity, 34) -SAX.getEntity(amp) SAX.characters(&, 1) SAX.characters(amp;)., 6) SAX.endElementNs(p, NULL, NULL) |