From 3ea65e43f4d51e4572aadaffe4c09e0b5ed89efb Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Thu, 15 Feb 2001 16:43:15 +0000 Subject: [PATCH] one bug fix, preparing 0.2.0 release: - libxlst/functions.c: fixed ID generation - doc/xslt.html doc/html/*.html: updated/regenerated the doc Daniel --- ChangeLog | 5 + configure.in | 8 +- doc/html/libxslt-attributes.html | 40 +-- doc/html/libxslt-imports.html | 258 +++++++++++++-- doc/html/libxslt-keys.html | 103 +++--- doc/html/libxslt-namespaces.html | 42 +-- doc/html/libxslt-numbersinternals.html | 12 +- doc/html/libxslt-pattern.html | 572 +++++++++++++++++++++++++++++++-- doc/html/libxslt-templates.html | 24 +- doc/html/libxslt-transform.html | 49 ++- doc/html/libxslt-variables.html | 56 ++-- doc/html/libxslt-xsltinternals.html | 212 ++++++++---- doc/html/libxslt-xsltutils.html | 533 +++++++++++++++++++++++++++--- doc/xslt.html | 40 +++ libxslt.spec.in | 4 +- libxslt/functions.c | 2 +- 16 files changed, 1642 insertions(+), 318 deletions(-) diff --git a/ChangeLog b/ChangeLog index f2d4832..3478012 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Feb 15 17:40:28 CET 2001 Daniel Veillard + + * libxlst/functions.c: fixed ID generation + * doc/xslt.html doc/html/*.html: updated/regenerated the doc + Thu Feb 15 13:34:42 CET 2001 Daniel Veillard * libxslt/numbers.c: removed a couple of memleaks diff --git a/configure.in b/configure.in index 21abad4..3fd7f6d 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ AC_INIT(libxslt/xslt.c) -VERSION=0.1.0 +VERSION=0.2.0 PACKAGE=libxslt AM_CONFIG_HEADER(config.h) @@ -95,7 +95,7 @@ dnl dnl find libxml dnl XML_CONFIG="xml2-config" -AC_MSG_CHECKING(for libxml libraries >= 2.3.0) +AC_MSG_CHECKING(for libxml libraries >= 2.3.1) if test "x$LIBXML_PREFIX" != "x" then if ${LIBXML_PREFIX}/bin/xml2-config --libs print > /dev/null 2>&1 @@ -112,13 +112,13 @@ dnl if test "x$XML_CONFIG" != "x" then vers=`$XML_CONFIG --version | sed -e 's/libxml //' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` - if test "$vers" -ge 2003000 + if test "$vers" -ge 2003001 then LIBXML_LIBS="`$XML_CONFIG --libs`" LIBXML_CFLAGS="`$XML_CONFIG --cflags`" AC_MSG_RESULT(found) else - AC_MSG_ERROR(You need at least libxml 2.3.0 for this version of libxml) + AC_MSG_ERROR(You need at least libxml 2.3.1 for this version of libxslt) fi else AC_MSG_ERROR(Could not find libxml2 anywhere.) diff --git a/doc/html/libxslt-attributes.html b/doc/html/libxslt-attributes.html index d0e49ab..e6949e2 100644 --- a/doc/html/libxslt-attributes.html +++ b/doc/html/libxslt-attributes.html @@ -121,7 +121,7 @@ NAME="LIBXSLT-ATTRIBUTES" >

Name

Synopsis

xsltParseStylesheetAttributeSet (xsltStylesheetPtr (xsltStylesheetPtr style, xsltFreeAttributeSetsHashes (xsltStylesheetPtr (xsltStylesheetPtr style); void

Description

Details

void        xsltParseStylesheetAttributeSet (xsltStylesheetPtrvoid        xsltParseStylesheetAttributeSet (xsltStylesheetPtr style,
                                              
void        xsltFreeAttributeSetsHashes     (xsltStylesheetPtrvoid        xsltFreeAttributeSetsHashes     (xsltStylesheetPtr style);
Name
Synopsis

 
+#define     XSLT_GET_IMPORT_PTR             (res, style, name)
+#define     XSLT_GET_IMPORT_INT             (res, style, name)
 void        xsltParseStylesheetImport       (xsltStylesheetPtr       (xsltStylesheetPtr style,
                                              xsltParseStylesheetInclude      (xsltStylesheetPtr      (xsltStylesheetPtr style,
                                              xmlNodePtr cur);
-xsltStylesheetPtrxsltStylesheetPtr xsltNextImport            (xsltStylesheetPtr            (xsltStylesheetPtr style);
 int         
Description
Details
XSLT_GET_IMPORT_PTR()
#define     XSLT_GET_IMPORT_PTR(res, style, name)
res : 
style : 
name :
XSLT_GET_IMPORT_INT()
#define     XSLT_GET_IMPORT_INT(res, style, name)
res : 
style : 
name :
void        xsltParseStylesheetImport       (xsltStylesheetPtrvoid        xsltParseStylesheetImport       (xsltStylesheetPtr style,
                                              
void        xsltParseStylesheetInclude      (xsltStylesheetPtrvoid        xsltParseStylesheetInclude      (xsltStylesheetPtr style,
                                              
xsltStylesheetPtr xsltNextImport            (xsltStylesheetPtrxsltStylesheetPtr xsltNextImport            (xsltStylesheetPtr style);
Name
Synopsis
xsltAddKey                      (xsltStylesheetPtr                      (xsltStylesheetPtr style,
                                              const                 (xsltTransformContextPtr ctxt);
+> ctxt,
+                                             xsltDocumentPtr doc);
 void        xsltFreeKeys                    (xsltStylesheetPtr                    (xsltStylesheetPtr style);
 void        xsltFreeCtxtKeys                (xsltTransformContextPtr ctxt);
xsltFreeDocumentKeys            (xsltDocumentPtr doc);
Description
Details
int         xsltAddKey                      (xsltStylesheetPtrint         xsltAddKey                      (xsltStylesheetPtr style,
                                              const 
void        xsltInitCtxtKeys                (xsltTransformContextPtr ctxt);
 ctxt,
+                                             xsltDocumentPtr doc);
an XSLT transformation context an XSLT transformation contextdoc : an XSLT document

void        xsltFreeKeys                    (xsltStylesheetPtrvoid        xsltFreeKeys                    (xsltStylesheetPtr style);

xsltFreeCtxtKeys ()

xsltFreeDocumentKeys ()

void        xsltFreeCtxtKeys                (xsltTransformContextPtr ctxt);
void xsltFreeDocumentKeys (xsltDocumentPtr doc);

Free up all the space used by the key tables

ctxtdoc : an XSLT transformation context

Name

Synopsis

xsltNamespaceAlias (xsltStylesheetPtr (xsltStylesheetPtr style, xsltFreeNamespaceAliasHashes (xsltStylesheetPtr (xsltStylesheetPtr style);

Description

Details

void        xsltNamespaceAlias              (xsltStylesheetPtrvoid        xsltNamespaceAlias              (xsltStylesheetPtr style,
                                              
void        xsltFreeNamespaceAliasHashes    (xsltStylesheetPtrvoid        xsltFreeNamespaceAliasHashes    (xsltStylesheetPtr style);
Name
Synopsis
Description
Details

 
+struct      xsltCompMatch;
+typedef     xsltCompMatchPtr;
+xsltCompMatchPtr xsltCompilePattern         (const xmlChar *pattern);
+void        xsltFreeCompMatchList           (xsltCompMatchPtr comp);
+int         xsltTestCompMatchList           (xsltTransformContextPtr ctxt,
+                                             xmlNodePtr node,
+                                             xsltCompMatchPtr comp);
 int         xsltAddTemplate                 (xsltStylesheetPtr                 (xsltStylesheetPtr style,
                                              xmlNodePtr node);
+> node,
+                                             xsltStylesheetPtr style);
 void        xsltFreeTemplateHashes          (xsltStylesheetPtr style);
(xsltStylesheetPtr style); +int xsltMatchPattern (xsltTransformContextPtr ctxt, + xmlNodePtr node, + const xmlChar *pattern);

Description

Details

struct xsltCompMatch

struct xsltCompMatch;

xsltCompMatchPtr

typedef xsltCompMatch *xsltCompMatchPtr;

xsltCompilePattern ()

xsltCompMatchPtr xsltCompilePattern         (const xmlChar *pattern);

Compile the XSLT pattern and generates a list of precompiled form suitable +for fast matching.

[1] Pattern ::= LocationPathPattern | Pattern '|' LocationPathPattern

pattern : 
Returns :the generated pattern list or NULL in case of failure

xsltFreeCompMatchList ()

void        xsltFreeCompMatchList           (xsltCompMatchPtr comp);

Free up the memory allocated by all the elements of comp

comp : an XSLT comp list

xsltTestCompMatchList ()

int         xsltTestCompMatchList           (xsltTransformContextPtr ctxt,
+                                             xmlNodePtr node,
+                                             xsltCompMatchPtr comp);

Test wether the node matches one of the patterns in the list

ctxt : a XSLT process context
node : a node
comp : the precompiled pattern list
Returns :1 if it matches, 0 if it doesn't and -1 in case of failure

int         xsltAddTemplate                 (xsltStylesheetPtrint         xsltAddTemplate                 (xsltStylesheetPtr style,
                                              
xmlNodePtr node);
node, + xsltStylesheetPtr style);

Finds the template applying to this node

Finds the template applying to this node, if style is non-NULL +it means one need to look for the next imported template in scope.

xsltMatchPattern ()

int         xsltMatchPattern                (xsltTransformContextPtr ctxt,
+                                             xmlNodePtr node,
+                                             const xmlChar *pattern);

Determine if a node matches a pattern.

ctxt : 
node : a node in the source tree
pattern : an XSLT pattern
Returns :

Name

Synopsis

Description

Details

Name

Synopsis

xsltApplyStylesheet (xsltStylesheetPtr (xsltStylesheetPtr style, xmlNodePtr node, + xsltTemplatePtr templ, xmlNodePtr

Description

Details

xmlDocPtr xsltApplyStylesheet (xsltStylesheetPtr xsltApplyStylesheet (xsltStylesheetPtr style,

xmlNodePtr node, + xsltTemplatePtr templ, xmlNodePtrtempl : the templatelist :

Name

Synopsis

xsltParseGlobalVariable (xsltStylesheetPtr (xsltStylesheetPtr style, xsltParseGlobalParam (xsltStylesheetPtr (xsltStylesheetPtr style,

Description

Details

void        xsltParseGlobalVariable         (xsltStylesheetPtrvoid        xsltParseGlobalVariable         (xsltStylesheetPtr style,
                                              
void        xsltParseGlobalParam            (xsltStylesheetPtrvoid        xsltParseGlobalParam            (xsltStylesheetPtr style,
                                              
Name
Synopsis
xsltDecimalFormat;
+struct      xsltStylesheet;
+typedef     xsltStylesheetPtr;
 enum        xsltOutputTypeCHECK_STOPPED0
-xsltStylesheetPtrxsltStylesheetPtr xsltParseStylesheetFilexsltFreeStylesheet              (xsltStylesheetPtr              (xsltStylesheetPtr sheet);
 int         xsltDecimalFormatGetByName
-                                            (xsltStylesheetPtrxsltStylesheetPtr sheet,
                                              xmlChar *name);
-xsltStylesheetPtrxsltStylesheetPtr xsltParseStylesheetProcess
-                                            (xsltStylesheetPtrxsltStylesheetPtr ret,
                                              xmlDocPtr doc);
-xsltStylesheetPtrxsltStylesheetPtr xsltParseStylesheetDoc
Description
Details
struct xsltTemplate {
     struct _xsltTemplate *next;/* chained list sorted by priority */
