Fossil SCM

Replace the last separate SVG file in branching.wiki with in-lin Pikchr. Also update pikchr.c to fix missing required whitespaces in the generated circle and ellipse markup.

drh 2020-09-10 17:18 trunk

Commit 9ec0ccee3357dcbcff5ce3499caf5a0e3529dc591d83023c629a68015f59625d

Parent bf01b42928e913f…

3 files changed +2 -2 -730 +35 -2

~ src/pikchr.c - www/branch05.svg ~ www/branching.wiki

M src/pikchr.c

+2 -2

		--- src/pikchr.c
		+++ src/pikchr.c
		@@ -3506,11 +3506,11 @@
3506	3506	PNum r = pElem->rad;
3507	3507	PPoint pt = pElem->ptAt;
3508	3508	if( pElem->sw>0.0 ){
3509	3509	pik_append_x(p,"<circle cx=\"", pt.x, "\"");
3510	3510	pik_append_y(p," cy=\"", pt.y, "\"");
3511		- pik_append_dis(p," r=\"", r, "\"");
	3511	+ pik_append_dis(p," r=\"", r, "\" ");
3512	3512	pik_append_style(p,pElem);
3513	3513	pik_append(p,"\" />\n", -1);
3514	3514	}
3515	3515	pik_append_txt(p, pElem);
3516	3516	}
		@@ -3634,11 +3634,11 @@
3634	3634	PPoint pt = pElem->ptAt;
3635	3635	if( pElem->sw>0.0 ){
3636	3636	pik_append_x(p,"<ellipse cx=\"", pt.x, "\"");
3637	3637	pik_append_y(p," cy=\"", pt.y, "\"");
3638	3638	pik_append_dis(p," rx=\"", w/2.0, "\"");
3639		- pik_append_dis(p," ry=\"", h/2.0, "\"");
	3639	+ pik_append_dis(p," ry=\"", h/2.0, "\" ");
3640	3640	pik_append_style(p,pElem);
3641	3641	pik_append(p,"\" />\n", -1);
3642	3642	}
3643	3643	pik_append_txt(p, pElem);
3644	3644	}
3645	3645
3646	3646	DELETED www/branch05.svg

	--- src/pikchr.c
	+++ src/pikchr.c
	@@ -3506,11 +3506,11 @@
3506	PNum r = pElem->rad;
3507	PPoint pt = pElem->ptAt;
3508	if( pElem->sw>0.0 ){
3509	pik_append_x(p,"<circle cx=\"", pt.x, "\"");
3510	pik_append_y(p," cy=\"", pt.y, "\"");
3511	pik_append_dis(p," r=\"", r, "\"");
3512	pik_append_style(p,pElem);
3513	pik_append(p,"\" />\n", -1);
3514	}
3515	pik_append_txt(p, pElem);
3516	}
	@@ -3634,11 +3634,11 @@
3634	PPoint pt = pElem->ptAt;
3635	if( pElem->sw>0.0 ){
3636	pik_append_x(p,"<ellipse cx=\"", pt.x, "\"");
3637	pik_append_y(p," cy=\"", pt.y, "\"");
3638	pik_append_dis(p," rx=\"", w/2.0, "\"");
3639	pik_append_dis(p," ry=\"", h/2.0, "\"");
3640	pik_append_style(p,pElem);
3641	pik_append(p,"\" />\n", -1);
3642	}
3643	pik_append_txt(p, pElem);
3644	}
3645
3646	ELETED www/branch05.svg

	--- src/pikchr.c
	+++ src/pikchr.c
	@@ -3506,11 +3506,11 @@
3506	PNum r = pElem->rad;
3507	PPoint pt = pElem->ptAt;
3508	if( pElem->sw>0.0 ){
3509	pik_append_x(p,"<circle cx=\"", pt.x, "\"");
3510	pik_append_y(p," cy=\"", pt.y, "\"");
3511	pik_append_dis(p," r=\"", r, "\" ");
3512	pik_append_style(p,pElem);
3513	pik_append(p,"\" />\n", -1);
3514	}
3515	pik_append_txt(p, pElem);
3516	}
	@@ -3634,11 +3634,11 @@
3634	PPoint pt = pElem->ptAt;
3635	if( pElem->sw>0.0 ){
3636	pik_append_x(p,"<ellipse cx=\"", pt.x, "\"");
3637	pik_append_y(p," cy=\"", pt.y, "\"");
3638	pik_append_dis(p," rx=\"", w/2.0, "\"");
3639	pik_append_dis(p," ry=\"", h/2.0, "\" ");
3640	pik_append_style(p,pElem);
3641	pik_append(p,"\" />\n", -1);
3642	}
3643	pik_append_txt(p, pElem);
3644	}
3645
3646	ELETED www/branch05.svg

D www/branch05.svg

-730

		--- a/www/branch05.svg
		+++ b/www/branch05.svg
		@@ -1,730 +0,0 @@
