[Gzz-commits] manuscripts/xupdf article.rst

[Janne V. Kujala]

CVSROOT:        /cvsroot/gzz
Module name:    manuscripts
Changes by:     Janne V. Kujala <address@hidden>        03/02/08 11:12:32

Modified files:
        xupdf          : article.rst 

Log message:
        zzStructure

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

Patches:
Index: manuscripts/xupdf/article.rst
diff -u manuscripts/xupdf/article.rst:1.41 manuscripts/xupdf/article.rst:1.42
--- manuscripts/xupdf/article.rst:1.41  Sat Feb  8 10:05:45 2003
+++ manuscripts/xupdf/article.rst       Sat Feb  8 11:12:32 2003
@@ -446,6 +446,8 @@
     assoc xuFluidMedia compos multi(1) - multi(*) xuFluidMediaUnit
 
     class xuFluidMediaUnit
+       fields
+           identity
 
     class xuEnfilade
     assoc xuEnfilade aggreg multi(*) - multi(*{ordered}) xuFluidMediaUnit
@@ -454,8 +456,8 @@
        fields
            metadata
     naryassoc nary
-    left = assoc nary multi(1) - role(leftend) xuEnfilade
-    right = assoc nary multi(1) - role(rightend) xuEnfilade
+    left = assoc nary - multi(*) role(leftend) xuEnfilade
+    right = assoc nary - multi(*) role(rightend) xuEnfilade
 
     ---
 
@@ -470,6 +472,37 @@
 
     draw nary.s -- xuLink.n dashed evenly;
 
+
+..  UML:: zzStructure
+
+    class zzSpace
+    assoc zzSpace compos multi(1) - multi(*) zzCell
+    assoc zzSpace compos multi(1) - multi(*) zzDimension
+
+    class zzCell
+       fields
+           identity
+    assoc zzCell aggreg multi(*) - multi(1) xuEnfilade
+
+    class zzDimension
+
+    naryassoc nary
+    left = assoc nary - multi(0..1) role(negend) zzCell
+    right = assoc nary - multi(0..1) role(posend) zzCell
+    assoc nary - multi(*) zzDimension
+
+    class xuEnfilade
+
+    ---
+
+    zzSpace.c = (0,0);
+
+    horizontally(80, foo, nary, zzCell, xuEnfilade);
+    horizontally(80, bar, zzDimension, zzSpace);
+    vertically(80, foobar, nary, zzDimension);
+
+    left.p = (nary.w{left}...zzCell.n{down});
+    right.p = (nary.e{right}...zzCell.w{right});
 
 Conclusions and future work
 ===========================