+    struct _xsltStylesheet *style;/* the containing stylesheet */
     xmlChar *match;	/* the matching string */
     int priority;	/* as given from the stylesheet, not computed */
     xmlChar *name;	/* the local part of the name QName */
@@ -446,7 +455,7 @@ CLASS="PROGRAMLISTING"
 >
struct xsltStylesheet
xsltDecimalFormatPtr xsltDecimalFormatGetByName
-                                            (xsltStylesheetPtrxsltStylesheetPtr sheet,
                                              
struct xsltStylesheet {
     /*
      * The stylesheet import relation is kept as a tree
      */
@@ -520,6 +559,8 @@ struct _xsltStylesheet {
     struct _xsltStylesheet *next;
     struct _xsltStylesheet *imports;
 
+    xsltDocumentPtr docList;		/* the include document list */
+
     /*
      * General data on the style sheet document
      */
@@ -588,7 +629,33 @@ struct _xsltStylesheet {
 >
xsltStylesheetPtr
typedef xsltStylesheet *xsltStylesheetPtr;
xsltStylesheetPtrxsltStylesheetPtr xsltParseStylesheetFile   (const xmlChar
void        xsltFreeStylesheet              (xsltStylesheetPtrvoid        xsltFreeStylesheet              (xsltStylesheetPtr sheet);
xsltStylesheetPtrxsltStylesheetPtr xsltParseStylesheetProcess
-                                            (xsltStylesheetPtrxsltStylesheetPtr ret,
                                              
xsltStylesheetPtrxsltStylesheetPtr xsltParseStylesheetDoc    (xmlDocPtr
Name
Synopsis
xmlChar *value);
+xmlNodePtr  xmlXPathNextPreceding           (xmlXPathParserContextPtr ctxt,
+                                             xmlNodePtr cur);
+xmlNodePtr  xmlXPathNextAncestor            (xmlXPathParserContextPtr ctxt,
+                                             xmlNodePtr cur);
+xmlNodePtr  xmlXPathNextPrecedingSibling    (xmlXPathParserContextPtr ctxt,
+                                             xmlNodePtr cur);
 #define     TODOxmlDocPtr result,
-                                             xsltStylesheetPtrxsltStylesheetPtr style);
 int         xmlDocPtr result,
-                                             xsltStylesheetPtrxsltStylesheetPtr style,
                                              int compression);
 int         xmlDocPtr result,
-                                             xsltStylesheetPtrxsltStylesheetPtr style);
 int         xmlDocPtr result,
+                                             xsltStylesheetPtr style);
+void        xsltDebug                       (xsltTransformContextPtr ctxt,
                                              xsltStylesheetPtr style);
xmlNodePtr node);
Description
Details
xmlXPathNextPreceding ()
xmlNodePtr  xmlXPathNextPreceding           (xmlXPathParserContextPtr ctxt,
+                                             xmlNodePtr cur);
ctxt : 
cur : 
Returns :
xmlXPathNextAncestor ()
xmlNodePtr  xmlXPathNextAncestor            (xmlXPathParserContextPtr ctxt,
+                                             xmlNodePtr cur);
ctxt : 
cur : 
Returns :
xmlXPathNextPrecedingSibling ()
xmlNodePtr  xmlXPathNextPrecedingSibling    (xmlXPathParserContextPtr ctxt,
+                                             xmlNodePtr cur);
ctxt : 
cur : 
Returns :
xmlDocPtr result,
-                                             xsltStylesheetPtrxsltStylesheetPtr style,
                                              int compression);

xmlDocPtr result, - xsltStylesheetPtrxsltStylesheetPtr style);

