[Gzz-commits] manuscripts/Paper Makefile buoyoing.mp paper.tex

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    manuscripts
Changes by:     Tuomas J. Lukka <address@hidden>        03/03/19 05:25:58

Modified files:
        Paper          : Makefile buoyoing.mp paper.tex 

Log message:
        They fit on one page...

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/manuscripts/Paper/Makefile.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/manuscripts/Paper/buoyoing.mp.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/manuscripts/Paper/paper.tex.diff?tr1=1.33&tr2=1.34&r1=text&r2=text

Patches:
Index: manuscripts/Paper/Makefile
diff -u manuscripts/Paper/Makefile:1.4 manuscripts/Paper/Makefile:1.5
--- manuscripts/Paper/Makefile:1.4      Wed Mar 19 03:36:22 2003
+++ manuscripts/Paper/Makefile  Wed Mar 19 05:25:58 2003
@@ -6,7 +6,7 @@
 LATEXCMD=
 endif
 
-all: pipe.1 perceptual-model.eps pipeline.eps buoyoing.1 buoyoing.5 xupdfimgs
+all: pipe.1 perceptual-model.eps pipeline.eps buoyoing.1 buoyoing.5 
        latex "${LATEXCMD} paper"
        BIBINPUTS=..:$$BIBINPUTS bibtex paper
        latex "${LATEXCMD} paper"
Index: manuscripts/Paper/buoyoing.mp
diff -u manuscripts/Paper/buoyoing.mp:1.8 manuscripts/Paper/buoyoing.mp:1.9
--- manuscripts/Paper/buoyoing.mp:1.8   Tue Mar 18 04:23:34 2003
+++ manuscripts/Paper/buoyoing.mp       Wed Mar 19 05:25:58 2003
@@ -104,13 +104,18 @@
     draw lnk[ind].e.p transformed lnk[ind].e.loc withpen pencircle scaled 4pt;
 enddef;
 
-vardef plainlink(expr ind) =
+vardef plainlink(expr ind, offs) =
     locatelinkend(a, ind);
     locatelinkend(b, ind);
     plainlinkend(a, ind)
     plainlinkend(b, ind)
-    draw ((0,0) transformed lnk[ind].a.loc){right} .. tension 1.5 ..
-        ((0,0) transformed lnk[ind].b.loc){right} withpen pencircle scaled 6pt;
+    save la, lb;
+    pair la,lb;
+    la = (0,0) transformed lnk[ind].a.loc; 
+    lb = (0,0) transformed lnk[ind].b.loc; 
+    draw la{right} .. tension .75 and .75 .. .5[la,lb] + offs {lb-la}  
+                   .. tension .75 and .75 ..  lb{right}
+        withpen pencircle scaled 6pt;
 enddef;
 
 def cir(expr x, y, r) =
@@ -153,11 +158,18 @@
 
 beginfig(1);
 
+spacing = 25;
+bscale = .85;
+
 docpic(a, identity);
-docpic(b, identity shifted (a.loc + (0, -ypart(b.size)-50)));
-docpic(c, identity shifted (b.loc + (xpart(b.size)+50, 0)));
-docpic(d, identity shifted (b.loc + (0, -400)));
-docpic(e, identity shifted (d.loc + (xpart(d.size)+50, 0)));
+%docpic(b, identity shifted (a.loc + (0, -ypart(b.size)-50)));
+%docpic(c, identity shifted (b.loc + (xpart(b.size)+50, 0)));
+%docpic(d, identity shifted (b.loc + (0, -400)));
+%docpic(e, identity shifted (d.loc + (xpart(d.size)+50, 0)));
+docpic(b, identity scaled bscale shifted (a.loc + (xpart(a.size)+spacing, 0)));
+docpic(c, identity shifted (b.loc + (bscale * xpart(b.size)+spacing, 0)));
+docpic(d, identity shifted (c.loc + (xpart(c.size)+spacing, 0)));
+docpic(e, identity shifted (d.loc + (xpart(d.size)+spacing, 0)));
 
 def doclabel(suffix d)(expr l) =
     label.lrt(l infont defaultfont scaled 10 , d.loc + (0,ypart d.size));
@@ -169,11 +181,11 @@
 doclabel(d, "4");
 doclabel(e, "5");
 