1		-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2		-<svg
3		- xmlns:dc="http://purl.org/dc/elements/1.1/"
4		- xmlns:cc="http://creativecommons.org/ns#"
5		- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
6		- xmlns:svg="http://www.w3.org/2000/svg"
7		- xmlns="http://www.w3.org/2000/svg"
8		- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
9		- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
10		- width="453.55252"
11		- stroke-miterlimit="10"
12		- font-weight="normal"
13		- height="184.5"
14		- font-style="normal"
15		- font-size="12px"
16		- id="svg172"
17		- version="1.1"
18		- inkscape:version="0.91 r13725"
19		- sodipodi:docname="branch05.svg"
20		- style="font-style:normal;font-weight:normal;font-size:12px;font-family:Dialog;color-interpolation:auto;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto">
21		- <metadata
22		- id="metadata392">
23		- <rdf:RDF>
24		- <cc:Work
25		- rdf:about="">
26		- <dc:format>image/svg+xml</dc:format>
27		- <dc:type
28		- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
29		- <dc:title></dc:title>
30		- </cc:Work>
31		- </rdf:RDF>
32		- </metadata>
33		- <sodipodi:namedview
34		- pagecolor="#ffffff"
35		- bordercolor="#666666"
36		- borderopacity="1"
37		- objecttolerance="10"
38		- gridtolerance="10"
39		- guidetolerance="10"
40		- inkscape:pageopacity="0"
41		- inkscape:pageshadow="2"
42		- inkscape:window-width="640"
43		- inkscape:window-height="480"
44		- id="namedview390"
45		- showgrid="false"
46		- fit-margin-top="0"
47		- fit-margin-left="0"
48		- fit-margin-right="0"
49		- fit-margin-bottom="0"
50		- inkscape:zoom="0.17717718"
51		- inkscape:cx="226.18549"
52		- inkscape:cy="91.9639"
53		- inkscape:window-x="0"
54		- inkscape:window-y="0"
55		- inkscape:window-maximized="0"
56		- inkscape:current-layer="svg172" />
57		- <!--Generated by ySVG 2.5-->
58		- <defs
59		- id="genericDefs" />
60		- <g
61		- id="g175"
62		- transform="translate(-141.31451,-573.4639)">
63		- <defs
64		- id="defs1">
65		- <clipPath
66		- clipPathUnits="userSpaceOnUse"
67		- id="clipPath1">
68		- <path
69		- d="M 0,0 735,0 735,1332 0,1332 0,0 Z"
70		- id="path179"
71		- inkscape:connector-curvature="0" />
72		- </clipPath>
73		- <clipPath
74		- clipPathUnits="userSpaceOnUse"
75		- id="clipPath2">
76		- <path
77		- d="m 10,-813 735,0 0,1332 -735,0 0,-1332 z"
78		- id="path182"
79		- inkscape:connector-curvature="0" />
80		- </clipPath>
81		- </defs>
82		- <g
83		- transform="translate(-10,813)"
84		- id="g184"
85		- style="fill:#9accfc;stroke:#9accfc;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
86		- <rect
87		- x="278.8833"
88		- width="298.8667"
89		- height="46"
90		- y="-198.5361"
91		- clip-path="url(#clipPath2)"
92		- id="rect186"
93		- style="stroke:none" />
94		- </g>
95		- <g
96		- transform="translate(-10,813)"
97		- stroke-miterlimit="1.45"
98		- id="g188"
99		- style="fill:#7ca5cc;stroke:#7ca5cc;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
100		- <rect
101		- x="278.8833"
102		- width="298.8667"
103		- height="46"
104		- y="-198.5361"
105		- clip-path="url(#clipPath2)"
106		- id="rect190"
107		- style="fill:none" />
108		- <text
109		- x="417.427"
110		- y="-134.9346"
111		- clip-path="url(#clipPath2)"
112		- xml:space="preserve"
113		- id="text192"
114		- style="font-family:sans-serif;fill:#000000;stroke:none">test</text>
115		- </g>
116		- <g
117		- transform="translate(-10,813)"
118		- id="g194"
119		- style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
120		- <circle
121		- r="15"
122		- clip-path="url(#clipPath2)"
123		- cx="206.75"
124		- cy="-223.5361"
125		- id="circle196"
126		- style="stroke:none" />
127		- </g>
128		- <g
129		- stroke-miterlimit="1.45"
130		- transform="translate(-10,813)"
131		- id="g198"
132		- style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
133		- <circle
134		- r="15"
135		- clip-path="url(#clipPath2)"
136		- cx="206.75"
137		- cy="-223.5361"
138		- id="circle200"
139		- style="fill:none" />
140		- <text
141		- x="202.9561"
142		- y="-219.00101"
143		- clip-path="url(#clipPath2)"
144		- xml:space="preserve"
145		- id="text202"
146		- style="font-family:sans-serif;stroke:none;stroke-width:1">1</text>
147		- </g>
148		- <g
149		- transform="translate(-10,813)"
150		- id="g204"
151		- style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
152		- <circle
153		- r="15"
154		- clip-path="url(#clipPath2)"
155		- cx="266.75"
156		- cy="-223.5361"
157		- id="circle206"
158		- style="stroke:none" />
159		- </g>
160		- <g
161		- stroke-miterlimit="1.45"
162		- transform="translate(-10,813)"
163		- id="g208"
164		- style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
165		- <circle
166		- r="15"
167		- clip-path="url(#clipPath2)"
168		- cx="266.75"
169		- cy="-223.5361"
170		- id="circle210"
171		- style="fill:none" />
172		- <text
173		- x="262.95609"
174		- y="-219.00101"
175		- clip-path="url(#clipPath2)"
176		- xml:space="preserve"
177		- id="text212"
178		- style="font-family:sans-serif;stroke:none;stroke-width:1">2</text>
179		- </g>
180		- <g
181		- transform="translate(-10,813)"
182		- id="g214"
183		- style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
184		- <circle
185		- r="15"
186		- clip-path="url(#clipPath2)"
187		- cx="326.75"
188		- cy="-223.5361"
189		- id="circle216"
190		- style="stroke:none" />
191		- </g>
192		- <g
193		- stroke-miterlimit="1.45"
194		- transform="translate(-10,813)"
195		- id="g218"
196		- style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
197		- <circle
198		- r="15"
199		- clip-path="url(#clipPath2)"
200		- cx="326.75"
201		- cy="-223.5361"
202		- id="circle220"
203		- style="fill:none" />
204		- <text
205		- x="322.95609"
206		- y="-219.00101"
207		- clip-path="url(#clipPath2)"
208		- xml:space="preserve"
209		- id="text222"
210		- style="font-family:sans-serif;stroke:none;stroke-width:1">3</text>
211		- </g>
212		- <g
213		- transform="translate(-10,813)"
214		- id="g224"
215		- style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
216		- <circle
217		- r="15"
218		- clip-path="url(#clipPath2)"
219		- cx="325.75"
220		- cy="-176.5361"
221		- id="circle226"
222		- style="stroke:none" />
223		- </g>
224		- <g
225		- stroke-miterlimit="1.45"
226		- transform="translate(-10,813)"
227		- id="g228"
228		- style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
229		- <circle
230		- r="15"
231		- clip-path="url(#clipPath2)"
232		- cx="325.75"
233		- cy="-176.5361"
234		- id="circle230"
235		- style="fill:none" />
236		- <text
237		- x="321.95609"
238		- y="-172.00101"
239		- clip-path="url(#clipPath2)"
240		- xml:space="preserve"
241		- id="text232"
242		- style="font-family:sans-serif;stroke:none;stroke-width:1">4</text>
243		- </g>
244		- <g
245		- transform="translate(-10,813)"
246		- id="g234"
247		- style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
248		- <circle
249		- r="15"
250		- clip-path="url(#clipPath2)"
251		- cx="385.75"
252		- cy="-223.5361"
253		- id="circle236"
254		- style="stroke:none" />
255		- </g>
256		- <g
257		- stroke-miterlimit="1.45"
258		- transform="translate(-10,813)"
259		- id="g238"
260		- style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
261		- <circle
262		- r="15"
263		- clip-path="url(#clipPath2)"
264		- cx="385.75"
265		- cy="-223.5361"
266		- id="circle240"
267		- style="fill:none" />
268		- <text
269		- x="381.95609"
270		- y="-219.00101"
271		- clip-path="url(#clipPath2)"
272		- xml:space="preserve"
273		- id="text242"
274		- style="font-family:sans-serif;stroke:none;stroke-width:1">5</text>
275		- </g>
276		- <g
277		- transform="translate(-10,813)"
278		- id="g244"
279		- style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
280		- <circle
281		- r="15"
282		- clip-path="url(#clipPath2)"
283		- cx="444.75"
284		- cy="-223.5361"
285		- id="circle246"
286		- style="stroke:none" />
287		- </g>
288		- <g
289		- stroke-miterlimit="1.45"
290		- transform="translate(-10,813)"
291		- id="g248"
292		- style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
293		- <circle
294		- r="15"
295		- clip-path="url(#clipPath2)"
296		- cx="444.75"
297		- cy="-223.5361"
298		- id="circle250"
299		- style="fill:none" />
300		- <text
301		- x="440.95609"
302		- y="-219.00101"
303		- clip-path="url(#clipPath2)"
304		- xml:space="preserve"
305		- id="text252"
306		- style="font-family:sans-serif;stroke:none;stroke-width:1">7</text>
307		- </g>
308		- <g
309		- transform="translate(-10,813)"
310		- id="g254"
311		- style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
312		- <circle
313		- r="15"
314		- clip-path="url(#clipPath2)"
315		- cx="503.75"
316		- cy="-223.5361"
317		- id="circle256"
318		- style="stroke:none" />
319		- </g>
320		- <g
321		- stroke-miterlimit="1.45"
322		- transform="translate(-10,813)"
323		- id="g258"
324		- style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
325		- <circle
326		- r="15"
327		- clip-path="url(#clipPath2)"
328		- cx="503.75"
329		- cy="-223.5361"
330		- id="circle260"
331		- style="fill:none" />
332		- <text
333		- x="499.95609"
334		- y="-219.00101"
335		- clip-path="url(#clipPath2)"
336		- xml:space="preserve"
337		- id="text262"
338		- style="font-family:sans-serif;stroke:none;stroke-width:1">8</text>
339		- </g>
340		- <g
341		- transform="translate(-10,813)"
342		- id="g264"
343		- style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
344		- <circle
345		- r="15"
346		- clip-path="url(#clipPath2)"
347		- cx="562.75"
348		- cy="-223.5361"
349		- id="circle266"
350		- style="stroke:none" />
351		- </g>
352		- <g
353		- stroke-miterlimit="1.45"
354		- transform="translate(-10,813)"
355		- id="g268"
356		- style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
357		- <circle
358		- r="15"
359		- clip-path="url(#clipPath2)"
360		- cx="562.75"
361		- cy="-223.5361"
362		- id="circle270"
363		- style="fill:none" />
364		- <text
365		- x="555.16211"
366		- y="-219.00101"
367		- clip-path="url(#clipPath2)"
368		- xml:space="preserve"
369		- id="text272"
370		- style="font-family:sans-serif;stroke:none;stroke-width:1">10</text>
371		- </g>
372		- <g
373		- transform="translate(-10,813)"
374		- id="g274"
375		- style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
376		- <circle
377		- r="15"
378		- clip-path="url(#clipPath2)"
379		- cx="415.75"
380		- cy="-176.5361"
381		- id="circle276"
382		- style="stroke:none" />
383		- </g>
384		- <g
385		- stroke-miterlimit="1.45"
386		- transform="translate(-10,813)"
387		- id="g278"
388		- style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
389		- <circle
390		- r="15"
391		- clip-path="url(#clipPath2)"
392		- cx="415.75"
393		- cy="-176.5361"
394		- id="circle280"
395		- style="fill:none" />
396		- <text
397		- x="411.95609"
398		- y="-172.00101"
399		- clip-path="url(#clipPath2)"
400		- xml:space="preserve"
401		- id="text282"
402		- style="font-family:sans-serif;stroke:none;stroke-width:1">6</text>
403		- </g>
404		- <g
405		- transform="translate(-10,813)"
406		- id="g284"
407		- style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
408		- <circle
409		- r="15"
410		- clip-path="url(#clipPath2)"
411		- cx="533.75"
412		- cy="-176.5361"
413		- id="circle286"
414		- style="stroke:none" />
415		- </g>
416		- <g
417		- stroke-miterlimit="1.45"
418		- transform="translate(-10,813)"
419		- id="g288"
420		- style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
421		- <circle
422		- r="15"
423		- clip-path="url(#clipPath2)"
424		- cx="533.75"
425		- cy="-176.5361"
426		- id="circle290"
427		- style="fill:none" />
428		- <text
429		- x="529.95612"
430		- y="-172.00101"
431		- clip-path="url(#clipPath2)"
432		- xml:space="preserve"
433		- id="text292"
434		- style="font-family:sans-serif;stroke:none;stroke-width:1">9</text>
435		- </g>
436		- <g
437		- transform="translate(-10,813)"
438		- id="g294"
439		- style="fill:#d8d8d8;stroke:#d8d8d8;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
440		- <path
441		- d="m 151.75,-178.5361 99,0 11,19.5 -11,19.5 -99,0 11,-19.5 z"
442		- clip-path="url(#clipPath2)"
443		- id="path296"
444		- inkscape:connector-curvature="0"
445		- style="fill-rule:evenodd;stroke:none" />
446		- </g>
447		- <g
448		- stroke-miterlimit="1.45"
449		- transform="translate(-10,813)"
450		- id="g298"
451		- style="stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
452		- <path
453		- d="m 151.75,-178.5361 99,0 11,19.5 -11,19.5 -99,0 11,-19.5 z"
454		- clip-path="url(#clipPath2)"
455		- id="path300"
456		- inkscape:connector-curvature="0"
457		- style="fill:none;fill-rule:evenodd" />
458		- <text
459		- x="166.2617"
460		- xml:space="preserve"
461		- y="-161.5674"
462		- clip-path="url(#clipPath2)"
463		- id="text302"
464		- style="font-family:sans-serif;stroke:none">branch=trunk</text>
465		- <text
466		- x="175.83009"
467		- xml:space="preserve"
468		- y="-147.4346"
469		- clip-path="url(#clipPath2)"
470		- id="text304"
471		- style="font-family:sans-serif;stroke:none">sym-trunk</text>
472		- </g>
473		- <g
474		- transform="translate(-10,813)"
475		- id="g306"
476		- style="fill:#d8d8d8;stroke:#d8d8d8;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
477		- <path
478		- d="m 254.5,-122.5361 128.25,0 14.25,33.5 -14.25,33.5 -128.25,0 14.25,-33.5 z"
479		- clip-path="url(#clipPath2)"
480		- id="path308"
481		- inkscape:connector-curvature="0"
482		- style="fill-rule:evenodd;stroke:none" />
483		- </g>
484		- <g
485		- stroke-miterlimit="1.45"
486		- transform="translate(-10,813)"
487		- id="g310"
488		- style="stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
489		- <path
490		- d="m 254.5,-122.5361 128.25,0 14.25,33.5 -14.25,33.5 -128.25,0 14.25,-33.5 z"
491		- clip-path="url(#clipPath2)"
492		- id="path312"
493		- inkscape:connector-curvature="0"
494		- style="fill:none;fill-rule:evenodd" />
495		- <text
496		- x="290.02539"
497		- xml:space="preserve"
498		- y="-105.7002"
499		- clip-path="url(#clipPath2)"
500		- id="text314"
501		- style="font-family:sans-serif;stroke:none">branch=test</text>
502		- <text
503		- x="299.59381"
504		- xml:space="preserve"
505		- y="-91.567398"
506		- clip-path="url(#clipPath2)"
507		- id="text316"
508		- style="font-family:sans-serif;stroke:none">sym-test</text>
509		- <text
510		- x="286.25201"
511		- xml:space="preserve"
512		- y="-77.434601"
513		- clip-path="url(#clipPath2)"
514		- id="text318"
515		- style="font-family:sans-serif;stroke:none">bgcolor=blue</text>
516		- <text
517		- x="271.7998"
518		- xml:space="preserve"
519		- y="-63.3018"
520		- clip-path="url(#clipPath2)"
521		- id="text320"
522		- style="font-family:sans-serif;stroke:none">cancel=sym-trunk</text>
523		- </g>
524		- <g
525		- transform="translate(-10,813)"
526		- id="g322"
527		- style="fill:#d8d8d8;stroke:#d8d8d8;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
528		- <path
529		- d="m 463.25,-117.5361 126.9,0 14.1,19.5 -14.1,19.5 -126.9,0 14.1,-19.5 z"
530		- clip-path="url(#clipPath2)"
531		- id="path324"
532		- inkscape:connector-curvature="0"
533		- style="fill-rule:evenodd;stroke:none" />
534		- </g>
535		- <g
536		- stroke-miterlimit="1.45"
537		- transform="translate(-10,813)"
538		- id="g326"
539		- style="stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
540		- <path
541		- d="m 463.25,-117.5361 126.9,0 14.1,19.5 -14.1,19.5 -126.9,0 14.1,-19.5 z"
542		- clip-path="url(#clipPath2)"
543		- id="path328"
544		- inkscape:connector-curvature="0"
545		- style="fill:none;fill-rule:evenodd" />
546		- <text
547		- x="484.93549"
548		- xml:space="preserve"
549		- y="-100.5674"
550		- clip-path="url(#clipPath2)"
551		- id="text330"
552		- style="font-family:sans-serif;stroke:none">sym-release-1.0</text>
553		- <text
554		- x="515.0791"
555		- xml:space="preserve"
556		- y="-86.434601"
557		- clip-path="url(#clipPath2)"
558		- id="text332"
559		- style="font-family:sans-serif;stroke:none">closed</text>
560		- <path
561		- d="m 221.75,-223.5361 22,0"
562		- clip-path="url(#clipPath2)"
563		- id="path334"
564		- inkscape:connector-curvature="0"
565		- style="fill:none" />
566		- <path
567		- d="m 251.75,-223.5361 -12,-5 3,5 -3,5 z"
568		- clip-path="url(#clipPath2)"
569		- id="path336"
570		- inkscape:connector-curvature="0"
571		- style="stroke:none" />
572		- <path
573		- d="m 281.75,-223.5361 22,0"
574		- clip-path="url(#clipPath2)"
575		- id="path338"
576		- inkscape:connector-curvature="0"
577		- style="fill:none" />
578		- <path
579		- d="m 311.75,-223.5361 -12,-5 3,5 -3,5 z"
580		- clip-path="url(#clipPath2)"
581		- id="path340"
582		- inkscape:connector-curvature="0"
583		- style="stroke:none" />
584		- <path
585		- d="m 278.4824,-214.19 29.2779,23.3231"
586		- clip-path="url(#clipPath2)"
587		- id="path342"
588		- inkscape:connector-curvature="0"
589		- style="fill:none" />
590		- <path
591		- d="m 314.0176,-185.8823 -6.2705,-11.3877 -0.7689,5.78 -5.4619,2.0416 z"
592		- clip-path="url(#clipPath2)"
593		- id="path344"
594		- inkscape:connector-curvature="0"
595		- style="stroke:none" />
596		- <path
597		- d="m 341.75,-223.5361 21,0"
598		- clip-path="url(#clipPath2)"
599		- id="path346"
600		- inkscape:connector-curvature="0"
601		- style="fill:none" />
602		- <path
603		- d="m 370.75,-223.5361 -12,-5 3,5 -3,5 z"
604		- clip-path="url(#clipPath2)"
605		- id="path348"
606		- inkscape:connector-curvature="0"
607		- style="stroke:none" />
608		- <path
609		- d="m 400.75,-223.5361 21,0"
610		- clip-path="url(#clipPath2)"
611		- id="path350"
612		- inkscape:connector-curvature="0"
613		- style="fill:none" />
614		- <path
615		- d="m 429.75,-223.5361 -12,-5 3,5 -3,5 z"
616		- clip-path="url(#clipPath2)"
617		- id="path352"
618		- inkscape:connector-curvature="0"
619		- style="stroke:none" />
620		- <path
621		- d="m 459.75,-223.5361 21,0"
622		- clip-path="url(#clipPath2)"
623		- id="path354"
624		- inkscape:connector-curvature="0"
625		- style="fill:none" />
626		- <path
627		- d="m 488.75,-223.5361 -12,-5 3,5 -3,5 z"
628		- clip-path="url(#clipPath2)"
629		- id="path356"
630		- inkscape:connector-curvature="0"
631		- style="stroke:none" />
632		- <path
633		- d="m 518.75,-223.5361 21,0"
634		- clip-path="url(#clipPath2)"
635		- id="path358"
636		- inkscape:connector-curvature="0"
637		- style="fill:none" />
638		- <path
639		- d="m 547.75,-223.5361 -12,-5 3,5 -3,5 z"
640		- clip-path="url(#clipPath2)"
641		- id="path360"
642		- inkscape:connector-curvature="0"
643		- style="stroke:none" />
644		- <path
645		- d="m 340.75,-176.5361 52,0"
646		- clip-path="url(#clipPath2)"
647		- id="path362"
648		- inkscape:connector-curvature="0"
649		- style="fill:none" />
650		- <path
651		- d="m 400.75,-176.5361 -12,-5 3,5 -3,5 z"
652		- clip-path="url(#clipPath2)"
653		- id="path364"
654		- inkscape:connector-curvature="0"
655		- style="stroke:none" />
656		- <path
657		- d="m 423.6266,-189.3017 9.0459,-14.6606"
658		- clip-path="url(#clipPath2)"
659		- id="path366"
660		- inkscape:connector-curvature="0"
661		- style="fill:none;stroke-dasharray:6, 2" />
662		- <path
663		- d="m 436.8734,-210.7706 -10.5565,7.5869 5.8305,0.0724 2.6799,5.1787 z"
664		- clip-path="url(#clipPath2)"
665		- id="path368"
666		- inkscape:connector-curvature="0"
667		- style="stroke:none;stroke-dasharray:6, 2" />
668		- <path
669		- d="m 430.75,-176.5361 80,0"
670		- clip-path="url(#clipPath2)"
671		- id="path370"
672		- inkscape:connector-curvature="0"
673		- style="fill:none" />
674		- <path
675		- d="m 518.75,-176.5361 -12,-5 3,5 -3,5 z"
676		- clip-path="url(#clipPath2)"
677		- id="path372"
678		- inkscape:connector-curvature="0"
679		- style="stroke:none" />
680		- <path
681		- d="m 541.6266,-189.3017 9.0459,-14.6606"
682		- clip-path="url(#clipPath2)"
683		- id="path374"
684		- inkscape:connector-curvature="0"
685		- style="fill:none;stroke-dasharray:6, 2" />
686		- <path
687		- d="m 554.8734,-210.7706 -10.5564,7.5869 5.8305,0.0724 2.6798,5.1787 z"
688		- clip-path="url(#clipPath2)"
689		- id="path376"
690		- inkscape:connector-curvature="0"
691		- style="stroke:none;stroke-dasharray:6, 2" />
692		- <path
693		- d="m 206.75,-178.531 0,-22.0051"
694		- clip-path="url(#clipPath2)"
695		- id="path378"
696		- inkscape:connector-curvature="0"
697		- style="fill:none" />
698		- <path
699		- d="m 206.75,-208.5361 -5,12 5,-3 5,3 z"
700		- clip-path="url(#clipPath2)"
701		- id="path380"
702		- inkscape:connector-curvature="0"
703		- style="stroke:none" />
704		- <path
705		- d="m 325.75,-122.575 0,-30.9611"
706		- clip-path="url(#clipPath2)"
707		- id="path382"
708		- inkscape:connector-curvature="0"
709		- style="fill:none" />
710		- <path
711		- d="m 325.75,-161.5361 -5,12 5,-3 5,3 z"
712		- clip-path="url(#clipPath2)"
713		- id="path384"
714		- inkscape:connector-curvature="0"
715		- style="stroke:none" />
716		- <path
717		- d="m 533.75,-117.5461 0,-35.99"
718		- clip-path="url(#clipPath2)"
719		- id="path386"
720		- inkscape:connector-curvature="0"
721		- style="fill:none" />
722		- <path
723		- d="m 533.75,-161.5361 -5,12 5,-3 5,3 z"
724		- clip-path="url(#clipPath2)"
725		- id="path388"
726		- inkscape:connector-curvature="0"
727		- style="stroke:none" />
728		- </g>
729		- </g>
730		-</svg>

	--- a/www/branch05.svg
	+++ b/www/branch05.svg
	@@ -1,730 +0,0 @@
