1.1 --- a/it/Makefile	Fri Aug 21 23:48:28 2009 +0200
     1.2 +++ b/it/Makefile	Sat Aug 22 16:35:17 2009 +0200
     1.3 @@ -69,6 +69,7 @@
     1.4  # screenshots
     1.5  image-png := $(filter %.png, $(image-files))
     1.6  
     1.7 +# this must already exists
     1.8  figs-folder := examples/figs
     1.9  figs-web := \
    1.10  	$(image-dot:$(image-folder)/%.dot=$(figs-folder)/%.png) \
    1.11 @@ -77,12 +78,11 @@
    1.12  
    1.13  figs: $(figs-web)
    1.14  
    1.15 -#$(figs-folder)/%.png: $(image-folder)/%.png $(image-folder)/%.svg
    1.16  $(figs-folder)/%.png: $(image-folder)/%.svg
    1.17  	inkscape -D -d 120 -e $@ $<
    1.18  
    1.19  $(figs-folder)/%.png: $(figs-folder)/%.svg
    1.20 -	inkscape -D -d 120 -e $@ $<
    1.21 +	inkscape -D -e $@ $<
    1.22  	rm $<
    1.23  
    1.24  $(figs-folder)/%.png: $(image-folder)/%.png

     2.1 --- a/it/figs/bad-merge-1.dot	Fri Aug 21 23:48:28 2009 +0200
     2.2 +++ b/it/figs/bad-merge-1.dot	Sat Aug 22 16:35:17 2009 +0200
     2.3 @@ -1,5 +1,5 @@
     2.4  digraph bad_merge_1 {
     2.5 -	ancestor [label="1: antenato"];
     2.6 +	ancestor [label="1: progenitore"];
     2.7  	left [label="2: mia modifica"];
     2.8  	right [label="3: vostra modifica"];
     2.9  	bad [label="4: unione sbagliata"];

     3.1 --- a/it/figs/bad-merge-2.dot	Fri Aug 21 23:48:28 2009 +0200
     3.2 +++ b/it/figs/bad-merge-2.dot	Sat Aug 22 16:35:17 2009 +0200
     3.3 @@ -1,5 +1,5 @@
     3.4  digraph bad_merge_2 {
     3.5 -	ancestor [label="1: antenato",color=grey,fontcolor=grey];
     3.6 +	ancestor [label="1: progenitore",color=grey,fontcolor=grey];
     3.7  	left [label="2: mia modifica",color=grey,fontcolor=grey];
     3.8  	right [label="3: vostra modifica",color=grey,fontcolor=grey];
     3.9  	bad [label="4: unione sbagliata",color=grey,fontcolor=grey];

     4.1 --- a/it/figs/bad-merge-3.dot	Fri Aug 21 23:48:28 2009 +0200
     4.2 +++ b/it/figs/bad-merge-3.dot	Sat Aug 22 16:35:17 2009 +0200
     4.3 @@ -1,5 +1,5 @@
     4.4  digraph bad_merge_3 {
     4.5 -	ancestor [label="1: antenato",color="#bbbbbb",fontcolor="#bbbbbb"];
     4.6 +	ancestor [label="1: progenitore",color="#bbbbbb",fontcolor="#bbbbbb"];
     4.7  	left [label="2: mia modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
     4.8  	right [label="3: vostra modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
     4.9  	bad [label="4: unione sbagliata",color="#bbbbbb",fontcolor="#bbbbbb"];

     5.1 --- a/it/figs/bad-merge-4.dot	Fri Aug 21 23:48:28 2009 +0200
     5.2 +++ b/it/figs/bad-merge-4.dot	Sat Aug 22 16:35:17 2009 +0200
     5.3 @@ -1,5 +1,5 @@
     5.4  digraph bad_merge_4 {
     5.5 -	ancestor [label="1: antenato",color="#bbbbbb",fontcolor="#bbbbbb"];
     5.6 +	ancestor [label="1: progenitore",color="#bbbbbb",fontcolor="#bbbbbb"];
     5.7  	left [label="2: mia modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
     5.8  	right [label="3: vostra modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
     5.9  	bad [label="4: unione sbagliata",color="#bbbbbb",fontcolor="#bbbbbb"];

     6.1 --- a/it/figs/bad-merge-5.dot	Fri Aug 21 23:48:28 2009 +0200
     6.2 +++ b/it/figs/bad-merge-5.dot	Sat Aug 22 16:35:17 2009 +0200
     6.3 @@ -1,5 +1,5 @@
     6.4  digraph bad_merge_5 {
     6.5 -	ancestor [label="1: antenato",color="#bbbbbb",fontcolor="#bbbbbb"];
     6.6 +	ancestor [label="1: progenitore",color="#bbbbbb",fontcolor="#bbbbbb"];
     6.7  	left [label="2: mia modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
     6.8  	right [label="3: vostra modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
     6.9  	bad [label="4: unione sbagliata",color="#bbbbbb",fontcolor="#bbbbbb"];