-plainlink(0);
-plainlink(1);
-plainlink(2);
-plainlink(3);
-plainlink(4);
+plainlink(0, (0,-30));
+plainlink(1, (0,60));
+plainlink(2, (0,60));
+plainlink(3, (0, 120));
+plainlink(4, (0, -60));
 
 % addto currentpicture also a.p;
 % 
@@ -188,26 +200,41 @@
 
 endfig;
 
+ccx = 210;
+ccy = 160;
 cor = 20;
 path csp;
 csp = (-200, 0){up} ... (-200+cor, 150-cor) ... (0, 150){right};
 csp := (csp & (reverse csp xscaled -1) ..(csp scaled -1) ..(reverse csp 
yscaled -1)) .. cycle ;
+path cbp;
+cbp = (-ccx,-ccy) -- (-ccx,ccy) -- (ccx, ccy) -- (ccx,-ccy) -- cycle ;
 
-ccx = 210;
-ccy = 160;
+boolean fillcscreen;
+fillcscreen = false;
 
-def cscreen =
+def cscreenkey = 
+    fillcscreen := true;
+enddef;
+vardef cscreen =
     clip currentpicture to csp;
+    if fillcscreen:
+       save p;
+       picture p;
+       p := currentpicture;
+       fill cbp withcolor black;
+       fill csp withcolor white;
+       addto currentpicture also p;
+    fi
     draw csp withpen pencircle scaled 3pt;
-    draw (-ccx,-ccy) -- (-ccx,ccy) -- (ccx, ccy) -- (ccx,-ccy) -- cycle 
-           withpen pencircle scaled 2pt;;
+    draw cbp withpen pencircle scaled 2pt;;
+    fillcscreen := false;
 enddef;
 
 
 bboxmargin := 0pt;
 
 def atrans(expr e) =
-    identity shifted(-50,-50) scaled (e[1.2, .7]) rotated (e*15) shifted 
(e[(0,0), (-150,25)])
+    identity shifted(-50,-50) scaled (e[1.2, .9]) rotated (e*15) shifted 
(e[(0,0), (-150,25)])
 enddef;
 
 def aclip(expr e) =
@@ -215,7 +242,7 @@
 enddef;
 
 def ctrans(expr e) =
-    identity shifted (-lnk0b.l) scaled (e[.7,1.2]) rotated (e[-15,0]) shifted 
(e[(150,-60),(0,0)])
+    identity shifted (-lnk0b.l) scaled (e[.9,1.2]) rotated (e[-15,0]) shifted 
(e[(150,-60),(0,0)])
 enddef;
 
 def cclip(expr e) =
@@ -224,7 +251,7 @@
 
 
 def btrans(expr e) =
-       identity shifted (-lnk3b.l) scaled (e[.7,1.15]) rotated (e[-15,0]) 
+       identity shifted (-lnk3b.l) scaled (e[1.0,1.15]) rotated (e[-15,0]) 
            shifted (e[(150, -70),(0,20)])
 enddef;
 def bclip(expr e) =
@@ -262,41 +289,21 @@
 
 enddef;
 
-
-% Initial position
-
-beginfig(2);
-aniframe(0);
-endfig;
-
-beginfig(3);
-aniframe(0.3);
-endfig;
-
-beginfig(4);
-aniframe(0.65);
-endfig;
-
-beginfig(5);
-aniframe(1.0);
-endfig;
-
 % Now, c starts to move away.
 % Inverting the parameter to make change easier.
 
-def ctrans(expr e) =
-    identity shifted (e[(-lnk3a.l),(-lnk0b.l)]) scaled (e[.7,1.2]) rotated 
(e[15,0]) shifted (e[(-150,-30),(0,0)])
+def ctransii(expr e) =
+    identity shifted (e[(-lnk3a.l),(-lnk0b.l)]) scaled (e[.9,1.2]) rotated 
(e[15,0]) shifted (e[(-150,-30),(0,0)])
 enddef;
 
-def cclip(expr e) =
+def cclipii(expr e) =
     lnk3a.p scaled (e[1.05, 5]) shifted lnk3a.l
 enddef;
 
-
-def aniframe(expr fract) =
+def aniframeii(expr fract) =
 
     % link 0
