[Gzz-commits] manuscripts/xupdf article.rst

[Janne V. Kujala]

CVSROOT:        /cvsroot/gzz
Module name:    manuscripts
Changes by:     Janne V. Kujala <address@hidden>        03/02/10 07:14:09

Modified files:
        xupdf          : article.rst 

Log message:
        include canvas stucture in the uml diagram

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

Patches:
Index: manuscripts/xupdf/article.rst
diff -u manuscripts/xupdf/article.rst:1.46 manuscripts/xupdf/article.rst:1.47
--- manuscripts/xupdf/article.rst:1.46  Mon Feb 10 03:23:24 2003
+++ manuscripts/xupdf/article.rst       Mon Feb 10 07:14:09 2003
@@ -436,7 +436,7 @@
 [#as-we-may-think] 
 
 
-..  UML:: xuStructure
+..  UML:: xupdfStructure
 
     class xuFluidMediaUnit
        fields
@@ -460,28 +460,41 @@
     class xuLink
        fields
            metadata
-    naryassoc nary
-    left = assoc nary - multi(*) role(leftend) xuEnfilade
-    right = assoc nary - multi(*) role(rightend) xuEnfilade
+    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
+    spatialassoc = assoc Canvas aggreg multi(1) - multi(*) Cell
+
+    class Coords
+       fields
+           x, y
+    
     ---
 
     xuLink.c = (0,0);
 
-    vertically(50, foo, xuEnfilade, nary);
-    vertically(25, foobar, nary, xuLink);
+    vertically(100, foo, xuLink, xuEnfilade);
     horizontally(80, bar, xuEnfilade, xuFluidMediaUnit);
 
     horizontally(10, a, xuTextBlock, xuImageBlock);
-    vertically(50, aa, xuCharacter, xuTextBlock);
-    vertically(50, ab, xuPixel, xuImageBlock);
+    vertically(50, aa, xuTextBlock, xuCharacter);
+    vertically(50, ab, xuImageBlock, xuPixel);
 
-    vertically(120, zzz, xuFluidMediaUnit, a);
-    
-    left.p = (nary.w{left}...xuEnfilade.w{right});
-    right.p = (nary.e{right}...xuEnfilade.s{up});
+    vertically(120, zzz, a, xuFluidMediaUnit);
+
+    horizontally(100, pp, Cell, Canvas);
+    vertically(50, xxx, xuEnfilade, Cell);
+
+    Coords.c = 0.5 * (Cell.e + Canvas.w) + (0,-50);
+
+    draw 0.5 * (Cell.e + Canvas.w) -- Coords.n dashed evenly;
 
-    draw nary.s -- xuLink.n dashed evenly;
+    left.p = (xuLink.w{left}...(xuEnfilade.n - (20,0)){down});
+    right.p = (xuLink.e{right}...(xuEnfilade.n + (20,0)){down});
 
 
 - *Enfilade*: a list of fluid media contents, a "virtual file" or part of one