# HG changeset patch
# User gpiancastelli
# Date 1250951717 -7200
# Node ID 793e15b562ef41a3edd881ffa96fc3fdc152a626
# Parent  efa16e810ae678f28587ad13e59e76edd17a953b
Figures wording and making.

diff -r efa16e810ae6 -r 793e15b562ef it/Makefile
--- a/it/Makefile	Fri Aug 21 23:48:28 2009 +0200
+++ b/it/Makefile	Sat Aug 22 16:35:17 2009 +0200
@@ -69,6 +69,7 @@
 # screenshots
 image-png := $(filter %.png, $(image-files))
 
+# this must already exists
 figs-folder := examples/figs
 figs-web := \
 	$(image-dot:$(image-folder)/%.dot=$(figs-folder)/%.png) \
@@ -77,12 +78,11 @@
 
 figs: $(figs-web)
 
-#$(figs-folder)/%.png: $(image-folder)/%.png $(image-folder)/%.svg
 $(figs-folder)/%.png: $(image-folder)/%.svg
 	inkscape -D -d 120 -e $@ $<
 
 $(figs-folder)/%.png: $(figs-folder)/%.svg
-	inkscape -D -d 120 -e $@ $<
+	inkscape -D -e $@ $<
 	rm $<
 
 $(figs-folder)/%.png: $(image-folder)/%.png
diff -r efa16e810ae6 -r 793e15b562ef it/figs/bad-merge-1.dot
--- a/it/figs/bad-merge-1.dot	Fri Aug 21 23:48:28 2009 +0200
+++ b/it/figs/bad-merge-1.dot	Sat Aug 22 16:35:17 2009 +0200
@@ -1,5 +1,5 @@
 digraph bad_merge_1 {
-	ancestor [label="1: antenato"];
+	ancestor [label="1: progenitore"];
 	left [label="2: mia modifica"];
 	right [label="3: vostra modifica"];
 	bad [label="4: unione sbagliata"];
diff -r efa16e810ae6 -r 793e15b562ef it/figs/bad-merge-2.dot
--- a/it/figs/bad-merge-2.dot	Fri Aug 21 23:48:28 2009 +0200
+++ b/it/figs/bad-merge-2.dot	Sat Aug 22 16:35:17 2009 +0200
@@ -1,5 +1,5 @@
 digraph bad_merge_2 {
-	ancestor [label="1: antenato",color=grey,fontcolor=grey];
+	ancestor [label="1: progenitore",color=grey,fontcolor=grey];
 	left [label="2: mia modifica",color=grey,fontcolor=grey];
 	right [label="3: vostra modifica",color=grey,fontcolor=grey];
 	bad [label="4: unione sbagliata",color=grey,fontcolor=grey];
diff -r efa16e810ae6 -r 793e15b562ef it/figs/bad-merge-3.dot
--- a/it/figs/bad-merge-3.dot	Fri Aug 21 23:48:28 2009 +0200
+++ b/it/figs/bad-merge-3.dot	Sat Aug 22 16:35:17 2009 +0200
@@ -1,5 +1,5 @@
 digraph bad_merge_3 {
-	ancestor [label="1: antenato",color="#bbbbbb",fontcolor="#bbbbbb"];
+	ancestor [label="1: progenitore",color="#bbbbbb",fontcolor="#bbbbbb"];
 	left [label="2: mia modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
 	right [label="3: vostra modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
 	bad [label="4: unione sbagliata",color="#bbbbbb",fontcolor="#bbbbbb"];
diff -r efa16e810ae6 -r 793e15b562ef it/figs/bad-merge-4.dot
--- a/it/figs/bad-merge-4.dot	Fri Aug 21 23:48:28 2009 +0200
+++ b/it/figs/bad-merge-4.dot	Sat Aug 22 16:35:17 2009 +0200
@@ -1,5 +1,5 @@
 digraph bad_merge_4 {
-	ancestor [label="1: antenato",color="#bbbbbb",fontcolor="#bbbbbb"];
+	ancestor [label="1: progenitore",color="#bbbbbb",fontcolor="#bbbbbb"];
 	left [label="2: mia modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
 	right [label="3: vostra modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
 	bad [label="4: unione sbagliata",color="#bbbbbb",fontcolor="#bbbbbb"];
diff -r efa16e810ae6 -r 793e15b562ef it/figs/bad-merge-5.dot
--- a/it/figs/bad-merge-5.dot	Fri Aug 21 23:48:28 2009 +0200
+++ b/it/figs/bad-merge-5.dot	Sat Aug 22 16:35:17 2009 +0200
@@ -1,5 +1,5 @@
 digraph bad_merge_5 {
-	ancestor [label="1: antenato",color="#bbbbbb",fontcolor="#bbbbbb"];
+	ancestor [label="1: progenitore",color="#bbbbbb",fontcolor="#bbbbbb"];
 	left [label="2: mia modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
 	right [label="3: vostra modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
 	bad [label="4: unione sbagliata",color="#bbbbbb",fontcolor="#bbbbbb"];