Mercurial > hgbook
comparison es/tour-merge-merge.svg @ 432:04c08ad7e92e
Translated svgs dummy .tex towards building
author | Igor TAmara <igor@tamarapatino.org> |
---|---|
date | Sat, 18 Oct 2008 07:48:21 -0500 |
parents | |
children | 0abd3d78172e |
comparison
equal
deleted
inserted
replaced
431:d13a05515acf | 432:04c08ad7e92e |
---|---|
1 <?xml version="1.0" encoding="UTF-8" standalone="no"?> | |
2 <!-- Created with Inkscape (http://www.inkscape.org/) --> | |
3 <svg | |
4 xmlns:dc="http://purl.org/dc/elements/1.1/" | |
5 xmlns:cc="http://creativecommons.org/ns#" | |
6 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" | |
7 xmlns:svg="http://www.w3.org/2000/svg" | |
8 xmlns="http://www.w3.org/2000/svg" | |
9 xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" | |
10 xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" | |
11 width="744.09448819" | |
12 height="1052.3622047" | |
13 id="svg2" | |
14 sodipodi:version="0.32" | |
15 inkscape:version="0.46" | |
16 sodipodi:docname="tour-merge-merge.svg" | |
17 inkscape:output_extension="org.inkscape.output.svg.inkscape"> | |
18 <defs | |
19 id="defs4"> | |
20 <inkscape:perspective | |
21 sodipodi:type="inkscape:persp3d" | |
22 inkscape:vp_x="0 : 526.18109 : 1" | |
23 inkscape:vp_y="0 : 1000 : 0" | |
24 inkscape:vp_z="744.09448 : 526.18109 : 1" | |
25 inkscape:persp3d-origin="372.04724 : 350.78739 : 1" | |
26 id="perspective2928" /> | |
27 <marker | |
28 inkscape:stockid="Arrow1Mstart" | |
29 orient="auto" | |
30 refY="0.0" | |
31 refX="0.0" | |
32 id="Arrow1Mstart" | |
33 style="overflow:visible"> | |
34 <path | |
35 id="path2973" | |
36 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 " | |
37 style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" | |
38 transform="scale(0.4) translate(10,0)" /> | |
39 </marker> | |
40 <marker | |
41 inkscape:stockid="Arrow1Mend" | |
42 orient="auto" | |
43 refY="0.0" | |
44 refX="0.0" | |
45 id="Arrow1Mend" | |
46 style="overflow:visible;"> | |
47 <path | |
48 id="path3066" | |
49 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 " | |
50 style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" | |
51 transform="scale(0.4) rotate(180) translate(10,0)" /> | |
52 </marker> | |
53 </defs> | |
54 <sodipodi:namedview | |
55 id="base" | |
56 pagecolor="#ffffff" | |
57 bordercolor="#666666" | |
58 borderopacity="1.0" | |
59 gridtolerance="10000" | |
60 guidetolerance="10" | |
61 objecttolerance="10" | |
62 inkscape:pageopacity="0.0" | |
63 inkscape:pageshadow="2" | |
64 inkscape:zoom="0.98994949" | |
65 inkscape:cx="328.35015" | |
66 inkscape:cy="790.24518" | |
67 inkscape:document-units="px" | |
68 inkscape:current-layer="layer1" | |
69 inkscape:window-width="906" | |
70 inkscape:window-height="659" | |
71 inkscape:window-x="38" | |
72 inkscape:window-y="95" | |
73 showgrid="false" /> | |
74 <metadata | |
75 id="metadata7"> | |
76 <rdf:RDF> | |
77 <cc:Work | |
78 rdf:about=""> | |
79 <dc:format>image/svg+xml</dc:format> | |
80 <dc:type | |
81 rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> | |
82 </cc:Work> | |
83 </rdf:RDF> | |
84 </metadata> | |
85 <g | |
86 inkscape:label="Layer 1" | |
87 inkscape:groupmode="layer" | |
88 id="layer1"> | |
89 <rect | |
90 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" | |
91 id="rect2995" | |
92 width="94.285713" | |
93 height="20.714285" | |
94 x="532.85718" | |
95 y="203.0479" /> | |
96 <text | |
97 xml:space="preserve" | |
98 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" | |
99 x="173.57143" | |
100 y="443.79074" | |
101 id="text2832"><tspan | |
102 sodipodi:role="line" | |
103 id="tspan2834" | |
104 x="173.57143" | |
105 y="443.79074" /></text> | |
106 <rect | |
107 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" | |
108 id="rect2830" | |
109 width="94.285713" | |
110 height="20.714285" | |
111 x="138" | |
112 y="297.76227" /> | |
113 <text | |
114 xml:space="preserve" | |
115 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" | |
116 x="162.09892" | |
117 y="311.38342" | |
118 id="text2824"><tspan | |
119 sodipodi:role="line" | |
120 id="tspan2826" | |
121 x="162.09892" | |
122 y="311.38342" | |
123 style="font-family:Courier"><tspan | |
124 style="font-weight:bold" | |
125 id="tspan2862">4</tspan>: REV4</tspan></text> | |
126 <path | |
127 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" | |
128 d="M 185.14286,343.63731 L 185.14286,319.47656" | |
129 id="path2900" | |
130 inkscape:connector-type="polyline" /> | |
131 <rect | |
132 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" | |
133 id="rect2863" | |
134 width="94.285713" | |
135 height="20.714285" | |
136 x="91.428574" | |
137 y="250.47656" /> | |
138 <text | |
139 xml:space="preserve" | |
140 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" | |
141 x="116.09886" | |
142 y="264.56592" | |
143 id="text1965" | |
144 transform="scale(1.000002,0.999998)"><tspan | |
145 sodipodi:role="line" | |
146 id="tspan1967" | |
147 x="116.09886" | |
148 y="264.56592" | |
149 style="font-family:Courier"><tspan | |
150 style="font-weight:bold" | |
151 id="tspan1973">5</tspan>: REV_my_new_hello</tspan></text> | |
152 <path | |
153 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" | |
154 d="M 173.95727,296.76228 L 149.75702,272.19085" | |
155 id="path1971" | |
156 inkscape:connector-type="polyline" | |
157 inkscape:connection-end="#rect2863" | |
158 inkscape:connection-start="#rect2830" /> | |
159 <rect | |
160 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" | |
161 id="rect2911" | |
162 width="94.285995" | |
163 height="20.714283" | |
164 x="186.71414" | |
165 y="204.40514" /> | |
166 <text | |
167 xml:space="preserve" | |
168 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" | |
169 x="210.81311" | |
170 y="218.02673" | |
171 id="text2913" | |
172 transform="scale(1.000002,0.999998)"><tspan | |
173 sodipodi:role="line" | |
174 id="tspan2915" | |
175 x="210.81311" | |
176 y="218.02673" | |
177 style="font-family:Courier"><tspan | |
178 id="tspan1966" | |
179 style="font-weight:bold">6</tspan>: REV6_my_new_hello</tspan></text> | |
180 <path | |
181 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" | |
182 d="M 191.06908,296.76228 L 227.93092,226.11942" | |
183 id="path2919" | |
184 inkscape:connector-type="polyline" | |
185 inkscape:connection-start="#rect2830" /> | |
186 <text | |
187 xml:space="preserve" | |
188 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" | |
189 x="295.28571" | |
190 y="217.56711" | |
191 id="text2871"><tspan | |
192 sodipodi:role="line" | |
193 id="tspan2873" | |
194 x="295.28571" | |
195 y="217.56711">tip (and head)</tspan></text> | |
196 <text | |
197 xml:space="preserve" | |
198 style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" | |
199 x="76" | |
200 y="264.91769" | |
201 id="text2875"><tspan | |
202 sodipodi:role="line" | |
203 id="tspan2877" | |
204 x="76" | |
205 y="264.91769" | |
206 style="text-align:end;text-anchor:end">principal</tspan></text> | |
207 <rect | |
208 style="fill:#c8aaa5;fill-opacity:1;stroke:#a07163;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 4;stroke-dashoffset:0;stroke-opacity:1" | |
209 id="rect1913" | |
210 width="94.285713" | |
211 height="20.714285" | |
212 x="138" | |
213 y="156.90514" /> | |
214 <path | |
215 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1" | |
216 d="M 144.22399,249.47657 L 179.49029,178.61943" | |
217 id="path1915" | |
218 inkscape:connector-type="polyline" | |
219 inkscape:connection-start="#rect2863" | |
220 inkscape:connection-end="#rect1913" /> | |
221 <path | |
222 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1" | |
223 d="M 222.20966,203.40514 L 196.79033,178.61943" | |
224 id="path1917" | |
225 inkscape:connector-type="polyline" | |
226 inkscape:connection-start="#rect2911" | |
227 inkscape:connection-end="#rect1913" /> | |
228 <text | |
229 xml:space="preserve" | |
230 style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" | |
231 x="166.16823" | |
232 y="168.52228" | |
233 id="text2806"><tspan | |
234 sodipodi:role="line" | |
235 id="tspan2808" | |
236 x="166.16823" | |
237 y="168.52228" | |
238 style="font-family:Courier">fusión</tspan></text> | |
239 <text | |
240 xml:space="preserve" | |
241 style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" | |
242 x="246" | |
243 y="162.63338" | |
244 id="text2810"><tspan | |
245 sodipodi:role="line" | |
246 x="246" | |
247 y="162.63338" | |
248 id="tspan2814">directorio de trabajo</tspan><tspan | |
249 sodipodi:role="line" | |
250 x="246" | |
251 y="177.63338" | |
252 id="tspan3538">durante la fusión</tspan></text> | |
253 <rect | |
254 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" | |
255 id="rect2816" | |
256 width="94.285713" | |
257 height="20.714285" | |
258 x="483.14636" | |
259 y="297.76227" /> | |
260 <text | |
261 xml:space="preserve" | |
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:Courier" | |
263 x="507.24527" | |
264 y="311.38342" | |
265 id="text2818"><tspan | |
266 sodipodi:role="line" | |
267 id="tspan2820" | |
268 x="507.24527" | |
269 y="311.38342" | |
270 style="font-family:Courier"><tspan | |
271 style="font-weight:bold" | |
272 id="tspan2822">4</tspan>: REV4</tspan></text> | |
273 <path | |
274 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" | |
275 d="M 530.28921,343.6373 L 530.28921,319.47655" | |
276 id="path2824" | |
277 inkscape:connector-type="polyline" /> | |
278 <rect | |
279 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" | |
280 id="rect2826" | |
281 width="94.285713" | |
282 height="20.714285" | |
283 x="436.57492" | |
284 y="250.47656" /> | |
285 <text | |
286 xml:space="preserve" | |
287 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" | |
288 x="461.24484" | |
289 y="264.56613" | |
290 id="text2828" | |
291 transform="scale(1.000002,0.999998)"><tspan | |
292 sodipodi:role="line" | |
293 id="tspan2830" | |
294 x="461.24484" | |
295 y="264.56613" | |
296 style="font-family:Courier"><tspan | |
297 style="font-weight:bold" | |
298 id="tspan2832">5</tspan>: REV_my_new_hello</tspan></text> | |
299 <path | |
300 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" | |
301 d="M 519.10362,296.76227 L 494.90337,272.19084" | |
302 id="path2834" | |
303 inkscape:connector-type="polyline" /> | |
304 <rect | |
305 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" | |
306 id="rect2836" | |
307 width="94.285995" | |
308 height="20.714283" | |
309 x="483.14001" | |
310 y="156.548" /> | |
311 <text | |
312 xml:space="preserve" | |
313 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" | |
314 x="555.95911" | |
315 y="218.02698" | |
316 id="text2838" | |
317 transform="scale(1.000002,0.999998)"><tspan | |
318 sodipodi:role="line" | |
319 id="tspan2840" | |
320 x="555.95911" | |
321 y="218.02698" | |
322 style="font-family:Courier"><tspan | |
323 id="tspan2842" | |
324 style="font-weight:bold">6</tspan>: REV6_my_new_hello</tspan></text> | |
325 <path | |
326 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" | |
327 d="M 536.21543,296.76227 L 574.03453,224.76218" | |
328 id="path2844" | |
329 inkscape:connector-type="polyline" /> | |
330 <text | |
331 xml:space="preserve" | |
332 style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" | |
333 x="463.11224" | |
334 y="169.78796" | |
335 id="text2846"><tspan | |
336 sodipodi:role="line" | |
337 id="tspan2848" | |
338 x="463.11224" | |
339 y="169.78796">tip</tspan></text> | |
340 <path | |
341 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" | |
342 d="M 489.37034,249.47656 L 524.65575,178.26229" | |
343 id="path2856" | |
344 inkscape:connector-type="polyline" | |
345 inkscape:connection-end="#rect2836" /> | |
346 <path | |
347 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" | |
348 d="M 567.85714,202.0479 L 542.42591,178.26229" | |
349 id="path2858" | |
350 inkscape:connector-type="polyline" | |
351 inkscape:connection-end="#rect2836" | |
352 inkscape:connection-start="#rect2995" /> | |
353 <text | |
354 xml:space="preserve" | |
355 style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" | |
356 x="490.40295" | |
357 y="170.39714" | |
358 id="text2860"><tspan | |
359 sodipodi:role="line" | |
360 id="tspan2863" | |
361 x="490.40295" | |
362 y="170.39714" | |
363 style="font-family:Courier"><tspan | |
364 style="font-weight:bold" | |
365 id="tspan2997">7</tspan>: REV7_my_new_hello</tspan></text> | |
366 <text | |
367 xml:space="preserve" | |
368 style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" | |
369 x="90.323105" | |
370 y="120.21933" | |
371 id="text2929"><tspan | |
372 sodipodi:role="line" | |
373 id="tspan2931" | |
374 x="90.323105" | |
375 y="120.21933" | |
376 style="font-weight:bold">Directorio de trabajo durante la fusión</tspan></text> | |
377 <text | |
378 xml:space="preserve" | |
379 style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" | |
380 x="435.35226" | |
381 y="120.21933" | |
382 id="text2937"><tspan | |
383 sodipodi:role="line" | |
384 id="tspan2939" | |
385 x="435.35226" | |
386 y="120.21933" | |
387 style="font-weight:bold">Repositorio después de consignar la fusión</tspan></text> | |
388 </g> | |
389 </svg> |