Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed probles in some HTML tag autoclose, XML output bug on mixed-con…

…tent

and fixed the related output for tests, Daniel.
  • Loading branch information...
commit 7d2c276a65a077932bbe2ae5a1b3af304175f995 1 parent 6077d03
Daniel Veillard authored
Showing with 1,463 additions and 4,214 deletions.
  1. +6 −0 ChangeLog
  2. +5 −5 HTMLparser.c
  3. +0 −1  SAXresult/dtd1
  4. +1 −5 SAXresult/ent1
  5. +3 −10 SAXresult/ent2
  6. +4 −2 SAXresult/ent3
  7. +0 −1  SAXresult/ent4
  8. +1 −7 SAXresult/ent5
  9. +1 −0  SAXresult/p3p
  10. +2 −10 SAXresult/rdf2
  11. +0 −1  SAXresult/svg1
  12. +0 −1  SAXresult/svg2
  13. +3 −5 SAXresult/xml1
  14. +7 −8 SAXresult/xml2
  15. +1 −1  result/SVG/a-wf.xml
  16. +13 −6 result/SVG/bike.xml
  17. +2 −1  result/SVG/defs.xml
  18. +2 −1  result/SVG/desc.xml
  19. +2 −1  result/SVG/gradient.xml
  20. +1 −1  result/SVG/image-wf.xml
  21. +6 −3 result/SVG/marker.xml
  22. +10 −5 result/SVG/mathswitch.xml
  23. +6 −3 result/SVG/parentns.xml
  24. +2 −1  result/SVG/patternfill.xml
  25. +4 −2 result/SVG/private.xml
  26. +3 −4 result/SVG/richdesc.xml
  27. +3 −2 result/SVG/script.xml
  28. +4 −2 result/SVG/structure01.xml
  29. +3 −2 result/SVG/style.xml
  30. +6 −3 result/SVG/switch.xml
  31. +12 −6 result/SVG/symbol-use.xml
  32. +1 −1  result/SVG/template.xml
  33. +1 −3 result/SVG/toap01.xml
  34. +8 −4 result/SVG/transform.xml
  35. +2 −1  result/SVG/trivial.xml
  36. +4 −2 result/SVG/viewport-nest.xml
  37. +14 −7 result/SVG/viewport-transform.xml
  38. +4 −2 result/SVG/viewport.xml
  39. +2 −2 result/VC/ElementValid
  40. +2 −1  result/cdata
  41. +1 −4 result/dtd5
  42. +2 −1  result/ent1
  43. +1 −2  result/ent2
  44. +2 −1  result/noent/cdata
  45. +1 −1  result/noent/dtd11
  46. +1 −4 result/noent/dtd5
  47. +1 −3 result/noent/ent2
  48. +1,143 −3,437 result/valid/REC-xml-19980210.xml
  49. +107 −615 result/valid/xlink.xml
  50. +53 −23 tree.c
