From c3cba69d67b09c87d77f49f335d238ba3e9ba74c Mon Sep 17 00:00:00 2001
From: Diomidis Spinellis <dds@aueb.gr>
Date: Tue, 8 Sep 2009 05:56:34 +0000
Subject: [PATCH] Add link to UML sequence diagram DSL. Fix duplication in the
 contributor list.

---
 doc/ack.xml         | 1 -
 doc/cd-model.xml    | 1 +
 doc/cd-opt-spec.xml | 4 ++--
 doc/deriv.xml       | 2 ++
 doc/index.xml       | 1 +
 doc/sequence.pic    | 5 +++--
 doc/ver.xml         | 4 +++-
 7 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/doc/ack.xml b/doc/ack.xml
index 2afc12e..7e04257 100644
--- a/doc/ack.xml
+++ b/doc/ack.xml
@@ -35,7 +35,6 @@ UMLGraph would not be in its current state without their contributions.
 <li>Olek Poplavskyy</li>
 <li>Alessandro Riva</li>
 <li>Arnaud Rogues</li>
-<li>Arnaud Rogues</li>
 <li>Jonathan R. Santos</li>
 <li>Sebastian Setzer</li>
 <li>J&#246;rn Guy S&#252;&#223;</li>
diff --git a/doc/cd-model.xml b/doc/cd-model.xml
index 964dd7a..1214546 100644
--- a/doc/cd-model.xml
+++ b/doc/cd-model.xml
@@ -5,6 +5,7 @@ The UMLGraph class diagrams allows you to model
 <ul>
 <li>classes (specified as Java classes)
 </li>
+<li>
 active classes, components, nodes, use cases,
 collaborations, and packages
 (specified as Java classes with an <code>@opt shape</code> tag)
diff --git a/doc/cd-opt-spec.xml b/doc/cd-opt-spec.xml
index 32cea35..faeb78c 100644
--- a/doc/cd-opt-spec.xml
+++ b/doc/cd-opt-spec.xml
@@ -13,7 +13,7 @@ of a class named <code>UMLOptions</code>, as in the following example:
  */
 class UMLOptions {}
 </fmtcode>
-<p>
+<p />
 Similarly, you can also globally specify options for all the note elements.
 through a class named <code>UMLNoteOptions</code>, as in the following example:
 <fmtcode ext="java">
@@ -23,7 +23,7 @@ through a class named <code>UMLNoteOptions</code>, as in the following example:
  */
 class UMLNoteOptions{}
 </fmtcode>
-<p>
+<p />
 
 You can also change the UMLGraph operation on a per-class basis by
 using <code>@opt</code> attributes on individual classes.
diff --git a/doc/deriv.xml b/doc/deriv.xml
index f4a1c50..7b29132 100644
--- a/doc/deriv.xml
+++ b/doc/deriv.xml
@@ -33,5 +33,7 @@ supports the scripting of UMLGraph.</li>
 <li> W. Goesgens has <a href="http://wiki.ioslo.net/dokuwiki/graphviz#plugging_umlgraph_infront_of_graphviz">documented here</a> a way to use
 UMLGraph diagrams in
 <a href="http://wiki.splitbrain.org/wiki:dokuwiki">DokuWiki</a>.</li>
+<li> Mykhaylo Sorochan has built on top of UMLGraph a
+<a href="http://macroexpand.org/doku.php/articles:uml-sequence-diagram-dsl-txl:start">higher-level domain-specific language for specifying UML sequence diagrams</a>.</li>
 </ul>
 </notes>
diff --git a/doc/index.xml b/doc/index.xml
index 9823957..c71a8ed 100644
--- a/doc/index.xml
+++ b/doc/index.xml
@@ -16,6 +16,7 @@
 <ch><ti>Class Diagram Example: Advanced Relationships</ti><fi>ceg-adv</fi></ch>
 <ch><ti>Class Diagram Example: Relationships Inference</ti><fi>ceg-infer</fi></ch>
 <ch><ti>Class Diagram Example: Schema</ti><fi>ceg-schema</fi></ch>
+<ch><ti>Class Diagram Example: ER</ti><fi>ceg-er</fi></ch>
 <ch><ti>Class Diagram Example: Element Visibility</ti><fi>ceg-ev</fi></ch>
 <ch><ti>Class Diagram Example: Association Types</ti><fi>ceg-at</fi></ch>
 <ch><ti>Class Diagram Example: Real Example (Catalina Classes)</ti><fi>ceg-cat</fi></ch>
diff --git a/doc/sequence.pic b/doc/sequence.pic
index 91ec8da..35e443e 100644
--- a/doc/sequence.pic
+++ b/doc/sequence.pic
@@ -34,13 +34,14 @@ define comment_default_move {up 0.25 right 0.25};
 comment_default_ht=0.5;
 # Comment width
 comment_default_wid=1;
-
+# Underline object name
+underline=1;
 
 # Create a new object(name,label)
 define object {
 	$1: box $2; move;
 	# Could also underline text with \mk\ul\ul\ul...\rt
-	{
+	if (underline) then {
 		line from $1.w + (.1, -.07) to $1.e + (-.1, -.07);
 	}
 	move to $1.e;
diff --git a/doc/ver.xml b/doc/ver.xml
index fef03b2..5cd7854 100644
--- a/doc/ver.xml
+++ b/doc/ver.xml
@@ -7,6 +7,7 @@
 <ul>
 <li>Sequence diagrams provide an option to specify whether objects are
 underlined or not.</li>
+</ul>
 </dd>
 
 <dt>Version 5.2 2008-12-03</dt><dd>
@@ -19,7 +20,8 @@ underlined or not.</li>
 </li>
 <li> Corrected NullPointerException occurring when no global options were
 available.
-(Fix supplied by Bernd Blacha.)
+(Fix supplied by Bernd Blacha.)</li>
+</ul>
 </dd>
 
 <dt>Version 5.1 2008-08-27 </dt><dd>