diff --git a/ChangeLog b/ChangeLog index e1cb5ed8..c96bb897 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Tue Nov 26 16:02:38 CET 2002 Daniel Veillard + + * doc/Makefile.am doc/parsedecl.py: fixed the API generation + scripts. + * doc/libxslt-api.xml doc/libxslt-refs.xml: regenerated + * doc/html/*.html: updated too + * python/libxsltclass.txt: updated too + Tue Nov 26 15:17:13 CET 2002 Daniel Veillard * libxslt/xsltutils.c libxslt/xsltutils.h: added the function diff --git a/doc/Makefile.am b/doc/Makefile.am index 8bde6e6e..912e3fe5 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -51,12 +51,10 @@ html: if ! test -d html ; then mkdir html ; fi -cd html && gtkdoc-mkhtml libxslt ../$(DOC_MAIN_SGML_FILE) -xml: sgml +xml: sgml if test -d xml ; then rm xml/* ; else mkdir xml ; fi -@(for s in sgml/*.sgml ; do name=`basename $$s .sgml` ; \ - echo ' ]>' > \ - xml/"$$name".xml ;\ - grep -v "^> xml/"$$name".xml ; done) + xmllint --sgml $$s > xml/"$$name".xml ; done) libxslt-api.xml libxslt-refs.xml: xml parsedecl.py libxslt-decl.txt libxslt-decl-list.txt -(./parsedecl.py) diff --git a/doc/html/book1.html b/doc/html/book1.html index aab79ffd..6b3ce9fa 100644 --- a/doc/html/book1.html +++ b/doc/html/book1.html @@ -46,7 +46,9 @@ NAME="AEN2" >

Daniel Veillard

Daniel Veillard

This manual documents the interfaces of the libxslt @@ -77,7 +81,9 @@ NAME="AEN18">

Permission is granted to make and distribute verbatim diff --git a/doc/html/index.sgml b/doc/html/index.sgml index 4eeca54f..5a747f9f 100644 --- a/doc/html/index.sgml +++ b/doc/html/index.sgml @@ -79,6 +79,7 @@ + @@ -94,6 +95,7 @@ + diff --git a/doc/html/libxslt-attributes.html b/doc/html/libxslt-attributes.html index 83cc9661..f5fe3fa9 100644 --- a/doc/html/libxslt-attributes.html +++ b/doc/html/libxslt-attributes.html @@ -117,11 +117,13 @@ SIZE="3" >

attributes

attributes

Name

Synopsis

Description

Details

extensions

extensions

Name

Synopsis

Description

Details

functions

functions

Synopsis

document() XSLT function -node-set document(object, node-set?)

key() XSLT function -node-set key(string, object)

uri() XSLT function -string unparsed-entity-uri(string)

number() XSLT function -string format-number(number, string, string?)

id() XSLT function -string generate-id(node-set?)

property() XSLT function -object system-property(string)

available() XSLT function -boolean element-available(string)

available() XSLT function -boolean function-available(string)

imports

imports

Name

Synopsis

Description

Details

1 if space should be stripped, 0 if not, and 2 if everything -should be CDTATA wrapped.

keys

keys

Name

Synopsis

Description

Details

Libxslt Library Reference

Libxslt Library Reference

namespaces

namespaces

Name

Synopsis

Description

Details

Libxml Programming Notes

Libxml Programming Notes

Libxml is an XSLT toolkit library, it allows to transform XML documents. It uses the XML parser, tree and XPath functionnalities diff --git a/doc/html/libxslt-pattern.html b/doc/html/libxslt-pattern.html index 5b5495b4..d4b888d3 100644 --- a/doc/html/libxslt-pattern.html +++ b/doc/html/libxslt-pattern.html @@ -117,7 +117,9 @@ SIZE="3" >

pattern

pattern

Synopsis

templates

templates

Synopsis

the computed string value or NULL, must be deallocated by the -caller.

the computed string value or NULL, must be deallocated by the -caller.

the static string value or NULL, must be deallocated by the -caller.

the computed string value or NULL, must be deallocated by the -caller.

the computed string value or NULL, must be deallocated by the -caller.

the computed string value or NULL, must be deallocated by the -caller.

the computed string value or NULL, must be deallocated by the -caller.

transform

transform

Synopsis

NOTE: This may lead to a non-wellformed output XML wise ! NOTE: This may also result in multiple files being generated NOTE: using IObuf, the result encoding used will be the one used for -creating the output buffer, use the following macro to read it -from the stylesheet -XSLT_GET_IMPORT_PTR(encoding, style, encoding) + creating the output buffer, use the following macro to read it + from the stylesheet + XSLT_GET_IMPORT_PTR(encoding, style, encoding) NOTE: using SAX, any encoding specified in the stylesheet will be lost -since the interface uses only UTF8

the number of by written to the main resource or -1 in case of -error.
NOTE: This may lead to a non-wellformed output XML wise ! NOTE: This may also result in multiple files being generated NOTE: using IObuf, the result encoding used will be the one used for -creating the output buffer, use the following macro to read it -from the stylesheet -XSLT_GET_IMPORT_PTR(encoding, style, encoding) + creating the output buffer, use the following macro to read it + from the stylesheet + XSLT_GET_IMPORT_PTR(encoding, style, encoding) NOTE: using SAX, any encoding specified in the stylesheet will be lost -since the interface uses only UTF8

the number of by written to the main resource or -1 in case of -error.

If either cur or node are a breakpoint, or xslDebugStatus in state -where debugging must occcur at this time then transfer control -to the xslDebugBreak function

variables

variables

Name

Synopsis

Description

Details

xslt

xslt

Synopsis

xsltInternals

xsltInternals

Name

Synopsis

Description

Details

Structure:

pattern := subpattern{;subpattern} -subpattern := {prefix}integer{.fraction}{suffix} -prefix := '\\u0000'..'\\uFFFD' - specialCharacters -suffix := '\\u0000'..'\\uFFFD' - specialCharacters -integer := '#'* '0'* '0' -fraction := '0'* '#'*

pattern := subpattern{;subpattern} + subpattern := {prefix}integer{.fraction}{suffix} + prefix := '\\u0000'..'\\uFFFD' - specialCharacters + suffix := '\\u0000'..'\\uFFFD' - specialCharacters + integer := '#'* '0'* '0' + fraction := '0'* '#'*

Notation: -X* 0 or more instances of X -(X | Y) either X or Y. -X..Y any character from X up to Y, inclusive. -S - T characters in S, except those in T

Notation: + X* 0 or more instances of X + (X | Y) either X or Y. + X..Y any character from X up to Y, inclusive. + S - T characters in S, except those in T

Special Characters:

Symbol Meaning -0 a digit -# a digit, zero shows as absent -. placeholder for decimal separator -, placeholder for grouping separator. -; separates formats. -- default negative prefix. -% multiply by 100 and show as percentage -? multiply by 1000 and show as per mille -X any other characters can be used in the prefix or suffix -' used to quote special characters in a prefix or suffix.

Symbol Meaning + 0 a digit + # a digit, zero shows as absent + . placeholder for decimal separator + , placeholder for grouping separator. + ; separates formats. + - default negative prefix. + % multiply by 100 and show as percentage + ? multiply by 1000 and show as per mille + X any other characters can be used in the prefix or suffix + ' used to quote special characters in a prefix or suffix.

xsltutils

xsltutils

Synopsis

xmlChar *nameSpace); +int xsltGetUTF8Char (unsigned char *utf, + int *len); void xsltPrintErrorContextFILE *output); xmlDocPtrxsltGetProfileInformation (xsltTransformContextPtr ctxt); +longxsltCalibrateAdjust (long delta); +HREF="LONG-DELTA" +>long delta); #define XSLT_TIMESTAMP_TICS_PER_SEC

Description

Details

the attribute value or NULL if not found. -It's up to the caller to free the memory.

xsltGetUTF8Char ()

int         xsltGetUTF8Char                 (unsigned char *utf,
+                                             int *len);

Read one UTF8 Char from utf +Function copied from libxml2 xmlGetUTF8Char() ... to discard ultimately +and use the original API

utf : a sequence of UTF-8 encoded bytes
len : a pointer to bytes len
Returns :the char value or -1 in case of error and update len with the + number of bytes used

to NULL.

NOTE: the namespace returned is a pointer to the place where it is -defined and hence has the same lifespan as the document holding it.

name is -not prefixed.

xsltGetProfileInformation ()

xmlDocPtr   xsltGetProfileInformation       (xsltTransformContextPtr ctxt);

This function should be called after the transformation completed +to extract template processing profiling informations if availble. +The informations are returned as an XML document tree like +<?xml version="1.0"?> +<profile> +<template rank="1" match="*" name="" + mode="" calls="6" time="48" average="8"/> +<template rank="2" match="item2|item3" name="" + mode="" calls="10" time="30" average="3"/> +<template rank="3" match="item1" name="" + mode="" calls="5" time="17" average="3"/> +</profile> +The caller will need to free up the returned tree with xmlFreeDoc()

ctxt : a transformation context
Returns :the xmlDocPtr corresponding to the result or NULL if not available.

void        xsltCalibrateAdjust             (long delta);
long delta);

deltaParam1 : 
a negative dealy value found

: 1 on sucess 0 otherwise an error may be printed if -WITH_XSLT_DEBUG_BREAKPOINTS is defined

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -44,80 +49,91 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -167,6 +183,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -179,143 +249,76 @@ - - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -339,12 +342,16 @@ Checks that the element pertains to XSLT namespace. + Checks the value of an element in XSLT namespace. + + Check that a node is a 'real' one: document, element, text or attribute. + the version string like "1.2.3" @@ -406,9 +413,15 @@ A macro to import intergers from the stylesheet cascading order. + + + A macro to import pointers from the stylesheet cascading order. + + + This is the libxslt namespace for specific extensions. @@ -419,6 +432,9 @@ The XSLT specification namespace. + + should be activated in the existing libc library lacks some of the string formatting function, in that case reuse the Trio ones already compiled in the libxml2 library. + This is Norm's namespace for SAXON extensions. @@ -430,15 +446,23 @@ Registering macro, not general purpose at all but used in different modules. + Registering macro, not general purpose at all but used in different modules. + + + + + + + This is Michael Kay's Saxon processor namespace for extensions. @@ -614,7 +638,7 @@ Used for to correct the calibration for xsltTimestamp() - + Process the xslt call-template node on the source node @@ -631,14 +655,14 @@ - Check if the resource is allowed to be read + Check if the resource is allowed to be read Return 1 if read is allowed, 0 if not and -1 in case or error. - Check if the resource is allowed to be written, if necessary makes some preliminary work like creating directories + Check if the resource is allowed to be written, if necessary makes some preliminary work like creating directories Return 1 if write is allowed, 0 if not and -1 in case or error. @@ -669,10 +693,10 @@ - + - Compile the XSLT pattern and generates a list of precompiled form suitable for fast matching. + Compile the XSLT pattern and generates a list of precompiled form suitable for fast matching. [1] Pattern ::= LocationPathPattern | Pattern '|' LocationPathPattern @@ -724,7 +748,7 @@ - + Find decimal-format by name @@ -739,7 +763,7 @@ - + Pre process an XSLT-1.1 document element @@ -770,7 +794,7 @@ - + Deallocates an xsltElemPreComp structure. @@ -805,7 +829,7 @@ - ctxt: the XSLT transformation context name: a null terminated string giving the name of the parameter value a null terminated string giving the XPath expression to be evaluated + ctxt: the XSLT transformation context name: a null terminated string giving the name of the parameter value a null terminated string giving the XPath expression to be evaluated This is normally called from xsltEvalUserParams to process a single parameter from a list of parameters. The value is evaluated as an XPath expression and the result is stored in the context's global variable/parameter hash table. To have a parameter treated literally (not as an XPath expression) use xsltQuoteUserParams (or xsltQuoteOneUserParam). For more details see description of xsltProcessOneUserParamInternal. @@ -828,7 +852,7 @@ - ctxt: the XSLT transformation context params: a NULL terminated array of parameters name/value tuples + ctxt: the XSLT transformation context params: a NULL terminated array of parameters name/value tuples Evaluate the global variables of a stylesheet. This needs to be done on parsed stylesheets before starting to apply transformations. Each of the parameters is evaluated as an XPath expression and stored in the global variables/parameter hash table. If you want your parameter used literally, use xsltQuoteUserParams. @@ -857,10 +881,10 @@ Looks up an extension element. ctxt can be NULL to search only in module elements. - - - - + + + + @@ -933,7 +957,7 @@ - format-number() uses the JDK 1.1 DecimalFormat class: + format-number() uses the JDK 1.1 DecimalFormat class: http://java.sun.com/products/jdk/1.1/docs/api/java.text.DecimalFormat.html Structure: pattern := subpattern{;subpattern} subpattern := {prefix}integer{.fraction}{suffix} prefix := '\\u0000'..'\\uFFFD' - specialCharacters suffix := '\\u0000'..'\\uFFFD' - specialCharacters integer := '#'* '0'* '0' fraction := '0'* '#'* Notation: X* 0 or more instances of X (X | Y) either X or Y. X..Y any character from X up to Y, inclusive. S - T characters in S, except those in T Special Characters: Symbol Meaning 0 a digit # a digit, zero shows as absent . placeholder for decimal separator , placeholder for grouping separator. ; separates formats. - default negative prefix. % multiply by 100 and show as percentage ? multiply by 1000 and show as per mille X any other characters can be used in the prefix or suffix ' used to quote special characters in a prefix or suffix. @@ -1033,7 +1057,7 @@ - Implement the node-set() XSLT function node-set node-set(result-tree) + Implement the node-set() XSLT function node-set node-set(result-tree) This function is available in libxslt, saxon or xt namespace. @@ -1070,15 +1094,20 @@ - Similar to xmlGetNsProp() but with a slightly different semantic + Similar to xmlGetNsProp() but with a slightly different semantic Search and get the value of an attribute associated to a node This attribute has to be anchored in the namespace specified, or has no namespace and the element is in that namespace. This does the entity substitution. This function looks in DTD attribute declaration for FIXED or default declaration values unless DTD use has been turned off. + + This function should be called after the transformation completed to extract template processing profiling informations if availble. The informations are returned as an XML document tree like <?xml version="1.0"?> <profile> <template rank="1" match="*" name="" mode="" calls="6" time="48" average="8"/> <template rank="2" match="item2|item3" name="" mode="" calls="10" time="30" average="3"/> <template rank="3" match="item1" name="" mode="" calls="5" time="17" average="3"/> </profile> The caller will need to free up the returned tree with xmlFreeDoc() + + + - This function analyzes name, if the name contains a prefix, the function seaches the associated namespace in scope for it. It will also replace name value with the NCName, the old value being freed. Errors in the prefix lookup are signalled by setting name to NULL. - + This function analyzes name, if the name contains a prefix, the function seaches the associated namespace in scope for it. It will also replace name value with the NCName, the old value being freed. Errors in the prefix lookup are signalled by setting name to NULL. NOTE: the namespace returned is a pointer to the place where it is defined and hence has the same lifespan as the document holding it. + @@ -1104,6 +1133,12 @@ + + Read one UTF8 Char from utf Function copied from libxml2 xmlGetUTF8Char() ... to discard ultimately and use the original API + + + + return the default state for XInclude processing @@ -1141,7 +1176,7 @@ - + Check if a string is ignorable @@ -1206,7 +1241,7 @@ Creates and initializes an xsltElemPreComp - + @@ -1271,7 +1306,7 @@ - parse an XSLT transformation param declaration, compute its value but doesn't record it. + parse an XSLT transformation param declaration, compute its value but doesn't record it. It returns the new xsltStackElemPtr or NULL @@ -1358,14 +1393,14 @@ - ctxt: the XSLT transformation context name: a null terminated string giving the name of the parameter value a null terminated string giving the parameter value + ctxt: the XSLT transformation context name: a null terminated string giving the name of the parameter value a null terminated string giving the parameter value This is normally called from xsltQuoteUserParams to process a single parameter from a list of parameters. The value is stored in the context's global variable/parameter hash table. - ctxt: the XSLT transformation context params: a NULL terminated arry of parameters names/values tuples + ctxt: the XSLT transformation context params: a NULL terminated arry of parameters names/values tuples Similar to xsltEvalUserParams, but the values are treated literally and are * *not* evaluated as XPath expressions. This should be done on parsed stylesheets before starting to apply transformations. @@ -1460,7 +1495,7 @@ - Apply the stylesheet to the document and generate the output according to output SAX and IObuf. It's an error to specify both SAX and IObuf. + Apply the stylesheet to the document and generate the output according to outputSAX and IObuf. It's an error to specify both SAX and IObuf. NOTE: This may lead to a non-wellformed output XML wise ! NOTE: This may also result in multiple files being generated NOTE: using IObuf, the result encoding used will be the one used for creating the output buffer, use the following macro to read it from the stylesheet XSLT_GET_IMPORT_PTR(encoding, style, encoding) NOTE: using SAX, any encoding specified in the stylesheet will be lost since the interface uses only UTF8 @@ -1470,7 +1505,7 @@ - Apply the stylesheet to the document and generate the output according to output SAX and IObuf. It's an error to specify both SAX and IObuf. + Apply the stylesheet to the document and generate the output according to outputSAX and IObuf. It's an error to specify both SAX and IObuf. NOTE: This may lead to a non-wellformed output XML wise ! NOTE: This may also result in multiple files being generated NOTE: using IObuf, the result encoding used will be the one used for creating the output buffer, use the following macro to read it from the stylesheet XSLT_GET_IMPORT_PTR(encoding, style, encoding) NOTE: using SAX, any encoding specified in the stylesheet will be lost since the interface uses only UTF8 @@ -1481,7 +1516,7 @@ - + Save the profiling informations on output @@ -1586,7 +1621,7 @@ - Function to reset the handler and the error context for out of context error messages specific to a given XSLT transromation. + Function to reset the handler and the error context for out of context error messages specific to a given XSLT transromation. This simply means that handler will be called for subsequent error messages while running the transformation. @@ -1636,7 +1671,7 @@ - + Precompute an XSLT stylesheet element @@ -1653,7 +1688,7 @@ - + Process the given node and return the new string value. diff --git a/doc/libxslt-decl.txt b/doc/libxslt-decl.txt index c0c26987..7d1547b6 100644 --- a/doc/libxslt-decl.txt +++ b/doc/libxslt-decl.txt @@ -1021,6 +1021,11 @@ xmlChar **doc_txt_ptr,int * doc_txt_len,xmlDocPtr result,xsltStylesheetPtr style xsltTransformContextPtr ctxt,FILE *output +xsltGetProfileInformation +xmlDocPtr +xsltTransformContextPtr ctxt + + xsltTimestamp long void diff --git a/doc/libxslt-refs.xml b/doc/libxslt-refs.xml index 0b75f217..87bb9011 100644 --- a/doc/libxslt-refs.xml +++ b/doc/libxslt-refs.xml @@ -1,21 +1,21 @@ - + - - + + - - - - + + + + - + @@ -24,6 +24,7 @@ + @@ -37,6 +38,8 @@ + + @@ -67,7 +70,6 @@ - @@ -76,19 +78,15 @@ - - - - @@ -102,7 +100,7 @@ - + @@ -141,10 +139,12 @@ + + @@ -169,7 +169,6 @@ - @@ -205,7 +204,6 @@ - @@ -216,8 +214,6 @@ - - @@ -230,30 +226,23 @@ - - - - - - - @@ -302,6 +291,7 @@ + @@ -316,6 +306,12 @@ + + + + + + @@ -347,7 +343,6 @@ - @@ -356,19 +351,15 @@ - - - - @@ -421,10 +412,12 @@ + + @@ -449,7 +442,6 @@ - @@ -485,7 +477,6 @@ - @@ -496,8 +487,6 @@ - - @@ -510,30 +499,23 @@ - - - - - - - @@ -577,6 +559,7 @@ + @@ -679,6 +662,9 @@ + + + @@ -768,6 +754,7 @@ + @@ -1201,6 +1188,7 @@ + @@ -1490,6 +1478,7 @@ + @@ -1501,6 +1490,7 @@ + @@ -1516,6 +1506,7 @@ + @@ -1541,6 +1532,9 @@ + + + @@ -1567,6 +1561,12 @@ + + + + + + @@ -1610,10 +1610,11 @@ + + + - - - + @@ -1639,6 +1640,9 @@ + + + @@ -1646,9 +1650,10 @@ + - + @@ -1662,6 +1667,9 @@ + + + @@ -1673,6 +1681,9 @@ + + + @@ -1692,6 +1703,7 @@ + @@ -1755,6 +1767,9 @@ + + + @@ -1782,6 +1797,9 @@ + + + @@ -1795,6 +1813,9 @@ + + + @@ -1802,6 +1823,9 @@ + + + @@ -1821,6 +1845,9 @@ + + + @@ -1867,6 +1894,7 @@ + @@ -1897,6 +1925,10 @@ + + + + @@ -1904,6 +1936,8 @@ + + @@ -1924,6 +1958,7 @@ + @@ -1942,6 +1977,10 @@ + + + + @@ -1952,48 +1991,29 @@ + + + + + + - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -2010,6 +2030,14 @@ + + + + + + + + @@ -2063,6 +2091,7 @@ + @@ -2076,6 +2105,7 @@ + @@ -2084,6 +2114,7 @@ + @@ -2096,11 +2127,18 @@ + + + + + + + @@ -2118,6 +2156,7 @@ + @@ -2134,13 +2173,16 @@ + - + + + @@ -2187,8 +2229,13 @@ + + + + + @@ -2200,12 +2247,21 @@ + + + + + + + + + @@ -2218,9 +2274,11 @@ + + @@ -2243,8 +2301,10 @@ + + @@ -2276,12 +2336,13 @@ + - + @@ -2325,10 +2386,18 @@ + + + + + + + + @@ -2338,10 +2407,13 @@ + + + @@ -2353,6 +2425,8 @@ + + @@ -2419,6 +2493,7 @@ + @@ -2429,6 +2504,7 @@ + @@ -2459,13 +2535,17 @@ + + + + @@ -2481,12 +2561,17 @@ + + + + + + - @@ -2500,6 +2585,15 @@ + + + + + + + + + @@ -2532,6 +2626,9 @@ + + + @@ -2543,6 +2640,7 @@ + @@ -2552,6 +2650,9 @@ + + + @@ -2578,13 +2679,13 @@ - + - + @@ -2615,6 +2716,9 @@ + + + @@ -2629,10 +2733,9 @@ - + + - - @@ -2640,6 +2743,8 @@ + + @@ -2675,10 +2780,12 @@ + + + - @@ -2689,7 +2796,6 @@ - @@ -2705,9 +2811,6 @@ - - - @@ -2726,10 +2829,11 @@ - + + @@ -2742,6 +2846,8 @@ + + @@ -2750,6 +2856,7 @@ + @@ -2760,26 +2867,38 @@ + + + - + + + + + + + + + + @@ -2789,12 +2908,16 @@ + + + + @@ -2805,8 +2928,10 @@ + + @@ -2815,11 +2940,10 @@ - - + @@ -2848,6 +2972,16 @@ + + + + + + + + + + @@ -2860,6 +2994,8 @@ + + @@ -2869,6 +3005,9 @@ + + + @@ -2877,6 +3016,7 @@ + @@ -2890,6 +3030,7 @@ + @@ -2897,9 +3038,10 @@ + - + @@ -2924,6 +3066,7 @@ + @@ -2965,6 +3108,10 @@ + + + + @@ -2978,6 +3125,10 @@ + + + + @@ -3000,11 +3151,14 @@ + + + + - @@ -3019,10 +3173,17 @@ + + + + + + + @@ -3034,9 +3195,15 @@ + + + + + + @@ -3049,6 +3216,8 @@ + + @@ -3080,6 +3249,7 @@ + @@ -3105,8 +3275,11 @@ + + + @@ -3114,6 +3287,9 @@ + + + @@ -3140,10 +3316,23 @@ + + + + + + + + + + + + + @@ -3153,6 +3342,12 @@ + + + + + + @@ -3161,7 +3356,7 @@ - + @@ -3170,7 +3365,7 @@ - + @@ -3186,9 +3381,7 @@ - - - + @@ -3199,10 +3392,14 @@ + + + + @@ -3220,7 +3417,6 @@ - @@ -3229,6 +3425,7 @@ + @@ -3260,6 +3457,9 @@ + + + @@ -3271,6 +3471,13 @@ + + + + + + + @@ -3285,6 +3492,12 @@ + + + + + + @@ -3303,11 +3516,17 @@ - - + + + + + + + + - + @@ -3326,6 +3545,9 @@ + + + @@ -3334,19 +3556,26 @@ + + + + + + + @@ -3355,14 +3584,23 @@ + + + + + + + + + @@ -3381,14 +3619,21 @@ + + + + + + + @@ -3408,11 +3653,20 @@ + + + + + + + + + @@ -3421,6 +3675,8 @@ + + @@ -3442,6 +3698,9 @@ + + + @@ -3453,11 +3712,14 @@ + + + @@ -3485,12 +3747,18 @@ + + + + + + @@ -3501,6 +3769,17 @@ + + + + + + + + + + + @@ -3518,6 +3797,9 @@ + + + @@ -3542,6 +3824,7 @@ + @@ -3559,10 +3842,11 @@ + - + @@ -3599,35 +3883,15 @@ + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -3658,6 +3922,7 @@ + @@ -3668,14 +3933,18 @@ + + + + @@ -3683,6 +3952,8 @@ + + @@ -3693,8 +3964,8 @@ + - @@ -3706,6 +3977,12 @@ + + + + + + @@ -3742,12 +4019,16 @@ + + + + - + @@ -3756,6 +4037,7 @@ + @@ -3764,8 +4046,10 @@ + + @@ -3799,16 +4083,18 @@ + - + + @@ -3836,19 +4122,26 @@ + - + - + + + + + + + @@ -3857,6 +4150,10 @@ + + + + @@ -3864,6 +4161,7 @@ + @@ -3893,6 +4191,7 @@ + @@ -3903,7 +4202,6 @@ - @@ -3913,7 +4211,6 @@ - @@ -3928,6 +4225,7 @@ + @@ -3956,7 +4254,7 @@ - + @@ -3972,6 +4270,7 @@ + @@ -3980,6 +4279,7 @@ + @@ -4003,6 +4303,7 @@ + @@ -4017,11 +4318,16 @@ + + + + + @@ -4050,14 +4356,24 @@ + + + + + + + + + + @@ -4141,9 +4457,13 @@ + + + + @@ -4183,6 +4503,14 @@ + + + + + + + + @@ -4202,17 +4530,24 @@ + + + - - + + + + + + @@ -4236,17 +4571,29 @@ + + + + + + + + + + + + + - @@ -4275,13 +4622,22 @@ + + + + + + + + + @@ -4294,10 +4650,17 @@ + + + + + + + @@ -4306,6 +4669,7 @@ + @@ -4332,6 +4696,12 @@ + + + + + + @@ -4343,6 +4713,9 @@ + + + @@ -4357,6 +4730,8 @@ + + @@ -4384,6 +4759,11 @@ + + + + + @@ -4405,17 +4785,12 @@ - - - - + - - @@ -4426,6 +4801,8 @@ + + @@ -4437,14 +4814,29 @@ + + + + + + + + + + + + + + + @@ -4478,12 +4870,18 @@ + + + + + + @@ -4494,7 +4892,14 @@ + + + + + + + @@ -4518,6 +4923,7 @@ + @@ -4544,6 +4950,7 @@ + @@ -4555,12 +4962,15 @@ + + + - + @@ -4572,6 +4982,7 @@ + @@ -4580,6 +4991,7 @@ + @@ -4588,6 +5000,9 @@ + + + @@ -4611,6 +5026,8 @@ + + @@ -4618,6 +5035,10 @@ + + + + @@ -4633,6 +5054,7 @@ + @@ -4657,10 +5079,17 @@ + + + - - + + + + + + @@ -4675,14 +5104,21 @@ + + + + + + + @@ -4693,9 +5129,11 @@ + - + + @@ -4703,7 +5141,10 @@ + + + @@ -4724,12 +5165,19 @@ + + + + + + + @@ -4743,6 +5191,7 @@ + @@ -4750,8 +5199,10 @@ + + @@ -4759,6 +5210,7 @@ + @@ -4777,12 +5229,20 @@ + + + + + + + + @@ -4808,6 +5268,7 @@ + @@ -4822,6 +5283,7 @@ + @@ -4831,14 +5293,20 @@ + + + + + + @@ -4846,7 +5314,9 @@ + + @@ -4864,6 +5334,9 @@ + + + @@ -4884,15 +5357,22 @@ + + + + + + + @@ -4944,12 +5424,30 @@ + + + + + + + + + + + + + + + + + + @@ -4972,22 +5470,31 @@ + + + + + + + - - - - - - - + + + + + + + + + diff --git a/doc/libxslt-sections.txt b/doc/libxslt-sections.txt index 9f0af957..d105252b 100644 --- a/doc/libxslt-sections.txt +++ b/doc/libxslt-sections.txt @@ -6,6 +6,7 @@ LIBXSLT_VERSION_STRING WITH_XSLT_DEBUG DEBUG_MEMORY DEBUG_MEMORY_LOCATION +XSLT_NEED_TRIO WITH_DEBUGGER ATTRIBUTE_UNUSED LIBXSLT_PUBLIC @@ -248,6 +249,7 @@ IS_XSLT_ELEM IS_XSLT_NAME IS_XSLT_REAL_NODE xsltGetNsProp +xsltGetUTF8Char xsltPrintErrorContext xsltMessage xsltSetGenericErrorFunc @@ -263,6 +265,7 @@ xsltSaveResultToFile xsltSaveResultToFd xsltSaveResultToString xsltSaveProfiling +xsltGetProfileInformation xsltTimestamp xsltCalibrateAdjust XSLT_TIMESTAMP_TICS_PER_SEC diff --git a/doc/parsedecl.py b/doc/parsedecl.py index 33b2fdb9..5d810b47 100755 --- a/doc/parsedecl.py +++ b/doc/parsedecl.py @@ -449,197 +449,98 @@ def insertComment(name, title, value, id): return "unknown" nbcomments = nbcomments + 1 - +import libxml2 import os -import xmllib -try: - import sgmlop -except ImportError: - sgmlop = None # accelerator not available - -debug = 0 - -if sgmlop: - class FastParser: - """sgmlop based XML parser. this is typically 15x faster - than SlowParser...""" - - def __init__(self, target): - - # setup callbacks - self.finish_starttag = target.start - self.finish_endtag = target.end - self.handle_data = target.data - - # activate parser - self.parser = sgmlop.XMLParser() - self.parser.register(self) - self.feed = self.parser.feed - self.entity = { - "amp": "&", "gt": ">", "lt": "<", - "apos": "'", "quot": '"' - } - - def close(self): - try: - self.parser.close() - finally: - self.parser = self.feed = None # nuke circular reference - - def handle_entityref(self, entity): - # entity - try: - self.handle_data(self.entity[entity]) - except KeyError: - self.handle_data("&%s;" % entity) - -else: - FastParser = None -class SlowParser(xmllib.XMLParser): - """slow but safe standard parser, based on the XML parser in - Python's standard library.""" +def analyzeXMLDescriptionRow(doc, desc, id, row): + if doc == None or desc == None or id == None or row == None: + return + ctxt = doc.xpathNewContext() + ctxt.setContextNode(row) + param = ctxt.xpathEval("entry[1]/parameter") + entries = ctxt.xpathEval("entry") + if param == []: + is_param = 0 + name = None + else: + name = param[0].content + is_param = 1 + str = entries[1].content + str = string.replace(str, '\n', ' ') + str = string.replace(str, '\r', ' ') + str = string.replace(str, ' ', ' ') + str = string.replace(str, ' ', ' ') + str = string.replace(str, ' ', ' ') + while len(str) >= 1 and str[0] == ' ': + str=str[1:] - def __init__(self, target): - self.unknown_starttag = target.start - self.handle_data = target.data - self.unknown_endtag = target.end - xmllib.XMLParser.__init__(self) + insertParameterComment(id, name, str, is_param) -def getparser(target = None): - # get the fastest available parser, and attach it to an - # unmarshalling object. return both objects. - if target == None: - target = docParser() - if FastParser: - return FastParser(target), target - return SlowParser(target), target -class docParser: - def __init__(self): - self._methodname = None - self._data = [] - self.id = None - self.title = None - self.descr = None - self.string = None - def close(self): - if debug: - print "close" +def analyzeXMLDescription(doc, desc): + if doc == None or desc == None: + return + ctxt = doc.xpathNewContext() + ctxt.setContextNode(desc) - def getmethodname(self): - return self._methodname + # + # get the function name + # + try: + title = ctxt.xpathEval("title")[0].content + except: + return + old_id = ctxt.xpathEval("string(title/anchor/@id)") + id = string.replace(title, '(', ' '); + id = string.replace(id, ')', ' '); + id = string.split(id) [0] - def data(self, text): - if debug: - print "data %s" % text - self._data.append(text) + # + # get the function comments + # + comment = "" + paras = ctxt.xpathEval("para") + for para in paras: + str = para.content + str = string.replace(str, '\n', ' ') + str = string.replace(str, '\r', ' ') + str = string.replace(str, ' ', ' ') + str = string.replace(str, ' ', ' ') + str = string.replace(str, ' ', ' ') + while len(str) >= 1 and str[0] == ' ': + str=str[1:] - def start(self, tag, attrs): - if debug: - print "start %s, %s" % (tag, attrs) - if tag == 'refsect2': - self.id = None - self.title = None - self.descr = None - self.string = None - self.type = None - self.in_parameter = 0 - self.is_parameter = 0 - self.parameter = None - self.parameter_info = None - self.entry = 0 - elif tag == 'para': - self._data = [] - elif tag == 'title': - self._data = [] - elif tag == 'tgroup': - self.in_parameter = 1 - elif tag == 'row': - self._data = [] - self.entry = 0 - elif tag == 'entry': - self.entry = self.entry + 1 - elif tag == 'parameter' and self.in_parameter == 1: - self._data = [] - elif tag == 'anchor' and self.id == None: - if attrs.has_key('id'): - self.orig_id = attrs['id'] - self.id = string.replace(self.orig_id, '-CAPS', '') - self.id = string.replace(self.id, '-', '_') + comment = comment + str - def end(self, tag): - if debug: - print "end %s" % tag - if tag == 'refsect2': - self.type = insertComment(self.id, self.title, self.string, - self.orig_id) - self.string = None - elif tag == 'row': - if self.parameter_info != None and self.parameter_info != '': - insertParameterComment(self.id, self.parameter, - self.parameter_info, self.is_parameter) - self.parameter_info = None - self.parameter = 0 - self.is_parameter = 0 - elif tag == 'parameter' and self.in_parameter == 1 and self.entry == 1: - str = '' - for c in self._data: - str = str + c - str = string.replace(str, '\n', ' ') - str = string.replace(str, '\r', ' ') - str = string.replace(str, ' ', ' ') - str = string.replace(str, ' ', ' ') - str = string.replace(str, ' ', ' ') - while len(str) >= 1 and str[0] == ' ': - str=str[1:] - self.parameter = str - self.is_parameter = 1 - self._data = [] - elif tag == 'para' or tag == 'entry': - str = '' - for c in self._data: - str = str + c - str = string.replace(str, '\n', ' ') - str = string.replace(str, '\r', ' ') - str = string.replace(str, ' ', ' ') - str = string.replace(str, ' ', ' ') - str = string.replace(str, ' ', ' ') - while len(str) >= 1 and str[0] == ' ': - str=str[1:] - if self.string == None: - self.string = str - elif self.in_parameter == 1: - self.parameter_info = str - self._data = [] - elif tag == 'title': - str = '' - for c in self._data: - str = str + c - str = string.replace(str, '\n', ' ') - str = string.replace(str, '\r', ' ') - str = string.replace(str, ' ', ' ') - str = string.replace(str, ' ', ' ') - str = string.replace(str, ' ', ' ') - while len(str) >= 1 and str[0] == ' ': - str=str[1:] - self.title = str + insertComment(id, title, comment, old_id) + + rows = ctxt.xpathEval("informaltable/tgroup/tbody/row") + for row in rows: + analyzeXMLDescriptionRow(doc, desc, id, row) + +def analyzeXMLDoc(doc): + if doc == None: + return + ctxt = doc.xpathNewContext() + descriptions = ctxt.xpathEval("//refsect2") + print len(descriptions) + for description in descriptions: + analyzeXMLDescription(doc, description) xmlfiles = 0 filenames = os.listdir("xml") for filename in filenames: + print filename try: - f = open("xml/" + filename, 'r') - except IOError, msg: - print file, ":", msg + doc = libxml2.parseFile("xml/" + filename) + analyzeXMLDoc(doc) + doc.freeDoc() + xmlfiles = xmlfiles + 1 + except: + print "failed to parse XML description %s" % ("xml/" + filename) continue - data = f.read() - (parser, target) = getparser() - parser.feed(data) - parser.close() - xmlfiles = xmlfiles + 1 print "Parsed: %d XML files collexting %d comments" % (xmlfiles, nbcomments) diff --git a/python/libxsltclass.txt b/python/libxsltclass.txt index 43e71893..8ec7d17e 100644 --- a/python/libxsltclass.txt +++ b/python/libxsltclass.txt @@ -133,6 +133,7 @@ Class transformCtxt() # functions from module xsltutils message() printErrorContext() + profileInformation() saveProfiling() Class stylesheet() # accessors