hgbook
diff it/figs/tour-merge-pull.svg @ 976:713f0f69029a
merge with Italian, and very (few) work on ch03
author | Romain PELISSE <belaran@gmail.com> |
---|---|
date | Fri Sep 04 16:33:35 2009 +0200 (2009-09-04) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/it/figs/tour-merge-pull.svg Fri Sep 04 16:33:35 2009 +0200 1.3 @@ -0,0 +1,288 @@ 1.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?> 1.5 +<!-- Created with Inkscape (http://www.inkscape.org/) --> 1.6 +<svg 1.7 + xmlns:dc="http://purl.org/dc/elements/1.1/" 1.8 + xmlns:cc="http://web.resource.org/cc/" 1.9 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 1.10 + xmlns:svg="http://www.w3.org/2000/svg" 1.11 + xmlns="http://www.w3.org/2000/svg" 1.12 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 1.13 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 1.14 + width="744.09448819" 1.15 + height="1052.3622047" 1.16 + id="svg2" 1.17 + sodipodi:version="0.32" 1.18 + inkscape:version="0.44.1" 1.19 + sodipodi:docname="tour-merge-pull.svg" 1.20 + sodipodi:docbase="/home/bos/hg/hgbook/en"> 1.21 + <defs 1.22 + id="defs4"> 1.23 + <marker 1.24 + inkscape:stockid="Arrow1Mstart" 1.25 + orient="auto" 1.26 + refY="0.0" 1.27 + refX="0.0" 1.28 + id="Arrow1Mstart" 1.29 + style="overflow:visible"> 1.30 + <path 1.31 + id="path2973" 1.32 + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " 1.33 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 1.34 + transform="scale(0.4) translate(10,0)" /> 1.35 + </marker> 1.36 + <marker 1.37 + inkscape:stockid="Arrow1Mend" 1.38 + orient="auto" 1.39 + refY="0.0" 1.40 + refX="0.0" 1.41 + id="Arrow1Mend" 1.42 + style="overflow:visible;"> 1.43 + <path 1.44 + id="path3066" 1.45 + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " 1.46 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 1.47 + transform="scale(0.4) rotate(180) translate(10,0)" /> 1.48 + </marker> 1.49 + </defs> 1.50 + <sodipodi:namedview 1.51 + id="base" 1.52 + pagecolor="#ffffff" 1.53 + bordercolor="#666666" 1.54 + borderopacity="1.0" 1.55 + gridtolerance="10000" 1.56 + guidetolerance="10" 1.57 + objecttolerance="10" 1.58 + inkscape:pageopacity="0.0" 1.59 + inkscape:pageshadow="2" 1.60 + inkscape:zoom="1.4" 1.61 + inkscape:cx="233.63208" 1.62 + inkscape:cy="832.54381" 1.63 + inkscape:document-units="px" 1.64 + inkscape:current-layer="layer1" 1.65 + inkscape:window-width="906" 1.66 + inkscape:window-height="620" 1.67 + inkscape:window-x="237" 1.68 + inkscape:window-y="103" /> 1.69 + <metadata 1.70 + id="metadata7"> 1.71 + <rdf:RDF> 1.72 + <cc:Work 1.73 + rdf:about=""> 1.74 + <dc:format>image/svg+xml</dc:format> 1.75 + <dc:type 1.76 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 1.77 + </cc:Work> 1.78 + </rdf:RDF> 1.79 + </metadata> 1.80 + <g 1.81 + inkscape:label="Layer 1" 1.82 + inkscape:groupmode="layer" 1.83 + id="layer1"> 1.84 + <text 1.85 + xml:space="preserve" 1.86 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 1.87 + x="173.57143" 1.88 + y="443.79074" 1.89 + id="text2832"><tspan 1.90 + sodipodi:role="line" 1.91 + id="tspan2834" 1.92 + x="173.57143" 1.93 + y="443.79074" /></text> 1.94 + <rect 1.95 + style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 1.96 + id="rect1878" 1.97 + width="94.285713" 1.98 + height="20.714285" 1.99 + x="138" 1.100 + y="479.50504" /> 1.101 + <text 1.102 + xml:space="preserve" 1.103 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 1.104 + x="162.09892" 1.105 + y="493.12619" 1.106 + id="text1872"><tspan 1.107 + sodipodi:role="line" 1.108 + id="tspan1874" 1.109 + x="162.09892" 1.110 + y="493.12619" 1.111 + style="font-family:Courier"><tspan 1.112 + style="font-weight:bold" 1.113 + id="tspan1876">0</tspan>: 0a04</tspan></text> 1.114 + <rect 1.115 + style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 1.116 + id="rect2800" 1.117 + width="94.285713" 1.118 + height="20.714285" 1.119 + x="138" 1.120 + y="432.63004" /> 1.121 + <text 1.122 + xml:space="preserve" 1.123 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 1.124 + x="162.09892" 1.125 + y="446.25119" 1.126 + id="text2794"><tspan 1.127 + sodipodi:role="line" 1.128 + id="tspan2796" 1.129 + x="162.09892" 1.130 + y="446.25119" 1.131 + style="font-family:Courier"><tspan 1.132 + id="tspan2868" 1.133 + style="font-weight:bold">1</tspan>: 82e5</tspan></text> 1.134 + <rect 1.135 + style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 1.136 + id="rect2810" 1.137 + width="94.285713" 1.138 + height="20.714285" 1.139 + x="138" 1.140 + y="385.75504" /> 1.141 + <text 1.142 + xml:space="preserve" 1.143 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 1.144 + x="162.09892" 1.145 + y="399.37619" 1.146 + id="text2804"><tspan 1.147 + sodipodi:role="line" 1.148 + id="tspan2806" 1.149 + x="162.09892" 1.150 + y="399.37619" 1.151 + style="font-family:Courier"><tspan 1.152 + style="font-weight:bold" 1.153 + id="tspan2866">2</tspan>: fef8</tspan></text> 1.154 + <rect 1.155 + style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 1.156 + id="rect2820" 1.157 + width="94.285713" 1.158 + height="20.714285" 1.159 + x="138" 1.160 + y="338.88007" /> 1.161 + <text 1.162 + xml:space="preserve" 1.163 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 1.164 + x="162.09892" 1.165 + y="352.50122" 1.166 + id="text2814"><tspan 1.167 + sodipodi:role="line" 1.168 + id="tspan2816" 1.169 + x="162.09892" 1.170 + y="352.50122" 1.171 + style="font-family:Courier"><tspan 1.172 + style="font-weight:bold" 1.173 + id="tspan2864">3</tspan>: 0272</tspan></text> 1.174 + <rect 1.175 + style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 1.176 + id="rect2830" 1.177 + width="94.285713" 1.178 + height="20.714285" 1.179 + x="138" 1.180 + y="292.00504" /> 1.181 + <text 1.182 + xml:space="preserve" 1.183 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 1.184 + x="162.09892" 1.185 + y="305.62619" 1.186 + id="text2824"><tspan 1.187 + sodipodi:role="line" 1.188 + id="tspan2826" 1.189 + x="162.09892" 1.190 + y="305.62619" 1.191 + style="font-family:Courier"><tspan 1.192 + style="font-weight:bold" 1.193 + id="tspan2862">4</tspan>: 2278</tspan></text> 1.194 + <path 1.195 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 1.196 + d="M 185.14286,478.50504 L 185.14286,454.34432" 1.197 + id="path2894" 1.198 + inkscape:connector-type="polyline" /> 1.199 + <path 1.200 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 1.201 + d="M 185.14286,431.63004 L 185.14286,407.46932" 1.202 + id="path2896" 1.203 + inkscape:connector-type="polyline" /> 1.204 + <path 1.205 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 1.206 + d="M 185.14286,384.75504 L 185.14286,360.59435" 1.207 + id="path2898" 1.208 + inkscape:connector-type="polyline" /> 1.209 + <path 1.210 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 1.211 + d="M 185.14286,337.88007 L 185.14286,313.71932" 1.212 + id="path2900" 1.213 + inkscape:connector-type="polyline" /> 1.214 + <rect 1.215 + style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 1.216 + id="rect2863" 1.217 + width="94.285713" 1.218 + height="20.714285" 1.219 + x="91.428574" 1.220 + y="244.71933" /> 1.221 + <text 1.222 + xml:space="preserve" 1.223 + style="font-size:12.00001812px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 1.224 + x="116.09886" 1.225 + y="258.80865" 1.226 + id="text1965" 1.227 + transform="scale(1.000002,0.999998)"><tspan 1.228 + sodipodi:role="line" 1.229 + id="tspan1967" 1.230 + x="116.09886" 1.231 + y="258.80865" 1.232 + style="font-family:Courier"><tspan 1.233 + style="font-weight:bold" 1.234 + id="tspan1973">5</tspan>: 1c34</tspan></text> 1.235 + <path 1.236 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.00000143px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1;display:inline" 1.237 + d="M 173.95727,291.00504 L 149.75702,266.43361" 1.238 + id="path1971" 1.239 + inkscape:connector-type="polyline" 1.240 + inkscape:connection-end="#rect2863" 1.241 + inkscape:connection-start="#rect2830" /> 1.242 + <rect 1.243 + style="fill:#78a5ad;fill-opacity:1;stroke:#507b84;stroke-width:2.00000286;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 1.244 + id="rect2911" 1.245 + width="94.285995" 1.246 + height="20.714283" 1.247 + x="186.71414" 1.248 + y="198.6479" /> 1.249 + <text 1.250 + xml:space="preserve" 1.251 + style="font-size:12.00001812px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 1.252 + x="210.81311" 1.253 + y="212.26949" 1.254 + id="text2913" 1.255 + transform="scale(1.000002,0.999998)"><tspan 1.256 + sodipodi:role="line" 1.257 + id="tspan2915" 1.258 + x="210.81311" 1.259 + y="212.26949" 1.260 + style="font-family:Courier"><tspan 1.261 + id="tspan1966" 1.262 + style="font-weight:bold">6</tspan>: 7643</tspan></text> 1.263 + <path 1.264 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.00000143px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1;display:inline" 1.265 + d="M 191.06908,291.00504 L 227.93092,220.36218" 1.266 + id="path2919" 1.267 + inkscape:connector-type="polyline" 1.268 + inkscape:connection-start="#rect2830" /> 1.269 + <text 1.270 + xml:space="preserve" 1.271 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 1.272 + x="295.28571" 1.273 + y="211.80988" 1.274 + id="text2871"><tspan 1.275 + sodipodi:role="line" 1.276 + id="tspan2873" 1.277 + x="295.28571" 1.278 + y="211.80988">punta (e testa)</tspan></text> 1.279 + <text 1.280 + xml:space="preserve" 1.281 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 1.282 + x="76" 1.283 + y="259.16046" 1.284 + id="text2875"><tspan 1.285 + sodipodi:role="line" 1.286 + id="tspan2877" 1.287 + x="76" 1.288 + y="259.16046" 1.289 + style="text-align:end;text-anchor:end">testa</tspan></text> 1.290 + </g> 1.291 +</svg>