[Gzz-commits] manuscripts/xupdf article.rst

[Janne V. Kujala]

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

Modified files:
        xupdf          : article.rst 

Log message:
        Simplify xu uml

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

Patches:
Index: manuscripts/xupdf/article.rst
diff -u manuscripts/xupdf/article.rst:1.44 manuscripts/xupdf/article.rst:1.45
--- manuscripts/xupdf/article.rst:1.44  Sat Feb  8 12:35:13 2003
+++ manuscripts/xupdf/article.rst       Sun Feb  9 12:14:08 2003
@@ -438,23 +438,18 @@
 
 ..  UML:: xuStructure
 
-    class xuSpace
-    assoc xuSpace compos multi(1) - multi(*) xuLink
-    assoc xuSpace compos multi(1) - multi(*) xuTextMedia
-    assoc xuSpace compos multi(1) - multi(*) xuImageMedia
-
     class xuFluidMediaUnit
        fields
            identity
 
-    class xuTextMedia
-    assoc xuTextMedia compos multi(1) - multi(*) role({ordered}) xuCharacter
+    class xuTextBlock
+    assoc xuTextBlock compos multi(1) - multi(*) role({ordered}) xuCharacter
 
     class xuCharacter
        inherit xuFluidMediaUnit
 
-    class xuImageMedia
-    assoc xuImageMedia compos multi(1) - multi(*) role({ordered}) xuPixel
+    class xuImageBlock
+    assoc xuImageBlock compos multi(1) - multi(*) role({ordered}) xuPixel
 
     class xuPixel
        inherit xuFluidMediaUnit
@@ -471,20 +466,18 @@
 
     ---
 
-    xuSpace.c = (0,0);
+    xuLink.c = (0,0);
 
-    vertically(120, foo, xuEnfilade, nary);
-    vertically(50, foobar, nary, xuLink);
+    vertically(50, foo, xuEnfilade, nary);
+    vertically(25, foobar, nary, xuLink);
     horizontally(80, bar, xuEnfilade, xuFluidMediaUnit);
 
-    horizontally(10, a, xuTextMedia, xuImageMedia);
-    vertically(50, aa, xuCharacter, xuTextMedia);
-    vertically(50, ab, xuPixel, xuImageMedia);
+    horizontally(10, a, xuTextBlock, xuImageBlock);
+    vertically(50, aa, xuCharacter, xuTextBlock);
+    vertically(50, ab, xuPixel, xuImageBlock);
 
-    vertically(100, zzz, xuFluidMediaUnit, a);
+    vertically(120, zzz, xuFluidMediaUnit, a);
     
-    horizontally(120, baz, xuLink, xuSpace);
-
     left.p = (nary.w{left}...xuEnfilade.w{right});
     right.p = (nary.e{right}...xuEnfilade.s{up});