From 437b87b8cc1970608f7172a98187f2a2eb04179a Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Mon, 3 Jan 2000 17:30:46 +0000 Subject: [PATCH] fixed configure and Makefile to use readline in tester if available rebuilt and updated the doc, Daniel --- ChangeLog | 5 + Makefile.am | 2 +- config.h.in | 6 + configure.in | 10 + doc/html/gnome-xml-entities.html | 52 +-- doc/html/gnome-xml-htmlparser.html | 468 ++++++++++++++++++++++-- doc/html/gnome-xml-htmltree.html | 20 +- doc/html/gnome-xml-nanohttp.html | 22 +- doc/html/gnome-xml-parser.html | 336 ++++++++--------- doc/html/gnome-xml-parserinternals.html | 182 ++++----- doc/html/gnome-xml-tree.html | 441 +++++++++++----------- doc/html/gnome-xml-valid.html | 122 +++--- doc/html/gnome-xml-xml-error.html | 22 +- doc/html/gnome-xml-xmlmemory.html | 40 +- doc/html/gnome-xml-xpath.html | 44 +-- doc/html/index.sgml | 7 +- doc/xml.html | 11 +- 17 files changed, 1123 insertions(+), 667 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1dea5478..095b1148 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Jan 3 18:29:43 CET 2000 Daniel Veillard + + * configure.in, Makefile.am: link tester against readline + * doc/xml.html doc/*/*: updated and rebuilt the documentation pages + Mon Jan 3 11:58:05 CET 2000 Daniel Veillard * tree.[ch]: added xmlRemoveProp diff --git a/Makefile.am b/Makefile.am index ed0b2bbc..c6404e2a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -56,7 +56,7 @@ LDADDS = $(top_builddir)/libxml.la @Z_LIBS@ @M_LIBS@ tester_SOURCES=tester.c tester_LDFLAGS = tester_DEPENDENCIES = $(DEPS) -tester_LDADD= $(LDADDS) +tester_LDADD= @RDL_LIBS@ $(LDADDS) testSAX_SOURCES=testSAX.c testSAX_LDFLAGS = diff --git a/config.h.in b/config.h.in index 32c79e21..842670ba 100644 --- a/config.h.in +++ b/config.h.in @@ -130,12 +130,18 @@ /* Define if you have the header file. */ #undef HAVE_ZLIB_H +/* Define if you have the history library (-lhistory). */ +#undef HAVE_LIBHISTORY + /* Define if you have the inet library (-linet). */ #undef HAVE_LIBINET /* Define if you have the nsl library (-lnsl). */ #undef HAVE_LIBNSL +/* Define if you have the readline library (-lreadline). */ +#undef HAVE_LIBREADLINE + /* Define if you have the socket library (-lsocket). */ #undef HAVE_LIBSOCKET diff --git a/configure.in b/configure.in index 59ef481d..51d84185 100644 --- a/configure.in +++ b/configure.in @@ -130,6 +130,15 @@ if test "$with_buffers" = "yes" ; then XML_CFLAGS="${XML_CFLAGS} -DXML_USE_BUFFER_CONTENT" fi +dnl +dnl Tester makes use of readline if present +dnl +RDL_LIBS="" +AC_CHECK_LIB(history, append_history, + RDL_LIBS="-lhistory"; AC_DEFINE(HAVE_LIBHISTORY)) +AC_CHECK_LIB(readline, readline, + RDL_LIBS="-lreadline ${RDL_LIBS}"; AC_DEFINE(HAVE_LIBREADLINE)) + AC_SUBST(CFLAGS) AC_SUBST(XML_CFLAGS) @@ -142,5 +151,6 @@ AC_SUBST(HAVE_ISINF) AC_SUBST(Z_LIBS) AC_SUBST(M_LIBS) +AC_SUBST(RDL_LIBS) AC_OUTPUT(libxml.spec Makefile doc/Makefile example/Makefile xml-config win32config.h) diff --git a/doc/html/gnome-xml-entities.html b/doc/html/gnome-xml-entities.html index 71e233fe..3a2d8e55 100644 --- a/doc/html/gnome-xml-entities.html +++ b/doc/html/gnome-xml-entities.html @@ -115,7 +115,7 @@ SIZE="3" >

Name

Synopsis

Description

Details






















Name

Synopsis

htmlParseFile (const char *filename, - const char *encoding);htmlFreeParserCtxt (htmlParserCtxtPtr ctxt); +htmlParserCtxtPtr htmlCreatePushParserCtxt (htmlSAXHandlerPtr sax, + void *user_data, + const char *chunk, + int size, + const char *filename, + xmlCharEncoding enc); +int htmlParseChunk (htmlParserCtxtPtr ctxt, + const char *chunk, + int size, + int terminate);

Description

Details





















htmlFreeParserCtxt ()

void        htmlFreeParserCtxt              (htmlParserCtxtPtr ctxt);

Free all the memory used by a parser context. However the parsed +document in ctxt->myDoc is not freed.

ctxt : an HTML parser context


htmlCreatePushParserCtxt ()

htmlParserCtxtPtr htmlCreatePushParserCtxt  (htmlSAXHandlerPtr sax,
+                                             void *user_data,
+                                             const char *chunk,
+                                             int size,
+                                             const char *filename,
+                                             xmlCharEncoding enc);

Create a parser context for using the HTML parser in push mode +To allow content encoding detection, size should be >= 4 +The value of filename is used for fetching external entities +and error/warning reports.

sax : a SAX handler
user_data : The user data returned on SAX callbacks
chunk : a pointer to an array of chars
size : number of chars in the array
filename : an optional file name or URI
enc : an optional encoding
Returns :the new parser context or NULL


htmlParseChunk ()

int         htmlParseChunk                  (htmlParserCtxtPtr ctxt,
+                                             const char *chunk,
+                                             int size,
+                                             int terminate);

Parse a Chunk of memory

ctxt : an XML parser context
chunk : an char array
size : the size in byte of the chunk
terminate : last chunk indicator
Returns :zero if no error, the xmlParserErrors otherwise.