[SCM] Lisaac documentation branch, master, updated. ce4754605d9e7808ed6e51d186af30ce35bae17c
sonntag (none)
sonntag at isaac.
Sun Sep 6 16:57:02 UTC 2009
The following commit has been merged in the master branch:
commit ce4754605d9e7808ed6e51d186af30ce35bae17c
Author: sonntag <sonntag at isaac.(none)>
Date: Sun Sep 6 18:57:05 2009 +0200
Slides end
diff --git a/slides/figures/style3.eps b/slides/figures/expanded_general.eps
similarity index 76%
copy from slides/figures/style3.eps
copy to slides/figures/expanded_general.eps
index 6533e51..02f6328 100644
--- a/slides/figures/style3.eps
+++ b/slides/figures/expanded_general.eps
@@ -1,7 +1,7 @@
%!PS-Adobe-3.0 EPSF-3.0
-%%BoundingBox: 60 713 201 797
-%%Title: style3
-%%CreationDate: Sun Sep 21 23:14:50 2008
+%%BoundingBox: 60 740 249 817
+%%Title: expanded_general
+%%CreationDate: Sun Sep 6 18:51:35 2009
%%Creator: Tgif-4.1.45-QPL written by William Chia-Wei Cheng (bill.cheng at acm.org)
%%ProducedBy: (unknown)
%%Pages: 1
@@ -111,7 +111,7 @@ end
%%EndProlog
%%Page: 1 1
-%%PageBoundingBox: 60 713 201 797
+%%PageBoundingBox: 60 740 249 817
tgifdict begin
/tgifsavedpage save def
@@ -160,29 +160,6 @@ GS
GR
GR
-% POLY/OPEN-SPLINE
-0 SG
-GS
- NP
- 210 85 M
- 0 90 atan DU cos 10.000 MU 300 exch SU
- exch sin 10.000 MU 85 exch SU L
- TGSM
- 2 W
- S
- 1 W
-GR
-GS
- TGSM
- NP
- 300 85 10.000 4.000 90 0 TGAT
- 1 SG CP F
- 0 SG
- NP
- 300 85 10.000 4.000 90 0 TGAT
- CP F
-GR
-
% TEXT
NP
0 SG
@@ -234,7 +211,7 @@ GR
GS
NP
210 105 M
- 245 105 L
+ 265 105 L
TGSM
5 W
S
@@ -243,10 +220,10 @@ GR
% OVAL
0 SG
-NP 255 105 5 5 TGEL F
+NP 275 105 5 5 TGEL F
GS
GS
- NP 255 105 5 5 TGEL
+ NP 275 105 5 5 TGEL
S
GR
GR
@@ -255,35 +232,12 @@ GR
0 SG
GS
GS
- NP 255 105 10 10 TGEL
+ NP 275 105 10 10 TGEL
2 W
S
GR
GR
-% POLY/OPEN-SPLINE
-0 SG
-GS
- NP
- 255 105 M
- 0 45 atan DU cos 10.000 MU 300 exch SU
- exch sin 10.000 MU 105 exch SU L
- TGSM
- 2 W
- S
- 1 W
-GR
-GS
- TGSM
- NP
- 300 105 10.000 4.000 45 0 TGAT
- 1 SG CP F
- 0 SG
- NP
- 300 105 10.000 4.000 45 0 TGAT
- CP F
-GR
-
% BOX
0 SG
GS
@@ -300,7 +254,7 @@ NP
0 SG
GS
1 W
- 305 85 M
+ 215 50 M
GS
0 SG
/Courier-Bold FF [14 0 0 -14 0 0] MS
@@ -313,7 +267,7 @@ NP
GS
10 SM
GS
- NP 300 70 M 355 70 L 355 90 L 300 90 L CP
+ NP 210 35 M 265 35 L 265 55 L 210 55 L CP
2 W
S
GR
@@ -324,7 +278,7 @@ NP
0 SG
GS
1 W
- 305 115 M
+ 255 160 M
GS
0 SG
/Courier-Bold FF [14 0 0 -14 0 0] MS
@@ -337,7 +291,7 @@ NP
GS
10 SM
GS
- NP 300 100 M 355 100 L 355 120 L 300 120 L CP
+ NP 250 145 M 305 145 L 305 165 L 250 165 L CP
2 W
S
GR
@@ -348,7 +302,7 @@ NP
0 SG
GS
1 W
- 120 165 M
+ 360 90 M
GS
0 SG
/Courier FF [14 0 0 -14 0 0] MS
@@ -361,17 +315,17 @@ NP
GS
10 SM
GS
- NP 115 150 M 220 150 L 220 170 L 115 170 L CP
+ NP 330 75 M 435 75 L 435 95 L 330 95 L CP
S
GR
GR
% OVAL
0 SG
-NP 210 160 5 5 TGEL F
+NP 340 85 5 5 TGEL F
GS
GS
- NP 210 160 5 5 TGEL
+ NP 340 85 5 5 TGEL
S
GR
GR
@@ -381,7 +335,7 @@ NP
0 SG
GS
1 W
- 110 210 M
+ 325 135 M
GS
0 SG
/Courier-Bold FF [14 0 0 -14 0 0] MS
@@ -394,7 +348,7 @@ NP
0 SG
GS
1 W
- 120 185 M
+ 360 110 M
GS
0 SG
/Courier FF [14 0 0 -14 0 0] MS
@@ -407,17 +361,17 @@ NP
GS
10 SM
GS
- NP 115 170 M 220 170 L 220 190 L 115 190 L CP
+ NP 330 95 M 435 95 L 435 115 L 330 115 L CP
S
GR
GR
% OVAL
0 SG
-NP 210 180 5 5 TGEL F
+NP 340 105 5 5 TGEL F
GS
GS
- NP 210 180 5 5 TGEL
+ NP 340 105 5 5 TGEL
S
GR
GR
@@ -427,7 +381,7 @@ GR
GS
10 SM
GS
- NP 110 145 M 225 145 L 225 195 L 110 195 L CP
+ NP 325 70 M 440 70 L 440 120 L 325 120 L CP
2 W
S
GR
@@ -437,21 +391,81 @@ GR
0 SG
GS
NP
- 210 160 M
- 275 160 L
- 275 85 L
+ 275 145 M
+ -35 0 atan DU cos 12.000 MU exch sin 12.000 MU RM
+ 275 110 L
TGSM
- 2 W
+ 3 W
S
1 W
GR
+GS
+ TGSM
+ NP
+ 275 145 12.000 5.000 0 35 TGAT
+ 1 SG CP F
+ 0 SG
+ NP
+ 275 145 12.000 5.000 0 35 TGAT
+ CP F
+GR
-% OVAL
+% POLY/OPEN-SPLINE
0 SG
-NP 275 85 5 5 TGEL F
GS
+ NP
+ 285 105 M
+ 340 105 L
+ TGSM
+ 5 W
+ S
+ 1 W
+GR
+
+% POLY/OPEN-SPLINE
+0 SG
+GS
+ NP
+ 210 85 M
+ 250 85 L
+ -30 0 atan DU cos 12.000 MU 250 exch SU
+ exch sin 12.000 MU 55 exch SU L
+ TGSM
+ 3 W
+ S
+ 1 W
+GR
+GS
+ TGSM
+ NP
+ 250 55 12.000 5.000 0 -30 TGAT
+ 1 SG CP F
+ 0 SG
+ NP
+ 250 55 12.000 5.000 0 -30 TGAT
+ CP F
+GR
+
+% TEXT
+NP
+0 SG
GS
- NP 275 85 5 5 TGEL
+ 1 W
+ 290 50 M
+ GS
+ 0 SG
+ /Courier-Bold FF [14 0 0 -14 0 0] MS
+ (BAR_3) SH
+ GR
+ GR
+
+% BOX
+0 SG
+GS
+ 10 SM
+ GS
+ NP 285 35 M 340 35 L 340 55 L 285 55 L CP
+ 2 W
S
GR
GR
@@ -460,14 +474,25 @@ GR
0 SG
GS
NP
- 210 180 M
- 255 180 L
- 255 115 L
+ 340 85 M
+ 300 85 L
+ -30 0 atan DU cos 12.000 MU 300 exch SU
+ exch sin 12.000 MU 55 exch SU L
TGSM
- 5 W
+ 3 W
S
1 W
GR
+GS
+ TGSM
+ NP
+ 300 55 12.000 5.000 0 -30 TGAT
+ 1 SG CP F
+ 0 SG
+ NP
+ 300 55 12.000 5.000 0 -30 TGAT
+ CP F
+GR
GR
tgifsavedpage restore
@@ -475,7 +500,7 @@ end
showpage
%%Trailer
-%MatchingCreationDate: Sun Sep 21 23:14:50 2008
+%MatchingCreationDate: Sun Sep 6 18:51:35 2009
%%DocumentFonts: Courier-Bold
%%+ Courier
%%EOF
diff --git a/slides/figures/style3.obj b/slides/figures/expanded_general.obj
similarity index 57%
copy from slides/figures/style3.obj
copy to slides/figures/expanded_general.obj
index b60a4a3..9d62a6c 100644
--- a/slides/figures/style3.obj
+++ b/slides/figures/expanded_general.obj
@@ -1,5 +1,5 @@
%TGIF 4.1.45-QPL
-state(0,37,100.000,87,0,1,16,1,9,1,1,4,0,0,0,1,0,'Courier-Bold',1,80640,0,0,1,5,0,1,1,1,0,16,0,0,1,1,1,1,1050,1485,1,0,2880,0).
+state(0,37,100.000,87,0,1,16,1,9,1,1,2,0,1,0,1,0,'Courier-Bold',1,80640,0,0,1,5,0,1,1,1,0,16,0,0,1,1,1,1,1050,1485,1,0,2880,0).
%
% @(#)$Header$
% %W%
@@ -11,17 +11,17 @@ color_info(19,65535,0,[
"green", 0, 65535, 0, 0, 65535, 0, 1,
"blue", 0, 0, 65535, 0, 0, 65535, 1,
"yellow", 65535, 65535, 0, 65535, 65535, 0, 1,
- "pink", 65535, 49344, 52171, 65535, 49344, 52171, 1,
+ "pink", 65535, 49931, 50971, 65535, 49344, 52171, 1,
"cyan", 0, 65535, 65535, 0, 65535, 65535, 1,
- "CadetBlue", 24415, 40606, 41120, 24415, 40606, 41120, 1,
+ "CadetBlue", 22885, 40569, 40569, 24415, 40606, 41120, 1,
"white", 65535, 65535, 65535, 65535, 65535, 65535, 1,
"black", 0, 0, 0, 0, 0, 0, 1,
- "DarkSlateGray", 12079, 20303, 20303, 12079, 20303, 20303, 1,
- "#00000000c000", 0, 0, 49344, 0, 0, 49152, 1,
- "#820782070000", 33410, 33410, 0, 33287, 33287, 0, 1,
- "#3cf3fbee34d2", 15420, 64507, 13364, 15603, 64494, 13522, 1,
- "#3cf3fbed34d3", 15420, 64507, 13364, 15603, 64493, 13523, 1,
- "#ffffa6990000", 65535, 42662, 0, 65535, 42649, 0, 1,
+ "DarkSlateGray", 10402, 19764, 18724, 12079, 20303, 20303, 1,
+ "#00000000c000", 0, 0, 48891, 0, 0, 49152, 1,
+ "#820782070000", 34327, 33287, 0, 33287, 33287, 0, 1,
+ "#3cf3fbee34d2", 14563, 64494, 14563, 15603, 64494, 13522, 1,
+ "#3cf3fbed34d3", 14563, 64494, 14563, 15603, 64493, 13523, 1,
+ "#ffffa6990000", 65535, 42649, 0, 65535, 42649, 0, 1,
"#ffff0000fffe", 65535, 0, 65535, 65535, 0, 65534, 1,
"#fffe0000fffe", 65535, 0, 65535, 65534, 0, 65534, 1,
"#fffe00000000", 65535, 0, 0, 65534, 0, 0, 1
@@ -43,11 +43,6 @@ box('black','',115,75,220,95,0,1,1,2,0,0,0,0,0,'1',0,[
]).
oval('black','',205,80,215,90,1,1,1,4,0,0,0,0,0,'1',0,[
]).
-poly('black','',2,[
- 210,85,300,85],1,2,1,6,0,1,0,0,0,0,0,'2',0,0,
- "0","",[
- 0,10,4,0,'10','4','0'],[0,10,4,0,'10','4','0'],[
-]).
text('black',110,123,1,0,1,27,16,10,12,4,0,0,0,0,2,27,16,0,0,"",0,0,0,0,135,'',[
minilines(27,16,0,0,0,0,0,[
mini_line(27,12,4,0,0,0,[
@@ -69,46 +64,49 @@ box('black','',115,95,220,115,0,1,1,18,0,0,0,0,0,'1',0,[
oval('black','',205,100,215,110,1,1,1,19,0,0,0,0,0,'1',0,[
]).
poly('black','',2,[
- 210,105,245,105],0,5,1,20,0,1,0,0,0,0,0,'5',0,0,
+ 210,105,265,105],0,5,1,20,0,1,0,0,0,0,0,'5',0,0,
"0","",[
0,18,7,0,'18','7','0'],[0,18,7,0,'18','7','0'],[
]).
group([
-oval('black','',250,100,260,110,1,1,1,22,0,0,0,0,0,'1',0,[
+oval('black','',270,100,280,110,1,1,1,22,0,0,0,0,0,'1',0,[
]),
-oval('black','',245,95,265,115,0,2,1,26,0,0,0,0,0,'2',0,[
+oval('black','',265,95,285,115,0,2,1,26,0,0,0,0,0,'2',0,[
])
],
29,0,0,[
]).
-poly('black','',2,[
- 255,105,300,105],1,2,1,36,0,1,0,0,0,0,0,'2',0,0,
- "0","",[
- 0,10,4,0,'10','4','0'],[0,10,4,0,'10','4','0'],[
-]).
box('black','',110,70,225,120,0,2,1,39,0,0,0,0,0,'2',0,[
]).
-text('black',305,73,1,0,1,45,16,47,12,4,0,0,0,0,2,45,16,0,0,"",0,0,0,0,85,'',[
+group([
+text('black',215,38,1,0,1,45,16,47,12,4,0,0,0,0,2,45,16,0,0,"",0,0,0,0,50,'',[
minilines(45,16,0,0,0,0,0,[
mini_line(45,12,4,0,0,0,[
str_block(0,45,12,4,0,-1,0,0,0,[
str_seg('black','Courier-Bold',1,80640,45,12,4,0,-1,0,0,0,0,0,
"BAR_1")])
])
-])]).
-box('black','',300,70,355,90,0,2,1,48,0,0,0,0,0,'2',0,[
+])]),
+box('black','',210,35,265,55,0,2,1,48,0,0,0,0,0,'2',0,[
+])
+],
+105,0,0,[
]).
-text('black',305,103,1,0,1,45,16,56,12,4,0,0,0,0,2,45,16,0,0,"",0,0,0,0,115,'',[
+group([
+text('black',255,148,1,0,1,45,16,56,12,4,0,0,0,0,2,45,16,0,0,"",0,0,0,0,160,'',[
minilines(45,16,0,0,0,0,0,[
mini_line(45,12,4,0,0,0,[
str_block(0,45,12,4,0,-2,0,0,0,[
str_seg('black','Courier-Bold',1,80640,45,12,4,0,-2,0,0,0,0,0,
"BAR_2")])
])
-])]).
-box('black','',300,100,355,120,0,2,1,57,0,0,0,0,0,'2',0,[
+])]),
+box('black','',250,145,305,165,0,2,1,57,0,0,0,0,0,'2',0,[
+])
+],
+108,0,0,[
]).
-text('black',120,153,1,0,1,72,15,63,12,3,0,0,0,0,2,72,15,0,0,"",0,0,0,0,165,'',[
+text('black',360,78,1,0,1,72,15,63,12,3,0,0,0,0,2,72,15,0,0,"",0,0,0,0,90,'',[
minilines(72,15,0,0,0,0,0,[
mini_line(72,12,3,0,0,0,[
str_block(0,72,12,3,0,-3,0,0,0,[
@@ -116,11 +114,11 @@ str_seg('black','Courier',0,80640,72,12,3,0,-3,0,0,0,0,0,
"+ data_1")])
])
])]).
-box('black','',115,150,220,170,0,1,1,64,0,0,0,0,0,'1',0,[
+box('black','',330,75,435,95,0,1,1,64,0,0,0,0,0,'1',0,[
]).
-oval('black','',205,155,215,165,1,1,1,65,0,0,0,0,0,'1',0,[
+oval('black','',335,80,345,90,1,1,1,65,0,0,0,0,0,'1',0,[
]).
-text('black',110,198,1,0,1,81,16,66,12,4,0,0,0,0,2,81,16,0,0,"",0,0,0,0,210,'',[
+text('black',325,123,1,0,1,81,16,66,12,4,0,0,0,0,2,81,16,0,0,"",0,0,0,0,135,'',[
minilines(81,16,0,0,0,0,0,[
mini_line(81,12,4,0,0,0,[
str_block(0,81,12,4,0,-1,0,0,0,[
@@ -128,7 +126,7 @@ str_seg('black','Courier-Bold',1,80640,81,12,4,0,-1,0,0,0,0,0,
"FOO.clone")])
])
])]).
-text('black',120,173,1,0,1,72,15,67,12,3,0,0,0,0,2,72,15,0,0,"",0,0,0,0,185,'',[
+text('black',360,98,1,0,1,72,15,67,12,3,0,0,0,0,2,72,15,0,0,"",0,0,0,0,110,'',[
minilines(72,15,0,0,0,0,0,[
mini_line(72,12,3,0,0,0,[
str_block(0,72,12,3,0,-3,0,0,0,[
@@ -136,21 +134,43 @@ str_seg('black','Courier',0,80640,72,12,3,0,-3,0,0,0,0,0,
"- data_2")])
])
])]).
-box('black','',115,170,220,190,0,1,1,68,0,0,0,0,0,'1',0,[
+box('black','',330,95,435,115,0,1,1,68,0,0,0,0,0,'1',0,[
+]).
+oval('black','',335,100,345,110,1,1,1,69,0,0,0,0,0,'1',0,[
]).
-oval('black','',205,175,215,185,1,1,1,69,0,0,0,0,0,'1',0,[
+box('black','',325,70,440,120,0,2,1,71,0,0,0,0,0,'2',0,[
]).
-box('black','',110,145,225,195,0,2,1,71,0,0,0,0,0,'2',0,[
+poly('black','',2,[
+ 275,145,275,110],2,3,1,142,0,1,0,0,0,0,0,'3',0,0,
+ "0","",[
+ 0,12,5,0,'12','5','0'],[0,12,5,0,'12','5','0'],[
+]).
+poly('black','',2,[
+ 285,105,340,105],0,5,1,146,0,1,0,0,0,0,0,'5',0,0,
+ "0","",[
+ 0,18,7,0,'18','7','0'],[0,18,7,0,'18','7','0'],[
]).
poly('black','',3,[
- 210,160,275,160,275,85],0,2,1,73,0,0,0,0,0,0,0,'2',0,0,
+ 210,85,250,85,250,55],1,3,1,152,0,0,0,0,0,0,0,'3',0,0,
"0","",[
- 0,10,4,0,'10','4','0'],[0,10,4,0,'10','4','0'],[
+ 0,12,5,0,'12','5','0'],[0,12,5,0,'12','5','0'],[
]).
-oval('black','',270,80,280,90,1,1,1,74,0,0,0,0,0,'1',0,[
+group([
+text('black',290,38,1,0,1,45,16,173,12,4,0,0,0,0,2,45,16,0,0,"",0,0,0,0,50,'',[
+minilines(45,16,0,0,0,0,0,[
+mini_line(45,12,4,0,0,0,[
+str_block(0,45,12,4,0,-2,0,0,0,[
+str_seg('black','Courier-Bold',1,80640,45,12,4,0,-2,0,0,0,0,0,
+ "BAR_3")])
+])
+])]),
+box('black','',285,35,340,55,0,2,1,174,0,0,0,0,0,'2',0,[
+])
+],
+172,0,0,[
]).
poly('black','',3,[
- 210,180,255,180,255,115],0,5,1,78,0,0,0,0,0,0,0,'5',0,0,
+ 340,85,300,85,300,55],1,3,1,178,0,0,0,0,0,0,0,'3',0,0,
"0","",[
- 0,18,7,0,'18','7','0'],[0,18,7,0,'18','7','0'],[
+ 0,12,5,0,'12','5','0'],[0,12,5,0,'12','5','0'],[
]).
diff --git a/slides/lisaac.tex b/slides/lisaac.tex
index 5968388..5711333 100644
--- a/slides/lisaac.tex
+++ b/slides/lisaac.tex
@@ -512,7 +512,7 @@ Self - - other;
\end{block}
\end{frame}
%---------------------------------------------------
-\begin{frame}{Style slot (1/2)}
+\begin{frame}{Style slot (1/3)}
\begin{block}{\textcolor{red}{+}\,: No shared, clonable or call sensitif}
\begin{itemize}
\item Distinct for classic data slot
@@ -527,7 +527,15 @@ Self - - other;
\end{block}
\end{frame}
%---------------------------------------------------
-\begin{frame}{Style slot (2/2)}
+\begin{frame}{Style slot (2/3)}
+\begin{block}{No shared {\it{}vs} shared}
+\begin{center}
+\includegraphics[scale=1.5]{figures/expanded_general.eps}
+\end{center}
+\end{block}
+\end{frame}
+%---------------------------------------------------
+\begin{frame}{Style slot (3/3)}
\begin{columns}
\begin{column}[l]{5.5cm}
\begin{block}{Step \#0}
--
Lisaac documentation
More information about the Lisaac-commits
mailing list