From 27979ecf09d98c7a081b2e1adfe94b7b8bd5937b Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Fri, 12 Sep 2003 11:34:55 +0000 Subject: [PATCH] fixes some output divergeances with libxml2-2.6.0beta1, daniel --- tests/general/array.xsl | 4 +- tests/xmlspec/REC-xml-20001006-review.html | 100 ++++++++++++++--------------- tests/xmlspec/REC-xml-20001006.html | 100 ++++++++++++++--------------- 3 files changed, 103 insertions(+), 101 deletions(-) diff --git a/tests/general/array.xsl b/tests/general/array.xsl index 2124caa..9f59c3e 100644 --- a/tests/general/array.xsl +++ b/tests/general/array.xsl @@ -1,7 +1,9 @@ - + 1 diff --git a/tests/xmlspec/REC-xml-20001006-review.html b/tests/xmlspec/REC-xml-20001006-review.html index 6d4d5bf..f9e82be 100644 --- a/tests/xmlspec/REC-xml-20001006-review.html +++ b/tests/xmlspec/REC-xml-20001006-review.html @@ -82,7 +82,7 @@ be contacted at cmsmcq@w3.org.

Table of Contents

1 Introduction
    1.1 Origin and Goals
    1.2 Terminology
2 Documents
    2.1 Well-Formed XML Documents
    2.2 Characters
    2.3 Common Syntactic Constructs
    2.4 Character Data and Markup
    2.5 Comments
    2.6 Processing Instructions
    2.7 CDATA Sections
    2.8 Prolog and Document Type Declaration
    2.9 Standalone Document Declaration
    2.10 White Space Handling
    2.11 End-of-Line Handling
    2.12 Language Identification
3 Logical Structures
    3.1 Start-Tags, End-Tags, and Empty-Element Tags
    3.2 Element Type Declarations
        3.2.1 Element Content
        3.2.2 Mixed Content
    3.3 Attribute-List Declarations
        3.3.1 Attribute Types
        3.3.2 Attribute Defaults
        3.3.3 Attribute-Value Normalization
    3.4 Conditional Sections
4 Physical Structures
    4.1 Character and Entity References
    4.2 Entity Declarations
        4.2.1 Internal Entities
        4.2.2 External Entities
    4.3 Parsed Entities
        4.3.1 The Text Declaration
        4.3.2 Well-Formed Parsed Entities
        4.3.3 Character Encoding in Entities
    4.4 XML Processor Treatment of Entities and References
        4.4.1 Not Recognized
        4.4.2 Included
        4.4.3 Included If Validating
        4.4.4 Forbidden
        4.4.5 Included in Literal
        4.4.6 Notify
        4.4.7 Bypassed
        4.4.8 Included as PE
    4.5 Construction of Internal Entity Replacement Text
    4.6 Predefined Entities
    4.7 Notation Declarations
    4.8 Document Entity
5 Conformance
    5.1 Validating and Non-Validating Processors
    5.2 Using XML Processors
6 Notation

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)

1 Introduction

@@ -1200,15 +1200,15 @@ declarations:

to the character sequences of the middle column if the attribute a is declared NMTOKENS and to those of the right columns if a is declared CDATA.

- - - - +
Attribute specificationa is NMTOKENSa is CDATA
a="
-
-xyz"
x y z#x20 #x20 x y z
a="&d;&d;A&a;&a;B&da;"
A -#x20 B#x20 #x20 A #x20 #x20 B #x20 #x20
a=
-"

A

B
"
#xD -#xD A #xA #xA B #xD #xA#xD #xD A #xA #xA B #xD #xD
+ + +
Attribute specificationa is NMTOKENSa is CDATA
a="
+
+xyz"
x y z#x20 #x20 x y z
a="&d;&d;A&a;&a;B&da;"
A +#x20 B#x20 #x20 A #x20 #x20 B #x20 #x20
a=
+"

A

B
"
#xD +#xD A #xA #xA B #xD #xA#xD #xD A #xA #xA B #xD #xD

Note that the last example is invalid (but well-formed) if a is declared to be of type NMTOKENS.

