# HG changeset patch # User Daniel Veillard <veillard@redhat.com> # Date 1253802113 -7200 # Thu Sep 24 16:21:53 2009 +0200 # Node ID 084f0936da7681dbb012f5573de4265dd7b71847 # Parent 0486ec5dfd70ef0c1ef3943cd2095486b8b6f8f4 Add xsltProcessOneNode to exported symbols for lxml * doc/symbols.xml libxslt/transform.c libxslt/transform.h: exports the entry point explicitely since lxml depends on it, also fixed some white spaces problems. diff --git a/doc/symbols.xml b/doc/symbols.xml --- a/doc/symbols.xml +++ b/doc/symbols.xml @@ -305,4 +305,8 @@ <symbol file="xsltlocale">xsltStrxfrm</symbol> <symbol file="extensions">xsltInitGlobals</symbol> </release> + <release version="1.1.26"> + <!-- lxml was using it even if not pusblished --> + <symbol file="transform">xsltProcessOneNode</symbol> + </release> </symbols> diff --git a/libxslt/transform.c b/libxslt/transform.c --- a/libxslt/transform.c +++ b/libxslt/transform.c @@ -1709,9 +1709,6 @@ * * ************************************************************************/ -static -void xsltProcessOneNode(xsltTransformContextPtr ctxt, xmlNodePtr node, - xsltStackElemPtr params); /** * xsltDefaultProcessOneNode: * @ctxt: a XSLT process context @@ -1977,7 +1974,7 @@ * * Process the source node. */ -static void +void xsltProcessOneNode(xsltTransformContextPtr ctxt, xmlNodePtr contextNode, xsltStackElemPtr withParams) { @@ -2280,7 +2277,7 @@ if (IS_XSLT_ELEM_FAST(cur) && IS_XSLT_NAME(cur, "message")) { xsltMessage(ctxt, contextNode, cur); goto skip_children; - } + } /* * Something really went wrong: */ @@ -2467,7 +2464,7 @@ xsltMessage(ctxt, contextNode, cur); } else { xsltTransformError(ctxt, NULL, cur, - "Unexpected XSLT element '%s'.\n", cur->name); + "Unexpected XSLT element '%s'.\n", cur->name); } goto skip_children; @@ -4076,7 +4073,7 @@ if ((value[len-1] == '-') || (xmlStrstr(value, BAD_CAST "--"))) { xsltTransformError(ctxt, NULL, inst, - "xsl:comment : '--' or ending '-' not allowed in comment\n"); + "xsl:comment : '--' or ending '-' not allowed in comment\n"); /* fall through to try to catch further errors */ } } @@ -4816,7 +4813,7 @@ */ #if 0 if ((ctxt->nbKeys > 0) && - (list->nodeNr != 0) && + (list->nodeNr != 0) && (list->nodeTab[0]->doc != NULL) && XSLT_IS_RES_TREE_FRAG(list->nodeTab[0]->doc)) { diff --git a/libxslt/transform.h b/libxslt/transform.h --- a/libxslt/transform.h +++ b/libxslt/transform.h @@ -24,51 +24,55 @@ /** * XInclude default processing. */ -XSLTPUBFUN void XSLTCALL +XSLTPUBFUN void XSLTCALL xsltSetXIncludeDefault (int xinclude); -XSLTPUBFUN int XSLTCALL +XSLTPUBFUN int XSLTCALL xsltGetXIncludeDefault (void); /** * Export context to users. */ -XSLTPUBFUN xsltTransformContextPtr XSLTCALL +XSLTPUBFUN xsltTransformContextPtr XSLTCALL xsltNewTransformContext (xsltStylesheetPtr style, xmlDocPtr doc); -XSLTPUBFUN void XSLTCALL +XSLTPUBFUN void XSLTCALL xsltFreeTransformContext(xsltTransformContextPtr ctxt); -XSLTPUBFUN xmlDocPtr XSLTCALL +XSLTPUBFUN xmlDocPtr XSLTCALL xsltApplyStylesheetUser (xsltStylesheetPtr style, xmlDocPtr doc, const char **params, const char *output, FILE * profile, xsltTransformContextPtr userCtxt); +XSLTPUBFUN void XSLTCALL + xsltProcessOneNode (xsltTransformContextPtr ctxt, + xmlNodePtr node, + xsltStackElemPtr params); /** * Private Interfaces. */ -XSLTPUBFUN void XSLTCALL +XSLTPUBFUN void XSLTCALL xsltApplyStripSpaces (xsltTransformContextPtr ctxt, xmlNodePtr node); -XSLTPUBFUN xmlDocPtr XSLTCALL +XSLTPUBFUN xmlDocPtr XSLTCALL xsltApplyStylesheet (xsltStylesheetPtr style, xmlDocPtr doc, const char **params); -XSLTPUBFUN xmlDocPtr XSLTCALL +XSLTPUBFUN xmlDocPtr XSLTCALL xsltProfileStylesheet (xsltStylesheetPtr style, xmlDocPtr doc, const char **params, FILE * output); -XSLTPUBFUN int XSLTCALL +XSLTPUBFUN int XSLTCALL xsltRunStylesheet (xsltStylesheetPtr style, xmlDocPtr doc, const char **params, const char *output, xmlSAXHandlerPtr SAX, xmlOutputBufferPtr IObuf); -XSLTPUBFUN int XSLTCALL +XSLTPUBFUN int XSLTCALL xsltRunStylesheetUser (xsltStylesheetPtr style, xmlDocPtr doc, const char **params, @@ -77,101 +81,101 @@ xmlOutputBufferPtr IObuf, FILE * profile, xsltTransformContextPtr userCtxt); -XSLTPUBFUN void XSLTCALL +XSLTPUBFUN void XSLTCALL xsltApplyOneTemplate (xsltTransformContextPtr ctxt, xmlNodePtr node, xmlNodePtr list, xsltTemplatePtr templ, xsltStackElemPtr params); -XSLTPUBFUN void XSLTCALL +XSLTPUBFUN void XSLTCALL xsltDocumentElem (xsltTransformContextPtr ctxt, xmlNodePtr node, xmlNodePtr inst, xsltStylePreCompPtr comp); -XSLTPUBFUN void XSLTCALL +XSLTPUBFUN void XSLTCALL xsltSort (xsltTransformContextPtr ctxt, xmlNodePtr node, xmlNodePtr inst, xsltStylePreCompPtr comp); -XSLTPUBFUN void XSLTCALL +XSLTPUBFUN void XSLTCALL xsltCopy (xsltTransformContextPtr ctxt, xmlNodePtr node, xmlNodePtr inst, xsltStylePreCompPtr comp); -XSLTPUBFUN void XSLTCALL +XSLTPUBFUN void XSLTCALL xsltText (xsltTransformContextPtr ctxt, xmlNodePtr node, xmlNodePtr inst, xsltStylePreCompPtr comp); -XSLTPUBFUN void XSLTCALL +XSLTPUBFUN void XSLTCALL xsltElement (xsltTransformContextPtr ctxt, xmlNodePtr node, xmlNodePtr inst, xsltStylePreCompPtr comp); -XSLTPUBFUN void XSLTCALL +XSLTPUBFUN void XSLTCALL xsltComment (xsltTransformContextPtr ctxt, xmlNodePtr node, xmlNodePtr inst, xsltStylePreCompPtr comp); -XSLTPUBFUN void XSLTCALL +XSLTPUBFUN void XSLTCALL xsltAttribute (xsltTransformContextPtr ctxt, xmlNodePtr node, xmlNodePtr inst, xsltStylePreCompPtr comp); -XSLTPUBFUN void XSLTCALL +XSLTPUBFUN void XSLTCALL xsltProcessingInstruction(xsltTransformContextPtr ctxt, xmlNodePtr node, xmlNodePtr inst, xsltStylePreCompPtr comp); -XSLTPUBFUN void XSLTCALL +XSLTPUBFUN void XSLTCALL xsltCopyOf (xsltTransformContextPtr ctxt, xmlNodePtr node, xmlNodePtr inst, xsltStylePreCompPtr comp); -XSLTPUBFUN void XSLTCALL +XSLTPUBFUN void XSLTCALL xsltValueOf (xsltTransformContextPtr ctxt, xmlNodePtr node, xmlNodePtr inst, xsltStylePreCompPtr comp); -XSLTPUBFUN void XSLTCALL +XSLTPUBFUN void XSLTCALL xsltNumber (xsltTransformContextPtr ctxt, xmlNodePtr node, xmlNodePtr inst, xsltStylePreCompPtr comp); -XSLTPUBFUN void XSLTCALL +XSLTPUBFUN void XSLTCALL xsltApplyImports (xsltTransformContextPtr ctxt, xmlNodePtr node, xmlNodePtr inst, xsltStylePreCompPtr comp); -XSLTPUBFUN void XSLTCALL +XSLTPUBFUN void XSLTCALL xsltCallTemplate (xsltTransformContextPtr ctxt, xmlNodePtr node, xmlNodePtr inst, xsltStylePreCompPtr comp); -XSLTPUBFUN void XSLTCALL +XSLTPUBFUN void XSLTCALL xsltApplyTemplates (xsltTransformContextPtr ctxt, xmlNodePtr node, xmlNodePtr inst, xsltStylePreCompPtr comp); -XSLTPUBFUN void XSLTCALL +XSLTPUBFUN void XSLTCALL xsltChoose (xsltTransformContextPtr ctxt, xmlNodePtr node, xmlNodePtr inst, xsltStylePreCompPtr comp); -XSLTPUBFUN void XSLTCALL +XSLTPUBFUN void XSLTCALL xsltIf (xsltTransformContextPtr ctxt, xmlNodePtr node, xmlNodePtr inst, xsltStylePreCompPtr comp); -XSLTPUBFUN void XSLTCALL +XSLTPUBFUN void XSLTCALL xsltForEach (xsltTransformContextPtr ctxt, xmlNodePtr node, xmlNodePtr inst, xsltStylePreCompPtr comp); -XSLTPUBFUN void XSLTCALL +XSLTPUBFUN void XSLTCALL xsltRegisterAllElement (xsltTransformContextPtr ctxt); -XSLTPUBFUN xmlNodePtr XSLTCALL +XSLTPUBFUN xmlNodePtr XSLTCALL xsltCopyTextString (xsltTransformContextPtr ctxt, xmlNodePtr target, const xmlChar *string, @@ -189,7 +193,7 @@ /* * Hook for the debugger if activated. */ -XSLTPUBFUN void XSLTCALL +XSLTPUBFUN void XSLTCALL xslHandleDebugger (xmlNodePtr cur, xmlNodePtr node, xsltTemplatePtr templ,