both slide

diff --git a/.gitignore b/.gitignore
index e569d7b22a5d38948aa6a6d1e0f026b5640f7be9..0e4d0a9ec95649faf4ff4016d9c70a00db489365 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ t.*
 *.[1-9]
 slides.pdf
 slides.ps
+both.fig

diff --git a/Makefile b/Makefile
index 7f643c8e9665de3ad6da9c5c06f34e58d55dcabc..43f76eb164bb32d916a034036cce9303a5fec31d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 
-SLIDES= reality
+SLIDES= old both
 
 SLIDEFILES=$(addsuffix .ps, $(SLIDES))
 
@@ -15,6 +15,11 @@ all: slides.pdf
 %.ps:  %.lout
        lout $< $o
 
+both.fig: old.fig new.fig
+       cat old.fig >$@.1
+       sed '1,9d' new.fig >>$@.1
+       mv -f $@.1 $@
+
 slides.ps: $(SLIDEFILES) Makefile
        cat $(SLIDEFILES) $o
 

diff --git a/reality.fig b/new.fig
similarity index 69%
rename from reality.fig
rename to new.fig
index 05dd854141fec8b29b83b2fc0c7de56ab2427aae..0065c59d78c4b31ffd8fad3b2de36974c355caaa 100644 (file)
--- a/reality.fig
+++ b/new.fig
@@ -27,26 +27,6 @@ Single
         2295 2970 2295 3690 2475 3690
 2 1 0 1 4 7 50 -1 -1 0.000 0 0 -1 0 0 2
         2295 3240 2475 3240
-2 4 0 2 0 7 50 -1 -1 0.000 0 0 14 0 0 5
-        5535 0 5535 -495 3960 -495 3960 0 5535 0
-2 4 0 2 0 7 50 -1 -1 0.000 0 0 14 0 0 5
-        2475 1260 2475 765 765 765 765 1260 2475 1260
-2 4 0 2 0 7 50 -1 -1 0.000 0 0 14 0 0 5
-        5400 1260 5400 765 3915 765 3915 1260 5400 1260
-2 4 0 2 0 7 50 -1 -1 0.000 0 0 14 0 0 5
-        10440 1215 10440 720 8505 720 8505 1215 10440 1215
-2 4 0 2 0 7 50 -1 -1 0.000 0 0 14 0 0 5
-        12645 1215 12645 720 11115 720 11115 1215 12645 1215
-2 1 0 2 0 7 40 -1 -1 0.000 0 0 14 1 0 2
-       1 1 1.00 60.00 120.00
-        5625 -270 7065 -270
-2 1 0 2 0 7 40 -1 -1 0.000 0 0 14 1 0 2
-       1 1 1.00 60.00 120.00
-        10485 990 11070 990
-2 1 0 2 0 7 50 -1 -1 0.000 0 0 14 0 0 3
-        10260 6030 10260 2655 13005 2655
-2 4 0 2 0 7 50 -1 -1 0.000 0 0 14 0 0 5
-        11340 4050 11340 3555 10530 3555 10530 4050 11340 4050
 2 1 0 2 4 7 50 -1 -1 0.000 0 0 14 1 0 3
        1 1 1.00 60.00 120.00
         1665 720 4230 -1755 8640 -1755
@@ -56,9 +36,6 @@ Single
 2 1 0 2 4 7 50 -1 -1 0.000 0 0 14 1 0 3
        1 1 1.00 60.00 120.00
         4815 -540 5175 -900 6975 -900
-2 1 0 2 0 7 40 -1 -1 0.000 0 0 14 1 0 2
-       1 1 1.00 60.00 120.00
-        2520 1035 3915 1035
 2 1 0 2 4 7 50 -1 -1 0.000 0 0 14 1 0 3
        1 1 1.00 60.00 120.00
         1170 1305 1440 4770 7650 4770
@@ -97,28 +74,16 @@ Single
         7110 -1125 9180 -1125 9180 -675 7110 -675 7110 -1125
 2 2 0 2 4 7 50 -1 -1 0.000 0 0 14 0 0 5
         3960 1440 6795 1440 6795 2160 3960 2160 3960 1440
-2 4 0 2 0 7 50 -1 -1 0.000 0 0 14 0 0 5
-        8865 0 8865 -495 7110 -495 7110 0 8865 0
 2 4 0 2 4 7 50 -1 -1 0.000 0 0 14 0 0 5
         11385 4725 11385 4320 10530 4320 10530 4725 11385 4725
-4 0 0 50 -1 0 20 0.0000 4 300 1440 900 1125 xen.git/.tar\001
-4 0 0 50 -1 0 20 0.0000 4 300 1440 1035 6840 xen.git/.tar\001
-4 0 0 50 -1 0 20 0.0000 4 225 1215 4050 1125 xen*.deb\001
 4 0 4 50 -1 0 20 0.0000 4 225 2400 4050 1665 xen devel headers\001
 4 0 4 50 -1 0 20 0.0000 4 225 2670 4050 2070 minios  libs/headers\001
