Fossil SCM

Merge in changes for the new /pikchrshow webpage.

drh 2020-09-10 16:19 trunk merge

Commit 0b2f838887c30f9b6e976b57b8de20caf87cbce4e26bf3c0241af6365db35a02

Parent d6639e466edba3a…

14 files changed +9 -2 +7 +13 +1 +8 +10 -4 +13 +12 -228 -247 -303 -569 -239 +124 -6

~ src/builtin.c ~ src/fossil.page.pikchrshow.js ~ src/main.mk ~ src/makemake.tcl ~ src/pikchrshow.c ~ win/Makefile.dmc ~ win/Makefile.mingw ~ win/Makefile.msc - www/branch01.svg - www/branch02.svg - www/branch03.svg - www/branch04.svg - www/branch06.svg ~ www/branching.wiki

M src/builtin.c

+9 -2

		--- src/builtin.c
		+++ src/builtin.c
		@@ -625,11 +625,19 @@
625	625	hash_digits(0), hash_digits(1));
626	626	CX("editStateMarkers: {"
627	627	"/Symbolic markers to denote certain edit states./"
628	628	"isNew:'[+]', isModified:'[*]', isDeleted:'[-]'},\n");
629	629	CX("confirmerButtonTicks: 3 "
630		- "/default fossil.confirmer tick count./\n");
	630	+ "/default fossil.confirmer tick count./,\n");
	631	+ /* Inject certain info about the current skin... */
	632	+ CX("skin:{");
	633	+ /* can leak a local filesystem path:
	634	+ CX("name: %!j,", skin_in_use());*/
	635	+ CX("isDark: %s"
	636	+ "/true if the current skin has the 'white-foreground' detail/",
	637	+ skin_detail_boolean("white-foreground") ? "true" : "false");
	638	+ CX("}\n"/fossil.config.skin/);
631	639	CX("};\n"/* fossil.config */);
632	640	#if 0
633	641	/* Is it safe to emit the CSRF token here? Some pages add it
634	642	** as a hidden form field. */
635	643	if(g.zCsrfToken[0]!=0){
		@@ -652,11 +660,10 @@
652	660	/* The remaining window.fossil bootstrap code is not dependent on
653	661	** C-runtime state... */
654	662	builtin_request_js("fossil.bootstrap.js");
655	663	}
656	664	}
657		-
658	665
659	666	/*
660	667	** Convenience wrapper which calls builtin_request_js() for a series
661	668	** of builtin scripts named fossil.NAME.js. The first time it is
662	669	** called, it also calls builtin_emit_script_fossil_bootstrap() to
663	670
664	671	ADDED src/fossil.page.pikchrshow.js

	--- src/builtin.c
	+++ src/builtin.c
	@@ -625,11 +625,19 @@
625	hash_digits(0), hash_digits(1));
626	CX("editStateMarkers: {"
627	"/Symbolic markers to denote certain edit states./"
628	"isNew:'[+]', isModified:'[*]', isDeleted:'[-]'},\n");
629	CX("confirmerButtonTicks: 3 "
630	"/default fossil.confirmer tick count./\n");








631	CX("};\n"/* fossil.config */);
632	#if 0
633	/* Is it safe to emit the CSRF token here? Some pages add it
634	** as a hidden form field. */
635	if(g.zCsrfToken[0]!=0){
	@@ -652,11 +660,10 @@
652	/* The remaining window.fossil bootstrap code is not dependent on
653	** C-runtime state... */
654	builtin_request_js("fossil.bootstrap.js");
655	}
656	}
657
658
659	/*
660	** Convenience wrapper which calls builtin_request_js() for a series
661	** of builtin scripts named fossil.NAME.js. The first time it is
662	** called, it also calls builtin_emit_script_fossil_bootstrap() to
663
664	DDED src/fossil.page.pikchrshow.js

	--- src/builtin.c
	+++ src/builtin.c
	@@ -625,11 +625,19 @@
625	hash_digits(0), hash_digits(1));
626	CX("editStateMarkers: {"
627	"/Symbolic markers to denote certain edit states./"
628	"isNew:'[+]', isModified:'[*]', isDeleted:'[-]'},\n");
629	CX("confirmerButtonTicks: 3 "
630	"/default fossil.confirmer tick count./,\n");
631	/* Inject certain info about the current skin... */
632	CX("skin:{");
633	/* can leak a local filesystem path:
634	CX("name: %!j,", skin_in_use());*/
635	CX("isDark: %s"
636	"/true if the current skin has the 'white-foreground' detail/",
637	skin_detail_boolean("white-foreground") ? "true" : "false");
638	CX("}\n"/fossil.config.skin/);
639	CX("};\n"/* fossil.config */);
640	#if 0
641	/* Is it safe to emit the CSRF token here? Some pages add it
642	** as a hidden form field. */
643	if(g.zCsrfToken[0]!=0){
	@@ -652,11 +660,10 @@
660	/* The remaining window.fossil bootstrap code is not dependent on
661	** C-runtime state... */
662	builtin_request_js("fossil.bootstrap.js");
663	}
664	}