View
6 ChangeLog
@@ -1,3 +1,9 @@
+Mon Oct 11 14:31:58 CEST 1999 Daniel Veillard <Daniel.Veillard@w3.org>
+
+ * HTMLparser.c: fixed problems with some autoclose tags
+ * tree.c: fixed XML output problems.
+ * result/* SAXresult/*: update of the tests output
+
Sat Oct 9 11:02:57 CEST 1999 Daniel Veillard <Daniel.Veillard@w3.org>
* Makefile.am: Arturo patch for xmlConf.sh version info
View
10 HTMLparser.c
@@ -334,13 +334,13 @@ char *htmlStartClose[] = {
"TABLE", "P", "HEAD", "H1", "H2", "H3", "H4", "H5", "H6", "PRE",
"LISTING", "XMP", "A", NULL,
"TH", "TH", "TD", NULL,
-"TD", "TH", "TD", NULL,
-"TR", "TH", "TD", "TR", "CAPTION", "COL", "COLGROUP", NULL,
+"TD", "TH", "TD", "P", NULL,
+"TR", "TH", "TD", "TR", "CAPTION", "COL", "COLGROUP", "P", NULL,
"THEAD", "CAPTION", "COL", "COLGROUP", NULL,
"TFOOT", "TH", "TD", "TR", "CAPTION", "COL", "COLGROUP", "THEAD",
- "TBODY", NULL,
+ "TBODY", "P", NULL,
"TBODY", "TH", "TD", "TR", "CAPTION", "COL", "COLGROUP", "THEAD",
- "TFOOT", "TBODY", NULL,
+ "TFOOT", "TBODY", "P", NULL,
"OPTGROUP", "OPTION", NULL,
"FIELDSET", "LEGEND", "P", "HEAD", "H1", "H2", "H3", "H4", "H5", "H6",
"PRE", "LISTING", "XMP", "A", NULL,
@@ -2245,7 +2245,7 @@ htmlParseElement(htmlParserCtxtPtr ctxt) {
const xmlChar *openTag = CUR_PTR;
xmlChar *name;
xmlChar *oldname;
- xmlChar *currentNode;
+ xmlChar *currentNode = NULL;
htmlElemDescPtr info;
htmlParserNodeInfo node_info;
View
1  SAXresult/dtd1
@@ -1,7 +1,6 @@
SAX.setDocumentLocator()
SAX.startDocument()
SAX.internalSubset(MEMO, -//SGMLSOURCE//DTD MEMO//EN, http://www.sgmlsource.com/dtds/memo.dtd)
-SAX.resolveEntity(-//SGMLSOURCE//DTD MEMO//EN, http://www.sgmlsource.com/dtds/memo.dtd)
SAX.startElement(MEMO)
SAX.characters(
, 1)
View
6 SAXresult/ent1
@@ -1,17 +1,13 @@
SAX.setDocumentLocator()
SAX.startDocument()
SAX.internalSubset(EXAMPLE, (null), example.dtd)
-SAX.resolveEntity( , example.dtd)
SAX.entityDecl(xml, 1, (null), (null), Extensible Markup Language)
SAX.getEntity(xml)
SAX.startElement(EXAMPLE)
SAX.characters(
, 5)
SAX.getEntity(xml)
-SAX.isStandalone()
-SAX.hasInternalSubset()
-SAX.hasExternalSubset()
-SAX.error: Entity 'xml' not defined
+SAX.warning: Entity 'xml' not defined
SAX.characters(
, 1)
SAX.endElement(EXAMPLE)
View
13 SAXresult/ent2
@@ -1,26 +1,19 @@
SAX.setDocumentLocator()
SAX.startDocument()
SAX.internalSubset(EXAMPLE, (null), example.dtd)
-SAX.resolveEntity( , example.dtd)
SAX.entityDecl(xml, 1, (null), (null), Extensible Markup Language)
SAX.getEntity(xml)
SAX.entityDecl(title, 2, -//MY-TITLE//FR, title.xml, (null))
-SAX.entityDecl(image, 3, (null), img.gif, GIF)
+SAX.unparsedEntityDecl(image, (null), img.gif, GIF)
SAX.startElement(EXAMPLE)
SAX.characters(
, 3)
SAX.getEntity(title)
-SAX.isStandalone()
-SAX.hasInternalSubset()
-SAX.hasExternalSubset()
-SAX.error: Entity 'title' not defined
+SAX.warning: Entity 'title' not defined
SAX.characters(
This text is about XML, the, 31)
SAX.getEntity(xml)
-SAX.isStandalone()
-SAX.hasInternalSubset()
-SAX.hasExternalSubset()
-SAX.error: Entity 'xml' not defined
+SAX.warning: Entity 'xml' not defined
SAX.characters( and this is an embedded , 25)
SAX.startElement(IMG, src='image')
SAX.endElement(IMG)
View
6 SAXresult/ent3
@@ -1,10 +1,12 @@
SAX.setDocumentLocator()
SAX.startDocument()
SAX.internalSubset(EXAMPLE, (null), example.dtd)
-SAX.resolveEntity( , example.dtd)
SAX.entityDecl(xml, 1, (null), (null), Extensible Markup Language)
SAX.getEntity(xml)
-SAX.startElement(EXAMPLE, prop1='a&amp;b', prop2='&xml;')
+SAX.getEntity(amp)
+SAX.getEntity(xml)
+SAX.warning: Entity 'xml' not defined
+SAX.startElement(EXAMPLE, prop1='a&amp;b', prop2='')
SAX.characters(
Test of entities in attribu, 35)
SAX.endElement(EXAMPLE)
View
1  SAXresult/ent4
@@ -1,7 +1,6 @@
SAX.setDocumentLocator()
SAX.startDocument()
SAX.internalSubset(EXAMPLE, (null), example.dtd)
-SAX.resolveEntity( , example.dtd)
SAX.entityDecl(xml, 1, (null), (null), Extensible Markup Language)
SAX.getEntity(xml)
SAX.startElement(EXAMPLE)
View
8 SAXresult/ent5
@@ -2,12 +2,6 @@ SAX.setDocumentLocator()
SAX.startDocument()
SAX.startElement(EXAMPLE)
SAX.characters(
- This is an inverted excla, 42)
-SAX.characters(�, 1)
-SAX.characters(
- This is a space , 21)
-SAX.characters( , 1)
-SAX.characters(
-, 2)
+ This is an inverted excla, 67)
SAX.endElement(EXAMPLE)
SAX.endDocument()
View
1  SAXresult/p3p
@@ -41,6 +41,7 @@ SAX.characters(
SAX.startElement(USES)
SAX.characters(
, 3)
+SAX.getEntity(amp)
SAX.startElement(STATEMENT, action='read&amp;write', purp='0', recpnt='0', id='1')
SAX.characters(
, 5)
View
12 SAXresult/rdf2
@@ -68,21 +68,13 @@ SAX.endElement(RPM:Summary)
SAX.characters(
, 5)
SAX.startElement(RPM:Description)
-SAX.characters(Diese Library stellt dem Progr, 57)
-SAX.characters(�, 1)
-SAX.characters(ngige
-Routinen zur Ansteuerung, 57)
-SAX.characters(�, 1)
-SAX.characters(gung, die
-speziell optimiert s, 57)
+SAX.characters(Diese Library stellt dem Progr, 173)
SAX.getEntity(apos)
SAX.characters(', 1)
SAX.characters(new curses, 10)
SAX.getEntity(apos)
SAX.characters(', 1)
-SAX.characters( (ncurses) Variante und ist de, 51)
-SAX.characters(�, 1)
-SAX.characters(r die klassische Curses-Librar, 70)
+SAX.characters( (ncurses) Variante und ist de, 122)
SAX.endElement(RPM:Description)
SAX.characters(
, 5)
View
1  SAXresult/svg1
@@ -1,7 +1,6 @@
SAX.setDocumentLocator()
SAX.startDocument()
SAX.internalSubset(svg, -//W3C//DTD SVG April 1999//EN, http://www.w3.org/Graphics/SVG/svg-19990412.dtd)
-SAX.resolveEntity(-//W3C//DTD SVG April 1999//EN, http://www.w3.org/Graphics/SVG/svg-19990412.dtd)
SAX.startElement(svg, width='242px', height='383px')
SAX.characters(
, 1)
View
1  SAXresult/svg2
@@ -1,7 +1,6 @@
SAX.setDocumentLocator()
SAX.startDocument()
SAX.internalSubset(svg, -//W3C//DTD SVG April 1999//EN, http://www.w3.org/Graphics/SVG/svg-19990412.dtd)
-SAX.resolveEntity(-//W3C//DTD SVG April 1999//EN, http://www.w3.org/Graphics/SVG/svg-19990412.dtd)
SAX.startElement(svg, width='268px', height='207px')
SAX.characters(
, 1)
View
8 SAXresult/xml1
@@ -1,16 +1,14 @@
+xmlSAXUserParseFile returned error 26
SAX.setDocumentLocator()
SAX.startDocument()
SAX.internalSubset(test, (null), (null))
-SAX.getEntity(amp)
SAX.entityDecl(example, 1, (null), (null), <p>An ampersand (&#38;) may be escaped
numerically (&#38;#38;) or with a general entity
- (&amp;).</p>)
+ (&amp;amp;).</p>)
SAX.getEntity(example)
SAX.startElement(test)
SAX.getEntity(example)
-SAX.isStandalone()
-SAX.hasInternalSubset()
-SAX.hasExternalSubset()
SAX.error: Entity 'example' not defined
SAX.endElement(test)
SAX.endDocument()
+xmlSAXUserParseFile returned error 26
View
15 SAXresult/xml2
@@ -1,20 +1,19 @@
+xmlSAXUserParseFile returned error 27
SAX.setDocumentLocator()
SAX.startDocument()
SAX.internalSubset(test, (null), (null))
SAX.elementDecl(test, 3, ...)
SAX.entityDecl(xx, 4, (null), (null), %zz;)
-SAX.getEntity(xx)
+SAX.getParameterEntity(xx)
SAX.entityDecl(zz, 4, (null), (null), <!ENTITY tricky "error-prone" >)
-SAX.getEntity(zz)
-SAX.getEntity(xx)
-SAX.warning: xmlParsePEReference: %xx; not found
+SAX.getParameterEntity(zz)
+SAX.getParameterEntity(xx)
+SAX.error: PEReference: %xx; not found
SAX.startElement(test)
SAX.characters(This sample shows a , 20)
SAX.getEntity(tricky)
-SAX.isStandalone()
-SAX.hasInternalSubset()
-SAX.hasExternalSubset()
-SAX.error: Entity 'tricky' not defined
+SAX.warning: Entity 'tricky' not defined
SAX.characters( method., 8)
SAX.endElement(test)
SAX.endDocument()
+xmlSAXUserParseFile returned error 27
View
2  result/SVG/a-wf.xml
@@ -2,7 +2,7 @@
<svg xmlns="http://www.w3.org/Graphics/SVG/svg-19990412.dtd" width="4in" height="3in">
<desc>This well formed svg document draws a triangle which is a hyperlink
</desc>
- <a link="simple" show="replace" actuate="user" href="http://www.w3.org">
+ <a xml:link="simple" show="replace" actuate="user" href="http://www.w3.org">
<p d="M 0 0 L 200 0 L 100 200 Z"/>
</a>
</svg>
View
19 result/SVG/bike.xml
@@ -1,5 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG April 1999//EN" "http://www.w3.org/Graphics/SVG/svg-19990412.dtd">
+<!--DOCTYPE svg SYSTEM "svg-19990412.dtd"-->
<svg width="4in" height="3in">
<title>Kona Lavadome mountain bike
</title>
@@ -12,27 +13,33 @@
<defs>
<symbol id="spoke">
<desc>14/12 gauge double butted spoke</desc>
-<!-- the path data goes here --> </symbol>
+<!-- the path data goes here -->
+ </symbol>
<symbol id="hub">
<desc>black anodised low torsion hub</desc>
-<!--the path data goes here --> </symbol>
+<!--the path data goes here -->
+ </symbol>
<symbol id="rim">
<desc>twin wall, eyeletted rim</desc>
-<!-- the path data goes here--> </symbol>
+<!-- the path data goes here-->
+ </symbol>
<symbol id="cogs">
<desc>8 speed, wide ratio gearing</desc>
-<!--the path data goes here --> </symbol>
+<!--the path data goes here -->
+ </symbol>
<symbol id="lacing">
<desc>double cross lacing of 32 spokes</desc>
</symbol>
</defs>
-<!-- the overall bike drawing goes here --> <g id="frontwheel">
+<!-- the overall bike drawing goes here -->
+ <g id="frontwheel">
<title>Front wheel</title>
<desc>The front wheel provides grip, steering and some shock absorption</desc>
<use href="id(lacing)" style="rotation: 20deg; fillcolor: black"/>
</g>
<g id="backwheel"/>
<g id="frame">
-<!-- and so on --> </g>
+<!-- and so on -->
+ </g>
</g>
</svg>
View
3  result/SVG/defs.xml
@@ -10,4 +10,5 @@
<desc>Defining things for later use
</desc>
<!-- SVG elements in here would reference/use
- the elements defined in the <defs> --></svg>
+ the elements defined in the <defs> -->
+</svg>
View
3  result/SVG/desc.xml
@@ -9,5 +9,6 @@
This is a bar chart which shows
company sales by region.
</desc>
-<!-- Bar chart defined as vector data --> </g>
+<!-- Bar chart defined as vector data -->
+ </g>
</svg>
View
3  result/SVG/gradient.xml
@@ -6,7 +6,8 @@
<g>
<defs>
<lineargradient id="MyGradient">
-<!-- Define linear gradient here --> <gradientstop offset="0%" color="#F60"/>
+<!-- Define linear gradient here -->
+ <gradientstop offset="0%" color="#F60"/>
<gradientstop offset="70%" color="#FF6"/>
</lineargradient>
</defs>
View
2  result/SVG/image-wf.xml
@@ -2,7 +2,7 @@
<svg xmlns="http://www.w3.org/Graphics/SVG/svg-19990412.dtd" width="4in" height="3in">
<desc>This links to an external image
</desc>
- <image x="200" y="200" style="width: 100px; height: 100px" link="simple" show="embed" actuate="auto" href="myimage.png">
+ <image xml:link="simple" x="200" y="200" style="width: 100px; height: 100px" show="embed" actuate="auto" href="myimage.png">
<title>My image</title>
</image>
</svg>
View
9 result/SVG/marker.xml
@@ -10,11 +10,14 @@
</desc>
<path d="M0 0">
<!-- Place an arrowhead rotated 180 degrees at the
- beginning of the path --> <marker href="#Triangle" width="200" height="200" style="text-transform: rotate(180)"/>
+ beginning of the path -->
+ <marker href="#Triangle" width="200" height="200" style="text-transform: rotate(180)"/>
<data d="M 2000 2000"/>
-<!-- Turn off markers in the middle of the path --> <marker href=""/>
+<!-- Turn off markers in the middle of the path -->
+ <marker href=""/>
<data d="L 4000 2000 L 4000 4000"/>
-<!-- Place an arrowhead at the end of the path--> <marker href="#Triangle" width="200" height="200"/>
+<!-- Place an arrowhead at the end of the path-->
+ <marker href="#Triangle" width="200" height="200"/>
<data d="L 6000 4000"/>
</path>
</svg>
View
15 result/SVG/mathswitch.xml
@@ -5,16 +5,21 @@
MathML is not supported.
</desc>
<!-- The <switch> element will process the first child element
- whose testing attributes evaluate to true.--> <switch>
+ whose testing attributes evaluate to true.-->
+ <switch>
<!-- Process the MathML if the system-required attribute
evaluates to true (i.e., the user agent supports MathML
- embedded within SVG). --> <foreignobject system-required="http://www.w3.org/TR/REC-MathML-19980407" width="100" height="50">
-<!-- MathML content goes here --> </foreignobject>
+ embedded within SVG). -->
+ <foreignobject system-required="http://www.w3.org/TR/REC-MathML-19980407" width="100" height="50">
+<!-- MathML content goes here -->
+ </foreignobject>
<!-- Else, process the following alternate SVG.
Note that there are no testing attributes on the <g> element.
If no testing attributes are provided, it is as if there
- were testing attributes and they evaluated to true.--> <g>
-<!-- Draw a red rectangle with a text string on top. --> <rect style="fill: red"/>
+ were testing attributes and they evaluated to true.-->
+ <g>
+<!-- Draw a red rectangle with a text string on top. -->
+ <rect style="fill: red"/>
<text>Formula goes here</text>
</g>
</switch>
View
9 result/SVG/parentns.xml
@@ -1,6 +1,9 @@
<?xml version="1.0"?>
<ABC xmlns="http://parent.name.space" xmlns:svg="http://www.w3.org/Graphics/SVG/1.0">
-<!-- document in the parent namespace --> <svg:svg width="40%" height="40%">
+<!-- document in the parent namespace -->
+ <svg:svg width="40%" height="40%">
<svg:rectangle width="43.6" height="31.5"/>
-<!-- svg graphic continues --> </svg:svg>
-<!-- document in parent namespace continues --></ABC>
+<!-- svg graphic continues -->
+ </svg:svg>
+<!-- document in parent namespace continues -->
+</ABC>
View
3  result/SVG/patternfill.xml
@@ -4,7 +4,8 @@
<defs>
<symbol id="fourstar">
<!-- Define the pattern using standard graphics elements
- such as paths, images, text and shapes --> </symbol>
+ such as paths, images, text and shapes -->
+ </symbol>
</defs>
<ellipse style="fill: url(#fourstar)" major="40" minor="27"/>
</svg>
View
6 result/SVG/private.xml
@@ -7,10 +7,12 @@
<myapp:piece label="Eastern Region" value="2.53"/>
<myapp:piece label="Southern Region" value="3.89"/>
<myapp:piece label="Western Region" value="2.04"/>
-<!-- Other private data goes here --> </myapp:piechart>
+<!-- Other private data goes here -->
+ </myapp:piechart>
</private>
</defs>
<desc>This chart includes private data in another namespace
</desc>
<!-- In here would be the actual graphics elements which
- draw the pie chart --></svg>
+ draw the pie chart -->
+</svg>
View
7 result/SVG/richdesc.xml
@@ -3,10 +3,9 @@
<desc xmlns:mydoc="http://foo.org/mydoc">
<mydoc:title>This is an example SVG file</mydoc:title>
<mydoc:para>The global description uses markup from the
-
- <mydoc:emph>mydoc</mydoc:emph>
- namespace. </mydoc:para>
+ <mydoc:emph>mydoc</mydoc:emph> namespace.</mydoc:para>
</desc>
<g>
-<!-- the picture goes here --> </g>
+<!-- the picture goes here -->
+ </g>
</svg>
View
5 result/SVG/script.xml
@@ -2,10 +2,11 @@
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG April 1999//EN" "http://www.w3.org/Graphics/SVG/svg-19990412.dtd">
<svg width="4in" height="3in">
<defs>
- <script>
+ <script>
+<![CDATA[
/* Beep on mouseclick */
MouseClickHandler() { beep(); }
- &gt;
+ ]]>
</script>
</defs>
<circle onclick="MouseClickHandler()" r="85"/>
View
6 result/SVG/structure01.xml
@@ -1,6 +1,8 @@
<?xml version="1.0" standalone="yes"?>
<parent xmlns="http://someplace.org" xmlns:svg="http://www.w3.org/Graphics/SVG/svg-19990412.dtd">
-<!-- parent stuff here --> <svg:svg width="5cm" height="8cm">
+<!-- parent stuff here -->
+ <svg:svg width="5cm" height="8cm">
<svg:ellipse major="200" minor="130"/>
</svg:svg>
-<!-- ... --></parent>
+<!-- ... -->
+</parent>
View
5 result/SVG/style.xml
@@ -2,8 +2,9 @@
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG April 1999//EN" "http://www.w3.org/Graphics/SVG/svg-19990412.dtd">
<svg width="4in" height="3in">
<defs>
- <style>
- .TitleText { font-size: 16; font-family: Helvetica } &gt;
+ <style>
+<![CDATA[
+ .TitleText { font-size: 16; font-family: Helvetica } ]]>
</style>
</defs>
<text class="TitleText">Here is my title</text>
View
9 result/SVG/switch.xml
@@ -3,11 +3,14 @@
<body>
<!-- The SMIL <switch> element will process the
first child element which tests true and skip
- past all others. --> <switch>
+ past all others. -->
+ <switch>
<!-- The system-required attribute tests to see if
the user agent supports SVG. If true, then
- render the file drawing.svg. --> <ref system-required="http://www.w3.org/Graphics/SVG/svg-19990412.dtd" type="image/svg" src="drawing.svg"/>
-<!-- Else, render the alternate image. --> <img src="alternate_image.jpg"/>
+ render the file drawing.svg. -->
+ <ref system-required="http://www.w3.org/Graphics/SVG/svg-19990412.dtd" type="image/svg" src="drawing.svg"/>
+<!-- Else, render the alternate image. -->
+ <img src="alternate_image.jpg"/>
</switch>
</body>
</smil>
View
18 result/SVG/symbol-use.xml
@@ -3,14 +3,20 @@
<svg width="4in" height="3in">
<defs>
<symbol id="TemplateObject01">
-<!-- symbol definition here --> </symbol>
+<!-- symbol definition here -->
+ </symbol>
</defs>
<desc>Examples of inline and referenced content
</desc>
-<!-- <g> with inline content --> <g>
-<!-- Inline content goes here --> </g>
-<!-- referenced content --> <use href="#TemplateObject01"/>
-<!-- <g> with both referenced and inline content --> <g>
+<!-- <g> with inline content -->
+ <g>
+<!-- Inline content goes here -->
+ </g>
+<!-- referenced content -->
+ <use href="#TemplateObject01"/>
+<!-- <g> with both referenced and inline content -->
+ <g>
<use href="#TemplateObject01"/>
-<!-- Inline content goes here --> </g>
+<!-- Inline content goes here -->
+ </g>
</svg>
View
2  result/SVG/template.xml
@@ -2,7 +2,7 @@
<svg xmlns="http://www.w3.org/Graphics/SVG/svg-19990412.dtd" width="4in" height="3in">
<desc>This well formed svg document contains a hyperlink
</desc>
- <a link="simple" show="replace" actuate="user" href="http://www.w3.org">
+ <a xml:link="simple" show="replace" actuate="user" href="http://www.w3.org">
<p d="M 0 0 L 200 0 L 100 200 Z"/>
</a>
</svg>
View
4 result/SVG/toap01.xml
@@ -4,7 +4,5 @@
<desc>Simple text on a path
</desc>
<path id="MyPath" style="visibility: hidden" d="M 100 100 C 125 125 175 125 200 100"/>
- <text>
- <textpath href="#MyPath"/>
-Text on path </text>
+ <text><textpath href="#MyPath"/>Text on path</text>
</svg>
View
12 result/SVG/transform.xml
@@ -4,13 +4,17 @@
<desc>Demonstration of coordinate transforms
</desc>
<!-- The following two text elements will both draw with a
- font height of 12 pixels --> <text style="font-size: 12">This prints 12 pixels high.</text>
+ font height of 12 pixels -->
+ <text style="font-size: 12">This prints 12 pixels high.</text>
<text style="font-size: 12px">This prints 12 pixels high.</text>
-<!-- Now scale the coordinate system by 2. --> <g style="transform: scale(2)">
+<!-- Now scale the coordinate system by 2. -->
+ <g style="transform: scale(2)">
<!-- The following text will actually draw 24 pixels high
because each unit in the new coordinate system equals
- 2 units in the previous coordinate system. --> <text style="font-size: 12">This prints 24 pixels high.</text>
+ 2 units in the previous coordinate system. -->
+ <text style="font-size: 12">This prints 24 pixels high.</text>
<!-- The following text will actually still draw 12 pixels high
- because the CSS unit specifier has been provided. --> <text style="font-size: 12px">This prints 12 pixels high.</text>
+ because the CSS unit specifier has been provided. -->
+ <text style="font-size: 12px">This prints 12 pixels high.</text>
</g>
</svg>
View
3  result/SVG/trivial.xml
@@ -1,3 +1,4 @@
<?xml version="1.0" standalone="yes"?>
<svg xmlns="http://www.w3.org/Graphics/SVG/svg-19990412.dtd" width="4in" height="3in">
-<!-- Insert drawing elements here --></svg>
+<!-- Insert drawing elements here -->
+</svg>
View
6 result/SVG/viewport-nest.xml
@@ -5,6 +5,8 @@
thus establishing a new viewport
</desc>
<!-- The following statement establishing a new viewport
- and renders SVG drawing B into that viewport --> <svg style="left: 25%; top: 25%" width="50%" height="50%">
-<!-- drawing B goes here --> </svg>
+ and renders SVG drawing B into that viewport -->
+ <svg style="left: 25%; top: 25%" width="50%" height="50%">
+<!-- drawing B goes here -->
+ </svg>
</svg>
View
21 result/SVG/viewport-transform.xml
@@ -4,25 +4,32 @@
<desc>Transformation with establishment of a new viewport
</desc>
<!-- The following two text elements will both draw with a
- font height of 12 pixels --> <text style="font-size: 12">This prints 12 pixels high.</text>
+ font height of 12 pixels -->
+ <text style="font-size: 12">This prints 12 pixels high.</text>
<text style="font-size: 12px">This prints 12 pixels high.</text>
-<!-- Now scale the coordinate system by 2. --> <g style="transform: scale(2)">
+<!-- Now scale the coordinate system by 2. -->
+ <g style="transform: scale(2)">
<!-- The following text will actually draw 24 pixels high
because each unit in the new coordinate system equals
- 2 units in the previous coordinate system. --> <text style="font-size: 12">This prints 24 pixels high.</text>
+ 2 units in the previous coordinate system. -->
+ <text style="font-size: 12">This prints 24 pixels high.</text>
<!-- The following text will actually still draw 12 pixels high
- because the CSS unit specifier has been provided. --> <text style="font-size: 12px">This prints 12 pixels high.</text>
+ because the CSS unit specifier has been provided. -->
+ <text style="font-size: 12px">This prints 12 pixels high.</text>
</g>
-<!-- This time, scale the coordinate system by 3. --> <g style="transform: scale(3)">
+<!-- This time, scale the coordinate system by 3. -->
+ <g style="transform: scale(3)">
<!-- Establish a new viewport and thus change the meaning of
- some CSS unit specifiers. --> <svg style="left:0; top:0; right:100; bottom:100" width="100%" height="100%">
+ some CSS unit specifiers. -->
+ <svg style="left:0; top:0; right:100; bottom:100" width="100%" height="100%">
<!-- The following two text elements will both draw with a
font height of 36 screen pixels. The first text element
defines its height in user coordinates, which have been
scaled by 3. The second text element defines its height
in CSS px units, which have been redefined to be three times
as big as screen pixels due the <svg> element establishing
- a new viewport. --> <text style="font-size: 12">This prints 36 pixels high.</text>
+ a new viewport. -->
+ <text style="font-size: 12">This prints 36 pixels high.</text>
<text style="font-size: 12px">This prints 36 pixels high.</text>
</svg>
</g>
View
6 result/SVG/viewport.xml
@@ -1,6 +1,8 @@
<?xml version="1.0" standalone="yes"?>
<parent xmlns="http://some.url">
-<!-- SVG graphic --> <svg xmlns="http://www.w3.org/Graphics/SVG/svg-19990412.dtd" width="100px" height="200px">
+<!-- SVG graphic -->
+ <svg xmlns="http://www.w3.org/Graphics/SVG/svg-19990412.dtd" width="100px" height="200px">
<path d="M100,100 Q200,400,300,100"/>
-<!-- rest of SVG graphic would go here --> </svg>
+<!-- rest of SVG graphic would go here -->
+ </svg>
</parent>
View
4 result/VC/ElementValid
@@ -1,3 +1,3 @@
-./test/VC/ElementValid:3: validity error: No declaration for element doc
+./test/VC/ElementValid:3: validity error: Validation failed: no DTD found !
<doc/>
- ^
+ ^
View
3  result/cdata
@@ -1,3 +1,4 @@
<?xml version="1.0"?>
<doc>
-<![CDATA[<greeting>Hello, world!</greeting>]]></doc>
+<![CDATA[<greeting>Hello, world!</greeting>]]>
+</doc>
View
5 result/dtd5
@@ -4,7 +4,4 @@
<!ELEMENT a (#PCDATA)>
<!ELEMENT b (#PCDATA)>
]>
-<doc>
- <a>This</a>
- is a <b>valid</b>
- document</doc>
+<doc><a>This</a> is a <b>valid</b> document</doc>
View
3  result/ent1
@@ -3,4 +3,5 @@
<!ENTITY xml "Extensible Markup Language">
]>
<EXAMPLE>
- &xml;</EXAMPLE>
+ &xml;
+</EXAMPLE>
View
3  result/ent2
@@ -6,6 +6,5 @@
]>
<EXAMPLE>
&title;
- This text is about XML, the &xml; and this is an embedded
- <IMG src="image"/>
+ This text is about XML, the &xml; and this is an embedded <IMG src="image"/>
</EXAMPLE>
View
3  result/noent/cdata
@@ -1,3 +1,4 @@
<?xml version="1.0"?>
<doc>
-<![CDATA[<greeting>Hello, world!</greeting>]]></doc>
+<![CDATA[<greeting>Hello, world!</greeting>]]>
+</doc>
View
2  result/noent/dtd11
@@ -3,4 +3,4 @@
<!ELEMENT doc (#PCDATA)>
<!ATTLIST doc val CDATA #IMPLIED>
]>
-<doc val=""/>
+<doc val="v1"/>
View
5 result/noent/dtd5
@@ -4,7 +4,4 @@
<!ELEMENT a (#PCDATA)>
<!ELEMENT b (#PCDATA)>
]>
-<doc>
- <a>This</a>
- is a <b>valid</b>
- document</doc>
+<doc><a>This</a> is a <b>valid</b> document</doc>
View
4 result/noent/ent2
@@ -6,7 +6,5 @@
]>
<EXAMPLE>
- This text is about XML, the Extensible Markup Language and this is an embedded
- <IMG src="image"/>
-
+ This text is about XML, the Extensible Markup Language and this is an embedded <IMG src="image"/>
</EXAMPLE>
View
4,580 result/valid/REC-xml-19980210.xml
1,143 additions, 3,437 deletions not shown
View
722 result/valid/xlink.xml
@@ -14,9 +14,7 @@ type="text/css"?>
<?Pub Dtl?>
<title>XML Linking Language (XLink)</title>
<version>Version 1.0</version>
- <w3c-designation>
-<!-- &doc-type;-&iso6.doc.date; -->
- WD-xlink-19990527 </w3c-designation>
+ <w3c-designation><!-- &doc-type;-&iso6.doc.date; --> WD-xlink-19990527</w3c-designation>
<w3c-doctype>World Wide Web Consortium Working Draft</w3c-doctype>
<pubdate>
<day>29</day>
@@ -61,24 +59,12 @@ type="text/css"?>
<EMAIL>tbray@textuality.com</EMAIL> </AUTHOR>-->
</authlist>
<status>
- <p>This is a W3C Working Draft for review by W3C members and other interested parties. It is a draft document and may be updated, replaced, or obsoleted by other documents at any time. It is inappropriate to use W3C Working Drafts as reference material or to cite them as other than &quot;work in progress&quot;. A list of current W3C working drafts can be found at
- <loc href="http://www.w3.org/TR">http://www.w3.org/TR</loc>
-. </p>
- <p>
- <emph>Note:</emph>
- Since working drafts are subject to frequent change, you are advised to reference the above URI, rather than the URIs for working drafts themselves. Some of the work remaining is described in <specref ref="unfinished"/>
-. </p>
- <p>This work is part of the W3C XML Activity (for current status, see
- <loc href="http://www.w3.org/MarkUp/SGML/Activity">http://www.w3.org/XML/Activity </loc>
-). For information about the XPointer language which is expected to be used with XLink, see <loc href="http://www.w3.org/MarkUp/SGML/Activity">http://www.w3.org/TR/WD-xptr</loc>
-.
- </p>
- <p>See
- <loc href="http://www.w3.org/TR/NOTE-xlink-principles">http://www.w3.org/TR/NOTE-xlink-principles </loc>
- for additional background on the design principles informing XLink. </p>
- <p>Also see
- <loc href="http://www.w3.org/TR/NOTE-xlink-req/">http://www.w3.org/TR/NOTE-xlink-req/</loc>
- for the XLink requirements that this document attempts to satisfy. </p>
+ <p>This is a W3C Working Draft for review by W3C members and other interested parties. It is a draft document and may be updated, replaced, or obsoleted by other documents at any time. It is inappropriate to use W3C Working Drafts as reference material or to cite them as other than &quot;work in progress&quot;. A list of current W3C working drafts can be found at <loc href="http://www.w3.org/TR">http://www.w3.org/TR</loc>.</p>
+ <p><emph>Note:</emph> Since working drafts are subject to frequent change, you are advised to reference the above URI, rather than the URIs for working drafts themselves. Some of the work remaining is described in <specref ref="unfinished"/>. </p>
+ <p>This work is part of the W3C XML Activity (for current status, see <loc href="http://www.w3.org/MarkUp/SGML/Activity">http://www.w3.org/XML/Activity </loc>). For information about the XPointer language which is expected to be used with XLink, see <loc href="http://www.w3.org/MarkUp/SGML/Activity">http://www.w3.org/TR/WD-xptr</loc>.
+ </p>
+ <p>See <loc href="http://www.w3.org/TR/NOTE-xlink-principles">http://www.w3.org/TR/NOTE-xlink-principles </loc> for additional background on the design principles informing XLink.</p>
+ <p>Also see <loc href="http://www.w3.org/TR/NOTE-xlink-req/">http://www.w3.org/TR/NOTE-xlink-req/</loc> for the XLink requirements that this document attempts to satisfy.</p>
</status>
<abstract>
<!-- edited the abstract for further clarity - bent -->
@@ -121,533 +107,120 @@ type="text/css"?>
<div1>
<?Pub Dtl?>
<head>Introduction</head>
- <p>This specification defines constructs that may be inserted into XML DTDs, schemas, and document instances to describe links between objects. A
- <termref def="dt-link">link</termref>
-, as the term is used here, is an explicit relationship between two or more data objects or portions of data objects. This specification is concerned with the syntax used to assert link existence and describe link characteristics. Implicit (unasserted) relationships, for example that of one word to the next or that of a word in a text to its entry in an on-line dictionary are obviously important, but outside its scope. </p>
- <p>Links are asserted by
- <xtermref href="WD-xml-lang.html#dt-element">elements </xtermref>
- contained in <xtermref href="WD-xml-lang.html#dt-xml-doc">XML document instances</xtermref>
-. The simplest case is very like an HTML <code>A</code>
- link, and has these characteristics:
- <ulist>
- <item>
- <p>The link is expressed at one of its ends (similar to the
- <code>A</code>
- element in some document) </p>
- </item>
- <item>
- <p>Users can only initiate travel from that end to the other</p>
- </item>
- <item>
- <p>The link&apos;s effect on windows, frames, go-back lists, stylesheets in use, and so on is mainly determined by browsers, not by the link itself. For example, traveral of
- <code>A</code>
- links normally replaces the current view, perhaps with a user option to open a new window. </p>
- </item>
- <item>
- <p>The link goes to only one destination (although a server may have great freedom in finding or dynamically creating that destination).</p>
- </item>
- </ulist>
-
- </p>
+ <p>This specification defines constructs that may be inserted into XML DTDs, schemas, and document instances to describe links between objects. A <termref def="dt-link">link</termref>, as the term is used here, is an explicit relationship between two or more data objects or portions of data objects. This specification is concerned with the syntax used to assert link existence and describe link characteristics. Implicit (unasserted) relationships, for example that of one word to the next or that of a word in a text to its entry in an on-line dictionary are obviously important, but outside its scope.</p>
+ <p>Links are asserted by <xtermref href="WD-xml-lang.html#dt-element">elements </xtermref> contained in <xtermref href="WD-xml-lang.html#dt-xml-doc">XML document instances</xtermref>. The simplest case is very like an HTML <code>A</code> link, and has these characteristics:
+ <ulist><item><p>The link is expressed at one of its ends (similar to the <code>A</code> element in some document)</p></item><item><p>Users can only initiate travel from that end to the other</p></item><item><p>The link&apos;s effect on windows, frames, go-back lists, stylesheets in use, and so on is mainly determined by browsers, not by the link itself. For example, traveral of <code>A</code> links normally replaces the current view, perhaps with a user option to open a new window.</p></item><item><p>The link goes to only one destination (although a server may have great freedom in finding or dynamically creating that destination).</p></item></ulist>
+ </p>
<p>While this set of characteristics is already very powerful and obviously has proven itself highly useful and effective, each of these assumptions also limits the range of hypertext functionality. The linking model defined here provides ways to create links that go beyond each of these specific characteristics, thus providing features previously available mostly in dedicated hypermedia systems.
</p>
<div2>
<head>Origin and Goals</head>
<p>Following is a summary of the design principles governing XLink:
-
- <olist>
- <item>
- <p>XLink must be straightforwardly usable over the Internet. </p>
- </item>
- <item>
- <p>XLink must be usable by a wide variety of link usage domains and classes of linking application software.</p>
- </item>
- <item>
- <p>XLink must support HTML 4.0 linking constructs.</p>
- </item>
- <item>
- <p>The XLink expression language must be XML.</p>
- </item>
- <item>
- <p>The XLink design must be formal, concise, and illustrative.</p>
- </item>
- <item>
- <p>XLinks must be human-readable and human-writable.</p>
- </item>
- <item>
- <p>XLinks may reside within or outside the documents in which the
- participating resources reside. </p>
- </item>
- <item>
- <p>XLink must represent the abstract structure and significance of links.</p>
- </item>
- <item>
- <p>XLink must be feasible to implement.</p>
- </item>
- <item>
- <p>XLink must be informed by knowledge of established hypermedia systems and standards.</p>
- </item>
- </olist>
-
- </p>
+ <olist><item><p>XLink must be straightforwardly usable over the Internet. </p></item><item><p>XLink must be usable by a wide variety of link usage domains and classes of linking application software.</p></item><item><p>XLink must support HTML 4.0 linking constructs.</p></item><item><p>The XLink expression language must be XML.</p></item><item><p>The XLink design must be formal, concise, and illustrative.</p></item><item><p>XLinks must be human-readable and human-writable.</p></item><item><p>XLinks may reside within or outside the documents in which the
+ participating resources reside. </p></item><item><p>XLink must represent the abstract structure and significance of links.</p></item><item><p>XLink must be feasible to implement.</p></item><item><p>XLink must be informed by knowledge of established hypermedia systems and standards.</p></item></olist>
+ </p>
</div2>
<!--Changed the list of requirements to reflect current XLink requirements
document. bent-->
<div2>
<head>Relationship to Existing Standards</head>
<p>Three standards have been especially influential:
-
- <ulist>
- <item>
- <p>
- <emph>HTML:</emph>
- Defines several SGML element types that represent links. </p>
- </item>
- <item>
- <p>
- <emph>HyTime:</emph>
- Defines inline and out-of-line link structures and some semantic features, including traversal control and presentation of objects. <!--Changed from "placement of objects into a display or other space" -elm-->
-
- </p>
- </item>
- <item>
- <p>
- <emph>Text Encoding Initiative Guidelines (TEI P3):</emph>
- Provides structures for creating links, aggregate objects, and link collections out of them. </p>
- </item>
- </ulist>
-
- </p>
+ <ulist><item><p><emph>HTML:</emph> Defines several SGML element types that represent links.</p></item><item><p><emph>HyTime:</emph> Defines inline and out-of-line link structures and some semantic features, including traversal control and presentation of objects. <!--Changed from "placement of objects into a display or other space" -elm-->
+ </p></item><item><p><emph>Text Encoding Initiative Guidelines (TEI P3):</emph> Provides structures for creating links, aggregate objects, and link collections out of them.</p></item></ulist>
+ </p>
<p>Many other linking systems have also informed this design, especially Dexter, FRESS, MicroCosm, and InterMedia.</p>
</div2>
<div2>
<head>Terminology</head>
- <p>The following basic terms apply in this document.
-<!--<IMG
+ <p>The following basic terms apply in this document. <!--<IMG
SRC="local://./linkdiag.gif">(figure to be inserted)-->
-
- <glist>
- <gitem>
- <label>
- <termdef id="dt-arc" term="Arc">arc</termdef>
- </label>
- <def>
- <p>A symbolic representation of traversal behavior in links, especially the direction, context and timing of traversal.</p>
- </def>
- </gitem>
- <gitem>
- <label>
- <termdef id="dt-eltree" term="Element Tree">element tree</termdef>
- </label>
- <def>
- <p>A representation of the relevant structure specified by the tags and attributes in an XML document, based on &quot;groves&quot; as defined in the ISO DSSSL standard. </p>
- </def>
- </gitem>
- <gitem>
- <label>
- <termdef id="dt-inline" term="In-Line Link">inline link</termdef>
- </label>
- <def>
- <p>Abstractly, a
- <termref def="dt-link">link</termref>
- which serves as one of its own <termref def="dt-resource">resources</termref>
-. Concretely, a link where the content of the <termref def="dt-linkel">linking element</termref>
- serves as a <termref def="dt-particip-resource">participating resource</termref>
-.
- HTML <code>A</code>
-, HyTime <code>clink</code>
-, and TEI <code>XREF</code>
-
- are all inline links. </p>
- </def>
- </gitem>
- <gitem>
- <label>
- <termdef id="dt-link" term="Link">link</termdef>
- </label>
- <def>
- <p>An explicit relationship between two or more data objects or portions of data objects.</p>
- </def>
- </gitem>
- <gitem>
- <label>
- <termdef id="dt-linkel" term="Linking Element">linking element </termdef>
- </label>
- <def>
- <p>An
- <xtermref href="WD-xml-lang.html#dt-element">element</xtermref>
- that asserts the existence and describes the characteristics of a <termref def="dt-link"> link</termref>
-. </p>
- </def>
- </gitem>
- <gitem>
- <label>
- <termdef id="dt-local-resource" term="Local Resource">local resource</termdef>
- </label>
- <def>
- <p>The content of an
- <termref def="dt-inline">inline</termref>
-linking element. Note that the content of the linking element could be explicitly pointed to by means of a regular <termref def="dt-locator">locator</termref>
- in the same linking element, in which case the resource is considered <termref def="dt-remote-resource"> remote</termref>
-, not local. </p>
- </def>
- </gitem>
- <gitem>
- <label>
- <termdef id="dt-locator" term="Locator">locator</termdef>
- </label>
- <def>
- <p>Data, provided as part of a link, which identifies a
-
- <termref def="dt-resource">resource</termref>
-. </p>
- </def>
- </gitem>
- <gitem>
- <label>
- <termdef id="dt-multidir" term="Multi-Directional Link">multidirectional link</termdef>
- </label>
- <def>
- <p>A
- <termref def="dt-link">link</termref>
- whose <termref def="dt-traversal"> traversal</termref>
- can be initiated from more than one of its <termref def="dt-particip-resource"> participating resources</termref>
-. Note that being able to &quot;go back&quot; after following a one-directional link does not make the link multidirectional. </p>
- </def>
- </gitem>
- <gitem>
- <label>
- <termdef id="dt-outofline" term="Out-of-line Link">out-of-line link</termdef>
- </label>
- <def>
- <p>A
- <termref def="dt-link">link</termref>
- whose content does not serve as one of the link&apos;s <termref def="dt-particip-resource">participating resources </termref>
-. Such links presuppose a notion like <termref def="dt-xlg">extended link groups</termref>
-, which instruct application software where to look for links. Out-of-line links are generally required for supporting multidirectional <termref def="dt-traversal">traversal</termref>
- and for allowing read-only resources to have outgoing links. </p>
- </def>
- </gitem>
- <gitem>
- <label>
- <termdef id="dt-parsedq" term="Parsed">parsed</termdef>
- </label>
- <def>
- <p>In the context of link behavior, a parsed link is any link whose content is transcluded into the document where the link originated. The use of the term &quot;parsed&quot; directly refers to the concept in XML of a
- parsed entity.</p>
- </def>
- </gitem>
- <gitem>
- <label>
- <termdef id="dt-particip-resource" term="Participating Resource"> participating resource</termdef>
- </label>
- <def>
- <p>A
- <termref def="dt-resource">resource</termref>
- that belongs to a link. All resources are potential contributors to a link; participating resources are the actual contributors to a particular link. </p>
- </def>
- </gitem>
- <gitem>
- <label>
- <termdef id="dt-remote-resource" term="Remote Resource">remote resource</termdef>
- </label>
- <def>
- <p>Any participating resource of a link that is pointed to with a locator. </p>
- </def>
- </gitem>
- <gitem>
- <label>
- <termdef id="dt-resource" term="Resource">resource</termdef>
- </label>
- <def>
- <p>In the abstract sense, an addressable unit of information or service that is participating in a
- <termref def="dt-link">link</termref>
-. Examples include files, images, documents, programs, and query results. Concretely, anything reachable by the use of a <termref def="dt-locator">locator</termref>
- in some <termref def="dt-linkel">linking element</termref>
-. Note that this term and its definition are taken from the basic specifications governing the World Wide Web. <!--Joel notes: need link here. bent asks: A link?-->
-
- </p>
- </def>
- </gitem>
- <gitem>
- <label>
- <termdef id="dt-subresource" term="sub-Resource">sub-resource</termdef>
- </label>
- <def>
- <p>A portion of a resource, pointed to as the precise destination of a link. As one example, a link might specify that an entire document be retrieved and displayed, but that some specific part(s) of it is the specific linked data, to be treated in an application-appropriate manner such as indication by highlighting, scrolling, etc.</p>
- </def>
- </gitem>
- <gitem>
- <label>
- <termdef id="dt-traversal" term="Traversal">traversal</termdef>
- </label>
- <def>
- <p>The action of using a
- <termref def="dt-link">link</termref>
-; that is, of accessing a <termref def="dt-resource">resource</termref>
-. Traversal may be initiated by a user action (for example, clicking on the displayed content of a <termref def="dt-linkel">linking element</termref>
-) or occur under program control. </p>
- </def>
- </gitem>
- </glist>
-
- </p>
+ <glist><gitem><label><termdef id="dt-arc" term="Arc">arc</termdef></label><def><p>A symbolic representation of traversal behavior in links, especially the direction, context and timing of traversal.</p></def></gitem><gitem><label><termdef id="dt-eltree" term="Element Tree">element tree</termdef></label><def><p>A representation of the relevant structure specified by the tags and attributes in an XML document, based on &quot;groves&quot; as defined in the ISO DSSSL standard. </p></def></gitem><gitem><label><termdef id="dt-inline" term="In-Line Link">inline link</termdef></label><def><p>Abstractly, a <termref def="dt-link">link</termref> which serves as one of its own <termref def="dt-resource">resources</termref>. Concretely, a link where the content of the <termref def="dt-linkel">linking element</termref> serves as a <termref def="dt-particip-resource">participating resource</termref>.
+ HTML <code>A</code>, HyTime <code>clink</code>, and TEI <code>XREF</code>
+ are all inline links.</p></def></gitem><gitem><label><termdef id="dt-link" term="Link">link</termdef></label><def><p>An explicit relationship between two or more data objects or portions of data objects.</p></def></gitem><gitem><label><termdef id="dt-linkel" term="Linking Element">linking element </termdef></label><def><p>An <xtermref href="WD-xml-lang.html#dt-element">element</xtermref> that asserts the existence and describes the characteristics of a <termref def="dt-link"> link</termref>.</p></def></gitem><gitem><label><termdef id="dt-local-resource" term="Local Resource">local resource</termdef></label><def><p>The content of an <termref def="dt-inline">inline</termref>linking element. Note that the content of the linking element could be explicitly pointed to by means of a regular <termref def="dt-locator">locator</termref> in the same linking element, in which case the resource is considered <termref def="dt-remote-resource"> remote</termref>, not local.</p></def></gitem><gitem><label><termdef id="dt-locator" term="Locator">locator</termdef> </label><def><p>Data, provided as part of a link, which identifies a
+ <termref def="dt-resource">resource</termref>.</p></def></gitem><gitem><label><termdef id="dt-multidir" term="Multi-Directional Link">multidirectional link</termdef></label><def><p>A <termref def="dt-link">link</termref> whose <termref def="dt-traversal"> traversal</termref> can be initiated from more than one of its <termref def="dt-particip-resource"> participating resources</termref>. Note that being able to &quot;go back&quot; after following a one-directional link does not make the link multidirectional.</p></def></gitem><gitem><label><termdef id="dt-outofline" term="Out-of-line Link">out-of-line link</termdef></label><def><p>A <termref def="dt-link">link</termref> whose content does not serve as one of the link&apos;s <termref def="dt-particip-resource">participating resources </termref>. Such links presuppose a notion like <termref def="dt-xlg">extended link groups</termref>, which instruct application software where to look for links. Out-of-line links are generally required for supporting multidirectional <termref def="dt-traversal">traversal</termref> and for allowing read-only resources to have outgoing links.</p></def></gitem><gitem><label><termdef id="dt-parsedq" term="Parsed">parsed</termdef></label><def><p>In the context of link behavior, a parsed link is any link whose content is transcluded into the document where the link originated. The use of the term &quot;parsed&quot; directly refers to the concept in XML of a
+ parsed entity.</p></def></gitem><gitem><label><termdef id="dt-particip-resource" term="Participating Resource"> participating resource</termdef></label><def><p>A <termref def="dt-resource">resource</termref> that belongs to a link. All resources are potential contributors to a link; participating resources are the actual contributors to a particular link.</p></def></gitem><gitem><label><termdef id="dt-remote-resource" term="Remote Resource">remote resource</termdef></label><def><p>Any participating resource of a link that is pointed to with a locator. </p></def></gitem><gitem><label><termdef id="dt-resource" term="Resource">resource</termdef></label><def><p>In the abstract sense, an addressable unit of information or service that is participating in a <termref def="dt-link">link</termref>. Examples include files, images, documents, programs, and query results. Concretely, anything reachable by the use of a <termref def="dt-locator">locator</termref> in some <termref def="dt-linkel">linking element</termref>. Note that this term and its definition are taken from the basic specifications governing the World Wide Web. <!--Joel notes: need link here. bent asks: A link?-->
+ </p></def></gitem><gitem><label><termdef id="dt-subresource" term="sub-Resource">sub-resource</termdef></label><def><p>A portion of a resource, pointed to as the precise destination of a link. As one example, a link might specify that an entire document be retrieved and displayed, but that some specific part(s) of it is the specific linked data, to be treated in an application-appropriate manner such as indication by highlighting, scrolling, etc.</p></def></gitem><gitem><label><termdef id="dt-traversal" term="Traversal">traversal</termdef></label><def><p>The action of using a <termref def="dt-link">link</termref>; that is, of accessing a <termref def="dt-resource">resource</termref>. Traversal may be initiated by a user action (for example, clicking on the displayed content of a <termref def="dt-linkel">linking element</termref>) or occur under program control.</p></def></gitem></glist>
+ </p>
</div2>
<div2>
<head>Notation</head>
- <p>The formal grammar for
- <termref def="dt-locator">locators</termref>
- is given using a simple Extended Backus-Naur Form (EBNF) location, as described in <xspecref href="http://www.w3.org/TR/REC-xml#sec-notation">the XML specification</xspecref>
-. </p>
+ <p>The formal grammar for <termref def="dt-locator">locators</termref> is given using a simple Extended Backus-Naur Form (EBNF) location, as described in <xspecref href="http://www.w3.org/TR/REC-xml#sec-notation">the XML specification</xspecref>.</p>
<!-- fixed link to XML spec - bent -->
</div2>
</div1>
<div1 id="addressing">
<?Pub Dtl?>
<head>Locator Syntax</head>
- <p>The locator for a
- <termref def="dt-resource">resource</termref>
- is typically provided by means of a Uniform Resource Identifier, or URI. XPointers can be used in conjunction with the URI structure, as fragment identifiers, to specify a more precise sub-resource. </p>
+ <p>The locator for a <termref def="dt-resource">resource</termref> is typically provided by means of a Uniform Resource Identifier, or URI. XPointers can be used in conjunction with the URI structure, as fragment identifiers, to specify a more precise sub-resource. </p>
<!-- Removed the discussion of queries from the previous paragraph, due to contention within the WG. bent -->
- <p>A locator generally contains a URI, as described in IETF RFCs
- <bibref ref="rfc1738"/>
- and <bibref ref="rfc1808"/>
-. As these RFCs state, the URI may include a trailing <emph>query</emph>
- (marked by a leading &quot; <code>?</code>
-&quot;), and be followed by a &quot; <code>#</code>
-&quot; and a <emph>fragment identifier</emph>
-, with the query interpreted by the host providing the indicated resource, and the interpretation of the fragment identifier dependent on the data type of the indicated resource. </p>
+ <p>A locator generally contains a URI, as described in IETF RFCs <bibref ref="rfc1738"/> and <bibref ref="rfc1808"/>. As these RFCs state, the URI may include a trailing <emph>query</emph> (marked by a leading &quot;<code>?</code>&quot;), and be followed by a &quot;<code>#</code>&quot; and a <emph>fragment identifier</emph>, with the query interpreted by the host providing the indicated resource, and the interpretation of the fragment identifier dependent on the data type of the indicated resource.</p>
<!--Is there some restriction on URNs having queries and/or fragment identifiers? Since these RFCs don't mention URIs explicitly, should the wording here lead from URLs to URIs more explicitly? -elm-->
- <p>In order to locate XML documents and portions of documents, a locator value may contain either a
- <xtermref href="http://www.w3.org/Addressing/rfc1738.txt"> URI</xtermref>
- or a fragment identifier, or both. Any fragment identifier for pointing into XML must be an <xtermref href="http://www.w3.org/TR/WD-xptr#dt-xpointer"> XPointer</xtermref>
-. </p>
+ <p>In order to locate XML documents and portions of documents, a locator value may contain either a <xtermref href="http://www.w3.org/Addressing/rfc1738.txt"> URI</xtermref> or a fragment identifier, or both. Any fragment identifier for pointing into XML must be an <xtermref href="http://www.w3.org/TR/WD-xptr#dt-xpointer"> XPointer</xtermref>.</p>
<p>Special syntax may be used to request the use of particular processing models in accessing the locator&apos;s resource. This is designed to reflect the realities of network operation, where it may or may not be desirable to exercise fine control over the distribution of work between local and remote processors.
-
- <scrap id="locator" lang="ebnf">
- <head>Locator</head>
- <prod id="nt-locator">
- <lhs>Locator</lhs>
- <rhs>
- <nt def="nt-uri">URI</nt>
- </rhs>
- <rhs>|
- <nt def="nt-connector">Connector</nt>
- ( <xnt href="http://www.w3.org/TR/WD-xptr">XPointer</xnt>
- | <xnt href="WD-xml-lang.html#NT-Name">Name</xnt>
-) </rhs>
- <rhs>|
- <nt def="nt-uri">URI</nt>
- <nt def="nt-connector">Connector</nt>
- ( <xnt href="http://www.w3.org/TR/WD-xptr">XPointer</xnt>
- | <xnt href="WD-xml-lang.html#NT-Name">Name</xnt>
-) </rhs>
- </prod>
- <prod id="nt-connector">
- <lhs>Connector</lhs>
- <rhs>&apos;#&apos; | &apos;|&apos;</rhs>
- </prod>
- <prod id="nt-uri">
- <lhs>URI</lhs>
- <rhs>
- <xnt href="WD-xml-lang.html#NT-URLchar">URIchar*</xnt>
- </rhs>
- </prod>
- </scrap>
-
- </p>
- <p>
- <termdef id="dt-designated" term="Designated Resource">In this discussion, the term
- <term>designated resource</term>
- refers to the resource which an entire locator serves to locate. </termdef>
- The following rules apply:
- <ulist>
- <item>
- <p>
- <termdef id="dt-containing-resource" term="Containing Resource"> The URI, if provided, locates a resource called the
- <term>containing resource</term>
-. </termdef>
- </p>
- </item>
- <item>
- <p>If the URI is not provided, the containing resource is considered to be the document in which the linking element is contained.
- </p>
- </item>
- <item>
- <p>
- <termdef id="dt-sub-resource" term="Sub-Resource">If an XPointer is provided, the designated resource is a
- <term>sub-resource</term>
-
+ <scrap id="locator" lang="ebnf"><head>Locator</head><prod id="nt-locator"><lhs>Locator</lhs><rhs><nt def="nt-uri">URI</nt></rhs><rhs>| <nt def="nt-connector">Connector</nt> (<xnt href="http://www.w3.org/TR/WD-xptr">XPointer</xnt> | <xnt href="WD-xml-lang.html#NT-Name">Name</xnt>)</rhs><rhs>| <nt def="nt-uri">URI</nt> <nt def="nt-connector">Connector</nt> (<xnt href="http://www.w3.org/TR/WD-xptr">XPointer</xnt> | <xnt href="WD-xml-lang.html#NT-Name">Name</xnt>)</rhs></prod><prod id="nt-connector"><lhs>Connector</lhs><rhs>&apos;#&apos; | &apos;|&apos;</rhs></prod><prod id="nt-uri"><lhs>URI</lhs><rhs><xnt href="WD-xml-lang.html#NT-URLchar">URIchar*</xnt></rhs></prod></scrap>
+ </p>
+ <p><termdef id="dt-designated" term="Designated Resource">In this discussion, the term <term>designated resource</term> refers to the resource which an entire locator serves to locate.</termdef> The following rules apply:
+ <ulist><item><p><termdef id="dt-containing-resource" term="Containing Resource"> The URI, if provided, locates a resource called the <term>containing resource</term>.</termdef></p></item><item><p>If the URI is not provided, the containing resource is considered to be the document in which the linking element is contained.
+ </p></item><item><p><termdef id="dt-sub-resource" term="Sub-Resource">If an XPointer is provided, the designated resource is a <term>sub-resource</term>
of the containing resource; otherwise the designated resource is the
- containing resource. </termdef>
- </p>
- </item>
-<!--Is this now incorrect, given the nature of the switch from here() to origin()? -elm
- Oy, yes, i think so. it will require some fun wording, though, so i haven't fixed it yet here -sjd-->
- <item>
- <p>If the
- <nt def="nt-connector">Connector</nt>
- is followed directly by a <xnt href="http://www.w3.org/TR/REC-xml#NT-Name">Name</xnt>
-, the <xnt href="http://www.w3.org/TR/REC-xml#NT-Name">Name</xnt>
- is shorthand for the XPointer&quot; <code>id(Name)</code>
-&quot;; that is, the sub-resource is the element in the containing resource that has an XML <xtermref href="http://www.w3.org/TR/REC-xml#sec-attrtypes">ID attribute</xtermref>
- whose value <xtermref href="http://www.w3.org/TR/REC-xml#dt-match">matches</xtermref>
- the <xnt href="http://www.w3.org/TR/REC-xml#NT-Name">Name</xnt>
-. This shorthand is to encourage use of the robust <code>id</code>
- addressing mode. </p>
- </item>
-<!-- fixed links to the XML recommendation - bent -->
- <item>
- <p>If the connector is &quot;
- <code>#</code>
-&quot;, this signals an intent that the containing resource is to be fetched as a whole from the host that provides it, and that the XPointer processing to extract the sub-resource
- is to be performed on the client, that is to say on the same system where the linking element is recognized and processed. </p>
- </item>
- <item>
- <p>If the connector is &quot;
- <code>|</code>
-&quot;, no intent is signaled as to what processing model is to be used to go about accessing the designated resource. </p>
- </item>
- </ulist>
-
- </p>
+ containing resource.</termdef></p></item><!--Is this now incorrect, given the nature of the switch from here() to origin()? -elm
+ Oy, yes, i think so. it will require some fun wording, though, so i haven't fixed it yet here -sjd--><item><p>If the <nt def="nt-connector">Connector</nt> is followed directly by a <xnt href="http://www.w3.org/TR/REC-xml#NT-Name">Name</xnt>, the <xnt href="http://www.w3.org/TR/REC-xml#NT-Name">Name</xnt> is shorthand for the XPointer&quot;<code>id(Name)</code>&quot;; that is, the sub-resource is the element in the containing resource that has an XML <xtermref href="http://www.w3.org/TR/REC-xml#sec-attrtypes">ID attribute</xtermref> whose value <xtermref href="http://www.w3.org/TR/REC-xml#dt-match">matches</xtermref> the <xnt href="http://www.w3.org/TR/REC-xml#NT-Name">Name</xnt>. This shorthand is to encourage use of the robust <code>id</code> addressing mode.</p></item><!-- fixed links to the XML recommendation - bent --><item><p>If the connector is &quot;<code>#</code>&quot;, this signals an intent that the containing resource is to be fetched as a whole from the host that provides it, and that the XPointer processing to extract the sub-resource
+ is to be performed on the client, that is to say on the same system where the linking element is recognized and processed.</p></item><item><p>If the connector is &quot;<code>|</code>&quot;, no intent is signaled as to what processing model is to be used to go about accessing the designated resource.</p></item></ulist>
+ </p>
<p>Note that the definition of a URI includes an optional query component. </p>
<p>In the case where the URI contains a query (to be interpreted by the server), information providers and authors of server software are urged to use queries as follows:
-
- <scrap id="querysyntax" lang="ebnf">
- <head>Query</head>
- <prod id="nt-query">
- <lhs>Query</lhs>
- <rhs>&apos;XML-XPTR=&apos; (
- <xnt href="http://www.w3.org/TR/WD-xptr"> XPointer</xnt>
- | <xnt href="http://www.w3.org/TR/REC-xml#NT-Name">Name</xnt>
-) </rhs>
- </prod>
- </scrap>
-
- </p>
+ <scrap id="querysyntax" lang="ebnf"><head>Query</head><prod id="nt-query"><lhs>Query</lhs><rhs>&apos;XML-XPTR=&apos; (<xnt href="http://www.w3.org/TR/WD-xptr"> XPointer</xnt> | <xnt href="http://www.w3.org/TR/REC-xml#NT-Name">Name</xnt>)</rhs></prod></scrap>
+ </p>
<!-- fixed link to XML recommendation - bent -->
</div1>
<div1>
<?Pub Dtl?>
<head>Link Recognition</head>
- <p>The existence of a
- <termref def="dt-link">link</termref>
- is asserted by a <termref def="dt-linkel">linking element</termref>
-. Linking elements must be recognized reliably by application software in order to provide appropriate display and behavior. There are several ways link recognition could be accomplished: for example, reserving element type names, reserving attributes names, leaving the matter of recognition entirely up to stylesheets and application software, or using the XLink <xtermref href="http://www.w3.org/TR/REC-xml-names/">namespace</xtermref>
- to specify element names and attribute names that would be recognized by namespace and XLink-aware processors. Using element and attribute names within the XLink namespace provides a balance between giving users control of their own markup language design and keeping the identification of linking elements simple and unambiguous. </p>
- <p>The two approaches to identifying linking elements are relatively simple to implement. For example, here&apos;s how the HTML
- <code>A</code>
- element would be declared using attributes within the XLink namespace, and then how an element within the XLink namespace might do the same:
- <eg>&lt;A xlink:type=&quot;simple&quot; xlink:href=&quot;http://www.w3.org/TR/wd-xlink/&quot;
+ <p>The existence of a <termref def="dt-link">link</termref> is asserted by a <termref def="dt-linkel">linking element</termref>. Linking elements must be recognized reliably by application software in order to provide appropriate display and behavior. There are several ways link recognition could be accomplished: for example, reserving element type names, reserving attributes names, leaving the matter of recognition entirely up to stylesheets and application software, or using the XLink <xtermref href="http://www.w3.org/TR/REC-xml-names/">namespace</xtermref> to specify element names and attribute names that would be recognized by namespace and XLink-aware processors. Using element and attribute names within the XLink namespace provides a balance between giving users control of their own markup language design and keeping the identification of linking elements simple and unambiguous.</p>
+ <p>The two approaches to identifying linking elements are relatively simple to implement. For example, here&apos;s how the HTML <code>A</code> element would be declared using attributes within the XLink namespace, and then how an element within the XLink namespace might do the same:
+ <eg>&lt;A xlink:type=&quot;simple&quot; xlink:href=&quot;http://www.w3.org/TR/wd-xlink/&quot;
xlink:title=&quot;The Xlink Working Draft&quot;&gt;The XLink Working Draft.&lt;/A&gt;</eg>
-
- <eg>&lt;xlink:simple href=&quot;http://www.w3.org/TR/wd-xlink/&quot;
+ <eg>&lt;xlink:simple href=&quot;http://www.w3.org/TR/wd-xlink/&quot;
title=&quot;The XLink Working Draft&quot;&gt;The XLink Working Draft&lt;/xlink:simple&gt;</eg>
-
- Any arbitrary element can be made into an XLink by using the <code>xlink:type</code>
- attribute. And, of course, the explicit XLink elements may be used, as well. This document will go on to describe the linking attributes that are associated with linking elements. It may be assumed by the reader that these attributes would require the <code>xlink</code>
- namespace prefix if they existed within an arbitrary element, or that they may be used directly if they exist within an explicit Xlink element. </p>
+ Any arbitrary element can be made into an XLink by using the <code>xlink:type</code> attribute. And, of course, the explicit XLink elements may be used, as well. This document will go on to describe the linking attributes that are associated with linking elements. It may be assumed by the reader that these attributes would require the <code>xlink</code> namespace prefix if they existed within an arbitrary element, or that they may be used directly if they exist within an explicit Xlink element.</p>
<!-- heavily modified this section to accomodate namespace-aware link recognition - bent -->
</div1>
<!-- Rewrote this entire section. - bent -->
<div1>
<head>Linking Attributes</head>
- <p>XLink has several attributes associated with the variety of links it may represent. These attributes define four main concepts: locators, arcs, behaviors, and semantics.
- <emph>Locators</emph>
- define where the actual resource is located. <emph>Arcs</emph>
- define the traversal of links. Where does the link come from? Where does it go to? All this information can be stored in the arc attributes. <emph>Behaviors</emph>
- define how the link is activated, and what the application should do with the resource being linked to. <emph>Semantics</emph>
- define useful information that the application may use, and enables the link for such specalized targets as constricted devices and accessibility software. </p>
+ <p>XLink has several attributes associated with the variety of links it may represent. These attributes define four main concepts: locators, arcs, behaviors, and semantics. <emph>Locators</emph> define where the actual resource is located. <emph>Arcs</emph> define the traversal of links. Where does the link come from? Where does it go to? All this information can be stored in the arc attributes. <emph>Behaviors</emph> define how the link is activated, and what the application should do with the resource being linked to. <emph>Semantics</emph> define useful information that the application may use, and enables the link for such specalized targets as constricted devices and accessibility software.</p>
<div2 id="link-locators">
<head>Locator Attributes</head>
- <p>The only locator attribute at this time is
- <code>href</code>
-. This attribute must contain either a string in the form of a URI that defines the remote resource being linked to, a string containing a fragment identifier that links to a local resource, or a string containing a URI with a fragment identifier concacenated onto it. </p>
+ <p>The only locator attribute at this time is <code>href</code>. This attribute must contain either a string in the form of a URI that defines the remote resource being linked to, a string containing a fragment identifier that links to a local resource, or a string containing a URI with a fragment identifier concacenated onto it.</p>
</div2>
<div2 id="link-arcs">
<head>Arc Attributes</head>
- <p>Arcs contain two attributes,
- <code>from</code>
- and <code>to</code>
-. The <code>from</code>
- attribute may contain a string containing the content of a <code>role</code>
- attribute from the resource being linked from. The purpose of the <code>from</code>
- attribute is to define where this link is being actuated from. </p>
- <p>The
- <code>to</code>
- attribute may contain a string containing the content of a <code>role</code>
- attribute from the resource being linked to. The purpose of the <code>to</code>
- attribute is to define where this link traverses to. </p>
+ <p>Arcs contain two attributes, <code>from</code> and <code>to</code>. The <code>from</code> attribute may contain a string containing the content of a <code>role</code> attribute from the resource being linked from. The purpose of the <code>from</code> attribute is to define where this link is being actuated from.</p>
+ <p>The <code>to</code> attribute may contain a string containing the content of a <code>role</code> attribute from the resource being linked to. The purpose of the <code>to</code> attribute is to define where this link traverses to.</p>
<p>The application may use this information in a number of ways, especially in a complex hypertext system, but it is mainly useful in providing context for application behavior.</p>
<!-- I'm at a loss as to how to describe arcs more clearly than this. I don't want to devolve into discussions of directed graphs and n-ary links. -bent -->
</div2>
<div2 id="link-behaviors">
<head>Behavior Attributes</head>
- <p>There are two attributes associated with behavior:
- <code>show</code>
- and <code>actuate</code>
-. The <code>show</code>
- attribute defines how the remote resource is to be revealed to the user. It has three options: <code>new</code>
-, <code>parsed</code>
-, and <code>replace</code>
-. The <code>new</code>
- option indicates that the remote resource should be shown in a new window (or other device context) without replacing the previous content. The <code>parsed</code>
- option, relating directly to the XML concept of a parsed entity, indicates that the content should be integrated into the document from which the link was actuated. The <code>replace</code>
- option is the one most commonly seen on the World Wide Web, where the document being linked from is entirely replaced by the object being linked to. </p>
- <p>The
- <code>actuate</code>
- attribute defines how the link is initiated. It has two options: <code>user</code>
- and <code>auto</code>
-. The <code>user</code>
- option indicates that the link must be initiated by some sort of human-initiated selection, such as clicking on an HTML anchor. The <code>auto</code>
- option indicates that the link is automatically initiated when the application deems that the user has reached the link. It then follows the behavior set out in the <code>show</code>
- option. </p>
+ <p>There are two attributes associated with behavior: <code>show</code> and <code>actuate</code>. The <code>show</code> attribute defines how the remote resource is to be revealed to the user. It has three options: <code>new</code>, <code>parsed</code>, and <code>replace</code>. The <code>new</code> option indicates that the remote resource should be shown in a new window (or other device context) without replacing the previous content. The <code>parsed</code> option, relating directly to the XML concept of a parsed entity, indicates that the content should be integrated into the document from which the link was actuated. The <code>replace</code> option is the one most commonly seen on the World Wide Web, where the document being linked from is entirely replaced by the object being linked to.</p>
+ <p>The <code>actuate</code> attribute defines how the link is initiated. It has two options: <code>user</code> and <code>auto</code>. The <code>user</code> option indicates that the link must be initiated by some sort of human-initiated selection, such as clicking on an HTML anchor. The <code>auto</code> option indicates that the link is automatically initiated when the application deems that the user has reached the link. It then follows the behavior set out in the <code>show</code> option.</p>
<!-- Something should be put here in terms of an example. Idea: "A" link versus automatically updating encyclopedia. -bent -->
</div2>
<div2 id="link-semantics">
<head>Semantic Attributes</head>
- <p>There are two attributes associated with semantics,
- <code>role</code>
- and <code>title</code>
-. The <code>role</code>
- attribute is a generic string used to describe the function of the link&apos;s content. For example, a poem might have a link with a <code>role=&quot;stanza&quot;</code>
-. The <code>role</code>
- is also used as an identifier for the <code>from</code>
- and <code>to</code>
- attributes of arcs. </p>
- <p>The
- <code>title</code>
- attribute is designed to provide human-readable text describing the link. It is very useful for those who have text-based applications, whether that be due to a constricted device that cannot display the link&apos;s content, or if it&apos;s being read by an application to a visually-impaired user, or if it&apos;s being used to create a table of links. The <code>title</code>
- attribute contains a simple, descriptive string. </p>
+ <p>There are two attributes associated with semantics, <code>role</code> and <code>title</code>. The <code>role</code> attribute is a generic string used to describe the function of the link&apos;s content. For example, a poem might have a link with a <code>role=&quot;stanza&quot;</code>. The <code>role</code> is also used as an identifier for the <code>from</code> and <code>to</code> attributes of arcs.</p>
+ <p>The <code>title</code> attribute is designed to provide human-readable text describing the link. It is very useful for those who have text-based applications, whether that be due to a constricted device that cannot display the link&apos;s content, or if it&apos;s being read by an application to a visually-impaired user, or if it&apos;s being used to create a table of links. The <code>title</code> attribute contains a simple, descriptive string.</p>
</div2>
</div1>
<div1 id="linking-elements">
<head>Linking Elements</head>
- <p>There are several kinds of linking elements in XLink:
- <code>simple</code>
- links, <code>locators</code>
-, <code>arcs</code>
-, and <code>extended</code>
- links. These elements may be instantiated via element declarations from the XLink namespace, or they may be instantiated via attribute declarations from the XLink namespace. Both kinds of instantiation are described in the definition of each linking element. </p>
- <p>The
- <code>simple</code>
- link is used to declare a link that approximates the functionality of the HTML <code>A</code>
- element. It has, however, a few added features to increase its value, including the potential declaration of semantics and behavior. The <code>locator</code>
- elements are used to define the resource being linked to. Some links may contain multiple locators, representing a choice of potential links to be traversed. The <code>arcs</code>
- are used to define the traversal semantics of the link. Finally, an <code>extended</code>
- linking element differs from a simple link in that it can connect any number of resources, not just one local resource (optionally) and one remote resource, and in that extended links are more often out-of-line than simple links. </p>
+ <p>There are several kinds of linking elements in XLink: <code>simple</code> links, <code>locators</code>, <code>arcs</code>, and <code>extended</code> links. These elements may be instantiated via element declarations from the XLink namespace, or they may be instantiated via attribute declarations from the XLink namespace. Both kinds of instantiation are described in the definition of each linking element.</p>
+ <p>The <code>simple</code> link is used to declare a link that approximates the functionality of the HTML <code>A</code> element. It has, however, a few added features to increase its value, including the potential declaration of semantics and behavior. The <code>locator</code> elements are used to define the resource being linked to. Some links may contain multiple locators, representing a choice of potential links to be traversed. The <code>arcs</code> are used to define the traversal semantics of the link. Finally, an <code>extended</code> linking element differs from a simple link in that it can connect any number of resources, not just one local resource (optionally) and one remote resource, and in that extended links are more often out-of-line than simple links.</p>
<div2 id="simple-links">
<head>Simple Links</head>
- <p id="dt-simplelink">
- <termdef id="dt-simpleline" term="Simple Link">
- <term>Simple links</term>
- can be used for purposes that approximate the functionality of a basic HTML <code>A</code>
- link, but they can also support a limited amount of additional functionality. Simple links have only one locator and thus, for convenience, combine the functions of a linking element and a locator into a single element. </termdef>
- As a result of this combination, the simple linking element offers both a locator attribute and all the behavior and semantic attributes. </p>
+ <p id="dt-simplelink"><termdef id="dt-simpleline" term="Simple Link"><term>Simple links</term> can be used for purposes that approximate the functionality of a basic HTML <code>A</code> link, but they can also support a limited amount of additional functionality. Simple links have only one locator and thus, for convenience, combine the functions of a linking element and a locator into a single element.</termdef> As a result of this combination, the simple linking element offers both a locator attribute and all the behavior and semantic attributes.</p>
<p>The following are two examples of linking elements, each showing all the possible attributes that can be associated with a simple link. Here is the explicit XLink simple linking element.
-
- <eg>&lt;!ELEMENT xlink:simple ANY&gt;
+ <eg>&lt;!ELEMENT xlink:simple ANY&gt;
&lt;!ATTLIST xlink:slink
href CDATA #REQUIRED
role CDATA #IMPLIED
@@ -655,9 +228,8 @@ title=&quot;The XLink Working Draft&quot;&gt;The XLink Working Draft&lt;/xlink:s
show (new|parsed|replace) &quot;replace&quot;
actuate (user|auto) &quot;user&quot;
&gt;</eg>
-
And here is how to make an arbitrary element into a simple link.
- <eg>&lt;!ELEMENT xlink:simple ANY&gt;
+ <eg>&lt;!ELEMENT xlink:simple ANY&gt;
&lt;!ATTLIST foo
xlink:type (simple|extended|locator|arc) #FIXED &quot;simple&quot;
xlink:href CDATA #REQUIRED
@@ -666,28 +238,22 @@ title=&quot;The XLink Working Draft&quot;&gt;The XLink Working Draft&lt;/xlink:s
xlink:show (new|parsed|replace) &quot;replace&quot;
xlink:actuate (user|auto) &quot;user&quot;
&gt;</eg>
-
Here is how the first example might look in a document:
- <eg>&lt;xlink:simple href=&quot;http://www.w3.org/TR/wd-xlink&quot; role=&quot;working draft&quot;
+<eg>&lt;xlink:simple href=&quot;http://www.w3.org/TR/wd-xlink&quot; role=&quot;working draft&quot;
title=&quot;The XLink Working Draft&quot; show=&quot;replace&quot; actuate=&quot;user&quot;&gt;
The XLink Working Draft.&lt;/xlink:simple&gt;</eg>
-
- <eg>&lt;foo xlink:href=&quot;http://www.w3.org/TR/wd-xlink&quot; xlink:role=&quot;working draft&quot;
+<eg>&lt;foo xlink:href=&quot;http://www.w3.org/TR/wd-xlink&quot; xlink:role=&quot;working draft&quot;
xlink:title=&quot;The XLink Working Draft&quot; xlink:show=&quot;new&quot; xlink:actuate=&quot;user&quot;&gt;
The XLink Working Draft.&lt;/foo&gt;</eg>
-
Alternately, a simple link could be as terse as this:
- <eg>&lt;foo xlink:href=&quot;#stanza1&quot;&gt;The First Stanza.&lt;/foo&gt;</eg>
-
- </p>
+<eg>&lt;foo xlink:href=&quot;#stanza1&quot;&gt;The First Stanza.&lt;/foo&gt;</eg>
+ </p>
<p>
There are no constraints on the contents of a simple linking element. In
- the sample declaration above, it is given a content model of
- <code>ANY</code>
-
+ the sample declaration above, it is given a content model of <code>ANY</code>
to illustrate that any content model or declared content is acceptable. In
a valid document, every element that is significant to XLink must still conform
- to the constraints expressed in its governing DTD. </p>
+ to the constraints expressed in its governing DTD.</p>
<p>Note that it is meaningful to have an out-of-line simple link, although
such links are uncommon. They are called &quot;one-ended&quot; and are typically used
to associate discrete semantic properties with locations. The properties might
@@ -699,58 +265,27 @@ The XLink Working Draft.&lt;/foo&gt;</eg>
<div2 id="extended-link">
<head>Extended Links</head>
<p>
- <termdef id="dt-extendedlink" term="Extended Link">An
- <term>extended link</term>
- differs from a simple link in that it can connect any number of resources, not just one local resource (optionally) and one remote resource, and in that extended links are more often out-of-line than simple links. </termdef>
+ <termdef id="dt-extendedlink" term="Extended Link">An <term>extended link</term> differs from a simple link in that it can connect any number of resources, not just one local resource (optionally) and one remote resource, and in that extended links are more often out-of-line than simple links.</termdef>
</p>
<p>These additional capabilities of extended links are required for:
-
- <ulist>
- <item>
- <p>Enabling outgoing links in documents that cannot be modified to add an inline link</p>
- </item>
- <item>
- <p>Creating links to and from resources in formats with no native support for embedded links (such as most multimedia formats)</p>
- </item>
- <item>
- <p>Applying and filtering sets of relevant links on demand</p>
- </item>
- <item>
- <p>Enabling other advanced hypermedia capabilities</p>
- </item>
- </ulist>
-
- </p>
+ <ulist><item><p>Enabling outgoing links in documents that cannot be modified to add an inline link</p></item><item><p>Creating links to and from resources in formats with no native support for embedded links (such as most multimedia formats)</p></item><item><p>Applying and filtering sets of relevant links on demand</p></item><item><p>Enabling other advanced hypermedia capabilities</p></item></ulist>
+ </p>
<p>Application software might be expected to provide traversal among all of a link&apos;s participating resources (subject to semantic constraints outside the scope of this specification) and to signal the fact that a given resource or sub-resource participates in one or more links when it is displayed (even though there is no markup at exactly that point to signal it).</p>
- <p>A linking element for an extended link contains a series of
- <xtermref href="http://www.w3.org/TR/REC-xml/#dt-parentchild">child elements</xtermref>
- that serve as locators and arcs. Because an extended link can have more than one remote resource, it separates out linking itself from the mechanisms used to locate each resource (whereas a simple link combines the two). </p>
- <p>The
- <code>xlink:type</code>
- attribute value for an extended link must be <code> extended</code>
-, if the link is being instantiated on an arbitrary element. Note that extended links introduce variants of the <code>show</code>
- and <code>actuate</code>
- behavior attributes. These attributes, the <code>showdefault</code>
- and <code>actuatedefault</code>
- define the same behavior as their counterparts. However, in this case, they are considered to define the default behavior for all the linking elements that they contain. </p>
- <p>However, when a linking element within an extended link has a
- <code>show</code>
- or <code>actuate</code>
- attribute of its own, that attribute overrides the defaults set on the extended linking element. </p>
+ <p>A linking element for an extended link contains a series of <xtermref href="http://www.w3.org/TR/REC-xml/#dt-parentchild">child elements</xtermref> that serve as locators and arcs. Because an extended link can have more than one remote resource, it separates out linking itself from the mechanisms used to locate each resource (whereas a simple link combines the two).</p>
+ <p>The <code>xlink:type</code> attribute value for an extended link must be <code> extended</code>, if the link is being instantiated on an arbitrary element. Note that extended links introduce variants of the <code>show</code> and <code>actuate</code> behavior attributes. These attributes, the <code>showdefault</code> and <code>actuatedefault</code> define the same behavior as their counterparts. However, in this case, they are considered to define the default behavior for all the linking elements that they contain.</p>
+ <p>However, when a linking element within an extended link has a <code>show</code> or <code>actuate</code> attribute of its own, that attribute overrides the defaults set on the extended linking element.</p>
<p>The extended linking element itself retains those attributes relevant to the link as a whole, and to its local resource if any. Following are two sample declaration for an extended link. The first is an example of the explicit XLink extended link:
-
- <eg>&lt;!ELEMENT xlink:extended ((xlink:arc | xlink:locator)*)&gt;
+<eg>&lt;!ELEMENT xlink:extended ((xlink:arc | xlink:locator)*)&gt;
&lt;!ATTLIST xlink:extended
role CDATA #IMPLIED
title CDATA #IMPLIED
showdefault (new|parsed|replace) #IMPLIED
actuatedefault (user|auto) #IMPLIED &gt;</eg>
-
The second is an example of an arbitrary element being used an extended link:
- <eg>&lt;!ELEMENT foo ((xlink:arc | xlink:locator)*)&gt;
+<eg>&lt;!ELEMENT foo ((xlink:arc | xlink:locator)*)&gt;
&lt;!ATTLIST foo
xlink:type (simple|extended|locator|arc) #FIXED &quot;extended&quot;
xlink:role CDATA #IMPLIED
@@ -758,60 +293,38 @@ The XLink Working Draft.&lt;/foo&gt;</eg>
xlink:showdefault (new|parsed|replace) #IMPLIED
xlink:actuatedefault (user|auto) #IMPLIED &gt;</eg>
-
The following two examples demonstrate how each of the above might appear within a document instance. Note that the content of these examples would be other elements. For brevity&apos;s sake, they&apos;ve been left blank. The first example shows how the link might appear, using an explicit XLink extended link:
- <eg>&lt;xlink:extended role=&quot;address book&quot; title=&quot;Ben&apos;s Address Book&quot; showdefault=&quot;replace&quot; actuatedefault=&quot;user&quot;&gt; ... &lt;/xlink:extended&gt;</eg>
-
+<eg>&lt;xlink:extended role=&quot;address book&quot; title=&quot;Ben&apos;s Address Book&quot; showdefault=&quot;replace&quot; actuatedefault=&quot;user&quot;&gt; ... &lt;/xlink:extended&gt;</eg>
And the second shows how the link might appear, using an arbitrary element:
- <eg>&lt;foo xlink:type=&quot;extended&quot; xlink:role=&quot;address book&quot; xlink:title=&quot;Ben&apos;s Address Book&quot; xlink:showdefault=&quot;replace&quot; xlink:actuatedefault=&quot;user&quot;&gt; ... &lt;/foo&gt;</eg>
-
- </p>
+<eg>&lt;foo xlink:type=&quot;extended&quot; xlink:role=&quot;address book&quot; xlink:title=&quot;Ben&apos;s Address Book&quot; xlink:showdefault=&quot;replace&quot; xlink:actuatedefault=&quot;user&quot;&gt; ... &lt;/foo&gt;</eg>
+ </p>
</div2>
<div2 id="xlink-arcs">
<head>Arc Elements</head>
- <p>
- <termdef id="dt-arc" term="Arc">An
- <term>arc</term>
- is contained within an extended link for the purpose of defining traversal behavior. </termdef>
- More than one arc may be associated with a link. Otherwise, arc elements function exactly as the arc attributes might lead on to expect. </p>
+ <p><termdef id="dt-arc" term="Arc">An <term>arc</term> is contained within an extended link for the purpose of defining traversal behavior.</termdef> More than one arc may be associated with a link. Otherwise, arc elements function exactly as the arc attributes might lead on to expect.</p>
<!-- More here? -bent -->
</div2>
</div1>
<div1>
<head>Conformance</head>
- <p>An element conforms to XLink if:
- <olist>
- <item>
- <p>The element has an
- <code>xml:link</code>
- attribute whose value is
-one of the attribute values prescribed by this specification, and </p>
- </item>
- <item>
- <p>the element and all of its attributes and content adhere to the
+ <p>An element conforms to XLink if: <olist><item><p>The element has an <code>xml:link</code> attribute whose value is
+one of the attribute values prescribed by this specification, and</p></item><item><p>the element and all of its attributes and content adhere to the
syntactic
-requirements imposed by the chosen
- <code>xml:link</code>
- attribute value,
-as prescribed in this specification. </p>
- </item>
- </olist>
- </p>
+requirements imposed by the chosen <code>xml:link</code> attribute value,
+as prescribed in this specification.</p></item></olist></p>
<p>Note that conformance is assessed at the level of individual elements,
rather than whole XML documents, because XLink and non-XLink linking mechanisms
may be used side by side in any one document.</p>
<p>An application conforms to XLink if it interprets XLink-conforming elements
according to all required semantics prescribed by this specification and,
for any optional semantics it chooses to support, supports them in the way
-prescribed.
-<!--If/when we split out the XLinkfunctionality
+prescribed. <!--If/when we split out the XLinkfunctionality
(e.g. inline links and out-of-line links), the
conformance language will have to address the different
-levels of support. -elm-->
- </p>
+levels of support. -elm--> </p>
</div1>
</body>
<back>
@@ -827,62 +340,41 @@ version will provide a mechanism for the use of structured link titles.</p>
<div1>
<head>References</head>
<blist>
- <bibl id="xptr" key="XPTR">Eve Maler and Steve DeRose, editors.
- <titleref>
-XML Pointer Language (XPointer) V1.0</titleref>
-. ArborText, Inso, and Brown
+ <bibl id="xptr" key="XPTR">Eve Maler and Steve DeRose, editors. <titleref>
+XML Pointer Language (XPointer) V1.0</titleref>. ArborText, Inso, and Brown
University. Burlington, Seekonk, et al.: World Wide Web Consortium, 1998.
-(See <loc href="http://www.w3.org/TR/WD-xptr">http://www.w3.org/TR/WD-xptr
- </loc>
-.) </bibl>
+(See <loc href="http://www.w3.org/TR/WD-xptr">http://www.w3.org/TR/WD-xptr
+ </loc>.)</bibl>
<bibl id="iso10744" key="ISO/IEC 10744">ISO (International Organization for
-Standardization).
- <titleref>ISO/IEC 10744-1992 (E). Information technology
-- Hypermedia/Time-based Structuring Language (HyTime).</titleref>
- [Geneva]:
-International Organization for Standardization, 1992. <titleref>Extended
+Standardization). <titleref>ISO/IEC 10744-1992 (E). Information technology
+- Hypermedia/Time-based Structuring Language (HyTime).</titleref> [Geneva]:
+International Organization for Standardization, 1992. <titleref>Extended
Facilities
-Annex.</titleref>
- [Geneva]: International Organization for Standardization,
-1996. (See <loc href="http://www.ornl.gov/sgml/wg8/hytime/html/is10744r.html">http://www.ornl.go
-v/sgml/wg8/hytime/html/is10744r.html </loc>
- <!--p m-r says this link is
-broken. elm -->
- ). </bibl>
+Annex.</titleref> [Geneva]: International Organization for Standardization,
+1996. (See <loc href="http://www.ornl.gov/sgml/wg8/hytime/html/is10744r.html">http://www.ornl.go
+v/sgml/wg8/hytime/html/is10744r.html </loc> <!--p m-r says this link is
+broken. elm --> ).</bibl>
<bibl id="rfc1738" key="IETF RFC 1738">IETF (Internet Engineering Task
-Force).
- <titleref>
-RFC 1738: Uniform Resource Locators</titleref>
-. 1991. (See <loc href="http://www.w3.org/Addressing/rfc1738.txt">
-http://www.w3.org/Addressing/rfc1738.txt</loc>
-). </bibl>
+Force). <titleref>
+RFC 1738: Uniform Resource Locators</titleref>. 1991. (See <loc href="http://www.w3.org/Addressing/rfc1738.txt">
+http://www.w3.org/Addressing/rfc1738.txt</loc>).</bibl>
<bibl id="rfc1808" key="IETF RFC 1808">IETF (Internet Engineering Task
-Force).
- <titleref>
-RFC 1808: Relative Uniform Resource Locators</titleref>
-. 1995. (See <loc href="http://www.w3.org/Addressing/rfc1808.txt">http://www.w3.org/Addressing/rfc
-1808.txt </loc>
-). </bibl>
+Force). <titleref>
+RFC 1808: Relative Uniform Resource Locators</titleref>. 1995. (See <loc href="http://www.w3.org/Addressing/rfc1808.txt">http://www.w3.org/Addressing/rfc
+1808.txt </loc>).</bibl>
<bibl id="tei" key="TEI">C. M. Sperberg-McQueen and Lou Burnard, editors.
-
- <titleref>
-Guidelines for Electronic Text Encoding and Interchange</titleref>
-. Association
+<titleref>
+Guidelines for Electronic Text Encoding and Interchange</titleref>. Association
for Computers and the Humanities (ACH), Association for Computational
Linguistics
(ACL), and Association for Literary and Linguistic Computing (ALLC). Chicago,
-Oxford: Text Encoding Initiative, 1994. <!-- add cite to DOM work -->
- </bibl>
+Oxford: Text Encoding Initiative, 1994. <!-- add cite to DOM work --> </bibl>
<bibl id="chum" key="CHUM">]Steven J. DeRose and David G. Durand. 1995. &quot;The
-TEI Hypertext Guidelines.&quot; In
- <titleref>Computing and the Humanities
-</titleref>
-29(3).
-Reprinted in <titleref>Text Encoding Initiative: Background and
-Context</titleref>
-,
-ed. Nancy Ide and Jean ronis <!-- fix this name -->
-, ISBN 0-7923-3704-2. </bibl>
+TEI Hypertext Guidelines.&quot; In <titleref>Computing and the Humanities
+</titleref>29(3).
+Reprinted in <titleref>Text Encoding Initiative: Background and
+Context</titleref>,
+ed. Nancy Ide and Jean ronis <!-- fix this name -->, ISBN 0-7923-3704-2. </bibl>
</blist>
</div1>
</back>
View
76 tree.c
@@ -2663,6 +2663,20 @@ xmlBufferCCat(xmlBufferPtr buf, const char *str) {
}
/**
+ * xmlBufferLastChar:
+ * @buf: the buffer to dump
+ *
+ * Get the last char of the buffer
+ *
+ * Returns the last char from the buffer or 0 if empty
+ */
+xmlChar
+xmlBufferLastChar(xmlBufferPtr buf) {
+ if ((buf == NULL) || (buf->use <= 0)) return(0);
+ return(buf->content[buf->use - 1]);
+}
+
+/**
* xmlBufferWriteCHAR:
* @buf: the XML buffer
* @string: the string to add
@@ -2899,38 +2913,38 @@ xmlAttrListDump(xmlBufferPtr buf, xmlDocPtr doc, xmlAttrPtr cur) {
static void
-xmlNodeDump(xmlBufferPtr buf, xmlDocPtr doc, xmlNodePtr cur, int level);
+xmlNodeDump(xmlBufferPtr buf, xmlDocPtr doc, xmlNodePtr cur, int level,
+ int format);
/**
* xmlNodeListDump:
* @buf: the XML buffer output
* @doc: the document
* @cur: the first node
* @level: the imbrication level for indenting
+ * @format: is formatting allowed
*
* Dump an XML node list, recursive behaviour,children are printed too.
*/
static void
-xmlNodeListDump(xmlBufferPtr buf, xmlDocPtr doc, xmlNodePtr cur, int level) {
- int needIndent = 0, i;
+xmlNodeListDump(xmlBufferPtr buf, xmlDocPtr doc, xmlNodePtr cur, int level,
+ int format) {
+ int i;
if (cur == NULL) {
fprintf(stderr, "xmlNodeListDump : node == NULL\n");
return;
}
while (cur != NULL) {
- if ((cur->type != XML_TEXT_NODE) &&
- (cur->type != XML_ENTITY_REF_NODE)) {
- if (!needIndent) {
- needIndent = 1;
- xmlBufferWriteChar(buf, "\n");
- }
+ if ((format) && (xmlIndentTreeOutput) &&
+ (cur->type == XML_ELEMENT_NODE))
+ for (i = 0;i < level;i++)
+ xmlBufferWriteChar(buf, " ");
+ xmlNodeDump(buf, doc, cur, level, format);
+ if (format) {
+ xmlBufferWriteChar(buf, "\n");
}
- xmlNodeDump(buf, doc, cur, level);
cur = cur->next;
}
- if ((xmlIndentTreeOutput) && (needIndent))
- for (i = 1;i < level;i++)
- xmlBufferWriteChar(buf, " ");
}
/**
@@ -2939,12 +2953,15 @@ xmlNodeListDump(xmlBufferPtr buf, xmlDocPtr doc, xmlNodePtr cur, int level) {
* @doc: the document
* @cur: the current node
* @level: the imbrication level for indenting
+ * @format: is formatting allowed
*
* Dump an XML node, recursive behaviour,children are printed too.
*/
static void
-xmlNodeDump(xmlBufferPtr buf, xmlDocPtr doc, xmlNodePtr cur, int level) {
+xmlNodeDump(xmlBufferPtr buf, xmlDocPtr doc, xmlNodePtr cur, int level,
+ int format) {
int i;
+ xmlNodePtr tmp;
if (cur == NULL) {
fprintf(stderr, "xmlNodeDump : node == NULL\n");
@@ -2970,7 +2987,7 @@ xmlNodeDump(xmlBufferPtr buf, xmlDocPtr doc, xmlNodePtr cur, int level) {
xmlBufferWriteChar(buf, " ");
xmlBufferWriteCHAR(buf, cur->content);
}
- xmlBufferWriteChar(buf, "?>\n");
+ xmlBufferWriteChar(buf, "?>");
}
return;
}
@@ -2978,7 +2995,7 @@ xmlNodeDump(xmlBufferPtr buf, xmlDocPtr doc, xmlNodePtr cur, int level) {
if (cur->content != NULL) {
xmlBufferWriteChar(buf, "<!--");
xmlBufferWriteCHAR(buf, cur->content);
- xmlBufferWriteChar(buf, "-->\n");
+ xmlBufferWriteChar(buf, "-->");
}
return;
}
@@ -2995,10 +3012,18 @@ xmlNodeDump(xmlBufferPtr buf, xmlDocPtr doc, xmlNodePtr cur, int level) {
xmlBufferWriteChar(buf, "]]>");
return;
}
- if (xmlIndentTreeOutput)
- for (i = 0;i < level;i++)
- xmlBufferWriteChar(buf, " ");
+ if (format == 1) {
+ tmp = cur->childs;
+ while (tmp != NULL) {
+ if ((tmp->type == XML_TEXT_NODE) ||
+ (tmp->type == XML_ENTITY_REF_NODE)) {
+ format = 0;
+ break;
+ }
+ tmp = tmp->next;
+ }
+ }
xmlBufferWriteChar(buf, "<");
if ((cur->ns != NULL) && (cur->ns->prefix != NULL)) {
xmlBufferWriteCHAR(buf, cur->ns->prefix);
@@ -3012,7 +3037,7 @@ xmlNodeDump(xmlBufferPtr buf, xmlDocPtr doc, xmlNodePtr cur, int level) {
xmlAttrListDump(buf, doc, cur->properties);
if ((cur->content == NULL) && (cur->childs == NULL)) {
- xmlBufferWriteChar(buf, "/>\n");
+ xmlBufferWriteChar(buf, "/>");
return;
}
xmlBufferWriteChar(buf, ">");
@@ -3026,7 +3051,11 @@ xmlNodeDump(xmlBufferPtr buf, xmlDocPtr doc, xmlNodePtr cur, int level) {
}
}
if (cur->childs != NULL) {
- xmlNodeListDump(buf, doc, cur->childs, level + 1);
+ if (format) xmlBufferWriteChar(buf, "\n");
+ xmlNodeListDump(buf, doc, cur->childs, level + 1, format);
+ if ((xmlIndentTreeOutput) && (format))
+ for (i = 0;i < level;i++)
+ xmlBufferWriteChar(buf, " ");
}
xmlBufferWriteChar(buf, "</");
if ((cur->ns != NULL) && (cur->ns->prefix != NULL)) {
@@ -3035,7 +3064,7 @@ xmlNodeDump(xmlBufferPtr buf, xmlDocPtr doc, xmlNodePtr cur, int level) {
}
xmlBufferWriteCHAR(buf, cur->name);
- xmlBufferWriteChar(buf, ">\n");
+ xmlBufferWriteChar(buf, ">");
}
/**
@@ -3077,7 +3106,8 @@ xmlDocContentDump(xmlBufferPtr buf, xmlDocPtr cur) {
xmlUpgradeOldNs(cur);
while (child != NULL) {
- xmlNodeDump(buf, cur, child, 0);
+ xmlNodeDump(buf, cur, child, 0, 1);
+ xmlBufferWriteChar(buf, "\n");
child = child->next;
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.