+Sun Jul 15 16:01:55 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
+
+ * libxslt/numbers.c libxslt/numbersInternals.h libxslt/preproc.c:
+ trying to accept AVT for "format" in xsl:number
+
Fri Jul 13 16:57:08 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
* win32/libxslt/libxslt.defs: trying to close #57460 by adding
#include <libxml/xpathInternals.h>
#include "xsltutils.h"
#include "pattern.h"
+#include "templates.h"
#include "numbersInternals.h"
#ifndef FALSE
double number;
xsltNumberFormatToken array[1024];
+ if ((data->format == NULL) && (data->has_format != 0)) {
+ data->format = xsltEvalAttrValueTemplate(ctxt, data->node,
+ (const xmlChar *) "format",
+ XSLT_NAMESPACE);
+ }
+ if (data->format == NULL) {
+ return;
+ }
+
output = xmlBufferCreate();
if (output == NULL)
goto XSLT_NUMBER_FORMAT_END;
comp->numdata.value = xsltGetNsProp(cur, (const xmlChar *)"value",
XSLT_NAMESPACE);
- prop = xsltGetNsProp(cur, (const xmlChar *)"format", XSLT_NAMESPACE);
- if (prop != NULL) {
- comp->numdata.format = prop;
- } else {
+ prop = xsltEvalStaticAttrValueTemplate(style, cur,
+ (const xmlChar *)"format",
+ XSLT_NAMESPACE, &comp->numdata.has_format);
+ if (comp->numdata.has_format == 0) {
comp->numdata.format = xmlStrdup(BAD_CAST(""));
+ } else {
+ comp->numdata.format = prop;
}
-
+
comp->numdata.count = xsltGetNsProp(cur, (const xmlChar *)"count",
XSLT_NAMESPACE);
comp->numdata.from = xsltGetNsProp(cur, (const xmlChar *)"from",