665
666	/*
667	** Convenience wrapper which calls builtin_request_js() for a series
668	** of builtin scripts named fossil.NAME.js. The first time it is
669	** called, it also calls builtin_emit_script_fossil_bootstrap() to
670
671	DDED src/fossil.page.pikchrshow.js

M src/fossil.page.pikchrshow.js

		--- a/src/fossil.page.pikchrshow.js
		+++ b/src/fossil.page.pikchrshow.js
		@@ -0,0 +1,7 @@
	1	+(functioampcbDarkMode.parentNode); {name: "Tip: drag/drop pikdivdivdivControls, if(Pnot strictly necessary, butalignment})(window.fossil);
	2	+removeClass, 'hidden' /*,,);
	3	+ D.addClass, 'hidde
	4	+ JS
	5	+ };
	6	+P.p
	7	+ P;fp.target.innerHTML =

	--- a/src/fossil.page.pikchrshow.js
	+++ b/src/fossil.page.pikchrshow.js
	@@ -0,0 +1,7 @@

	--- a/src/fossil.page.pikchrshow.js
	+++ b/src/fossil.page.pikchrshow.js
	@@ -0,0 +1,7 @@
1	(functioampcbDarkMode.parentNode); {name: "Tip: drag/drop pikdivdivdivControls, if(Pnot strictly necessary, butalignment})(window.fossil);
2	removeClass, 'hidden' /*,,);
3	D.addClass, 'hidde
4	JS
5	};
6	P.p
7	P;fp.target.innerHTML =

M src/main.mk

+13

		--- src/main.mk
		+++ src/main.mk
		@@ -105,10 +105,11 @@
105	105	$(SRCDIR)/moderate.c \
106	106	$(SRCDIR)/name.c \
107	107	$(SRCDIR)/path.c \
108	108	$(SRCDIR)/piechart.c \
109	109	$(SRCDIR)/pikchr.c \
	110	+ $(SRCDIR)/pikchrshow.c \
110	111	$(SRCDIR)/pivot.c \
111	112	$(SRCDIR)/popen.c \
112	113	$(SRCDIR)/pqueue.c \
113	114	$(SRCDIR)/printf.c \
114	115	$(SRCDIR)/publish.c \
		@@ -231,10 +232,11 @@
231	232	$(SRCDIR)/fossil.dom.js \
232	233	$(SRCDIR)/fossil.fetch.js \
233	234	$(SRCDIR)/fossil.numbered-lines.js \
234	235	$(SRCDIR)/fossil.page.fileedit.js \
235	236	$(SRCDIR)/fossil.page.forumpost.js \
	237	+ $(SRCDIR)/fossil.page.pikchrshow.js \
236	238	$(SRCDIR)/fossil.page.wikiedit-wysiwyg-legacy.js \
237	239	$(SRCDIR)/fossil.page.wikiedit.js \
238	240	$(SRCDIR)/fossil.popupwidget.js \
239	241	$(SRCDIR)/fossil.storage.js \
240	242	$(SRCDIR)/fossil.tabs.js \
		@@ -360,10 +362,11 @@
360	362	$(OBJDIR)/moderate_.c \
361	363	$(OBJDIR)/name_.c \
362	364	$(OBJDIR)/path_.c \
363	365	$(OBJDIR)/piechart_.c \
364	366	$(OBJDIR)/pikchr_.c \
	367	+ $(OBJDIR)/pikchrshow_.c \
365	368	$(OBJDIR)/pivot_.c \
366	369	$(OBJDIR)/popen_.c \
367	370	$(OBJDIR)/pqueue_.c \
368	371	$(OBJDIR)/printf_.c \
369	372	$(OBJDIR)/publish_.c \
		@@ -507,10 +510,11 @@
507	510	$(OBJDIR)/moderate.o \
508	511	$(OBJDIR)/name.o \
509	512	$(OBJDIR)/path.o \
510	513	$(OBJDIR)/piechart.o \
511	514	$(OBJDIR)/pikchr.o \
	515	+ $(OBJDIR)/pikchrshow.o \
512	516	$(OBJDIR)/pivot.o \
513	517	$(OBJDIR)/popen.o \
514	518	$(OBJDIR)/pqueue.o \
515	519	$(OBJDIR)/printf.o \
516	520	$(OBJDIR)/publish.o \
		@@ -844,10 +848,11 @@
844	848	$(OBJDIR)/moderate_.c:$(OBJDIR)/moderate.h \
845	849	$(OBJDIR)/name_.c:$(OBJDIR)/name.h \
846	850	$(OBJDIR)/path_.c:$(OBJDIR)/path.h \
847	851	$(OBJDIR)/piechart_.c:$(OBJDIR)/piechart.h \
848	852	$(OBJDIR)/pikchr_.c:$(OBJDIR)/pikchr.h \
	853	+ $(OBJDIR)/pikchrshow_.c:$(OBJDIR)/pikchrshow.h \
849	854	$(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h \
850	855	$(OBJDIR)/popen_.c:$(OBJDIR)/popen.h \
851	856	$(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h \
852	857	$(OBJDIR)/printf_.c:$(OBJDIR)/printf.h \
853	858	$(OBJDIR)/publish_.c:$(OBJDIR)/publish.h \
		@@ -1632,10 +1637,18 @@
1632	1637
1633	1638	$(OBJDIR)/pikchr.o: $(OBJDIR)/pikchr_.c $(OBJDIR)/pikchr.h $(SRCDIR)/config.h
1634	1639	$(XTCC) -o $(OBJDIR)/pikchr.o -c $(OBJDIR)/pikchr_.c
1635	1640
1636	1641	$(OBJDIR)/pikchr.h: $(OBJDIR)/headers
	1642	+
	1643	+$(OBJDIR)/pikchrshow_.c: $(SRCDIR)/pikchrshow.c $(OBJDIR)/translate
	1644	+ $(OBJDIR)/translate $(SRCDIR)/pikchrshow.c >$@
	1645	+
	1646	+$(OBJDIR)/pikchrshow.o: $(OBJDIR)/pikchrshow_.c $(OBJDIR)/pikchrshow.h $(SRCDIR)/config.h
	1647	+ $(XTCC) -o $(OBJDIR)/pikchrshow.o -c $(OBJDIR)/pikchrshow_.c
	1648	+
	1649	+$(OBJDIR)/pikchrshow.h: $(OBJDIR)/headers
1637	1650
1638	1651	$(OBJDIR)/pivot_.c: $(SRCDIR)/pivot.c $(OBJDIR)/translate
1639	1652	$(OBJDIR)/translate $(SRCDIR)/pivot.c >$@
1640	1653
1641	1654	$(OBJDIR)/pivot.o: $(OBJDIR)/pivot_.c $(OBJDIR)/pivot.h $(SRCDIR)/config.h
1642	1655

	--- src/main.mk
	+++ src/main.mk
	@@ -105,10 +105,11 @@
105	$(SRCDIR)/moderate.c \
106	$(SRCDIR)/name.c \
107	$(SRCDIR)/path.c \
108	$(SRCDIR)/piechart.c \
109	$(SRCDIR)/pikchr.c \

110	$(SRCDIR)/pivot.c \
111	$(SRCDIR)/popen.c \
112	$(SRCDIR)/pqueue.c \
113	$(SRCDIR)/printf.c \
114	$(SRCDIR)/publish.c \
	@@ -231,10 +232,11 @@
231	$(SRCDIR)/fossil.dom.js \
232	$(SRCDIR)/fossil.fetch.js \
233	$(SRCDIR)/fossil.numbered-lines.js \
234	$(SRCDIR)/fossil.page.fileedit.js \
235	$(SRCDIR)/fossil.page.forumpost.js \

236	$(SRCDIR)/fossil.page.wikiedit-wysiwyg-legacy.js \
237	$(SRCDIR)/fossil.page.wikiedit.js \
238	$(SRCDIR)/fossil.popupwidget.js \
239	$(SRCDIR)/fossil.storage.js \
240	$(SRCDIR)/fossil.tabs.js \
	@@ -360,10 +362,11 @@
360	$(OBJDIR)/moderate_.c \
361	$(OBJDIR)/name_.c \
362	$(OBJDIR)/path_.c \
363	$(OBJDIR)/piechart_.c \
364	$(OBJDIR)/pikchr_.c \

365	$(OBJDIR)/pivot_.c \
366	$(OBJDIR)/popen_.c \
367	$(OBJDIR)/pqueue_.c \
368	$(OBJDIR)/printf_.c \
369	$(OBJDIR)/publish_.c \
	@@ -507,10 +510,11 @@
507	$(OBJDIR)/moderate.o \
508	$(OBJDIR)/name.o \
509	$(OBJDIR)/path.o \
510	$(OBJDIR)/piechart.o \
511	$(OBJDIR)/pikchr.o \

512	$(OBJDIR)/pivot.o \
513	$(OBJDIR)/popen.o \
514	$(OBJDIR)/pqueue.o \
515	$(OBJDIR)/printf.o \
516	$(OBJDIR)/publish.o \
	@@ -844,10 +848,11 @@
844	$(OBJDIR)/moderate_.c:$(OBJDIR)/moderate.h \
845	$(OBJDIR)/name_.c:$(OBJDIR)/name.h \
846	$(OBJDIR)/path_.c:$(OBJDIR)/path.h \
847	$(OBJDIR)/piechart_.c:$(OBJDIR)/piechart.h \
848	$(OBJDIR)/pikchr_.c:$(OBJDIR)/pikchr.h \

849	$(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h \
850	$(OBJDIR)/popen_.c:$(OBJDIR)/popen.h \
851	$(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h \
852	$(OBJDIR)/printf_.c:$(OBJDIR)/printf.h \
853	$(OBJDIR)/publish_.c:$(OBJDIR)/publish.h \
	@@ -1632,10 +1637,18 @@
1632
1633	$(OBJDIR)/pikchr.o: $(OBJDIR)/pikchr_.c $(OBJDIR)/pikchr.h $(SRCDIR)/config.h
1634	$(XTCC) -o $(OBJDIR)/pikchr.o -c $(OBJDIR)/pikchr_.c
1635
1636	$(OBJDIR)/pikchr.h: $(OBJDIR)/headers








1637
1638	$(OBJDIR)/pivot_.c: $(SRCDIR)/pivot.c $(OBJDIR)/translate
1639	$(OBJDIR)/translate $(SRCDIR)/pivot.c >$@
1640
1641	$(OBJDIR)/pivot.o: $(OBJDIR)/pivot_.c $(OBJDIR)/pivot.h $(SRCDIR)/config.h
1642

	--- src/main.mk
	+++ src/main.mk
	@@ -105,10 +105,11 @@
105	$(SRCDIR)/moderate.c \
106	$(SRCDIR)/name.c \
107	$(SRCDIR)/path.c \
108	$(SRCDIR)/piechart.c \
109	$(SRCDIR)/pikchr.c \
110	$(SRCDIR)/pikchrshow.c \
111	$(SRCDIR)/pivot.c \
112	$(SRCDIR)/popen.c \
113	$(SRCDIR)/pqueue.c \
114	$(SRCDIR)/printf.c \
115	$(SRCDIR)/publish.c \
	@@ -231,10 +232,11 @@
232	$(SRCDIR)/fossil.dom.js \
233	$(SRCDIR)/fossil.fetch.js \
234	$(SRCDIR)/fossil.numbered-lines.js \
235	$(SRCDIR)/fossil.page.fileedit.js \
236	$(SRCDIR)/fossil.page.forumpost.js \
237	$(SRCDIR)/fossil.page.pikchrshow.js \
238	$(SRCDIR)/fossil.page.wikiedit-wysiwyg-legacy.js \
239	$(SRCDIR)/fossil.page.wikiedit.js \
240	$(SRCDIR)/fossil.popupwidget.js \
241	$(SRCDIR)/fossil.storage.js \
242	$(SRCDIR)/fossil.tabs.js \
	@@ -360,10 +362,11 @@
362	$(OBJDIR)/moderate_.c \
363	$(OBJDIR)/name_.c \
364	$(OBJDIR)/path_.c \
365	$(OBJDIR)/piechart_.c \
366	$(OBJDIR)/pikchr_.c \
367	$(OBJDIR)/pikchrshow_.c \
368	$(OBJDIR)/pivot_.c \
369	$(OBJDIR)/popen_.c \
370	$(OBJDIR)/pqueue_.c \
371	$(OBJDIR)/printf_.c \
372	$(OBJDIR)/publish_.c \
	@@ -507,10 +510,11 @@
510	$(OBJDIR)/moderate.o \
511	$(OBJDIR)/name.o \
512	$(OBJDIR)/path.o \
513	$(OBJDIR)/piechart.o \
514	$(OBJDIR)/pikchr.o \
515	$(OBJDIR)/pikchrshow.o \
516	$(OBJDIR)/pivot.o \
517	$(OBJDIR)/popen.o \
518	$(OBJDIR)/pqueue.o \
519	$(OBJDIR)/printf.o \
520	$(OBJDIR)/publish.o \
	@@ -844,10 +848,11 @@
848	$(OBJDIR)/moderate_.c:$(OBJDIR)/moderate.h \
849	$(OBJDIR)/name_.c:$(OBJDIR)/name.h \
850	$(OBJDIR)/path_.c:$(OBJDIR)/path.h \
851	$(OBJDIR)/piechart_.c:$(OBJDIR)/piechart.h \
852	$(OBJDIR)/pikchr_.c:$(OBJDIR)/pikchr.h \
853	$(OBJDIR)/pikchrshow_.c:$(OBJDIR)/pikchrshow.h \
854	$(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h \
855	$(OBJDIR)/popen_.c:$(OBJDIR)/popen.h \
856	$(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h \
857	$(OBJDIR)/printf_.c:$(OBJDIR)/printf.h \
858	$(OBJDIR)/publish_.c:$(OBJDIR)/publish.h \
	@@ -1632,10 +1637,18 @@
1637
1638	$(OBJDIR)/pikchr.o: $(OBJDIR)/pikchr_.c $(OBJDIR)/pikchr.h $(SRCDIR)/config.h
1639	$(XTCC) -o $(OBJDIR)/pikchr.o -c $(OBJDIR)/pikchr_.c
1640
1641	$(OBJDIR)/pikchr.h: $(OBJDIR)/headers
1642
1643	$(OBJDIR)/pikchrshow_.c: $(SRCDIR)/pikchrshow.c $(OBJDIR)/translate
1644	$(OBJDIR)/translate $(SRCDIR)/pikchrshow.c >$@
1645
1646	$(OBJDIR)/pikchrshow.o: $(OBJDIR)/pikchrshow_.c $(OBJDIR)/pikchrshow.h $(SRCDIR)/config.h
1647	$(XTCC) -o $(OBJDIR)/pikchrshow.o -c $(OBJDIR)/pikchrshow_.c
1648
1649	$(OBJDIR)/pikchrshow.h: $(OBJDIR)/headers
1650
1651	$(OBJDIR)/pivot_.c: $(SRCDIR)/pivot.c $(OBJDIR)/translate
1652	$(OBJDIR)/translate $(SRCDIR)/pivot.c >$@
1653
1654	$(OBJDIR)/pivot.o: $(OBJDIR)/pivot_.c $(OBJDIR)/pivot.h $(SRCDIR)/config.h
1655

M src/makemake.tcl

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -115,10 +115,11 @@
115	115	moderate
116	116	name
117	117	path
118	118	piechart
119	119	pikchr
	120	+ pikchrshow
120	121	pivot
121	122	popen
122	123	pqueue
123	124	printf
124	125	publish
125	126
126	127	ADDED src/pikchrshow.c

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -115,10 +115,11 @@
115	moderate
116	name
117	path
118	piechart
119	pikchr

120	pivot
121	popen
122	pqueue
123	printf
124	publish
125
126	DDED src/pikchrshow.c

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -115,10 +115,11 @@
115	moderate
116	name
117	path
118	piechart
119	pikchr
120	pikchrshow
121	pivot
122	popen
123	pqueue
124	printf
125	publish
126
127	DDED src/pikchrshow.c

M src/pikchrshow.c

		--- a/src/pikchrshow.c
		+++ b/src/pikchrshow.c
		@@ -0,0 +1,8 @@
	1	+r}
	2	+ected
	3	+** adjacec@. zIn 1;
	4	+erow>div id='cmd\n%s%s", zNonce\n%s%s", zNonce
	5	+max-width: initialmargin: 0 0 1em 0form {flex: 2 1 auto"
	6	+ "flex: 1 1 auto; border-width: 1px; border-style: solid;"
	7	+ " padding: 0.5emalign-items: ce-left: 0.5emcolorIn 1;
	8	+erow>div id=

	--- a/src/pikchrshow.c
	+++ b/src/pikchrshow.c
	@@ -0,0 +1,8 @@

	--- a/src/pikchrshow.c
	+++ b/src/pikchrshow.c
	@@ -0,0 +1,8 @@
1	r}
2	ected
3	** adjacec@. zIn 1;
4	erow>div id='cmd\n%s%s", zNonce\n%s%s", zNonce
5	max-width: initialmargin: 0 0 1em 0form {flex: 2 1 auto"
6	"flex: 1 1 auto; border-width: 1px; border-style: solid;"
7	" padding: 0.5emalign-items: ce-left: 0.5emcolorIn 1;
8	erow>div id=

M win/Makefile.dmc

+10 -4

		--- win/Makefile.dmc
		+++ win/Makefile.dmc
		@@ -28,13 +28,13 @@
28	28
29	29	SQLITE_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_USE_ALLOCA -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_INTROSPECTION_PRAGMAS -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0
30	30
31	31	SHELL_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_USE_ALLOCA -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_INTROSPECTION_PRAGMAS -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -Dmain=sqlite3_shell -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
32	32
33		-SRC = add_.c ajax_.c alerts_.c allrepo_.c attach_.c backlink_.c backoffice_.c bag_.c bisect_.c blob_.c branch_.c browse_.c builtin_.c bundle_.c cache_.c capabilities_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c cookies_.c db_.c delta_.c deltacmd_.c deltafunc_.c descendants_.c diff_.c diffcmd_.c dispatch_.c doc_.c encode_.c etag_.c event_.c export_.c extcgi_.c file_.c fileedit_.c finfo_.c foci_.c forum_.c fshell_.c fusefs_.c fuzz_.c glob_.c graph_.c gzip_.c hname_.c hook_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c interwiki_.c json_.c json_artifact_.c json_branch_.c json_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c loadctrl_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c path_.c piechart_.c pikchr_.c pivot_.c popen_.c pqueue_.c printf_.c publish_.c purge_.c rebuild_.c regexp_.c repolist_.c report_.c rss_.c schema_.c search_.c security_audit_.c setup_.c setupuser_.c sha1_.c sha1hard_.c sha3_.c shun_.c sitemap_.c skins_.c smtp_.c sqlcmd_.c stash_.c stat_.c statrep_.c style_.c sync_.c tag_.c tar_.c terminal_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c unversioned_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c webmail_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c xfer_.c xfersetup_.c zip_.c
	33	+SRC = add_.c ajax_.c alerts_.c allrepo_.c attach_.c backlink_.c backoffice_.c bag_.c bisect_.c blob_.c branch_.c browse_.c builtin_.c bundle_.c cache_.c capabilities_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c cookies_.c db_.c delta_.c deltacmd_.c deltafunc_.c descendants_.c diff_.c diffcmd_.c dispatch_.c doc_.c encode_.c etag_.c event_.c export_.c extcgi_.c file_.c fileedit_.c finfo_.c foci_.c forum_.c fshell_.c fusefs_.c fuzz_.c glob_.c graph_.c gzip_.c hname_.c hook_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c interwiki_.c json_.c json_artifact_.c json_branch_.c json_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c loadctrl_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c path_.c piechart_.c pikchr_.c pikchrshow_.c pivot_.c popen_.c pqueue_.c printf_.c publish_.c purge_.c rebuild_.c regexp_.c repolist_.c report_.c rss_.c schema_.c search_.c security_audit_.c setup_.c setupuser_.c sha1_.c sha1hard_.c sha3_.c shun_.c sitemap_.c skins_.c smtp_.c sqlcmd_.c stash_.c stat_.c statrep_.c style_.c sync_.c tag_.c tar_.c terminal_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c unversioned_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c webmail_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c xfer_.c xfersetup_.c zip_.c
34	34
35		-OBJ = $(OBJDIR)\add$O $(OBJDIR)\ajax$O $(OBJDIR)\alerts$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\backlink$O $(OBJDIR)\backoffice$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\builtin$O $(OBJDIR)\bundle$O $(OBJDIR)\cache$O $(OBJDIR)\capabilities$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\cookies$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\deltafunc$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\dispatch$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\etag$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\extcgi$O $(OBJDIR)\file$O $(OBJDIR)\fileedit$O $(OBJDIR)\finfo$O $(OBJDIR)\foci$O $(OBJDIR)\forum$O $(OBJDIR)\fshell$O $(OBJDIR)\fusefs$O $(OBJDIR)\fuzz$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\hname$O $(OBJDIR)\hook$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\interwiki$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_config$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_dir$O $(OBJDIR)\json_finfo$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_status$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_user$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\loadctrl$O $(OBJDIR)\login$O $(OBJDIR)\lookslike$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\markdown$O $(OBJDIR)\markdown_html$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\moderate$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\piechart$O $(OBJDIR)\pikchr$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\publish$O $(OBJDIR)\purge$O $(OBJDIR)\rebuild$O $(OBJDIR)\regexp$O $(OBJDIR)\repolist$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\security_audit$O $(OBJDIR)\setup$O $(OBJDIR)\setupuser$O $(OBJDIR)\sha1$O $(OBJDIR)\sha1hard$O $(OBJDIR)\sha3$O $(OBJDIR)\shun$O $(OBJDIR)\sitemap$O $(OBJDIR)\skins$O $(OBJDIR)\smtp$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\statrep$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\terminal$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\unicode$O $(OBJDIR)\unversioned$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$O $(OBJDIR)\util$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\webmail$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winfile$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
	35	+OBJ = $(OBJDIR)\add$O $(OBJDIR)\ajax$O $(OBJDIR)\alerts$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\backlink$O $(OBJDIR)\backoffice$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\builtin$O $(OBJDIR)\bundle$O $(OBJDIR)\cache$O $(OBJDIR)\capabilities$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\cookies$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\deltafunc$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\dispatch$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\etag$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\extcgi$O $(OBJDIR)\file$O $(OBJDIR)\fileedit$O $(OBJDIR)\finfo$O $(OBJDIR)\foci$O $(OBJDIR)\forum$O $(OBJDIR)\fshell$O $(OBJDIR)\fusefs$O $(OBJDIR)\fuzz$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\hname$O $(OBJDIR)\hook$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\interwiki$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_config$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_dir$O $(OBJDIR)\json_finfo$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_status$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_user$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\loadctrl$O $(OBJDIR)\login$O $(OBJDIR)\lookslike$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\markdown$O $(OBJDIR)\markdown_html$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\moderate$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\piechart$O $(OBJDIR)\pikchr$O $(OBJDIR)\pikchrshow$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\publish$O $(OBJDIR)\purge$O $(OBJDIR)\rebuild$O $(OBJDIR)\regexp$O $(OBJDIR)\repolist$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\security_audit$O $(OBJDIR)\setup$O $(OBJDIR)\setupuser$O $(OBJDIR)\sha1$O $(OBJDIR)\sha1hard$O $(OBJDIR)\sha3$O $(OBJDIR)\shun$O $(OBJDIR)\sitemap$O $(OBJDIR)\skins$O $(OBJDIR)\smtp$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\statrep$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\terminal$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\unicode$O $(OBJDIR)\unversioned$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$O $(OBJDIR)\util$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\webmail$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winfile$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
36	36
37	37
38	38	RC=$(DMDIR)\bin\rcc
39	39	RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__
40	40
		@@ -49,11 +49,11 @@
49	49
50	50	$(OBJDIR)\fossil.res: $B\win\fossil.rc
51	51	$(RC) $(RCFLAGS) -o$@ $**
52	52
53	53	$(OBJDIR)\link: $B\win\Makefile.dmc $(OBJDIR)\fossil.res
54		- +echo add ajax alerts allrepo attach backlink backoffice bag bisect blob branch browse builtin bundle cache capabilities captcha cgi checkin checkout clearsign clone comformat configure content cookies db delta deltacmd deltafunc descendants diff diffcmd dispatch doc encode etag event export extcgi file fileedit finfo foci forum fshell fusefs fuzz glob graph gzip hname hook http http_socket http_ssl http_transport import info interwiki json json_artifact json_branch json_config json_diff json_dir json_finfo json_login json_query json_report json_status json_tag json_timeline json_user json_wiki leaf loadctrl login lookslike main manifest markdown markdown_html md5 merge merge3 moderate name path piechart pikchr pivot popen pqueue printf publish purge rebuild regexp repolist report rss schema search security_audit setup setupuser sha1 sha1hard sha3 shun sitemap skins smtp sqlcmd stash stat statrep style sync tag tar terminal th_main timeline tkt tktsetup undo unicode unversioned update url user utf8 util verify vfile webmail wiki wikiformat winfile winhttp xfer xfersetup zip shell sqlite3 th th_lang > $@
	54	+ +echo add ajax alerts allrepo attach backlink backoffice bag bisect blob branch browse builtin bundle cache capabilities captcha cgi checkin checkout clearsign clone comformat configure content cookies db delta deltacmd deltafunc descendants diff diffcmd dispatch doc encode etag event export extcgi file fileedit finfo foci forum fshell fusefs fuzz glob graph gzip hname hook http http_socket http_ssl http_transport import info interwiki json json_artifact json_branch json_config json_diff json_dir json_finfo json_login json_query json_report json_status json_tag json_timeline json_user json_wiki leaf loadctrl login lookslike main manifest markdown markdown_html md5 merge merge3 moderate name path piechart pikchr pikchrshow pivot popen pqueue printf publish purge rebuild regexp repolist report rss schema search security_audit setup setupuser sha1 sha1hard sha3 shun sitemap skins smtp sqlcmd stash stat statrep style sync tag tar terminal th_main timeline tkt tktsetup undo unicode unversioned update url user utf8 util verify vfile webmail wiki wikiformat winfile winhttp xfer xfersetup zip shell sqlite3 th th_lang > $@
55	55	+echo fossil >> $@
56	56	+echo fossil >> $@
57	57	+echo $(LIBS) >> $@
58	58	+echo. >> $@
59	59	+echo fossil >> $@
		@@ -667,10 +667,16 @@
667	667	$(OBJDIR)\pikchr$O : pikchr_.c pikchr.h
668	668	$(TCC) -o$@ -c pikchr_.c
669	669
670	670	pikchr_.c : $(SRCDIR)\pikchr.c
671	671	+translate$E $** > $@
	672	+
	673	+$(OBJDIR)\pikchrshow$O : pikchrshow_.c pikchrshow.h
	674	+ $(TCC) -o$@ -c pikchrshow_.c
	675	+
	676	+pikchrshow_.c : $(SRCDIR)\pikchrshow.c
	677	+ +translate$E $** > $@
672	678
673	679	$(OBJDIR)\pivot$O : pivot_.c pivot.h
674	680	$(TCC) -o$@ -c pivot_.c
675	681
676	682	pivot_.c : $(SRCDIR)\pivot.c
		@@ -993,7 +999,7 @@
993	999
994	1000	zip_.c : $(SRCDIR)\zip.c
995	1001	+translate$E $** > $@
996	1002
997	1003	headers: makeheaders$E page_index.h builtin_data.h VERSION.h
998		- +makeheaders$E add_.c:add.h ajax_.c:ajax.h alerts_.c:alerts.h allrepo_.c:allrepo.h attach_.c:attach.h backlink_.c:backlink.h backoffice_.c:backoffice.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h builtin_.c:builtin.h bundle_.c:bundle.h cache_.c:cache.h capabilities_.c:capabilities.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h cookies_.c:cookies.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h deltafunc_.c:deltafunc.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h dispatch_.c:dispatch.h doc_.c:doc.h encode_.c:encode.h etag_.c:etag.h event_.c:event.h export_.c:export.h extcgi_.c:extcgi.h file_.c:file.h fileedit_.c:fileedit.h finfo_.c:finfo.h foci_.c:foci.h forum_.c:forum.h fshell_.c:fshell.h fusefs_.c:fusefs.h fuzz_.c:fuzz.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h hname_.c:hname.h hook_.c:hook.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h interwiki_.c:interwiki.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_config_.c:json_config.h json_diff_.c:json_diff.h json_dir_.c:json_dir.h json_finfo_.c:json_finfo.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_status_.c:json_status.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_user_.c:json_user.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h loadctrl_.c:loadctrl.h login_.c:login.h lookslike_.c:lookslike.h main_.c:main.h manifest_.c:manifest.h markdown_.c:markdown.h markdown_html_.c:markdown_html.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h moderate_.c:moderate.h name_.c:name.h path_.c:path.h piechart_.c:piechart.h pikchr_.c:pikchr.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h publish_.c:publish.h purge_.c:purge.h rebuild_.c:rebuild.h regexp_.c:regexp.h repolist_.c:repolist.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h security_audit_.c:security_audit.h setup_.c:setup.h setupuser_.c:setupuser.h sha1_.c:sha1.h sha1hard_.c:sha1hard.h sha3_.c:sha3.h shun_.c:shun.h sitemap_.c:sitemap.h skins_.c:skins.h smtp_.c:smtp.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h statrep_.c:statrep.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h terminal_.c:terminal.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h unicode_.c:unicode.h unversioned_.c:unversioned.h update_.c:update.h url_.c:url.h user_.c:user.h utf8_.c:utf8.h util_.c:util.h verify_.c:verify.h vfile_.c:vfile.h webmail_.c:webmail.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winfile_.c:winfile.h winhttp_.c:winhttp.h xfer_.c:xfer.h xfersetup_.c:xfersetup.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h
	1004	+ +makeheaders$E add_.c:add.h ajax_.c:ajax.h alerts_.c:alerts.h allrepo_.c:allrepo.h attach_.c:attach.h backlink_.c:backlink.h backoffice_.c:backoffice.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h builtin_.c:builtin.h bundle_.c:bundle.h cache_.c:cache.h capabilities_.c:capabilities.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h cookies_.c:cookies.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h deltafunc_.c:deltafunc.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h dispatch_.c:dispatch.h doc_.c:doc.h encode_.c:encode.h etag_.c:etag.h event_.c:event.h export_.c:export.h extcgi_.c:extcgi.h file_.c:file.h fileedit_.c:fileedit.h finfo_.c:finfo.h foci_.c:foci.h forum_.c:forum.h fshell_.c:fshell.h fusefs_.c:fusefs.h fuzz_.c:fuzz.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h hname_.c:hname.h hook_.c:hook.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h interwiki_.c:interwiki.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_config_.c:json_config.h json_diff_.c:json_diff.h json_dir_.c:json_dir.h json_finfo_.c:json_finfo.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_status_.c:json_status.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_user_.c:json_user.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h loadctrl_.c:loadctrl.h login_.c:login.h lookslike_.c:lookslike.h main_.c:main.h manifest_.c:manifest.h markdown_.c:markdown.h markdown_html_.c:markdown_html.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h moderate_.c:moderate.h name_.c:name.h path_.c:path.h piechart_.c:piechart.h pikchr_.c:pikchr.h pikchrshow_.c:pikchrshow.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h publish_.c:publish.h purge_.c:purge.h rebuild_.c:rebuild.h regexp_.c:regexp.h repolist_.c:repolist.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h security_audit_.c:security_audit.h setup_.c:setup.h setupuser_.c:setupuser.h sha1_.c:sha1.h sha1hard_.c:sha1hard.h sha3_.c:sha3.h shun_.c:shun.h sitemap_.c:sitemap.h skins_.c:skins.h smtp_.c:smtp.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h statrep_.c:statrep.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h terminal_.c:terminal.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h unicode_.c:unicode.h unversioned_.c:unversioned.h update_.c:update.h url_.c:url.h user_.c:user.h utf8_.c:utf8.h util_.c:util.h verify_.c:verify.h vfile_.c:vfile.h webmail_.c:webmail.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winfile_.c:winfile.h winhttp_.c:winhttp.h xfer_.c:xfer.h xfersetup_.c:xfersetup.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h
999	1005	@copy /Y nul: headers
1000	1006

	--- win/Makefile.dmc
	+++ win/Makefile.dmc
	@@ -28,13 +28,13 @@
28
29	SQLITE_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_USE_ALLOCA -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_INTROSPECTION_PRAGMAS -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0
30
31	SHELL_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_USE_ALLOCA -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_INTROSPECTION_PRAGMAS -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -Dmain=sqlite3_shell -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
32
33	SRC = add_.c ajax_.c alerts_.c allrepo_.c attach_.c backlink_.c backoffice_.c bag_.c bisect_.c blob_.c branch_.c browse_.c builtin_.c bundle_.c cache_.c capabilities_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c cookies_.c db_.c delta_.c deltacmd_.c deltafunc_.c descendants_.c diff_.c diffcmd_.c dispatch_.c doc_.c encode_.c etag_.c event_.c export_.c extcgi_.c file_.c fileedit_.c finfo_.c foci_.c forum_.c fshell_.c fusefs_.c fuzz_.c glob_.c graph_.c gzip_.c hname_.c hook_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c interwiki_.c json_.c json_artifact_.c json_branch_.c json_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c loadctrl_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c path_.c piechart_.c pikchr_.c pivot_.c popen_.c pqueue_.c printf_.c publish_.c purge_.c rebuild_.c regexp_.c repolist_.c report_.c rss_.c schema_.c search_.c security_audit_.c setup_.c setupuser_.c sha1_.c sha1hard_.c sha3_.c shun_.c sitemap_.c skins_.c smtp_.c sqlcmd_.c stash_.c stat_.c statrep_.c style_.c sync_.c tag_.c tar_.c terminal_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c unversioned_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c webmail_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c xfer_.c xfersetup_.c zip_.c
34
35	OBJ = $(OBJDIR)\add$O $(OBJDIR)\ajax$O $(OBJDIR)\alerts$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\backlink$O $(OBJDIR)\backoffice$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\builtin$O $(OBJDIR)\bundle$O $(OBJDIR)\cache$O $(OBJDIR)\capabilities$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\cookies$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\deltafunc$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\dispatch$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\etag$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\extcgi$O $(OBJDIR)\file$O $(OBJDIR)\fileedit$O $(OBJDIR)\finfo$O $(OBJDIR)\foci$O $(OBJDIR)\forum$O $(OBJDIR)\fshell$O $(OBJDIR)\fusefs$O $(OBJDIR)\fuzz$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\hname$O $(OBJDIR)\hook$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\interwiki$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_config$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_dir$O $(OBJDIR)\json_finfo$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_status$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_user$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\loadctrl$O $(OBJDIR)\login$O $(OBJDIR)\lookslike$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\markdown$O $(OBJDIR)\markdown_html$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\moderate$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\piechart$O $(OBJDIR)\pikchr$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\publish$O $(OBJDIR)\purge$O $(OBJDIR)\rebuild$O $(OBJDIR)\regexp$O $(OBJDIR)\repolist$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\security_audit$O $(OBJDIR)\setup$O $(OBJDIR)\setupuser$O $(OBJDIR)\sha1$O $(OBJDIR)\sha1hard$O $(OBJDIR)\sha3$O $(OBJDIR)\shun$O $(OBJDIR)\sitemap$O $(OBJDIR)\skins$O $(OBJDIR)\smtp$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\statrep$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\terminal$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\unicode$O $(OBJDIR)\unversioned$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$O $(OBJDIR)\util$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\webmail$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winfile$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
36
37
38	RC=$(DMDIR)\bin\rcc
39	RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__
40
	@@ -49,11 +49,11 @@
49
50	$(OBJDIR)\fossil.res: $B\win\fossil.rc
51	$(RC) $(RCFLAGS) -o$@ $**
52
53	$(OBJDIR)\link: $B\win\Makefile.dmc $(OBJDIR)\fossil.res
54	+echo add ajax alerts allrepo attach backlink backoffice bag bisect blob branch browse builtin bundle cache capabilities captcha cgi checkin checkout clearsign clone comformat configure content cookies db delta deltacmd deltafunc descendants diff diffcmd dispatch doc encode etag event export extcgi file fileedit finfo foci forum fshell fusefs fuzz glob graph gzip hname hook http http_socket http_ssl http_transport import info interwiki json json_artifact json_branch json_config json_diff json_dir json_finfo json_login json_query json_report json_status json_tag json_timeline json_user json_wiki leaf loadctrl login lookslike main manifest markdown markdown_html md5 merge merge3 moderate name path piechart pikchr pivot popen pqueue printf publish purge rebuild regexp repolist report rss schema search security_audit setup setupuser sha1 sha1hard sha3 shun sitemap skins smtp sqlcmd stash stat statrep style sync tag tar terminal th_main timeline tkt tktsetup undo unicode unversioned update url user utf8 util verify vfile webmail wiki wikiformat winfile winhttp xfer xfersetup zip shell sqlite3 th th_lang > $@
55	+echo fossil >> $@
56	+echo fossil >> $@
57	+echo $(LIBS) >> $@
58	+echo. >> $@
59	+echo fossil >> $@
	@@ -667,10 +667,16 @@
667	$(OBJDIR)\pikchr$O : pikchr_.c pikchr.h
668	$(TCC) -o$@ -c pikchr_.c
669
670	pikchr_.c : $(SRCDIR)\pikchr.c
671	+translate$E $** > $@






672
673	$(OBJDIR)\pivot$O : pivot_.c pivot.h
674	$(TCC) -o$@ -c pivot_.c
675
676	pivot_.c : $(SRCDIR)\pivot.c
	@@ -993,7 +999,7 @@
993
994	zip_.c : $(SRCDIR)\zip.c
995	+translate$E $** > $@
996
997	headers: makeheaders$E page_index.h builtin_data.h VERSION.h
998	+makeheaders$E add_.c:add.h ajax_.c:ajax.h alerts_.c:alerts.h allrepo_.c:allrepo.h attach_.c:attach.h backlink_.c:backlink.h backoffice_.c:backoffice.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h builtin_.c:builtin.h bundle_.c:bundle.h cache_.c:cache.h capabilities_.c:capabilities.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h cookies_.c:cookies.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h deltafunc_.c:deltafunc.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h dispatch_.c:dispatch.h doc_.c:doc.h encode_.c:encode.h etag_.c:etag.h event_.c:event.h export_.c:export.h extcgi_.c:extcgi.h file_.c:file.h fileedit_.c:fileedit.h finfo_.c:finfo.h foci_.c:foci.h forum_.c:forum.h fshell_.c:fshell.h fusefs_.c:fusefs.h fuzz_.c:fuzz.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h hname_.c:hname.h hook_.c:hook.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h interwiki_.c:interwiki.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_config_.c:json_config.h json_diff_.c:json_diff.h json_dir_.c:json_dir.h json_finfo_.c:json_finfo.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_status_.c:json_status.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_user_.c:json_user.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h loadctrl_.c:loadctrl.h login_.c:login.h lookslike_.c:lookslike.h main_.c:main.h manifest_.c:manifest.h markdown_.c:markdown.h markdown_html_.c:markdown_html.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h moderate_.c:moderate.h name_.c:name.h path_.c:path.h piechart_.c:piechart.h pikchr_.c:pikchr.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h publish_.c:publish.h purge_.c:purge.h rebuild_.c:rebuild.h regexp_.c:regexp.h repolist_.c:repolist.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h security_audit_.c:security_audit.h setup_.c:setup.h setupuser_.c:setupuser.h sha1_.c:sha1.h sha1hard_.c:sha1hard.h sha3_.c:sha3.h shun_.c:shun.h sitemap_.c:sitemap.h skins_.c:skins.h smtp_.c:smtp.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h statrep_.c:statrep.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h terminal_.c:terminal.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h unicode_.c:unicode.h unversioned_.c:unversioned.h update_.c:update.h url_.c:url.h user_.c:user.h utf8_.c:utf8.h util_.c:util.h verify_.c:verify.h vfile_.c:vfile.h webmail_.c:webmail.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winfile_.c:winfile.h winhttp_.c:winhttp.h xfer_.c:xfer.h xfersetup_.c:xfersetup.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h
999	@copy /Y nul: headers
1000

	--- win/Makefile.dmc
	+++ win/Makefile.dmc
	@@ -28,13 +28,13 @@
28
29	SQLITE_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_USE_ALLOCA -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_INTROSPECTION_PRAGMAS -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0
30
31	SHELL_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_USE_ALLOCA -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_INTROSPECTION_PRAGMAS -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -Dmain=sqlite3_shell -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
32
33	SRC = add_.c ajax_.c alerts_.c allrepo_.c attach_.c backlink_.c backoffice_.c bag_.c bisect_.c blob_.c branch_.c browse_.c builtin_.c bundle_.c cache_.c capabilities_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c cookies_.c db_.c delta_.c deltacmd_.c deltafunc_.c descendants_.c diff_.c diffcmd_.c dispatch_.c doc_.c encode_.c etag_.c event_.c export_.c extcgi_.c file_.c fileedit_.c finfo_.c foci_.c forum_.c fshell_.c fusefs_.c fuzz_.c glob_.c graph_.c gzip_.c hname_.c hook_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c interwiki_.c json_.c json_artifact_.c json_branch_.c json_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c loadctrl_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c path_.c piechart_.c pikchr_.c pikchrshow_.c pivot_.c popen_.c pqueue_.c printf_.c publish_.c purge_.c rebuild_.c regexp_.c repolist_.c report_.c rss_.c schema_.c search_.c security_audit_.c setup_.c setupuser_.c sha1_.c sha1hard_.c sha3_.c shun_.c sitemap_.c skins_.c smtp_.c sqlcmd_.c stash_.c stat_.c statrep_.c style_.c sync_.c tag_.c tar_.c terminal_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c unversioned_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c webmail_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c xfer_.c xfersetup_.c zip_.c
34
35	OBJ = $(OBJDIR)\add$O $(OBJDIR)\ajax$O $(OBJDIR)\alerts$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\backlink$O $(OBJDIR)\backoffice$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\builtin$O $(OBJDIR)\bundle$O $(OBJDIR)\cache$O $(OBJDIR)\capabilities$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\cookies$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\deltafunc$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\dispatch$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\etag$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\extcgi$O $(OBJDIR)\file$O $(OBJDIR)\fileedit$O $(OBJDIR)\finfo$O $(OBJDIR)\foci$O $(OBJDIR)\forum$O $(OBJDIR)\fshell$O $(OBJDIR)\fusefs$O $(OBJDIR)\fuzz$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\hname$O $(OBJDIR)\hook$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\interwiki$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_config$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_dir$O $(OBJDIR)\json_finfo$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_status$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_user$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\loadctrl$O $(OBJDIR)\login$O $(OBJDIR)\lookslike$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\markdown$O $(OBJDIR)\markdown_html$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\moderate$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\piechart$O $(OBJDIR)\pikchr$O $(OBJDIR)\pikchrshow$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\publish$O $(OBJDIR)\purge$O $(OBJDIR)\rebuild$O $(OBJDIR)\regexp$O $(OBJDIR)\repolist$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\security_audit$O $(OBJDIR)\setup$O $(OBJDIR)\setupuser$O $(OBJDIR)\sha1$O $(OBJDIR)\sha1hard$O $(OBJDIR)\sha3$O $(OBJDIR)\shun$O $(OBJDIR)\sitemap$O $(OBJDIR)\skins$O $(OBJDIR)\smtp$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\statrep$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\terminal$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\unicode$O $(OBJDIR)\unversioned$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$O $(OBJDIR)\util$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\webmail$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winfile$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
36
37
38	RC=$(DMDIR)\bin\rcc
39	RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__
40
	@@ -49,11 +49,11 @@
49
50	$(OBJDIR)\fossil.res: $B\win\fossil.rc
51	$(RC) $(RCFLAGS) -o$@ $**
52
53	$(OBJDIR)\link: $B\win\Makefile.dmc $(OBJDIR)\fossil.res
54	+echo add ajax alerts allrepo attach backlink backoffice bag bisect blob branch browse builtin bundle cache capabilities captcha cgi checkin checkout clearsign clone comformat configure content cookies db delta deltacmd deltafunc descendants diff diffcmd dispatch doc encode etag event export extcgi file fileedit finfo foci forum fshell fusefs fuzz glob graph gzip hname hook http http_socket http_ssl http_transport import info interwiki json json_artifact json_branch json_config json_diff json_dir json_finfo json_login json_query json_report json_status json_tag json_timeline json_user json_wiki leaf loadctrl login lookslike main manifest markdown markdown_html md5 merge merge3 moderate name path piechart pikchr pikchrshow pivot popen pqueue printf publish purge rebuild regexp repolist report rss schema search security_audit setup setupuser sha1 sha1hard sha3 shun sitemap skins smtp sqlcmd stash stat statrep style sync tag tar terminal th_main timeline tkt tktsetup undo unicode unversioned update url user utf8 util verify vfile webmail wiki wikiformat winfile winhttp xfer xfersetup zip shell sqlite3 th th_lang > $@
55	+echo fossil >> $@
56	+echo fossil >> $@
57	+echo $(LIBS) >> $@
58	+echo. >> $@
59	+echo fossil >> $@
	@@ -667,10 +667,16 @@
667	$(OBJDIR)\pikchr$O : pikchr_.c pikchr.h
668	$(TCC) -o$@ -c pikchr_.c
669
670	pikchr_.c : $(SRCDIR)\pikchr.c
671	+translate$E $** > $@
672
673	$(OBJDIR)\pikchrshow$O : pikchrshow_.c pikchrshow.h
674	$(TCC) -o$@ -c pikchrshow_.c
675
676	pikchrshow_.c : $(SRCDIR)\pikchrshow.c
677	+translate$E $** > $@
678
679	$(OBJDIR)\pivot$O : pivot_.c pivot.h
680	$(TCC) -o$@ -c pivot_.c
681
682	pivot_.c : $(SRCDIR)\pivot.c
	@@ -993,7 +999,7 @@
999
1000	zip_.c : $(SRCDIR)\zip.c
1001	+translate$E $** > $@
1002
1003	headers: makeheaders$E page_index.h builtin_data.h VERSION.h
1004	+makeheaders$E add_.c:add.h ajax_.c:ajax.h alerts_.c:alerts.h allrepo_.c:allrepo.h attach_.c:attach.h backlink_.c:backlink.h backoffice_.c:backoffice.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h builtin_.c:builtin.h bundle_.c:bundle.h cache_.c:cache.h capabilities_.c:capabilities.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h cookies_.c:cookies.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h deltafunc_.c:deltafunc.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h dispatch_.c:dispatch.h doc_.c:doc.h encode_.c:encode.h etag_.c:etag.h event_.c:event.h export_.c:export.h extcgi_.c:extcgi.h file_.c:file.h fileedit_.c:fileedit.h finfo_.c:finfo.h foci_.c:foci.h forum_.c:forum.h fshell_.c:fshell.h fusefs_.c:fusefs.h fuzz_.c:fuzz.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h hname_.c:hname.h hook_.c:hook.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h interwiki_.c:interwiki.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_config_.c:json_config.h json_diff_.c:json_diff.h json_dir_.c:json_dir.h json_finfo_.c:json_finfo.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_status_.c:json_status.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_user_.c:json_user.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h loadctrl_.c:loadctrl.h login_.c:login.h lookslike_.c:lookslike.h main_.c:main.h manifest_.c:manifest.h markdown_.c:markdown.h markdown_html_.c:markdown_html.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h moderate_.c:moderate.h name_.c:name.h path_.c:path.h piechart_.c:piechart.h pikchr_.c:pikchr.h pikchrshow_.c:pikchrshow.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h publish_.c:publish.h purge_.c:purge.h rebuild_.c:rebuild.h regexp_.c:regexp.h repolist_.c:repolist.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h security_audit_.c:security_audit.h setup_.c:setup.h setupuser_.c:setupuser.h sha1_.c:sha1.h sha1hard_.c:sha1hard.h sha3_.c:sha3.h shun_.c:shun.h sitemap_.c:sitemap.h skins_.c:skins.h smtp_.c:smtp.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h statrep_.c:statrep.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h terminal_.c:terminal.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h unicode_.c:unicode.h unversioned_.c:unversioned.h update_.c:update.h url_.c:url.h user_.c:user.h utf8_.c:utf8.h util_.c:util.h verify_.c:verify.h vfile_.c:vfile.h webmail_.c:webmail.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winfile_.c:winfile.h winhttp_.c:winhttp.h xfer_.c:xfer.h xfersetup_.c:xfersetup.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h
1005	@copy /Y nul: headers
1006

M win/Makefile.mingw

+13

		--- win/Makefile.mingw
		+++ win/Makefile.mingw
		@@ -517,10 +517,11 @@
517	517	$(SRCDIR)/moderate.c \
518	518	$(SRCDIR)/name.c \
519	519	$(SRCDIR)/path.c \
520	520	$(SRCDIR)/piechart.c \
521	521	$(SRCDIR)/pikchr.c \
	522	+ $(SRCDIR)/pikchrshow.c \
522	523	$(SRCDIR)/pivot.c \
523	524	$(SRCDIR)/popen.c \
524	525	$(SRCDIR)/pqueue.c \
525	526	$(SRCDIR)/printf.c \
526	527	$(SRCDIR)/publish.c \
		@@ -643,10 +644,11 @@
643	644	$(SRCDIR)/fossil.dom.js \
644	645	$(SRCDIR)/fossil.fetch.js \
645	646	$(SRCDIR)/fossil.numbered-lines.js \
646	647	$(SRCDIR)/fossil.page.fileedit.js \
647	648	$(SRCDIR)/fossil.page.forumpost.js \
	649	+ $(SRCDIR)/fossil.page.pikchrshow.js \
648	650	$(SRCDIR)/fossil.page.wikiedit-wysiwyg-legacy.js \
649	651	$(SRCDIR)/fossil.page.wikiedit.js \
650	652	$(SRCDIR)/fossil.popupwidget.js \
651	653	$(SRCDIR)/fossil.storage.js \
652	654	$(SRCDIR)/fossil.tabs.js \
		@@ -772,10 +774,11 @@
772	774	$(OBJDIR)/moderate_.c \
773	775	$(OBJDIR)/name_.c \
774	776	$(OBJDIR)/path_.c \
775	777	$(OBJDIR)/piechart_.c \
776	778	$(OBJDIR)/pikchr_.c \
	779	+ $(OBJDIR)/pikchrshow_.c \
777	780	$(OBJDIR)/pivot_.c \
778	781	$(OBJDIR)/popen_.c \
779	782	$(OBJDIR)/pqueue_.c \
780	783	$(OBJDIR)/printf_.c \
781	784	$(OBJDIR)/publish_.c \
		@@ -919,10 +922,11 @@
919	922	$(OBJDIR)/moderate.o \
920	923	$(OBJDIR)/name.o \
921	924	$(OBJDIR)/path.o \
922	925	$(OBJDIR)/piechart.o \
923	926	$(OBJDIR)/pikchr.o \
	927	+ $(OBJDIR)/pikchrshow.o \
924	928	$(OBJDIR)/pivot.o \
925	929	$(OBJDIR)/popen.o \
926	930	$(OBJDIR)/pqueue.o \
927	931	$(OBJDIR)/printf.o \
928	932	$(OBJDIR)/publish.o \
		@@ -1281,10 +1285,11 @@
1281	1285	$(OBJDIR)/moderate_.c:$(OBJDIR)/moderate.h \
1282	1286	$(OBJDIR)/name_.c:$(OBJDIR)/name.h \
1283	1287	$(OBJDIR)/path_.c:$(OBJDIR)/path.h \
1284	1288	$(OBJDIR)/piechart_.c:$(OBJDIR)/piechart.h \
1285	1289	$(OBJDIR)/pikchr_.c:$(OBJDIR)/pikchr.h \
	1290	+ $(OBJDIR)/pikchrshow_.c:$(OBJDIR)/pikchrshow.h \
1286	1291	$(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h \
1287	1292	$(OBJDIR)/popen_.c:$(OBJDIR)/popen.h \
1288	1293	$(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h \
1289	1294	$(OBJDIR)/printf_.c:$(OBJDIR)/printf.h \
1290	1295	$(OBJDIR)/publish_.c:$(OBJDIR)/publish.h \
		@@ -2071,10 +2076,18 @@
2071	2076
2072	2077	$(OBJDIR)/pikchr.o: $(OBJDIR)/pikchr_.c $(OBJDIR)/pikchr.h $(SRCDIR)/config.h
2073	2078	$(XTCC) -o $(OBJDIR)/pikchr.o -c $(OBJDIR)/pikchr_.c
2074	2079
2075	2080	$(OBJDIR)/pikchr.h: $(OBJDIR)/headers
	2081	+
	2082	+$(OBJDIR)/pikchrshow_.c: $(SRCDIR)/pikchrshow.c $(TRANSLATE)
	2083	+ $(TRANSLATE) $(SRCDIR)/pikchrshow.c >$@
	2084	+
	2085	+$(OBJDIR)/pikchrshow.o: $(OBJDIR)/pikchrshow_.c $(OBJDIR)/pikchrshow.h $(SRCDIR)/config.h
	2086	+ $(XTCC) -o $(OBJDIR)/pikchrshow.o -c $(OBJDIR)/pikchrshow_.c
	2087	+
	2088	+$(OBJDIR)/pikchrshow.h: $(OBJDIR)/headers
2076	2089
2077	2090	$(OBJDIR)/pivot_.c: $(SRCDIR)/pivot.c $(TRANSLATE)
2078	2091	$(TRANSLATE) $(SRCDIR)/pivot.c >$@
2079	2092
2080	2093	$(OBJDIR)/pivot.o: $(OBJDIR)/pivot_.c $(OBJDIR)/pivot.h $(SRCDIR)/config.h
2081	2094

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -517,10 +517,11 @@
517	$(SRCDIR)/moderate.c \
518	$(SRCDIR)/name.c \
519	$(SRCDIR)/path.c \
520	$(SRCDIR)/piechart.c \
521	$(SRCDIR)/pikchr.c \

522	$(SRCDIR)/pivot.c \
523	$(SRCDIR)/popen.c \
524	$(SRCDIR)/pqueue.c \
525	$(SRCDIR)/printf.c \
526	$(SRCDIR)/publish.c \
	@@ -643,10 +644,11 @@
643	$(SRCDIR)/fossil.dom.js \
644	$(SRCDIR)/fossil.fetch.js \
645	$(SRCDIR)/fossil.numbered-lines.js \
646	$(SRCDIR)/fossil.page.fileedit.js \
647	$(SRCDIR)/fossil.page.forumpost.js \

648	$(SRCDIR)/fossil.page.wikiedit-wysiwyg-legacy.js \
649	$(SRCDIR)/fossil.page.wikiedit.js \
650	$(SRCDIR)/fossil.popupwidget.js \
651	$(SRCDIR)/fossil.storage.js \
652	$(SRCDIR)/fossil.tabs.js \
	@@ -772,10 +774,11 @@
772	$(OBJDIR)/moderate_.c \
773	$(OBJDIR)/name_.c \
774	$(OBJDIR)/path_.c \
775	$(OBJDIR)/piechart_.c \
776	$(OBJDIR)/pikchr_.c \

777	$(OBJDIR)/pivot_.c \
778	$(OBJDIR)/popen_.c \
779	$(OBJDIR)/pqueue_.c \
780	$(OBJDIR)/printf_.c \
781	$(OBJDIR)/publish_.c \
	@@ -919,10 +922,11 @@
919	$(OBJDIR)/moderate.o \
920	$(OBJDIR)/name.o \
921	$(OBJDIR)/path.o \
922	$(OBJDIR)/piechart.o \
923	$(OBJDIR)/pikchr.o \

924	$(OBJDIR)/pivot.o \
925	$(OBJDIR)/popen.o \
926	$(OBJDIR)/pqueue.o \
927	$(OBJDIR)/printf.o \
928	$(OBJDIR)/publish.o \
	@@ -1281,10 +1285,11 @@
1281	$(OBJDIR)/moderate_.c:$(OBJDIR)/moderate.h \
1282	$(OBJDIR)/name_.c:$(OBJDIR)/name.h \
1283	$(OBJDIR)/path_.c:$(OBJDIR)/path.h \
1284	$(OBJDIR)/piechart_.c:$(OBJDIR)/piechart.h \
1285	$(OBJDIR)/pikchr_.c:$(OBJDIR)/pikchr.h \

1286	$(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h \
1287	$(OBJDIR)/popen_.c:$(OBJDIR)/popen.h \
1288	$(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h \
1289	$(OBJDIR)/printf_.c:$(OBJDIR)/printf.h \
1290	$(OBJDIR)/publish_.c:$(OBJDIR)/publish.h \
	@@ -2071,10 +2076,18 @@
2071
2072	$(OBJDIR)/pikchr.o: $(OBJDIR)/pikchr_.c $(OBJDIR)/pikchr.h $(SRCDIR)/config.h
2073	$(XTCC) -o $(OBJDIR)/pikchr.o -c $(OBJDIR)/pikchr_.c
2074
2075	$(OBJDIR)/pikchr.h: $(OBJDIR)/headers








2076
2077	$(OBJDIR)/pivot_.c: $(SRCDIR)/pivot.c $(TRANSLATE)
2078	$(TRANSLATE) $(SRCDIR)/pivot.c >$@
2079
2080	$(OBJDIR)/pivot.o: $(OBJDIR)/pivot_.c $(OBJDIR)/pivot.h $(SRCDIR)/config.h
2081

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -517,10 +517,11 @@
517	$(SRCDIR)/moderate.c \
518	$(SRCDIR)/name.c \
519	$(SRCDIR)/path.c \
520	$(SRCDIR)/piechart.c \
521	$(SRCDIR)/pikchr.c \
522	$(SRCDIR)/pikchrshow.c \
523	$(SRCDIR)/pivot.c \
524	$(SRCDIR)/popen.c \
525	$(SRCDIR)/pqueue.c \
526	$(SRCDIR)/printf.c \
527	$(SRCDIR)/publish.c \
	@@ -643,10 +644,11 @@
644	$(SRCDIR)/fossil.dom.js \
645	$(SRCDIR)/fossil.fetch.js \
646	$(SRCDIR)/fossil.numbered-lines.js \
647	$(SRCDIR)/fossil.page.fileedit.js \
648	$(SRCDIR)/fossil.page.forumpost.js \
649	$(SRCDIR)/fossil.page.pikchrshow.js \
650	$(SRCDIR)/fossil.page.wikiedit-wysiwyg-legacy.js \
651	$(SRCDIR)/fossil.page.wikiedit.js \
652	$(SRCDIR)/fossil.popupwidget.js \
653	$(SRCDIR)/fossil.storage.js \
654	$(SRCDIR)/fossil.tabs.js \
	@@ -772,10 +774,11 @@
774	$(OBJDIR)/moderate_.c \
775	$(OBJDIR)/name_.c \
776	$(OBJDIR)/path_.c \
777	$(OBJDIR)/piechart_.c \
778	$(OBJDIR)/pikchr_.c \
779	$(OBJDIR)/pikchrshow_.c \
780	$(OBJDIR)/pivot_.c \
781	$(OBJDIR)/popen_.c \
782	$(OBJDIR)/pqueue_.c \
783	$(OBJDIR)/printf_.c \
784	$(OBJDIR)/publish_.c \
	@@ -919,10 +922,11 @@
922	$(OBJDIR)/moderate.o \
923	$(OBJDIR)/name.o \
924	$(OBJDIR)/path.o \
925	$(OBJDIR)/piechart.o \
926	$(OBJDIR)/pikchr.o \
927	$(OBJDIR)/pikchrshow.o \
928	$(OBJDIR)/pivot.o \
929	$(OBJDIR)/popen.o \
930	$(OBJDIR)/pqueue.o \
931	$(OBJDIR)/printf.o \
932	$(OBJDIR)/publish.o \
	@@ -1281,10 +1285,11 @@
1285	$(OBJDIR)/moderate_.c:$(OBJDIR)/moderate.h \
1286	$(OBJDIR)/name_.c:$(OBJDIR)/name.h \
1287	$(OBJDIR)/path_.c:$(OBJDIR)/path.h \
1288	$(OBJDIR)/piechart_.c:$(OBJDIR)/piechart.h \
1289	$(OBJDIR)/pikchr_.c:$(OBJDIR)/pikchr.h \
1290	$(OBJDIR)/pikchrshow_.c:$(OBJDIR)/pikchrshow.h \
1291	$(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h \
1292	$(OBJDIR)/popen_.c:$(OBJDIR)/popen.h \
1293	$(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h \
1294	$(OBJDIR)/printf_.c:$(OBJDIR)/printf.h \
1295	$(OBJDIR)/publish_.c:$(OBJDIR)/publish.h \
	@@ -2071,10 +2076,18 @@
2076
2077	$(OBJDIR)/pikchr.o: $(OBJDIR)/pikchr_.c $(OBJDIR)/pikchr.h $(SRCDIR)/config.h
2078	$(XTCC) -o $(OBJDIR)/pikchr.o -c $(OBJDIR)/pikchr_.c
2079
2080	$(OBJDIR)/pikchr.h: $(OBJDIR)/headers
2081
2082	$(OBJDIR)/pikchrshow_.c: $(SRCDIR)/pikchrshow.c $(TRANSLATE)
2083	$(TRANSLATE) $(SRCDIR)/pikchrshow.c >$@
2084
2085	$(OBJDIR)/pikchrshow.o: $(OBJDIR)/pikchrshow_.c $(OBJDIR)/pikchrshow.h $(SRCDIR)/config.h
2086	$(XTCC) -o $(OBJDIR)/pikchrshow.o -c $(OBJDIR)/pikchrshow_.c
2087
2088	$(OBJDIR)/pikchrshow.h: $(OBJDIR)/headers
2089
2090	$(OBJDIR)/pivot_.c: $(SRCDIR)/pivot.c $(TRANSLATE)
2091	$(TRANSLATE) $(SRCDIR)/pivot.c >$@
2092
2093	$(OBJDIR)/pivot.o: $(OBJDIR)/pivot_.c $(OBJDIR)/pivot.h $(SRCDIR)/config.h
2094

M win/Makefile.msc

+12

		--- win/Makefile.msc
		+++ win/Makefile.msc
		@@ -439,10 +439,11 @@
439	439	"$(OX)\moderate_.c" \
440	440	"$(OX)\name_.c" \
441	441	"$(OX)\path_.c" \
442	442	"$(OX)\piechart_.c" \
443	443	"$(OX)\pikchr_.c" \
	444	+ "$(OX)\pikchrshow_.c" \
444	445	"$(OX)\pivot_.c" \
445	446	"$(OX)\popen_.c" \
446	447	"$(OX)\pqueue_.c" \
447	448	"$(OX)\printf_.c" \
448	449	"$(OX)\publish_.c" \
		@@ -564,10 +565,11 @@
564	565	"$(SRCDIR)\fossil.dom.js" \
565	566	"$(SRCDIR)\fossil.fetch.js" \
566	567	"$(SRCDIR)\fossil.numbered-lines.js" \
567	568	"$(SRCDIR)\fossil.page.fileedit.js" \
568	569	"$(SRCDIR)\fossil.page.forumpost.js" \
	570	+ "$(SRCDIR)\fossil.page.pikchrshow.js" \
569	571	"$(SRCDIR)\fossil.page.wikiedit-wysiwyg-legacy.js" \
570	572	"$(SRCDIR)\fossil.page.wikiedit.js" \
571	573	"$(SRCDIR)\fossil.popupwidget.js" \
572	574	"$(SRCDIR)\fossil.storage.js" \
573	575	"$(SRCDIR)\fossil.tabs.js" \
		@@ -693,10 +695,11 @@
693	695	"$(OX)\moderate$O" \
694	696	"$(OX)\name$O" \
695	697	"$(OX)\path$O" \
696	698	"$(OX)\piechart$O" \
697	699	"$(OX)\pikchr$O" \
	700	+ "$(OX)\pikchrshow$O" \
698	701	"$(OX)\pivot$O" \
699	702	"$(OX)\popen$O" \
700	703	"$(OX)\pqueue$O" \
701	704	"$(OX)\printf$O" \
702	705	"$(OX)\publish$O" \
		@@ -921,10 +924,11 @@
921	924	echo "$(OX)\moderate.obj" >> $@
922	925	echo "$(OX)\name.obj" >> $@
923	926	echo "$(OX)\path.obj" >> $@
924	927	echo "$(OX)\piechart.obj" >> $@
925	928	echo "$(OX)\pikchr.obj" >> $@
	929	+ echo "$(OX)\pikchrshow.obj" >> $@
926	930	echo "$(OX)\pivot.obj" >> $@
927	931	echo "$(OX)\popen.obj" >> $@
928	932	echo "$(OX)\pqueue.obj" >> $@
929	933	echo "$(OX)\printf.obj" >> $@
930	934	echo "$(OX)\publish.obj" >> $@
		@@ -1166,10 +1170,11 @@
1166	1170	echo "$(SRCDIR)\fossil.dom.js" >> $@
1167	1171	echo "$(SRCDIR)\fossil.fetch.js" >> $@
1168	1172	echo "$(SRCDIR)\fossil.numbered-lines.js" >> $@
1169	1173	echo "$(SRCDIR)\fossil.page.fileedit.js" >> $@
1170	1174	echo "$(SRCDIR)\fossil.page.forumpost.js" >> $@
	1175	+ echo "$(SRCDIR)\fossil.page.pikchrshow.js" >> $@
1171	1176	echo "$(SRCDIR)\fossil.page.wikiedit-wysiwyg-legacy.js" >> $@
1172	1177	echo "$(SRCDIR)\fossil.page.wikiedit.js" >> $@
1173	1178	echo "$(SRCDIR)\fossil.popupwidget.js" >> $@
1174	1179	echo "$(SRCDIR)\fossil.storage.js" >> $@
1175	1180	echo "$(SRCDIR)\fossil.tabs.js" >> $@
		@@ -1748,10 +1753,16 @@
1748	1753	"$(OX)\pikchr$O" : "$(OX)\pikchr_.c" "$(OX)\pikchr.h"
1749	1754	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\pikchr_.c"
1750	1755
1751	1756	"$(OX)\pikchr_.c" : "$(SRCDIR)\pikchr.c"
1752	1757	"$(OBJDIR)\translate$E" $** > $@
	1758	+
	1759	+"$(OX)\pikchrshow$O" : "$(OX)\pikchrshow_.c" "$(OX)\pikchrshow.h"
	1760	+ $(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\pikchrshow_.c"
	1761	+
	1762	+"$(OX)\pikchrshow_.c" : "$(SRCDIR)\pikchrshow.c"
	1763	+ "$(OBJDIR)\translate$E" $** > $@
1753	1764
1754	1765	"$(OX)\pivot$O" : "$(OX)\pivot_.c" "$(OX)\pivot.h"
1755	1766	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\pivot_.c"
1756	1767
1757	1768	"$(OX)\pivot_.c" : "$(SRCDIR)\pivot.c"
		@@ -2168,10 +2179,11 @@
2168	2179	"$(OX)\moderate_.c":"$(OX)\moderate.h" \
2169	2180	"$(OX)\name_.c":"$(OX)\name.h" \
2170	2181	"$(OX)\path_.c":"$(OX)\path.h" \
2171	2182	"$(OX)\piechart_.c":"$(OX)\piechart.h" \
2172	2183	"$(OX)\pikchr_.c":"$(OX)\pikchr.h" \
	2184	+ "$(OX)\pikchrshow_.c":"$(OX)\pikchrshow.h" \
2173	2185	"$(OX)\pivot_.c":"$(OX)\pivot.h" \
2174	2186	"$(OX)\popen_.c":"$(OX)\popen.h" \
2175	2187	"$(OX)\pqueue_.c":"$(OX)\pqueue.h" \
2176	2188	"$(OX)\printf_.c":"$(OX)\printf.h" \
2177	2189	"$(OX)\publish_.c":"$(OX)\publish.h" \
2178	2190
2179	2191	DELETED www/branch01.svg
2180	2192	DELETED www/branch02.svg
2181	2193	DELETED www/branch03.svg
2182	2194	DELETED www/branch04.svg
2183	2195	DELETED www/branch06.svg

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -439,10 +439,11 @@
439	"$(OX)\moderate_.c" \
440	"$(OX)\name_.c" \
441	"$(OX)\path_.c" \
442	"$(OX)\piechart_.c" \
443	"$(OX)\pikchr_.c" \

444	"$(OX)\pivot_.c" \
445	"$(OX)\popen_.c" \
446	"$(OX)\pqueue_.c" \
447	"$(OX)\printf_.c" \
448	"$(OX)\publish_.c" \
	@@ -564,10 +565,11 @@
564	"$(SRCDIR)\fossil.dom.js" \
565	"$(SRCDIR)\fossil.fetch.js" \
566	"$(SRCDIR)\fossil.numbered-lines.js" \
567	"$(SRCDIR)\fossil.page.fileedit.js" \
568	"$(SRCDIR)\fossil.page.forumpost.js" \

569	"$(SRCDIR)\fossil.page.wikiedit-wysiwyg-legacy.js" \
570	"$(SRCDIR)\fossil.page.wikiedit.js" \
571	"$(SRCDIR)\fossil.popupwidget.js" \
572	"$(SRCDIR)\fossil.storage.js" \
573	"$(SRCDIR)\fossil.tabs.js" \
	@@ -693,10 +695,11 @@
693	"$(OX)\moderate$O" \
694	"$(OX)\name$O" \
695	"$(OX)\path$O" \
696	"$(OX)\piechart$O" \
697	"$(OX)\pikchr$O" \

698	"$(OX)\pivot$O" \
699	"$(OX)\popen$O" \
700	"$(OX)\pqueue$O" \
701	"$(OX)\printf$O" \
702	"$(OX)\publish$O" \
	@@ -921,10 +924,11 @@
921	echo "$(OX)\moderate.obj" >> $@
922	echo "$(OX)\name.obj" >> $@
923	echo "$(OX)\path.obj" >> $@
924	echo "$(OX)\piechart.obj" >> $@
925	echo "$(OX)\pikchr.obj" >> $@

926	echo "$(OX)\pivot.obj" >> $@
927	echo "$(OX)\popen.obj" >> $@
928	echo "$(OX)\pqueue.obj" >> $@
929	echo "$(OX)\printf.obj" >> $@
930	echo "$(OX)\publish.obj" >> $@
	@@ -1166,10 +1170,11 @@
1166	echo "$(SRCDIR)\fossil.dom.js" >> $@
1167	echo "$(SRCDIR)\fossil.fetch.js" >> $@
1168	echo "$(SRCDIR)\fossil.numbered-lines.js" >> $@
1169	echo "$(SRCDIR)\fossil.page.fileedit.js" >> $@
1170	echo "$(SRCDIR)\fossil.page.forumpost.js" >> $@

1171	echo "$(SRCDIR)\fossil.page.wikiedit-wysiwyg-legacy.js" >> $@
1172	echo "$(SRCDIR)\fossil.page.wikiedit.js" >> $@
1173	echo "$(SRCDIR)\fossil.popupwidget.js" >> $@
1174	echo "$(SRCDIR)\fossil.storage.js" >> $@
1175	echo "$(SRCDIR)\fossil.tabs.js" >> $@
	@@ -1748,10 +1753,16 @@
1748	"$(OX)\pikchr$O" : "$(OX)\pikchr_.c" "$(OX)\pikchr.h"
1749	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\pikchr_.c"
1750
1751	"$(OX)\pikchr_.c" : "$(SRCDIR)\pikchr.c"
1752	"$(OBJDIR)\translate$E" $** > $@






1753
1754	"$(OX)\pivot$O" : "$(OX)\pivot_.c" "$(OX)\pivot.h"
1755	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\pivot_.c"
1756
1757	"$(OX)\pivot_.c" : "$(SRCDIR)\pivot.c"
	@@ -2168,10 +2179,11 @@
2168	"$(OX)\moderate_.c":"$(OX)\moderate.h" \
2169	"$(OX)\name_.c":"$(OX)\name.h" \
2170	"$(OX)\path_.c":"$(OX)\path.h" \
2171	"$(OX)\piechart_.c":"$(OX)\piechart.h" \
2172	"$(OX)\pikchr_.c":"$(OX)\pikchr.h" \

2173	"$(OX)\pivot_.c":"$(OX)\pivot.h" \
2174	"$(OX)\popen_.c":"$(OX)\popen.h" \
2175	"$(OX)\pqueue_.c":"$(OX)\pqueue.h" \
2176	"$(OX)\printf_.c":"$(OX)\printf.h" \
2177	"$(OX)\publish_.c":"$(OX)\publish.h" \
2178
2179	ELETED www/branch01.svg
2180	ELETED www/branch02.svg
2181	ELETED www/branch03.svg
2182	ELETED www/branch04.svg
2183	ELETED www/branch06.svg

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -439,10 +439,11 @@
439	"$(OX)\moderate_.c" \
440	"$(OX)\name_.c" \
441	"$(OX)\path_.c" \
442	"$(OX)\piechart_.c" \
443	"$(OX)\pikchr_.c" \
444	"$(OX)\pikchrshow_.c" \
445	"$(OX)\pivot_.c" \
446	"$(OX)\popen_.c" \
447	"$(OX)\pqueue_.c" \
448	"$(OX)\printf_.c" \
449	"$(OX)\publish_.c" \
	@@ -564,10 +565,11 @@
565	"$(SRCDIR)\fossil.dom.js" \
566	"$(SRCDIR)\fossil.fetch.js" \
567	"$(SRCDIR)\fossil.numbered-lines.js" \
568	"$(SRCDIR)\fossil.page.fileedit.js" \
569	"$(SRCDIR)\fossil.page.forumpost.js" \
570	"$(SRCDIR)\fossil.page.pikchrshow.js" \
571	"$(SRCDIR)\fossil.page.wikiedit-wysiwyg-legacy.js" \
572	"$(SRCDIR)\fossil.page.wikiedit.js" \
573	"$(SRCDIR)\fossil.popupwidget.js" \
574	"$(SRCDIR)\fossil.storage.js" \
575	"$(SRCDIR)\fossil.tabs.js" \
	@@ -693,10 +695,11 @@
695	"$(OX)\moderate$O" \
696	"$(OX)\name$O" \
697	"$(OX)\path$O" \
698	"$(OX)\piechart$O" \
699	"$(OX)\pikchr$O" \
700	"$(OX)\pikchrshow$O" \
701	"$(OX)\pivot$O" \
702	"$(OX)\popen$O" \
703	"$(OX)\pqueue$O" \
704	"$(OX)\printf$O" \
705	"$(OX)\publish$O" \
	@@ -921,10 +924,11 @@
924	echo "$(OX)\moderate.obj" >> $@
925	echo "$(OX)\name.obj" >> $@
926	echo "$(OX)\path.obj" >> $@
927	echo "$(OX)\piechart.obj" >> $@
928	echo "$(OX)\pikchr.obj" >> $@
929	echo "$(OX)\pikchrshow.obj" >> $@
930	echo "$(OX)\pivot.obj" >> $@
931	echo "$(OX)\popen.obj" >> $@
932	echo "$(OX)\pqueue.obj" >> $@
933	echo "$(OX)\printf.obj" >> $@
934	echo "$(OX)\publish.obj" >> $@
	@@ -1166,10 +1170,11 @@
1170	echo "$(SRCDIR)\fossil.dom.js" >> $@
1171	echo "$(SRCDIR)\fossil.fetch.js" >> $@
1172	echo "$(SRCDIR)\fossil.numbered-lines.js" >> $@
1173	echo "$(SRCDIR)\fossil.page.fileedit.js" >> $@
1174	echo "$(SRCDIR)\fossil.page.forumpost.js" >> $@
1175	echo "$(SRCDIR)\fossil.page.pikchrshow.js" >> $@
1176	echo "$(SRCDIR)\fossil.page.wikiedit-wysiwyg-legacy.js" >> $@
1177	echo "$(SRCDIR)\fossil.page.wikiedit.js" >> $@
1178	echo "$(SRCDIR)\fossil.popupwidget.js" >> $@
1179	echo "$(SRCDIR)\fossil.storage.js" >> $@
1180	echo "$(SRCDIR)\fossil.tabs.js" >> $@
	@@ -1748,10 +1753,16 @@
1753	"$(OX)\pikchr$O" : "$(OX)\pikchr_.c" "$(OX)\pikchr.h"
1754	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\pikchr_.c"
1755
1756	"$(OX)\pikchr_.c" : "$(SRCDIR)\pikchr.c"
1757	"$(OBJDIR)\translate$E" $** > $@
1758
1759	"$(OX)\pikchrshow$O" : "$(OX)\pikchrshow_.c" "$(OX)\pikchrshow.h"
1760	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\pikchrshow_.c"
1761
1762	"$(OX)\pikchrshow_.c" : "$(SRCDIR)\pikchrshow.c"
1763	"$(OBJDIR)\translate$E" $** > $@
1764
1765	"$(OX)\pivot$O" : "$(OX)\pivot_.c" "$(OX)\pivot.h"
1766	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\pivot_.c"
1767
1768	"$(OX)\pivot_.c" : "$(SRCDIR)\pivot.c"
	@@ -2168,10 +2179,11 @@
2179	"$(OX)\moderate_.c":"$(OX)\moderate.h" \
2180	"$(OX)\name_.c":"$(OX)\name.h" \
2181	"$(OX)\path_.c":"$(OX)\path.h" \
2182	"$(OX)\piechart_.c":"$(OX)\piechart.h" \
2183	"$(OX)\pikchr_.c":"$(OX)\pikchr.h" \
2184	"$(OX)\pikchrshow_.c":"$(OX)\pikchrshow.h" \
2185	"$(OX)\pivot_.c":"$(OX)\pivot.h" \
2186	"$(OX)\popen_.c":"$(OX)\popen.h" \
2187	"$(OX)\pqueue_.c":"$(OX)\pqueue.h" \
2188	"$(OX)\printf_.c":"$(OX)\printf.h" \
2189	"$(OX)\publish_.c":"$(OX)\publish.h" \
2190
2191	ELETED www/branch01.svg
2192	ELETED www/branch02.svg
2193	ELETED www/branch03.svg
2194	ELETED www/branch04.svg
2195	ELETED www/branch06.svg

D www/branch01.svg

-228

		--- a/www/branch01.svg
		+++ b/www/branch01.svg
		@@ -1,228 +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="211"
11		- stroke-miterlimit="10"
12		- font-weight="normal"
13		- height="32"
14		- font-style="normal"
15		- font-size="12px"
16		- id="svg2"
17		- version="1.1"
18		- inkscape:version="0.91 r13725"
19		- sodipodi:docname="branch01.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="metadata61">
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="1240"
43		- inkscape:window-height="1382"
44		- id="namedview59"
45		- showgrid="false"
46		- inkscape:zoom="0.17717718"
47		- inkscape:cx="106"
48		- inkscape:cy="15.833008"
49		- inkscape:window-x="0"
50		- inkscape:window-y="0"
51		- inkscape:window-maximized="0"
52		- inkscape:current-layer="svg2"
53		- fit-margin-top="0"
54		- fit-margin-left="0"
55		- fit-margin-right="0"
56		- fit-margin-bottom="0" />
57		- <!--Generated by ySVG 2.5-->
58		- <defs
59		- id="genericDefs" />
60		- <g
61		- id="g5"
62		- transform="translate(-261.5,-649.83301)">
63		- <g
64		- transform="translate(206,1954)"
65		- id="g7"
66		- style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
67		- <circle
68		- r="15"
69		- clip-path="url(#clipPath2)"
70		- cx="71.5"
71		- cy="-1288.167"
72		- id="circle9"
73		- style="stroke:none" />
74		- </g>
75		- <g
76		- stroke-miterlimit="1.45"
77		- transform="translate(206,1954)"
78		- id="g11"
79		- style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
80		- <circle
81		- r="15"
82		- clip-path="url(#clipPath2)"
83		- cx="71.5"
84		- cy="-1288.167"
85		- id="circle13"
86		- style="fill:none" />
87		- <text
88		- x="67.7061"
89		- y="-1283.6318"
90		- clip-path="url(#clipPath2)"
91		- xml:space="preserve"
92		- id="text15"
93		- style="font-family:sans-serif;stroke:none;stroke-width:1">1</text>
94		- </g>
95		- <g
96		- transform="translate(206,1954)"
97		- id="g17"
98		- style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
99		- <circle
100		- r="15"
101		- clip-path="url(#clipPath2)"
102		- cx="131.5"
103		- cy="-1288.167"
104		- id="circle19"
105		- style="stroke:none" />
106		- </g>
107		- <g
108		- stroke-miterlimit="1.45"
109		- transform="translate(206,1954)"
110		- id="g21"
111		- style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
112		- <circle
113		- r="15"
114		- clip-path="url(#clipPath2)"
115		- cx="131.5"
116		- cy="-1288.167"
117		- id="circle23"
118		- style="fill:none" />
119		- <text
120		- x="127.7061"
121		- y="-1283.6318"
122		- clip-path="url(#clipPath2)"
123		- xml:space="preserve"
124		- id="text25"
125		- style="font-family:sans-serif;stroke:none;stroke-width:1">2</text>
126		- </g>
127		- <g
128		- transform="translate(206,1954)"
129		- id="g27"
130		- style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
131		- <circle
132		- r="15"
133		- clip-path="url(#clipPath2)"
134		- cx="191.5"
135		- cy="-1288.167"
136		- id="circle29"
137		- style="stroke:none" />
138		- </g>
139		- <g
140		- stroke-miterlimit="1.45"
141		- transform="translate(206,1954)"
142		- id="g31"
143		- style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
144		- <circle
145		- r="15"
146		- clip-path="url(#clipPath2)"
147		- cx="191.5"
148		- cy="-1288.167"
149		- id="circle33"
150		- style="fill:none" />
151		- <text
152		- x="187.7061"
153		- y="-1283.6318"
154		- clip-path="url(#clipPath2)"
155		- xml:space="preserve"
156		- id="text35"
157		- style="font-family:sans-serif;stroke:none;stroke-width:1">3</text>
158		- </g>
159		- <g
160		- transform="translate(206,1954)"
161		- id="g37"
162		- style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
163		- <circle
164		- r="15"
165		- clip-path="url(#clipPath2)"
166		- cx="250.5"
167		- cy="-1288.167"
168		- id="circle39"
169		- style="stroke:none" />
170		- </g>
171		- <g
172		- stroke-miterlimit="1.45"
173		- transform="translate(206,1954)"
174		- id="g41"
175		- style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
176		- <circle
177		- r="15"
178		- clip-path="url(#clipPath2)"
179		- cx="250.5"
180		- cy="-1288.167"
181		- id="circle43"
182		- style="fill:none" />
183		- <text
184		- x="246.7061"
185		- y="-1283.6318"
186		- clip-path="url(#clipPath2)"
187		- xml:space="preserve"
188		- id="text45"
189		- style="font-family:sans-serif;stroke:none;stroke-width:1">4</text>
190		- <path
191		- d="m 86.5,-1288.167 22,0"
192		- clip-path="url(#clipPath2)"
193		- id="path47"
194		- inkscape:connector-curvature="0"
195		- style="fill:none;stroke-width:1" />
196		- <path
197		- d="m 116.5,-1288.167 -12,-5 3,5 -3,5 z"
198		- clip-path="url(#clipPath2)"
199		- id="path49"
200		- inkscape:connector-curvature="0"
201		- style="stroke:none;stroke-width:1" />
202		- <path
203		- d="m 146.5,-1288.167 22,0"
204		- clip-path="url(#clipPath2)"
205		- id="path51"
206		- inkscape:connector-curvature="0"
207		- style="fill:none;stroke-width:1" />
208		- <path
209		- d="m 176.5,-1288.167 -12,-5 3,5 -3,5 z"
210		- clip-path="url(#clipPath2)"
211		- id="path53"
212		- inkscape:connector-curvature="0"
213		- style="stroke:none;stroke-width:1" />
214		- <path
215		- d="m 206.5,-1288.167 21,0"
216		- clip-path="url(#clipPath2)"
217		- id="path55"
218		- inkscape:connector-curvature="0"
219		- style="fill:none;stroke-width:1" />
220		- <path
221		- d="m 235.5,-1288.167 -12,-5 3,5 -3,5 z"
222		- clip-path="url(#clipPath2)"
223		- id="path57"
224		- inkscape:connector-curvature="0"
225		- style="stroke:none;stroke-width:1" />
226		- </g>
227		- </g>
228		-</svg>

	--- a/www/branch01.svg
	+++ b/www/branch01.svg
	@@ -1,228 +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="211"
11	stroke-miterlimit="10"
12	font-weight="normal"
13	height="32"
14	font-style="normal"
15	font-size="12px"
16	id="svg2"
17	version="1.1"
18	inkscape:version="0.91 r13725"
19	sodipodi:docname="branch01.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="metadata61">
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="1240"
43	inkscape:window-height="1382"
44	id="namedview59"
45	showgrid="false"
46	inkscape:zoom="0.17717718"
47	inkscape:cx="106"
48	inkscape:cy="15.833008"
49	inkscape:window-x="0"
50	inkscape:window-y="0"
51	inkscape:window-maximized="0"
52	inkscape:current-layer="svg2"
53	fit-margin-top="0"
54	fit-margin-left="0"
55	fit-margin-right="0"
56	fit-margin-bottom="0" />
57	<!--Generated by ySVG 2.5-->
58	<defs
59	id="genericDefs" />
60	<g
61	id="g5"
62	transform="translate(-261.5,-649.83301)">
63	<g
64	transform="translate(206,1954)"
65	id="g7"
66	style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
67	<circle
68	r="15"
69	clip-path="url(#clipPath2)"
70	cx="71.5"
71	cy="-1288.167"
72	id="circle9"
73	style="stroke:none" />
74	</g>
75	<g
76	stroke-miterlimit="1.45"
77	transform="translate(206,1954)"
78	id="g11"
79	style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
80	<circle
81	r="15"
82	clip-path="url(#clipPath2)"
83	cx="71.5"
84	cy="-1288.167"
85	id="circle13"
86	style="fill:none" />
87	<text
88	x="67.7061"
89	y="-1283.6318"
90	clip-path="url(#clipPath2)"
91	xml:space="preserve"
92	id="text15"
93	style="font-family:sans-serif;stroke:none;stroke-width:1">1</text>
94	</g>
95	<g
96	transform="translate(206,1954)"
97	id="g17"
98	style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
99	<circle
100	r="15"
101	clip-path="url(#clipPath2)"
102	cx="131.5"
103	cy="-1288.167"
104	id="circle19"
105	style="stroke:none" />
106	</g>
107	<g
108	stroke-miterlimit="1.45"
109	transform="translate(206,1954)"
110	id="g21"
111	style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
112	<circle
113	r="15"
114	clip-path="url(#clipPath2)"
115	cx="131.5"
116	cy="-1288.167"
117	id="circle23"
118	style="fill:none" />
119	<text
120	x="127.7061"
121	y="-1283.6318"
122	clip-path="url(#clipPath2)"
123	xml:space="preserve"
124	id="text25"
125	style="font-family:sans-serif;stroke:none;stroke-width:1">2</text>
126	</g>
127	<g
128	transform="translate(206,1954)"
129	id="g27"
130	style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
131	<circle
132	r="15"
133	clip-path="url(#clipPath2)"
134	cx="191.5"
135	cy="-1288.167"
136	id="circle29"
137	style="stroke:none" />
138	</g>
139	<g
140	stroke-miterlimit="1.45"
141	transform="translate(206,1954)"
142	id="g31"
143	style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
144	<circle
145	r="15"
146	clip-path="url(#clipPath2)"
147	cx="191.5"
148	cy="-1288.167"
149	id="circle33"
150	style="fill:none" />
151	<text
152	x="187.7061"
153	y="-1283.6318"
154	clip-path="url(#clipPath2)"
155	xml:space="preserve"
156	id="text35"
157	style="font-family:sans-serif;stroke:none;stroke-width:1">3</text>
158	</g>
159	<g
160	transform="translate(206,1954)"
161	id="g37"
162	style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
163	<circle
164	r="15"
165	clip-path="url(#clipPath2)"
166	cx="250.5"
167	cy="-1288.167"
168	id="circle39"
169	style="stroke:none" />
170	</g>
171	<g
172	stroke-miterlimit="1.45"
173	transform="translate(206,1954)"
174	id="g41"
175	style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
176	<circle
177	r="15"
178	clip-path="url(#clipPath2)"
179	cx="250.5"
180	cy="-1288.167"
181	id="circle43"
182	style="fill:none" />
183	<text
184	x="246.7061"
185	y="-1283.6318"
186	clip-path="url(#clipPath2)"
187	xml:space="preserve"
188	id="text45"
189	style="font-family:sans-serif;stroke:none;stroke-width:1">4</text>
190	<path
191	d="m 86.5,-1288.167 22,0"
192	clip-path="url(#clipPath2)"
193	id="path47"
194	inkscape:connector-curvature="0"
195	style="fill:none;stroke-width:1" />
196	<path
197	d="m 116.5,-1288.167 -12,-5 3,5 -3,5 z"
198	clip-path="url(#clipPath2)"
199	id="path49"
200	inkscape:connector-curvature="0"
201	style="stroke:none;stroke-width:1" />
202	<path
203	d="m 146.5,-1288.167 22,0"
204	clip-path="url(#clipPath2)"
205	id="path51"
206	inkscape:connector-curvature="0"
207	style="fill:none;stroke-width:1" />
208	<path
209	d="m 176.5,-1288.167 -12,-5 3,5 -3,5 z"
210	clip-path="url(#clipPath2)"
211	id="path53"
212	inkscape:connector-curvature="0"
213	style="stroke:none;stroke-width:1" />
214	<path
215	d="m 206.5,-1288.167 21,0"
216	clip-path="url(#clipPath2)"
217	id="path55"
218	inkscape:connector-curvature="0"
219	style="fill:none;stroke-width:1" />
220	<path
221	d="m 235.5,-1288.167 -12,-5 3,5 -3,5 z"
222	clip-path="url(#clipPath2)"
223	id="path57"
224	inkscape:connector-curvature="0"
225	style="stroke:none;stroke-width:1" />
226	</g>
227	</g>
228	</svg>

	--- a/www/branch01.svg
	+++ b/www/branch01.svg
	@@ -1,228 +0,0 @@

D www/branch02.svg

-247

		--- a/www/branch02.svg
		+++ b/www/branch02.svg
		@@ -1,247 +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="152"
11		- stroke-miterlimit="10"
12		- font-weight="normal"
13		- height="121"
14		- font-style="normal"
15		- font-size="12px"
16		- id="svg4677"
17		- version="1.1"
18		- inkscape:version="0.91 r13725"
19		- sodipodi:docname="branch02.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="metadata4743">
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="namedview4741"
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.93768769"
51		- inkscape:cx="76"
52		- inkscape:cy="60.165985"
53		- inkscape:window-x="0"
54		- inkscape:window-y="0"
55		- inkscape:window-maximized="0"
56		- inkscape:current-layer="svg4677" />
57		- <!--Generated by ySVG 2.5-->
58		- <defs
59		- id="genericDefs" />
60		- <g
61		- id="g4680"
62		- transform="translate(-291.5,-605.16599)">
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="path4684"
71		- inkscape:connector-curvature="0" />
72		- </clipPath>
73		- <clipPath
74		- clipPathUnits="userSpaceOnUse"
75		- id="clipPath2">
76		- <path
77		- d="m 47,-1129 735,0 0,1332 -735,0 0,-1332 z"
78		- id="path4687"
79		- inkscape:connector-curvature="0" />
80		- </clipPath>
81		- </defs>
82		- <g
83		- transform="translate(-47,1129)"
84		- id="g4689"
85		- style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
86		- <circle
87		- r="15"
88		- clip-path="url(#clipPath2)"
89		- cx="354.5"
90		- cy="-465.83401"
91		- id="circle4691"
92		- style="stroke:none" />
93		- </g>
94		- <g
95		- stroke-miterlimit="1.45"
96		- transform="translate(-47,1129)"
97		- id="g4693"
98		- style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
99		- <circle
100		- r="15"
101		- clip-path="url(#clipPath2)"
102		- cx="354.5"
103		- cy="-465.83401"
104		- id="circle4695"
105		- style="fill:none" />
106		- <text
107		- x="350.70609"
108		- y="-461.2988"
109		- clip-path="url(#clipPath2)"
110		- xml:space="preserve"
111		- id="text4697"
112		- style="font-family:sans-serif;stroke:none;stroke-width:1">1</text>
113		- </g>
114		- <g
115		- transform="translate(-47,1129)"
116		- id="g4699"
117		- style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
118		- <circle
119		- r="15"
120		- clip-path="url(#clipPath2)"
121		- cx="414.5"
122		- cy="-465.83401"
123		- id="circle4701"
124		- style="stroke:none" />
125		- </g>
126		- <g
127		- stroke-miterlimit="1.45"
128		- transform="translate(-47,1129)"
129		- id="g4703"
130		- style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
131		- <circle
132		- r="15"
133		- clip-path="url(#clipPath2)"
134		- cx="414.5"
135		- cy="-465.83401"
136		- id="circle4705"
137		- style="fill:none" />
138		- <text
139		- x="410.70609"
140		- y="-461.2988"
141		- clip-path="url(#clipPath2)"
142		- xml:space="preserve"
143		- id="text4707"
144		- style="font-family:sans-serif;stroke:none;stroke-width:1">2</text>
145		- </g>
146		- <g
147		- transform="translate(-47,1129)"
148		- id="g4709"
149		- style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
150		- <circle
151		- r="15"
152		- clip-path="url(#clipPath2)"
153		- cx="474.5"
154		- cy="-507.83401"
155		- id="circle4711"
156		- style="stroke:none" />
157		- </g>
158		- <g
159		- stroke-miterlimit="1.45"
160		- transform="translate(-47,1129)"
161		- id="g4713"
162		- style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
163		- <circle
164		- r="15"
165		- clip-path="url(#clipPath2)"
166		- cx="474.5"
167		- cy="-507.83401"
168		- id="circle4715"
169		- style="fill:none" />
170		- <text
171		- x="470.70609"
172		- y="-503.2988"
173		- clip-path="url(#clipPath2)"
174		- xml:space="preserve"
175		- id="text4717"
176		- style="font-family:sans-serif;stroke:none;stroke-width:1">3</text>
177		- </g>
178		- <g
179		- transform="translate(-47,1129)"
180		- id="g4719"
181		- style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
182		- <circle
183		- r="15"
184		- clip-path="url(#clipPath2)"
185		- cx="473.5"
186		- cy="-418.83401"
187		- id="circle4721"
188		- style="stroke:none" />
189		- </g>
190		- <g
191		- stroke-miterlimit="1.45"
192		- transform="translate(-47,1129)"
193		- id="g4723"
194		- style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
195		- <circle
196		- r="15"
197		- clip-path="url(#clipPath2)"
198		- cx="473.5"
199		- cy="-418.83401"
200		- id="circle4725"
201		- style="fill:none" />
202		- <text
203		- x="469.70609"
204		- y="-414.2988"
205		- clip-path="url(#clipPath2)"
206		- xml:space="preserve"
207		- id="text4727"
208		- style="font-family:sans-serif;stroke:none;stroke-width:1">4</text>
209		- <path
210		- d="m 369.5,-465.834 22,0"
211		- clip-path="url(#clipPath2)"
212		- id="path4729"
213		- inkscape:connector-curvature="0"
214		- style="fill:none;stroke-width:1" />
215		- <path
216		- d="m 399.5,-465.834 -12,-5 3,5 -3,5 z"
217		- clip-path="url(#clipPath2)"
218		- id="path4731"
219		- inkscape:connector-curvature="0"
220		- style="stroke:none;stroke-width:1" />
221		- <path
222		- d="m 426.7885,-474.4359 28.8692,-20.2084"
223		- clip-path="url(#clipPath2)"
224		- id="path4733"
225		- inkscape:connector-curvature="0"
226		- style="fill:none;stroke-width:1" />
227		- <path
228		- d="m 462.2115,-499.2321 -12.6981,2.7854 5.325,2.3758 0.4096,5.8166 z"
229		- clip-path="url(#clipPath2)"
230		- id="path4735"
231		- inkscape:connector-curvature="0"
232		- style="stroke:none;stroke-width:1" />
233		- <path
234		- d="m 426.2324,-456.4878 29.2779,23.323"
235		- clip-path="url(#clipPath2)"
236		- id="path4737"
237		- inkscape:connector-curvature="0"
238		- style="fill:none;stroke-width:1" />
239		- <path
240		- d="m 461.7676,-428.1801 -6.2705,-11.3878 -0.769,5.7801 -5.4618,2.0415 z"
241		- clip-path="url(#clipPath2)"
242		- id="path4739"
243		- inkscape:connector-curvature="0"
244		- style="stroke:none;stroke-width:1" />
245		- </g>
246		- </g>
247		-</svg>

	--- a/www/branch02.svg
	+++ b/www/branch02.svg
	@@ -1,247 +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="152"
11	stroke-miterlimit="10"
12	font-weight="normal"
13	height="121"
14	font-style="normal"
15	font-size="12px"
16	id="svg4677"
17	version="1.1"
18	inkscape:version="0.91 r13725"
19	sodipodi:docname="branch02.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="metadata4743">
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="namedview4741"
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.93768769"
51	inkscape:cx="76"
52	inkscape:cy="60.165985"
53	inkscape:window-x="0"
54	inkscape:window-y="0"
55	inkscape:window-maximized="0"
56	inkscape:current-layer="svg4677" />
57	<!--Generated by ySVG 2.5-->
58	<defs
59	id="genericDefs" />
60	<g
61	id="g4680"
62	transform="translate(-291.5,-605.16599)">
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="path4684"
71	inkscape:connector-curvature="0" />
72	</clipPath>
73	<clipPath
74	clipPathUnits="userSpaceOnUse"
75	id="clipPath2">
76	<path
77	d="m 47,-1129 735,0 0,1332 -735,0 0,-1332 z"
78	id="path4687"
79	inkscape:connector-curvature="0" />
80	</clipPath>
81	</defs>
82	<g
83	transform="translate(-47,1129)"
84	id="g4689"
85	style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
86	<circle
87	r="15"
88	clip-path="url(#clipPath2)"
89	cx="354.5"
90	cy="-465.83401"
91	id="circle4691"
92	style="stroke:none" />
93	</g>
94	<g
95	stroke-miterlimit="1.45"
96	transform="translate(-47,1129)"
97	id="g4693"
98	style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
99	<circle
100	r="15"
101	clip-path="url(#clipPath2)"
102	cx="354.5"
103	cy="-465.83401"
104	id="circle4695"
105	style="fill:none" />
106	<text
107	x="350.70609"
108	y="-461.2988"
109	clip-path="url(#clipPath2)"
110	xml:space="preserve"
111	id="text4697"
112	style="font-family:sans-serif;stroke:none;stroke-width:1">1</text>
113	</g>
114	<g
115	transform="translate(-47,1129)"
116	id="g4699"
117	style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
118	<circle
119	r="15"
120	clip-path="url(#clipPath2)"
121	cx="414.5"
122	cy="-465.83401"
123	id="circle4701"
124	style="stroke:none" />
125	</g>
126	<g
127	stroke-miterlimit="1.45"
128	transform="translate(-47,1129)"
129	id="g4703"
130	style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
131	<circle
132	r="15"
133	clip-path="url(#clipPath2)"
134	cx="414.5"
135	cy="-465.83401"
136	id="circle4705"
137	style="fill:none" />
138	<text
139	x="410.70609"
140	y="-461.2988"
141	clip-path="url(#clipPath2)"
142	xml:space="preserve"
143	id="text4707"
144	style="font-family:sans-serif;stroke:none;stroke-width:1">2</text>
145	</g>
146	<g
147	transform="translate(-47,1129)"
148	id="g4709"
149	style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
150	<circle
151	r="15"
152	clip-path="url(#clipPath2)"
153	cx="474.5"
154	cy="-507.83401"
155	id="circle4711"
156	style="stroke:none" />
157	</g>
158	<g
159	stroke-miterlimit="1.45"
160	transform="translate(-47,1129)"
161	id="g4713"
162	style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
163	<circle
164	r="15"
165	clip-path="url(#clipPath2)"
166	cx="474.5"
167	cy="-507.83401"
168	id="circle4715"
169	style="fill:none" />
170	<text
171	x="470.70609"
172	y="-503.2988"
173	clip-path="url(#clipPath2)"
174	xml:space="preserve"
175	id="text4717"
176	style="font-family:sans-serif;stroke:none;stroke-width:1">3</text>
177	</g>
178	<g
179	transform="translate(-47,1129)"
180	id="g4719"
181	style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
182	<circle
183	r="15"
184	clip-path="url(#clipPath2)"
185	cx="473.5"
186	cy="-418.83401"
187	id="circle4721"
188	style="stroke:none" />
189	</g>
190	<g
191	stroke-miterlimit="1.45"
192	transform="translate(-47,1129)"
193	id="g4723"
194	style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
195	<circle
196	r="15"
197	clip-path="url(#clipPath2)"
198	cx="473.5"
199	cy="-418.83401"
200	id="circle4725"
201	style="fill:none" />
202	<text
203	x="469.70609"
204	y="-414.2988"
205	clip-path="url(#clipPath2)"
206	xml:space="preserve"
207	id="text4727"
208	style="font-family:sans-serif;stroke:none;stroke-width:1">4</text>
209	<path
210	d="m 369.5,-465.834 22,0"
211	clip-path="url(#clipPath2)"
212	id="path4729"
213	inkscape:connector-curvature="0"
214	style="fill:none;stroke-width:1" />
215	<path
216	d="m 399.5,-465.834 -12,-5 3,5 -3,5 z"
217	clip-path="url(#clipPath2)"
218	id="path4731"
219	inkscape:connector-curvature="0"
220	style="stroke:none;stroke-width:1" />
221	<path
222	d="m 426.7885,-474.4359 28.8692,-20.2084"
223	clip-path="url(#clipPath2)"
224	id="path4733"
225	inkscape:connector-curvature="0"
226	style="fill:none;stroke-width:1" />
227	<path
228	d="m 462.2115,-499.2321 -12.6981,2.7854 5.325,2.3758 0.4096,5.8166 z"
229	clip-path="url(#clipPath2)"
230	id="path4735"
231	inkscape:connector-curvature="0"
232	style="stroke:none;stroke-width:1" />
233	<path
234	d="m 426.2324,-456.4878 29.2779,23.323"
235	clip-path="url(#clipPath2)"
236	id="path4737"
237	inkscape:connector-curvature="0"
238	style="fill:none;stroke-width:1" />
239	<path
240	d="m 461.7676,-428.1801 -6.2705,-11.3878 -0.769,5.7801 -5.4618,2.0415 z"
241	clip-path="url(#clipPath2)"
242	id="path4739"
243	inkscape:connector-curvature="0"
244	style="stroke:none;stroke-width:1" />
245	</g>
246	</g>
247	</svg>

	--- a/www/branch02.svg
	+++ b/www/branch02.svg
	@@ -1,247 +0,0 @@

D www/branch03.svg

-303

		--- a/www/branch03.svg
		+++ b/www/branch03.svg
		@@ -1,303 +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="211"
11		- stroke-miterlimit="10"
12		- font-weight="normal"
13		- height="121"
14		- font-style="normal"
15		- font-size="12px"
16		- id="svg4877"
17		- version="1.1"
18		- inkscape:version="0.91 r13725"
19		- sodipodi:docname="branch03.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="metadata4961">
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="namedview4959"
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.93768769"
51		- inkscape:cx="105.5"
52		- inkscape:cy="60.998993"
53		- inkscape:window-x="0"
54		- inkscape:window-y="0"
55		- inkscape:window-maximized="0"
56		- inkscape:current-layer="svg4877" />
57		- <!--Generated by ySVG 2.5-->
58		- <defs
59		- id="genericDefs" />
60		- <g
61		- id="g4880"
62		- transform="translate(-262,-605.99899)">
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="path4884"
71		- inkscape:connector-curvature="0" />
72		- </clipPath>
73		- <clipPath
74		- clipPathUnits="userSpaceOnUse"
75		- id="clipPath2">
76		- <path
77		- d="m 46,-911 735,0 0,1332 -735,0 0,-1332 z"
78		- id="path4887"
79		- inkscape:connector-curvature="0" />
80		- </clipPath>
81		- </defs>
82		- <g
83		- transform="translate(-46,911)"
84		- id="g4889"
85		- style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
86		- <circle
87		- r="15"
88		- clip-path="url(#clipPath2)"
89		- cx="324"
90		- cy="-247.00101"
91		- id="circle4891"
92		- style="stroke:none" />
93		- </g>
94		- <g
95		- stroke-miterlimit="1.45"
96		- transform="translate(-46,911)"
97		- id="g4893"
98		- style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
99		- <circle
100		- r="15"
101		- clip-path="url(#clipPath2)"
102		- cx="324"
103		- cy="-247.00101"
104		- id="circle4895"
105		- style="fill:none" />
106		- <text
107		- x="320.20609"
108		- y="-242.46581"
109		- clip-path="url(#clipPath2)"
110		- xml:space="preserve"
111		- id="text4897"
112		- style="font-family:sans-serif;stroke:none;stroke-width:1">1</text>
113		- </g>
114		- <g
115		- transform="translate(-46,911)"
116		- id="g4899"
117		- style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
118		- <circle
119		- r="15"
120		- clip-path="url(#clipPath2)"
121		- cx="384"
122		- cy="-247.00101"
123		- id="circle4901"
124		- style="stroke:none" />
125		- </g>
126		- <g
127		- stroke-miterlimit="1.45"
128		- transform="translate(-46,911)"
129		- id="g4903"
130		- style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
131		- <circle
132		- r="15"
133		- clip-path="url(#clipPath2)"
134		- cx="384"
135		- cy="-247.00101"
136		- id="circle4905"
137		- style="fill:none" />
138		- <text
139		- x="380.20609"
140		- y="-242.46581"
141		- clip-path="url(#clipPath2)"
142		- xml:space="preserve"
143		- id="text4907"
144		- style="font-family:sans-serif;stroke:none;stroke-width:1">2</text>
145		- </g>
146		- <g
147		- transform="translate(-46,911)"
148		- id="g4909"
149		- style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
150		- <circle
151		- r="15"
152		- clip-path="url(#clipPath2)"
153		- cx="444"
154		- cy="-289.00101"
155		- id="circle4911"
156		- style="stroke:none" />
157		- </g>
158		- <g
159		- stroke-miterlimit="1.45"
160		- transform="translate(-46,911)"
161		- id="g4913"
162		- style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
163		- <circle
164		- r="15"
165		- clip-path="url(#clipPath2)"
166		- cx="444"
167		- cy="-289.00101"
168		- id="circle4915"
169		- style="fill:none" />
170		- <text
171		- x="440.20609"
172		- y="-284.46579"
173		- clip-path="url(#clipPath2)"
174		- xml:space="preserve"
175		- id="text4917"
176		- style="font-family:sans-serif;stroke:none;stroke-width:1">3</text>
177		- </g>
178		- <g
179		- transform="translate(-46,911)"
180		- id="g4919"
181		- style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
182		- <circle
183		- r="15"
184		- clip-path="url(#clipPath2)"
185		- cx="443"
186		- cy="-200.00101"
187		- id="circle4921"
188		- style="stroke:none" />
189		- </g>
190		- <g
191		- stroke-miterlimit="1.45"
192		- transform="translate(-46,911)"
193		- id="g4923"
194		- style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
195		- <circle
196		- r="15"
197		- clip-path="url(#clipPath2)"
198		- cx="443"
199		- cy="-200.00101"
200		- id="circle4925"
201		- style="fill:none" />
202		- <text
203		- x="439.20609"
204		- y="-195.46581"
205		- clip-path="url(#clipPath2)"
206		- xml:space="preserve"
207		- id="text4927"
208		- style="font-family:sans-serif;stroke:none;stroke-width:1">4</text>
209		- </g>
210		- <g
211		- transform="translate(-46,911)"
212		- id="g4929"
213		- style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
214		- <circle
215		- r="15"
216		- clip-path="url(#clipPath2)"
217		- cx="503"
218		- cy="-247.00101"
219		- id="circle4931"
220		- style="stroke:none" />
221		- </g>
222		- <g
223		- stroke-miterlimit="1.45"
224		- transform="translate(-46,911)"
225		- id="g4933"
226		- style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
227		- <circle
228		- r="15"
229		- clip-path="url(#clipPath2)"
230		- cx="503"
231		- cy="-247.00101"
232		- id="circle4935"
233		- style="fill:none" />
234		- <text
235		- x="499.20609"
236		- y="-242.46581"
237		- clip-path="url(#clipPath2)"
238		- xml:space="preserve"
239		- id="text4937"
240		- style="font-family:sans-serif;stroke:none;stroke-width:1">5</text>
241		- <path
242		- d="m 339,-247.001 22,0"
243		- clip-path="url(#clipPath2)"
244		- id="path4939"
245		- inkscape:connector-curvature="0"
246		- style="fill:none;stroke-width:1" />
247		- <path
248		- d="m 369,-247.001 -12,-5 3,5 -3,5 z"
249		- clip-path="url(#clipPath2)"
250		- id="path4941"
251		- inkscape:connector-curvature="0"
252		- style="stroke:none;stroke-width:1" />
253		- <path
254		- d="m 396.2885,-255.6029 28.8692,-20.2084"
255		- clip-path="url(#clipPath2)"
256		- id="path4943"
257		- inkscape:connector-curvature="0"
258		- style="fill:none;stroke-width:1" />
259		- <path
260		- d="m 431.7115,-280.399 -12.6981,2.7854 5.325,2.3757 0.4096,5.8166 z"
261		- clip-path="url(#clipPath2)"
262		- id="path4945"
263		- inkscape:connector-curvature="0"
264		- style="stroke:none;stroke-width:1" />
265		- <path
266		- d="m 395.7324,-237.6548 29.2779,23.3231"
267		- clip-path="url(#clipPath2)"
268		- id="path4947"
269		- inkscape:connector-curvature="0"
270		- style="fill:none;stroke-width:1" />
271		- <path
272		- d="m 431.2676,-209.3471 -6.2705,-11.3877 -0.7689,5.78 -5.4619,2.0415 z"
273		- clip-path="url(#clipPath2)"
274		- id="path4949"
275		- inkscape:connector-curvature="0"
276		- style="stroke:none;stroke-width:1" />
277		- <path
278		- d="m 456.22,-280.302 28.0427,19.9626"
279		- clip-path="url(#clipPath2)"
280		- id="path4951"
281		- inkscape:connector-curvature="0"
282		- style="fill:none;stroke-width:1" />
283		- <path
284		- d="m 490.78,-255.7 -6.8763,-11.0325 -0.4557,5.8132 -5.3436,2.3335 z"
285		- clip-path="url(#clipPath2)"
286		- id="path4953"
287		- inkscape:connector-curvature="0"
288		- style="stroke:none;stroke-width:1" />
289		- <path
290		- d="m 454.8084,-209.2509 30.0854,-23.5668"
291		- clip-path="url(#clipPath2)"
292		- id="path4955"
293		- inkscape:connector-curvature="0"
294		- style="fill:none;stroke-width:1;stroke-dasharray:6, 2" />
295		- <path
296		- d="m 491.1916,-237.7511 -12.53,3.4639 5.4449,2.0861 0.7217,5.7861 z"
297		- clip-path="url(#clipPath2)"
298		- id="path4957"
299		- inkscape:connector-curvature="0"
300		- style="stroke:none;stroke-width:1;stroke-dasharray:6, 2" />
301		- </g>
302		- </g>
303		-</svg>

	--- a/www/branch03.svg
	+++ b/www/branch03.svg
	@@ -1,303 +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="211"
11	stroke-miterlimit="10"
12	font-weight="normal"
13	height="121"
14	font-style="normal"
15	font-size="12px"
16	id="svg4877"
17	version="1.1"
18	inkscape:version="0.91 r13725"
19	sodipodi:docname="branch03.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="metadata4961">
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="namedview4959"
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.93768769"
51	inkscape:cx="105.5"
52	inkscape:cy="60.998993"
53	inkscape:window-x="0"
54	inkscape:window-y="0"
55	inkscape:window-maximized="0"
56	inkscape:current-layer="svg4877" />
57	<!--Generated by ySVG 2.5-->
58	<defs
59	id="genericDefs" />
60	<g
61	id="g4880"
62	transform="translate(-262,-605.99899)">
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="path4884"
71	inkscape:connector-curvature="0" />
72	</clipPath>
73	<clipPath
74	clipPathUnits="userSpaceOnUse"
75	id="clipPath2">
76	<path
77	d="m 46,-911 735,0 0,1332 -735,0 0,-1332 z"
78	id="path4887"
79	inkscape:connector-curvature="0" />
80	</clipPath>
81	</defs>
82	<g
83	transform="translate(-46,911)"
84	id="g4889"
85	style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
86	<circle
87	r="15"
88	clip-path="url(#clipPath2)"
89	cx="324"
90	cy="-247.00101"
91	id="circle4891"
92	style="stroke:none" />
93	</g>
94	<g
95	stroke-miterlimit="1.45"
96	transform="translate(-46,911)"
97	id="g4893"
98	style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
99	<circle
100	r="15"
101	clip-path="url(#clipPath2)"
102	cx="324"
103	cy="-247.00101"
104	id="circle4895"
105	style="fill:none" />
106	<text
107	x="320.20609"
108	y="-242.46581"
109	clip-path="url(#clipPath2)"
110	xml:space="preserve"
111	id="text4897"
112	style="font-family:sans-serif;stroke:none;stroke-width:1">1</text>
113	</g>
114	<g
115	transform="translate(-46,911)"
116	id="g4899"
117	style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
118	<circle
119	r="15"
120	clip-path="url(#clipPath2)"
121	cx="384"
122	cy="-247.00101"
123	id="circle4901"
124	style="stroke:none" />
125	</g>
126	<g
127	stroke-miterlimit="1.45"
128	transform="translate(-46,911)"
129	id="g4903"
130	style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
131	<circle
132	r="15"
133	clip-path="url(#clipPath2)"
134	cx="384"
135	cy="-247.00101"
136	id="circle4905"
137	style="fill:none" />
138	<text
139	x="380.20609"
140	y="-242.46581"
141	clip-path="url(#clipPath2)"
142	xml:space="preserve"
143	id="text4907"
144	style="font-family:sans-serif;stroke:none;stroke-width:1">2</text>
145	</g>
146	<g
147	transform="translate(-46,911)"
148	id="g4909"
149	style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
150	<circle
151	r="15"
152	clip-path="url(#clipPath2)"
153	cx="444"
154	cy="-289.00101"
155	id="circle4911"
156	style="stroke:none" />
157	</g>
158	<g
159	stroke-miterlimit="1.45"
160	transform="translate(-46,911)"
161	id="g4913"
162	style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
163	<circle
164	r="15"
165	clip-path="url(#clipPath2)"
166	cx="444"
167	cy="-289.00101"
168	id="circle4915"
169	style="fill:none" />
170	<text
171	x="440.20609"
172	y="-284.46579"
173	clip-path="url(#clipPath2)"
174	xml:space="preserve"
175	id="text4917"
176	style="font-family:sans-serif;stroke:none;stroke-width:1">3</text>
177	</g>
178	<g
179	transform="translate(-46,911)"
180	id="g4919"
181	style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
182	<circle
183	r="15"
184	clip-path="url(#clipPath2)"
185	cx="443"
186	cy="-200.00101"
187	id="circle4921"
188	style="stroke:none" />
189	</g>
190	<g
191	stroke-miterlimit="1.45"
192	transform="translate(-46,911)"
193	id="g4923"
194	style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
195	<circle
196	r="15"
197	clip-path="url(#clipPath2)"
198	cx="443"
199	cy="-200.00101"
200	id="circle4925"
201	style="fill:none" />
202	<text
203	x="439.20609"
204	y="-195.46581"
205	clip-path="url(#clipPath2)"
206	xml:space="preserve"
207	id="text4927"
208	style="font-family:sans-serif;stroke:none;stroke-width:1">4</text>
209	</g>
210	<g
211	transform="translate(-46,911)"
212	id="g4929"
213	style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
214	<circle
215	r="15"
216	clip-path="url(#clipPath2)"
217	cx="503"
218	cy="-247.00101"
219	id="circle4931"
220	style="stroke:none" />
221	</g>
222	<g
223	stroke-miterlimit="1.45"
224	transform="translate(-46,911)"
225	id="g4933"
226	style="stroke-width:2;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
227	<circle
228	r="15"
229	clip-path="url(#clipPath2)"
230	cx="503"
231	cy="-247.00101"
232	id="circle4935"
233	style="fill:none" />
234	<text
235	x="499.20609"
236	y="-242.46581"
237	clip-path="url(#clipPath2)"
238	xml:space="preserve"
239	id="text4937"
240	style="font-family:sans-serif;stroke:none;stroke-width:1">5</text>
241	<path
242	d="m 339,-247.001 22,0"
243	clip-path="url(#clipPath2)"
244	id="path4939"
245	inkscape:connector-curvature="0"
246	style="fill:none;stroke-width:1" />
247	<path
248	d="m 369,-247.001 -12,-5 3,5 -3,5 z"
249	clip-path="url(#clipPath2)"
250	id="path4941"
251	inkscape:connector-curvature="0"
252	style="stroke:none;stroke-width:1" />
253	<path
254	d="m 396.2885,-255.6029 28.8692,-20.2084"
255	clip-path="url(#clipPath2)"
256	id="path4943"
257	inkscape:connector-curvature="0"
258	style="fill:none;stroke-width:1" />
259	<path
260	d="m 431.7115,-280.399 -12.6981,2.7854 5.325,2.3757 0.4096,5.8166 z"
261	clip-path="url(#clipPath2)"
262	id="path4945"
263	inkscape:connector-curvature="0"
264	style="stroke:none;stroke-width:1" />
265	<path
266	d="m 395.7324,-237.6548 29.2779,23.3231"
267	clip-path="url(#clipPath2)"
268	id="path4947"
269	inkscape:connector-curvature="0"
270	style="fill:none;stroke-width:1" />
271	<path
272	d="m 431.2676,-209.3471 -6.2705,-11.3877 -0.7689,5.78 -5.4619,2.0415 z"
273	clip-path="url(#clipPath2)"
274	id="path4949"
275	inkscape:connector-curvature="0"
276	style="stroke:none;stroke-width:1" />
277	<path
278	d="m 456.22,-280.302 28.0427,19.9626"
279	clip-path="url(#clipPath2)"
280	id="path4951"
281	inkscape:connector-curvature="0"
282	style="fill:none;stroke-width:1" />
283	<path
284	d="m 490.78,-255.7 -6.8763,-11.0325 -0.4557,5.8132 -5.3436,2.3335 z"
285	clip-path="url(#clipPath2)"
286	id="path4953"
287	inkscape:connector-curvature="0"
288	style="stroke:none;stroke-width:1" />
289	<path
290	d="m 454.8084,-209.2509 30.0854,-23.5668"
291	clip-path="url(#clipPath2)"
292	id="path4955"
293	inkscape:connector-curvature="0"
294	style="fill:none;stroke-width:1;stroke-dasharray:6, 2" />
295	<path
296	d="m 491.1916,-237.7511 -12.53,3.4639 5.4449,2.0861 0.7217,5.7861 z"
297	clip-path="url(#clipPath2)"
298	id="path4957"
299	inkscape:connector-curvature="0"
300	style="stroke:none;stroke-width:1;stroke-dasharray:6, 2" />
301	</g>
302	</g>
303	</svg>

	--- a/www/branch03.svg
	+++ b/www/branch03.svg
	@@ -1,303 +0,0 @@

D www/branch04.svg

-569

		--- a/www/branch04.svg
		+++ b/www/branch04.svg
		@@ -1,569 +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="388"
11		- stroke-miterlimit="10"
12		- font-weight="normal"
13		- height="104.77151"
14		- font-style="normal"
15		- font-size="12px"
16		- id="svg2"
17		- version="1.1"
18		- inkscape:version="0.91 r13725"
19		- sodipodi:docname="branch04.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="metadata170">
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="namedview168"
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="194"
52		- inkscape:cy="49.103516"
53		- inkscape:window-x="0"
54		- inkscape:window-y="0"
55		- inkscape:window-maximized="0"
56		- inkscape:current-layer="svg2" />
57		- <!--Generated by ySVG 2.5-->
58		- <defs
59		- id="genericDefs" />
60		- <g
61		- id="g5"
62		- transform="translate(-173.5,-610.332)">
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="path9"
71		- inkscape:connector-curvature="0" />
72		- </clipPath>
73		- <clipPath
74		- clipPathUnits="userSpaceOnUse"
75		- id="clipPath2">
76		- <path
77		- d="m 29,-1077 735,0 0,1332 -735,0 0,-1332 z"
78		- id="path12"
79		- inkscape:connector-curvature="0" />
80		- </clipPath>
81		- </defs>
82		- <g
83		- transform="translate(-29,1077)"
84		- id="g14"
85		- style="fill:#9accfc;stroke:#9accfc;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
86		- <rect
87		- x="290.6333"
88		- width="298.8667"
89		- height="46"
90		- y="-425.668"
91		- clip-path="url(#clipPath2)"
92		- id="rect16"
93		- style="stroke:none" />
94		- </g>
95		- <g
96		- transform="translate(-29,1077)"
97		- stroke-miterlimit="1.45"
98		- id="g18"
99		- style="fill:#7ca5cc;stroke:#7ca5cc;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
100		- <rect
101		- x="290.6333"
102		- width="298.8667"
103		- height="46"
104		- y="-425.668"
105		- clip-path="url(#clipPath2)"
106		- id="rect20"
107		- style="fill:none" />
108		- <text
109		- x="429.177"
110		- y="-362.06641"
111		- clip-path="url(#clipPath2)"
112		- xml:space="preserve"
113		- id="text22"
114		- style="font-family:sans-serif;fill:#000000;stroke:none">test</text>
115		- </g>
116		- <g
117		- transform="translate(-29,1077)"
118		- id="g24"
119		- style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
120		- <circle
121		- r="15"
122		- clip-path="url(#clipPath2)"
123		- cx="218.5"
124		- cy="-450.668"
125		- id="circle26"
126		- style="stroke:none" />
127		- </g>
128		- <g
129		- stroke-miterlimit="1.45"
130		- transform="translate(-29,1077)"
131		- id="g28"
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="218.5"
137		- cy="-450.668"
138		- id="circle30"
139		- style="fill:none" />
140		- <text
141		- x="214.7061"
142		- y="-446.13281"
143		- clip-path="url(#clipPath2)"
144		- xml:space="preserve"
145		- id="text32"
146		- style="font-family:sans-serif;stroke:none;stroke-width:1">1</text>
147		- </g>
148		- <g
149		- transform="translate(-29,1077)"
150		- id="g34"
151		- style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
152		- <circle
153		- r="15"
154		- clip-path="url(#clipPath2)"
155		- cx="278.5"
156		- cy="-450.668"
157		- id="circle36"
158		- style="stroke:none" />
159		- </g>
160		- <g
161		- stroke-miterlimit="1.45"
162		- transform="translate(-29,1077)"
163		- id="g38"
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="278.5"
169		- cy="-450.668"
170		- id="circle40"
171		- style="fill:none" />
172		- <text
173		- x="274.70609"
174		- y="-446.13281"
175		- clip-path="url(#clipPath2)"
176		- xml:space="preserve"
177		- id="text42"
178		- style="font-family:sans-serif;stroke:none;stroke-width:1">2</text>
179		- </g>
180		- <g
181		- transform="translate(-29,1077)"
182		- id="g44"
183		- style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
184		- <circle
185		- r="15"
186		- clip-path="url(#clipPath2)"
187		- cx="338.5"
188		- cy="-450.668"
189		- id="circle46"
190		- style="stroke:none" />
191		- </g>
192		- <g
193		- stroke-miterlimit="1.45"
194		- transform="translate(-29,1077)"
195		- id="g48"
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="338.5"
201		- cy="-450.668"
202		- id="circle50"
203		- style="fill:none" />
204		- <text
205		- x="334.70609"
206		- y="-446.13281"
207		- clip-path="url(#clipPath2)"
208		- xml:space="preserve"
209		- id="text52"
210		- style="font-family:sans-serif;stroke:none;stroke-width:1">3</text>
211		- </g>
212		- <g
213		- transform="translate(-29,1077)"
214		- id="g54"
215		- style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
216		- <circle
217		- r="15"
218		- clip-path="url(#clipPath2)"
219		- cx="337.5"
220		- cy="-403.668"
221		- id="circle56"
222		- style="stroke:none" />
223		- </g>
224		- <g
225		- stroke-miterlimit="1.45"
226		- transform="translate(-29,1077)"
227		- id="g58"
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="337.5"
233		- cy="-403.668"
234		- id="circle60"
235		- style="fill:none" />
236		- <text
237		- x="333.70609"
238		- y="-399.13281"
239		- clip-path="url(#clipPath2)"
240		- xml:space="preserve"
241		- id="text62"
242		- style="font-family:sans-serif;stroke:none;stroke-width:1">4</text>
243		- </g>
244		- <g
245		- transform="translate(-29,1077)"
246		- id="g64"
247		- style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
248		- <circle
249		- r="15"
250		- clip-path="url(#clipPath2)"
251		- cx="397.5"
252		- cy="-450.668"
253		- id="circle66"
254		- style="stroke:none" />
255		- </g>
256		- <g
257		- stroke-miterlimit="1.45"
258		- transform="translate(-29,1077)"
259		- id="g68"
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="397.5"
265		- cy="-450.668"
266		- id="circle70"
267		- style="fill:none" />
268		- <text
269		- x="393.70609"
270		- y="-446.13281"
271		- clip-path="url(#clipPath2)"
272		- xml:space="preserve"
273		- id="text72"
274		- style="font-family:sans-serif;stroke:none;stroke-width:1">5</text>
275		- </g>
276		- <g
277		- transform="translate(-29,1077)"
278		- id="g74"
279		- style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
280		- <circle
281		- r="15"
282		- clip-path="url(#clipPath2)"
283		- cx="456.5"
284		- cy="-450.668"
285		- id="circle76"
286		- style="stroke:none" />
287		- </g>
288		- <g
289		- stroke-miterlimit="1.45"
290		- transform="translate(-29,1077)"
291		- id="g78"
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="456.5"
297		- cy="-450.668"
298		- id="circle80"
299		- style="fill:none" />
300		- <text
301		- x="452.70609"
302		- y="-446.13281"
303		- clip-path="url(#clipPath2)"
304		- xml:space="preserve"
305		- id="text82"
306		- style="font-family:sans-serif;stroke:none;stroke-width:1">7</text>
307		- </g>
308		- <g
309		- transform="translate(-29,1077)"
310		- id="g84"
311		- style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
312		- <circle
313		- r="15"
314		- clip-path="url(#clipPath2)"
315		- cx="515.5"
316		- cy="-450.668"
317		- id="circle86"
318		- style="stroke:none" />
319		- </g>
320		- <g
321		- stroke-miterlimit="1.45"
322		- transform="translate(-29,1077)"
323		- id="g88"
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="515.5"
329		- cy="-450.668"
330		- id="circle90"
331		- style="fill:none" />
332		- <text
333		- x="511.70609"
334		- y="-446.13281"
335		- clip-path="url(#clipPath2)"
336		- xml:space="preserve"
337		- id="text92"
338		- style="font-family:sans-serif;stroke:none;stroke-width:1">8</text>
339		- </g>
340		- <g
341		- transform="translate(-29,1077)"
342		- id="g94"
343		- style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
344		- <circle
345		- r="15"
346		- clip-path="url(#clipPath2)"
347		- cx="574.5"
348		- cy="-450.668"
349		- id="circle96"
350		- style="stroke:none" />
351		- </g>
352		- <g
353		- stroke-miterlimit="1.45"
354		- transform="translate(-29,1077)"
355		- id="g98"
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="574.5"
361		- cy="-450.668"
362		- id="circle100"
363		- style="fill:none" />
364		- <text
365		- x="566.91211"
366		- y="-446.13281"
367		- clip-path="url(#clipPath2)"
368		- xml:space="preserve"
369		- id="text102"
370		- style="font-family:sans-serif;stroke:none;stroke-width:1">10</text>
371		- </g>
372		- <g
373		- transform="translate(-29,1077)"
374		- id="g104"
375		- style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
376		- <circle
377		- r="15"
378		- clip-path="url(#clipPath2)"
379		- cx="427.5"
380		- cy="-403.668"
381		- id="circle106"
382		- style="stroke:none" />
383		- </g>
384		- <g
385		- stroke-miterlimit="1.45"
386		- transform="translate(-29,1077)"
387		- id="g108"
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="427.5"
393		- cy="-403.668"
394		- id="circle110"
395		- style="fill:none" />
396		- <text
397		- x="423.70609"
398		- y="-399.13281"
399		- clip-path="url(#clipPath2)"
400		- xml:space="preserve"
401		- id="text112"
402		- style="font-family:sans-serif;stroke:none;stroke-width:1">6</text>
403		- </g>
404		- <g
405		- transform="translate(-29,1077)"
406		- id="g114"
407		- style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
408		- <circle
409		- r="15"
410		- clip-path="url(#clipPath2)"
411		- cx="545.5"
412		- cy="-403.668"
413		- id="circle116"
414		- style="stroke:none" />
415		- </g>
416		- <g
417		- stroke-miterlimit="1.45"
418		- transform="translate(-29,1077)"
419		- id="g118"
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="545.5"
425		- cy="-403.668"
426		- id="circle120"
427		- style="fill:none" />
428		- <text
429		- x="541.70612"
430		- y="-399.13281"
431		- clip-path="url(#clipPath2)"
432		- xml:space="preserve"
433		- id="text122"
434		- style="font-family:sans-serif;stroke:none;stroke-width:1">9</text>
435		- <path
436		- d="m 233.5,-450.668 22,0"
437		- clip-path="url(#clipPath2)"
438		- id="path124"
439		- inkscape:connector-curvature="0"
440		- style="fill:none;stroke-width:1" />
441		- <path
442		- d="m 263.5,-450.668 -12,-5 3,5 -3,5 z"
443		- clip-path="url(#clipPath2)"
444		- id="path126"
445		- inkscape:connector-curvature="0"
446		- style="stroke:none;stroke-width:1" />
447		- <path
448		- d="m 293.5,-450.668 22,0"
449		- clip-path="url(#clipPath2)"
450		- id="path128"
451		- inkscape:connector-curvature="0"
452		- style="fill:none;stroke-width:1" />
453		- <path
454		- d="m 323.5,-450.668 -12,-5 3,5 -3,5 z"
455		- clip-path="url(#clipPath2)"
456		- id="path130"
457		- inkscape:connector-curvature="0"
458		- style="stroke:none;stroke-width:1" />
459		- <path
460		- d="m 290.2324,-441.3218 29.2779,23.3231"
461		- clip-path="url(#clipPath2)"
462		- id="path132"
463		- inkscape:connector-curvature="0"
464		- style="fill:none;stroke-width:1" />
465		- <path
466		- d="m 325.7676,-413.0141 -6.2705,-11.3878 -0.769,5.7801 -5.4618,2.0415 z"
467		- clip-path="url(#clipPath2)"
468		- id="path134"
469		- inkscape:connector-curvature="0"
470		- style="stroke:none;stroke-width:1" />
471		- <path
472		- d="m 353.5,-450.668 21,0"
473		- clip-path="url(#clipPath2)"
474		- id="path136"
475		- inkscape:connector-curvature="0"
476		- style="fill:none;stroke-width:1" />
477		- <path
478		- d="m 382.5,-450.668 -12,-5 3,5 -3,5 z"
479		- clip-path="url(#clipPath2)"
480		- id="path138"
481		- inkscape:connector-curvature="0"
482		- style="stroke:none;stroke-width:1" />
483		- <path
484		- d="m 412.5,-450.668 21,0"
485		- clip-path="url(#clipPath2)"
486		- id="path140"
487		- inkscape:connector-curvature="0"
488		- style="fill:none;stroke-width:1" />
489		- <path
490		- d="m 441.5,-450.668 -12,-5 3,5 -3,5 z"
491		- clip-path="url(#clipPath2)"
492		- id="path142"
493		- inkscape:connector-curvature="0"
494		- style="stroke:none;stroke-width:1" />
495		- <path
496		- d="m 471.5,-450.668 21,0"
497		- clip-path="url(#clipPath2)"
498		- id="path144"
499		- inkscape:connector-curvature="0"
500		- style="fill:none;stroke-width:1" />
501		- <path
502		- d="m 500.5,-450.668 -12,-5 3,5 -3,5 z"
503		- clip-path="url(#clipPath2)"
504		- id="path146"
505		- inkscape:connector-curvature="0"
506		- style="stroke:none;stroke-width:1" />
507		- <path
508		- d="m 530.5,-450.668 21,0"
509		- clip-path="url(#clipPath2)"
510		- id="path148"
511		- inkscape:connector-curvature="0"
512		- style="fill:none;stroke-width:1" />
513		- <path
514		- d="m 559.5,-450.668 -12,-5 3,5 -3,5 z"
515		- clip-path="url(#clipPath2)"
516		- id="path150"
517		- inkscape:connector-curvature="0"
518		- style="stroke:none;stroke-width:1" />
519		- <path
520		- d="m 352.5,-403.668 52,0"
521		- clip-path="url(#clipPath2)"
522		- id="path152"
523		- inkscape:connector-curvature="0"
524		- style="fill:none;stroke-width:1" />
525		- <path
526		- d="m 412.5,-403.668 -12,-5 3,5 -3,5 z"
527		- clip-path="url(#clipPath2)"
528		- id="path154"
529		- inkscape:connector-curvature="0"
530		- style="stroke:none;stroke-width:1" />
531		- <path
532		- d="m 435.3766,-416.4335 9.0459,-14.6606"
533		- clip-path="url(#clipPath2)"
534		- id="path156"
535		- inkscape:connector-curvature="0"
536		- style="fill:none;stroke-width:1;stroke-dasharray:6, 2" />
537		- <path
538		- d="m 448.6234,-437.9024 -10.5565,7.5869 5.8305,0.0724 2.6799,5.1786 z"
539		- clip-path="url(#clipPath2)"
540		- id="path158"
541		- inkscape:connector-curvature="0"
542		- style="stroke:none;stroke-width:1;stroke-dasharray:6, 2" />
543		- <path
544		- d="m 442.5,-403.668 80,0"
545		- clip-path="url(#clipPath2)"
546		- id="path160"
547		- inkscape:connector-curvature="0"
548		- style="fill:none;stroke-width:1" />
549		- <path
550		- d="m 530.5,-403.668 -12,-5 3,5 -3,5 z"
551		- clip-path="url(#clipPath2)"
552		- id="path162"
553		- inkscape:connector-curvature="0"
554		- style="stroke:none;stroke-width:1" />
555		- <path
556		- d="m 553.3766,-416.4335 9.0459,-14.6606"
557		- clip-path="url(#clipPath2)"
558		- id="path164"
559		- inkscape:connector-curvature="0"
560		- style="fill:none;stroke-width:1;stroke-dasharray:6, 2" />
561		- <path
562		- d="m 566.6234,-437.9024 -10.5564,7.5868 5.8305,0.0725 2.6798,5.1786 z"
563		- clip-path="url(#clipPath2)"
564		- id="path166"
565		- inkscape:connector-curvature="0"
566		- style="stroke:none;stroke-width:1;stroke-dasharray:6, 2" />
567		- </g>
568		- </g>
569		-</svg>

	--- a/www/branch04.svg
	+++ b/www/branch04.svg
	@@ -1,569 +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="388"
11	stroke-miterlimit="10"
12	font-weight="normal"
13	height="104.77151"
14	font-style="normal"
15	font-size="12px"
16	id="svg2"
17	version="1.1"
18	inkscape:version="0.91 r13725"
19	sodipodi:docname="branch04.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="metadata170">
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="namedview168"
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="194"
52	inkscape:cy="49.103516"
53	inkscape:window-x="0"
54	inkscape:window-y="0"
55	inkscape:window-maximized="0"
56	inkscape:current-layer="svg2" />
57	<!--Generated by ySVG 2.5-->
58	<defs
59	id="genericDefs" />
60	<g
61	id="g5"
62	transform="translate(-173.5,-610.332)">
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="path9"
71	inkscape:connector-curvature="0" />
72	</clipPath>
73	<clipPath
74	clipPathUnits="userSpaceOnUse"
75	id="clipPath2">
76	<path
77	d="m 29,-1077 735,0 0,1332 -735,0 0,-1332 z"
78	id="path12"
79	inkscape:connector-curvature="0" />
80	</clipPath>
81	</defs>
82	<g
83	transform="translate(-29,1077)"
84	id="g14"
85	style="fill:#9accfc;stroke:#9accfc;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
86	<rect
87	x="290.6333"
88	width="298.8667"
89	height="46"
90	y="-425.668"
91	clip-path="url(#clipPath2)"
92	id="rect16"
93	style="stroke:none" />
94	</g>
95	<g
96	transform="translate(-29,1077)"
97	stroke-miterlimit="1.45"
98	id="g18"
99	style="fill:#7ca5cc;stroke:#7ca5cc;stroke-linecap:butt;stroke-miterlimit:1.45000005;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
100	<rect
101	x="290.6333"
102	width="298.8667"
103	height="46"
104	y="-425.668"
105	clip-path="url(#clipPath2)"
106	id="rect20"
107	style="fill:none" />
108	<text
109	x="429.177"
110	y="-362.06641"
111	clip-path="url(#clipPath2)"
112	xml:space="preserve"
113	id="text22"
114	style="font-family:sans-serif;fill:#000000;stroke:none">test</text>
115	</g>
116	<g
117	transform="translate(-29,1077)"
118	id="g24"
119	style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
120	<circle
121	r="15"
122	clip-path="url(#clipPath2)"
123	cx="218.5"
124	cy="-450.668"
125	id="circle26"
126	style="stroke:none" />
127	</g>
128	<g
129	stroke-miterlimit="1.45"
130	transform="translate(-29,1077)"
131	id="g28"
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="218.5"
137	cy="-450.668"
138	id="circle30"
139	style="fill:none" />
140	<text
141	x="214.7061"
142	y="-446.13281"
143	clip-path="url(#clipPath2)"
144	xml:space="preserve"
145	id="text32"
146	style="font-family:sans-serif;stroke:none;stroke-width:1">1</text>
147	</g>
148	<g
149	transform="translate(-29,1077)"
150	id="g34"
151	style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
152	<circle
153	r="15"
154	clip-path="url(#clipPath2)"
155	cx="278.5"
156	cy="-450.668"
157	id="circle36"
158	style="stroke:none" />
159	</g>
160	<g
161	stroke-miterlimit="1.45"
162	transform="translate(-29,1077)"
163	id="g38"
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="278.5"
169	cy="-450.668"
170	id="circle40"
171	style="fill:none" />
172	<text
173	x="274.70609"
174	y="-446.13281"
175	clip-path="url(#clipPath2)"
176	xml:space="preserve"
177	id="text42"
178	style="font-family:sans-serif;stroke:none;stroke-width:1">2</text>
179	</g>
180	<g
181	transform="translate(-29,1077)"
182	id="g44"
183	style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
184	<circle
185	r="15"
186	clip-path="url(#clipPath2)"
187	cx="338.5"
188	cy="-450.668"
189	id="circle46"
190	style="stroke:none" />
191	</g>
192	<g
193	stroke-miterlimit="1.45"
194	transform="translate(-29,1077)"
195	id="g48"
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="338.5"
201	cy="-450.668"
202	id="circle50"
203	style="fill:none" />
204	<text
205	x="334.70609"
206	y="-446.13281"
207	clip-path="url(#clipPath2)"
208	xml:space="preserve"
209	id="text52"
210	style="font-family:sans-serif;stroke:none;stroke-width:1">3</text>
211	</g>
212	<g
213	transform="translate(-29,1077)"
214	id="g54"
215	style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
216	<circle
217	r="15"
218	clip-path="url(#clipPath2)"
219	cx="337.5"
220	cy="-403.668"
221	id="circle56"
222	style="stroke:none" />
223	</g>
224	<g
225	stroke-miterlimit="1.45"
226	transform="translate(-29,1077)"
227	id="g58"
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="337.5"
233	cy="-403.668"
234	id="circle60"
235	style="fill:none" />
236	<text
237	x="333.70609"
238	y="-399.13281"
239	clip-path="url(#clipPath2)"
240	xml:space="preserve"
241	id="text62"
242	style="font-family:sans-serif;stroke:none;stroke-width:1">4</text>
243	</g>
244	<g
245	transform="translate(-29,1077)"
246	id="g64"
247	style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
248	<circle
249	r="15"
250	clip-path="url(#clipPath2)"
251	cx="397.5"
252	cy="-450.668"
253	id="circle66"
254	style="stroke:none" />
255	</g>
256	<g
257	stroke-miterlimit="1.45"
258	transform="translate(-29,1077)"
259	id="g68"
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="397.5"
265	cy="-450.668"
266	id="circle70"
267	style="fill:none" />
268	<text
269	x="393.70609"
270	y="-446.13281"
271	clip-path="url(#clipPath2)"
272	xml:space="preserve"
273	id="text72"
274	style="font-family:sans-serif;stroke:none;stroke-width:1">5</text>
275	</g>
276	<g
277	transform="translate(-29,1077)"
278	id="g74"
279	style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
280	<circle
281	r="15"
282	clip-path="url(#clipPath2)"
283	cx="456.5"
284	cy="-450.668"
285	id="circle76"
286	style="stroke:none" />
287	</g>
288	<g
289	stroke-miterlimit="1.45"
290	transform="translate(-29,1077)"
291	id="g78"
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="456.5"
297	cy="-450.668"
298	id="circle80"
299	style="fill:none" />
300	<text
301	x="452.70609"
302	y="-446.13281"
303	clip-path="url(#clipPath2)"
304	xml:space="preserve"
305	id="text82"
306	style="font-family:sans-serif;stroke:none;stroke-width:1">7</text>
307	</g>
308	<g
309	transform="translate(-29,1077)"
310	id="g84"
311	style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
312	<circle
313	r="15"
314	clip-path="url(#clipPath2)"
315	cx="515.5"
316	cy="-450.668"
317	id="circle86"
318	style="stroke:none" />
319	</g>
320	<g
321	stroke-miterlimit="1.45"
322	transform="translate(-29,1077)"
323	id="g88"
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="515.5"
329	cy="-450.668"
330	id="circle90"
331	style="fill:none" />
332	<text
333	x="511.70609"
334	y="-446.13281"
335	clip-path="url(#clipPath2)"
336	xml:space="preserve"
337	id="text92"
338	style="font-family:sans-serif;stroke:none;stroke-width:1">8</text>
339	</g>
340	<g
341	transform="translate(-29,1077)"
342	id="g94"
343	style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
344	<circle
345	r="15"
346	clip-path="url(#clipPath2)"
347	cx="574.5"
348	cy="-450.668"
349	id="circle96"
350	style="stroke:none" />
351	</g>
352	<g
353	stroke-miterlimit="1.45"
354	transform="translate(-29,1077)"
355	id="g98"
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="574.5"
361	cy="-450.668"
362	id="circle100"
363	style="fill:none" />
364	<text
365	x="566.91211"
366	y="-446.13281"
367	clip-path="url(#clipPath2)"
368	xml:space="preserve"
369	id="text102"
370	style="font-family:sans-serif;stroke:none;stroke-width:1">10</text>
371	</g>
372	<g
373	transform="translate(-29,1077)"
374	id="g104"
375	style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
376	<circle
377	r="15"
378	clip-path="url(#clipPath2)"
379	cx="427.5"
380	cy="-403.668"
381	id="circle106"
382	style="stroke:none" />
383	</g>
384	<g
385	stroke-miterlimit="1.45"
386	transform="translate(-29,1077)"
387	id="g108"
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="427.5"
393	cy="-403.668"
394	id="circle110"
395	style="fill:none" />
396	<text
397	x="423.70609"
398	y="-399.13281"
399	clip-path="url(#clipPath2)"
400	xml:space="preserve"
401	id="text112"
402	style="font-family:sans-serif;stroke:none;stroke-width:1">6</text>
403	</g>
404	<g
405	transform="translate(-29,1077)"
406	id="g114"
407	style="fill:#ffffff;stroke:#ffffff;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
408	<circle
409	r="15"
410	clip-path="url(#clipPath2)"
411	cx="545.5"
412	cy="-403.668"
413	id="circle116"
414	style="stroke:none" />
415	</g>
416	<g
417	stroke-miterlimit="1.45"
418	transform="translate(-29,1077)"
419	id="g118"
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="545.5"
425	cy="-403.668"
426	id="circle120"
427	style="fill:none" />
428	<text
429	x="541.70612"
430	y="-399.13281"
431	clip-path="url(#clipPath2)"
432	xml:space="preserve"
433	id="text122"
434	style="font-family:sans-serif;stroke:none;stroke-width:1">9</text>
435	<path
436	d="m 233.5,-450.668 22,0"
437	clip-path="url(#clipPath2)"
438	id="path124"
439	inkscape:connector-curvature="0"
440	style="fill:none;stroke-width:1" />
441	<path
442	d="m 263.5,-450.668 -12,-5 3,5 -3,5 z"
443	clip-path="url(#clipPath2)"
444	id="path126"
445	inkscape:connector-curvature="0"
446	style="stroke:none;stroke-width:1" />
447	<path
448	d="m 293.5,-450.668 22,0"
449	clip-path="url(#clipPath2)"
450	id="path128"
451	inkscape:connector-curvature="0"
452	style="fill:none;stroke-width:1" />
453	<path
454	d="m 323.5,-450.668 -12,-5 3,5 -3,5 z"
455	clip-path="url(#clipPath2)"
456	id="path130"
457	inkscape:connector-curvature="0"
458	style="stroke:none;stroke-width:1" />
459	<path
460	d="m 290.2324,-441.3218 29.2779,23.3231"
461	clip-path="url(#clipPath2)"
462	id="path132"
463	inkscape:connector-curvature="0"
464	style="fill:none;stroke-width:1" />
465	<path
466	d="m 325.7676,-413.0141 -6.2705,-11.3878 -0.769,5.7801 -5.4618,2.0415 z"
467	clip-path="url(#clipPath2)"
468	id="path134"
469	inkscape:connector-curvature="0"
470	style="stroke:none;stroke-width:1" />
471	<path
472	d="m 353.5,-450.668 21,0"
473	clip-path="url(#clipPath2)"
474	id="path136"
475	inkscape:connector-curvature="0"
476	style="fill:none;stroke-width:1" />
477	<path
478	d="m 382.5,-450.668 -12,-5 3,5 -3,5 z"
479	clip-path="url(#clipPath2)"
480	id="path138"
481	inkscape:connector-curvature="0"
482	style="stroke:none;stroke-width:1" />
483	<path
484	d="m 412.5,-450.668 21,0"
485	clip-path="url(#clipPath2)"
486	id="path140"
487	inkscape:connector-curvature="0"
488	style="fill:none;stroke-width:1" />
489	<path
490	d="m 441.5,-450.668 -12,-5 3,5 -3,5 z"
491	clip-path="url(#clipPath2)"
492	id="path142"
493	inkscape:connector-curvature="0"
494	style="stroke:none;stroke-width:1" />
495	<path
496	d="m 471.5,-450.668 21,0"
497	clip-path="url(#clipPath2)"
498	id="path144"
499	inkscape:connector-curvature="0"
500	style="fill:none;stroke-width:1" />
501	<path
502	d="m 500.5,-450.668 -12,-5 3,5 -3,5 z"
503	clip-path="url(#clipPath2)"
504	id="path146"
505	inkscape:connector-curvature="0"
506	style="stroke:none;stroke-width:1" />
507	<path
508	d="m 530.5,-450.668 21,0"
509	clip-path="url(#clipPath2)"
510	id="path148"
511	inkscape:connector-curvature="0"
512	style="fill:none;stroke-width:1" />
513	<path
514	d="m 559.5,-450.668 -12,-5 3,5 -3,5 z"
515	clip-path="url(#clipPath2)"
516	id="path150"
517	inkscape:connector-curvature="0"
518	style="stroke:none;stroke-width:1" />
519	<path
520	d="m 352.5,-403.668 52,0"
521	clip-path="url(#clipPath2)"
522	id="path152"
523	inkscape:connector-curvature="0"
524	style="fill:none;stroke-width:1" />
525	<path
526	d="m 412.5,-403.668 -12,-5 3,5 -3,5 z"
527	clip-path="url(#clipPath2)"
528	id="path154"
529	inkscape:connector-curvature="0"
530	style="stroke:none;stroke-width:1" />
531	<path
532	d="m 435.3766,-416.4335 9.0459,-14.6606"
533	clip-path="url(#clipPath2)"
534	id="path156"
535	inkscape:connector-curvature="0"
536	style="fill:none;stroke-width:1;stroke-dasharray:6, 2" />
537	<path
538	d="m 448.6234,-437.9024 -10.5565,7.5869 5.8305,0.0724 2.6799,5.1786 z"
539	clip-path="url(#clipPath2)"
540	id="path158"
541	inkscape:connector-curvature="0"
542	style="stroke:none;stroke-width:1;stroke-dasharray:6, 2" />
543	<path
544	d="m 442.5,-403.668 80,0"
545	clip-path="url(#clipPath2)"
546	id="path160"
547	inkscape:connector-curvature="0"
548	style="fill:none;stroke-width:1" />
549	<path
550	d="m 530.5,-403.668 -12,-5 3,5 -3,5 z"
551	clip-path="url(#clipPath2)"
552	id="path162"
553	inkscape:connector-curvature="0"
554	style="stroke:none;stroke-width:1" />
555	<path
556	d="m 553.3766,-416.4335 9.0459,-14.6606"
557	clip-path="url(#clipPath2)"
558	id="path164"
559	inkscape:connector-curvature="0"
560	style="fill:none;stroke-width:1;stroke-dasharray:6, 2" />
561	<path
562	d="m 566.6234,-437.9024 -10.5564,7.5868 5.8305,0.0725 2.6798,5.1786 z"
563	clip-path="url(#clipPath2)"
564	id="path166"
565	inkscape:connector-curvature="0"
566	style="stroke:none;stroke-width:1;stroke-dasharray:6, 2" />
567	</g>
568	</g>
569	</svg>

	--- a/www/branch04.svg
	+++ b/www/branch04.svg
	@@ -1,569 +0,0 @@

D www/branch06.svg

-239

		--- a/www/branch06.svg
		+++ b/www/branch06.svg
		@@ -1,239 +0,0 @@
1		-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill-opacity="1" color-rendering="auto" color-interpolation="auto" text-rendering="auto" stroke="black" stroke-linecap="square" width="517" stroke-miterlimit="10" shape-rendering="auto" stroke-opacity="1" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" height="501" font-family="'Dialog'" font-style="normal" stroke-linejoin="miter" font-size="12px" stroke-dashoffset="0" image-rendering="auto">
2		- <!--Generated by ySVG 2.5-->
3		- <defs id="genericDefs"/>
4		- <g>
5		- <defs id="defs1">
6		- <clipPath clipPathUnits="userSpaceOnUse" id="clipPath1">
7		- <path d="M0 0 L517 0 L517 501 L0 501 L0 0 Z"/>
8		- </clipPath>
9		- <clipPath clipPathUnits="userSpaceOnUse" id="clipPath2">
10		- <path d="M-223 -1949 L294 -1949 L294 -1448 L-223 -1448 L-223 -1949 Z"/>
11		- </clipPath>
12		- <clipPath clipPathUnits="userSpaceOnUse" id="clipPath3">
13		- <path d="M115.2451 -18 L115.2451 499 L-385.7549 499 L-385.7549 -18 L115.2451 -18 Z"/>
14		- </clipPath>
15		- <clipPath clipPathUnits="userSpaceOnUse" id="clipPath4">
16		- <path d="M226.751 -18 L226.751 499 L-274.249 499 L-274.249 -18 L226.751 -18 Z"/>
17		- </clipPath>
18		- <clipPath clipPathUnits="userSpaceOnUse" id="clipPath5">
19		- <path d="M342.2891 -18 L342.2891 499 L-158.7109 499 L-158.7109 -18 L342.2891 -18 Z"/>
20		- </clipPath>
21		- <clipPath clipPathUnits="userSpaceOnUse" id="clipPath6">
22		- <path d="M454.2402 -18 L454.2402 499 L-46.7598 499 L-46.7598 -18 L454.2402 -18 Z"/>
23		- </clipPath>
24		- </defs>
25		- <g fill="rgb(236,245,255)" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke="rgb(236,245,255)">
26		- <path d="M-208 -1933.666 L-208 -1903.666 L279 -1903.666 L279 -1933.666 Z" stroke="none" clip-path="url(#clipPath2)"/>
27		- <rect x="-208" width="487" height="440" y="-1903.666" clip-path="url(#clipPath2)" stroke="none"/>
28		- <line clip-path="url(#clipPath2)" fill="rgb(113,146,178)" x1="-184" x2="279" y1="-1903.666" y2="-1903.666" stroke="none"/>
29		- <rect x="-208" y="-1903.666" clip-path="url(#clipPath2)" fill="rgb(196,215,237)" width="24" height="110" stroke="none"/>
30		- <rect x="-184" y="-1903.666" clip-path="url(#clipPath2)" fill="rgb(196,215,237)" width="463" height="110" stroke="none"/>
31		- <rect x="-208" y="-1793.666" clip-path="url(#clipPath2)" fill="rgb(171,200,226)" width="24" height="110" stroke="none"/>
32		- <rect x="-184" y="-1793.666" clip-path="url(#clipPath2)" fill="rgb(171,200,226)" width="463" height="110" stroke="none"/>
33		- <rect x="-208" y="-1683.666" clip-path="url(#clipPath2)" fill="rgb(196,215,237)" width="24" height="109" stroke="none"/>
34		- <rect x="-184" y="-1683.666" clip-path="url(#clipPath2)" fill="rgb(196,215,237)" width="463" height="109" stroke="none"/>
35		- <rect x="-208" y="-1574.666" clip-path="url(#clipPath2)" fill="rgb(171,200,226)" width="24" height="111" stroke="none"/>
36		- <rect x="-184" y="-1574.666" clip-path="url(#clipPath2)" fill="rgb(171,200,226)" width="463" height="111" stroke="none"/>
37		- </g>
38		- <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke-linecap="butt">
39		- <rect fill="none" x="-208" width="487" height="470" y="-1933.666" clip-path="url(#clipPath2)"/>
40		- <rect fill="none" x="-184" width="463" height="440" y="-1903.666" clip-path="url(#clipPath2)"/>
41		- <rect fill="none" x="-208" width="487" height="110" y="-1903.666" clip-path="url(#clipPath2)"/>
42		- <rect fill="none" x="-208" width="487" height="110" y="-1793.666" clip-path="url(#clipPath2)"/>
43		- <rect fill="none" x="-208" width="487" height="109" y="-1683.666" clip-path="url(#clipPath2)"/>
44		- <rect fill="none" x="-208" width="487" height="111" y="-1574.666" clip-path="url(#clipPath2)"/>
45		- </g>
46		- <g font-size="15px" stroke-linecap="butt" transform="matrix(1,0,0,1,223,1949)" text-rendering="geometricPrecision" font-family="sans-serif" shape-rendering="geometricPrecision" stroke-miterlimit="1.45">
47		- <text x="-107.6299" xml:space="preserve" y="-1913.1641" clip-path="url(#clipPath2)" stroke="none">Varying User Views of Fossil Repository</text>
48		- </g>
49		- <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" shape-rendering="geometricPrecision" font-family="sans-serif" transform="matrix(-0,-1,1,-0,18,115.2451)" stroke-linecap="butt">
50		- <text x="2" xml:space="preserve" y="13.6016" clip-path="url(#clipPath3)" stroke="none">Alan</text>
51		- </g>
52		- <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" shape-rendering="geometricPrecision" font-family="sans-serif" transform="matrix(-0,-1,1,-0,18,226.751)" stroke-linecap="butt">
53		- <text x="2" xml:space="preserve" y="13.6016" clip-path="url(#clipPath4)" stroke="none">Betty</text>
54		- </g>
55		- <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" shape-rendering="geometricPrecision" font-family="sans-serif" transform="matrix(-0,-1,1,-0,18,342.2891)" stroke-linecap="butt">
56		- <text x="2" xml:space="preserve" y="13.6016" clip-path="url(#clipPath5)" stroke="none">Charlie</text>
57		- </g>
58		- <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" shape-rendering="geometricPrecision" font-family="sans-serif" transform="matrix(-0,-1,1,-0,18,454.2402)" stroke-linecap="butt">
59		- <text x="2" xml:space="preserve" y="13.6016" clip-path="url(#clipPath6)" stroke="none">Darlene</text>
60		- </g>
61		- <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke="white">
62		- <circle r="15" clip-path="url(#clipPath2)" cx="-157" cy="-1760.666" stroke="none"/>
63		- </g>
64		- <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke-linecap="butt">
65		- <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="-157" cy="-1760.666"/>
66		- <text x="-160.7939" y="-1756.1309" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">1</text>
67		- </g>
68		- <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke="white">
69		- <circle r="15" clip-path="url(#clipPath2)" cx="-50" cy="-1718.166" stroke="none"/>
70		- </g>
71		- <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke-linecap="butt">
72		- <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="-50" cy="-1718.166"/>
73		- <text x="-53.7939" y="-1713.6309" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">3</text>
74		- </g>
75		- <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke="white">
76		- <ellipse rx="32" ry="15" clip-path="url(#clipPath2)" cx="229" cy="-1760.666" stroke="none"/>
77		- </g>
78		- <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke-linecap="butt">
79		- <ellipse rx="32" fill="none" ry="15" clip-path="url(#clipPath2)" cx="229" cy="-1760.666"/>
80		- <text x="211.3047" y="-1756.1309" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">future</text>
81		- </g>
82		- <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke="white">
83		- <circle r="15" clip-path="url(#clipPath2)" cx="-97" cy="-1760.666" stroke="none"/>
84		- </g>
85		- <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke-linecap="butt">
86		- <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="-97" cy="-1760.666"/>
87		- <text x="-100.7939" y="-1756.1309" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">2</text>
88		- </g>
89		- <g fill="silver" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke="silver">
90		- <circle r="15" clip-path="url(#clipPath2)" cx="10" cy="-1718.166" stroke="none"/>
91		- </g>
92		- <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke-linecap="butt">
93		- <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="10" cy="-1718.166"/>
94		- <text x="6.2061" y="-1713.6309" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">4</text>
95		- </g>
96		- <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke="white">
97		- <circle r="15" clip-path="url(#clipPath2)" cx="-157" cy="-1541.5" stroke="none"/>
98		- </g>
99		- <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke-linecap="butt">
100		- <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="-157" cy="-1541.5"/>
101		- <text x="-160.7939" y="-1536.9648" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">1</text>
102		- </g>
103		- <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke="white">
104		- <circle r="15" clip-path="url(#clipPath2)" cx="-50" cy="-1499" stroke="none"/>
105		- </g>
106		- <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke-linecap="butt">
107		- <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="-50" cy="-1499"/>
108		- <text x="-53.7939" y="-1494.4648" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">3</text>
109		- </g>
110		- <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke="white">
111		- <ellipse rx="32" ry="15" clip-path="url(#clipPath2)" cx="229" cy="-1541.5" stroke="none"/>
112		- </g>
113		- <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke-linecap="butt">
114		- <ellipse rx="32" fill="none" ry="15" clip-path="url(#clipPath2)" cx="229" cy="-1541.5"/>
115		- <text x="211.3047" y="-1536.9648" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">future</text>
116		- </g>
117		- <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke="white">
118		- <circle r="15" clip-path="url(#clipPath2)" cx="-97" cy="-1541.5" stroke="none"/>
119		- </g>
120		- <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke-linecap="butt">
121		- <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="-97" cy="-1541.5"/>
122		- <text x="-100.7939" y="-1536.9648" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">2</text>
123		- </g>
124		- <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke="white">
125		- <circle r="15" clip-path="url(#clipPath2)" cx="10" cy="-1499" stroke="none"/>
126		- </g>
127		- <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke-linecap="butt">
128		- <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="10" cy="-1499"/>
129		- <text x="6.2061" y="-1494.4648" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">4</text>
130		- </g>
131		- <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke="white">
132		- <circle r="15" clip-path="url(#clipPath2)" cx="70" cy="-1541.5" stroke="none"/>
133		- </g>
134		- <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke-linecap="butt">
135		- <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="70" cy="-1541.5"/>
136		- <text x="66.2061" y="-1536.9648" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">5</text>
137		- </g>
138		- <g fill="silver" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke="silver">
139		- <circle r="15" clip-path="url(#clipPath2)" cx="130" cy="-1541.5" stroke="none"/>
140		- </g>
141		- <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke-linecap="butt">
142		- <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="130" cy="-1541.5"/>
143		- <text x="126.2061" y="-1536.9648" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">6</text>
144		- </g>
145		- <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke="white">
146		- <circle r="15" clip-path="url(#clipPath2)" cx="-157" cy="-1871.666" stroke="none"/>
147		- </g>
148		- <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke-linecap="butt">
149		- <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="-157" cy="-1871.666"/>
150		- <text x="-160.7939" y="-1867.1309" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">1</text>
151		- </g>
152		- <g fill="silver" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke="silver">
153		- <circle r="15" clip-path="url(#clipPath2)" cx="-50" cy="-1829.166" stroke="none"/>
154		- </g>
155		- <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke-linecap="butt">
156		- <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="-50" cy="-1829.166"/>
157		- <text x="-53.7939" y="-1824.6309" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">3</text>
158		- </g>
159		- <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke="white">
160		- <ellipse rx="32" ry="15" clip-path="url(#clipPath2)" cx="229" cy="-1871.666" stroke="none"/>
161		- </g>
162		- <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke-linecap="butt">
163		- <ellipse rx="32" fill="none" ry="15" clip-path="url(#clipPath2)" cx="229" cy="-1871.666"/>
164		- <text x="211.3047" y="-1867.1309" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">future</text>
165		- </g>
166		- <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke="white">
167		- <circle r="15" clip-path="url(#clipPath2)" cx="-97" cy="-1871.666" stroke="none"/>
168		- </g>
169		- <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke-linecap="butt">
170		- <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="-97" cy="-1871.666"/>
171		- <text x="-100.7939" y="-1867.1309" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">2</text>
172		- </g>
173		- <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke="white">
174		- <circle r="15" clip-path="url(#clipPath2)" cx="-97" cy="-1643.333" stroke="none"/>
175		- </g>
176		- <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke-linecap="butt">
177		- <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="-97" cy="-1643.333"/>
178		- <text x="-100.7939" y="-1638.7979" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">2</text>
179		- </g>
180		- <g fill="silver" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke="silver">
181		- <circle r="15" clip-path="url(#clipPath2)" cx="70" cy="-1643.333" stroke="none"/>
182		- </g>
183		- <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke-linecap="butt">
184		- <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="70" cy="-1643.333"/>
185		- <text x="66.2061" y="-1638.7979" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">5</text>
186		- </g>
187		- <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke="white">
188		- <circle r="15" clip-path="url(#clipPath2)" cx="-157" cy="-1643.333" stroke="none"/>
189		- </g>
190		- <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke-linecap="butt">
191		- <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="-157" cy="-1643.333"/>
192		- <text x="-160.7939" y="-1638.7979" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">1</text>
193		- </g>
194		- <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke="white">
195		- <ellipse rx="32" ry="15" clip-path="url(#clipPath2)" cx="229" cy="-1643.333" stroke="none"/>
196		- </g>
197		- <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke-linecap="butt">
198		- <ellipse rx="32" fill="none" ry="15" clip-path="url(#clipPath2)" cx="229" cy="-1643.333"/>
199		- <text x="211.3047" y="-1638.7979" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">future</text>
200		- <path fill="none" d="M-143.0594 -1755.1289 L-71.3756 -1726.6564" stroke-width="1" clip-path="url(#clipPath2)"/>
201		- <path d="M-63.9406 -1723.7031 L-73.2473 -1732.7798 L-72.3049 -1727.0255 L-76.9388 -1723.4861 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
202		- <path fill="none" d="M-142 -1760.666 L-120 -1760.666" stroke-width="1" clip-path="url(#clipPath2)"/>
203		- <path d="M-112 -1760.666 L-124 -1765.666 L-121 -1760.666 L-124 -1755.666 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
204		- <path fill="none" d="M-82 -1760.666 L189 -1760.666" stroke-width="1" clip-path="url(#clipPath2)"/>
205		- <path d="M197 -1760.666 L185 -1765.666 L188 -1760.666 L185 -1755.666 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
206		- <path fill="none" d="M-35 -1718.166 L-13 -1718.166" stroke-width="1" clip-path="url(#clipPath2)"/>
207		- <path d="M-5 -1718.166 L-17 -1723.166 L-14 -1718.166 L-17 -1713.166 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
208		- <path fill="none" d="M-143.0594 -1535.9629 L-71.3756 -1507.4904" stroke-width="1" clip-path="url(#clipPath2)"/>
209		- <path d="M-63.9406 -1504.5371 L-73.2473 -1513.6138 L-72.3049 -1507.8595 L-76.9388 -1504.3201 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
210		- <path fill="none" d="M-142 -1541.5 L-120 -1541.5" stroke-width="1" clip-path="url(#clipPath2)"/>
211		- <path d="M-112 -1541.5 L-124 -1546.5 L-121 -1541.5 L-124 -1536.5 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
212		- <path fill="none" d="M-35 -1499 L-13 -1499" stroke-width="1" clip-path="url(#clipPath2)"/>
213		- <path d="M-5 -1499 L-17 -1504 L-14 -1499 L-17 -1494 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
214		- <path fill="none" d="M-82 -1541.5 L47 -1541.5" stroke-width="1" clip-path="url(#clipPath2)"/>
215		- <path d="M55 -1541.5 L43 -1546.5 L46 -1541.5 L43 -1536.5 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
216		- <path fill="none" d="M85 -1541.5 L107 -1541.5" stroke-width="1" clip-path="url(#clipPath2)"/>
217		- <path d="M115 -1541.5 L103 -1546.5 L106 -1541.5 L103 -1536.5 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
218		- <path fill="none" d="M145 -1541.5 L189 -1541.5" stroke-width="1" clip-path="url(#clipPath2)"/>
219		- <path d="M197 -1541.5 L185 -1546.5 L188 -1541.5 L185 -1536.5 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
220		- <path fill="none" d="M-143.0594 -1866.1289 L-71.3756 -1837.6564" stroke-width="1" clip-path="url(#clipPath2)"/>
221		- <path d="M-63.9406 -1834.7031 L-73.2473 -1843.7798 L-72.3049 -1838.0255 L-76.9388 -1834.4861 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
222		- <text x="-151.3547" y="-1842.3409" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">fork!</text>
223		- <path fill="none" d="M-142 -1871.666 L-120 -1871.666" stroke-width="1" clip-path="url(#clipPath2)"/>
224		- <path d="M-112 -1871.666 L-124 -1876.666 L-121 -1871.666 L-124 -1866.666 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
225		- <path fill="none" d="M-82 -1871.666 L189 -1871.666" stroke-width="1" clip-path="url(#clipPath2)"/>
226		- <path d="M197 -1871.666 L185 -1876.666 L188 -1871.666 L185 -1866.666 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
227		- <path fill="none" d="M-82 -1643.333 L47 -1643.333" stroke-width="1" clip-path="url(#clipPath2)"/>
228		- <path d="M55 -1643.333 L43 -1648.333 L46 -1643.333 L43 -1638.333 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
229		- <text x="-47.8594" y="-1651.8643" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">goes offline</text>
230		- <path fill="none" d="M-142 -1643.333 L-120 -1643.333" stroke-width="1" clip-path="url(#clipPath2)"/>
231		- <path d="M-112 -1643.333 L-124 -1648.333 L-121 -1643.333 L-124 -1638.333 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
232		- <path fill="none" d="M85 -1643.333 L189 -1643.333" stroke-width="1" clip-path="url(#clipPath2)"/>
233		- <path d="M197 -1643.333 L185 -1648.333 L188 -1643.333 L185 -1638.333 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
234		- <text x="105.5889" y="-1627.7314" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">back online,</text>
235		- <text x="112.7256" y="-1613.5986" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">pushes 5,</text>
236		- <text x="109.5059" y="-1599.4658" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">pulls 3 & 4</text>
237		- </g>
238		- </g>
239		-</svg>

	--- a/www/branch06.svg
	+++ b/www/branch06.svg
	@@ -1,239 +0,0 @@
1	<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill-opacity="1" color-rendering="auto" color-interpolation="auto" text-rendering="auto" stroke="black" stroke-linecap="square" width="517" stroke-miterlimit="10" shape-rendering="auto" stroke-opacity="1" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" height="501" font-family="'Dialog'" font-style="normal" stroke-linejoin="miter" font-size="12px" stroke-dashoffset="0" image-rendering="auto">
2	<!--Generated by ySVG 2.5-->
3	<defs id="genericDefs"/>
4	<g>
5	<defs id="defs1">
6	<clipPath clipPathUnits="userSpaceOnUse" id="clipPath1">
7	<path d="M0 0 L517 0 L517 501 L0 501 L0 0 Z"/>
8	</clipPath>
9	<clipPath clipPathUnits="userSpaceOnUse" id="clipPath2">
10	<path d="M-223 -1949 L294 -1949 L294 -1448 L-223 -1448 L-223 -1949 Z"/>
11	</clipPath>
12	<clipPath clipPathUnits="userSpaceOnUse" id="clipPath3">
13	<path d="M115.2451 -18 L115.2451 499 L-385.7549 499 L-385.7549 -18 L115.2451 -18 Z"/>
14	</clipPath>
15	<clipPath clipPathUnits="userSpaceOnUse" id="clipPath4">
16	<path d="M226.751 -18 L226.751 499 L-274.249 499 L-274.249 -18 L226.751 -18 Z"/>
17	</clipPath>
18	<clipPath clipPathUnits="userSpaceOnUse" id="clipPath5">
19	<path d="M342.2891 -18 L342.2891 499 L-158.7109 499 L-158.7109 -18 L342.2891 -18 Z"/>
20	</clipPath>
21	<clipPath clipPathUnits="userSpaceOnUse" id="clipPath6">
22	<path d="M454.2402 -18 L454.2402 499 L-46.7598 499 L-46.7598 -18 L454.2402 -18 Z"/>
23	</clipPath>
24	</defs>
25	<g fill="rgb(236,245,255)" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke="rgb(236,245,255)">
26	<path d="M-208 -1933.666 L-208 -1903.666 L279 -1903.666 L279 -1933.666 Z" stroke="none" clip-path="url(#clipPath2)"/>
27	<rect x="-208" width="487" height="440" y="-1903.666" clip-path="url(#clipPath2)" stroke="none"/>
28	<line clip-path="url(#clipPath2)" fill="rgb(113,146,178)" x1="-184" x2="279" y1="-1903.666" y2="-1903.666" stroke="none"/>
29	<rect x="-208" y="-1903.666" clip-path="url(#clipPath2)" fill="rgb(196,215,237)" width="24" height="110" stroke="none"/>
30	<rect x="-184" y="-1903.666" clip-path="url(#clipPath2)" fill="rgb(196,215,237)" width="463" height="110" stroke="none"/>
31	<rect x="-208" y="-1793.666" clip-path="url(#clipPath2)" fill="rgb(171,200,226)" width="24" height="110" stroke="none"/>
32	<rect x="-184" y="-1793.666" clip-path="url(#clipPath2)" fill="rgb(171,200,226)" width="463" height="110" stroke="none"/>
33	<rect x="-208" y="-1683.666" clip-path="url(#clipPath2)" fill="rgb(196,215,237)" width="24" height="109" stroke="none"/>
34	<rect x="-184" y="-1683.666" clip-path="url(#clipPath2)" fill="rgb(196,215,237)" width="463" height="109" stroke="none"/>
35	<rect x="-208" y="-1574.666" clip-path="url(#clipPath2)" fill="rgb(171,200,226)" width="24" height="111" stroke="none"/>
36	<rect x="-184" y="-1574.666" clip-path="url(#clipPath2)" fill="rgb(171,200,226)" width="463" height="111" stroke="none"/>
37	</g>
38	<g text-rendering="geometricPrecision" stroke-miterlimit="1.45" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke-linecap="butt">
39	<rect fill="none" x="-208" width="487" height="470" y="-1933.666" clip-path="url(#clipPath2)"/>
40	<rect fill="none" x="-184" width="463" height="440" y="-1903.666" clip-path="url(#clipPath2)"/>
41	<rect fill="none" x="-208" width="487" height="110" y="-1903.666" clip-path="url(#clipPath2)"/>
42	<rect fill="none" x="-208" width="487" height="110" y="-1793.666" clip-path="url(#clipPath2)"/>
43	<rect fill="none" x="-208" width="487" height="109" y="-1683.666" clip-path="url(#clipPath2)"/>
44	<rect fill="none" x="-208" width="487" height="111" y="-1574.666" clip-path="url(#clipPath2)"/>
45	</g>
46	<g font-size="15px" stroke-linecap="butt" transform="matrix(1,0,0,1,223,1949)" text-rendering="geometricPrecision" font-family="sans-serif" shape-rendering="geometricPrecision" stroke-miterlimit="1.45">
47	<text x="-107.6299" xml:space="preserve" y="-1913.1641" clip-path="url(#clipPath2)" stroke="none">Varying User Views of Fossil Repository</text>
48	</g>
49	<g text-rendering="geometricPrecision" stroke-miterlimit="1.45" shape-rendering="geometricPrecision" font-family="sans-serif" transform="matrix(-0,-1,1,-0,18,115.2451)" stroke-linecap="butt">
50	<text x="2" xml:space="preserve" y="13.6016" clip-path="url(#clipPath3)" stroke="none">Alan</text>
51	</g>
52	<g text-rendering="geometricPrecision" stroke-miterlimit="1.45" shape-rendering="geometricPrecision" font-family="sans-serif" transform="matrix(-0,-1,1,-0,18,226.751)" stroke-linecap="butt">
53	<text x="2" xml:space="preserve" y="13.6016" clip-path="url(#clipPath4)" stroke="none">Betty</text>
54	</g>
55	<g text-rendering="geometricPrecision" stroke-miterlimit="1.45" shape-rendering="geometricPrecision" font-family="sans-serif" transform="matrix(-0,-1,1,-0,18,342.2891)" stroke-linecap="butt">
56	<text x="2" xml:space="preserve" y="13.6016" clip-path="url(#clipPath5)" stroke="none">Charlie</text>
57	</g>
58	<g text-rendering="geometricPrecision" stroke-miterlimit="1.45" shape-rendering="geometricPrecision" font-family="sans-serif" transform="matrix(-0,-1,1,-0,18,454.2402)" stroke-linecap="butt">
59	<text x="2" xml:space="preserve" y="13.6016" clip-path="url(#clipPath6)" stroke="none">Darlene</text>
60	</g>
61	<g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke="white">
62	<circle r="15" clip-path="url(#clipPath2)" cx="-157" cy="-1760.666" stroke="none"/>
63	</g>
64	<g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke-linecap="butt">
65	<circle fill="none" r="15" clip-path="url(#clipPath2)" cx="-157" cy="-1760.666"/>
66	<text x="-160.7939" y="-1756.1309" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">1</text>
67	</g>
68	<g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke="white">
69	<circle r="15" clip-path="url(#clipPath2)" cx="-50" cy="-1718.166" stroke="none"/>
70	</g>
71	<g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke-linecap="butt">
72	<circle fill="none" r="15" clip-path="url(#clipPath2)" cx="-50" cy="-1718.166"/>
73	<text x="-53.7939" y="-1713.6309" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">3</text>
74	</g>
75	<g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke="white">
76	<ellipse rx="32" ry="15" clip-path="url(#clipPath2)" cx="229" cy="-1760.666" stroke="none"/>
77	</g>
78	<g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke-linecap="butt">
79	<ellipse rx="32" fill="none" ry="15" clip-path="url(#clipPath2)" cx="229" cy="-1760.666"/>
80	<text x="211.3047" y="-1756.1309" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">future</text>
81	</g>
82	<g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke="white">
83	<circle r="15" clip-path="url(#clipPath2)" cx="-97" cy="-1760.666" stroke="none"/>
84	</g>
85	<g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke-linecap="butt">
86	<circle fill="none" r="15" clip-path="url(#clipPath2)" cx="-97" cy="-1760.666"/>
87	<text x="-100.7939" y="-1756.1309" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">2</text>
88	</g>
89	<g fill="silver" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke="silver">
90	<circle r="15" clip-path="url(#clipPath2)" cx="10" cy="-1718.166" stroke="none"/>
91	</g>
92	<g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke-linecap="butt">
93	<circle fill="none" r="15" clip-path="url(#clipPath2)" cx="10" cy="-1718.166"/>
94	<text x="6.2061" y="-1713.6309" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">4</text>
95	</g>
96	<g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke="white">
97	<circle r="15" clip-path="url(#clipPath2)" cx="-157" cy="-1541.5" stroke="none"/>
98	</g>
99	<g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke-linecap="butt">
100	<circle fill="none" r="15" clip-path="url(#clipPath2)" cx="-157" cy="-1541.5"/>
101	<text x="-160.7939" y="-1536.9648" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">1</text>
102	</g>
103	<g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke="white">
104	<circle r="15" clip-path="url(#clipPath2)" cx="-50" cy="-1499" stroke="none"/>
105	</g>
106	<g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke-linecap="butt">
107	<circle fill="none" r="15" clip-path="url(#clipPath2)" cx="-50" cy="-1499"/>
108	<text x="-53.7939" y="-1494.4648" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">3</text>
109	</g>
110	<g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke="white">
111	<ellipse rx="32" ry="15" clip-path="url(#clipPath2)" cx="229" cy="-1541.5" stroke="none"/>
112	</g>
113	<g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke-linecap="butt">
114	<ellipse rx="32" fill="none" ry="15" clip-path="url(#clipPath2)" cx="229" cy="-1541.5"/>
115	<text x="211.3047" y="-1536.9648" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">future</text>
116	</g>
117	<g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke="white">
118	<circle r="15" clip-path="url(#clipPath2)" cx="-97" cy="-1541.5" stroke="none"/>
119	</g>
120	<g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke-linecap="butt">
121	<circle fill="none" r="15" clip-path="url(#clipPath2)" cx="-97" cy="-1541.5"/>
122	<text x="-100.7939" y="-1536.9648" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">2</text>
123	</g>
124	<g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke="white">
125	<circle r="15" clip-path="url(#clipPath2)" cx="10" cy="-1499" stroke="none"/>
126	</g>
127	<g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke-linecap="butt">
128	<circle fill="none" r="15" clip-path="url(#clipPath2)" cx="10" cy="-1499"/>
129	<text x="6.2061" y="-1494.4648" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">4</text>
130	</g>
131	<g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke="white">
132	<circle r="15" clip-path="url(#clipPath2)" cx="70" cy="-1541.5" stroke="none"/>
133	</g>
134	<g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke-linecap="butt">
135	<circle fill="none" r="15" clip-path="url(#clipPath2)" cx="70" cy="-1541.5"/>
136	<text x="66.2061" y="-1536.9648" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">5</text>
137	</g>
138	<g fill="silver" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke="silver">
139	<circle r="15" clip-path="url(#clipPath2)" cx="130" cy="-1541.5" stroke="none"/>
140	</g>
141	<g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke-linecap="butt">
142	<circle fill="none" r="15" clip-path="url(#clipPath2)" cx="130" cy="-1541.5"/>
143	<text x="126.2061" y="-1536.9648" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">6</text>
144	</g>
145	<g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke="white">
146	<circle r="15" clip-path="url(#clipPath2)" cx="-157" cy="-1871.666" stroke="none"/>
147	</g>
148	<g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke-linecap="butt">
149	<circle fill="none" r="15" clip-path="url(#clipPath2)" cx="-157" cy="-1871.666"/>
150	<text x="-160.7939" y="-1867.1309" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">1</text>
151	</g>
152	<g fill="silver" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke="silver">
153	<circle r="15" clip-path="url(#clipPath2)" cx="-50" cy="-1829.166" stroke="none"/>
154	</g>
155	<g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke-linecap="butt">
156	<circle fill="none" r="15" clip-path="url(#clipPath2)" cx="-50" cy="-1829.166"/>
157	<text x="-53.7939" y="-1824.6309" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">3</text>
158	</g>
159	<g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke="white">
160	<ellipse rx="32" ry="15" clip-path="url(#clipPath2)" cx="229" cy="-1871.666" stroke="none"/>
161	</g>
162	<g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke-linecap="butt">
163	<ellipse rx="32" fill="none" ry="15" clip-path="url(#clipPath2)" cx="229" cy="-1871.666"/>
164	<text x="211.3047" y="-1867.1309" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">future</text>
165	</g>
166	<g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke="white">
167	<circle r="15" clip-path="url(#clipPath2)" cx="-97" cy="-1871.666" stroke="none"/>
168	</g>
169	<g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke-linecap="butt">
170	<circle fill="none" r="15" clip-path="url(#clipPath2)" cx="-97" cy="-1871.666"/>
171	<text x="-100.7939" y="-1867.1309" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">2</text>
172	</g>
173	<g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke="white">
174	<circle r="15" clip-path="url(#clipPath2)" cx="-97" cy="-1643.333" stroke="none"/>
175	</g>
176	<g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke-linecap="butt">
177	<circle fill="none" r="15" clip-path="url(#clipPath2)" cx="-97" cy="-1643.333"/>
178	<text x="-100.7939" y="-1638.7979" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">2</text>
179	</g>
180	<g fill="silver" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke="silver">
181	<circle r="15" clip-path="url(#clipPath2)" cx="70" cy="-1643.333" stroke="none"/>
182	</g>
183	<g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke-linecap="butt">
184	<circle fill="none" r="15" clip-path="url(#clipPath2)" cx="70" cy="-1643.333"/>
185	<text x="66.2061" y="-1638.7979" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">5</text>
186	</g>
187	<g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke="white">
188	<circle r="15" clip-path="url(#clipPath2)" cx="-157" cy="-1643.333" stroke="none"/>
189	</g>
190	<g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke-linecap="butt">
191	<circle fill="none" r="15" clip-path="url(#clipPath2)" cx="-157" cy="-1643.333"/>
192	<text x="-160.7939" y="-1638.7979" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">1</text>
193	</g>
194	<g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke="white">
195	<ellipse rx="32" ry="15" clip-path="url(#clipPath2)" cx="229" cy="-1643.333" stroke="none"/>
196	</g>
197	<g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,223,1949)" stroke-linecap="butt">
198	<ellipse rx="32" fill="none" ry="15" clip-path="url(#clipPath2)" cx="229" cy="-1643.333"/>
199	<text x="211.3047" y="-1638.7979" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">future</text>
200	<path fill="none" d="M-143.0594 -1755.1289 L-71.3756 -1726.6564" stroke-width="1" clip-path="url(#clipPath2)"/>
201	<path d="M-63.9406 -1723.7031 L-73.2473 -1732.7798 L-72.3049 -1727.0255 L-76.9388 -1723.4861 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
202	<path fill="none" d="M-142 -1760.666 L-120 -1760.666" stroke-width="1" clip-path="url(#clipPath2)"/>
203	<path d="M-112 -1760.666 L-124 -1765.666 L-121 -1760.666 L-124 -1755.666 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
204	<path fill="none" d="M-82 -1760.666 L189 -1760.666" stroke-width="1" clip-path="url(#clipPath2)"/>
205	<path d="M197 -1760.666 L185 -1765.666 L188 -1760.666 L185 -1755.666 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
206	<path fill="none" d="M-35 -1718.166 L-13 -1718.166" stroke-width="1" clip-path="url(#clipPath2)"/>
207	<path d="M-5 -1718.166 L-17 -1723.166 L-14 -1718.166 L-17 -1713.166 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
208	<path fill="none" d="M-143.0594 -1535.9629 L-71.3756 -1507.4904" stroke-width="1" clip-path="url(#clipPath2)"/>
209	<path d="M-63.9406 -1504.5371 L-73.2473 -1513.6138 L-72.3049 -1507.8595 L-76.9388 -1504.3201 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
210	<path fill="none" d="M-142 -1541.5 L-120 -1541.5" stroke-width="1" clip-path="url(#clipPath2)"/>
211	<path d="M-112 -1541.5 L-124 -1546.5 L-121 -1541.5 L-124 -1536.5 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
212	<path fill="none" d="M-35 -1499 L-13 -1499" stroke-width="1" clip-path="url(#clipPath2)"/>
213	<path d="M-5 -1499 L-17 -1504 L-14 -1499 L-17 -1494 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
214	<path fill="none" d="M-82 -1541.5 L47 -1541.5" stroke-width="1" clip-path="url(#clipPath2)"/>
215	<path d="M55 -1541.5 L43 -1546.5 L46 -1541.5 L43 -1536.5 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
216	<path fill="none" d="M85 -1541.5 L107 -1541.5" stroke-width="1" clip-path="url(#clipPath2)"/>
217	<path d="M115 -1541.5 L103 -1546.5 L106 -1541.5 L103 -1536.5 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
218	<path fill="none" d="M145 -1541.5 L189 -1541.5" stroke-width="1" clip-path="url(#clipPath2)"/>
219	<path d="M197 -1541.5 L185 -1546.5 L188 -1541.5 L185 -1536.5 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
220	<path fill="none" d="M-143.0594 -1866.1289 L-71.3756 -1837.6564" stroke-width="1" clip-path="url(#clipPath2)"/>
221	<path d="M-63.9406 -1834.7031 L-73.2473 -1843.7798 L-72.3049 -1838.0255 L-76.9388 -1834.4861 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
222	<text x="-151.3547" y="-1842.3409" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">fork!</text>
223	<path fill="none" d="M-142 -1871.666 L-120 -1871.666" stroke-width="1" clip-path="url(#clipPath2)"/>
224	<path d="M-112 -1871.666 L-124 -1876.666 L-121 -1871.666 L-124 -1866.666 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
225	<path fill="none" d="M-82 -1871.666 L189 -1871.666" stroke-width="1" clip-path="url(#clipPath2)"/>
226	<path d="M197 -1871.666 L185 -1876.666 L188 -1871.666 L185 -1866.666 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
227	<path fill="none" d="M-82 -1643.333 L47 -1643.333" stroke-width="1" clip-path="url(#clipPath2)"/>
228	<path d="M55 -1643.333 L43 -1648.333 L46 -1643.333 L43 -1638.333 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
229	<text x="-47.8594" y="-1651.8643" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">goes offline</text>
230	<path fill="none" d="M-142 -1643.333 L-120 -1643.333" stroke-width="1" clip-path="url(#clipPath2)"/>
231	<path d="M-112 -1643.333 L-124 -1648.333 L-121 -1643.333 L-124 -1638.333 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
232	<path fill="none" d="M85 -1643.333 L189 -1643.333" stroke-width="1" clip-path="url(#clipPath2)"/>
233	<path d="M197 -1643.333 L185 -1648.333 L188 -1643.333 L185 -1638.333 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
234	<text x="105.5889" y="-1627.7314" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">back online,</text>
235	<text x="112.7256" y="-1613.5986" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">pushes 5,</text>
236	<text x="109.5059" y="-1599.4658" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">pulls 3 & 4</text>
237	</g>
238	</g>
239	</svg>

	--- a/www/branch06.svg
	+++ b/www/branch06.svg
	@@ -1,239 +0,0 @@

M www/branching.wiki

+124 -6

		--- www/branching.wiki
		+++ www/branching.wiki
		@@ -4,11 +4,19 @@
4	4	In a simple and perfect world, the development of a project would proceed
5	5	linearly, as shown in Figure 1.
6	6
7	7	<table border=1 cellpadding=10 hspace=10 vspace=10 align="center">
8	8	<tr><td align="center">
9		-<img src="branch01.svg"><br>
	9	+<verbatim type="pikchr center">
	10	+circle rad 40% thickness 1.5px "1"
	11	+arrow right 40%
	12	+circle same "2"
	13	+arrow same
	14	+circle same "3"
	15	+arrow same
	16	+circle same "4"
	17	+</verbatim>
10	18	Figure 1
11	19	</td></tr></table>
12	20
13	21	Each circle represents a check-in. For the sake of clarity, the check-ins
14	22	are given small consecutive numbers. In a real system, of course, the
		@@ -39,11 +47,19 @@
39	47	project. Suppose two programmers make independent modifications to check-in 2.
40	48	After both changes are committed, the check-in graph looks like Figure 2:
41	49
42	50	<table border=1 cellpadding=10 hspace=10 vspace=10 align="center">
43	51	<tr><td align="center">
44		-<img src="branch02.svg"><br>
	52	+<verbatim type="pikchr center">
	53	+circle rad 40% thickness 1.5px "1"
	54	+arrow right 40%
	55	+circle same "2"
	56	+circle same "3" at 2nd circle+(.4,.3)
	57	+arrow from 2nd circle to 3rd circle chop
	58	+circle same "4" at 2nd circle+(.4,-.3)
	59	+arrow from 2nd circle to 4th circle chop
	60	+</verbatim>
45	61	Figure 2
46	62	</td></tr></table>
47	63
48	64	The graph in Figure 2 has two leaves: check-ins 3 and 4. Check-in 2 has
49	65	two children, check-ins 3 and 4. We call this state a <i>fork</i>.
		@@ -109,12 +125,23 @@
109	125	current branch. Alice can then verify that the merge is sensible and if
110	126	so, commit the results as check-in 5. This results in a DAG as shown in
111	127	Figure 3.
112	128
113	129	<table border=1 cellpadding=10 hspace=10 vspace=10 align="center">
114		-<tr><td align="center">
115		-<img src="branch03.svg"><br>
	130	+<tr><td align="cent">
	131	+<verbatim type="pikchr">
	132	+circle rad 40% thickness 1.5px "1"
	133	+arrow right 40%
	134	+circle same "2"
	135	+circle same "3" at 2nd circle+(.4,.3)
	136	+arrow from 2nd circle to 3rd circle chop
	137	+circle same "4" at 2nd circle+(.4,-.3)
	138	+arrow from 2nd circle to 4th circle chop
	139	+circle same "5" at 3rd circle+(.4,-.3)
	140	+arrow from 3rd circle to 5th circle chop
	141	+arrow dashed .03 from 4th circle to 5th circle chop
	142	+</verbatim>
116	143	Figure 3
117	144	</td></tr></table>
118	145
119	146	Check-in 5 is a child of check-in 3 because it was created by editing
120	147	check-in 3, but since check-in 5 also inherits the changes from check-in 4 by
		@@ -165,11 +192,37 @@
165	192	Figure 4 shows an example of a project where there are two branches, one
166	193	for development work and another for testing.
167	194
168	195	<table border=1 cellpadding=10 hspace=10 vspace=10 align="center">
169	196	<tr><td align="center">
170		-<img src="branch04.svg"><br>
	197	+<verbatim type="pikchr">
	198	+circle rad 40% thickness 1.5px fill white "1"
	199	+arrow 40%
	200	+C2: circle same "2"
	201	+arrow same
	202	+circle same "3"
	203	+arrow same
	204	+C5: circle same "5"
	205	+arrow same
	206	+C7: circle same "7"
	207	+arrow same
	208	+C8: circle same "8"
	209	+arrow same
	210	+C10: circle same "10"
	211	+C4: circle same at 3rd circle-(0,.35) "4"
	212	+C6: circle same at (1/2 way between C5 and C7,C4) "6"
	213	+C9: circle same at (1/2 way between C8 and C10,C4) "9"
	214	+arrow from C2 to C4 chop
	215	+arrow from C4 to C6 chop
	216	+arrow from C6 to C9 chop
	217	+arrow dashed 0.03 from C6 to C7 chop
	218	+arrow same from C9 to C10
	219	+layer = 0
	220	+box fill 0x9bcdfc color 0x9bcdfc wid (C10.e.x - C2.w.x) ht C6.height*1.5 at C6.c
	221	+text " test" above ljust at last box.sw
	222	+</verbatim>
	223	+<p>
171	224	Figure 4
172	225	</td></tr></table>
173	226
174	227	Figure 4 diagrams the following scenario: the project starts and
175	228	progresses to a point where (at check-in 2)
		@@ -423,11 +476,76 @@
423	476	immediately obvious why this is so. To see it, consider this swim lane
424	477	diagram:
425	478
426	479	<table border=1 cellpadding=10 hspace=10 vspace=10 align="center">
427	480	<tr><td align="center">
428		-<img src="branch06.svg"><br>
	481	+<verbatim type="pikchr">
	482	+ $laneh = 0.75
	483	+
	484	+ # Draw the lanes
	485	+ down
	486	+ box width 3.5in height $laneh fill 0xacc9e3
	487	+ box same fill 0xc5d8ef
	488	+ box same as first box
	489	+ box same as 2nd box
	490	+ line from 1st box.sw+(0.2,0) up until even with 1st box.n \
	491	+ "Alan" above aligned
	492	+ line from 2nd box.sw+(0.2,0) up until even with 2nd box.n \
	493	+ "Betty" above aligned
	494	+ line from 3rd box.sw+(0.2,0) up until even with 3rd box.n \
	495	+ "Charlie" above aligned
	496	+ line from 4th box.sw+(0.2,0) up until even with 4th box.n \
	497	+ "Darlene" above aligned
	498	+
	499	+ # fill in content for the Alice lane
	500	+ right
	501	+A1: circle rad 0.1in at end of first line + (0.2,-0.2) \
	502	+ fill white thickness 1.5px "1"
	503	+ arrow right 50%
	504	+ circle same "2"
	505	+ arrow right until even with first box.e - (0.65,0.0)
	506	+ ellipse "future" fit fill white height 0.2 width 0.5 thickness 1.5px
	507	+A3: circle same at A1+(0.8,-0.3) "3" fill 0xc0c0c0
	508	+ arrow from A1 to last circle chop "fork!" below aligned
	509	+
	510	+ # content for the Betty lane
	511	+B1: circle same as A1 at A1-(0,$laneh) "1"
	512	+ arrow right 50%
	513	+ circle same "2"
	514	+ arrow right until even with first ellipse.w
	515	+ ellipse same "future"
	516	+B3: circle same at A3-(0,$laneh) "3"
	517	+ arrow right 50%
	518	+ circle same as A3 "4"
	519	+ arrow from B1 to 2nd last circle chop
	520	+
	521	+ # content for the Charlie lane
	522	+C1: circle same as A1 at B1-(0,$laneh) "1"
	523	+ arrow 50%
	524	+ circle same "2"
	525	+ arrow right 0.8in "goes" "offline"
	526	+C5: circle same as A3 "5"
	527	+ arrow right until even with first ellipse.w
	528	+ ellipse same "future"
	529	+ text "back online" "pushes 5" "pulls 3 & 4" with .n at last arrow
	530	+
	531	+ # content for the Darlene lane
	532	+D1: circle same as A1 at C1-(0,$laneh) "1"
	533	+ arrow 50%
	534	+ circle same "2"
	535	+ arrow right until even with C5.w
	536	+ circle same "5"
	537	+ arrow 50%
	538	+ circle same as A3 "6"
	539	+ arrow right until even with first ellipse.w
	540	+ ellipse same "future"
	541	+D3: circle same as B3 at B3-(0,2*$laneh) "3"
	542	+ arrow 50%
	543	+ circle same "4"
	544	+ arrow from D1 to D3 chop
	545	+</verbatim>
	546	+<br>
429	547	Figure 6
430	548	</td></tr></table>
431	549
432	550	This is a happy, cooperating team. That is an important restriction on
433	551	our example, because you must understand that this sort of problem can
434	552

	--- www/branching.wiki
	+++ www/branching.wiki
	@@ -4,11 +4,19 @@
4	In a simple and perfect world, the development of a project would proceed
5	linearly, as shown in Figure 1.
6
7	<table border=1 cellpadding=10 hspace=10 vspace=10 align="center">
8	<tr><td align="center">
9	<img src="branch01.svg"><br>








10	Figure 1
11	</td></tr></table>
12
13	Each circle represents a check-in. For the sake of clarity, the check-ins
14	are given small consecutive numbers. In a real system, of course, the
	@@ -39,11 +47,19 @@
39	project. Suppose two programmers make independent modifications to check-in 2.
40	After both changes are committed, the check-in graph looks like Figure 2:
41
42	<table border=1 cellpadding=10 hspace=10 vspace=10 align="center">
43	<tr><td align="center">
44	<img src="branch02.svg"><br>








45	Figure 2
46	</td></tr></table>
47
48	The graph in Figure 2 has two leaves: check-ins 3 and 4. Check-in 2 has
49	two children, check-ins 3 and 4. We call this state a <i>fork</i>.
	@@ -109,12 +125,23 @@
109	current branch. Alice can then verify that the merge is sensible and if
110	so, commit the results as check-in 5. This results in a DAG as shown in
111	Figure 3.
112
113	<table border=1 cellpadding=10 hspace=10 vspace=10 align="center">
114	<tr><td align="center">
115	<img src="branch03.svg"><br>











116	Figure 3
117	</td></tr></table>
118
119	Check-in 5 is a child of check-in 3 because it was created by editing
120	check-in 3, but since check-in 5 also inherits the changes from check-in 4 by
	@@ -165,11 +192,37 @@
165	Figure 4 shows an example of a project where there are two branches, one
166	for development work and another for testing.
167
168	<table border=1 cellpadding=10 hspace=10 vspace=10 align="center">
169	<tr><td align="center">
170	<img src="branch04.svg"><br>


























171	Figure 4
172	</td></tr></table>
173
174	Figure 4 diagrams the following scenario: the project starts and
175	progresses to a point where (at check-in 2)
	@@ -423,11 +476,76 @@
423	immediately obvious why this is so. To see it, consider this swim lane
424	diagram:
425
426	<table border=1 cellpadding=10 hspace=10 vspace=10 align="center">
427	<tr><td align="center">
428	<img src="branch06.svg"><br>

































































429	Figure 6
430	</td></tr></table>
431
432	This is a happy, cooperating team. That is an important restriction on
433	our example, because you must understand that this sort of problem can
434

	--- www/branching.wiki
	+++ www/branching.wiki
	@@ -4,11 +4,19 @@
4	In a simple and perfect world, the development of a project would proceed
5	linearly, as shown in Figure 1.
6
7	<table border=1 cellpadding=10 hspace=10 vspace=10 align="center">
8	<tr><td align="center">
9	<verbatim type="pikchr center">
10	circle rad 40% thickness 1.5px "1"
11	arrow right 40%
12	circle same "2"
13	arrow same
14	circle same "3"
15	arrow same
16	circle same "4"
17	</verbatim>
18	Figure 1
19	</td></tr></table>
20
21	Each circle represents a check-in. For the sake of clarity, the check-ins
22	are given small consecutive numbers. In a real system, of course, the
	@@ -39,11 +47,19 @@
47	project. Suppose two programmers make independent modifications to check-in 2.
48	After both changes are committed, the check-in graph looks like Figure 2:
49
50	<table border=1 cellpadding=10 hspace=10 vspace=10 align="center">
51	<tr><td align="center">
52	<verbatim type="pikchr center">
53	circle rad 40% thickness 1.5px "1"
54	arrow right 40%
55	circle same "2"
56	circle same "3" at 2nd circle+(.4,.3)
57	arrow from 2nd circle to 3rd circle chop
58	circle same "4" at 2nd circle+(.4,-.3)
59	arrow from 2nd circle to 4th circle chop
60	</verbatim>
61	Figure 2
62	</td></tr></table>
63
64	The graph in Figure 2 has two leaves: check-ins 3 and 4. Check-in 2 has
65	two children, check-ins 3 and 4. We call this state a <i>fork</i>.
	@@ -109,12 +125,23 @@
125	current branch. Alice can then verify that the merge is sensible and if
126	so, commit the results as check-in 5. This results in a DAG as shown in
127	Figure 3.
128
129	<table border=1 cellpadding=10 hspace=10 vspace=10 align="center">
130	<tr><td align="cent">
131	<verbatim type="pikchr">
132	circle rad 40% thickness 1.5px "1"
133	arrow right 40%
134	circle same "2"
135	circle same "3" at 2nd circle+(.4,.3)
136	arrow from 2nd circle to 3rd circle chop
137	circle same "4" at 2nd circle+(.4,-.3)
138	arrow from 2nd circle to 4th circle chop
139	circle same "5" at 3rd circle+(.4,-.3)
140	arrow from 3rd circle to 5th circle chop
141	arrow dashed .03 from 4th circle to 5th circle chop
142	</verbatim>
143	Figure 3
144	</td></tr></table>
145
146	Check-in 5 is a child of check-in 3 because it was created by editing
147	check-in 3, but since check-in 5 also inherits the changes from check-in 4 by
	@@ -165,11 +192,37 @@
192	Figure 4 shows an example of a project where there are two branches, one
193	for development work and another for testing.
194
195	<table border=1 cellpadding=10 hspace=10 vspace=10 align="center">
196	<tr><td align="center">
197	<verbatim type="pikchr">
198	circle rad 40% thickness 1.5px fill white "1"
199	arrow 40%
200	C2: circle same "2"
201	arrow same
202	circle same "3"
203	arrow same
204	C5: circle same "5"
205	arrow same
206	C7: circle same "7"
207	arrow same
208	C8: circle same "8"
209	arrow same
210	C10: circle same "10"
211	C4: circle same at 3rd circle-(0,.35) "4"
212	C6: circle same at (1/2 way between C5 and C7,C4) "6"
213	C9: circle same at (1/2 way between C8 and C10,C4) "9"
214	arrow from C2 to C4 chop
215	arrow from C4 to C6 chop
216	arrow from C6 to C9 chop
217	arrow dashed 0.03 from C6 to C7 chop
218	arrow same from C9 to C10
219	layer = 0
220	box fill 0x9bcdfc color 0x9bcdfc wid (C10.e.x - C2.w.x) ht C6.height*1.5 at C6.c
221	text " test" above ljust at last box.sw
222	</verbatim>
223	<p>
224	Figure 4
225	</td></tr></table>
226
227	Figure 4 diagrams the following scenario: the project starts and
228	progresses to a point where (at check-in 2)
	@@ -423,11 +476,76 @@
476	immediately obvious why this is so. To see it, consider this swim lane
477	diagram:
478
479	<table border=1 cellpadding=10 hspace=10 vspace=10 align="center">
480	<tr><td align="center">
481	<verbatim type="pikchr">
482	$laneh = 0.75
483
484	# Draw the lanes
485	down
486	box width 3.5in height $laneh fill 0xacc9e3
487	box same fill 0xc5d8ef
488	box same as first box
489	box same as 2nd box
490	line from 1st box.sw+(0.2,0) up until even with 1st box.n \
491	"Alan" above aligned
492	line from 2nd box.sw+(0.2,0) up until even with 2nd box.n \
493	"Betty" above aligned
494	line from 3rd box.sw+(0.2,0) up until even with 3rd box.n \
495	"Charlie" above aligned
496	line from 4th box.sw+(0.2,0) up until even with 4th box.n \
497	"Darlene" above aligned
498
499	# fill in content for the Alice lane
500	right
501	A1: circle rad 0.1in at end of first line + (0.2,-0.2) \
502	fill white thickness 1.5px "1"
503	arrow right 50%
504	circle same "2"
505	arrow right until even with first box.e - (0.65,0.0)
506	ellipse "future" fit fill white height 0.2 width 0.5 thickness 1.5px
507	A3: circle same at A1+(0.8,-0.3) "3" fill 0xc0c0c0
508	arrow from A1 to last circle chop "fork!" below aligned
509
510	# content for the Betty lane
511	B1: circle same as A1 at A1-(0,$laneh) "1"
512	arrow right 50%
513	circle same "2"
514	arrow right until even with first ellipse.w
515	ellipse same "future"
516	B3: circle same at A3-(0,$laneh) "3"
517	arrow right 50%
518	circle same as A3 "4"
519	arrow from B1 to 2nd last circle chop
520
521	# content for the Charlie lane
522	C1: circle same as A1 at B1-(0,$laneh) "1"
523	arrow 50%
524	circle same "2"
525	arrow right 0.8in "goes" "offline"
526	C5: circle same as A3 "5"
527	arrow right until even with first ellipse.w
528	ellipse same "future"
529	text "back online" "pushes 5" "pulls 3 & 4" with .n at last arrow
530
531	# content for the Darlene lane
532	D1: circle same as A1 at C1-(0,$laneh) "1"
533	arrow 50%
534	circle same "2"
535	arrow right until even with C5.w
536	circle same "5"
537	arrow 50%
538	circle same as A3 "6"
539	arrow right until even with first ellipse.w
540	ellipse same "future"
541	D3: circle same as B3 at B3-(0,2*$laneh) "3"
542	arrow 50%
543	circle same "4"
544	arrow from D1 to D3 chop
545	</verbatim>
546	<br>
547	Figure 6
548	</td></tr></table>
549
550	This is a happy, cooperating team. That is an important restriction on
551	our example, because you must understand that this sort of problem can
552

Fossil SCM

Keyboard Shortcuts