hgbook
diff it/figs/wdir-merge.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/wdir-merge.svg Fri Sep 04 16:33:35 2009 +0200 1.3 @@ -0,0 +1,425 @@ 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:xlink="http://www.w3.org/1999/xlink" 1.13 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 1.14 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 1.15 + width="744.09448819" 1.16 + height="1052.3622047" 1.17 + id="svg5971" 1.18 + sodipodi:version="0.32" 1.19 + inkscape:version="0.44.1" 1.20 + sodipodi:docbase="/home/bos/hg/hgbook/en" 1.21 + sodipodi:docname="wdir-merge.svg"> 1.22 + <defs 1.23 + id="defs5973"> 1.24 + <marker 1.25 + inkscape:stockid="Arrow1Mstart" 1.26 + orient="auto" 1.27 + refY="0.0" 1.28 + refX="0.0" 1.29 + id="Arrow1Mstart" 1.30 + style="overflow:visible"> 1.31 + <path 1.32 + id="path4855" 1.33 + 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.34 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 1.35 + transform="scale(0.4) translate(10,0)" /> 1.36 + </marker> 1.37 + <linearGradient 1.38 + id="linearGradient6049"> 1.39 + <stop 1.40 + style="stop-color:#686868;stop-opacity:1;" 1.41 + offset="0" 1.42 + id="stop6051" /> 1.43 + <stop 1.44 + style="stop-color:#f0f0f0;stop-opacity:1;" 1.45 + offset="1" 1.46 + id="stop6053" /> 1.47 + </linearGradient> 1.48 + <marker 1.49 + inkscape:stockid="Arrow1Mend" 1.50 + orient="auto" 1.51 + refY="0.0" 1.52 + refX="0.0" 1.53 + id="Arrow1Mend" 1.54 + style="overflow:visible;"> 1.55 + <path 1.56 + id="path4852" 1.57 + 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.58 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 1.59 + transform="scale(0.4) rotate(180) translate(10,0)" /> 1.60 + </marker> 1.61 + <linearGradient 1.62 + inkscape:collect="always" 1.63 + xlink:href="#linearGradient6049" 1.64 + id="linearGradient6083" 1.65 + gradientUnits="userSpaceOnUse" 1.66 + gradientTransform="translate(-240.0462,-8.633237e-6)" 1.67 + x1="333.91171" 1.68 + y1="488.79077" 1.69 + x2="508.94543" 1.70 + y2="263.79077" /> 1.71 + <linearGradient 1.72 + inkscape:collect="always" 1.73 + xlink:href="#linearGradient6049" 1.74 + id="linearGradient6142" 1.75 + gradientUnits="userSpaceOnUse" 1.76 + gradientTransform="translate(-42.00893,-30.49544)" 1.77 + x1="333.91171" 1.78 + y1="488.79077" 1.79 + x2="508.94543" 1.80 + y2="263.79077" /> 1.81 + <linearGradient 1.82 + inkscape:collect="always" 1.83 + xlink:href="#linearGradient6049" 1.84 + id="linearGradient6193" 1.85 + gradientUnits="userSpaceOnUse" 1.86 + gradientTransform="translate(-240.0462,-8.633237e-6)" 1.87 + x1="333.91171" 1.88 + y1="488.79077" 1.89 + x2="508.94543" 1.90 + y2="263.79077" /> 1.91 + <linearGradient 1.92 + inkscape:collect="always" 1.93 + xlink:href="#linearGradient6049" 1.94 + id="linearGradient6216" 1.95 + gradientUnits="userSpaceOnUse" 1.96 + gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 1.97 + x1="333.91171" 1.98 + y1="488.79077" 1.99 + x2="508.94543" 1.100 + y2="263.79077" /> 1.101 + <linearGradient 1.102 + inkscape:collect="always" 1.103 + xlink:href="#linearGradient6049" 1.104 + id="linearGradient6232" 1.105 + gradientUnits="userSpaceOnUse" 1.106 + gradientTransform="matrix(1.000473,0,0,0.790947,-11.16012,50.85693)" 1.107 + x1="333.91171" 1.108 + y1="488.79077" 1.109 + x2="508.94543" 1.110 + y2="263.79077" /> 1.111 + <linearGradient 1.112 + inkscape:collect="always" 1.113 + xlink:href="#linearGradient6049" 1.114 + id="linearGradient6445" 1.115 + gradientUnits="userSpaceOnUse" 1.116 + gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 1.117 + x1="333.91171" 1.118 + y1="488.79077" 1.119 + x2="508.94543" 1.120 + y2="263.79077" /> 1.121 + <linearGradient 1.122 + inkscape:collect="always" 1.123 + xlink:href="#linearGradient6049" 1.124 + id="linearGradient6974" 1.125 + gradientUnits="userSpaceOnUse" 1.126 + gradientTransform="matrix(1.911882,0,0,0.789965,-574.7896,51.22599)" 1.127 + x1="333.91171" 1.128 + y1="488.79077" 1.129 + x2="508.94543" 1.130 + y2="263.79077" /> 1.131 + <linearGradient 1.132 + inkscape:collect="always" 1.133 + xlink:href="#linearGradient6049" 1.134 + id="linearGradient6996" 1.135 + gradientUnits="userSpaceOnUse" 1.136 + gradientTransform="matrix(1.000473,0,0,0.790947,112.8399,50.85693)" 1.137 + x1="333.91171" 1.138 + y1="488.79077" 1.139 + x2="508.94543" 1.140 + y2="263.79077" /> 1.141 + </defs> 1.142 + <sodipodi:namedview 1.143 + id="base" 1.144 + pagecolor="#ffffff" 1.145 + bordercolor="#666666" 1.146 + borderopacity="1.0" 1.147 + gridtolerance="10000" 1.148 + guidetolerance="10" 1.149 + objecttolerance="10" 1.150 + inkscape:pageopacity="0.0" 1.151 + inkscape:pageshadow="2" 1.152 + inkscape:zoom="1.28" 1.153 + inkscape:cx="345.85973" 1.154 + inkscape:cy="690.49342" 1.155 + inkscape:document-units="px" 1.156 + inkscape:current-layer="layer1" 1.157 + showguides="true" 1.158 + inkscape:guide-bbox="true" 1.159 + inkscape:window-width="906" 1.160 + inkscape:window-height="620" 1.161 + inkscape:window-x="0" 1.162 + inkscape:window-y="25"> 1.163 + <sodipodi:guide 1.164 + orientation="vertical" 1.165 + position="-1.4285714" 1.166 + id="guide6022" /> 1.167 + </sodipodi:namedview> 1.168 + <metadata 1.169 + id="metadata5976"> 1.170 + <rdf:RDF> 1.171 + <cc:Work 1.172 + rdf:about=""> 1.173 + <dc:format>image/svg+xml</dc:format> 1.174 + <dc:type 1.175 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 1.176 + </cc:Work> 1.177 + </rdf:RDF> 1.178 + </metadata> 1.179 + <g 1.180 + inkscape:label="Layer 1" 1.181 + inkscape:groupmode="layer" 1.182 + id="layer1"> 1.183 + <rect 1.184 + y="246.06918" 1.185 + x="64.325172" 1.186 + height="204.26233" 1.187 + width="333.2135" 1.188 + id="rect6047" 1.189 + style="fill:url(#linearGradient6974);fill-opacity:1;stroke:#686868;stroke-width:0.91925466;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 1.190 + <g 1.191 + id="g6976" 1.192 + transform="translate(70,0)"> 1.193 + <rect 1.194 + y="327.9104" 1.195 + x="40.113693" 1.196 + height="44.537449" 1.197 + width="134.53746" 1.198 + id="rect6004" 1.199 + style="fill:#d4d4d4;fill-opacity:1;stroke:black;stroke-width:0.7482574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.49651474, 0.74825737;stroke-dashoffset:0;stroke-opacity:1" /> 1.200 + <text 1.201 + id="text6006" 1.202 + y="353.67111" 1.203 + x="62.654205" 1.204 + 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.205 + xml:space="preserve"><tspan 1.206 + style="font-family:Courier" 1.207 + y="353.67111" 1.208 + x="62.654205" 1.209 + id="tspan6008" 1.210 + sodipodi:role="line">7b064d8bac5e</tspan></text> 1.211 + </g> 1.212 + <path 1.213 + inkscape:connector-type="polyline" 1.214 + id="path6020" 1.215 + d="M 160.92915,311.15532 L 167.83571,327.53627" 1.216 + 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;display:inline" 1.217 + inkscape:connection-end="#g6976" 1.218 + inkscape:connection-start="#g1935" /> 1.219 + <rect 1.220 + style="fill:#ededed;fill-opacity:1;stroke:#797979;stroke-width:0.74800003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 1.221 + id="rect6039" 1.222 + width="134.53746" 1.223 + height="44.537449" 1.224 + x="110.11359" 1.225 + y="389.57703" /> 1.226 + <text 1.227 + xml:space="preserve" 1.228 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#979797;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 1.229 + x="134.79706" 1.230 + y="415.33771" 1.231 + id="text6041"><tspan 1.232 + sodipodi:role="line" 1.233 + id="tspan6043" 1.234 + x="134.79706" 1.235 + y="415.33771" 1.236 + style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> 1.237 + <path 1.238 + inkscape:connection-end="#rect6039" 1.239 + inkscape:connector-type="polyline" 1.240 + id="path6045" 1.241 + d="M 177.38238,372.82195 L 177.38235,389.20303" 1.242 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#686868;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" /> 1.243 + <rect 1.244 + y="245.94225" 1.245 + x="447.28412" 1.246 + height="204.51619" 1.247 + width="174.36833" 1.248 + id="rect6140" 1.249 + style="fill:url(#linearGradient6996);fill-opacity:1;stroke:#686868;stroke-width:0.66539276;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 1.250 + <g 1.251 + id="g6130" 1.252 + transform="translate(152.3254,24.38544)"> 1.253 + <rect 1.254 + style="fill:#d4d4d4;fill-opacity:1;stroke:black;stroke-width:0.7482574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.49651474, 0.74825737;stroke-dashoffset:0;stroke-opacity:1" 1.255 + id="rect6106" 1.256 + width="134.53746" 1.257 + height="44.537449" 1.258 + x="314.87415" 1.259 + y="257.95059" /> 1.260 + <text 1.261 + xml:space="preserve" 1.262 + 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.263 + x="339.55664" 1.264 + y="283.7113" 1.265 + id="text6108"><tspan 1.266 + sodipodi:role="line" 1.267 + id="tspan6110" 1.268 + x="339.55664" 1.269 + y="283.7113" 1.270 + style="font-family:Courier">ffb20e1701ea</tspan></text> 1.271 + </g> 1.272 + <g 1.273 + id="g6135" 1.274 + transform="translate(153.0396,49.83106)"> 1.275 + <rect 1.276 + inkscape:transform-center-y="102.85714" 1.277 + inkscape:transform-center-x="129.28571" 1.278 + style="fill:#d4d4d4;fill-opacity:1;stroke:#797979;stroke-width:0.74800003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 1.279 + id="rect6112" 1.280 + width="134.53746" 1.281 + height="44.537449" 1.282 + x="314.15985" 1.283 + y="326.52203" /> 1.284 + <text 1.285 + inkscape:transform-center-y="102.7311" 1.286 + inkscape:transform-center-x="128.69672" 1.287 + xml:space="preserve" 1.288 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#979797;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 1.289 + x="338.84335" 1.290 + y="352.28271" 1.291 + id="text6114"><tspan 1.292 + sodipodi:role="line" 1.293 + id="tspan6116" 1.294 + x="338.84335" 1.295 + y="352.28271" 1.296 + style="fill:black;fill-opacity:1;font-family:Courier">e7639888bb2f</tspan></text> 1.297 + </g> 1.298 + <text 1.299 + xml:space="preserve" 1.300 + 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.301 + x="466.63208" 1.302 + y="270.479" 1.303 + id="text6118"><tspan 1.304 + sodipodi:role="line" 1.305 + id="tspan6120" 1.306 + x="466.63208" 1.307 + y="270.479">Primo genitore (invariato)</tspan></text> 1.308 + <text 1.309 + xml:space="preserve" 1.310 + 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.311 + x="466.07544" 1.312 + y="364.49615" 1.313 + id="text6122"><tspan 1.314 + sodipodi:role="line" 1.315 + id="tspan6124" 1.316 + x="466.07544" 1.317 + y="364.49615">Secondo genitore</tspan></text> 1.318 + <text 1.319 + xml:space="preserve" 1.320 + 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.321 + x="446.61743" 1.322 + y="231.36218" 1.323 + id="text6195"><tspan 1.324 + sodipodi:role="line" 1.325 + id="tspan6197" 1.326 + x="446.61743" 1.327 + y="231.36218">Genitori della directory di lavoro</tspan></text> 1.328 + <path 1.329 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" 1.330 + d="M 466.82542,300.21999 L 377.00207,294.39744" 1.331 + id="path6266" 1.332 + inkscape:connector-type="polyline" 1.333 + inkscape:connection-start="#g6130" 1.334 + inkscape:connection-end="#rect1925" /> 1.335 + <path 1.336 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 1.337 + d="M 665.12232,418.17579 L 665.12232,418.17579" 1.338 + id="path6270" 1.339 + inkscape:connector-type="polyline" /> 1.340 + <g 1.341 + id="g2845"> 1.342 + <rect 1.343 + y="266.24374" 1.344 + x="242.09048" 1.345 + height="44.537449" 1.346 + width="134.53746" 1.347 + id="rect1925" 1.348 + style="fill:#9f9f9f;fill-opacity:1;stroke:black;stroke-width:0.7482574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.49651474, 0.74825737;stroke-dashoffset:0;stroke-opacity:1" /> 1.349 + <text 1.350 + id="text1927" 1.351 + y="292.00446" 1.352 + x="266.77298" 1.353 + 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.354 + xml:space="preserve"><tspan 1.355 + style="font-family:Courier" 1.356 + y="292.00446" 1.357 + x="266.77298" 1.358 + id="tspan1929" 1.359 + sodipodi:role="line">ffb20e1701ea</tspan></text> 1.360 + </g> 1.361 + <path 1.362 + inkscape:connector-type="polyline" 1.363 + id="path1933" 1.364 + d="M 260.89978,311.15532 L 225.84185,327.53627" 1.365 + 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;display:inline" 1.366 + inkscape:connection-end="#g6976" /> 1.367 + <text 1.368 + xml:space="preserve" 1.369 + 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.370 + x="109.45568" 1.371 + y="231.4554" 1.372 + id="text2837"><tspan 1.373 + sodipodi:role="line" 1.374 + id="tspan2839" 1.375 + x="109.45568" 1.376 + y="231.4554">Testa preesistente</tspan></text> 1.377 + <text 1.378 + xml:space="preserve" 1.379 + 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.380 + x="237.54184" 1.381 + y="231.4554" 1.382 + id="text2841"><tspan 1.383 + sodipodi:role="line" 1.384 + id="tspan2843" 1.385 + x="237.54184" 1.386 + y="231.4554">Testa appena creata (e punta)</tspan></text> 1.387 + <path 1.388 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)" 1.389 + d="M 148.05048,235.87482 L 149.94915,265.86962" 1.390 + id="path2850" 1.391 + inkscape:connector-type="polyline" 1.392 + inkscape:connection-end="#g1935" /> 1.393 + <path 1.394 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)" 1.395 + d="M 303.83495,238.08453 L 306.87874,265.86962" 1.396 + id="path2852" 1.397 + inkscape:connector-type="polyline" 1.398 + inkscape:connection-end="#g2845" /> 1.399 + <path 1.400 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" 1.401 + d="M 466.82545,379.17944 L 219.0253,307.95488" 1.402 + id="path3016" 1.403 + inkscape:connector-type="polyline" 1.404 + inkscape:connection-start="#g6135" 1.405 + inkscape:connection-end="#g1935" /> 1.406 + <g 1.407 + id="g1935"> 1.408 + <rect 1.409 + y="266.24374" 1.410 + x="84.113708" 1.411 + height="44.537449" 1.412 + width="134.53746" 1.413 + id="rect5996" 1.414 + style="fill:#d4d4d4;fill-opacity:1;stroke:black;stroke-width:0.7482574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.49651474, 0.74825737;stroke-dashoffset:0;stroke-opacity:1" /> 1.415 + <text 1.416 + id="text5998" 1.417 + y="292.00446" 1.418 + x="108.7962" 1.419 + 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.420 + xml:space="preserve"><tspan 1.421 + style="font-family:Courier" 1.422 + y="292.00446" 1.423 + x="108.7962" 1.424 + id="tspan6000" 1.425 + sodipodi:role="line">e7639888bb2f</tspan></text> 1.426 + </g> 1.427 + </g> 1.428 +</svg>