diff --git a/src/main/java/org/umlgraph/doclet/UmlGraphDoc.java b/src/main/java/org/umlgraph/doclet/UmlGraphDoc.java
index 6dda3a2..4c829eb 100644
--- a/src/main/java/org/umlgraph/doclet/UmlGraphDoc.java
+++ b/src/main/java/org/umlgraph/doclet/UmlGraphDoc.java
@@ -162,7 +162,7 @@ public class UmlGraphDoc {
     //Format string for the uml image div tag.
     private static final String UML_DIV_TAG = 
 	"<div align=\"center\">" +
-	    "<object  width=\"100%\" height=\"100%\" type=\"image/svg+xml\" data=\"%1$s.svg\" alt=\"Package class diagram package %1$s\" border=0></object>" +
+	    "<object  width=\"100%%\" height=\"100%%\" type=\"image/svg+xml\" data=\"%1$s.svg\" alt=\"Package class diagram package %1$s\" border=0></object>" +
 	"</div>";
     
     private static final String EXPANDABLE_UML_STYLE = "font-family: Arial,Helvetica,sans-serif;font-size: 1.5em; display: block; width: 250px; height: 20px; background: #009933; padding: 5px; text-align: center; border-radius: 8px; color: white; font-weight: bold;";
diff --git a/src/main/java/org/umlgraph/doclet/Version.java b/src/main/java/org/umlgraph/doclet/Version.java
index 641f0a4..6759301 100644
--- a/src/main/java/org/umlgraph/doclet/Version.java
+++ b/src/main/java/org/umlgraph/doclet/Version.java
@@ -1,4 +1,4 @@
 /* Automatically generated file */
 package org.umlgraph.doclet;
-class Version { public static String VERSION = "R5_7_2-3-gee82a7";}
+class Version { public static String VERSION = "R5_7_2-11-g86574a";}
 	
\ No newline at end of file
diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/Customer.dot b/testdata/umldoc-ref/gr/spinellis/invoice/Customer.dot
index bbe2826..995b9bb 100644
--- a/testdata/umldoc-ref/gr/spinellis/invoice/Customer.dot
+++ b/testdata/umldoc-ref/gr/spinellis/invoice/Customer.dot
@@ -1,7 +1,7 @@
 #!/usr/local/bin/dot
 #
 # Class diagram 
-# Generated by UMLGraph version R5_7_0-10-g786d98 (http://www.umlgraph.org/)
+# Generated by UMLGraph version R5_7_2-11-g86574a (http://www.umlgraph.org/)
 #
 
 digraph G {
@@ -10,14 +10,14 @@ digraph G {
 	nodesep=0.25;
 	ranksep=0.5;
 	// gr.spinellis.invoice.Invoice
-	c33 [label=<<table title="gr.spinellis.invoice.Invoice" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" href="./Invoice.html"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> Invoice </td></tr></table></td></tr></table>>, URL="./Invoice.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	c33 [label=<<table title="gr.spinellis.invoice.Invoice" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" href="./Invoice.html" target="_parent"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> Invoice </td></tr></table></td></tr></table>>, URL="./Invoice.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
 	// gr.spinellis.invoice.Customer
-	c34 [label=<<table title="gr.spinellis.invoice.Customer" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" bgcolor="lemonChiffon" href="./Customer.html"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> Customer </td></tr></table></td></tr></table>>, URL="./Customer.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	c34 [label=<<table title="gr.spinellis.invoice.Customer" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" bgcolor="lemonChiffon" href="./Customer.html" target="_parent"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> Customer </td></tr></table></td></tr></table>>, URL="./Customer.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
 	// gr.spinellis.invoice.Invoice NAVASSOC gr.spinellis.invoice.Customer
 	c33:p -> c34:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
 	// gr.spinellis.invoice.Customer NAVASSOC java.lang.String
 	c34:p -> c44:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
 	// java.lang.String
-	c44 [label=<<table title="java.lang.String" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" href="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/String.html"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> String </td></tr><tr><td align="center" balign="center"> java.lang </td></tr></table></td></tr></table>>, URL="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/String.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	c44 [label=<<table title="java.lang.String" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html" target="_parent"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> String </td></tr><tr><td align="center" balign="center"> java.lang </td></tr></table></td></tr></table>>, URL="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
 }
 
diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/Customer.html b/testdata/umldoc-ref/gr/spinellis/invoice/Customer.html
index d866a92..2617014 100644
--- a/testdata/umldoc-ref/gr/spinellis/invoice/Customer.html
+++ b/testdata/umldoc-ref/gr/spinellis/invoice/Customer.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Tue Oct 28 20:20:40 EET 2014 -->
+<!-- Generated by javadoc (1.8.0_92) on Tue Jun 07 17:15:23 EEST 2016 -->
 <title>Customer</title>
-<meta name="date" content="2014-10-28">
+<meta name="date" content="2016-06-07">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -87,16 +87,8 @@
 <div class="header">
 <div class="subTitle">gr.spinellis.invoice</div>
 <h2 title="Class Customer" class="title">Class Customer</h2>
-<map id="G" name="G">
-<area shape="rect" id="node1_0" href="./Invoice.html" title="gr.spinellis.invoice.Invoice" alt="" coords="25,16,85,43"/>
-<area shape="rect" id="node1" href="./Invoice.html" title="&lt;TABLE&gt;" alt="" coords="14,5,95,53"/>
-<area shape="rect" id="node2_1" href="./Customer.html" title="gr.spinellis.invoice.Customer" alt="" coords="16,112,93,139"/>
-<area shape="rect" id="node2" href="./Customer.html" title="&lt;TABLE&gt;" alt="" coords="5,101,104,149"/>
-<area shape="rect" id="node3_2" href="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/String.html" title="java.lang.String" alt="" coords="19,203,90,247"/>
-<area shape="rect" id="node3" href="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/String.html" title="&lt;TABLE&gt;" alt="" coords="9,198,101,253"/>
-</map>
-<!-- UML diagram added by UMLGraph version R5_7_0-10-g786d98 (http://www.umlgraph.org/) -->
-<div align="center"><img src="Customer.png" alt="Package class diagram package Customer" usemap="#G" border=0/></div>
+<!-- UML diagram added by UMLGraph version R5_7_2-11-g86574a (http://www.umlgraph.org/) -->
+<div align="center"><object  width="100%" height="100%" type="image/svg+xml" data="Customer.svg" alt="Package class diagram package Customer" border=0></object></div>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/Invoice.dot b/testdata/umldoc-ref/gr/spinellis/invoice/Invoice.dot
index 0139895..19d299b 100644
--- a/testdata/umldoc-ref/gr/spinellis/invoice/Invoice.dot
+++ b/testdata/umldoc-ref/gr/spinellis/invoice/Invoice.dot
@@ -1,7 +1,7 @@
 #!/usr/local/bin/dot
 #
 # Class diagram 
-# Generated by UMLGraph version R5_7_0-10-g786d98 (http://www.umlgraph.org/)
+# Generated by UMLGraph version R5_7_2-11-g86574a (http://www.umlgraph.org/)
 #
 
 digraph G {
@@ -10,13 +10,13 @@ digraph G {
 	nodesep=0.25;
 	ranksep=0.5;
 	// gr.spinellis.invoice.InvoiceItem
-	c45 [label=<<table title="gr.spinellis.invoice.InvoiceItem" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" href="./InvoiceItem.html"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> InvoiceItem </td></tr></table></td></tr></table>>, URL="./InvoiceItem.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	c45 [label=<<table title="gr.spinellis.invoice.InvoiceItem" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" href="./InvoiceItem.html" target="_parent"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> InvoiceItem </td></tr></table></td></tr></table>>, URL="./InvoiceItem.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
 	// gr.spinellis.invoice.Invoice
-	c46 [label=<<table title="gr.spinellis.invoice.Invoice" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" bgcolor="lemonChiffon" href="./Invoice.html"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> Invoice </td></tr></table></td></tr></table>>, URL="./Invoice.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	c46 [label=<<table title="gr.spinellis.invoice.Invoice" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" bgcolor="lemonChiffon" href="./Invoice.html" target="_parent"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> Invoice </td></tr></table></td></tr></table>>, URL="./Invoice.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
 	// gr.spinellis.invoice.Customer
-	c47 [label=<<table title="gr.spinellis.invoice.Customer" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" href="./Customer.html"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> Customer </td></tr></table></td></tr></table>>, URL="./Customer.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	c47 [label=<<table title="gr.spinellis.invoice.Customer" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" href="./Customer.html" target="_parent"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> Customer </td></tr></table></td></tr></table>>, URL="./Customer.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
 	// gr.spinellis.product.Product
-	c48 [label=<<table title="gr.spinellis.product.Product" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" href="../product/Product.html"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> Product </td></tr><tr><td align="center" balign="center"> gr.spinellis.product </td></tr></table></td></tr></table>>, URL="../product/Product.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	c48 [label=<<table title="gr.spinellis.product.Product" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" href="../product/Product.html" target="_parent"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> Product </td></tr><tr><td align="center" balign="center"> gr.spinellis.product </td></tr></table></td></tr></table>>, URL="../product/Product.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
 	// gr.spinellis.invoice.InvoiceItem NAVASSOC gr.spinellis.product.Product
 	c45:p -> c48:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
 	// gr.spinellis.invoice.Invoice NAVASSOC gr.spinellis.invoice.InvoiceItem
@@ -28,6 +28,6 @@ digraph G {
 	// gr.spinellis.invoice.Invoice DEPEND gr.spinellis.product.Product
 	c46:p -> c48:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed];
 	// java.util.Date
-	c50 [label=<<table title="java.util.Date" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/Date.html"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> Date </td></tr><tr><td align="center" balign="center"> java.util </td></tr></table></td></tr></table>>, URL="http://java.sun.com/j2se/1.4.2/docs/api/java/util/Date.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	c50 [label=<<table title="java.util.Date" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" href="http://docs.oracle.com/javase/7/docs/api/java/util/Date.html" target="_parent"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> Date </td></tr><tr><td align="center" balign="center"> java.util </td></tr></table></td></tr></table>>, URL="http://docs.oracle.com/javase/7/docs/api/java/util/Date.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
 }
 
diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/Invoice.html b/testdata/umldoc-ref/gr/spinellis/invoice/Invoice.html
index 2ceec08..c40f240 100644
--- a/testdata/umldoc-ref/gr/spinellis/invoice/Invoice.html
+++ b/testdata/umldoc-ref/gr/spinellis/invoice/Invoice.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Tue Oct 28 20:20:40 EET 2014 -->
+<!-- Generated by javadoc (1.8.0_92) on Tue Jun 07 17:15:23 EEST 2016 -->
 <title>Invoice</title>
-<meta name="date" content="2014-10-28">
+<meta name="date" content="2016-06-07">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -93,20 +93,8 @@ var activeTableTab = "activeTableTab";
 <div class="header">
 <div class="subTitle">gr.spinellis.invoice</div>
 <h2 title="Class Invoice" class="title">Class Invoice</h2>
-<map id="G" name="G">
-<area shape="rect" id="node1_0" href="./InvoiceItem.html" title="gr.spinellis.invoice.InvoiceItem" alt="" coords="16,116,101,143"/>
-<area shape="rect" id="node1" href="./InvoiceItem.html" title="&lt;TABLE&gt;" alt="" coords="5,105,112,153"/>
-<area shape="rect" id="node4_1" href="../product/Product.html" title="gr.spinellis.product.Product" alt="" coords="101,211,230,255"/>
-<area shape="rect" id="node4" href="../product/Product.html" title="&lt;TABLE&gt;" alt="" coords="90,206,241,261"/>
-<area shape="rect" id="node2_2" href="./Invoice.html" title="gr.spinellis.invoice.Invoice" alt="" coords="198,16,258,43"/>
-<area shape="rect" id="node2" href="./Invoice.html" title="&lt;TABLE&gt;" alt="" coords="187,5,269,53"/>
-<area shape="rect" id="node3_3" href="./Customer.html" title="gr.spinellis.invoice.Customer" alt="" coords="147,116,224,143"/>
-<area shape="rect" id="node3" href="./Customer.html" title="&lt;TABLE&gt;" alt="" coords="136,105,235,153"/>
-<area shape="rect" id="node5_4" href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/Date.html" title="java.util.Date" alt="" coords="320,107,384,151"/>
-<area shape="rect" id="node5" href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/Date.html" title="&lt;TABLE&gt;" alt="" coords="309,102,395,157"/>
-</map>
-<!-- UML diagram added by UMLGraph version R5_7_0-10-g786d98 (http://www.umlgraph.org/) -->
-<div align="center"><img src="Invoice.png" alt="Package class diagram package Invoice" usemap="#G" border=0/></div>
+<!-- UML diagram added by UMLGraph version R5_7_2-11-g86574a (http://www.umlgraph.org/) -->
+<div align="center"><object  width="100%" height="100%" type="image/svg+xml" data="Invoice.svg" alt="Package class diagram package Invoice" border=0></object></div>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/InvoiceItem.dot b/testdata/umldoc-ref/gr/spinellis/invoice/InvoiceItem.dot
index 7bb3910..e55613f 100644
--- a/testdata/umldoc-ref/gr/spinellis/invoice/InvoiceItem.dot
+++ b/testdata/umldoc-ref/gr/spinellis/invoice/InvoiceItem.dot
@@ -1,7 +1,7 @@
 #!/usr/local/bin/dot
 #
 # Class diagram 
-# Generated by UMLGraph version R5_7_0-10-g786d98 (http://www.umlgraph.org/)
+# Generated by UMLGraph version R5_7_2-11-g86574a (http://www.umlgraph.org/)
 #
 
 digraph G {
@@ -10,11 +10,11 @@ digraph G {
 	nodesep=0.25;
 	ranksep=0.5;
 	// gr.spinellis.invoice.InvoiceItem
-	c51 [label=<<table title="gr.spinellis.invoice.InvoiceItem" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" bgcolor="lemonChiffon" href="./InvoiceItem.html"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> InvoiceItem </td></tr></table></td></tr></table>>, URL="./InvoiceItem.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	c51 [label=<<table title="gr.spinellis.invoice.InvoiceItem" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" bgcolor="lemonChiffon" href="./InvoiceItem.html" target="_parent"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> InvoiceItem </td></tr></table></td></tr></table>>, URL="./InvoiceItem.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
 	// gr.spinellis.invoice.Invoice
-	c52 [label=<<table title="gr.spinellis.invoice.Invoice" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" href="./Invoice.html"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> Invoice </td></tr></table></td></tr></table>>, URL="./Invoice.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	c52 [label=<<table title="gr.spinellis.invoice.Invoice" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" href="./Invoice.html" target="_parent"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> Invoice </td></tr></table></td></tr></table>>, URL="./Invoice.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
 	// gr.spinellis.product.Product
-	c54 [label=<<table title="gr.spinellis.product.Product" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" href="../product/Product.html"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> Product </td></tr><tr><td align="center" balign="center"> gr.spinellis.product </td></tr></table></td></tr></table>>, URL="../product/Product.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	c54 [label=<<table title="gr.spinellis.product.Product" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" href="../product/Product.html" target="_parent"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> Product </td></tr><tr><td align="center" balign="center"> gr.spinellis.product </td></tr></table></td></tr></table>>, URL="../product/Product.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
 	// gr.spinellis.invoice.InvoiceItem NAVASSOC gr.spinellis.product.Product
 	c51:p -> c54:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
 	// gr.spinellis.invoice.Invoice NAVASSOC gr.spinellis.invoice.InvoiceItem
diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/InvoiceItem.html b/testdata/umldoc-ref/gr/spinellis/invoice/InvoiceItem.html
index e4bc5c7..f85a4a0 100644
--- a/testdata/umldoc-ref/gr/spinellis/invoice/InvoiceItem.html
+++ b/testdata/umldoc-ref/gr/spinellis/invoice/InvoiceItem.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Tue Oct 28 20:20:40 EET 2014 -->
+<!-- Generated by javadoc (1.8.0_92) on Tue Jun 07 17:15:23 EEST 2016 -->
 <title>InvoiceItem</title>
-<meta name="date" content="2014-10-28">
+<meta name="date" content="2016-06-07">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -87,16 +87,8 @@
 <div class="header">
 <div class="subTitle">gr.spinellis.invoice</div>
 <h2 title="Class InvoiceItem" class="title">Class InvoiceItem</h2>
-<map id="G" name="G">
-<area shape="rect" id="node1_0" href="./InvoiceItem.html" title="gr.spinellis.invoice.InvoiceItem" alt="" coords="16,112,101,139"/>
-<area shape="rect" id="node1" href="./InvoiceItem.html" title="&lt;TABLE&gt;" alt="" coords="5,101,112,149"/>
-<area shape="rect" id="node3_1" href="../product/Product.html" title="gr.spinellis.product.Product" alt="" coords="39,203,169,247"/>
-<area shape="rect" id="node3" href="../product/Product.html" title="&lt;TABLE&gt;" alt="" coords="29,198,179,253"/>
-<area shape="rect" id="node2_2" href="./Invoice.html" title="gr.spinellis.invoice.Invoice" alt="" coords="74,16,134,43"/>
-<area shape="rect" id="node2" href="./Invoice.html" title="&lt;TABLE&gt;" alt="" coords="63,5,145,53"/>
-</map>
-<!-- UML diagram added by UMLGraph version R5_7_0-10-g786d98 (http://www.umlgraph.org/) -->
-<div align="center"><img src="InvoiceItem.png" alt="Package class diagram package InvoiceItem" usemap="#G" border=0/></div>
+<!-- UML diagram added by UMLGraph version R5_7_2-11-g86574a (http://www.umlgraph.org/) -->
+<div align="center"><object  width="100%" height="100%" type="image/svg+xml" data="InvoiceItem.svg" alt="Package class diagram package InvoiceItem" border=0></object></div>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/gr.spinellis.invoice.dot b/testdata/umldoc-ref/gr/spinellis/invoice/gr.spinellis.invoice.dot
index 44e8280..a2ad5de 100644
--- a/testdata/umldoc-ref/gr/spinellis/invoice/gr.spinellis.invoice.dot
+++ b/testdata/umldoc-ref/gr/spinellis/invoice/gr.spinellis.invoice.dot
@@ -1,23 +1,23 @@
 #!/usr/local/bin/dot
 #
 # Class diagram 
-# Generated by UMLGraph version 5.4 (http://www.umlgraph.org/)
+# Generated by UMLGraph version R5_7_2-11-g86574a (http://www.umlgraph.org/)
 #
 
 digraph G {
 	edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10];
-	node [fontname="Helvetica",fontsize=10,shape=plaintext];
-	nodesep=0.25;
-	ranksep=0.5;
-	// gr.spinellis.invoice.InvoiceItem
-	c0 [label=<<table title="gr.spinellis.invoice.InvoiceItem" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" href="./InvoiceItem.html"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> InvoiceItem </td></tr></table></td></tr></table>>, URL="./InvoiceItem.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
-	// gr.spinellis.invoice.Invoice
-	c1 [label=<<table title="gr.spinellis.invoice.Invoice" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" href="./Invoice.html"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> Invoice </td></tr></table></td></tr></table>>, URL="./Invoice.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
-	// gr.spinellis.invoice.Customer
-	c2 [label=<<table title="gr.spinellis.invoice.Customer" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" href="./Customer.html"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> Customer </td></tr></table></td></tr></table>>, URL="./Customer.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
-	// gr.spinellis.invoice.Invoice NAVASSOC gr.spinellis.invoice.InvoiceItem
-	c1:p -> c0:p [taillabel="", label="", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
-	// gr.spinellis.invoice.Invoice NAVASSOC gr.spinellis.invoice.Customer
-	c1:p -> c2:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
+	node [fontname="Helvetica",fontsize=10,shape=plaintext];
+	nodesep=0.25;
+	ranksep=0.5;
+	// gr.spinellis.invoice.InvoiceItem
+	c0 [label=<<table title="gr.spinellis.invoice.InvoiceItem" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" href="./InvoiceItem.html" target="_parent"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> InvoiceItem </td></tr></table></td></tr></table>>, URL="./InvoiceItem.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	// gr.spinellis.invoice.Invoice
+	c1 [label=<<table title="gr.spinellis.invoice.Invoice" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" href="./Invoice.html" target="_parent"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> Invoice </td></tr></table></td></tr></table>>, URL="./Invoice.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	// gr.spinellis.invoice.Customer
+	c2 [label=<<table title="gr.spinellis.invoice.Customer" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" href="./Customer.html" target="_parent"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> Customer </td></tr></table></td></tr></table>>, URL="./Customer.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	// gr.spinellis.invoice.Invoice NAVASSOC gr.spinellis.invoice.InvoiceItem
+	c1:p -> c0:p [taillabel="", label="", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
+	// gr.spinellis.invoice.Invoice NAVASSOC gr.spinellis.invoice.Customer
+	c1:p -> c2:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
 }
-
+
diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/package-frame.html b/testdata/umldoc-ref/gr/spinellis/invoice/package-frame.html
index 921b144..11cb12b 100644
--- a/testdata/umldoc-ref/gr/spinellis/invoice/package-frame.html
+++ b/testdata/umldoc-ref/gr/spinellis/invoice/package-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Tue Oct 28 20:20:40 EET 2014 -->
+<!-- Generated by javadoc (1.8.0_92) on Tue Jun 07 17:15:23 EEST 2016 -->
 <title>gr.spinellis.invoice</title>
-<meta name="date" content="2014-10-28">
+<meta name="date" content="2016-06-07">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/package-summary.html b/testdata/umldoc-ref/gr/spinellis/invoice/package-summary.html
index cdd36ba..a6e6f41 100644
--- a/testdata/umldoc-ref/gr/spinellis/invoice/package-summary.html
+++ b/testdata/umldoc-ref/gr/spinellis/invoice/package-summary.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Tue Oct 28 20:20:40 EET 2014 -->
+<!-- Generated by javadoc (1.8.0_92) on Tue Jun 07 17:15:23 EEST 2016 -->
 <title>gr.spinellis.invoice</title>
-<meta name="date" content="2014-10-28">
+<meta name="date" content="2016-06-07">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -70,16 +70,8 @@
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
 <h1 title="Package" class="title">Package&nbsp;gr.spinellis.invoice</h1>
-<map id="G" name="G">
-<area shape="rect" id="node1_0" href="./InvoiceItem.html" title="gr.spinellis.invoice.InvoiceItem" alt="" coords="16,112,101,139"/>
-<area shape="rect" id="node1" href="./InvoiceItem.html" title="&lt;TABLE&gt;" alt="" coords="5,101,112,149"/>
-<area shape="rect" id="node2_1" href="./Invoice.html" title="gr.spinellis.invoice.Invoice" alt="" coords="91,16,151,43"/>
-<area shape="rect" id="node2" href="./Invoice.html" title="&lt;TABLE&gt;" alt="" coords="81,5,162,53"/>
-<area shape="rect" id="node3_2" href="./Customer.html" title="gr.spinellis.invoice.Customer" alt="" coords="147,112,224,139"/>
-<area shape="rect" id="node3" href="./Customer.html" title="&lt;TABLE&gt;" alt="" coords="136,101,235,149"/>
-</map>
-<!-- UML diagram added by UMLGraph version R5_7_0-10-g786d98 (http://www.umlgraph.org/) -->
-<div align="center"><img src="gr.spinellis.invoice.png" alt="Package class diagram package gr.spinellis.invoice" usemap="#G" border=0/></div>
+<!-- UML diagram added by UMLGraph version R5_7_2-11-g86574a (http://www.umlgraph.org/) -->
+<div align="center"><object  width="100%" height="100%" type="image/svg+xml" data="gr.spinellis.invoice.svg" alt="Package class diagram package gr.spinellis.invoice" border=0></object></div>
 </div>
 <div class="contentContainer">
 <ul class="blockList">
diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/package-tree.html b/testdata/umldoc-ref/gr/spinellis/invoice/package-tree.html
index c9b4ea9..d1baca1 100644
--- a/testdata/umldoc-ref/gr/spinellis/invoice/package-tree.html
+++ b/testdata/umldoc-ref/gr/spinellis/invoice/package-tree.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Tue Oct 28 20:20:40 EET 2014 -->
+<!-- Generated by javadoc (1.8.0_92) on Tue Jun 07 17:15:23 EEST 2016 -->
 <title>gr.spinellis.invoice Class Hierarchy</title>
-<meta name="date" content="2014-10-28">
+<meta name="date" content="2016-06-07">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
diff --git a/testdata/umldoc-ref/gr/spinellis/product/Category.dot b/testdata/umldoc-ref/gr/spinellis/product/Category.dot
index 0e45cb1..94aa1d1 100644
--- a/testdata/umldoc-ref/gr/spinellis/product/Category.dot
+++ b/testdata/umldoc-ref/gr/spinellis/product/Category.dot
@@ -1,7 +1,7 @@
 #!/usr/local/bin/dot
 #
 # Class diagram 
-# Generated by UMLGraph version R5_7_0-10-g786d98 (http://www.umlgraph.org/)
+# Generated by UMLGraph version R5_7_2-11-g86574a (http://www.umlgraph.org/)
 #
 
 digraph G {
@@ -10,9 +10,9 @@ digraph G {
 	nodesep=0.25;
 	ranksep=0.5;
 	// gr.spinellis.product.Product
-	c20 [label=<<table title="gr.spinellis.product.Product" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" href="./Product.html"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> Product </td></tr></table></td></tr></table>>, URL="./Product.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	c20 [label=<<table title="gr.spinellis.product.Product" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" href="./Product.html" target="_parent"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> Product </td></tr></table></td></tr></table>>, URL="./Product.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
 	// gr.spinellis.product.Category
-	c21 [label=<<table title="gr.spinellis.product.Category" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" bgcolor="lemonChiffon" href="./Category.html"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> Category </td></tr></table></td></tr></table>>, URL="./Category.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	c21 [label=<<table title="gr.spinellis.product.Category" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" bgcolor="lemonChiffon" href="./Category.html" target="_parent"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> Category </td></tr></table></td></tr></table>>, URL="./Category.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
 	// gr.spinellis.product.Product NAVASSOC java.lang.String
 	c20:p -> c27:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
 	// gr.spinellis.product.Product NAVASSOC gr.spinellis.product.Category
@@ -20,6 +20,6 @@ digraph G {
 	// gr.spinellis.product.Category NAVASSOC java.lang.String
 	c21:p -> c27:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
 	// java.lang.String
-	c27 [label=<<table title="java.lang.String" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" href="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/String.html"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> String </td></tr><tr><td align="center" balign="center"> java.lang </td></tr></table></td></tr></table>>, URL="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/String.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	c27 [label=<<table title="java.lang.String" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html" target="_parent"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> String </td></tr><tr><td align="center" balign="center"> java.lang </td></tr></table></td></tr></table>>, URL="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
 }
 
diff --git a/testdata/umldoc-ref/gr/spinellis/product/Category.html b/testdata/umldoc-ref/gr/spinellis/product/Category.html
index 63c034a..69da1b9 100644
--- a/testdata/umldoc-ref/gr/spinellis/product/Category.html
+++ b/testdata/umldoc-ref/gr/spinellis/product/Category.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Tue Oct 28 20:20:40 EET 2014 -->
+<!-- Generated by javadoc (1.8.0_92) on Tue Jun 07 17:18:26 EEST 2016 -->
 <title>Category</title>
-<meta name="date" content="2014-10-28">
+<meta name="date" content="2016-06-07">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -87,16 +87,8 @@
 <div class="header">
 <div class="subTitle">gr.spinellis.product</div>
 <h2 title="Class Category" class="title">Class Category</h2>
-<map id="G" name="G">
-<area shape="rect" id="node1_0" href="./Product.html" title="gr.spinellis.product.Product" alt="" coords="62,16,127,43"/>
-<area shape="rect" id="node1" href="./Product.html" title="&lt;TABLE&gt;" alt="" coords="51,5,138,53"/>
-<area shape="rect" id="node2_1" href="./Category.html" title="gr.spinellis.product.Category" alt="" coords="15,112,89,139"/>
-<area shape="rect" id="node2" href="./Category.html" title="&lt;TABLE&gt;" alt="" coords="5,101,99,149"/>
-<area shape="rect" id="node3_2" href="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/String.html" title="java.lang.String" alt="" coords="59,203,130,247"/>
-<area shape="rect" id="node3" href="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/String.html" title="&lt;TABLE&gt;" alt="" coords="49,198,141,253"/>
-</map>
-<!-- UML diagram added by UMLGraph version R5_7_0-10-g786d98 (http://www.umlgraph.org/) -->
-<div align="center"><img src="Category.png" alt="Package class diagram package Category" usemap="#G" border=0/></div>
+<!-- UML diagram added by UMLGraph version R5_7_2-11-g86574a (http://www.umlgraph.org/) -->
+<div align="center"><object  width="100%" height="100%" type="image/svg+xml" data="Category.svg" alt="Package class diagram package Category" border=0></object></div>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
diff --git a/testdata/umldoc-ref/gr/spinellis/product/Product.dot b/testdata/umldoc-ref/gr/spinellis/product/Product.dot
index 0f756b1..e34b4d9 100644
--- a/testdata/umldoc-ref/gr/spinellis/product/Product.dot
+++ b/testdata/umldoc-ref/gr/spinellis/product/Product.dot
@@ -1,7 +1,7 @@
 #!/usr/local/bin/dot
 #
 # Class diagram 
-# Generated by UMLGraph version R5_7_0-10-g786d98 (http://www.umlgraph.org/)
+# Generated by UMLGraph version R5_7_2-11-g86574a (http://www.umlgraph.org/)
 #
 
 digraph G {
@@ -10,13 +10,13 @@ digraph G {
 	nodesep=0.25;
 	ranksep=0.5;
 	// gr.spinellis.invoice.InvoiceItem
-	c56 [label=<<table title="gr.spinellis.invoice.InvoiceItem" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" href="../invoice/InvoiceItem.html"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> InvoiceItem </td></tr><tr><td align="center" balign="center"> gr.spinellis.invoice </td></tr></table></td></tr></table>>, URL="../invoice/InvoiceItem.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	c56 [label=<<table title="gr.spinellis.invoice.InvoiceItem" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" href="../invoice/InvoiceItem.html" target="_parent"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> InvoiceItem </td></tr><tr><td align="center" balign="center"> gr.spinellis.invoice </td></tr></table></td></tr></table>>, URL="../invoice/InvoiceItem.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
 	// gr.spinellis.invoice.Invoice
-	c57 [label=<<table title="gr.spinellis.invoice.Invoice" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" href="../invoice/Invoice.html"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> Invoice </td></tr><tr><td align="center" balign="center"> gr.spinellis.invoice </td></tr></table></td></tr></table>>, URL="../invoice/Invoice.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	c57 [label=<<table title="gr.spinellis.invoice.Invoice" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" href="../invoice/Invoice.html" target="_parent"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> Invoice </td></tr><tr><td align="center" balign="center"> gr.spinellis.invoice </td></tr></table></td></tr></table>>, URL="../invoice/Invoice.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
 	// gr.spinellis.product.Product
-	c59 [label=<<table title="gr.spinellis.product.Product" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" bgcolor="lemonChiffon" href="./Product.html"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> Product </td></tr></table></td></tr></table>>, URL="./Product.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	c59 [label=<<table title="gr.spinellis.product.Product" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" bgcolor="lemonChiffon" href="./Product.html" target="_parent"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> Product </td></tr></table></td></tr></table>>, URL="./Product.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
 	// gr.spinellis.product.Category
-	c60 [label=<<table title="gr.spinellis.product.Category" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" href="./Category.html"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> Category </td></tr></table></td></tr></table>>, URL="./Category.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	c60 [label=<<table title="gr.spinellis.product.Category" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" href="./Category.html" target="_parent"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> Category </td></tr></table></td></tr></table>>, URL="./Category.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
 	// gr.spinellis.invoice.InvoiceItem NAVASSOC gr.spinellis.product.Product
 	c56:p -> c59:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
 	// gr.spinellis.invoice.Invoice NAVASSOC gr.spinellis.invoice.InvoiceItem
@@ -30,6 +30,6 @@ digraph G {
 	// gr.spinellis.invoice.Invoice DEPEND gr.spinellis.product.Product
 	c57:p -> c59:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed];
 	// java.lang.String
-	c61 [label=<<table title="java.lang.String" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" href="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/String.html"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> String </td></tr><tr><td align="center" balign="center"> java.lang </td></tr></table></td></tr></table>>, URL="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/String.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	c61 [label=<<table title="java.lang.String" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html" target="_parent"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> String </td></tr><tr><td align="center" balign="center"> java.lang </td></tr></table></td></tr></table>>, URL="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
 }
 
diff --git a/testdata/umldoc-ref/gr/spinellis/product/Product.html b/testdata/umldoc-ref/gr/spinellis/product/Product.html
index 42dbb65..5319c4b 100644
--- a/testdata/umldoc-ref/gr/spinellis/product/Product.html
+++ b/testdata/umldoc-ref/gr/spinellis/product/Product.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Tue Oct 28 20:20:40 EET 2014 -->
+<!-- Generated by javadoc (1.8.0_92) on Tue Jun 07 17:18:26 EEST 2016 -->
 <title>Product</title>
-<meta name="date" content="2014-10-28">
+<meta name="date" content="2016-06-07">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -87,20 +87,8 @@
 <div class="header">
 <div class="subTitle">gr.spinellis.product</div>
 <h2 title="Class Product" class="title">Class Product</h2>
-<map id="G" name="G">
-<area shape="rect" id="node1_0" href="../invoice/InvoiceItem.html" title="gr.spinellis.invoice.InvoiceItem" alt="" coords="16,115,141,159"/>
-<area shape="rect" id="node1" href="../invoice/InvoiceItem.html" title="&lt;TABLE&gt;" alt="" coords="5,110,152,165"/>
-<area shape="rect" id="node3_1" href="./Product.html" title="gr.spinellis.product.Product" alt="" coords="101,224,166,251"/>
-<area shape="rect" id="node3" href="./Product.html" title="&lt;TABLE&gt;" alt="" coords="90,213,177,261"/>
-<area shape="rect" id="node2_2" href="../invoice/Invoice.html" title="gr.spinellis.invoice.Invoice" alt="" coords="71,11,196,55"/>
-<area shape="rect" id="node2" href="../invoice/Invoice.html" title="&lt;TABLE&gt;" alt="" coords="60,6,207,61"/>
-<area shape="rect" id="node4_3" href="./Category.html" title="gr.spinellis.product.Category" alt="" coords="54,320,127,347"/>
-<area shape="rect" id="node4" href="./Category.html" title="&lt;TABLE&gt;" alt="" coords="43,309,138,357"/>
-<area shape="rect" id="node5_4" href="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/String.html" title="java.lang.String" alt="" coords="98,411,169,455"/>
-<area shape="rect" id="node5" href="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/String.html" title="&lt;TABLE&gt;" alt="" coords="87,406,179,461"/>
-</map>
-<!-- UML diagram added by UMLGraph version R5_7_0-10-g786d98 (http://www.umlgraph.org/) -->
-<div align="center"><img src="Product.png" alt="Package class diagram package Product" usemap="#G" border=0/></div>
+<!-- UML diagram added by UMLGraph version R5_7_2-11-g86574a (http://www.umlgraph.org/) -->
+<div align="center"><object  width="100%" height="100%" type="image/svg+xml" data="Product.svg" alt="Package class diagram package Product" border=0></object></div>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
diff --git a/testdata/umldoc-ref/gr/spinellis/product/gr.spinellis.product.dot b/testdata/umldoc-ref/gr/spinellis/product/gr.spinellis.product.dot
index a1e9f6d..04606aa 100644
--- a/testdata/umldoc-ref/gr/spinellis/product/gr.spinellis.product.dot
+++ b/testdata/umldoc-ref/gr/spinellis/product/gr.spinellis.product.dot
@@ -1,7 +1,7 @@
 #!/usr/local/bin/dot
 #
 # Class diagram 
-# Generated by UMLGraph version R5_7_0-10-g786d98 (http://www.umlgraph.org/)
+# Generated by UMLGraph version R5_7_2-11-g86574a (http://www.umlgraph.org/)
 #
 
 digraph G {
@@ -10,9 +10,9 @@ digraph G {
 	nodesep=0.25;
 	ranksep=0.5;
 	// gr.spinellis.product.Product
-	c8 [label=<<table title="gr.spinellis.product.Product" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" href="./Product.html"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> Product </td></tr></table></td></tr></table>>, URL="./Product.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	c8 [label=<<table title="gr.spinellis.product.Product" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" href="./Product.html" target="_parent"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> Product </td></tr></table></td></tr></table>>, URL="./Product.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
 	// gr.spinellis.product.Category
-	c9 [label=<<table title="gr.spinellis.product.Category" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" href="./Category.html"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> Category </td></tr></table></td></tr></table>>, URL="./Category.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	c9 [label=<<table title="gr.spinellis.product.Category" border="0" cellborder="1" cellspacing="0" cellpadding="2" port="p" href="./Category.html" target="_parent"><tr><td><table border="0" cellspacing="0" cellpadding="1"><tr><td align="center" balign="center"> Category </td></tr></table></td></tr></table>>, URL="./Category.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
 	// gr.spinellis.product.Product NAVASSOC gr.spinellis.product.Category
 	c8:p -> c9:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
 }
diff --git a/testdata/umldoc-ref/gr/spinellis/product/package-frame.html b/testdata/umldoc-ref/gr/spinellis/product/package-frame.html
index ac90d4e..7c2f904 100644
--- a/testdata/umldoc-ref/gr/spinellis/product/package-frame.html
+++ b/testdata/umldoc-ref/gr/spinellis/product/package-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Tue Oct 28 20:20:40 EET 2014 -->
+<!-- Generated by javadoc (1.8.0_92) on Tue Jun 07 17:18:26 EEST 2016 -->
 <title>gr.spinellis.product</title>
-<meta name="date" content="2014-10-28">
+<meta name="date" content="2016-06-07">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
diff --git a/testdata/umldoc-ref/gr/spinellis/product/package-summary.html b/testdata/umldoc-ref/gr/spinellis/product/package-summary.html
index 38a8409..06156cb 100644
--- a/testdata/umldoc-ref/gr/spinellis/product/package-summary.html
+++ b/testdata/umldoc-ref/gr/spinellis/product/package-summary.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Tue Oct 28 20:20:40 EET 2014 -->
+<!-- Generated by javadoc (1.8.0_92) on Tue Jun 07 17:18:26 EEST 2016 -->
 <title>gr.spinellis.product</title>
-<meta name="date" content="2014-10-28">
+<meta name="date" content="2016-06-07">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -70,14 +70,8 @@
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
 <h1 title="Package" class="title">Package&nbsp;gr.spinellis.product</h1>
-<map id="G" name="G">
-<area shape="rect" id="node1_0" href="./Product.html" title="gr.spinellis.product.Product" alt="" coords="19,16,85,43"/>
-<area shape="rect" id="node1" href="./Product.html" title="&lt;TABLE&gt;" alt="" coords="9,5,95,53"/>
-<area shape="rect" id="node2_1" href="./Category.html" title="gr.spinellis.product.Category" alt="" coords="15,112,89,139"/>
-<area shape="rect" id="node2" href="./Category.html" title="&lt;TABLE&gt;" alt="" coords="5,101,99,149"/>
-</map>
-<!-- UML diagram added by UMLGraph version R5_7_0-10-g786d98 (http://www.umlgraph.org/) -->
-<div align="center"><img src="gr.spinellis.product.png" alt="Package class diagram package gr.spinellis.product" usemap="#G" border=0/></div>
+<!-- UML diagram added by UMLGraph version R5_7_2-11-g86574a (http://www.umlgraph.org/) -->
+<div align="center"><object  width="100%" height="100%" type="image/svg+xml" data="gr.spinellis.product.svg" alt="Package class diagram package gr.spinellis.product" border=0></object></div>
 </div>
 <div class="contentContainer">
 <ul class="blockList">
diff --git a/testdata/umldoc-ref/gr/spinellis/product/package-tree.html b/testdata/umldoc-ref/gr/spinellis/product/package-tree.html
index 8fcbdce..ba79b80 100644
--- a/testdata/umldoc-ref/gr/spinellis/product/package-tree.html
+++ b/testdata/umldoc-ref/gr/spinellis/product/package-tree.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Tue Oct 28 20:20:40 EET 2014 -->
+<!-- Generated by javadoc (1.8.0_92) on Tue Jun 07 17:18:26 EEST 2016 -->
 <title>gr.spinellis.product Class Hierarchy</title>
-<meta name="date" content="2014-10-28">
+<meta name="date" content="2016-06-07">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>