From 07136650c1e8bfbc3e2a15b254f842e2fd17e16c Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Thu, 18 Nov 1999 14:02:05 +0000 Subject: [PATCH] Fixed some wrongly space collapsing code due to misreading of the spec, Daniel. --- ChangeLog | 8 +++++++- SAXresult/att1 | 2 +- SAXresult/att2 | 2 +- parser.c | 25 ++++++++++++------------- result/SVG/flower2.xml | 8 ++++---- result/SVG/toap02.xml | 2 +- result/att1 | 2 +- result/att2 | 2 +- 8 files changed, 28 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index f677325e..701ef312 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,10 @@ -Wed Nov 17 18:28:06 CET 1999 +Thu Nov 18 14:57:18 CET 1999 + + * parser.c: Fixed some wrongly space collapsing code due to + a misreading of the spec. + * result/*: fixed the output accordingly + +Wed Nov 17 18:28:06 CET 1999 Daniel Veillard * encoding.c: bug fix and typos * xmlIO.[ch] parser.c: first bits toward real progressive parsing diff --git a/SAXresult/att1 b/SAXresult/att1 index 125e1b2c..e19a8a7e 100644 --- a/SAXresult/att1 +++ b/SAXresult/att1 @@ -1,5 +1,5 @@ SAX.setDocumentLocator() SAX.startDocument() -SAX.startElement(doc, attr='to normalize with a space') +SAX.startElement(doc, attr='to normalize with a space') SAX.endElement(doc) SAX.endDocument() diff --git a/SAXresult/att2 b/SAXresult/att2 index 125e1b2c..02ca320e 100644 --- a/SAXresult/att2 +++ b/SAXresult/att2 @@ -1,5 +1,5 @@ SAX.setDocumentLocator() SAX.startDocument() -SAX.startElement(doc, attr='to normalize with a space') +SAX.startElement(doc, attr='to normalize with a space') SAX.endElement(doc) SAX.endDocument() diff --git a/parser.c b/parser.c index 3491efbc..f3bd47a1 100644 --- a/parser.c +++ b/parser.c @@ -2509,6 +2509,12 @@ xmlParseEntityValue(xmlParserCtxtPtr ctxt, xmlChar **orig) { * #x20 is appended for a "#xD#xA" sequence that is part of an external * parsed entity or the literal entity value of an internal parsed entity * - other characters are processed by appending them to the normalized value + * If the declared value is not CDATA, then the XML processor must further + * process the normalized attribute value by discarding any leading and + * trailing space (#x20) characters, and by replacing sequences of space + * (#x20) characters by a single space (#x20) character. + * All attributes for which no declaration has been read should be treated + * by a non-validating parser as if declared CDATA. * * Returns the AttValue parsed or NULL. The value has to be freed by the caller. */ @@ -2523,7 +2529,6 @@ xmlParseAttValue(xmlParserCtxtPtr ctxt) { xmlChar *current = NULL; xmlEntityPtr ent; xmlChar cur; - int blank = 0; SHRINK; @@ -2564,7 +2569,6 @@ xmlParseAttValue(xmlParserCtxtPtr ctxt) { if ((cur == '&') && (NXT(1) == '#')) { int val = xmlParseCharRef(ctxt); *out++ = val; - blank = 0; } else if (cur == '&') { ent = xmlParseEntityRef(ctxt); if ((ent != NULL) && @@ -2594,20 +2598,16 @@ xmlParseAttValue(xmlParserCtxtPtr ctxt) { *out++ = *cur++; *out++ = ';'; } - blank = 0; } else { /* invalid for UTF-8 , use COPY(out); !!!!!! */ if ((cur == 0x20) || (cur == 0xD) || (cur == 0xA) || (cur == 0x9)) { - if (!blank) { - *out++ = 0x20; - if (out - buffer > buffer_size - 10) { - int index = out - buffer; - - growBuffer(buffer); - out = &buffer[index]; - } + *out++ = 0x20; + if (out - buffer > buffer_size - 10) { + int index = out - buffer; + + growBuffer(buffer); + out = &buffer[index]; } - blank = 1; } else { *out++ = cur; if (out - buffer > buffer_size - 10) { @@ -2616,7 +2616,6 @@ xmlParseAttValue(xmlParserCtxtPtr ctxt) { growBuffer(buffer); out = &buffer[index]; } - blank = 0; } NEXT; } diff --git a/result/SVG/flower2.xml b/result/SVG/flower2.xml index b34513d3..f6cd2ba0 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/toap02.xml b/result/SVG/toap02.xml index 0a903689..c62aa04b 100644 --- a/result/SVG/toap02.xml +++ b/result/SVG/toap02.xml @@ -3,7 +3,7 @@ - + diff --git a/result/att1 b/result/att1 index d3ed2adf..00aa6be6 100644 --- a/result/att1 +++ b/result/att1 @@ -1,2 +1,2 @@ - + diff --git a/result/att2 b/result/att2 index d3ed2adf..28989a2c 100644 --- a/result/att2 +++ b/result/att2 @@ -1,2 +1,2 @@ - +