[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 12:19:38

Modified files:
        xupdf          : article.rst 

Log message:
        add some xu fluidmedia types to the diagram

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

Patches:
Index: manuscripts/xupdf/article.rst
diff -u manuscripts/xupdf/article.rst:1.42 manuscripts/xupdf/article.rst:1.43
--- manuscripts/xupdf/article.rst:1.42  Sat Feb  8 11:12:32 2003
+++ manuscripts/xupdf/article.rst       Sat Feb  8 12:19:38 2003
@@ -440,15 +440,25 @@
 
     class xuSpace
     assoc xuSpace compos multi(1) - multi(*) xuLink
-    assoc xuSpace compos multi(1) - multi(*) xuFluidMedia
-
-    class xuFluidMedia
-    assoc xuFluidMedia compos multi(1) - multi(*) xuFluidMediaUnit
+    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(*{ordered}) xuCharacter
+
+    class xuCharacter
+       inherit xuFluidMediaUnit
+
+    class xuImageMedia
+    assoc xuImageMedia compos multi(1) - multi(*{ordered}) xuPixel
+
+    class xuPixel
+       inherit xuFluidMediaUnit
+
     class xuEnfilade
     assoc xuEnfilade aggreg multi(*) - multi(*{ordered}) xuFluidMediaUnit
 
@@ -463,12 +473,20 @@
 
     xuSpace.c = (0,0);
 
-    horizontally(80, foo, nary, xuEnfilade, xuFluidMediaUnit);
-    horizontally(80, bar, xuLink, xuSpace, xuFluidMedia);
-    vertically(80, foobar, foo, bar);
+    vertically(120, foo, xuEnfilade, nary);
+    vertically(50, foobar, nary, xuLink);
+    horizontally(80, bar, xuEnfilade, xuFluidMediaUnit);
+
+    horizontally(10, a, xuTextMedia, xuImageMedia);
+    vertically(50, aa, xuCharacter, xuTextMedia);
+    vertically(50, ab, xuPixel, xuImageMedia);
+
+    vertically(100, zzz, xuFluidMediaUnit, a);
+    
+    horizontally(120, baz, xuLink, xuSpace);
 
-    left.p = (nary.w{left}...xuEnfilade.n{down});
-    right.p = (nary.e{right}...xuEnfilade.w{right});
+    left.p = (nary.w{left}...xuEnfilade.w{right});
+    right.p = (nary.e{right}...xuEnfilade.s{up});
 
     draw nary.s -- xuLink.n dashed evenly;