lib/libxslt
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxslt synced 2025-08-08 21:42:07 +03:00
Code Activity

applied fix for accessor functions of a stylesheet returning pointers to

Browse Source 
* python/libxslt-python-api.xml: applied fix for accessor functions
  of a stylesheet returning pointers to immutable strings, patch
  from #320540
* xsltproc/xsltproc.c: fix the xinclude on stylehseet problem
  by adding a new parameter to xsltproc names --xincludestyle
Daniel
This commit is contained in:
Daniel Veillard
2006-10-11 21:19:49 +00:00
parent e810227aff
commit f32d5c181d
3 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,11 @@
Wed Oct 11 23:16:10 CEST 2006 Daniel Veillard <daniel@veillard.com>
* python/libxslt-python-api.xml: applied fix for accessor functions
of a stylesheet returning pointers to immutable strings, patch
from #320540
* xsltproc/xsltproc.c: fix the xinclude on stylehseet problem
by adding a new parameter to xsltproc names --xincludestyle
Wed Oct 11 22:27:37 CEST 2006 Daniel Veillard <daniel@veillard.com> Wed Oct 11 22:27:37 CEST 2006 Daniel Veillard <daniel@veillard.com>
* xsltproc/xsltproc.c: apply patch from Gary Coady to compile when * xsltproc/xsltproc.c: apply patch from Gary Coady to compile when

8
python/libxslt-python-api.xml
View File

@@ -141,22 +141,22 @@
</function> </function>
<function name='xsltStylesheetGetMethod' file='python_accessor'> <function name='xsltStylesheetGetMethod' file='python_accessor'>
<info>Get the output method of a stylesheet</info> <info>Get the output method of a stylesheet</info>
<return type='xmlChar *' info="The output method" field="method"/> <return type='const xmlChar *' info="The output method" field="method"/>
<arg name='style' type='xsltStylesheetPtr' info='the stylesheet'/> <arg name='style' type='xsltStylesheetPtr' info='the stylesheet'/>
</function> </function>
<function name='xsltStylesheetGetMethodURI' file='python_accessor'> <function name='xsltStylesheetGetMethodURI' file='python_accessor'>
<info>Get the output method URI of a stylesheet</info> <info>Get the output method URI of a stylesheet</info>
<return type='xmlChar *' info="The output method URI" field="methodURI"/> <return type='const xmlChar *' info="The output method URI" field="methodURI"/>
<arg name='style' type='xsltStylesheetPtr' info='the stylesheet'/> <arg name='style' type='xsltStylesheetPtr' info='the stylesheet'/>
</function> </function>
<function name='xsltStylesheetGetVersion' file='python_accessor'> <function name='xsltStylesheetGetVersion' file='python_accessor'>
<info>Get the output version of a stylesheet</info> <info>Get the output version of a stylesheet</info>
<return type='xmlChar *' info="The output version" field="version"/> <return type='const xmlChar *' info="The output version" field="version"/>
<arg name='style' type='xsltStylesheetPtr' info='the stylesheet'/> <arg name='style' type='xsltStylesheetPtr' info='the stylesheet'/>
</function> </function>
<function name='xsltStylesheetGetEncoding' file='python_accessor'> <function name='xsltStylesheetGetEncoding' file='python_accessor'>
<info>Get the output encoding of a stylesheet</info> <info>Get the output encoding of a stylesheet</info>
<return type='xmlChar *' info="The output encoding" field="encoding"/> <return type='const xmlChar *' info="The output encoding" field="encoding"/>
<arg name='style' type='xsltStylesheetPtr' info='the stylesheet'/> <arg name='style' type='xsltStylesheetPtr' info='the stylesheet'/>
</function> </function>
<function name='xsltStylesheetGetDoctypePublic' file='python_accessor'> <function name='xsltStylesheetGetDoctypePublic' file='python_accessor'>

21
xsltproc/xsltproc.c
View File

@@ -85,6 +85,7 @@ static int html = 0;
static int load_trace = 0; static int load_trace = 0;
#ifdef LIBXML_XINCLUDE_ENABLED #ifdef LIBXML_XINCLUDE_ENABLED
static int xinclude = 0; static int xinclude = 0;
static int xincludestyle = 0;
#endif #endif
static int profile = 0; static int profile = 0;
@@ -514,6 +515,7 @@ static void usage(const char *name) {
#endif #endif
#ifdef LIBXML_XINCLUDE_ENABLED #ifdef LIBXML_XINCLUDE_ENABLED
printf("\t--xinclude : do XInclude processing on document input\n"); printf("\t--xinclude : do XInclude processing on document input\n");
printf("\t--xincludestyle : do XInclude processing on stylesheets\n");
#endif #endif
printf("\t--load-trace : print trace of all external entites loaded\n"); printf("\t--load-trace : print trace of all external entites loaded\n");
printf("\t--profile or --norman : dump profiling informations \n"); printf("\t--profile or --norman : dump profiling informations \n");
@@ -652,6 +654,9 @@ main(int argc, char **argv)
} else if ((!strcmp(argv[i], "-xinclude")) || } else if ((!strcmp(argv[i], "-xinclude")) ||
(!strcmp(argv[i], "--xinclude"))) { (!strcmp(argv[i], "--xinclude"))) {
xinclude++; xinclude++;
} else if ((!strcmp(argv[i], "-xincludestyle")) ||
(!strcmp(argv[i], "--xincludestyle"))) {
xincludestyle++;
xsltSetXIncludeDefault(1); xsltSetXIncludeDefault(1);
#endif #endif
} else if ((!strcmp(argv[i], "-load-trace")) || } else if ((!strcmp(argv[i], "-load-trace")) ||
@@ -779,16 +784,18 @@ main(int argc, char **argv)
style = xmlReadFile((const char *) argv[i], NULL, options); style = xmlReadFile((const char *) argv[i], NULL, options);
if (timing) if (timing)
endTimer("Parsing stylesheet %s", argv[i]); endTimer("Parsing stylesheet %s", argv[i]);
if (style != NULL) { if (xincludestyle) {
if (timing) if (style != NULL) {
startTimer(); if (timing)
startTimer();
#if LIBXML_VERSION >= 20603 #if LIBXML_VERSION >= 20603
xmlXIncludeProcessFlags(style, XSLT_PARSE_OPTIONS); xmlXIncludeProcessFlags(style, XSLT_PARSE_OPTIONS);
#else #else
xmlXIncludeProcess(style); xmlXIncludeProcess(style);
#endif #endif
if (timing) { if (timing) {
endTimer("XInclude processing %s", argv[i]); endTimer("XInclude processing %s", argv[i]);
}
} }
} }
if (style == NULL) { if (style == NULL) {