wip

diff --git a/.gitignore b/.gitignore
index 958665a2e3b35f0848d26bd41c494cea3bad966f..68eb0c9662c4cafaea20506fa9a1d89919e4c989 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ borrow-nonmut.ps
 bck-lifetimes.ps
 macros.ps
 tour-main.ps
+tour-6?.ps
 *.1
 *.txt.eps
 slides.pdf

diff --git a/Makefile b/Makefile
index b15cebe4c93c54af86235b30926cb9add30cb4cb..13dd6df87d3e269c87fe99426188d0f51f64d632 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,8 @@ SLIDES+= borrow-mut
 SLIDES+= dangling
 SLIDES+= borrow-nonmut
 
-SLIDES+= tour-main #xxx
+SLIDES+= tour-61
+SLIDES+= tour-62
 
 SLIDES+= bck-lifetimes
 SLIDES+= macros
@@ -34,6 +35,10 @@ borrow-nonmut.ps: borrow-nonmut.txt.eps borrow-nonmut-error.txt.eps
 
 tour-main.ps: tour-example.txt.eps
 
+tour-%.ps: tour-main.fig tour-example.txt.eps Makefile
+       iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1
+       LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 -D+1:59,$*,80:99 <$@.1 $o
+
 %.eps:   %.fig
        iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1
        # wtf!

diff --git a/tour-main.fig b/tour-main.fig
index 98dd96d8bb1f525d709bb3ffe9731801c03356ec..e2e7bad4a589fe6aef34521d29112185126ad3a6 100644 (file)
--- a/tour-main.fig
+++ b/tour-main.fig
@@ -13,9 +13,19 @@ Single
 4 0 0 50 -1 2 30 0.0000 4 435 3105 1260 450 polymorphism\001
 4 0 0 50 -1 2 30 0.0000 4 435 2625 1530 990 ("generics")\001
 -6
-2 5 0 1 0 -1 50 -1 -1 0.000 0 0 -1 0 0 5
+2 2 0 2 1 7 61 -1 -1 0.000 0 0 -1 0 0 5
+        -1530 -1170 450 -1170 450 -540 -1530 -540 -1530 -1170
+2 2 0 2 1 7 62 -1 -1 0.000 0 0 -1 0 0 5
+        990 -1170 4050 -1170 4050 -540 990 -540 990 -1170
+2 1 0 2 1 7 62 -1 -1 0.000 0 0 -1 0 0 3
+        990 2700 1620 2880 990 3240
+2 5 0 1 0 -1 90 -1 -1 0.000 0 0 -1 0 0 5
        0 tour-example.txt.eps
         -1530 2106 9900 2106 9900 6300 -1530 6300 -1530 2106
+2 1 0 2 1 7 62 -1 -1 0.000 0 0 -1 0 0 3
+        3690 5580 3420 4500 3780 4860
+2 1 0 2 1 7 62 -1 -1 0.000 0 0 -1 0 0 2
+        4140 2250 4770 2250
 4 0 0 50 -1 2 30 0.0000 4 435 1335 4860 -720 Safety\001
 4 0 0 50 -1 2 30 0.0000 4 330 795 7650 -720 FFI\001
 4 0 0 50 -1 2 30 0.0000 4 435 1470 -1260 -720 Syntax\001
@@ -25,3 +35,7 @@ Single
 4 0 0 50 -1 2 27 0.0000 4 300 1245 4950 270 escape\001
 4 0 0 50 -1 2 27 0.0000 4 300 1605 7830 270 to C etc.\001
 4 0 0 50 -1 2 27 0.0000 4 390 1350 7830 -180 talking\001
+4 0 1 62 -1 1 27 0.0000 4 405 4500 5040 2340 definition of a struct type\001
+4 0 1 62 -1 1 27 0.0000 4 405 7365 1890 2970 definition of the members and their types\001
+4 0 1 62 -1 1 27 0.0000 4 405 6480 1980 4320 by specifying values of the members\001
+4 0 1 62 -1 1 27 0.0000 4 405 5100 1710 3870 construction of struct values\001