1	<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2	<svg
3	xmlns:dc="http://purl.org/dc/elements/1.1/"
4	xmlns:cc="http://creativecommons.org/ns#"
5	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
6	xmlns:svg="http://www.w3.org/2000/svg"
7	xmlns="http://www.w3.org/2000/svg"
8	xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
9	xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
10	width="453.55252"
11	stroke-miterlimit="10"
12	font-weight="normal"
13	height="184.5"
14	font-style="normal"
15	font-size="12px"
16	id="svg172"
17	version="1.1"
18	inkscape:version="0.91 r13725"
19	sodipodi:docname="branch05.svg"
20	style="font-style:normal;font-weight:normal;font-size:12px;font-family:Dialog;color-interpolation:auto;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto">
21	<metadata
22	id="metadata392">
23	<rdf:RDF>
24	<cc:Work
25	rdf:about="">
26	<dc:format>image/svg+xml</dc:format>
27	<dc:type
28	rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
29	<dc:title></dc:title>
30	</cc:Work>
31	</rdf:RDF>
32	</metadata>
33	<sodipodi:namedview
34	pagecolor="#ffffff"
35	bordercolor="#666666"
36	borderopacity="1"
37	objecttolerance="10"
38	gridtolerance="10"
39	guidetolerance="10"
40	inkscape:pageopacity="0"
41	inkscape:pageshadow="2"
42	inkscape:window-width="640"
43	inkscape:window-height="480"
44	id="namedview390"
45	showgrid="false"
46	fit-margin-top="0"
47	fit-margin-left="0"
48	fit-margin-right="0"
49	fit-margin-bottom="0"
50	inkscape:zoom="0.17717718"
51	inkscape:cx="226.18549"
52	inkscape:cy="91.9639"
53	inkscape:window-x="0"
54	inkscape:window-y="0"
55	inkscape:window-maximized="0"
56	inkscape:current-layer="svg172" />
57	<!--Generated by ySVG 2.5-->
58	<defs
59	id="genericDefs" />
60	<g
61	id="g175"
62	transform="translate(-141.31451,-573.4639)">
63	<defs
64	id="defs1">
65	<clipPath
66	clipPathUnits="userSpaceOnUse"
67	id="clipPath1">
68	<path
69	d="M 0,0 735,0 735,1332 0,1332 0,0 Z"
70	id="path179"
71	inkscape:connector-curvature="0" />
72	</clipPath>
73	<clipPath
74	clipPathUnits="userSpaceOnUse"
75	id="clipPath2">
76	<path
77	d="m 10,-813 735,0 0,1332 -735,0 0,-1332 z"
78	id="path182"
79	inkscape:connector-curvature="0" />
80	</clipPath>
81	</defs>
82	<g
83	transform="translate(-10,813)"
84	id="g184"
85	style="fill:#9accfc;stroke:#9accfc;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
86	<rect
87	x="278.8833"
88	width="298.8667"
89	height="46"
90	y="-198.5361"
91	clip-path="url(#clipPath2)"
92	id="rect186"
93	style="stroke:none" />
94	</g>
95	<g
96	transform="translate(-10,813)"
97	stroke-miterlimit="1.45"
98	id="g188"
99	style="fill:#7ca5cc;stroke:#7ca5cc;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
100	<rect
101	x="278.8833"
102	width="298.8667"
103	height="46"
104	y="-198.5361"
105	clip-path="url(#clipPath2)"
106	id="rect190"
107	style="fill:none" />
108	<text
109	x="417.427"
110	y="-134.9346"
111	clip-path="url(#clipPath2)"
112	xml:space="preserve"
113	id="text192"
114	style="font-family:sans-serif;fill:#000000;stroke:none">test</text>
115	</g>
116	<g
117	transform="translate(-10,813)"
118	id="g194"
119	style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
120	<circle
121	r="15"
122	clip-path="url(#clipPath2)"
123	cx="206.75"
124	cy="-223.5361"
125	id="circle196"
126	style="stroke:none" />
127	</g>
128	<g
129	stroke-miterlimit="1.45"
130	transform="translate(-10,813)"
131	id="g198"
132	style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
133	<circle
134	r="15"
135	clip-path="url(#clipPath2)"
136	cx="206.75"
137	cy="-223.5361"
138	id="circle200"
139	style="fill:none" />
140	<text
141	x="202.9561"
142	y="-219.00101"
143	clip-path="url(#clipPath2)"
144	xml:space="preserve"
145	id="text202"
146	style="font-family:sans-serif;stroke:none;stroke-width:1">1</text>
147	</g>
148	<g
149	transform="translate(-10,813)"
150	id="g204"
151	style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
152	<circle
153	r="15"
154	clip-path="url(#clipPath2)"
155	cx="266.75"
156	cy="-223.5361"
157	id="circle206"
158	style="stroke:none" />
159	</g>
160	<g
161	stroke-miterlimit="1.45"
162	transform="translate(-10,813)"
163	id="g208"
164	style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
165	<circle
166	r="15"
167	clip-path="url(#clipPath2)"
168	cx="266.75"
169	cy="-223.5361"
170	id="circle210"
171	style="fill:none" />
172	<text
173	x="262.95609"
174	y="-219.00101"
175	clip-path="url(#clipPath2)"
176	xml:space="preserve"
177	id="text212"
178	style="font-family:sans-serif;stroke:none;stroke-width:1">2</text>
179	</g>
180	<g
181	transform="translate(-10,813)"
182	id="g214"
183	style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
184	<circle
185	r="15"
186	clip-path="url(#clipPath2)"
187	cx="326.75"
188	cy="-223.5361"
189	id="circle216"
190	style="stroke:none" />
191	</g>
192	<g
193	stroke-miterlimit="1.45"
194	transform="translate(-10,813)"
195	id="g218"
196	style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
197	<circle
198	r="15"
199	clip-path="url(#clipPath2)"
200	cx="326.75"
201	cy="-223.5361"
202	id="circle220"
203	style="fill:none" />
204	<text
205	x="322.95609"
206	y="-219.00101"
207	clip-path="url(#clipPath2)"
208	xml:space="preserve"
209	id="text222"
210	style="font-family:sans-serif;stroke:none;stroke-width:1">3</text>
211	</g>
212	<g
213	transform="translate(-10,813)"
214	id="g224"
215	style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
216	<circle
217	r="15"
218	clip-path="url(#clipPath2)"
219	cx="325.75"
220	cy="-176.5361"
221	id="circle226"
222	style="stroke:none" />
223	</g>
224	<g
225	stroke-miterlimit="1.45"
226	transform="translate(-10,813)"
227	id="g228"
228	style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
229	<circle
230	r="15"
231	clip-path="url(#clipPath2)"
232	cx="325.75"
233	cy="-176.5361"
234	id="circle230"
235	style="fill:none" />
236	<text
237	x="321.95609"
238	y="-172.00101"
239	clip-path="url(#clipPath2)"
240	xml:space="preserve"
241	id="text232"
242	style="font-family:sans-serif;stroke:none;stroke-width:1">4</text>
243	</g>
244	<g
245	transform="translate(-10,813)"
246	id="g234"
247	style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
248	<circle
249	r="15"
250	clip-path="url(#clipPath2)"
251	cx="385.75"
252	cy="-223.5361"
253	id="circle236"
254	style="stroke:none" />
255	</g>
256	<g
257	stroke-miterlimit="1.45"
258	transform="translate(-10,813)"
259	id="g238"
260	style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
261	<circle
262	r="15"
263	clip-path="url(#clipPath2)"
264	cx="385.75"
265	cy="-223.5361"
266	id="circle240"
267	style="fill:none" />
268	<text
269	x="381.95609"
270	y="-219.00101"
271	clip-path="url(#clipPath2)"
272	xml:space="preserve"
273	id="text242"
274	style="font-family:sans-serif;stroke:none;stroke-width:1">5</text>
275	</g>
276	<g
277	transform="translate(-10,813)"
278	id="g244"
279	style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
280	<circle
281	r="15"
282	clip-path="url(#clipPath2)"
283	cx="444.75"
284	cy="-223.5361"
285	id="circle246"
286	style="stroke:none" />
287	</g>
288	<g
289	stroke-miterlimit="1.45"
290	transform="translate(-10,813)"
291	id="g248"
292	style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
293	<circle
294	r="15"
295	clip-path="url(#clipPath2)"
296	cx="444.75"
297	cy="-223.5361"
298	id="circle250"
299	style="fill:none" />
300	<text
301	x="440.95609"
302	y="-219.00101"
303	clip-path="url(#clipPath2)"
304	xml:space="preserve"
305	id="text252"
306	style="font-family:sans-serif;stroke:none;stroke-width:1">7</text>
307	</g>
308	<g
309	transform="translate(-10,813)"
310	id="g254"
311	style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
312	<circle
313	r="15"
314	clip-path="url(#clipPath2)"
315	cx="503.75"
316	cy="-223.5361"
317	id="circle256"
318	style="stroke:none" />
319	</g>
320	<g
321	stroke-miterlimit="1.45"
322	transform="translate(-10,813)"
323	id="g258"
324	style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
325	<circle
326	r="15"
327	clip-path="url(#clipPath2)"
328	cx="503.75"
329	cy="-223.5361"
330	id="circle260"
331	style="fill:none" />
332	<text
333	x="499.95609"
334	y="-219.00101"
335	clip-path="url(#clipPath2)"
336	xml:space="preserve"
337	id="text262"
338	style="font-family:sans-serif;stroke:none;stroke-width:1">8</text>
339	</g>
340	<g
341	transform="translate(-10,813)"
342	id="g264"
343	style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
344	<circle
345	r="15"
346	clip-path="url(#clipPath2)"
347	cx="562.75"
348	cy="-223.5361"
349	id="circle266"
350	style="stroke:none" />
351	</g>
352	<g
353	stroke-miterlimit="1.45"
354	transform="translate(-10,813)"
355	id="g268"
356	style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
357	<circle
358	r="15"
359	clip-path="url(#clipPath2)"
360	cx="562.75"
361	cy="-223.5361"
362	id="circle270"
363	style="fill:none" />
364	<text
365	x="555.16211"
366	y="-219.00101"
367	clip-path="url(#clipPath2)"
368	xml:space="preserve"
369	id="text272"
370	style="font-family:sans-serif;stroke:none;stroke-width:1">10</text>
371	</g>
372	<g
373	transform="translate(-10,813)"
374	id="g274"
375	style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
376	<circle
377	r="15"
378	clip-path="url(#clipPath2)"
379	cx="415.75"
380	cy="-176.5361"
381	id="circle276"
382	style="stroke:none" />
383	</g>
384	<g
385	stroke-miterlimit="1.45"
386	transform="translate(-10,813)"
387	id="g278"
388	style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
389	<circle
390	r="15"
391	clip-path="url(#clipPath2)"
392	cx="415.75"
393	cy="-176.5361"
394	id="circle280"
395	style="fill:none" />
396	<text
397	x="411.95609"
398	y="-172.00101"
399	clip-path="url(#clipPath2)"
400	xml:space="preserve"
401	id="text282"
402	style="font-family:sans-serif;stroke:none;stroke-width:1">6</text>
403	</g>
404	<g
405	transform="translate(-10,813)"
406	id="g284"
407	style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
408	<circle
409	r="15"
410	clip-path="url(#clipPath2)"
411	cx="533.75"
412	cy="-176.5361"
413	id="circle286"
414	style="stroke:none" />
415	</g>
416	<g
417	stroke-miterlimit="1.45"
418	transform="translate(-10,813)"
419	id="g288"
420	style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
421	<circle
422	r="15"
423	clip-path="url(#clipPath2)"
424	cx="533.75"
425	cy="-176.5361"
426	id="circle290"
427	style="fill:none" />
428	<text
429	x="529.95612"
430	y="-172.00101"
431	clip-path="url(#clipPath2)"
432	xml:space="preserve"
433	id="text292"
434	style="font-family:sans-serif;stroke:none;stroke-width:1">9</text>
435	</g>
436	<g
437	transform="translate(-10,813)"
438	id="g294"
439	style="fill:#d8d8d8;stroke:#d8d8d8;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
440	<path
441	d="m 151.75,-178.5361 99,0 11,19.5 -11,19.5 -99,0 11,-19.5 z"
442	clip-path="url(#clipPath2)"
443	id="path296"
444	inkscape:connector-curvature="0"
445	style="fill-rule:evenodd;stroke:none" />
446	</g>
447	<g
448	stroke-miterlimit="1.45"
449	transform="translate(-10,813)"
450	id="g298"
451	style="stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
452	<path
453	d="m 151.75,-178.5361 99,0 11,19.5 -11,19.5 -99,0 11,-19.5 z"
454	clip-path="url(#clipPath2)"
455	id="path300"
456	inkscape:connector-curvature="0"
457	style="fill:none;fill-rule:evenodd" />
458	<text
459	x="166.2617"
460	xml:space="preserve"
461	y="-161.5674"
462	clip-path="url(#clipPath2)"
463	id="text302"
464	style="font-family:sans-serif;stroke:none">branch=trunk</text>
465	<text
466	x="175.83009"
467	xml:space="preserve"
468	y="-147.4346"
469	clip-path="url(#clipPath2)"
470	id="text304"
471	style="font-family:sans-serif;stroke:none">sym-trunk</text>
472	</g>
473	<g
474	transform="translate(-10,813)"
475	id="g306"
476	style="fill:#d8d8d8;stroke:#d8d8d8;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
477	<path
478	d="m 254.5,-122.5361 128.25,0 14.25,33.5 -14.25,33.5 -128.25,0 14.25,-33.5 z"
479	clip-path="url(#clipPath2)"
480	id="path308"
481	inkscape:connector-curvature="0"
482	style="fill-rule:evenodd;stroke:none" />
483	</g>
484	<g
485	stroke-miterlimit="1.45"
486	transform="translate(-10,813)"
487	id="g310"
488	style="stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
489	<path
490	d="m 254.5,-122.5361 128.25,0 14.25,33.5 -14.25,33.5 -128.25,0 14.25,-33.5 z"
491	clip-path="url(#clipPath2)"
492	id="path312"
493	inkscape:connector-curvature="0"
494	style="fill:none;fill-rule:evenodd" />
495	<text
496	x="290.02539"
497	xml:space="preserve"
498	y="-105.7002"
499	clip-path="url(#clipPath2)"
500	id="text314"
501	style="font-family:sans-serif;stroke:none">branch=test</text>
502	<text
503	x="299.59381"
504	xml:space="preserve"
505	y="-91.567398"
506	clip-path="url(#clipPath2)"
507	id="text316"
508	style="font-family:sans-serif;stroke:none">sym-test</text>
509	<text
510	x="286.25201"
511	xml:space="preserve"
512	y="-77.434601"
513	clip-path="url(#clipPath2)"
514	id="text318"
515	style="font-family:sans-serif;stroke:none">bgcolor=blue</text>
516	<text
517	x="271.7998"
518	xml:space="preserve"
519	y="-63.3018"
520	clip-path="url(#clipPath2)"
521	id="text320"
522	style="font-family:sans-serif;stroke:none">cancel=sym-trunk</text>
523	</g>
524	<g
525	transform="translate(-10,813)"
526	id="g322"
527	style="fill:#d8d8d8;stroke:#d8d8d8;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
528	<path
529	d="m 463.25,-117.5361 126.9,0 14.1,19.5 -14.1,19.5 -126.9,0 14.1,-19.5 z"
530	clip-path="url(#clipPath2)"
531	id="path324"
532	inkscape:connector-curvature="0"
533	style="fill-rule:evenodd;stroke:none" />
534	</g>
535	<g
536	stroke-miterlimit="1.45"
537	transform="translate(-10,813)"
538	id="g326"
539	style="stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
540	<path
541	d="m 463.25,-117.5361 126.9,0 14.1,19.5 -14.1,19.5 -126.9,0 14.1,-19.5 z"
542	clip-path="url(#clipPath2)"
543	id="path328"
544	inkscape:connector-curvature="0"
545	style="fill:none;fill-rule:evenodd" />
546	<text
547	x="484.93549"
548	xml:space="preserve"
549	y="-100.5674"
550	clip-path="url(#clipPath2)"
551	id="text330"
552	style="font-family:sans-serif;stroke:none">sym-release-1.0</text>
553	<text
554	x="515.0791"
555	xml:space="preserve"
556	y="-86.434601"
557	clip-path="url(#clipPath2)"
558	id="text332"
559	style="font-family:sans-serif;stroke:none">closed</text>
560	<path
561	d="m 221.75,-223.5361 22,0"
562	clip-path="url(#clipPath2)"
563	id="path334"
564	inkscape:connector-curvature="0"
565	style="fill:none" />
566	<path
567	d="m 251.75,-223.5361 -12,-5 3,5 -3,5 z"
568	clip-path="url(#clipPath2)"
569	id="path336"
570	inkscape:connector-curvature="0"
571	style="stroke:none" />
572	<path
573	d="m 281.75,-223.5361 22,0"
574	clip-path="url(#clipPath2)"
575	id="path338"
576	inkscape:connector-curvature="0"
577	style="fill:none" />
578	<path
579	d="m 311.75,-223.5361 -12,-5 3,5 -3,5 z"
580	clip-path="url(#clipPath2)"
581	id="path340"
582	inkscape:connector-curvature="0"
583	style="stroke:none" />
584	<path
585	d="m 278.4824,-214.19 29.2779,23.3231"
586	clip-path="url(#clipPath2)"
587	id="path342"
588	inkscape:connector-curvature="0"
589	style="fill:none" />
590	<path
591	d="m 314.0176,-185.8823 -6.2705,-11.3877 -0.7689,5.78 -5.4619,2.0416 z"
592	clip-path="url(#clipPath2)"
593	id="path344"
594	inkscape:connector-curvature="0"
595	style="stroke:none" />
596	<path
597	d="m 341.75,-223.5361 21,0"
598	clip-path="url(#clipPath2)"
599	id="path346"
600	inkscape:connector-curvature="0"
601	style="fill:none" />
602	<path
603	d="m 370.75,-223.5361 -12,-5 3,5 -3,5 z"
604	clip-path="url(#clipPath2)"
605	id="path348"
606	inkscape:connector-curvature="0"
607	style="stroke:none" />
608	<path
609	d="m 400.75,-223.5361 21,0"
610	clip-path="url(#clipPath2)"
611	id="path350"
612	inkscape:connector-curvature="0"
613	style="fill:none" />
614	<path
615	d="m 429.75,-223.5361 -12,-5 3,5 -3,5 z"
616	clip-path="url(#clipPath2)"
617	id="path352"
618	inkscape:connector-curvature="0"
619	style="stroke:none" />
620	<path
621	d="m 459.75,-223.5361 21,0"
622	clip-path="url(#clipPath2)"
623	id="path354"
624	inkscape:connector-curvature="0"
625	style="fill:none" />
626	<path
627	d="m 488.75,-223.5361 -12,-5 3,5 -3,5 z"
628	clip-path="url(#clipPath2)"
629	id="path356"
630	inkscape:connector-curvature="0"
631	style="stroke:none" />
632	<path
633	d="m 518.75,-223.5361 21,0"
634	clip-path="url(#clipPath2)"
635	id="path358"
636	inkscape:connector-curvature="0"
637	style="fill:none" />
638	<path
639	d="m 547.75,-223.5361 -12,-5 3,5 -3,5 z"
640	clip-path="url(#clipPath2)"
641	id="path360"
642	inkscape:connector-curvature="0"
643	style="stroke:none" />
644	<path
645	d="m 340.75,-176.5361 52,0"
646	clip-path="url(#clipPath2)"
647	id="path362"
648	inkscape:connector-curvature="0"
649	style="fill:none" />
650	<path
651	d="m 400.75,-176.5361 -12,-5 3,5 -3,5 z"
652	clip-path="url(#clipPath2)"
653	id="path364"
654	inkscape:connector-curvature="0"
655	style="stroke:none" />
656	<path
657	d="m 423.6266,-189.3017 9.0459,-14.6606"
658	clip-path="url(#clipPath2)"
659	id="path366"
660	inkscape:connector-curvature="0"
661	style="fill:none;stroke-dasharray:6, 2" />
662	<path
663	d="m 436.8734,-210.7706 -10.5565,7.5869 5.8305,0.0724 2.6799,5.1787 z"
664	clip-path="url(#clipPath2)"
665	id="path368"
666	inkscape:connector-curvature="0"
667	style="stroke:none;stroke-dasharray:6, 2" />
668	<path
669	d="m 430.75,-176.5361 80,0"
670	clip-path="url(#clipPath2)"
671	id="path370"
672	inkscape:connector-curvature="0"
673	style="fill:none" />
674	<path
675	d="m 518.75,-176.5361 -12,-5 3,5 -3,5 z"
676	clip-path="url(#clipPath2)"
677	id="path372"
678	inkscape:connector-curvature="0"
679	style="stroke:none" />
680	<path
681	d="m 541.6266,-189.3017 9.0459,-14.6606"
682	clip-path="url(#clipPath2)"
683	id="path374"
684	inkscape:connector-curvature="0"
685	style="fill:none;stroke-dasharray:6, 2" />
686	<path
687	d="m 554.8734,-210.7706 -10.5564,7.5869 5.8305,0.0724 2.6798,5.1787 z"
688	clip-path="url(#clipPath2)"
689	id="path376"
690	inkscape:connector-curvature="0"
691	style="stroke:none;stroke-dasharray:6, 2" />
692	<path
693	d="m 206.75,-178.531 0,-22.0051"
694	clip-path="url(#clipPath2)"
695	id="path378"
696	inkscape:connector-curvature="0"
697	style="fill:none" />
698	<path
699	d="m 206.75,-208.5361 -5,12 5,-3 5,3 z"
700	clip-path="url(#clipPath2)"
701	id="path380"
702	inkscape:connector-curvature="0"
703	style="stroke:none" />
704	<path
705	d="m 325.75,-122.575 0,-30.9611"
706	clip-path="url(#clipPath2)"
707	id="path382"
708	inkscape:connector-curvature="0"
709	style="fill:none" />
710	<path
711	d="m 325.75,-161.5361 -5,12 5,-3 5,3 z"
712	clip-path="url(#clipPath2)"
713	id="path384"
714	inkscape:connector-curvature="0"
715	style="stroke:none" />
716	<path
717	d="m 533.75,-117.5461 0,-35.99"
718	clip-path="url(#clipPath2)"
719	id="path386"
720	inkscape:connector-curvature="0"
721	style="fill:none" />
722	<path
723	d="m 533.75,-161.5361 -5,12 5,-3 5,3 z"
724	clip-path="url(#clipPath2)"
725	id="path388"
726	inkscape:connector-curvature="0"
727	style="stroke:none" />
728	</g>
729	</g>
730	</svg>

	--- a/www/branch05.svg
	+++ b/www/branch05.svg
	@@ -1,730 +0,0 @@

