wip

diff --git a/.gitignore b/.gitignore
index 89c7adb3a631d2cb1b1a061551d0ac8865869b23..46fdd887490e3652a0ef94983e34ded9f17a01e7 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,9 @@ tour-main.ps
 tour-6?.ps
 tourx-7?.ps
 c-v-rust.ps
+borrow-errormsg.ps
+stability-slide.ps
+coc-slide.ps
 *.1
 *.tmp
 *.txt.eps

diff --git a/Makefile b/Makefile
index e461e66d2e0a98156968da2a173bba7150b58de9..9b003293b61acfc602a4c3115e2a7217ec8422ab 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,9 @@ SLIDES+= tourx-72
 
 # D
 SLIDES+= c-v-rust
-SLIDES+= borrow-nonmut # error message
+SLIDES+= stability-slide
+SLIDES+= borrow-errormsg
+SLIDES+= coc-slide
 
 # E
 SLIDES+= bck-lifetimes
@@ -44,7 +46,7 @@ bck-lifetimes.ps: bck-err.txt.eps
 macros.ps: serde-example.txt.eps macro-rules-example.txt.eps
 borrow-mut.ps: borrow-mut-example.txt.eps
 dangling.ps: dangling.txt.eps dangling-err.txt.eps
-borrow-nonmut.ps: borrow-nonmut.txt.eps borrow-nonmut-error.txt.eps
+borrow-nonmut.ps borrow-errormsg.ps: borrow-nonmut.txt.eps borrow-nonmut-error.txt.eps
 cargo.ps: cargo-nonconfig.txt.eps
 
 tour-main.ps: tour-example.txt.eps

diff --git a/c-v-rust.fig b/c-v-rust.fig
index 1d19abf09c8d1e720394834f04615cf5868d94c6..d38e6c7f802f1b90aa0c74cea760eddde31b83e1 100644 (file)
--- a/c-v-rust.fig
+++ b/c-v-rust.fig
@@ -21,7 +21,6 @@ Single
 4 0 4 72 -1 2 30 0.0000 4 330 360 8865 -990 C\001
 4 0 1 72 -1 2 30 0.0000 4 330 990 -720 4275 Rust\001
 4 0 1 72 -1 2 30 0.0000 4 435 2415 -720 4680 community\001
-4 0 0 72 -1 2 30 0.0000 4 435 7170 -855 -1845 Attitude to programmer mistakes\001
 4 0 1 72 -1 2 30 0.0000 4 435 2025 -720 5490 Compiler\001
 4 0 1 72 -1 2 30 0.0000 4 435 2415 -720 5985 should help\001
 4 0 4 72 -1 2 30 0.0000 4 435 1740 8820 1755 blaming\001
@@ -29,3 +28,4 @@ Single
 4 0 4 72 -1 2 30 0.0000 4 435 2025 8865 -585 compiler/\001
 4 0 4 72 -1 2 30 0.0000 4 435 2415 8865 360 community\001
 4 0 4 72 -1 2 30 0.0000 4 330 2100 8865 -90 standards\001
+4 0 0 72 -1 2 30 0.0000 4 435 9510 -855 -1845 Community attitude - Programmer mistakes\001

diff --git a/coc-slide.fig b/coc-slide.fig
new file mode 100644 (file)
index 0000000..157f126
--- /dev/null
+++ b/coc-slide.fig
@@ -0,0 +1,16 @@
+#FIG 3.2  Produced by xfig version 3.2.6a
+Landscape
+Center
+Metric
+A4
+100.00
+Single
+-2
+1200 2
+2 5 0 1 0 -1 90 -1 -1 0.000 0 0 -1 0 0 5
+       0 coc.png
+        -818 -2520 11745 -2520 11745 6135 -818 6135 -818 -2520
+4 0 0 72 -1 2 30 0.0000 4 435 4320 -855 -1845 Community attitude\001
+4 0 1 72 -1 1 30 0.0000 4 450 4110 7020 -1755 This is the first thing\001
+4 0 1 72 -1 1 30 0.0000 4 450 3810 7110 -1350 you see if you click\001
+4 0 1 72 -1 1 30 0.0000 4 435 3255 7290 -945 on "community"\001

diff --git a/coc.png b/coc.png
new file mode 100644 (file)
index 0000000..48291b6
Binary files /dev/null and b/coc.png differ