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

For Norman walsh: for heriting defaulted atts from the DTD Added a few new

Browse Source 
For Norman walsh:
* xsltproc/xsltproc.c: for heriting defaulted atts from the DTD
* tests/docs/Makefile.am tests/docs/bug-52.xml tests/docs/bug-53.xml
  tests/general/Makefile.am tests/general/bug-52.*
  tests/general/bug-53.*: Added a few new tests for recently fixed
  stuff in libxml
* tests/xmlspec/REC-xml-20001006-review.html
  tests/xmlspec/REC-xml-20001006.html: inheriting default attrs from
  DTD changed the result by adding extra attributes to the HTML output
Daniel
This commit is contained in:
Daniel Veillard
2001-08-07 01:14:30 +00:00
parent 664d555115
commit c3e6b8a663
12 changed files with 225 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@@ -1,3 +1,14 @@
Tue Aug 7 03:11:31 CEST 2001 Daniel Veillard <daniel@veillard.com>
* xsltproc/xsltproc.c: for heriting defaulted atts from the DTD
* tests/docs/Makefile.am tests/docs/bug-52.xml tests/docs/bug-53.xml
tests/general/Makefile.am tests/general/bug-52.*
tests/general/bug-53.*: Added a few new tests for recently fixed
stuff in libxml
* tests/xmlspec/REC-xml-20001006-review.html
tests/xmlspec/REC-xml-20001006.html: inheriting default attrs from
DTD changed the result by adding extra attributes to the HTML output
2001-08-06 Peter Williams <peterw@ximian.com> 2001-08-06 Peter Williams <peterw@ximian.com>
* libexslt/Makefile.am, xsltproc/Makefile.am: Fixes for compiling * libexslt/Makefile.am, xsltproc/Makefile.am: Fixes for compiling

2
tests/docs/Makefile.am
View File

@@ -54,6 +54,8 @@ EXTRA_DIST = \
bug-48-.xml \ bug-48-.xml \
bug-49-.xml \ bug-49-.xml \
bug-50-.xml \ bug-50-.xml \
bug-52-.xml \
bug-53-.xml \
character.xml \ character.xml \
array.xml \ array.xml \
items.xml items.xml

12
tests/docs/bug-52.xml Normal file
View File

@@ -0,0 +1,12 @@
<!DOCTYPE doc [
<!NOTATION GIF PUBLIC "GIF">
<!ENTITY graphic SYSTEM "graphic.gif" NDATA GIF>
<!ELEMENT doc (img)>
<!ELEMENT img EMPTY>
<!ATTLIST img
entref ENTITY #REQUIRED
>
]>
<doc>
<img entref="graphic"/>
</doc>

6
tests/docs/bug-53.xml Normal file
View File

@@ -0,0 +1,6 @@
<!DOCTYPE doc [
<!ELEMENT doc EMPTY>
<!ATTLIST doc
defatt (SUCCESS|FAILURE) "SUCCESS">
]>
<doc/>

2
tests/general/Makefile.am
View File

@@ -56,6 +56,8 @@ EXTRA_DIST = \
bug-48-.out bug-48-.xsl \ bug-48-.out bug-48-.xsl \
bug-49-.out bug-49-.xsl \ bug-49-.out bug-49-.xsl \
bug-50-.out bug-50-.xsl \ bug-50-.out bug-50-.xsl \
bug-52-.out bug-52-.xsl \
bug-53-.out bug-53-.xsl \
character.out character.xsl \ character.out character.xsl \
character2.out character2.xsl \ character2.out character2.xsl \
itemschoose.out itemschoose.xsl \ itemschoose.out itemschoose.xsl \

4
tests/general/bug-52.out Normal file
View File

@@ -0,0 +1,4 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
Graphic file=../docs/graphic.gif

16
tests/general/bug-52.xsl Normal file
View File

@@ -0,0 +1,16 @@
<?xml version="1.0"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
version="1.0">
<xsl:output method="html"/>
<xsl:template match="doc">
<xsl:apply-templates/>
</xsl:template>
<xsl:template match="img">
<xsl:text>Graphic file=</xsl:text>
<xsl:value-of select="unparsed-entity-uri(@entref)"/>
</xsl:template>
</xsl:stylesheet>

1
tests/general/bug-53.out Normal file
View File

@@ -0,0 +1 @@
SUCCESS

11
tests/general/bug-53.xsl Normal file
View File

@@ -0,0 +1,11 @@
<?xml version="1.0"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
version="1.0">
<xsl:output method="text"/>
<xsl:template match="doc">
<xsl:value-of select="@defatt"/>
</xsl:template>
</xsl:stylesheet>

158
tests/xmlspec/REC-xml-20001006-review.html
View File

