Updated the doc a bit, Daniel.
diff --git a/ChangeLog b/ChangeLog
index 0906f23..861561b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Aug 19 18:38:53 CEST 2000 Daniel Veillard <Daniel.Veillard@w3.org>
+
+ * doc/xml.html libxml.* structure.*: updated the doc a bit
+
Thu Aug 17 15:50:00 CEST 2000 Daniel Veillard <Daniel.Veillard@w3.org>
* testSAX.c testHTML.c result/HTML/: cleanup of the output
@@ -25,6 +29,7 @@
* config.in: Removed @LIBS@ from xml-config because @XML_LIBS@
includes @LIBS@
+>>>>>>> 1.186
Sat Aug 12 23:19:42 CEST 2000 Daniel Veillard <Daniel.Veillard@w3.org>
* doc/* : rebuilt the docs
diff --git a/doc/libxml.fig b/doc/libxml.fig
new file mode 100644
index 0000000..5c8672c
--- /dev/null
+++ b/doc/libxml.fig
@@ -0,0 +1,47 @@
+#FIG 3.2
+Landscape
+Center
+Inches
+Letter
+100.00
+Single
+-2
+1200 2
+2 3 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 8
+ 3375 1275 2550 1275 2550 2100 1575 2100 1575 675 3375 675
+ 3375 1275 3375 1275
+2 3 0 1 0 11 50 0 20 0.000 0 0 7 0 0 7
+ 2625 1350 2625 2100 5400 2100 5400 2550 7425 2550 7425 1350
+ 2625 1350
+2 2 0 1 0 11 50 0 20 0.000 0 0 7 0 0 5
+ 300 2175 5325 2175 5325 2550 300 2550 300 2175
+2 2 0 1 0 11 50 0 20 0.000 0 0 7 0 0 5
+ 300 2625 3450 2625 3450 3450 300 3450 300 2625
+2 2 0 1 0 11 50 0 20 0.000 0 0 7 0 0 5
+ 3450 2625 5325 2625 5325 3450 3450 3450 3450 2625
+2 2 0 1 0 11 50 0 20 0.000 0 0 7 0 0 5
+ 5325 2625 7425 2625 7425 3450 5325 3450 5325 2625
+2 2 0 1 0 11 50 0 20 0.000 0 0 7 0 0 5
+ 3600 825 5100 825 5100 1275 3600 1275 3600 825
+2 2 0 1 0 11 50 0 33 0.000 0 0 7 0 0 5
+ 5175 825 6450 825 6450 1275 5175 1275 5175 825
+2 2 0 1 0 11 50 0 33 0.000 0 0 7 0 0 5
+ 3600 300 5100 300 5100 750 3600 750 3600 300
+2 2 0 1 0 11 50 0 20 0.000 0 0 7 0 0 5
+ 1050 3525 5775 3525 5775 4125 1050 4125 1050 3525
+2 2 0 1 0 11 50 0 20 0.000 0 0 7 0 0 5
+ 1950 4200 5775 4200 5775 4650 1950 4650 1950 4200
+2 2 0 1 0 11 50 0 20 0.000 0 0 7 0 0 5
+ 5850 3525 7425 3525 7425 4275 5850 4275 5850 3525
+4 0 0 50 0 0 18 0.0000 4 255 1335 1125 3150 XML parser\001
+4 0 0 50 0 0 18 0.0000 4 255 1530 3600 3150 HTML parser\001
+4 0 0 50 0 0 18 0.0000 4 195 555 2925 2475 SAX\001
+4 0 0 50 0 0 18 0.0000 4 255 765 5850 3150 Export\001
+4 0 0 50 0 0 18 0.0000 4 195 525 5025 1875 Tree\001
+4 0 0 50 0 0 18 0.0000 4 195 690 4050 1125 XPath\001
+4 0 0 50 0 0 18 0.0000 4 195 990 5250 1125 Schemas\001
+4 0 0 50 0 0 18 0.0000 4 195 1005 3825 675 XPointer\001
+4 0 0 50 0 0 18 0.0000 4 195 1155 1875 1050 GtkHtml2\001
+4 0 0 50 0 0 18 0.0000 4 195 555 3075 3900 I18N\001
+4 0 0 50 0 0 18 0.0000 4 255 2775 2625 4500 I/O layer (FTP/HTTP/...)\001
+4 0 0 50 0 0 18 0.0000 4 195 465 6375 3975 URI\001
diff --git a/doc/libxml.gif b/doc/libxml.gif
new file mode 100644
index 0000000..1f51388
--- /dev/null
+++ b/doc/libxml.gif
Binary files differ
diff --git a/doc/structure.fig b/doc/structure.fig
index 4e7f087..1d27b44 100644
--- a/doc/structure.fig
+++ b/doc/structure.fig
@@ -7,36 +7,6 @@
Single
-2
1200 2
-6 1275 4425 5475 5100
-2 4 0 1 0 7 0 0 -1 0.000 0 0 7 0 0 5
- 2250 5100 2250 4425 1275 4425 1275 5100 2250 5100
-2 4 0 1 0 7 0 0 -1 0.000 0 0 7 0 0 5
- 3975 5100 3975 4425 3000 4425 3000 5100 3975 5100
-2 4 0 1 0 7 0 0 -1 0.000 0 0 7 0 0 5
- 5475 5100 5475 4425 4500 4425 4500 5100 5475 5100
-4 0 0 0 0 14 16 0.0000 4 135 600 4650 4725 TEXT\001
-4 0 0 0 0 14 16 0.0000 4 135 600 1425 4725 TEXT\001
-4 0 0 0 0 14 16 0.0000 4 135 900 3075 4725 ENTITY\001
-4 0 0 0 0 14 16 0.0000 4 135 450 3075 4950 REF\001
--6
-6 825 4575 900 5100
-2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
- 900 4575 900 5100
-2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
- 900 5025 825 5100
-2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
- 900 4950 825 5025
-2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
- 900 4800 825 4875
-2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
- 900 4875 825 4950
-2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
- 900 4650 825 4725
-2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
- 900 4725 825 4800
-2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
- 900 4575 825 4650
--6
6 1125 2325 1200 2850
2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
1200 2325 1200 2850
@@ -55,24 +25,6 @@
2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
1200 2325 1125 2400
-6
-6 2550 4650 2625 5175
-2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
- 2625 4650 2625 5175
-2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
- 2625 5100 2550 5175
-2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
- 2625 5025 2550 5100
-2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
- 2625 4875 2550 4950
-2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
- 2625 4950 2550 5025
-2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
- 2625 4725 2550 4800
-2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
- 2625 4800 2550 4875
-2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
- 2625 4650 2550 4725
--6
6 6000 4200 6075 4725
2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
6075 4200 6075 4725
@@ -91,42 +43,6 @@
2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
6075 4200 6000 4275
-6
-6 2475 4425 2550 4950
-2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
- 2475 4950 2475 4425
-2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
- 2475 4500 2550 4425
-2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
- 2475 4575 2550 4500
-2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
- 2475 4725 2550 4650
-2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
- 2475 4650 2550 4575
-2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
- 2475 4875 2550 4800
-2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
- 2475 4800 2550 4725
-2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
- 2475 4950 2550 4875
--6
-6 5775 4425 5850 4950
-2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
- 5775 4950 5775 4425
-2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
- 5775 4500 5850 4425
-2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
- 5775 4575 5850 4500
-2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
- 5775 4725 5850 4650
-2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
- 5775 4650 5850 4575
-2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
- 5775 4875 5850 4800
-2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
- 5775 4800 5850 4725
-2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
- 5775 4950 5850 4875
--6
6 9000 2100 9075 2625
2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
9000 2625 9000 2100
@@ -163,6 +79,42 @@
2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
11850 4575 11925 4500
-6
+6 1950 4275 2025 4800
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
+ 2025 4275 2025 4800
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
+ 2025 4725 1950 4800
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
+ 2025 4650 1950 4725
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
+ 2025 4500 1950 4575
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
+ 2025 4575 1950 4650
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
+ 2025 4350 1950 4425
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
+ 2025 4425 1950 4500
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
+ 2025 4275 1950 4350
+-6
+6 5175 4050 5250 4575
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
+ 5175 4575 5175 4050
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
+ 5175 4125 5250 4050
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
+ 5175 4200 5250 4125
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
+ 5175 4350 5250 4275
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
+ 5175 4275 5250 4200
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
+ 5175 4500 5250 4425
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
+ 5175 4425 5250 4350
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
+ 5175 4575 5250 4500
+-6
2 2 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 5
3150 375 4425 375 4425 1275 3150 1275 3150 375
2 4 0 1 0 7 0 0 -1 0.000 0 0 7 0 0 5
@@ -220,13 +172,6 @@
2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 1 0 2
1 1 1.00 60.00 120.00
6675 4500 6075 4500
-2 2 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 5
- 1275 3375 2250 3375 2250 3825 1275 3825 1275 3375
-2 2 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 5
- 3000 3375 3975 3375 3975 3825 3000 3825 3000 3375
-2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 1 0 2
- 1 1 1.00 60.00 120.00
- 2325 2775 1725 3375
2 4 0 1 0 7 0 0 -1 0.000 0 0 7 0 0 5
11250 4725 11250 4050 10275 4050 10275 4725 11250 4725
2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 1 0 2
@@ -235,56 +180,47 @@
2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 1 0 2
1 1 1.00 60.00 120.00
10275 4425 9675 4425
-2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 1 0 2
- 1 1 1.00 60.00 120.00
- 1725 3825 1725 4425
-2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 1 0 2
- 1 1 1.00 60.00 120.00
- 3450 3825 3450 4425
-2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 1 0 2
- 1 1 1.00 60.00 120.00
- 3975 4650 4500 4650
-2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 1 0 2
- 1 1 1.00 60.00 120.00
- 5475 4650 5775 4650
-2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 1 0 2
- 1 1 1.00 60.00 120.00
- 4500 4875 3975 4875
-2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 1 0 2
- 1 1 1.00 60.00 120.00
- 2250 4650 2550 4650
-2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 1 0 2
- 1 1 1.00 60.00 120.00
- 1275 4875 900 4875
-2 2 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 5
- 975 5625 2550 5625 2550 5850 975 5850 975 5625
-2 2 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 5
- 4200 5625 5775 5625 5775 5850 4200 5850 4200 5625
2 2 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 5
6450 5250 8025 5250 8025 5475 6450 5475 6450 5250
2 2 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 5
10125 5250 11700 5250 11700 5475 10125 5475 10125 5250
2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 1 0 2
1 1 1.00 60.00 120.00
- 1725 5100 1725 5625
-2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 1 0 2
- 1 1 1.00 60.00 120.00
- 4875 5100 4875 5625
-2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 1 0 2
- 1 1 1.00 60.00 120.00
7050 4725 7050 5250
2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 1 0 2
1 1 1.00 60.00 120.00
10650 4725 10650 5250
2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 1 0 2
1 1 1.00 60.00 120.00
- 3000 4875 2625 4875
+ 5100 2775 3375 3225
2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 1 0 2
1 1 1.00 60.00 120.00
- 5100 2775 3525 3375
+ 2850 3600 2850 4050
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 1 0 2
+ 1 1 1.00 60.00 120.00
+ 3375 4275 3900 4275
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 1 0 2
+ 1 1 1.00 60.00 120.00
+ 4875 4275 5175 4275
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 1 0 2
+ 1 1 1.00 60.00 120.00
+ 3900 4500 3375 4500
+2 2 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 5
+ 3600 5250 5175 5250 5175 5475 3600 5475 3600 5250
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 1 0 2
+ 1 1 1.00 60.00 120.00
+ 4275 4725 4275 5250
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 1 0 2
+ 1 1 1.00 60.00 120.00
+ 2400 4500 2025 4500
+2 4 0 1 0 7 0 0 -1 0.000 0 0 7 0 0 5
+ 3375 4725 3375 4050 2400 4050 2400 4725 3375 4725
+2 4 0 1 0 7 0 0 -1 0.000 0 0 7 0 0 5
+ 4875 4725 4875 4050 3900 4050 3900 4725 4875 4725
+2 4 0 1 0 7 0 0 -1 0.000 0 0 7 0 0 5
+ 3375 3600 3375 2925 2400 2925 2400 3600 3375 3600
4 0 0 0 0 0 16 0.0000 4 150 420 3000 2250 next\001
-4 0 0 0 0 0 16 0.0000 4 180 450 3975 2775 prev\001
-4 0 0 0 0 0 16 0.0000 4 210 630 5100 2025 parent\001
+4 0 0 0 0 0 16 0.0000 4 180 435 3975 2775 prev\001
4 0 0 0 0 14 15 0.0000 4 135 945 7200 2475 ELEMENT\001
4 0 0 0 0 14 15 0.0000 4 135 945 4575 2475 ELEMENT\001
4 0 0 0 0 14 15 0.0000 4 135 945 1875 2475 ELEMENT\001
@@ -294,10 +230,13 @@
4 0 0 0 0 14 16 0.0000 4 135 600 6750 4425 TEXT\001
4 0 0 0 0 14 16 0.0000 4 150 1050 1275 2025 xmlNode\001
4 0 0 0 0 14 16 0.0000 4 150 900 2175 675 xmlDoc\001
-4 0 0 0 0 14 16 0.0000 4 150 1050 675 3300 xmlAttr\001
4 0 0 0 0 14 16 0.0000 4 135 1200 3225 825 DOCUMENT\001
-4 0 0 0 0 0 16 0.0000 4 150 390 3375 1650 root\001
-4 0 0 0 0 -1 20 0.0000 4 285 4770 5175 825 A DOM tree as built by the XML parser\001
-4 0 0 0 0 -1 20 0.0000 4 180 465 1050 6150 text\001
-4 0 0 0 0 -1 16 0.0000 4 225 990 2250 3000 properties\001
-4 0 0 0 0 -1 16 0.0000 4 150 720 1800 5475 content\001
+4 0 0 0 0 -1 20 0.0000 4 255 4665 5175 825 A DOM tree as built by the XML parser\001
+4 0 0 0 0 0 16 0.0000 4 165 810 3375 1650 children\001
+4 0 0 0 0 14 16 0.0000 4 135 900 2475 4275 ENTITY\001
+4 0 0 0 0 14 16 0.0000 4 135 450 2475 4575 REF\001
+4 0 0 0 0 14 16 0.0000 4 135 600 4050 4425 TEXT\001
+4 0 0 0 0 -1 16 0.0000 4 225 990 3975 3225 properties\001
+4 0 0 50 0 0 16 0.0000 4 150 720 4350 5025 content\001
+4 0 0 0 0 14 16 0.0000 4 135 600 2625 3300 ATTR\001
+4 0 0 0 0 0 16 0.0000 4 210 615 4950 1800 parent\001
diff --git a/doc/structure.gif b/doc/structure.gif
index 6711480..4b9a3e6 100644
--- a/doc/structure.gif
+++ b/doc/structure.gif
Binary files differ
diff --git a/doc/xml.html b/doc/xml.html
index 0cc44af..f28a4ff 100644
--- a/doc/xml.html
+++ b/doc/xml.html
@@ -3,7 +3,7 @@
<html>
<head>
<title>The XML library for Gnome</title>
- <meta name="GENERATOR" content="amaya V3.2">
+ <meta name="GENERATOR" content="amaya V3.2.1">
<meta http-equiv="Content-Type" content="text/html">
</head>
@@ -477,6 +477,31 @@
spreadsheets (gnumeric), or even shorter lived documents such as WebDAV where
it is used to encode remote calls between a client and a server.</p>
+<h2>An overview of libxml architecture</h2>
+
+<p>Libxml is made of multiple components, some of them optionals, and most of
+the block interfaces are public. The main components are:</p>
+<ul>
+ <li>an Input/Output layer</li>
+ <li>FTP and HTTP client layers (optionnal)</li>
+ <li>an Internationalization layer managing the encodings support</li>
+ <li>an URI module</li>
+ <li>the XML parser and its basic SAX interface</li>
+ <li>an HTML parser using the same SAX interface (optionnal)</li>
+ <li>a SAX tree module to build an in-memory DOM representation</li>
+ <li>a tree module to manipulate the DOM representation</li>
+ <li>a validation module using the DOM representation (optionnal)</li>
+ <li>an XPath module for global lookup in a DOM representation
+ (optionnal)</li>
+ <li>a debug module (optionnal)</li>
+</ul>
+
+<p>Graphically this gives the following:</p>
+
+<p><img src="libxml.gif" alt="a graphical view of the various"></p>
+
+<p></p>
+
<h2><a name="tree">The tree output</a></h2>
<p>The parser returns a tree built during the document analysis. The value
@@ -543,9 +568,9 @@
the library as it progresses through the XML input.</p>
<p>To get more detailed step-by-step guidance on using the SAX interface of
-libxml, see the
-href="http://www.daa.com.au/~james/gnome/xml-sax/xml-sax.html">nice
-documentation.written by <a href="mailto:james@daa.com.au">James
+libxml, see the <a
+href="http://www.daa.com.au/~james/gnome/xml-sax/xml-sax.html">nice
+documentation</a>.written by <a href="mailto:james@daa.com.au">James
Henstridge</a>.</p>
<p>You can debug the SAX behaviour by using the <strong>testSAX</strong>
@@ -1228,6 +1253,6 @@
<p><a href="mailto:Daniel.Veillard@w3.org">Daniel Veillard</a></p>
-<p>$Id: xml.html,v 1.44 2000/07/22 02:38:15 veillard Exp $</p>
+<p>$Id: xml.html,v 1.45 2000/08/12 23:38:57 veillard Exp $</p>
</body>
</html>
