diff --git a/doc/cd-opt.xml b/doc/cd-opt.xml
index 3aa66b6..cc391af 100644
--- a/doc/cd-opt.xml
+++ b/doc/cd-opt.xml
@@ -4,46 +4,10 @@
A number of options contol the operation of UMLGraph
class diagram generator.
These can be specified on the command line, and most can also
-be specified within the diagram, affecting all or some elements.
+be specified through javadoc tags within the diagram, affecting all or some elements.
-The following options are supported:
+What Gets Drawn
-- -output
- Specify the output file (default
graph.dot).
-If the output directory is provided, -output can only specify a file name,
-otherwise a full path is accepted as well.
-If the filename specified is a dash, then the results are printed on the
-standard output, and can be directly piped into dot.
-Note that, in order to avoid javadoc messages to contaminate
-UMLGraph's output, you must execute UMLGraph directly as a jar,
-not through javadoc.
-
-- -d
- Specify the output directory (defaults to the current directory).
-
-- -outputencoding
- Specify the output encoding character set (default
ISO-8859-1).
-When using dot to generate SVG diagrams you should specify
-UTF-8 as the output encoding, to have guillemots correctly
-appearing in the resulting SVG.
-
-- -qualify
- Produce fully-qualified class names.
-
-- -horizontal
- Layout the graph in the horizontal direction.
-
-- -attributes
- Show class attributes (Java fields)
-
-- -operations
- Show class operations (Java methods)
-
-- -constructors
- Show a class's constructors
-
-- -visibility
- Adorn class elements according to their
-visibility (private, public, protected, package)
-
-- -types
- Add type information to attributes and operations
-
-- -enumerations
- Show enumarations as separate stereotyped primitive
-types.
-
-- -enumconstants
- When showing enumerations, also show the values they can take.
-
- -all
- Same as
-attributes
-operations
@@ -52,87 +16,84 @@ types.
-enumerations
-enumconstants
-- -commentname
- Name the element using the text in the javadoc
-comment, instead of the name of its class.
-
-- -nodefillcolor
- Specify the color to use to fill the shapes.
-
-- -nodefontname
- Specify the font name to use inside nodes.
-
-- -nodefontabstractname
- Specify the font name to use
-inside abstract class nodes.
-
-- -nodefontsize
- Specify the font size to use inside nodes.
-
-- -nodefontclassname
- Specify the font name to use for the class names.
-
-- -nodefontclassabstractname
- Specify the font name use for the
-class name of abstract classes.
-
-- -nodefontclasssize
- Specify the font size to use for the class names.
-
-- -nodefonttagname
- Specify the font name to use for the tag names.
-
-- -nodefonttagsize
- Specify the font size to use for the tag names.
-
-- -nodefontpackagename
- Specify the font name to use for the package
-names (used only when the package name is postfixed, see -postfixpackage).
-
-- -nodefontpackagesize
- Specify the font size to use for the package
-names (used only when it package name is postfixed, see -postfixpackage).
-
-- -nodefontcolor
- Specify the font color to use inside nodes.
-
-- -edgefontname
- Specify the font name to use for edge labels.
-
-- -edgefontsize
- Specify the font size to use for edge labels.
-
-- -edgefontcolor
- Specify the font color to use for edge labels.
-
-- -edgecolor
- Specify the color for drawing edges.
-
-- -bgcolor
- Specify the graph's background color.
-
-- -postfixpackage
- When using qualified class names, put the
-package name in the line after the class name, in order to reduce the
-width of class nodes.
-
-- -shape
- Specify the shape to use for the rendered element(s).
-The following UML shapes are available:
-
-- class (default)
-- node
-- component
-- package
-- collaboration
-- usecase
-- activeclass
-
-
-
+- -attributes
- Show class attributes (Java fields)
+- -commentname
- Name the element using the text in the javadoc comment, instead of the name of its class.
+- -constructors
- Show a class's constructors
+- -enumconstants
- When showing enumerations, also show the values they can take.
+- -enumerations
- Show enumarations as separate stereotyped primitive types.
- -hide
- Specify entities to hide from the graph.
-Matching is done using a non-anchored regular match.
-For instance, "
-hide (Big|\.)Widget" would hide "com.foo.widgets.Widget" and
-"com.foo.widgets.BigWidget". Can also be used without arguments,
-in this case it will hide everything (useful in the context of views
-to selectively unhide some portions of the graph, see the view chapter for
-further details).
-
+ Matching is done using a non-anchored regular match.
+ For instance, "-hide (Big|\.)Widget" would hide "com.foo.widgets.Widget" and
+ "com.foo.widgets.BigWidget". Can also be used without arguments,
+ in this case it will hide everything (useful in the context of views
+ to selectively unhide some portions of the graph, see the view chapter for
+ further details).
+- -operations
- Show class operations (Java methods)
+- -qualify
- Produce fully-qualified class names.
+- -types
- Add type information to attributes and operations
- -view
- Specify the fully qualified name of a class that contains
-a view definition. Only the class diagram specified by this view will be generated.
-
See the views chapter for more details.
-
-- -views
- Generate a class diagram for every view found in the source path.
-
-- -collapsible
- Enhance the javadoc HTML files containing UML diagrams
-with Javascript that provides a link for showing the (initially collapsed)
-diagrams.
-
-- -inferrel
- Try to automatically infer relationships between classes by inspecting
-field values. See the class diagram inference chapter for further details. Disabled by default.
-
-- -inferreltype
- The type of relationship inferred when -inferrel is activated.
-Defaults to "navassoc" (see the class modelling chapter for a list of relationship types).
+ a view definition. Only the class diagram specified by this view will be generated.
+
See the views chapter for more details.
+- -views
- Generate a class diagram for every view found in the source path.
+- -visibility
- Adorn class elements according to their visibility (private, public, protected, package)
+
+Visual Appearance
+
+- -bgcolor
- Specify the graph's background color.
+- -collapsible
- Enhance the javadoc HTML files containing UML diagrams with Javascript that provides a link for showing the (initially collapsed) diagrams.
+- -edgecolor
- Specify the color for drawing edges.
+- -edgefontcolor
- Specify the font color to use for edge labels.
+- -edgefontname
- Specify the font name to use for edge labels.
+- -edgefontsize
- Specify the font size to use for edge labels.
+- -horizontal
- Layout the graph in the horizontal direction.
+- -nodefillcolor
- Specify the color to use to fill the shapes.
+- -nodefontabstractname
- Specify the font name to use inside abstract class nodes.
+- -nodefontclassabstractname
- Specify the font name use for the class name of abstract classes.
+- -nodefontclassname
- Specify the font name to use for the class names.
+- -nodefontclasssize
- Specify the font size to use for the class names.
+- -nodefontcolor
- Specify the font color to use inside nodes.
+- -nodefontname
- Specify the font name to use inside nodes.
+- -nodefontpackagename
- Specify the font name to use for the package names (used only when the package name is postfixed, see -postfixpackage).
+- -nodefontpackagesize
- Specify the font size to use for the package names (used only when it package name is postfixed, see -postfixpackage).
+- -nodefontsize
- Specify the font size to use inside nodes.
+- -nodefonttagname
- Specify the font name to use for the tag names.
+- -nodefonttagsize
- Specify the font size to use for the tag names.
+- -nodesep
- Specify the horizontal separation between the class nodes (0.25 by default). Decreasing this can make a diagram more compact.
+- -noguillemot
- Specify that guillemot characters should not be used to denote special terms like "interface" and stereotype names. This is used on some platforms to circumvent problems associated with displaying non-ASCII characters.
+- -postfixpackage
- When using qualified class names, put the package name in the line after the class name, in order to reduce the width of class nodes.
+- -ranksep
- Specify the vertical separation between the class nodes (0.5 by default). Decreasing this can make a diagram more compact.
+- -shape
- Specify the shape to use for the rendered element(s).
+ The following UML shapes are available:
+
+ - class (default)
+ - node
+ - component
+ - package
+ - collaboration
+ - usecase
+ - activeclass
+
+
+
+
+
+All colors can be either a symbolic name (e.g. blue),
+a tripple specifying hue-saturation-brightness as values 0-1
+(e.g. ".13 0.9 1"),
+or a tripple specifying red-green-blue values as hexadecimal
+digits prefixed by a # (e.g. "#ff8020").
+The symbolic color names are derived from the X Windows System;
+you can find a complete list in the
+Graphviz documentation
+
+Font names are passed directly to the dot graph generation back-end.
+In general the Postcript standard names Times, Helvetica, Courier, and
+Symbol are safe to use.
+Relationship Inference
+
+- -collpackages
- Specify the classes that will be treated as
+containers for one to many relationships when inference is enabled.
+Matching is done using a non-anchored regular match. Empty by default.
- -inferdep
- Try to automatically infer dependencies between classes by inspecting
methods and fields. See the class diagram inference chapter for more details. Disabled by default.
@@ -146,18 +107,27 @@ of these dependencies since imports are not required to use classes in the same
dependencies among classes. Possible values are private, package, protected, public, in this
order. The default value is private. Use higher levels to limit the number of inferred dependencies.
+- -inferrel
- Try to automatically infer relationships between classes by inspecting
+field values. See the class diagram inference chapter for further details. Disabled by default.
+
+- -inferreltype
- The type of relationship inferred when -inferrel is activated.
+Defaults to "navassoc" (see the class modelling chapter for a list of relationship types).
+
- -useimports
- Will also use imports to infer dependencies.
Disabled by default, since it does not work properly if there are multiple
classes in the same source file (will add dependencies to every class in
the source file).
-- -verbose2
- Will print on the standard output details regarding
-the progress of graph generation.
-(Note that -verbose is a javadoc option with a different meaning).
-
-- -collpackages
- Specify the classes that will be treated as
-containers for one to many relationships when inference is enabled.
-Matching is done using a non-anchored regular match. Empty by default.
+
+API Hyperlinks
+
+- -apidocmap
- Specify the file name of the URL mapping table.
+The is a standard Java property file, where the property name is a regular
+expression (as defined in the java.util.regex package) and the property value is
+an URL "root" as described above.
+This table is used to resolved external class names (class names that do not
+belong to the current package being processed by UMLGraph). If no file is provided,
+external classes will just be mapped to the on-line Java API documentation.
- -apidocroot
- Specify the URL that should be used as the "root" for local classes.
This URL will be used as a prefix, to which the page name for the local class or
@@ -170,28 +140,6 @@ final class diagram by setting the output to SVG, or by creating an HTML page
that associates the diagram static image (a .gif or .png) with a client-side
image map.
-- -apidocmap
- Specify the file name of the URL mapping table.
-The is a standard Java property file, where the property name is a regular
-expression (as defined in the java.util.regex package) and the property value is
-an URL "root" as described above.
-This table is used to resolved external class names (class names that do not
-belong to the current package being processed by UMLGraph). If no file is provided,
-external classes will just be mapped to the on-line Java API documentation.
-
-- -nodesep
- Specify the horizontal separation between the class nodes (0.25
-by default). Decreasing this can make a diagram more compact.
-- -ranksep
- Specify the vertical separation between the class nodes (0.5
-by default). Decreasing this can make a diagram more compact.
-- -noguillemot
- Specify that guillemot characters should not
-be used to denote special terms like "interface" and stereotype names.
-This is used on some platforms to circumvent problems associated
-with displaying non-ASCII characters.
-
-- -compact
- Generate compact dot files, that is, print html labels
-in a single line instead of "pretty printing" them. Useful if the dot file
-has to be manipulated by an automated tool (e.g., the UMLGraph regression
-test suite).
-
- -link
- A clone of the standard doclet
-link
option, allows UMLGraph to generate links from class symbols to their external javadoc
@@ -199,17 +147,33 @@ documentation (image maps are automatically generated in UMLGraphDoc, you'll hav
manually with graphviz if using UMLGraph).
-
-All colors can be either a symbolic name (e.g. blue),
-a tripple specifying hue-saturation-brightness as values 0-1
-(e.g. ".13 0.9 1"),
-or a tripple specifying red-green-blue values as hexadecimal
-digits prefixed by a # (e.g. "#ff8020").
-The symbolic color names are derived from the X Windows System;
-you can find a complete list in the
-Graphviz documentation
-
-Font names are passed directly to the dot graph generation back-end.
-In general the Postcript standard names Times, Helvetica, Courier, and
-Symbol are safe to use.
+Operation
+
+- -compact
- Generate compact dot files, that is, print HTML labels
+in a single line instead of "pretty printing" them. Useful if the dot file
+has to be manipulated by an automated tool
+(e.g., the UMLGraph regression test suite).
+
+- -d
- Specify the output directory (defaults to the current directory).
+
+- -output
- Specify the output file (default
graph.dot).
+If the output directory is provided, -output can only specify a file name,
+otherwise a full path is accepted as well.
+If the filename specified is a dash, then the results are printed on the
+standard output, and can be directly piped into dot.
+Note that, in order to avoid javadoc messages to contaminate
+UMLGraph's output, you must execute UMLGraph directly as a jar,
+not through javadoc.
+
+- -outputencoding
- Specify the output encoding character set (default
ISO-8859-1).
+When using dot to generate SVG diagrams you should specify
+UTF-8 as the output encoding, to have guillemots correctly
+appearing in the resulting SVG.
+
+- -verbose2
- Will print on the standard output details regarding
+the progress of graph generation.
+(Note that -verbose is a javadoc option with a different meaning).
+
+
+
diff --git a/doc/ver.xml b/doc/ver.xml
index 44ad372..ac1b0ba 100644
--- a/doc/ver.xml
+++ b/doc/ver.xml
@@ -6,24 +6,32 @@
Version 5.1 Under development
- Active classes now appear with a double vertical border, following UML2.
+- Reorganized the documentation of class diagram options.
- New class diagram options
-nodesep and -ranksep,
which allow fine control of the generated diagram layout.
-(patch submitted by Trustin Lee).
+(Patch submitted by Trustin Lee.)
- A class's title will appear as a tooltip in image files that support this
-feature
-(patch submitted by Anthony Callegaro).
+feature.
+(Patch submitted by Anthony Callegaro.)
-
-Nested class hyperlinks to Javadoc documentation now work correctly
-(patch submitted by David P. Caldwell).
+Nested class hyperlinks to Javadoc documentation now work correctly.
+(Patch submitted by David P. Caldwell.)
-
The guillemot characters are now output with their Unicode HTML numeric
escapes instead of their HTML symbolic values.
This makes the output work correctly on Mac OS X, and also easier
to validate with XML tools.
-(patch submitted by Joshua Lim).
+(Patch submitted by Joshua Lim.)
+
+-
+UmlGraphDoc now supports Javascript-collapsible UML diagrams.
+A new option
-collapsible can be used to enable this
+feature.
+(Patch submitted by Franz Wilhelmstoetter.)
+