M www/branching.wiki

+35 -2

		--- www/branching.wiki
		+++ www/branching.wiki
		@@ -406,12 +406,45 @@
406	406	thus to distinguish between forks and branches. Figure 5 shows the
407	407	same scenario as Figure 4 but with tags and properties added:
408	408
409	409	<table border=1 cellpadding=10 hspace=10 vspace=10 align="center">
410	410	<tr><td align="center">
411		-<img src="branch05.svg"><br>
412		-Figure 5
	411	+<verbatim type="pikchr">
	412	+arrowht = 0.07
	413	+C1: circle rad 40% thickness 1.5px fill white "1"
	414	+arrow 40%
	415	+C2: circle same "2"
	416	+arrow same
	417	+circle same "3"
	418	+arrow same
	419	+C5: circle same "5"
	420	+arrow same
	421	+C7: circle same "7"
	422	+arrow same
	423	+C8: circle same "8"
	424	+arrow same
	425	+C10: circle same "10"
	426	+C4: circle same at 3rd circle-(0,.35) "4"
	427	+C6: circle same at (1/2 way between C5 and C7,C4) "6"
	428	+C9: circle same at (1/2 way between C8 and C10,C4) "9"
	429	+arrow from C2 to C4 chop
	430	+arrow from C4 to C6 chop
	431	+arrow from C6 to C9 chop
	432	+arrow dashed 0.03 from C6 to C7 chop
	433	+arrow same from C9 to C10
	434	+layer = 0
	435	+box fill 0x9bcdfc color 0x9bcdfc wid (C10.e.x - C2.w.x) ht C6.height*1.5 at C6.c
	436	+text " test" above ljust at last box.sw
	437	+box fill lightgray "branch=trunk" "sym-trunk" fit with .ne at C1-(0.05,0.3);
	438	+line color gray from last box.ne to C1 chop
	439	+box same "branch=test" "sym-test" "bgcolor=blue" "cancel=sym-trunk" fit \
	440	+ with .n at C4-(0,0.3)
	441	+line color gray from last box.n to C4 chop
	442	+box same "sym-release-1.0" "closed" fit with .n at C9-(0,0.3)
	443	+line color gray from last box.n to C9 chop
	444	+</verbatim>
	445	+<p>Figure 5</p>