@@ -1632,24 +1632,24 @@ or the contents of an ignored conditional section (see -Entity -TypeCharacterParameterInternal GeneralExternal Parsed -GeneralUnparsedReference -in ContentNot recognized -IncludedIncluded -if validatingForbidden -IncludedReference in Attribute ValueNot recognizedIncluded -in literalForbidden -[E51]
Forbidden
Included -Occurs as Attribute -ValueNot recognized -Forbidden[E51]
Forbidden
Notify -[E51]
Not recognized
Reference in EntityValueIncluded in literalBypassed -BypassedForbidden -IncludedReference in DTDIncluded -as PEForbidden -ForbiddenForbidden -Forbidden +Entity +TypeCharacterParameterInternal GeneralExternal Parsed +GeneralUnparsedReference +in ContentNot recognized +IncludedIncluded +if validatingForbidden +IncludedReference in Attribute ValueNot recognizedIncluded +in literalForbidden +[E51]
Forbidden
Included +Occurs as Attribute +ValueNot recognized +Forbidden[E51]
Forbidden
Notify +[E51]
Not recognized
Reference in EntityValueIncluded in literalBypassed +BypassedForbidden +IncludedReference in DTDIncluded +as PEForbidden +ForbiddenForbidden +Forbidden

4.4.1 Not Recognized

@@ -2394,42 +2394,42 @@ list, it may help to know that in UCS-4, '<' is "#x0000003C" and '?' is "#x0000003F", and the Byte Order Mark required of UTF-16 data streams is "#xFEFF". The notation ## is used to denote any byte value except that two consecutive ##s cannot be both 00.

With a Byte Order Mark:

-
- - - - -
00 00 FE -FFUCS-4, big-endian machine (1234 order)
FF -FE 00 00UCS-4, little-endian machine (4321 order)
00 00 FF FEUCS-4, unusual octet order (2143)
FE FF 00 00UCS-4, unusual octet order (3412)
FE FF ## ##UTF-16, big-endian
FF FE ## ##UTF-16, little-endian
EF BB BFUTF-8
+
+ + + + +
00 00 FE +FFUCS-4, big-endian machine (1234 order)
FF +FE 00 00UCS-4, little-endian machine (4321 order)
00 00 FF FEUCS-4, unusual octet order (2143)
FE FF 00 00UCS-4, unusual octet order (3412)
FE FF ## ##UTF-16, big-endian
FF FE ## ##UTF-16, little-endian
EF BB BFUTF-8

Without a Byte Order Mark:

-
- - - - - - - - - - - -
00 00 00 3CUCS-4 or other encoding with a 32-bit code unit and ASCII +
+ +applies. - + - + - - + - +
00 00 00 3CUCS-4 or other encoding with a 32-bit code unit and ASCII characters encoded as ASCII values, in respectively big-endian (1234), little-endian (4321) and two unusual byte orders (2143 and 3412). The encoding declaration must be read to determine which of UCS-4 or other supported 32-bit encodings -applies.
3C 00 00 00
3C 00 00 00
00 00 3C 00
00 00 3C 00
00 3C 00 00
00 3C 00 00
00 3C 00 3FUTF-16BE or big-endian ISO-10646-UCS-2 +
00 3C 00 3FUTF-16BE or big-endian ISO-10646-UCS-2 or other encoding with a 16-bit code unit in big-endian order and ASCII characters encoded as ASCII values (the encoding declaration must be read to determine -which)
3C 00 3F 00UTF-16LE or little-endian +which)
3C 00 3F 00UTF-16LE or little-endian ISO-10646-UCS-2 or other encoding with a 16-bit code unit in little-endian order and ASCII characters encoded as ASCII values (the encoding declaration -must be read to determine which)
3C 3F 78 6DUTF-8, ISO 646, ASCII, some part of ISO 8859, Shift-JIS, EUC, or any other +must be read to determine which)
3C 3F 78 6DUTF-8, ISO 646, ASCII, some part of ISO 8859, Shift-JIS, EUC, or any other 7-bit, 8-bit, or mixed-width encoding which ensures that the characters of ASCII have their normal positions, width, and values; the actual encoding declaration must be read to detect which of these applies, but since all of these encodings use the same bit patterns for the relevant ASCII characters, -the encoding declaration itself may be read reliably
4C -6F A7 94EBCDIC (in some flavor; the full encoding declaration -must be read to tell which code page is in use)
OtherUTF-8 without an encoding declaration, or else the data stream is mislabeled +the encoding declaration itself may be read reliably
4C +6F A7 94EBCDIC (in some flavor; the full encoding declaration +must be read to tell which code page is in use)
OtherUTF-8 without an encoding declaration, or else the data stream is mislabeled (lacking a required encoding declaration), corrupt, fragmentary, or enclosed in a wrapper of some kind