@@ -114,7 +114,7 @@ Normalization</a><br>
</p> </p>
<h3>Appendices</h3> <h3>Appendices</h3>
<p class="toc">A <a href="#sec-bibliography">References</a><br><EFBFBD><EFBFBD><EFBFBD><EFBFBD>A.1 <a href="#sec-existing-stds">Normative References</a><br><EFBFBD><EFBFBD><EFBFBD><EFBFBD>A.2 <a href="#null">Other References</a><br>B <a href="#CharClasses">Character Classes</a><br>C <a href="#sec-xml-and-sgml">XML and SGML</a> (Non-Normative)<br>D <a href="#sec-entexpand">Expansion of Entity and Character References</a> (Non-Normative)<br>E <a href="#determinism">Deterministic Content Models</a> (Non-Normative)<br>F <a href="#sec-guessing">Autodetection <p class="toc">A <a href="#sec-bibliography">References</a><br><EFBFBD><EFBFBD><EFBFBD><EFBFBD>A.1 <a href="#sec-existing-stds">Normative References</a><br><EFBFBD><EFBFBD><EFBFBD><EFBFBD>A.2 <a href="#null">Other References</a><br>B <a href="#CharClasses">Character Classes</a><br>C <a href="#sec-xml-and-sgml">XML and SGML</a> (Non-Normative)<br>D <a href="#sec-entexpand">Expansion of Entity and Character References</a> (Non-Normative)<br>E <a href="#determinism">Deterministic Content Models</a> (Non-Normative)<br>F <a href="#sec-guessing">Autodetection
of Character Encodings</a> (Non-Normative)<br><EFBFBD><EFBFBD><EFBFBD><EFBFBD>F.1 <a href="#sec-guessing-no-ext-info">Detection Without External Encoding Information</a><br><EFBFBD><EFBFBD><EFBFBD><EFBFBD>F.2 <a href="#sec-guessing-with-ext-info">Priorities in the Presence of External Encoding Information</a><br>G <a href="#sec-xml-wg">W3C XML Working Group</a> (Non-Normative)<br>H <a href="#sec-core-wg">W3C XML Core Group</a> (Non-Normative)<br>I <a href="#id2668540">Production Notes</a> (Non-Normative)<br> of Character Encodings</a> (Non-Normative)<br><EFBFBD><EFBFBD><EFBFBD><EFBFBD>F.1 <a href="#sec-guessing-no-ext-info">Detection Without External Encoding Information</a><br><EFBFBD><EFBFBD><EFBFBD><EFBFBD>F.2 <a href="#sec-guessing-with-ext-info">Priorities in the Presence of External Encoding Information</a><br>G <a href="#sec-xml-wg">W3C XML Working Group</a> (Non-Normative)<br>H <a href="#sec-core-wg">W3C XML Core Group</a> (Non-Normative)<br>I <a href="#id2675479">Production Notes</a> (Non-Normative)<br>
</p> </p>
</div> </div>
<hr> <hr>
@@ -2106,30 +2106,30 @@ is declared <b>NMTOKENS</b> and to those of the right columns if <code>a</code>
is declared <b>CDATA</b>.</p> is declared <b>CDATA</b>.</p>
<table border="1" frame="border"> <table border="1" frame="border">
<thead><tr> <thead><tr>
<th>Attribute specification</th> <th colspan="1" rowspan="1">Attribute specification</th>
<th>a is NMTOKENS</th> <th colspan="1" rowspan="1">a is NMTOKENS</th>
<th>a is CDATA</th> <th colspan="1" rowspan="1">a is CDATA</th>
</tr></thead> </tr></thead>
<tbody> <tbody>
<tr> <tr>
<td><table class="eg" cellpadding="5" border="1" bgcolor="#99ffff" width="100%" summary="Example"><tr><td><pre>a=&quot; <td colspan="1" rowspan="1"><table class="eg" cellpadding="5" border="1" bgcolor="#99ffff" width="100%" summary="Example"><tr><td><pre>a=&quot;
xyz&quot;</pre></td></tr></table></td> xyz&quot;</pre></td></tr></table></td>
<td><code>x y z</code></td> <td colspan="1" rowspan="1"><code>x y z</code></td>
<td><code>#x20 #x20 x y z</code></td> <td colspan="1" rowspan="1"><code>#x20 #x20 x y z</code></td>
</tr> </tr>
<tr> <tr>
<td><table class="eg" cellpadding="5" border="1" bgcolor="#99ffff" width="100%" summary="Example"><tr><td><pre>a=&quot;&amp;d;&amp;d;A&amp;a;&amp;a;B&amp;da;&quot;</pre></td></tr></table></td> <td colspan="1" rowspan="1"><table class="eg" cellpadding="5" border="1" bgcolor="#99ffff" width="100%" summary="Example"><tr><td><pre>a=&quot;&amp;d;&amp;d;A&amp;a;&amp;a;B&amp;da;&quot;</pre></td></tr></table></td>
<td><code>A <td colspan="1" rowspan="1"><code>A
#x20 B</code></td> #x20 B</code></td>
<td><code>#x20 #x20 A #x20 #x20 B #x20 #x20</code></td> <td colspan="1" rowspan="1"><code>#x20 #x20 A #x20 #x20 B #x20 #x20</code></td>
</tr> </tr>
<tr> <tr>
<td><table class="eg" cellpadding="5" border="1" bgcolor="#99ffff" width="100%" summary="Example"><tr><td><pre>a= <td colspan="1" rowspan="1"><table class="eg" cellpadding="5" border="1" bgcolor="#99ffff" width="100%" summary="Example"><tr><td><pre>a=
&quot;&amp;#xd;&amp;#xd;A&amp;#xa;&amp;#xa;B&amp;#xd;&amp;#xa;&quot;</pre></td></tr></table></td> &quot;&amp;#xd;&amp;#xd;A&amp;#xa;&amp;#xa;B&amp;#xd;&amp;#xa;&quot;</pre></td></tr></table></td>
<td><code>#xD <td colspan="1" rowspan="1"><code>#xD
#xD A #xA #xA B #xD #xA</code></td> #xD A #xA #xA B #xD #xA</code></td>
<td><code>#xD #xD A #xA #xA B #xD #xD</code></td> <td colspan="1" rowspan="1"><code>#xD #xD A #xA #xA B #xD #xD</code></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
@@ -2850,67 +2850,67 @@ or the contents of an ignored conditional section (see <a href="#sec-condition-s
<table border="1" frame="border" cellpadding="7"><tbody align="center"> <table border="1" frame="border" cellpadding="7"><tbody align="center">
<tr> <tr>
<td rowspan="2" colspan="1"></td> <td rowspan="2" colspan="1"></td>
<td colspan="4" align="center" valign="bottom">Entity <td rowspan="1" colspan="4" align="center" valign="bottom">Entity
Type</td> Type</td>
<td rowspan="2" align="center">Character</td> <td colspan="1" rowspan="2" align="center">Character</td>
</tr> </tr>
<tr align="center" valign="bottom"> <tr align="center" valign="bottom">
<td>Parameter</td> <td colspan="1" rowspan="1">Parameter</td>
<td>Internal General</td> <td colspan="1" rowspan="1">Internal General</td>
<td>External Parsed <td colspan="1" rowspan="1">External Parsed
General</td> General</td>
<td>Unparsed</td> <td colspan="1" rowspan="1">Unparsed</td>
</tr> </tr>
<tr align="center" valign="middle"> <tr align="center" valign="middle">
<td align="right">Reference <td colspan="1" rowspan="1" align="right">Reference
in Content</td> in Content</td>
<td><a href="#not-recognized"><cite>Not recognized</cite></a></td> <td colspan="1" rowspan="1"><a href="#not-recognized"><cite>Not recognized</cite></a></td>
<td><a href="#included"><cite>Included</cite></a></td> <td colspan="1" rowspan="1"><a href="#included"><cite>Included</cite></a></td>
<td><a href="#include-if-valid"><cite>Included <td colspan="1" rowspan="1"><a href="#include-if-valid"><cite>Included
if validating</cite></a></td> if validating</cite></a></td>
<td><a href="#forbidden"><cite>Forbidden</cite></a></td> <td colspan="1" rowspan="1"><a href="#forbidden"><cite>Forbidden</cite></a></td>
<td><a href="#included"><cite>Included</cite></a></td> <td colspan="1" rowspan="1"><a href="#included"><cite>Included</cite></a></td>
</tr> </tr>
<tr align="center" valign="middle"> <tr align="center" valign="middle">
<td align="right">Reference in Attribute Value</td> <td colspan="1" rowspan="1" align="right">Reference in Attribute Value</td>
<td><a href="#not-recognized"><cite>Not recognized</cite></a></td> <td colspan="1" rowspan="1"><a href="#not-recognized"><cite>Not recognized</cite></a></td>
<td><a href="#inliteral"><cite>Included <td colspan="1" rowspan="1"><a href="#inliteral"><cite>Included
in literal</cite></a></td> in literal</cite></a></td>
<td><a href="#forbidden"><cite>Forbidden</cite></a></td> <td colspan="1" rowspan="1"><a href="#forbidden"><cite>Forbidden</cite></a></td>
<td> <td colspan="1" rowspan="1">
<a href="http://www.w3.org/XML/xml-19980210-errata#E51">[E51]</a><div class="diff-chg"><a href="#forbidden"><cite>Forbidden</cite></a></div> <a href="http://www.w3.org/XML/xml-19980210-errata#E51">[E51]</a><div class="diff-chg"><a href="#forbidden"><cite>Forbidden</cite></a></div>
</td> </td>
<td><a href="#included"><cite>Included</cite></a></td> <td colspan="1" rowspan="1"><a href="#included"><cite>Included</cite></a></td>
</tr> </tr>
<tr align="center" valign="middle"> <tr align="center" valign="middle">
<td align="right">Occurs as Attribute <td colspan="1" rowspan="1" align="right">Occurs as Attribute
Value</td> Value</td>
<td><a href="#not-recognized"><cite>Not recognized</cite></a></td> <td colspan="1" rowspan="1"><a href="#not-recognized"><cite>Not recognized</cite></a></td>
<td><a href="#forbidden"><cite>Forbidden</cite></a></td> <td colspan="1" rowspan="1"><a href="#forbidden"><cite>Forbidden</cite></a></td>
<td> <td colspan="1" rowspan="1">
<a href="http://www.w3.org/XML/xml-19980210-errata#E51">[E51]</a><div class="diff-chg"><a href="#forbidden"><cite>Forbidden</cite></a></div> <a href="http://www.w3.org/XML/xml-19980210-errata#E51">[E51]</a><div class="diff-chg"><a href="#forbidden"><cite>Forbidden</cite></a></div>
</td> </td>
<td><a href="#notify"><cite>Notify</cite></a></td> <td colspan="1" rowspan="1"><a href="#notify"><cite>Notify</cite></a></td>
<td> <td colspan="1" rowspan="1">
<a href="http://www.w3.org/XML/xml-19980210-errata#E51">[E51]</a><div class="diff-chg"><a href="#not-recognized"><cite>Not recognized</cite></a></div> <a href="http://www.w3.org/XML/xml-19980210-errata#E51">[E51]</a><div class="diff-chg"><a href="#not-recognized"><cite>Not recognized</cite></a></div>
</td> </td>
</tr> </tr>
<tr align="center" valign="middle"> <tr align="center" valign="middle">
<td align="right">Reference in EntityValue</td> <td colspan="1" rowspan="1" align="right">Reference in EntityValue</td>
<td><a href="#inliteral"><cite>Included in literal</cite></a></td> <td colspan="1" rowspan="1"><a href="#inliteral"><cite>Included in literal</cite></a></td>
<td><a href="#bypass"><cite>Bypassed</cite></a></td> <td colspan="1" rowspan="1"><a href="#bypass"><cite>Bypassed</cite></a></td>
<td><a href="#bypass"><cite>Bypassed</cite></a></td> <td colspan="1" rowspan="1"><a href="#bypass"><cite>Bypassed</cite></a></td>
<td><a href="#forbidden"><cite>Forbidden</cite></a></td> <td colspan="1" rowspan="1"><a href="#forbidden"><cite>Forbidden</cite></a></td>
<td><a href="#included"><cite>Included</cite></a></td> <td colspan="1" rowspan="1"><a href="#included"><cite>Included</cite></a></td>
</tr> </tr>
<tr align="center" valign="middle"> <tr align="center" valign="middle">
<td align="right">Reference in DTD</td> <td colspan="1" rowspan="1" align="right">Reference in DTD</td>
<td><a href="#as-PE"><cite>Included <td colspan="1" rowspan="1"><a href="#as-PE"><cite>Included
as PE</cite></a></td> as PE</cite></a></td>
<td><a href="#forbidden"><cite>Forbidden</cite></a></td> <td colspan="1" rowspan="1"><a href="#forbidden"><cite>Forbidden</cite></a></td>
<td><a href="#forbidden"><cite>Forbidden</cite></a></td> <td colspan="1" rowspan="1"><a href="#forbidden"><cite>Forbidden</cite></a></td>
<td><a href="#forbidden"><cite>Forbidden</cite></a></td> <td colspan="1" rowspan="1"><a href="#forbidden"><cite>Forbidden</cite></a></td>
<td><a href="#forbidden"><cite>Forbidden</cite></a></td> <td colspan="1" rowspan="1"><a href="#forbidden"><cite>Forbidden</cite></a></td>
</tr> </tr>
</tbody></table> </tbody></table>
<div class="div3"> <div class="div3">
@@ -3827,75 +3827,75 @@ required of UTF-16 data streams is &quot;<code>#xFEFF</code>&quot;. <span class=
<div class="diff-add"><p>With a Byte Order Mark:</p></div> <div class="diff-add"><p>With a Byte Order Mark:</p></div>
<div class="diff-add"><table border="1" frame="border"><tbody> <div class="diff-add"><table border="1" frame="border"><tbody>
<tr> <tr>
<td><code>00 00 FE <td colspan="1" rowspan="1"><code>00 00 FE
FF</code></td> FF</code></td>
<td>UCS-4, big-endian machine (1234 order)</td> <td colspan="1" rowspan="1">UCS-4, big-endian machine (1234 order)</td>
</tr> </tr>
<tr> <tr>
<td><code>FF <td colspan="1" rowspan="1"><code>FF
FE 00 00</code></td> FE 00 00</code></td>
<td>UCS-4, little-endian machine (4321 order)</td> <td colspan="1" rowspan="1">UCS-4, little-endian machine (4321 order)</td>
</tr> </tr>
<tr> <tr>
<td><code>00 00 FF FE</code></td> <td colspan="1" rowspan="1"><code>00 00 FF FE</code></td>
<td>UCS-4, unusual octet order (2143)</td> <td colspan="1" rowspan="1">UCS-4, unusual octet order (2143)</td>
</tr> </tr>
<tr> <tr>
<td><code>FE FF 00 00</code></td> <td colspan="1" rowspan="1"><code>FE FF 00 00</code></td>
<td>UCS-4, unusual octet order (3412)</td> <td colspan="1" rowspan="1">UCS-4, unusual octet order (3412)</td>
</tr> </tr>
<tr> <tr>
<td><code>FE FF ## ##</code></td> <td colspan="1" rowspan="1"><code>FE FF ## ##</code></td>
<td>UTF-16, big-endian</td> <td colspan="1" rowspan="1">UTF-16, big-endian</td>
</tr> </tr>
<tr> <tr>
<td><code>FF FE ## ##</code></td> <td colspan="1" rowspan="1"><code>FF FE ## ##</code></td>
<td>UTF-16, little-endian</td> <td colspan="1" rowspan="1">UTF-16, little-endian</td>
</tr> </tr>
<tr> <tr>
<td><code>EF BB BF</code></td> <td colspan="1" rowspan="1"><code>EF BB BF</code></td>
<td>UTF-8</td> <td colspan="1" rowspan="1">UTF-8</td>
</tr> </tr>
</tbody></table></div> </tbody></table></div>
<div class="diff-add"><p>Without a Byte Order Mark:</p></div> <div class="diff-add"><p>Without a Byte Order Mark:</p></div>
<div class="diff-add"><table border="1" frame="border"><tbody> <div class="diff-add"><table border="1" frame="border"><tbody>
<tr> <tr>
<td><code>00<EFBFBD>00<EFBFBD>00<EFBFBD>3C</code></td> <td colspan="1" rowspan="1"><code>00<EFBFBD>00<EFBFBD>00<EFBFBD>3C</code></td>
<td rowspan="4">UCS-4 or other encoding with a 32-bit code unit and ASCII <td colspan="1" rowspan="4">UCS-4 or other encoding with a 32-bit code unit and ASCII
characters encoded as ASCII values, in respectively big-endian (1234), little-endian characters encoded as ASCII values, in respectively big-endian (1234), little-endian
(4321) and two unusual byte orders (2143 and 3412). The encoding declaration (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 must be read to determine which of UCS-4 or other supported 32-bit encodings
applies.</td> applies.</td>
</tr> </tr>
<tr> <tr>
<td><code>3C 00 00 00</code></td> <td colspan="1" rowspan="1"><code>3C 00 00 00</code></td>
</tr> </tr>
<tr> <tr>
<td><code>00 00 3C 00</code></td> <td colspan="1" rowspan="1"><code>00 00 3C 00</code></td>
</tr> </tr>
<tr> <tr>
<td><code>00 3C 00 00</code></td> <td colspan="1" rowspan="1"><code>00 3C 00 00</code></td>
</tr> </tr>
<tr> <tr>
<td><code>00 3C 00 3F</code></td> <td colspan="1" rowspan="1"><code>00 3C 00 3F</code></td>
<td>UTF-16BE or big-endian ISO-10646-UCS-2 <td colspan="1" rowspan="1">UTF-16BE or big-endian ISO-10646-UCS-2
or other encoding with a 16-bit code unit in big-endian order and ASCII characters 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 encoded as ASCII values (the encoding declaration must be read to determine
which)</td> which)</td>
</tr> </tr>
<tr> <tr>
<td><code>3C 00 3F 00</code></td> <td colspan="1" rowspan="1"><code>3C 00 3F 00</code></td>
<td>UTF-16LE or little-endian <td colspan="1" rowspan="1">UTF-16LE or little-endian
ISO-10646-UCS-2 or other encoding with a 16-bit code unit in 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 order and ASCII characters encoded as ASCII values (the encoding declaration
must be read to determine which)</td> must be read to determine which)</td>
</tr> </tr>
<tr> <tr>
<td><code>3C 3F 78 6D</code></td> <td colspan="1" rowspan="1"><code>3C 3F 78 6D</code></td>
<td>UTF-8, ISO 646, ASCII, some part of ISO 8859, Shift-JIS, EUC, or any other <td colspan="1" rowspan="1">UTF-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 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 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 declaration must be read to detect which of these applies, but since all of
@@ -3903,14 +3903,14 @@ these encodings use the same bit patterns for the relevant ASCII characters,
the encoding declaration itself may be read reliably</td> the encoding declaration itself may be read reliably</td>
</tr> </tr>
<tr> <tr>
<td><code>4C <td colspan="1" rowspan="1"><code>4C
6F A7 94</code></td> 6F A7 94</code></td>
<td>EBCDIC (in some flavor; the full encoding declaration <td colspan="1" rowspan="1">EBCDIC (in some flavor; the full encoding declaration
must be read to tell which code page is in use)</td> must be read to tell which code page is in use)</td>
</tr> </tr>
<tr> <tr>
<td>Other</td> <td colspan="1" rowspan="1">Other</td>
<td>UTF-8 without an encoding declaration, or else the data stream is mislabeled <td colspan="1" rowspan="1">UTF-8 without an encoding declaration, or else the data stream is mislabeled
(lacking a required encoding declaration), corrupt, fragmentary, or enclosed (lacking a required encoding declaration), corrupt, fragmentary, or enclosed
in a wrapper of some kind</td> in a wrapper of some kind</td>
</tr> </tr>
@@ -4069,7 +4069,7 @@ Contact</i>) </li>
<div class="diff-add"><div class="div1"> <div class="diff-add"><div class="div1">
<h2> <h2>
<a name="id2668540"></a>I Production Notes (Non-Normative)</h2> <a name="id2675479"></a>I Production Notes (Non-Normative)</h2>
<p>This Second Edition was encoded in the <a href="http://www.w3.org/XML/1998/06/xmlspec-v21.dtd">XMLspec <p>This Second Edition was encoded in the <a href="http://www.w3.org/XML/1998/06/xmlspec-v21.dtd">XMLspec
DTD</a> (which has <a href="http://www.w3.org/XML/1998/06/xmlspec-report-v21.htm">documentation</a> DTD</a> (which has <a href="http://www.w3.org/XML/1998/06/xmlspec-report-v21.htm">documentation</a>
available). The HTML versions were produced with a combination of the <a href="http://www.w3.org/XML/1998/06/xmlspec.xsl">xmlspec.xsl</a>, <a href="http://www.w3.org/XML/1998/06/diffspec.xsl">diffspec.xsl</a>, available). The HTML versions were produced with a combination of the <a href="http://www.w3.org/XML/1998/06/xmlspec.xsl">xmlspec.xsl</a>, <a href="http://www.w3.org/XML/1998/06/diffspec.xsl">diffspec.xsl</a>,

