[Gzz-commits] manuscripts/xupdf article.rst

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    manuscripts
Changes by:     Tuomas J. Lukka <address@hidden>        03/02/15 03:40:05

Modified files:
        xupdf          : article.rst 

Log message:
        Split the UML

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/manuscripts/xupdf/article.rst.diff?tr1=1.117&tr2=1.118&r1=text&r2=text

Patches:
Index: manuscripts/xupdf/article.rst
diff -u manuscripts/xupdf/article.rst:1.117 manuscripts/xupdf/article.rst:1.118
--- manuscripts/xupdf/article.rst:1.117 Sat Feb 15 03:32:58 2003
+++ manuscripts/xupdf/article.rst       Sat Feb 15 03:40:05 2003
@@ -606,11 +606,48 @@
 
 
 ..  UML:: xupdfStructure
-    :caption: An UML diagram of the structure XXX. XXX orthogonal...
+    :caption: An UML diagram of the two orthogonal structures in the example
+             application.  The cell is connected to other cell by 1) Being
+             placed on the same canvas, or 2) by containing an enfilade
+             which is xanalogically connected to other cells' enfilades.
     :width: 8.45cm
     :label: figuml
 
-    class xuFluidMediaUnit
+    class xuEnfilade
+
+    class Cell
+    assoc Cell compos multi(0..1) - multi(1) role(content) xuEnfilade
+
+    class Canvas
+    assoc Canvas aggreg multi(*) - multi(*) Cell
+
+    class Placement
+       fields
+           x, y
+    
+    ---
+
+    Cell.c = (0,0);
+    horizontally(100, pp, Cell, Canvas);
+    Placement.c = 0.5 * (Cell.e + Canvas.w) + (40,-50);
+
+
+    vertically(50, xxx, Cell, xuEnfilade);
+    draw 0.5 * (Cell.e + Canvas.w) -- Placement.n dashed evenly;
+
+
+..  UML:: xuStructure
+    :caption: An UML diagram of the xanalogical hypertext structure.
+    :width: 8.45cm
+    :label: xuStructure
+
+    class xuLink
+       fields
+           metadata
+    left = assoc xuLink compos multi(0..1) - multi(1) role(leftend) xuEnfilade
+    right = assoc xuLink compos multi(0..1) - multi(1) role(rightend) 
xuEnfilade
+
+    class xuFluidMediaUnit "interface"
        fields
            identity
 
@@ -626,27 +663,11 @@
     class xuPixel
        inherit xuFluidMediaUnit
 
-    class xuEnfilade
-    assoc xuEnfilade aggreg multi(*) - multi(*) role({ordered}) 
xuFluidMediaUnit
-
-    class xuLink
-       fields
-           metadata
-    left = assoc xuLink compos multi(0..1) - multi(1) role(leftend) xuEnfilade
-    right = assoc xuLink compos multi(0..1) - multi(1) role(rightend) 
xuEnfilade
-
-    class Cell
-    assoc Cell compos multi(0..1) - multi(1) role(content) xuEnfilade
 
-    class Canvas
-    assoc Canvas aggreg multi(*) - multi(*) Cell
+    class xuEnfilade
+       assoc aggreg multi(*) - multi(*) role({ordered}) xuFluidMediaUnit
 
-    class Placement
-       fields
-           x, y
-    
     ---
-
     xuLink.c = (0,0);
 
     vertically(100, foo, xuLink, xuEnfilade);
@@ -658,12 +679,6 @@
 
     vertically(120, zzz, a, xuFluidMediaUnit);
 
-    horizontally(100, pp, Cell, Canvas);
-    vertically(50, xxx, xuEnfilade, Cell);
-
-    Placement.c = 0.5 * (Cell.e + Canvas.w) + (0,-50);
-
-    draw 0.5 * (Cell.e + Canvas.w) -- Placement.n dashed evenly;
 
     left.p = (xuLink.w{left}...(xuEnfilade.n - (20,0)){down});
     right.p = (xuLink.e{right}...(xuEnfilade.n + (20,0)){down});