Note:

@@ -2574,7 +2574,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 ead304b..341dbdc 100644 --- a/tests/xmlspec/REC-xml-20001006.html +++ b/tests/xmlspec/REC-xml-20001006.html @@ -65,7 +65,7 @@ be contacted at cmsmcq@w3.org.

Table of Contents

1 Introduction
    1.1 Origin and Goals
    1.2 Terminology
2 Documents
    2.1 Well-Formed XML Documents
    2.2 Characters
    2.3 Common Syntactic Constructs
    2.4 Character Data and Markup
    2.5 Comments
    2.6 Processing Instructions
    2.7 CDATA Sections
    2.8 Prolog and Document Type Declaration
    2.9 Standalone Document Declaration
    2.10 White Space Handling
    2.11 End-of-Line Handling
    2.12 Language Identification
3 Logical Structures
    3.1 Start-Tags, End-Tags, and Empty-Element Tags
    3.2 Element Type Declarations
        3.2.1 Element Content
        3.2.2 Mixed Content
    3.3 Attribute-List Declarations
        3.3.1 Attribute Types
        3.3.2 Attribute Defaults
        3.3.3 Attribute-Value Normalization
    3.4 Conditional Sections
4 Physical Structures
    4.1 Character and Entity References
    4.2 Entity Declarations
        4.2.1 Internal Entities
        4.2.2 External Entities
    4.3 Parsed Entities
        4.3.1 The Text Declaration
        4.3.2 Well-Formed Parsed Entities
        4.3.3 Character Encoding in Entities
    4.4 XML Processor Treatment of Entities and References
        4.4.1 Not Recognized
        4.4.2 Included
        4.4.3 Included If Validating
        4.4.4 Forbidden
        4.4.5 Included in Literal
        4.4.6 Notify
        4.4.7 Bypassed
        4.4.8 Included as PE
    4.5 Construction of Internal Entity Replacement Text
    4.6 Predefined Entities
    4.7 Notation Declarations
    4.8 Document Entity
5 Conformance
    5.1 Validating and Non-Validating Processors
    5.2 Using XML Processors
6 Notation

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)

1 Introduction

@@ -1151,15 +1151,15 @@ declarations:

to the character sequences of the middle column if the attribute a is declared NMTOKENS and to those of the right columns if a is declared CDATA.

- - - - +
Attribute specificationa is NMTOKENSa is CDATA
a="
-
-xyz"
x y z#x20 #x20 x y z
a="&d;&d;A&a;&a;B&da;"
A -#x20 B#x20 #x20 A #x20 #x20 B #x20 #x20
a=
-"&#xd;&#xd;A&#xa;&#xa;B&#xd;&#xa;"
#xD -#xD A #xA #xA B #xD #xA#xD #xD A #xA #xA B #xD #xD
+ + +
Attribute specificationa is NMTOKENSa is CDATA
a="
+
+xyz"
x y z#x20 #x20 x y z
a="&d;&d;A&a;&a;B&da;"
A +#x20 B#x20 #x20 A #x20 #x20 B #x20 #x20
a=
+"&#xd;&#xd;A&#xa;&#xa;B&#xd;&#xa;"
#xD +#xD A #xA #xA B #xD #xA#xD #xD A #xA #xA B #xD #xD

Note that the last example is invalid (but well-formed) if a is declared to be of type NMTOKENS.

