diff --git a/testdata/dot-ref/Style.dot b/testdata/dot-ref/Style.dot index f416ea5..8154c25 100644 --- a/testdata/dot-ref/Style.dot +++ b/testdata/dot-ref/Style.dot @@ -1,27 +1,27 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version 5.1 (http://www.umlgraph.org/) +# Generated by UMLGraph version 5.2 (http://www.umlgraph.org/) # digraph G { - edge [fontname="arialbd",fontsize=10,labelfontname="arialbd",labelfontsize=10]; + edge [fontname="arial",fontsize=10,labelfontname="arial",labelfontsize=10]; node [fontname="arial",fontsize=10,shape=plaintext]; nodesep=0.25; ranksep=0.5; // net.sf.whatever.test.AbstractBase - c106 [label=<
«base»
AbstractBase
net.sf.whatever.test
{since = 1.0}
field : int
{since = 1.5}
abstractMethod()
concreteMethod() : int
>, fontname="arial", fontcolor="black", fontsize=9.0]; + c117 [label=<
«base»
AbstractBase
net.sf.whatever.test
{since = 1.0}
field : int
{since = 1.5}
abstractMethod()
concreteMethod() : int
>, fontname="arial", fontcolor="black", fontsize=9.0]; // net.sf.whatever.test.Composite - c107 [label=<
Composite
net.sf.whatever.test
>, fontname="arial", fontcolor="black", fontsize=9.0]; + c118 [label=<
Composite
net.sf.whatever.test
>, fontname="arial", fontcolor="black", fontsize=9.0]; // net.sf.whatever.test.Style - c108 [label=<
Style
net.sf.whatever.test
>, fontname="arial", fontcolor="black", fontsize=9.0]; + c119 [label=<
Style
net.sf.whatever.test
>, fontname="arial", fontcolor="black", fontsize=9.0]; //net.sf.whatever.test.Composite extends net.sf.whatever.test.AbstractBase - c106:p -> c107:p [dir=back,arrowtail=empty]; + c117:p -> c118:p [dir=back,arrowtail=empty]; // net.sf.whatever.test.Composite COMPOSED from.Outer.Space.AlienClass - c107:p -> c109:p [taillabel="1", label="has", headlabel="*", fontname="arialbd", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=diamond]; + c118:p -> c120:p [taillabel="1", label="has", headlabel="*", fontname="arial", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=diamond]; //net.sf.whatever.test.Style extends net.sf.whatever.test.AbstractBase - c106:p -> c108:p [dir=back,arrowtail=empty]; + c117:p -> c119:p [dir=back,arrowtail=empty]; // from.Outer.Space.AlienClass - c109[label=<
AlienClass
from.Outer.Space
>, fontname="arial", fontcolor="black", fontsize=9.0]; + c120[label=<
AlienClass
from.Outer.Space
>, fontname="arial", fontcolor="black", fontsize=9.0]; } diff --git a/testdata/dot-ref/color.dot b/testdata/dot-ref/color.dot index b8d76a7..d03bd58 100644 --- a/testdata/dot-ref/color.dot +++ b/testdata/dot-ref/color.dot @@ -1,29 +1,29 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version 5.1 (http://www.umlgraph.org/) +# Generated by UMLGraph version 5.2 (http://www.umlgraph.org/) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; - node [fontname="Times",fontsize=10,shape=plaintext]; + node [fontname="Serif",fontsize=10,shape=plaintext]; nodesep=0.25; ranksep=0.5; bgcolor=".7 .9 1"; // Pixel - c49 [label=<
Pixel
- x : int
- y : int
>, fontname="Helvetica-Bold", fontcolor="white", fontsize=14.0]; + c111 [label=<
Pixel
- x : int
- y : int
>, fontname="arial", fontcolor="white", fontsize=14.0]; // Red - c50 [label=<
Red
>, fontname="Times", fontcolor="black", fontsize=14.0]; + c112 [label=<
Red
>, fontname="Serif", fontcolor="black", fontsize=14.0]; // Green - c51 [label=<
Green
>, fontname="Times", fontcolor="black", fontsize=14.0]; + c113 [label=<
Green
>, fontname="Serif", fontcolor="black", fontsize=14.0]; // Blue - c52 [label=<
Blue
>, fontname="Times", fontcolor="black", fontsize=14.0]; + c114 [label=<
Blue
>, fontname="Serif", fontcolor="black", fontsize=14.0]; // Pixel COMPOSED Red - c49:p -> c50:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="yellow", arrowhead=none, arrowtail=diamond]; + c111:p -> c112:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="yellow", arrowhead=none, arrowtail=diamond]; // Pixel COMPOSED Green - c49:p -> c51:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="yellow", arrowhead=none, arrowtail=diamond]; + c111:p -> c113:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="yellow", arrowhead=none, arrowtail=diamond]; // Pixel COMPOSED Blue - c49:p -> c52:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="yellow", arrowhead=none, arrowtail=diamond]; + c111:p -> c114:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="yellow", arrowhead=none, arrowtail=diamond]; } diff --git a/testdata/java/Style.java b/testdata/java/Style.java index 8db312f..67329e2 100644 --- a/testdata/java/Style.java +++ b/testdata/java/Style.java @@ -4,14 +4,14 @@ package net.sf.whatever.test; /** * @hidden * @opt postfixpackage - * @opt edgefontname arialbd + * @opt edgefontname arial bold * @opt nodefontname arial * @opt nodefontsize 9 - * @opt nodefontabstract ariali - * @opt nodefontclassname arialbd - * @opt nodefontclassabstractname arialbi + * @opt nodefontabstract arial italic + * @opt nodefontclassname arial bold + * @opt nodefontclassabstractname arial bold italic * @opt nodefonttagsize 6 - * @opt nodefonttagname ariali + * @opt nodefonttagname arial italic * @opt nodefontpackagesize 8 * @opt operations * @opt attributes diff --git a/testdata/java/color.java b/testdata/java/color.java index f4a82aa..ac14658 100644 --- a/testdata/java/color.java +++ b/testdata/java/color.java @@ -2,7 +2,7 @@ /** * @opt edgecolor "yellow" - * @opt nodefontname "Times" + * @opt nodefontname Serif * @opt bgcolor ".7 .9 1" * @opt nodefillcolor "#a0a0a0" * @opt nodefontsize 14 @@ -11,7 +11,7 @@ class UMLOptions{} /** - * @opt nodefontname "Helvetica-Bold" + * @opt nodefontname arial bold * @opt nodefontcolor "white" * @composed - - - Red * @composed - - - Green