[Gzz-commits] gzz/Documentation/Manuscripts/Paper Makefile pi...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/12/01 13:41:56

Modified files:
        Documentation/Manuscripts/Paper: Makefile pipe.mp 

Log message:
        progressfig

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Documentation/Manuscripts/Paper/Makefile.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Documentation/Manuscripts/Paper/pipe.mp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gzz/Documentation/Manuscripts/Paper/Makefile
diff -u gzz/Documentation/Manuscripts/Paper/Makefile:1.10 
gzz/Documentation/Manuscripts/Paper/Makefile:1.11
--- gzz/Documentation/Manuscripts/Paper/Makefile:1.10   Sun Dec  1 12:42:18 2002
+++ gzz/Documentation/Manuscripts/Paper/Makefile        Sun Dec  1 13:41:55 2002
@@ -13,7 +13,7 @@
        dvips paper
 
 pipe.1: pipe.mp
-       mpost pipe
+       TEX=latex mpost pipe
 
 # doesn't work because of .ps screenshots
 pdf: perceptual-model.pdf pipeline.pdf
Index: gzz/Documentation/Manuscripts/Paper/pipe.mp
diff -u gzz/Documentation/Manuscripts/Paper/pipe.mp:1.2 
gzz/Documentation/Manuscripts/Paper/pipe.mp:1.3
--- gzz/Documentation/Manuscripts/Paper/pipe.mp:1.2     Sun Dec  1 13:02:39 2002
+++ gzz/Documentation/Manuscripts/Paper/pipe.mp Sun Dec  1 13:41:55 2002
@@ -1,21 +1,29 @@
+verbatimtex
+\documentclass{article}
+\begin{document}
+etex
+
 beginfig(1);
 
 % defaultfont := "ptmr7t";
 
+y0 = 700;
 y1 = 600; % globals
 y2 = 500;
-y3 = 400; % perpaper
-y4 = 300;
-
-x1 = 40;
-x2 = 100; % repunit
-x3 = 200; % basistex
-x4 = 300; % combinerprogs
+y3 = 450; % perpaper
+y4 = 350;
+y5 = 300; % perpass
+y6 = 200;
+y7 = 100; % pertexunit
+y8 = 0;
+
+x0 = 40;
+x1 = 100; % repunit
+x2 = 200; % color
+x3 = 300; % basistex
+x4 = 400; % combinerprogs
 xl = 500;
 
-draw (x1,y2)--(xl,y2);
-draw (x1,y4)--(xl,y4);
-
 vardef drawgrid(expr c, v, nv, w, nw) =
     for i = 0 upto nv:
        draw (c + v * i / nv) -- (c + w + v * i / nv);
@@ -25,14 +33,50 @@
     endfor;
 enddef;
 
-label.urt("Combiner programs",(x4,y1));
-drawgrid((x4, y1), (0,-60), 5, (60,0), 1);
+
+draw (x0,y2)--(xl,y2);
+draw (x0,y4)--(xl,y4);
+draw (x0,y6)--(xl,y6);
+label.rt("Global", (x0, .5[y0,y2]));
+label.rt("Per-paper", (x0, .5[y2,y4]));
+label.rt("Per-pass", (x0, .5[y4,y6]));
+label.rt("Per-texunit", (x0, .5[y6,y8]));
+
+
+label.urt("Repeat unit", (x1, y3));
+drawgrid((x1 + 20,y3), (40,-40), 1, (-30,-60), 1);
+
+
+
+label.urt("Lab*", (x2, y1));
+pair p[];
+p1 = (x2, y1-20);
+p2 = (p1 + (50, 0));
+draw p1 ... (.5[p1,p2] + (0,5)) ... p2 ... (.5[p1,p2]-(0,5)) ... cycle;
+draw p1 -- (.5[p1,p2] - (0,50)) .. p2;
+
+    label.urt("Colors", (x2, y3));
+    drawgrid((x2,y3), (0,-20), 1, (80,0), 4);
+
 
 
 label.urt("Basis textures", (x3, y1));
 drawgrid((x3, y1), (0,-60), 4, (60,0), 4);
 
+    label.urt(btex \noindent Basis texture\\ probabilities etex, (x3, y3));
+    drawgrid((x3, y3), (0,-60), 4, (60,0), 4);
+    label.lrt(".81", (x3, y3));
+    label.lrt(".11", (x3+30, y3-15));
+
+label.urt("Combiner programs",(x4,y1));
+drawgrid((x4, y1), (0,-60), 5, (60,0), 1);
+
+
 
 
 endfig;
+
+verbatimtex
+\end{document}
+etex
 end;