Merge pull request #190 from mufernando/union_vignette

Union vignette

Author: petrelharp

docs/.gitignore

@@ -2,3 +2,4 @@ _build
 spatial_sim_individuals.txt
 spatial_sim_genotypes.vcf
 example_snps.vcf
+sims.make

docs/A.trees

@@ -4,7 +4,7 @@ INKSCAPE := $(shell command -v inkscape 2> /dev/null)
 
 # NOTE: all layers must be visible in pedigrees.ink.svg for this to work.
 
-all: pedigree01.png pedigree2.png pedigree_recapitate.png pedigree_simplify.png pedigree_mutate.png annotated_p_vs_s.png annotate_genome.png
+all: pedigree01.png pedigree2.png pedigree_recapitate.png pedigree_simplify.png pedigree_mutate.png annotated_p_vs_s.png annotate_genome.png phylo.png
 
 pedigree01.png : pedigree0.png pedigree1.png
 	convert +append $^ $@

docs/B.trees

@@ -0,0 +1,6 @@
+child	parent	popsize	edgelen
+root		5000	20000
+C	root	500	2500
+I	root	1000	2000
+B	I	700	500
+A	I	400	500

docs/C.trees

@@ -9,6 +9,7 @@
     - file: vignette_space
     - file: vignette_continuing
     - file: vignette_coalescent_diversity
+    - file: vignette_parallel_phylo
     - file: metadata
 
 - part: pyslim reference