-    docpicclip(c, ctrans(1-fract), cclip(1-fract));
+    docpicclip(c, ctransii(1-fract), cclipii(1-fract));
     docpicclip(b, btrans(fract), bclip(fract));
     if fract>.5:
     fi;
@@ -313,27 +320,58 @@
        linkline(2);
 
        docpicclip(a, 
-           identity shifted (-lnk1b.l) scaled .7 rotated -15 shifted (150,-50),
+           identity shifted (-lnk1b.l) scaled 1.0 rotated -15 shifted 
(150,-50),
            lnk1b.p scaled 1.5 shifted lnk1b.l);
        linkline(1);
 
     fi;
 
+
     linkline(3);
     cscreen;
 enddef;
 
-beginfig(6);
-aniframe(.3);
-endfig;
-beginfig(7);
-aniframe(.65);
-endfig;
-beginfig(8);
-aniframe(1);
-endfig;
+curframe = 2;
+
+def frames =
 
+    % Initial position
+
+    beginfig(curframe);
+    cscreenkey;
+    aniframe(0);
+    endfig;
+
+    beginfig(curframe+1);
+    aniframe(0.3);
+    endfig;
+
+    beginfig(curframe+2);
+    aniframe(0.65);
+    endfig;
+
+    beginfig(curframe+3);
+    cscreenkey;
+    aniframe(1.0);
+    endfig;
+
+    beginfig(curframe+4);
+    aniframeii(.3);
+    endfig;
+    beginfig(curframe+5);
+    aniframeii(.65);
+    endfig;
+    beginfig(curframe+6);
+    cscreenkey;
+    aniframeii(1);
+    endfig;
+
+    curframe := curframe + 7;
+
+enddef;
 
+frames;
+frames;
 
 verbatimtex
 \end{document}
Index: manuscripts/Paper/paper.tex
diff -u manuscripts/Paper/paper.tex:1.33 manuscripts/Paper/paper.tex:1.34
--- manuscripts/Paper/paper.tex:1.33    Wed Mar 19 03:36:22 2003
+++ manuscripts/Paper/paper.tex Wed Mar 19 05:25:58 2003
@@ -10,7 +10,8 @@
 \newcommand{\hyp}{\discretionary{}{}{}}
 
 \newif\ifpics
-\picstrue
+\picsfalse
+%\picstrue
 
 \title{Rendering recognizably unique textures}
 % Representing Identity 
@@ -392,20 +393,27 @@
 
 \begin{figure*}
 \def\bw{7cm}
-\def\fw{3.5cm}
-\def\fkw{6cm}
-\includegraphics[width=\bw]{buoyoing.1}
-\vbox{
-\textwidth=5cm\raggedright
-\hsize=7.5cm
+\def\fw{4cm}
+\def\fkw{4cm}
+\raggedright
+a)\\
+\includegraphics[width=\hsize]{buoyoing.1}
+b)\\
 \includegraphics[width=\fkw]{buoyoing.2}
 \includegraphics[width=\fw]{buoyoing.3}
 \includegraphics[width=\fw]{buoyoing.4}
 \includegraphics[width=\fkw]{buoyoing.5}
 \includegraphics[width=\fw]{buoyoing.6}
 \includegraphics[width=\fw]{buoyoing.7}
-\includegraphics[width=\fkw]{buoyoing.8}
-}
+\includegraphics[width=\fkw]{buoyoing.8} \\
+c)\\
+\includegraphics[width=\fkw]{buoyoing.9}
+\includegraphics[width=\fw]{buoyoing.10}
+\includegraphics[width=\fw]{buoyoing.11}
+\includegraphics[width=\fkw]{buoyoing.12}
+\includegraphics[width=\fw]{buoyoing.13}
+\includegraphics[width=\fw]{buoyoing.14}
+\includegraphics[width=\fkw]{buoyoing.15}
 \caption{
 An example of the structure used by BuoyOING.
 a) A small network of documents.
@@ -961,7 +969,7 @@
 \begin{figure}
 \centering
 \ifpics
-\includegraphics[height=5cm]{paperbasistex.ps}
+\includegraphics[height=4cm]{paperbasistex.ps}
 \fi
 \caption{
 \label{fig-basis}