Anonymous avatar Anonymous committed 793e15b

Figures wording and making.

Comments (0)

Files changed (6)

 # 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) \
 
 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

it/figs/bad-merge-1.dot

 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"];

it/figs/bad-merge-2.dot

 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];

it/figs/bad-merge-3.dot

 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"];

it/figs/bad-merge-4.dot

 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"];

it/figs/bad-merge-5.dot

 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"];
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.