[Gzz-commits] gzz/Documentation/misc/uml Makefile newbie.rst ...

[Asko Soukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Asko Soukka <address@hidden>    02/12/17 09:23:36

Modified files:
        Documentation/misc/uml: Makefile newbie.rst 
Removed files:
        Documentation/misc/uml: classes.mp classes.uml packages.mp 
                                packages.uml sequence.mp sequence.uml 

Log message:
        embedding UMLs into rst

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Documentation/misc/uml/Makefile.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Documentation/misc/uml/newbie.rst.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gzz/Documentation/misc/uml/Makefile
diff -u gzz/Documentation/misc/uml/Makefile:1.3 
gzz/Documentation/misc/uml/Makefile:1.4
--- gzz/Documentation/misc/uml/Makefile:1.3     Wed Dec  4 07:59:36 2002
+++ gzz/Documentation/misc/uml/Makefile Tue Dec 17 09:23:35 2002
@@ -1,20 +1,14 @@
-UML_TARGETS=$(shell for file in *.uml; do echo $${file%.uml}.png; done)
 RST_TARGETS=$(shell for file in *.rst; do echo $${file%.rst}.html; done)
 
-all: $(UML_TARGETS) $(RST_TARGETS)
+all: $(RST_TARGETS)
 
 showtargets:
-       echo $(RST_TARGETS) $(UML_TARGETS)
+       echo $(RST_TARGETS)
 
 clean:
-       rm -f *.gen1 *.gen2 *.gen3 *.html *.log *.1 *.png
-
-%.png: %.uml %.mp
-       MPINPUTS=../../../metacode python ../../../metacode/uml.py $*
+       rm -f *.html
 
 %.html: %.rst
-#      python ../../../../depends/rst2html.py -stg --stylesheet 
'../../../doc/gzz.css' *.rst >$*.html
-       make -C ../../../ runjython DBG="../depends/rst2html.py -stg 
--stylesheet '../../../doc/gzz.css' Documentation/misc/uml/$*.rst 
Documentation/misc/uml/$*.html"
-
+       make -C ../../../ rst2html RST="Documentation/misc/uml/$*.rst"
 
 
Index: gzz/Documentation/misc/uml/newbie.rst
diff -u gzz/Documentation/misc/uml/newbie.rst:1.2 
gzz/Documentation/misc/uml/newbie.rst:1.3
--- gzz/Documentation/misc/uml/newbie.rst:1.2   Tue Dec  3 11:00:14 2002
+++ gzz/Documentation/misc/uml/newbie.rst       Tue Dec 17 09:23:35 2002
@@ -3,7 +3,7 @@
 ==========================================================================
 
        :Author: Asko Soukka
-       :Date:  $Date: 2002/12/03 16:00:14 $
+       :Date:  $Date: 2002/12/17 14:23:35 $
 
 Some basics to create diagrams with ``uml.py`` tool.
 
@@ -78,7 +78,22 @@
 Output
 ------
 
-.. image:: packages.png
+.. UML:: doc-umlnewbie-packages
+
+       bigpackage Package
+
+       package First
+         jlink
+           classes.html
+
+       package Second
+         use First
+       ------------------------------------------------------------------
+       horizontally(50, h, First, Second);
+
+       pad = 30;
+       Package.nw = First.nw + (-pad,pad);
+       Package.se = Second.se + (pad,-pad);
 
 -------------
 Class example
@@ -158,7 +173,47 @@
 Output
 ------
 
-.. image:: classes.png
+.. UML:: doc-umlnewbie-classes
+
+       jlinkpackage Package.First
+
+       bigpackage First
+
+       class Interface "interface"
+         jlink
+         methods
+            void first()
+
+       class Derived "interface"
+         jlink
+         inherit Interface
+         methods
+            void second()
+
+       class Abstract "abstract"
+         jlink
+         methods
+            void third()
+
+       class Implementation
+         jlink
+         realize Derived
+         realize Abstract
+         assoc compos multi(1) - multi(*) role(part_of) Component
+
+       class Component
+         jlink           
+       ------------------------------------------------------------------
+       Derived.c = (100, 100);
+         horizontally(50, derived_h, Interface, Derived, Abstract);
+         vertically(50, derived_v, Derived, Implementation); 
+
+       Component.c = (300, 17);
+         horizontally(50, component_h, Component);
+ 
+       pad = 30;                           
+       First.nw = Interface.nw + (-pad,pad);
+       First.se = Component.se + (pad,-pad);
 
 ----------------
 Sequence example
@@ -200,4 +255,24 @@
 Output
 ------
 
-.. image:: sequence.png
+.. UML:: doc-umlnewbie-sequence
+
+       seqobject First
+       seqobject Second
+       seqobject Third
+
+       sequence example
+         call First "call(...)"
+           call Second "call (...)"
+             call Third "call (...)"
+               call Second "callbac(...)"
+                 call First "callback(...)"
+                  return
+                return
+              return
+            return
+          return
+       ------------------------------------------------------------------
+       horizontally(100, h, First, Second, Third);
+
+