From 8d7c6499f7471d721f4356a13f37928ffec564c7 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Sat, 13 Sep 2003 00:08:39 +0000 Subject: [PATCH] removing the DocBook SGML support Daniel * xsltproc/xsltproc.c doc/xsltproc.1 doc/xsltproc.xml libxslt/xsltutils.h: removing the DocBook SGML support Daniel --- ChangeLog | 5 +++++ doc/xsltproc.1 | 14 +++++--------- doc/xsltproc.xml | 16 ---------------- libxslt/xsltutils.h | 11 ----------- xsltproc/xsltproc.c | 24 ------------------------ 5 files changed, 10 insertions(+), 60 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1830a36..3624111 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Sep 13 02:04:13 CEST 2003 Daniel Veillard + + * xsltproc/xsltproc.c doc/xsltproc.1 doc/xsltproc.xml + libxslt/xsltutils.h: removing the DocBook SGML support + Fri Sep 12 13:52:07 CEST 2003 Daniel Veillard * configure.in: preparing release libxslt-1.0.33 diff --git a/doc/xsltproc.1 b/doc/xsltproc.1 index d5700fe..5042c2b 100644 --- a/doc/xsltproc.1 +++ b/doc/xsltproc.1 @@ -25,11 +25,11 @@ xsltproc \- command line xslt processor .nf \fBxsltproc\fR [\fB-V\fR | \fB-v\fR | \fB-o \fIfile\fR\fR | \fB--timing\fR | \fB--repeat\fR | \fB--debug\fR | \fB--novalid\fR | \fB--noout\fR | \fB--maxdepth \fIval\fR\fR - | \fB--html\fR | \fB--docbook\fR | \fB--param \fIname\fR \fIvalue\fR\fR - | \fB--stringparam \fIname\fR \fIvalue\fR\fR | \fB--nonet\fR | \fB--catalogs\fR - | \fB--xinclude\fR | \fB--profile\fR | \fB--dumpextensions\fR | \fB--nowrite\fR - | \fB--nomkdir\fR | \fB--writesubtree\fR] [\fBstylesheet\fR] [\fIfile1\fR] - [\fIfile2\fR] [\fI....\fR] + | \fB--html\fR | \fB--param \fIname\fR \fIvalue\fR\fR | \fB--stringparam + \fIname\fR \fIvalue\fR\fR | \fB--nonet\fR | \fB--catalogs\fR | \fB--xinclude\fR + | \fB--profile\fR | \fB--dumpextensions\fR | \fB--nowrite\fR | \fB--nomkdir\fR + | \fB--writesubtree\fR] [\fBstylesheet\fR] [\fIfile1\fR] [\fIfile2\fR] + [\fI....\fR] .fi .SH "INTRODUCTION" @@ -89,10 +89,6 @@ Adjust the maximum depth of the template stack before libxslt concludes it is in The input document is an HTML file. .TP -\fB--docbook\fR -The input document is DocBook SGML. Do not use the --docbook option of xsltproc to process XML DocBook documents, this option is only intended to provide some (limited) support of the SGML version of DocBook. - -.TP \fB--param\fR \fIname\fR \fIvalue\fR Pass a parameter of name \fIname\fR and value \fIvalue\fR to the stylesheet. You may pass multiple name/value pairs up to a maximum of 32. If the value being passed is a string rather than a node identifier, use \fB--stringparam\fR instead. diff --git a/doc/xsltproc.xml b/doc/xsltproc.xml index a76733d..5d122b9 100644 --- a/doc/xsltproc.xml +++ b/doc/xsltproc.xml @@ -44,7 +44,6 @@ --noout --maxdepth val --html - --docbook --param name value --stringparam name value --nonet @@ -208,21 +207,6 @@ - - - - - - The input document is DocBook - SGML. - Do not use the --docbook option of xsltproc to process XML DocBook - documents, this option is only intended to provide some (limited) support - of the SGML version of DocBook. - - - - - name value diff --git a/libxslt/xsltutils.h b/libxslt/xsltutils.h index b15c03a..7ca6fc0 100644 --- a/libxslt/xsltutils.h +++ b/libxslt/xsltutils.h @@ -66,16 +66,6 @@ extern "C" { * * Check that a node is a 'real' one: document, element, text or attribute. */ -#ifdef LIBXML_DOCB_ENABLED -#define IS_XSLT_REAL_NODE(n) \ - (((n) != NULL) && \ - (((n)->type == XML_ELEMENT_NODE) || \ - ((n)->type == XML_TEXT_NODE) || \ - ((n)->type == XML_ATTRIBUTE_NODE) || \ - ((n)->type == XML_DOCUMENT_NODE) || \ - ((n)->type == XML_HTML_DOCUMENT_NODE) || \ - ((n)->type == XML_DOCB_DOCUMENT_NODE))) -#else #define IS_XSLT_REAL_NODE(n) \ (((n) != NULL) && \ (((n)->type == XML_ELEMENT_NODE) || \ @@ -83,7 +73,6 @@ extern "C" { ((n)->type == XML_ATTRIBUTE_NODE) || \ ((n)->type == XML_DOCUMENT_NODE) || \ ((n)->type == XML_HTML_DOCUMENT_NODE))) -#endif /* * Our own version of namespaced atributes lookup. diff --git a/xsltproc/xsltproc.c b/xsltproc/xsltproc.c index 7e4e777..8bd9992 100644 --- a/xsltproc/xsltproc.c +++ b/xsltproc/xsltproc.c @@ -34,9 +34,6 @@ #include #include #include -#ifdef LIBXML_DOCB_ENABLED -#include -#endif #ifdef LIBXML_XINCLUDE_ENABLED #include #endif @@ -94,9 +91,6 @@ static int timing = 0; static int dumpextensions = 0; static int novalid = 0; static int noout = 0; -#ifdef LIBXML_DOCB_ENABLED -static int docbook = 0; -#endif #ifdef LIBXML_HTML_ENABLED static int html = 0; #endif @@ -381,11 +375,6 @@ xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur, const char *filename) { doc = htmlParseFile(filename, NULL); else #endif -#ifdef LIBXML_DOCB_ENABLED - if (docbook) - doc = docbParseFile(filename, NULL); - else -#endif doc = xmlParseFile(filename); } } @@ -489,9 +478,6 @@ static void usage(const char *name) { #ifdef LIBXML_HTML_ENABLED printf("\t--html: the input document is(are) an HTML file(s)\n"); #endif -#ifdef LIBXML_DOCB_ENABLED - printf("\t--docbook: the input document is SGML docbook\n"); -#endif printf("\t--param name value : pass a (parameter,value) pair\n"); printf("\t value is an UTF8 XPath expression.\n"); printf("\t string values must be quoted like \"'string'\"\n or"); @@ -586,11 +572,6 @@ main(int argc, char **argv) } else if ((!strcmp(argv[i], "-noout")) || (!strcmp(argv[i], "--noout"))) { noout++; -#ifdef LIBXML_DOCB_ENABLED - } else if ((!strcmp(argv[i], "-docbook")) || - (!strcmp(argv[i], "--docbook"))) { - docbook++; -#endif #ifdef LIBXML_HTML_ENABLED } else if ((!strcmp(argv[i], "-html")) || (!strcmp(argv[i], "--html"))) { @@ -810,11 +791,6 @@ main(int argc, char **argv) doc = htmlParseFile(argv[i], NULL); else #endif -#ifdef LIBXML_DOCB_ENABLED - if (docbook) - doc = docbParseFile(argv[i], NULL); - else -#endif doc = xmlParseFile(argv[i]); if (doc == NULL) { fprintf(stderr, "unable to parse %s\n", argv[i]); -- 2.7.4