xmlDocPtr result, - xsltStylesheetPtrxsltStylesheetPtr style);

xsltDebug ()

void        xsltDebug                       (xsltTransformContextPtr ctxt,
+                                             xmlNodePtr node);

Process an debug node

ctxt : an XSLT processing context
node : The current node

Changelog file for a really accurate description

+

0.2.0: Feb 15 2000

+
    +
  • second beta version, released at the same time as libxml2-2.3.1
    • +
  • getting close to feature completion, lot of bug fixes, some in the HTML + and XPath support of libxml
    • +
  • start becoming usable for real work. This version can now regenerate the + XML 2e HTML from the original XML sources and the associated stylesheets + (in section I of the + XML REC)
    • +
  • Still misses extension element/function/prefixes support. Support of + key() and document() is not complete
    • +
+ +

0.1.0: Feb 8 2000

+
    +
  • first beta version, released at the same time as libxml2-2.3.0
    • +
  • lots of bug fixes, first "testing" version, but incomplete
    • +
+

0.0.1: Jan 25 2000

  • first alpha version released at the same time as libxml2-2.2.12
    • @@ -162,7 +181,28 @@ the processing is redirected on the standard output.

    @@TODO

    +

    check the generated pages and the source of +xsltproc.c, basically done in a few steps:

    +
      +
    1. configure the parser for XSLT: +

      xmlSubstituteEntitiesDefault(1);

      +

      xmlLoadExtDtdDefaultValue = 1;

      +
      2. +
    2. parse the stylesheet with xsltParseStylesheetFile()
      3. +
    3. parse the document with xmlParseFile()
      4. +
    4. apply the stylesheet using xsltApplyStylesheet()
      5. +
    5. save the result using xsltSaveResultToFile() if needed set + xmlIndentTreeOutput to 1
      6. +
    + +

    Steps 2,3, and 5 will probably need to be changed depending on you +processing needs and environment for example if reading/saving from/to +memory

    +

    Contributions

    +
      +
    • Bjorn Reese is the author of the number support
      • +

    diff --git a/libxslt.spec.in b/libxslt.spec.in index 26fa837..41c133b 100644 --- a/libxslt.spec.in +++ b/libxslt.spec.in @@ -10,7 +10,7 @@ Copyright: LGPL Group: Development/Libraries Source: ftp://xmlsoft.org/XSLT/libxslt-%{ver}.tar.gz BuildRoot: /var/tmp/libxslt-%{PACKAGE_VERSION}-root -Requires: libxml2 >= 2.3.0 +Requires: libxml2 >= 2.3.1 URL: http://xmlsoft.org/ Docdir: %{prefix}/doc @@ -25,7 +25,7 @@ installed. Summary: Libraries, includes, etc. to develop XML and HTML applications Group: Development/Libraries Requires: libxslt = %{version} -Requires: libxml2-devel >= 2.3.0 +Requires: libxml2-devel >= 2.3.1 %description devel This C library allows to transform XML files into other XML files diff --git a/libxslt/functions.c b/libxslt/functions.c index e593e49..0a3fd03 100644 --- a/libxslt/functions.c +++ b/libxslt/functions.c @@ -348,7 +348,7 @@ xsltGenerateIdFunction(xmlXPathParserContextPtr ctxt, int nargs){ val = (unsigned long)((char *)cur - (char *)0); val /= sizeof(xmlNode); val |= 0xFFFFFF; - sprintf((char *)str, "id%10ld", val); + sprintf((char *)str, "id%ld", val); valuePush(ctxt, xmlXPathNewString(str)); } -- 2.7.4