diff options
| author | William M. Brack <wbrack@src.gnome.org> | 2004-06-24 02:24:44 +0000 |
|---|---|---|
| committer | William M. Brack <wbrack@src.gnome.org> | 2004-06-24 02:24:44 +0000 |
| commit | 4119d1c61dda92e3f96d67c7d87d0cb693acabae (patch) | |
| tree | 9a9c5d50aeba8a9db17abffa3c6840b141ffd8c7 | |
| parent | b7fe1047794bc7a5d4c719c9dd8865953540737e (diff) | |
| download | android_external_libxml2-4119d1c61dda92e3f96d67c7d87d0cb693acabae.tar.gz android_external_libxml2-4119d1c61dda92e3f96d67c7d87d0cb693acabae.tar.bz2 android_external_libxml2-4119d1c61dda92e3f96d67c7d87d0cb693acabae.zip | |
implemented bugfix from Massimo Morara for DTD dumping problem. added
* valid.c: implemented bugfix from Massimo Morara for DTD
dumping problem.
* test/valid/t10.xml, result/valid/t10.*: added regression
for above
* configure.in: small change for my profile settings
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | result/valid/t10.xml | 12 | ||||
| -rw-r--r-- | result/valid/t10.xml.err | 0 | ||||
| -rw-r--r-- | test/valid/t10.xml | 12 | ||||
| -rw-r--r-- | valid.c | 8 |
6 files changed, 39 insertions, 3 deletions
@@ -1,3 +1,11 @@ +Thu Jun 24 10:17:31 HKT 2004 William Brack <wbrack@mmm.com.hk> + + * valid.c: implemented bugfix from Massimo Morara for DTD + dumping problem. + * test/valid/t10.xml, result/valid/t10.*: added regression + for above + * configure.in: small change for my profile settings + Wed Jun 23 20:18:19 MDT 2004 John Fleck <jfleck@inkstain.net> * doc/xmlcatalog_man.xml, xmlcatalog.1 diff --git a/configure.in b/configure.in index 78f76839..634c7ffa 100644 --- a/configure.in +++ b/configure.in @@ -422,7 +422,7 @@ dnl (-Wunreachable-code) dnl if [[ "${LOGNAME}" = "veillard" -a "`pwd`" = "/u/veillard/XML" ]] || \ [[ "${LOGNAME}" = "bill" -a "`pwd`" = "/home/bill/gnomecvs/xmltest" ]] || \ - [[ "${LOGNAME}" = "bill" -a "`pwd`" = "/home/bill/gnomecvs/xmlnew" ]] + [[ "${LOGNAME}" = "wbrack" -a "`pwd`" = "/Users/wbrack/gnomecvs/xmltest" ]] then if test "$with_minimum" != "yes" then diff --git a/result/valid/t10.xml b/result/valid/t10.xml new file mode 100644 index 00000000..b60f2f97 --- /dev/null +++ b/result/valid/t10.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" standalone="yes"?> +<!DOCTYPE root [ +<!ELEMENT root (cont1 , (cont1 , cont2?)+)> +<!ELEMENT cont1 EMPTY> +<!ELEMENT cont2 EMPTY> +]> +<root> + <cont1/> + <cont1/> + <cont1/> + <cont1/> +</root> diff --git a/result/valid/t10.xml.err b/result/valid/t10.xml.err new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/result/valid/t10.xml.err diff --git a/test/valid/t10.xml b/test/valid/t10.xml new file mode 100644 index 00000000..de066f9d --- /dev/null +++ b/test/valid/t10.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" standalone="yes"?> +<!DOCTYPE root [ +<!ELEMENT root (cont1, (cont1, cont2?)+)> + <!ELEMENT cont1 EMPTY> + <!ELEMENT cont2 EMPTY> +]> +<root> + <cont1/> + <cont1/> + <cont1/> + <cont1/> +</root> @@ -1012,7 +1012,9 @@ xmlDumpElementContent(xmlBufferPtr buf, xmlElementContentPtr content, int glob) else xmlDumpElementContent(buf, content->c1, 0); xmlBufferWriteChar(buf, " , "); - if (content->c2->type == XML_ELEMENT_CONTENT_OR) + if ((content->c2->type == XML_ELEMENT_CONTENT_OR) || + ((content->c2->type == XML_ELEMENT_CONTENT_SEQ) && + (content->c2->ocur != XML_ELEMENT_CONTENT_ONCE))) xmlDumpElementContent(buf, content->c2, 1); else xmlDumpElementContent(buf, content->c2, 0); @@ -1024,7 +1026,9 @@ xmlDumpElementContent(xmlBufferPtr buf, xmlElementContentPtr content, int glob) else xmlDumpElementContent(buf, content->c1, 0); xmlBufferWriteChar(buf, " | "); - if (content->c2->type == XML_ELEMENT_CONTENT_SEQ) + if ((content->c2->type == XML_ELEMENT_CONTENT_SEQ) || + ((content->c2->type == XML_ELEMENT_CONTENT_OR) && + (content->c2->ocur != XML_ELEMENT_CONTENT_ONCE))) xmlDumpElementContent(buf, content->c2, 1); else xmlDumpElementContent(buf, content->c2, 0); |