From ae7c300b6722969513f14ec5dfe6412fb64f1be6 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Sun, 7 Oct 2001 11:19:37 +0000 Subject: [PATCH] fixed bug #61070, number ANY formatting should be faster too. updated the * libxslt/numbers.c: fixed bug #61070, number ANY formatting should be faster too. * tests/docbook/result/xtchunk/html/* tests/xmlspec/REC-xml-20001006*.html: updated the result of the tests. A subtle bug unnnoticed yet in the XML Rec formatting got fixed. Daniel --- ChangeLog | 8 ++ libxslt/numbers.c | 112 +++++++++++---------- tests/docbook/result/xtchunk/html/apa.orig | 6 +- .../xtchunk/html/{apas17.orig => apas02.orig} | 6 +- .../xtchunk/html/{apas18.orig => apas03.orig} | 6 +- tests/docbook/result/xtchunk/html/index.orig | 8 +- tests/docbook/result/xtchunk/html/indexs02.orig | 20 ++-- tests/docbook/result/xtchunk/html/indexs04.orig | 68 ++++++------- tests/docbook/result/xtchunk/html/indexs06.orig | 10 +- tests/docbook/result/xtchunk/html/indexs07.orig | 4 +- tests/docbook/result/xtchunk/html/indexs08.orig | 4 +- tests/docbook/result/xtchunk/html/indexs09.orig | 2 +- tests/docbook/result/xtchunk/html/indexs12.orig | 8 +- tests/xmlspec/REC-xml-20001006-review.html | 6 +- tests/xmlspec/REC-xml-20001006.html | 6 +- 15 files changed, 143 insertions(+), 131 deletions(-) rename tests/docbook/result/xtchunk/html/{apas17.orig => apas02.orig} (98%) rename tests/docbook/result/xtchunk/html/{apas18.orig => apas03.orig} (99%) diff --git a/ChangeLog b/ChangeLog index 528fd1c..d7e92d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Sun Oct 7 13:15:33 CEST 2001 Daniel Veillard + + * libxslt/numbers.c: fixed bug #61070, number ANY formatting + should be faster too. + * tests/docbook/result/xtchunk/html/* tests/xmlspec/REC-xml-20001006*.html: + updated the result of the tests. A subtle bug unnnoticed yet + in the XML Rec formatting got fixed. + Sat Oct 6 19:45:07 CEST 2001 Daniel Veillard * libxslt/numbers.c: trying to fix bug #61070, seems there diff --git a/libxslt/numbers.c b/libxslt/numbers.c index 2f6a970..6c933fd 100644 --- a/libxslt/numbers.c +++ b/libxslt/numbers.c @@ -369,69 +369,73 @@ xsltNumberFormatGetAnyLevel(xsltTransformContextPtr context, { int amount = 0; int cnt = 0; - int keep_going = TRUE; - xmlNodePtr ancestor; - xmlNodePtr preceding; - xmlXPathParserContextPtr parser; - xsltCompMatchPtr countPat; - xsltCompMatchPtr fromPat; + xmlNodePtr cur; + xsltCompMatchPtr countPat = NULL; + xsltCompMatchPtr fromPat = NULL; if (count != NULL) countPat = xsltCompilePattern(count, doc, elem); - else - countPat = NULL; if (from != NULL) fromPat = xsltCompilePattern(from, doc, elem); - else - fromPat = NULL; - context->xpathCtxt->node = node; - parser = xmlXPathNewParserContext(NULL, context->xpathCtxt); - if (parser) { - /* preceding */ - for (preceding = xmlXPathNextPreceding(parser, node); - preceding != NULL; - preceding = xmlXPathNextPreceding(parser, preceding)) { - if ((from != NULL) && - xsltTestCompMatchList(context, preceding, fromPat)) { - keep_going = FALSE; - break; /* for */ - } - if (count == NULL) { - if ((node->type == preceding->type) && - /* FIXME: must use expanded-name instead of local name */ - xmlStrEqual(node->name, preceding->name)) - cnt++; - } else { - if (xsltTestCompMatchList(context, preceding, countPat)) - cnt++; - } + + /* select the starting node */ + switch (node->type) { + case XML_ELEMENT_NODE: + cur = node; + break; + case XML_ATTRIBUTE_NODE: + cur = ((xmlAttrPtr) node)->parent; + break; + case XML_TEXT_NODE: + case XML_PI_NODE: + case XML_COMMENT_NODE: + cur = node->parent; + break; + default: + cur = NULL; + break; + } + + while (cur != NULL) { + /* process current node */ + if (count == NULL) { + if ((node->type == cur->type) && + /* FIXME: must use expanded-name instead of local name */ + xmlStrEqual(node->name, cur->name)) + cnt++; + } else { + if (xsltTestCompMatchList(context, cur, countPat)) + cnt++; + } + if ((from != NULL) && + xsltTestCompMatchList(context, cur, fromPat)) { + break; /* while */ } - if (keep_going) { - /* ancestor-or-self */ - for (ancestor = node; - ancestor != NULL; - ancestor = xmlXPathNextAncestor(parser, ancestor)) { - if ((from != NULL) && - xsltTestCompMatchList(context, ancestor, fromPat)) { - break; /* for */ - } - if (count == NULL) { - if ((node->type == ancestor->type) && - /* FIXME */ - xmlStrEqual(node->name, ancestor->name)) - cnt++; - } else { - if (xsltTestCompMatchList(context, ancestor, countPat)) - cnt++; - } - } + /* Skip to next preceding or ancestor */ + if ((cur->type == XML_DOCUMENT_NODE) || +#ifdef LIBXML_DOCB_ENABLED + (cur->type == XML_DOCB_DOCUMENT_NODE) || +#endif + (cur->type == XML_HTML_DOCUMENT_NODE)) + break; /* while */ + + while ((cur->prev != NULL) && (cur->prev->type == XML_DTD_NODE)) + cur = cur->prev; + if (cur->prev != NULL) { + for (cur = cur->prev; cur->last != NULL; cur = cur->last); + } else { + cur = cur->parent; } - array[amount++] = (double)cnt; - xmlXPathFreeParserContext(parser); + } - xsltFreeCompMatchList(countPat); - xsltFreeCompMatchList(fromPat); + + array[amount++] = (double) cnt; + + if (countPat != NULL) + xsltFreeCompMatchList(countPat); + if (fromPat != NULL) + xsltFreeCompMatchList(fromPat); return(amount); } diff --git a/tests/docbook/result/xtchunk/html/apa.orig b/tests/docbook/result/xtchunk/html/apa.orig index d5cb0b8..8f10138 100644 --- a/tests/docbook/result/xtchunk/html/apa.orig +++ b/tests/docbook/result/xtchunk/html/apa.orig @@ -7,7 +7,7 @@ - +
@@ -17,7 +17,7 @@ Prev    - Next + Next @@ -775,7 +775,7 @@ Prev  Home - Next + Next diff --git a/tests/docbook/result/xtchunk/html/apas17.orig b/tests/docbook/result/xtchunk/html/apas02.orig similarity index 98% rename from tests/docbook/result/xtchunk/html/apas17.orig rename to tests/docbook/result/xtchunk/html/apas02.orig index a6f6e8f..9f4850f 100644 --- a/tests/docbook/result/xtchunk/html/apas17.orig +++ b/tests/docbook/result/xtchunk/html/apas02.orig @@ -7,7 +7,7 @@ - +
@@ -17,7 +17,7 @@ Prev  A. Document Templates - Next + Next @@ -357,7 +357,7 @@ Prev  Home - Next + Next diff --git a/tests/docbook/result/xtchunk/html/apas18.orig b/tests/docbook/result/xtchunk/html/apas03.orig similarity index 99% rename from tests/docbook/result/xtchunk/html/apas18.orig rename to tests/docbook/result/xtchunk/html/apas03.orig index c899dc8..f588de2 100644 --- a/tests/docbook/result/xtchunk/html/apas18.orig +++ b/tests/docbook/result/xtchunk/html/apas03.orig @@ -6,7 +6,7 @@ - +
@@ -14,7 +14,7 @@ Template 2: Applet Manual For GNOME 2.x -Prev  +Prev  A. Document Templates   @@ -657,7 +657,7 @@ +Prev  diff --git a/tests/docbook/result/xtchunk/html/index.orig b/tests/docbook/result/xtchunk/html/index.orig index 1c09754..8a5a5ef 100644 --- a/tests/docbook/result/xtchunk/html/index.orig +++ b/tests/docbook/result/xtchunk/html/index.orig @@ -205,9 +205,9 @@
Template 1: Application Manual
-
Template 2: Applet Manual For GNOME 1.x +
Template 2: Applet Manual For GNOME 1.x
-
Template 2: Applet Manual For GNOME 2.x +
Template 2: Applet Manual For GNOME 2.x
@@ -293,8 +293,8 @@ Notation and Conventions