@@ -1577,24 +1577,24 @@ or the contents of an ignored conditional section (see
Entity -TypeCharacter
ParameterInternal GeneralExternal Parsed -GeneralUnparsed
Reference -in ContentNot recognizedIncludedIncluded -if validatingForbiddenIncluded
Reference in Attribute ValueNot recognizedIncluded -in literalForbiddenForbiddenIncluded
Occurs as Attribute -ValueNot recognizedForbiddenForbiddenNotifyNot recognized
Reference in EntityValueIncluded in literalBypassedBypassedForbiddenIncluded
Reference in DTDIncluded -as PEForbiddenForbiddenForbiddenForbidden
+Entity +TypeCharacterParameterInternal GeneralExternal Parsed +GeneralUnparsedReference +in ContentNot recognized +IncludedIncluded +if validatingForbidden +IncludedReference in Attribute ValueNot recognizedIncluded +in literalForbidden +ForbiddenIncluded +Occurs as Attribute +ValueNot recognized +ForbiddenForbiddenNotify +Not recognizedReference in EntityValueIncluded in literalBypassed +BypassedForbidden +IncludedReference in DTDIncluded +as PEForbidden +ForbiddenForbidden +Forbidden

4.4.1 Not Recognized

@@ -2318,42 +2318,42 @@ list, it may help to know that in UCS-4, '<' is "#x0000003C" and '?' is "#x0000003F", and the Byte Order Mark required of UTF-16 data streams is "#xFEFF". The notation ## is used to denote any byte value except that two consecutive ##s cannot be both 00.

With a Byte Order Mark:

- - - - - -
00 00 FE -FFUCS-4, big-endian machine (1234 order)
FF -FE 00 00UCS-4, little-endian machine (4321 order)
00 00 FF FEUCS-4, unusual octet order (2143)
FE FF 00 00UCS-4, unusual octet order (3412)
FE FF ## ##UTF-16, big-endian
FF FE ## ##UTF-16, little-endian
EF BB BFUTF-8
+ + + + + +
00 00 FE +FFUCS-4, big-endian machine (1234 order)
FF +FE 00 00UCS-4, little-endian machine (4321 order)
00 00 FF FEUCS-4, unusual octet order (2143)
FE FF 00 00UCS-4, unusual octet order (3412)
FE FF ## ##UTF-16, big-endian
FF FE ## ##UTF-16, little-endian
EF BB BFUTF-8

Without a Byte Order Mark:

- -
00 00 00 3CUCS-4 or other encoding with a 32-bit code unit and ASCII + + +applies. - + - + - - + - +
00 00 00 3CUCS-4 or other encoding with a 32-bit code unit and ASCII characters encoded as ASCII values, in respectively big-endian (1234), little-endian (4321) and two unusual byte orders (2143 and 3412). The encoding declaration must be read to determine which of UCS-4 or other supported 32-bit encodings -applies.
3C 00 00 00
3C 00 00 00
00 00 3C 00
00 00 3C 00
00 3C 00 00
00 3C 00 00
00 3C 00 3FUTF-16BE or big-endian ISO-10646-UCS-2 +
00 3C 00 3FUTF-16BE or big-endian ISO-10646-UCS-2 or other encoding with a 16-bit code unit in big-endian order and ASCII characters encoded as ASCII values (the encoding declaration must be read to determine -which)
3C 00 3F 00UTF-16LE or little-endian +which)
3C 00 3F 00UTF-16LE or little-endian ISO-10646-UCS-2 or other encoding with a 16-bit code unit in little-endian order and ASCII characters encoded as ASCII values (the encoding declaration -must be read to determine which)
3C 3F 78 6DUTF-8, ISO 646, ASCII, some part of ISO 8859, Shift-JIS, EUC, or any other +must be read to determine which)
3C 3F 78 6DUTF-8, ISO 646, ASCII, some part of ISO 8859, Shift-JIS, EUC, or any other 7-bit, 8-bit, or mixed-width encoding which ensures that the characters of ASCII have their normal positions, width, and values; the actual encoding declaration must be read to detect which of these applies, but since all of these encodings use the same bit patterns for the relevant ASCII characters, -the encoding declaration itself may be read reliably
4C -6F A7 94EBCDIC (in some flavor; the full encoding declaration -must be read to tell which code page is in use)
OtherUTF-8 without an encoding declaration, or else the data stream is mislabeled +the encoding declaration itself may be read reliably
4C +6F A7 94EBCDIC (in some flavor; the full encoding declaration +must be read to tell which code page is in use)
OtherUTF-8 without an encoding declaration, or else the data stream is mislabeled (lacking a required encoding declaration), corrupt, fragmentary, or enclosed in a wrapper of some kind

Note:

@@ -2484,7 +2484,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