-4 0 0 50 -1 0 20 0.0000 4 300 1305 11205 1080 qemu.deb\001
 4 0 4 50 -1 0 20 0.0000 4 300 1260 11160 1620 qemu-dm\001
-4 0 0 50 -1 0 20 0.0000 4 300 1695 8640 1080 qemu.git/.tar\001
-4 0 0 50 -1 0 20 0.0000 4 300 1485 7245 -180 python.deb\001
 4 0 4 50 -1 0 20 0.0000 4 300 1905 7200 -810 python (rump)\001
-4 0 0 50 -1 0 20 0.0000 4 300 1350 4095 -180 python.tar\001
 4 0 4 50 -1 0 20 0.0000 4 300 930 10125 -1665 pygrub\001
 4 0 4 50 -1 0 16 0.0000 4 255 1455 10125 -1305 xen pv image\001
 4 0 4 50 -1 0 16 0.0000 4 255 1455 11160 1935 xen pv image\001
 4 0 4 50 -1 0 20 0.0000 4 300 2820 6885 2835 rumpxen libs & tools\001
-4 0 0 50 -1 0 16 0.0000 4 255 435 10620 3195 Key\001
-4 0 0 50 -1 0 16 0.0000 4 225 795 11520 3690 source/\001
-4 0 0 50 -1 0 16 0.0000 4 255 870 11520 3915 package\001
 4 0 4 50 -1 0 16 0.0000 4 225 795 11520 4365 source/\001
 4 0 4 50 -1 0 16 0.0000 4 255 870 11520 4590 package\001
 4 0 4 50 -1 0 16 0.0000 4 135 600 11520 4815 - new\001

diff --git a/old.fig b/old.fig
new file mode 100644 (file)
index 0000000..8e15fbc
--- /dev/null
+++ b/old.fig
@@ -0,0 +1,45 @@
+#FIG 3.2  Produced by xfig version 3.2.5b
+Landscape
+Center
+Metric
+A4      
+100.00
+Single
+-2
+1200 2
+2 4 0 2 0 7 50 -1 -1 0.000 0 0 14 0 0 5
+        5535 0 5535 -495 3960 -495 3960 0 5535 0
+2 4 0 2 0 7 50 -1 -1 0.000 0 0 14 0 0 5
+        2475 1260 2475 765 765 765 765 1260 2475 1260
+2 4 0 2 0 7 50 -1 -1 0.000 0 0 14 0 0 5
+        5400 1260 5400 765 3915 765 3915 1260 5400 1260
+2 4 0 2 0 7 50 -1 -1 0.000 0 0 14 0 0 5
+        10440 1215 10440 720 8505 720 8505 1215 10440 1215
+2 4 0 2 0 7 50 -1 -1 0.000 0 0 14 0 0 5
+        12645 1215 12645 720 11115 720 11115 1215 12645 1215
+2 1 0 2 0 7 40 -1 -1 0.000 0 0 14 1 0 2
+       1 1 1.00 60.00 120.00
+        5625 -270 7065 -270
+2 1 0 2 0 7 40 -1 -1 0.000 0 0 14 1 0 2
+       1 1 1.00 60.00 120.00
+        10485 990 11070 990
+2 1 0 2 0 7 50 -1 -1 0.000 0 0 14 0 0 3
+        10260 6030 10260 2655 13005 2655
+2 4 0 2 0 7 50 -1 -1 0.000 0 0 14 0 0 5
+        11340 4050 11340 3555 10530 3555 10530 4050 11340 4050
+2 1 0 2 0 7 40 -1 -1 0.000 0 0 14 1 0 2
+       1 1 1.00 60.00 120.00
+        2520 1035 3915 1035
+2 4 0 2 0 7 50 -1 -1 0.000 0 0 14 0 0 5
+        8865 0 8865 -495 7110 -495 7110 0 8865 0
+2 2 0 2 7 7 100 -1 -1 0.000 0 0 -1 0 0 5
+        450 -2700 630 -2700 630 -2475 450 -2475 450 -2700
+4 0 0 50 -1 0 20 0.0000 4 300 1440 900 1125 xen.git/.tar\001
+4 0 0 50 -1 0 20 0.0000 4 225 1215 4050 1125 xen*.deb\001
+4 0 0 50 -1 0 20 0.0000 4 300 1305 11205 1080 qemu.deb\001
+4 0 0 50 -1 0 20 0.0000 4 300 1695 8640 1080 qemu.git/.tar\001
+4 0 0 50 -1 0 20 0.0000 4 300 1485 7245 -180 python.deb\001
+4 0 0 50 -1 0 20 0.0000 4 300 1350 4095 -180 python.tar\001
+4 0 0 50 -1 0 16 0.0000 4 255 435 10620 3195 Key\001
+4 0 0 50 -1 0 16 0.0000 4 225 795 11520 3690 source/\001
+4 0 0 50 -1 0 16 0.0000 4 255 870 11520 3915 package\001