diff --git a/TODO b/TODO
index 4e17f82..417d18f 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,7 @@
$Id$
+Add link to MoinMoin sequence to deriv.xml
+
Yves Bossel: If I may do some suggestions:
+ I would appreciate to be able to add UML comments to both diagram types.
+ Adding patterns (collaborations ellipse with roles bound to classes) would be welcome into class diagrams.
diff --git a/testdata/umldoc-ref/allclasses-frame.html b/testdata/umldoc-ref/allclasses-frame.html
index d14ac02..d9fef4a 100644
--- a/testdata/umldoc-ref/allclasses-frame.html
+++ b/testdata/umldoc-ref/allclasses-frame.html
@@ -2,11 +2,12 @@
-
+
All Classes
+
diff --git a/testdata/umldoc-ref/allclasses-noframe.html b/testdata/umldoc-ref/allclasses-noframe.html
index e2b4491..d93dab6 100644
--- a/testdata/umldoc-ref/allclasses-noframe.html
+++ b/testdata/umldoc-ref/allclasses-noframe.html
@@ -2,11 +2,12 @@
-
+
All Classes
+
diff --git a/testdata/umldoc-ref/constant-values.html b/testdata/umldoc-ref/constant-values.html
index 8f8165b..1c117f2 100644
--- a/testdata/umldoc-ref/constant-values.html
+++ b/testdata/umldoc-ref/constant-values.html
@@ -2,18 +2,21 @@
-
+
Constant Field Values
+
@@ -22,6 +25,7 @@ function windowTitle()
+
diff --git a/testdata/umldoc-ref/deprecated-list.html b/testdata/umldoc-ref/deprecated-list.html
index 79beba8..89ae00c 100644
--- a/testdata/umldoc-ref/deprecated-list.html
+++ b/testdata/umldoc-ref/deprecated-list.html
@@ -2,18 +2,21 @@
-
+
Deprecated List
+
@@ -22,6 +25,7 @@ function windowTitle()
+
diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/Customer.html b/testdata/umldoc-ref/gr/spinellis/invoice/Customer.html
index 8001997..c5151a8 100644
--- a/testdata/umldoc-ref/gr/spinellis/invoice/Customer.html
+++ b/testdata/umldoc-ref/gr/spinellis/invoice/Customer.html
@@ -2,19 +2,21 @@
-
+
Customer
-
+
@@ -23,6 +25,7 @@ function windowTitle()
+
diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/Invoice.html b/testdata/umldoc-ref/gr/spinellis/invoice/Invoice.html
index 629baa7..93e0247 100644
--- a/testdata/umldoc-ref/gr/spinellis/invoice/Invoice.html
+++ b/testdata/umldoc-ref/gr/spinellis/invoice/Invoice.html
@@ -2,19 +2,21 @@
-
+
Invoice
-
+
@@ -23,6 +25,7 @@ function windowTitle()
+
diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/InvoiceItem.html b/testdata/umldoc-ref/gr/spinellis/invoice/InvoiceItem.html
index d026318..2b0594e 100644
--- a/testdata/umldoc-ref/gr/spinellis/invoice/InvoiceItem.html
+++ b/testdata/umldoc-ref/gr/spinellis/invoice/InvoiceItem.html
@@ -2,19 +2,21 @@
-
+
InvoiceItem
-
+
@@ -23,6 +25,7 @@ function windowTitle()
+
diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/package-frame.html b/testdata/umldoc-ref/gr/spinellis/invoice/package-frame.html
index a9a9b0d..a880ec4 100644
--- a/testdata/umldoc-ref/gr/spinellis/invoice/package-frame.html
+++ b/testdata/umldoc-ref/gr/spinellis/invoice/package-frame.html
@@ -2,12 +2,12 @@
-
+
gr.spinellis.invoice
-
+
diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/package-summary.html b/testdata/umldoc-ref/gr/spinellis/invoice/package-summary.html
index 4d20962..5043d6a 100644
--- a/testdata/umldoc-ref/gr/spinellis/invoice/package-summary.html
+++ b/testdata/umldoc-ref/gr/spinellis/invoice/package-summary.html
@@ -2,19 +2,21 @@
-
+
gr.spinellis.invoice
-
+
@@ -23,6 +25,7 @@ function windowTitle()
+
diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/package-tree.html b/testdata/umldoc-ref/gr/spinellis/invoice/package-tree.html
index 97bc9cd..c69d208 100644
--- a/testdata/umldoc-ref/gr/spinellis/invoice/package-tree.html
+++ b/testdata/umldoc-ref/gr/spinellis/invoice/package-tree.html
@@ -2,18 +2,21 @@
-
+
gr.spinellis.invoice Class Hierarchy
+
@@ -22,6 +25,7 @@ function windowTitle()
+
diff --git a/testdata/umldoc-ref/gr/spinellis/product/Category.html b/testdata/umldoc-ref/gr/spinellis/product/Category.html
index 453e35f..1cab557 100644
--- a/testdata/umldoc-ref/gr/spinellis/product/Category.html
+++ b/testdata/umldoc-ref/gr/spinellis/product/Category.html
@@ -2,19 +2,21 @@
-
+
Category
-
+
@@ -23,6 +25,7 @@ function windowTitle()
+
diff --git a/testdata/umldoc-ref/gr/spinellis/product/Product.html b/testdata/umldoc-ref/gr/spinellis/product/Product.html
index 9209ed7..b967856 100644
--- a/testdata/umldoc-ref/gr/spinellis/product/Product.html
+++ b/testdata/umldoc-ref/gr/spinellis/product/Product.html
@@ -2,19 +2,21 @@
-
+
Product
-
+
@@ -23,6 +25,7 @@ function windowTitle()
+
diff --git a/testdata/umldoc-ref/gr/spinellis/product/package-frame.html b/testdata/umldoc-ref/gr/spinellis/product/package-frame.html
index 2f7271e..17c8dac 100644
--- a/testdata/umldoc-ref/gr/spinellis/product/package-frame.html
+++ b/testdata/umldoc-ref/gr/spinellis/product/package-frame.html
@@ -2,12 +2,12 @@
-
+
gr.spinellis.product
-
+
diff --git a/testdata/umldoc-ref/gr/spinellis/product/package-summary.html b/testdata/umldoc-ref/gr/spinellis/product/package-summary.html
index 332c6fd..ccae1ce 100644
--- a/testdata/umldoc-ref/gr/spinellis/product/package-summary.html
+++ b/testdata/umldoc-ref/gr/spinellis/product/package-summary.html
@@ -2,19 +2,21 @@
-
+
gr.spinellis.product
-
+
@@ -23,6 +25,7 @@ function windowTitle()
+
diff --git a/testdata/umldoc-ref/gr/spinellis/product/package-tree.html b/testdata/umldoc-ref/gr/spinellis/product/package-tree.html
index b25027a..ec80240 100644
--- a/testdata/umldoc-ref/gr/spinellis/product/package-tree.html
+++ b/testdata/umldoc-ref/gr/spinellis/product/package-tree.html
@@ -2,18 +2,21 @@
-
+
gr.spinellis.product Class Hierarchy
+
@@ -22,6 +25,7 @@ function windowTitle()
+
diff --git a/testdata/umldoc-ref/help-doc.html b/testdata/umldoc-ref/help-doc.html
index d95eba8..d2a175c 100644
--- a/testdata/umldoc-ref/help-doc.html
+++ b/testdata/umldoc-ref/help-doc.html
@@ -2,18 +2,21 @@
-
+
API Help
+
@@ -22,6 +25,7 @@ function windowTitle()
+
diff --git a/testdata/umldoc-ref/index-all.html b/testdata/umldoc-ref/index-all.html
index 7ed8499..8a8b6a8 100644
--- a/testdata/umldoc-ref/index-all.html
+++ b/testdata/umldoc-ref/index-all.html
@@ -2,18 +2,21 @@
-
+
Index
+
@@ -22,6 +25,7 @@ function windowTitle()
+
diff --git a/testdata/umldoc-ref/index.html b/testdata/umldoc-ref/index.html
index 236831b..45cf062 100644
--- a/testdata/umldoc-ref/index.html
+++ b/testdata/umldoc-ref/index.html
@@ -2,14 +2,16 @@
-
+
Generated Documentation (Untitled)
@@ -23,6 +25,7 @@ function windowTitle()
+
diff --git a/testdata/umldoc-ref/overview-tree.html b/testdata/umldoc-ref/overview-tree.html
index 303c365..e08980b 100644
--- a/testdata/umldoc-ref/overview-tree.html
+++ b/testdata/umldoc-ref/overview-tree.html
@@ -2,18 +2,21 @@
-
+
Class Hierarchy
+
@@ -22,6 +25,7 @@ function windowTitle()
+