413	446	</td></tr></table>
414	447
415	448	A <i>tag</i> is a name that is attached to a check-in. A
416	449	<i>property</i> is a name/value pair. Internally, Fossil implements
417	450	tags as properties with a NULL value. So, tags and properties really
418	451

	--- www/branching.wiki
	+++ www/branching.wiki
	@@ -406,12 +406,45 @@
406	thus to distinguish between forks and branches. Figure 5 shows the
407	same scenario as Figure 4 but with tags and properties added:
408
409	<table border=1 cellpadding=10 hspace=10 vspace=10 align="center">
410	<tr><td align="center">
411	<img src="branch05.svg"><br>
412	Figure 5

































413	</td></tr></table>
414
415	A <i>tag</i> is a name that is attached to a check-in. A
416	<i>property</i> is a name/value pair. Internally, Fossil implements
417	tags as properties with a NULL value. So, tags and properties really
418

	--- www/branching.wiki
	+++ www/branching.wiki
	@@ -406,12 +406,45 @@
406	thus to distinguish between forks and branches. Figure 5 shows the
407	same scenario as Figure 4 but with tags and properties added:
408
409	<table border=1 cellpadding=10 hspace=10 vspace=10 align="center">
410	<tr><td align="center">
411	<verbatim type="pikchr">
412	arrowht = 0.07
413	C1: circle rad 40% thickness 1.5px fill white "1"
414	arrow 40%
415	C2: circle same "2"
416	arrow same
417	circle same "3"
418	arrow same
419	C5: circle same "5"
420	arrow same
421	C7: circle same "7"
422	arrow same
423	C8: circle same "8"
424	arrow same
425	C10: circle same "10"
426	C4: circle same at 3rd circle-(0,.35) "4"
427	C6: circle same at (1/2 way between C5 and C7,C4) "6"
428	C9: circle same at (1/2 way between C8 and C10,C4) "9"
429	arrow from C2 to C4 chop
430	arrow from C4 to C6 chop
431	arrow from C6 to C9 chop
432	arrow dashed 0.03 from C6 to C7 chop
433	arrow same from C9 to C10
434	layer = 0
435	box fill 0x9bcdfc color 0x9bcdfc wid (C10.e.x - C2.w.x) ht C6.height*1.5 at C6.c
436	text " test" above ljust at last box.sw
437	box fill lightgray "branch=trunk" "sym-trunk" fit with .ne at C1-(0.05,0.3);
438	line color gray from last box.ne to C1 chop
439	box same "branch=test" "sym-test" "bgcolor=blue" "cancel=sym-trunk" fit \
440	with .n at C4-(0,0.3)
441	line color gray from last box.n to C4 chop
442	box same "sym-release-1.0" "closed" fit with .n at C9-(0,0.3)
443	line color gray from last box.n to C9 chop
444	</verbatim>
445	<p>Figure 5</p>
446	</td></tr></table>
447
448	A <i>tag</i> is a name that is attached to a check-in. A
449	<i>property</i> is a name/value pair. Internally, Fossil implements
450	tags as properties with a NULL value. So, tags and properties really
451

Fossil SCM

Keyboard Shortcuts