158
tests/xmlspec/REC-xml-20001006.html
View File

@@ -97,7 +97,7 @@ Normalization</a><br>
</p> </p>
<h3>Appendices</h3> <h3>Appendices</h3>
<p class="toc">A <a href="#sec-bibliography">References</a><br><EFBFBD><EFBFBD><EFBFBD><EFBFBD>A.1 <a href="#sec-existing-stds">Normative References</a><br><EFBFBD><EFBFBD><EFBFBD><EFBFBD>A.2 <a href="#null">Other References</a><br>B <a href="#CharClasses">Character Classes</a><br>C <a href="#sec-xml-and-sgml">XML and SGML</a> (Non-Normative)<br>D <a href="#sec-entexpand">Expansion of Entity and Character References</a> (Non-Normative)<br>E <a href="#determinism">Deterministic Content Models</a> (Non-Normative)<br>F <a href="#sec-guessing">Autodetection <p class="toc">A <a href="#sec-bibliography">References</a><br><EFBFBD><EFBFBD><EFBFBD><EFBFBD>A.1 <a href="#sec-existing-stds">Normative References</a><br><EFBFBD><EFBFBD><EFBFBD><EFBFBD>A.2 <a href="#null">Other References</a><br>B <a href="#CharClasses">Character Classes</a><br>C <a href="#sec-xml-and-sgml">XML and SGML</a> (Non-Normative)<br>D <a href="#sec-entexpand">Expansion of Entity and Character References</a> (Non-Normative)<br>E <a href="#determinism">Deterministic Content Models</a> (Non-Normative)<br>F <a href="#sec-guessing">Autodetection
of Character Encodings</a> (Non-Normative)<br><EFBFBD><EFBFBD><EFBFBD><EFBFBD>F.1 <a href="#sec-guessing-no-ext-info">Detection Without External Encoding Information</a><br><EFBFBD><EFBFBD><EFBFBD><EFBFBD>F.2 <a href="#sec-guessing-with-ext-info">Priorities in the Presence of External Encoding Information</a><br>G <a href="#sec-xml-wg">W3C XML Working Group</a> (Non-Normative)<br>H <a href="#sec-core-wg">W3C XML Core Group</a> (Non-Normative)<br>I <a href="#id2668540">Production Notes</a> (Non-Normative)<br> of Character Encodings</a> (Non-Normative)<br><EFBFBD><EFBFBD><EFBFBD><EFBFBD>F.1 <a href="#sec-guessing-no-ext-info">Detection Without External Encoding Information</a><br><EFBFBD><EFBFBD><EFBFBD><EFBFBD>F.2 <a href="#sec-guessing-with-ext-info">Priorities in the Presence of External Encoding Information</a><br>G <a href="#sec-xml-wg">W3C XML Working Group</a> (Non-Normative)<br>H <a href="#sec-core-wg">W3C XML Core Group</a> (Non-Normative)<br>I <a href="#id2675479">Production Notes</a> (Non-Normative)<br>
</p> </p>
</div> </div>
<hr> <hr>
@@ -1988,30 +1988,30 @@ is declared <b>NMTOKENS</b> and to those of the right columns if <code>a</code>
is declared <b>CDATA</b>.</p> is declared <b>CDATA</b>.</p>
<table border="1" frame="border"> <table border="1" frame="border">
<thead><tr> <thead><tr>
<th>Attribute specification</th> <th colspan="1" rowspan="1">Attribute specification</th>
<th>a is NMTOKENS</th> <th colspan="1" rowspan="1">a is NMTOKENS</th>
<th>a is CDATA</th> <th colspan="1" rowspan="1">a is CDATA</th>
</tr></thead> </tr></thead>
<tbody> <tbody>
<tr> <tr>
<td><table class="eg" cellpadding="5" border="1" bgcolor="#99ffff" width="100%" summary="Example"><tr><td><pre>a=&quot; <td colspan="1" rowspan="1"><table class="eg" cellpadding="5" border="1" bgcolor="#99ffff" width="100%" summary="Example"><tr><td><pre>a=&quot;
xyz&quot;</pre></td></tr></table></td> xyz&quot;</pre></td></tr></table></td>
<td><code>x y z</code></td> <td colspan="1" rowspan="1"><code>x y z</code></td>
<td><code>#x20 #x20 x y z</code></td> <td colspan="1" rowspan="1"><code>#x20 #x20 x y z</code></td>
</tr> </tr>
<tr> <tr>
<td><table class="eg" cellpadding="5" border="1" bgcolor="#99ffff" width="100%" summary="Example"><tr><td><pre>a=&quot;&amp;d;&amp;d;A&amp;a;&amp;a;B&amp;da;&quot;</pre></td></tr></table></td> <td colspan="1" rowspan="1"><table class="eg" cellpadding="5" border="1" bgcolor="#99ffff" width="100%" summary="Example"><tr><td><pre>a=&quot;&amp;d;&amp;d;A&amp;a;&amp;a;B&amp;da;&quot;</pre></td></tr></table></td>
<td><code>A <td colspan="1" rowspan="1"><code>A
#x20 B</code></td> #x20 B</code></td>
<td><code>#x20 #x20 A #x20 #x20 B #x20 #x20</code></td> <td colspan="1" rowspan="1"><code>#x20 #x20 A #x20 #x20 B #x20 #x20</code></td>
</tr> </tr>
<tr> <tr>
<td><table class="eg" cellpadding="5" border="1" bgcolor="#99ffff" width="100%" summary="Example"><tr><td><pre>a= <td colspan="1" rowspan="1"><table class="eg" cellpadding="5" border="1" bgcolor="#99ffff" width="100%" summary="Example"><tr><td><pre>a=
&quot;&amp;#xd;&amp;#xd;A&amp;#xa;&amp;#xa;B&amp;#xd;&amp;#xa;&quot;</pre></td></tr></table></td> &quot;&amp;#xd;&amp;#xd;A&amp;#xa;&amp;#xa;B&amp;#xd;&amp;#xa;&quot;</pre></td></tr></table></td>
<td><code>#xD <td colspan="1" rowspan="1"><code>#xD
#xD A #xA #xA B #xD #xA</code></td> #xD A #xA #xA B #xD #xA</code></td>
<td><code>#xD #xD A #xA #xA B #xD #xD</code></td> <td colspan="1" rowspan="1"><code>#xD #xD A #xA #xA B #xD #xD</code></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
@@ -2705,61 +2705,61 @@ or the contents of an ignored conditional section (see <a href="#sec-condition-s
<table border="1" frame="border" cellpadding="7"><tbody align="center"> <table border="1" frame="border" cellpadding="7"><tbody align="center">
<tr> <tr>
<td rowspan="2" colspan="1"></td> <td rowspan="2" colspan="1"></td>
<td colspan="4" align="center" valign="bottom">Entity <td rowspan="1" colspan="4" align="center" valign="bottom">Entity
Type</td> Type</td>
<td rowspan="2" align="center">Character</td> <td colspan="1" rowspan="2" align="center">Character</td>
</tr> </tr>
<tr align="center" valign="bottom"> <tr align="center" valign="bottom">
<td>Parameter</td> <td colspan="1" rowspan="1">Parameter</td>
<td>Internal General</td> <td colspan="1" rowspan="1">Internal General</td>
<td>External Parsed <td colspan="1" rowspan="1">External Parsed
General</td> General</td>
<td>Unparsed</td> <td colspan="1" rowspan="1">Unparsed</td>
</tr> </tr>
<tr align="center" valign="middle"> <tr align="center" valign="middle">
<td align="right">Reference <td colspan="1" rowspan="1" align="right">Reference
in Content</td> in Content</td>
<td><a href="#not-recognized"><cite>Not recognized</cite></a></td> <td colspan="1" rowspan="1"><a href="#not-recognized"><cite>Not recognized</cite></a></td>
<td><a href="#included"><cite>Included</cite></a></td> <td colspan="1" rowspan="1"><a href="#included"><cite>Included</cite></a></td>
<td><a href="#include-if-valid"><cite>Included <td colspan="1" rowspan="1"><a href="#include-if-valid"><cite>Included
if validating</cite></a></td> if validating</cite></a></td>
<td><a href="#forbidden"><cite>Forbidden</cite></a></td> <td colspan="1" rowspan="1"><a href="#forbidden"><cite>Forbidden</cite></a></td>
<td><a href="#included"><cite>Included</cite></a></td> <td colspan="1" rowspan="1"><a href="#included"><cite>Included</cite></a></td>
</tr> </tr>
<tr align="center" valign="middle"> <tr align="center" valign="middle">
<td align="right">Reference in Attribute Value</td> <td colspan="1" rowspan="1" align="right">Reference in Attribute Value</td>
<td><a href="#not-recognized"><cite>Not recognized</cite></a></td> <td colspan="1" rowspan="1"><a href="#not-recognized"><cite>Not recognized</cite></a></td>
<td><a href="#inliteral"><cite>Included <td colspan="1" rowspan="1"><a href="#inliteral"><cite>Included
in literal</cite></a></td> in literal</cite></a></td>
<td><a href="#forbidden"><cite>Forbidden</cite></a></td> <td colspan="1" rowspan="1"><a href="#forbidden"><cite>Forbidden</cite></a></td>
<td><a href="#forbidden"><cite>Forbidden</cite></a></td> <td colspan="1" rowspan="1"><a href="#forbidden"><cite>Forbidden</cite></a></td>
<td><a href="#included"><cite>Included</cite></a></td> <td colspan="1" rowspan="1"><a href="#included"><cite>Included</cite></a></td>
</tr> </tr>
<tr align="center" valign="middle"> <tr align="center" valign="middle">
<td align="right">Occurs as Attribute <td colspan="1" rowspan="1" align="right">Occurs as Attribute
Value</td> Value</td>
<td><a href="#not-recognized"><cite>Not recognized</cite></a></td> <td colspan="1" rowspan="1"><a href="#not-recognized"><cite>Not recognized</cite></a></td>
<td><a href="#forbidden"><cite>Forbidden</cite></a></td> <td colspan="1" rowspan="1"><a href="#forbidden"><cite>Forbidden</cite></a></td>
<td><a href="#forbidden"><cite>Forbidden</cite></a></td> <td colspan="1" rowspan="1"><a href="#forbidden"><cite>Forbidden</cite></a></td>
<td><a href="#notify"><cite>Notify</cite></a></td> <td colspan="1" rowspan="1"><a href="#notify"><cite>Notify</cite></a></td>
<td><a href="#not-recognized"><cite>Not recognized</cite></a></td> <td colspan="1" rowspan="1"><a href="#not-recognized"><cite>Not recognized</cite></a></td>
</tr> </tr>
<tr align="center" valign="middle"> <tr align="center" valign="middle">
<td align="right">Reference in EntityValue</td> <td colspan="1" rowspan="1" align="right">Reference in EntityValue</td>
<td><a href="#inliteral"><cite>Included in literal</cite></a></td> <td colspan="1" rowspan="1"><a href="#inliteral"><cite>Included in literal</cite></a></td>
<td><a href="#bypass"><cite>Bypassed</cite></a></td> <td colspan="1" rowspan="1"><a href="#bypass"><cite>Bypassed</cite></a></td>
<td><a href="#bypass"><cite>Bypassed</cite></a></td> <td colspan="1" rowspan="1"><a href="#bypass"><cite>Bypassed</cite></a></td>
<td><a href="#forbidden"><cite>Forbidden</cite></a></td> <td colspan="1" rowspan="1"><a href="#forbidden"><cite>Forbidden</cite></a></td>
<td><a href="#included"><cite>Included</cite></a></td> <td colspan="1" rowspan="1"><a href="#included"><cite>Included</cite></a></td>
</tr> </tr>
<tr align="center" valign="middle"> <tr align="center" valign="middle">
<td align="right">Reference in DTD</td> <td colspan="1" rowspan="1" align="right">Reference in DTD</td>
<td><a href="#as-PE"><cite>Included <td colspan="1" rowspan="1"><a href="#as-PE"><cite>Included
as PE</cite></a></td> as PE</cite></a></td>
<td><a href="#forbidden"><cite>Forbidden</cite></a></td> <td colspan="1" rowspan="1"><a href="#forbidden"><cite>Forbidden</cite></a></td>
<td><a href="#forbidden"><cite>Forbidden</cite></a></td> <td colspan="1" rowspan="1"><a href="#forbidden"><cite>Forbidden</cite></a></td>
<td><a href="#forbidden"><cite>Forbidden</cite></a></td> <td colspan="1" rowspan="1"><a href="#forbidden"><cite>Forbidden</cite></a></td>
<td><a href="#forbidden"><cite>Forbidden</cite></a></td> <td colspan="1" rowspan="1"><a href="#forbidden"><cite>Forbidden</cite></a></td>
</tr> </tr>
</tbody></table> </tbody></table>
<div class="div3"> <div class="div3">
@@ -3641,75 +3641,75 @@ required of UTF-16 data streams is &quot;<code>#xFEFF</code>&quot;. The notation
<p>With a Byte Order Mark:</p> <p>With a Byte Order Mark:</p>
<table border="1" frame="border"><tbody> <table border="1" frame="border"><tbody>
<tr> <tr>
<td><code>00 00 FE <td colspan="1" rowspan="1"><code>00 00 FE
FF</code></td> FF</code></td>
<td>UCS-4, big-endian machine (1234 order)</td> <td colspan="1" rowspan="1">UCS-4, big-endian machine (1234 order)</td>
</tr> </tr>
<tr> <tr>
<td><code>FF <td colspan="1" rowspan="1"><code>FF
FE 00 00</code></td> FE 00 00</code></td>
<td>UCS-4, little-endian machine (4321 order)</td> <td colspan="1" rowspan="1">UCS-4, little-endian machine (4321 order)</td>
</tr> </tr>
<tr> <tr>
<td><code>00 00 FF FE</code></td> <td colspan="1" rowspan="1"><code>00 00 FF FE</code></td>
<td>UCS-4, unusual octet order (2143)</td> <td colspan="1" rowspan="1">UCS-4, unusual octet order (2143)</td>
</tr> </tr>
<tr> <tr>
<td><code>FE FF 00 00</code></td> <td colspan="1" rowspan="1"><code>FE FF 00 00</code></td>
<td>UCS-4, unusual octet order (3412)</td> <td colspan="1" rowspan="1">UCS-4, unusual octet order (3412)</td>
</tr> </tr>
<tr> <tr>
<td><code>FE FF ## ##</code></td> <td colspan="1" rowspan="1"><code>FE FF ## ##</code></td>
<td>UTF-16, big-endian</td> <td colspan="1" rowspan="1">UTF-16, big-endian</td>
</tr> </tr>
<tr> <tr>
<td><code>FF FE ## ##</code></td> <td colspan="1" rowspan="1"><code>FF FE ## ##</code></td>
<td>UTF-16, little-endian</td> <td colspan="1" rowspan="1">UTF-16, little-endian</td>
</tr> </tr>
<tr> <tr>
<td><code>EF BB BF</code></td> <td colspan="1" rowspan="1"><code>EF BB BF</code></td>
<td>UTF-8</td> <td colspan="1" rowspan="1">UTF-8</td>
</tr> </tr>
</tbody></table> </tbody></table>
<p>Without a Byte Order Mark:</p> <p>Without a Byte Order Mark:</p>
<table border="1" frame="border"><tbody> <table border="1" frame="border"><tbody>
<tr> <tr>
<td><code>00<EFBFBD>00<EFBFBD>00<EFBFBD>3C</code></td> <td colspan="1" rowspan="1"><code>00<EFBFBD>00<EFBFBD>00<EFBFBD>3C</code></td>
<td rowspan="4">UCS-4 or other encoding with a 32-bit code unit and ASCII <td colspan="1" rowspan="4">UCS-4 or other encoding with a 32-bit code unit and ASCII
characters encoded as ASCII values, in respectively big-endian (1234), little-endian characters encoded as ASCII values, in respectively big-endian (1234), little-endian
(4321) and two unusual byte orders (2143 and 3412). The encoding declaration (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 must be read to determine which of UCS-4 or other supported 32-bit encodings
applies.</td> applies.</td>
</tr> </tr>
<tr> <tr>
<td><code>3C 00 00 00</code></td> <td colspan="1" rowspan="1"><code>3C 00 00 00</code></td>
</tr> </tr>
<tr> <tr>
<td><code>00 00 3C 00</code></td> <td colspan="1" rowspan="1"><code>00 00 3C 00</code></td>
</tr> </tr>
<tr> <tr>
<td><code>00 3C 00 00</code></td> <td colspan="1" rowspan="1"><code>00 3C 00 00</code></td>
</tr> </tr>
<tr> <tr>
<td><code>00 3C 00 3F</code></td> <td colspan="1" rowspan="1"><code>00 3C 00 3F</code></td>
<td>UTF-16BE or big-endian ISO-10646-UCS-2 <td colspan="1" rowspan="1">UTF-16BE or big-endian ISO-10646-UCS-2
or other encoding with a 16-bit code unit in big-endian order and ASCII characters 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 encoded as ASCII values (the encoding declaration must be read to determine
which)</td> which)</td>
</tr> </tr>
<tr> <tr>
<td><code>3C 00 3F 00</code></td> <td colspan="1" rowspan="1"><code>3C 00 3F 00</code></td>
<td>UTF-16LE or little-endian <td colspan="1" rowspan="1">UTF-16LE or little-endian
ISO-10646-UCS-2 or other encoding with a 16-bit code unit in 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 order and ASCII characters encoded as ASCII values (the encoding declaration
must be read to determine which)</td> must be read to determine which)</td>
</tr> </tr>
<tr> <tr>
<td><code>3C 3F 78 6D</code></td> <td colspan="1" rowspan="1"><code>3C 3F 78 6D</code></td>
<td>UTF-8, ISO 646, ASCII, some part of ISO 8859, Shift-JIS, EUC, or any other <td colspan="1" rowspan="1">UTF-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 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 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 declaration must be read to detect which of these applies, but since all of
@@ -3717,14 +3717,14 @@ these encodings use the same bit patterns for the relevant ASCII characters,
the encoding declaration itself may be read reliably</td> the encoding declaration itself may be read reliably</td>
</tr> </tr>
<tr> <tr>
<td><code>4C <td colspan="1" rowspan="1"><code>4C
6F A7 94</code></td> 6F A7 94</code></td>
<td>EBCDIC (in some flavor; the full encoding declaration <td colspan="1" rowspan="1">EBCDIC (in some flavor; the full encoding declaration
must be read to tell which code page is in use)</td> must be read to tell which code page is in use)</td>
</tr> </tr>
<tr> <tr>
<td>Other</td> <td colspan="1" rowspan="1">Other</td>
<td>UTF-8 without an encoding declaration, or else the data stream is mislabeled <td colspan="1" rowspan="1">UTF-8 without an encoding declaration, or else the data stream is mislabeled
(lacking a required encoding declaration), corrupt, fragmentary, or enclosed (lacking a required encoding declaration), corrupt, fragmentary, or enclosed
in a wrapper of some kind</td> in a wrapper of some kind</td>
</tr> </tr>
@@ -3863,7 +3863,7 @@ Contact</i>) </li>
<div class="div1"> <div class="div1">
<h2> <h2>
<a name="id2668540"></a>I Production Notes (Non-Normative)</h2> <a name="id2675479"></a>I Production Notes (Non-Normative)</h2>
<p>This Second Edition was encoded in the <a href="http://www.w3.org/XML/1998/06/xmlspec-v21.dtd">XMLspec <p>This Second Edition was encoded in the <a href="http://www.w3.org/XML/1998/06/xmlspec-v21.dtd">XMLspec
DTD</a> (which has <a href="http://www.w3.org/XML/1998/06/xmlspec-report-v21.htm">documentation</a> DTD</a> (which has <a href="http://www.w3.org/XML/1998/06/xmlspec-report-v21.htm">documentation</a>
available). The HTML versions were produced with a combination of the <a href="http://www.w3.org/XML/1998/06/xmlspec.xsl">xmlspec.xsl</a>, <a href="http://www.w3.org/XML/1998/06/diffspec.xsl">diffspec.xsl</a>, available). The HTML versions were produced with a combination of the <a href="http://www.w3.org/XML/1998/06/xmlspec.xsl">xmlspec.xsl</a>, <a href="http://www.w3.org/XML/1998/06/diffspec.xsl">diffspec.xsl</a>,

4
xsltproc/xsltproc.c
View File

@@ -284,8 +284,8 @@ main(int argc, char **argv)
defaultLoader = xmlGetExternalEntityLoader(); defaultLoader = xmlGetExternalEntityLoader();
xmlLineNumbersDefault(1); xmlLineNumbersDefault(1);
if (novalid == 0) /* TODO XML_DETECT_IDS | XML_COMPLETE_ATTRS */ if (novalid == 0)
xmlLoadExtDtdDefaultValue = 6; xmlLoadExtDtdDefaultValue = XML_DETECT_IDS | XML_COMPLETE_ATTRS;
else else
xmlLoadExtDtdDefaultValue = 0; xmlLoadExtDtdDefaultValue = 0;
for (i = 1; i < argc; i++) { for (i = 1; i < argc; i++) {