This Handbook uses the following notation: -

-
-Prev  Home  
+
+
diff --git a/tests/docbook/result/xtchunk/html/indexs02.orig b/tests/docbook/result/xtchunk/html/indexs02.orig index 2a59c88..5f919e3 100644 --- a/tests/docbook/result/xtchunk/html/indexs02.orig +++ b/tests/docbook/result/xtchunk/html/indexs02.orig @@ -86,7 +86,7 @@

-Note

+Note

Note that the information in the DocTable may not always be up-to-date @@ -109,7 +109,7 @@

-NOTE

+NOTE

To get started writing for the GDP you do not need to rush out and learn DocBook - if you feel it is too much to handle @@ -176,7 +176,7 @@

  • - + Download the GDP DocBook DTD for PNG support and install it where you keep your DTD's. (On Red Hat use /usr/lib/sgml/.) Note that @@ -185,7 +185,7 @@ recommended that you use version 3.1

  • - + Add the new DTD to your SGML CATALOG file. The location of your SGML CATALOG file may vary depending upon your distribution. (On Red Hat it is usually in @@ -284,7 +284,7 @@ V1.1//EN"[]>

    -NOTE

    +NOTE

    The html files you get will not look quite the same as the documentation distributed with GNOME unless you have the @@ -355,7 +355,7 @@ V1.1//EN"[]>

    • - + http://www.docbook.org - Norman Walsh's DocBook: The Definitive Guide. Online O'Reilly book on using @@ -363,14 +363,14 @@ V1.1//EN"[]> too formal for a beginner.

    • - + A Practical Introduction to DocBook - The Open Source Writers Group's introduction to using DocBook. This is an excellent HOW-TO type article on getting started.

    • - + Getting Going with DocBook: Notes for Hackers - Mark Galassi's introduction to DocBook for hackers. This has to be one of the first @@ -378,7 +378,7 @@ V1.1//EN"[]> was.

    • - + FreeBSD Documentation Project Primer for New Contributors - FreeBSD documentation project @@ -396,7 +396,7 @@ V1.1//EN"[]> documentation authors write correct and consistent DocBook:

      diff --git a/tests/docbook/result/xtchunk/html/indexs04.orig b/tests/docbook/result/xtchunk/html/indexs04.orig index b3fee5a..815c55b 100644 --- a/tests/docbook/result/xtchunk/html/indexs04.orig +++ b/tests/docbook/result/xtchunk/html/indexs04.orig @@ -117,10 +117,10 @@

      - Minimization + Minimization

      - + It is possible with some implementations of SGML to use minimizations to close elements in a document by using </>, for example: @@ -133,10 +133,10 @@ Modify->Normalize.

      - Self-closing tags + Self-closing tags

      - + Also, in SGML some tags are allowed not to have closing tags. For example, it is legal for <xref> not to have a closing tag: @@ -148,10 +148,10 @@ slash!).

      - Case sensitive tags + Case sensitive tags

      - + In XML, unlike SGML, tags are case-senstive <title> and <TITLE> are different tags! @@ -252,7 +252,7 @@

      -NOTE

      +NOTE

      Notice in this example that the screenshot file name does not include the file type extension -- to find out @@ -310,7 +310,7 @@ make: *** No rule to make target `love'. Stop. and commands entered by user.

      -NOTE

      +NOTE

      Note that both <programlisting> and <screen> preserve linebreaks, @@ -333,11 +333,11 @@ make: *** No rule to make target `love'. Stop.

      - <itemizedlist> + <itemizedlist>

      - + This is the simplest unnumbered list, parallel to <ul> in HTML. Here is an example: 

      @@ -371,20 +371,20 @@ make: *** No rule to make target `love'.  Stop.
                 
      
 
        
 
      • 
-
+
 		      Show backup files --
 		      This will show any backup file that might be on
 		      your system.
 		    
        • 
 
      • 
-
+
 		      Show hidden files --
 		      This will show all "dot files" or files that
 		      begin with a dot.  This files typically include
 		      configuration files and directories.
 		    
        • 
 
      • 
-
+
 		      Mix files and directories
 		      -- This option will display files and
 		      directories in the order you sort them instead
@@ -407,10 +407,10 @@ make: *** No rule to make target `love'.  Stop.
      - <orderedlist> + <orderedlist>

      - + This list is completely analogous to <itemizedlist> and has the same syntax, but it produces numbered list. By default, @@ -425,10 +425,10 @@ make: *** No rule to make target `love'. Stop. lowerroman.

      - <variablelist> + <variablelist>

      - This list is used when each entry is + This list is used when each entry is rather long, so it should be formatted as a block of text with some subtitle, like a small subsection. The <variablelist> is more complicated @@ -482,12 +482,12 @@ make: *** No rule to make target `love'. Stop. GUI elements

      • - + <guibutton> -- used for buttons, including checkbuttons and radio buttons

      • - + <guimenu>, <guisubmenu> --used for top-level menus and submenus @@ -496,21 +496,21 @@ make: *** No rule to make target `love'. Stop. <guimenu>Main Menu</guimenu>

      • - + <guimenuitem>--an entry in a menu

      • - + <guiicon>--an icon

      • - + <guilabel>--for items which have labels, like tabs, or bounding boxes.

      • - + <interface>-- for most everything else... a window, a dialog box, the Panel, etc.

        • @@ -575,7 +575,7 @@ url="http://www.gnome.org">GNOME Web page</ulink>

        • - <filename> -- used + <filename> -- used for filenames, e.g.<filename> foo.sgml @@ -583,7 +583,7 @@ url="http://www.gnome.org">GNOME Web page</ulink> produces: foo.sgml.

        • - <filename + <filename class="directory"> -- used for directories, e.g.<filename class="directory">/usr/bin @@ -591,7 +591,7 @@ url="http://www.gnome.org">GNOME Web page</ulink> produces: /usr/bin.

        • - + <application> -- used for application names, e.g. <application>Gnumeric @@ -599,13 +599,13 @@ url="http://www.gnome.org">GNOME Web page</ulink> Gnumeric.

        • - + <envar> -- used for environment variables, e.g. <envar>PATH</envar>.

        • - + <command> -- used for commands entered on command line, e.g. <command>make install @@ -613,7 +613,7 @@ url="http://www.gnome.org">GNOME Web page</ulink> make install.

        • - + <replaceable> -- used for replaceable text, e.g. <command>db2html<replaceable> @@ -704,23 +704,23 @@ url="http://www.gnome.org">GNOME Web page</ulink>

          • - + &amp; -- ampersend (&)

          • - + &lt; -- left angle bracket (<)

          • - + &copy; -- copyright sign (©)

          • - + &mdash; -- long dash (--)

          • - + &hellip; -- ellipsis (...)

          diff --git a/tests/docbook/result/xtchunk/html/indexs06.orig b/tests/docbook/result/xtchunk/html/indexs06.orig index 49c961a..342cc87 100644 --- a/tests/docbook/result/xtchunk/html/indexs06.orig +++ b/tests/docbook/result/xtchunk/html/indexs06.orig @@ -37,7 +37,7 @@

          -Documentation Availability

          +Documentation Availability

          Applications and applets should not rely on documentation which is only available on the internet. All manuals and @@ -48,13 +48,13 @@

          Application manuals should be based on the template in the section called “Template 1: Application Manual”. Applet manuals should be based on - the templates in the section called “Template 2: Applet Manual For GNOME 1.x” for GNOME - versions 1.x and the templates in the section called “Template 2: Applet Manual For GNOME 2.x” + the templates in the section called “Template 2: Applet Manual For GNOME 1.x” for GNOME + versions 1.x and the templates in the section called “Template 2: Applet Manual For GNOME 2.x” for GNOME versions 2.x.

          -Manuals For Large Applications

          +Manuals For Large Applications

          Manuals for very large applications, such as GNOME Workshop components should be a <book> (and thus @@ -66,7 +66,7 @@

          -Applet Manuals in GNOME 2.0

          +Applet Manuals in GNOME 2.0

          Note that applet manuals in GNOME 2.0 are treated in a special way. The manuals for all applets are merged into a single diff --git a/tests/docbook/result/xtchunk/html/indexs07.orig b/tests/docbook/result/xtchunk/html/indexs07.orig index d507bb6..9bf161c 100644 --- a/tests/docbook/result/xtchunk/html/indexs07.orig +++ b/tests/docbook/result/xtchunk/html/indexs07.orig @@ -28,7 +28,7 @@ Listing Documents in the Help Menu

        -Developer Information

        +Developer Information

        This section is for developers. Documentation authors generally do not need to know this material. @@ -66,7 +66,7 @@ function-reference.html Gnumeric function reference

        -Note

        +Note

        If the help files are not present in the correct directory, the menu items will NOT appear when the program is run. diff --git a/tests/docbook/result/xtchunk/html/indexs08.orig b/tests/docbook/result/xtchunk/html/indexs08.orig index 0902094..717b4f9 100644 --- a/tests/docbook/result/xtchunk/html/indexs08.orig +++ b/tests/docbook/result/xtchunk/html/indexs08.orig @@ -28,7 +28,7 @@ Application Help Buttons

        -Developer Information

        +Developer Information

        This section is for developers. Documentation authors generally do not need to know this material. @@ -61,7 +61,7 @@ if (tmp) {

        -NOTE

        +NOTE

        The example above is in the C language, please refer to other documentation or forums for other GNOME language bindings. diff --git a/tests/docbook/result/xtchunk/html/indexs09.orig b/tests/docbook/result/xtchunk/html/indexs09.orig index bba9bbe..15386f0 100644 --- a/tests/docbook/result/xtchunk/html/indexs09.orig +++ b/tests/docbook/result/xtchunk/html/indexs09.orig @@ -72,7 +72,7 @@ Adding Documentation to an Applet Menu

        -Developer Information

        +Developer Information

        This section is for developers. Documentation authors generally do not need to know this material. diff --git a/tests/docbook/result/xtchunk/html/indexs12.orig b/tests/docbook/result/xtchunk/html/indexs12.orig index bb14c37..762e3ea 100644 --- a/tests/docbook/result/xtchunk/html/indexs12.orig +++ b/tests/docbook/result/xtchunk/html/indexs12.orig @@ -73,7 +73,7 @@ you'll have to juggle a number of other extremes as you write:

        @@ -830,7 +830,7 @@ Subset]
+[28a]    @@ -4069,7 +4069,7 @@ Contact)

-I Production Notes (Non-Normative)

+I Production Notes (Non-Normative)

This Second Edition was encoded in the XMLspec DTD (which has documentation available). The HTML versions were produced with a combination of the xmlspec.xsl, diffspec.xsl, diff --git a/tests/xmlspec/REC-xml-20001006.html b/tests/xmlspec/REC-xml-20001006.html index 75c3a92..ab60d02 100644 --- a/tests/xmlspec/REC-xml-20001006.html +++ b/tests/xmlspec/REC-xml-20001006.html @@ -97,7 +97,7 @@ Normalization

Appendices

A References
    A.1 Normative References
    A.2 Other References
B Character Classes
C XML and SGML (Non-Normative)
D Expansion of Entity and Character References (Non-Normative)
E Deterministic Content Models (Non-Normative)
F Autodetection -of Character Encodings (Non-Normative)
    F.1 Detection Without External Encoding Information
    F.2 Priorities in the Presence of External Encoding Information
G W3C XML Working Group (Non-Normative)
H W3C XML Core Group (Non-Normative)
I Production Notes (Non-Normative)
+of Character Encodings (Non-Normative)
    F.1 Detection Without External Encoding Information
    F.2 Priorities in the Presence of External Encoding Information
G W3C XML Working Group (Non-Normative)
H W3C XML Core Group (Non-Normative)
I Production Notes (Non-Normative)

@@ -805,7 +805,7 @@ Subset]
+[28a]    @@ -3863,7 +3863,7 @@ Contact)

-I Production Notes (Non-Normative)

+I Production Notes (Non-Normative)

This Second Edition was encoded in the XMLspec DTD (which has documentation available). The HTML versions were produced with a combination of the xmlspec.xsl, diffspec.xsl, -- 2.7.4

-[28]   DeclSep    ::=    PEReference | S
-[28]   DeclSep    ::=    PEReference | S