1
0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-07-29 11:41:22 +03:00

added entities testing to the Thread test make the test reasonable fix the

* test/threads/*: added entities testing to the Thread test
* testThreads.c: make the test reasonable
* DOCBparser.c: fix the DTD public and system ID
* xmllint.c: added --sgml for SGML DocBook importing
* Makefile.am: added Docbtests target
Daniel
This commit is contained in:
Daniel Veillard
2001-10-22 09:46:13 +00:00
parent 0a702dcab3
commit 89cad536e3
13 changed files with 110 additions and 25 deletions

View File

@ -47,6 +47,15 @@
#include <libxml/uri.h>
#include <libxml/globals.h>
/*
* DocBook XML current versions
*/
#define XML_DOCBOOK_XML_PUBLIC (const xmlChar *) \
"-//OASIS//DTD DocBook XML V4.1.2//EN"
#define XML_DOCBOOK_XML_SYSTEM (const xmlChar *) \
"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"
/*
* Internal description of an SGML entity
*/
@ -3554,17 +3563,20 @@ docbParseDocTypeDecl(docbParserCtxtPtr ctxt) {
/*
* Create or update the document accordingly to the DOCTYPE
* But use the predefined PUBLIC and SYSTEM ID of DocBook XML
*/
if ((ctxt->sax != NULL) && (ctxt->sax->internalSubset != NULL) &&
(!ctxt->disableSAX))
ctxt->sax->internalSubset(ctxt->userData, name, ExternalID, URI);
ctxt->sax->internalSubset(ctxt->userData, name,
XML_DOCBOOK_XML_PUBLIC,
XML_DOCBOOK_XML_SYSTEM);
/*
* Is there any internal subset declarations ?
* they are handled separately in docbParseInternalSubset()
*/
if (RAW != '[') {
return;
if (RAW != '>') {
if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
ctxt->sax->error(ctxt->userData,
"docbParseDocTypeDecl : internal subset not handled\n");
} else {
NEXT;
}
/*