Commit 4119d1c6 authored by William M. Brack's avatar William M. Brack
Browse files

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
parent b7fe1047
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
......
......@@ -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
......
<?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>
<?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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment