Fossil SCM

Move default_css.txt to default.css, treat it like a builtin file, and remove mkcss, as the recent style.css reorg obviates the need for mkcss.

stephan 2020-05-29 08:05 trunk

Commit 0c19cd0a8630a62901ba1033208526299d03db87ad503f865c790145eb106dcb

Parent 8ad5e4690854a81…

11 files changed +3 -28 -37 +3 -8 +8 -40 -168 -46 +43 -55 +1 -4 +2 -8 +4 -11 +2 -9

~ src/default.css - src/default_css.txt ~ src/main.mk ~ src/makemake.tcl - src/mkcss.c ~ src/skins.c ~ src/style.c ~ win/Makefile.PellesCGMake ~ win/Makefile.dmc ~ win/Makefile.mingw ~ win/Makefile.msc

M src/default.css

+3 -28

		--- a/src/default.css
		+++ b/src/default.css
		@@ -1,12 +1,5 @@
1		-// This is the template file for the default CSS for Fossil. Lines
2		-// beginning with "//" are stripped out by the pre-processor and never
3		-// reach the web browser.
4		-//
5		-// Each repository skin has skin-specific CSS. The rules contained in this
6		-// file are appended to the skin-CSS as required. Each rule is evaluated
7		-// separately and is only appended to the final CSS if there is not an
8		-// overriding rule with the same selector in the skin-CSS.
9		-/ghboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;/overflow: auto;/lbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;margin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;*/
	1	+margin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;*/
	2	+ margin: 0 0 0 0.2em /* leave a gap between this and the neighboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;/overflow: auto;/lbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;margin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;*/
10	3	margin: 0 0 0 0.2em /* leave a gap between this and the neighboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;-top: 0Selboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;/overflow: auto;/lbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;margin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;/
11	4	margin: 0 0 0 0.2em /* leave a gap between this and the neighboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;margin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;/
12	5	margin: 0 0 0 0.2em /* leave a gap between this and the neighboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;/overflow: auto;/lbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;margin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;*/
		@@ -16,22 +9,4 @@
16	9	It's currently intentionally set low for
17	10	demonstration purposes. /PostBody Selinput[type=checkbar / margin: 0ov:margin: 0.2em 0 0solz-index: -1;
18	11	}
19		-input[type=checkbox].forum-post-collapser:checked ~ label.forum-post-collapser:10000em /* som10Selnot(:checked)200emdisplay: block4Sel)/WVCIiIv/WVCIiIv///Note: the mkcss utility does not support line breaks in data URIs.d='M4,5gin: 0.2em 0 0soliddamonospa0soliddamonospace dimargin: 0.2 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;/overflow: auto;/lbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;margin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-chilmargin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;*/
20		- margin: 0 0 0 0.2em /* leave a gap between this and the neighboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;/
21		- margin:mhe neighboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;/overflow: auto;/lbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;margin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;*/
22		- margin: 0 0 0 0.2em /* leave a gap between this and the neighboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;-top: 0Selboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;/overflow: auto;/lbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;margin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;/
23		- margin: 0 0 0 0.2em /* leave a gap between this and the neighboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;margin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;/
24		- margin: 0 0 0 0.2em /* leave a gap between this and the neighboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;/overflow: auto;/lbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;margin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;*/
25		- margin: 0 0 0 0.2em /* leave a gap between this and the neighboring scrollbar */ margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;5em 0.button{
26		- align-self: flex20em /* Posts which overflow this value get an
27		- Expand/Collapse toggle injected at page-load.
28		- It's currently intentionally set low for
29		- demonstration purposes. /PostBody Selinput[type=checkbar / margin: 0ov:margin: 0.2em 0 0solz-index: -1;
30		-}
31		-input[type=checkbox].forum-post-collapser:checked ~ label.forum-post-collapser:10000em /* som10Selnot(:checked)200emdisplay: block4Selmargin: 0.2em 0 0e neighboring scrollbar */ margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3abm//#setup_skinedit_css_defaults {
32		- max-width: 98%;
33		- font-family: monospace;
34		-// These are for the UL-based implementation:
35		- column-width: auto;
36		- column-count: 2child(2)/for tesmargin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;/
37		- mar
	12	+input[type=checkbox].forum-post-collapser:checked ~ label.forum-post-collapser:10000em /* som10Selnot(:checked)200emdisplay: block4Sel

	--- a/src/default.css
	+++ b/src/default.css
	@@ -1,12 +1,5 @@
1	// This is the template file for the default CSS for Fossil. Lines
2	// beginning with "//" are stripped out by the pre-processor and never
3	// reach the web browser.
4	//
5	// Each repository skin has skin-specific CSS. The rules contained in this
6	// file are appended to the skin-CSS as required. Each rule is evaluated
7	// separately and is only appended to the final CSS if there is not an
8	// overriding rule with the same selector in the skin-CSS.
9	/ghboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;/overflow: auto;/lbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;margin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;*/
10	margin: 0 0 0 0.2em /* leave a gap between this and the neighboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;-top: 0Selboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;/overflow: auto;/lbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;margin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;/
11	margin: 0 0 0 0.2em /* leave a gap between this and the neighboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;margin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;/
12	margin: 0 0 0 0.2em /* leave a gap between this and the neighboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;/overflow: auto;/lbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;margin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;*/
	@@ -16,22 +9,4 @@
16	It's currently intentionally set low for
17	demonstration purposes. /PostBody Selinput[type=checkbar / margin: 0ov:margin: 0.2em 0 0solz-index: -1;
18	}
19	input[type=checkbox].forum-post-collapser:checked ~ label.forum-post-collapser:10000em /* som10Selnot(:checked)200emdisplay: block4Sel)/WVCIiIv/WVCIiIv///Note: the mkcss utility does not support line breaks in data URIs.d='M4,5gin: 0.2em 0 0soliddamonospa0soliddamonospace dimargin: 0.2 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;/overflow: auto;/lbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;margin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-chilmargin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;*/
20	margin: 0 0 0 0.2em /* leave a gap between this and the neighboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;/
21	margin:mhe neighboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;/overflow: auto;/lbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;margin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;*/
22	margin: 0 0 0 0.2em /* leave a gap between this and the neighboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;-top: 0Selboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;/overflow: auto;/lbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;margin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;/
23	margin: 0 0 0 0.2em /* leave a gap between this and the neighboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;margin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;/
24	margin: 0 0 0 0.2em /* leave a gap between this and the neighboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;/overflow: auto;/lbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;margin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;*/
25	margin: 0 0 0 0.2em /* leave a gap between this and the neighboring scrollbar */ margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;5em 0.button{
26	align-self: flex20em /* Posts which overflow this value get an
27	Expand/Collapse toggle injected at page-load.
28	It's currently intentionally set low for
29	demonstration purposes. /PostBody Selinput[type=checkbar / margin: 0ov:margin: 0.2em 0 0solz-index: -1;
30	}
31	input[type=checkbox].forum-post-collapser:checked ~ label.forum-post-collapser:10000em /* som10Selnot(:checked)200emdisplay: block4Selmargin: 0.2em 0 0e neighboring scrollbar */ margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3abm//#setup_skinedit_css_defaults {
32	max-width: 98%;
33	font-family: monospace;
34	// These are for the UL-based implementation:
35	column-width: auto;
36	column-count: 2child(2)/for tesmargin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;/
37	mar

	--- a/src/default.css
	+++ b/src/default.css
	@@ -1,12 +1,5 @@
1	margin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;*/
2	margin: 0 0 0 0.2em /* leave a gap between this and the neighboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;/overflow: auto;/lbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;margin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;*/







3	margin: 0 0 0 0.2em /* leave a gap between this and the neighboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;-top: 0Selboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;/overflow: auto;/lbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;margin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;/
4	margin: 0 0 0 0.2em /* leave a gap between this and the neighboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;margin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;/
5	margin: 0 0 0 0.2em /* leave a gap between this and the neighboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;/overflow: auto;/lbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;margin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;*/
	@@ -16,22 +9,4 @@
9	It's currently intentionally set low for
10	demonstration purposes. /PostBody Selinput[type=checkbar / margin: 0ov:margin: 0.2em 0 0solz-index: -1;
11	}
12	input[type=checkbox].forum-post-collapser:checked ~ label.forum-post-collapser:10000em /* som10Selnot(:checked)200emdisplay: block4Sel

D src/default_css.txt

-37

		--- a/src/default_css.txt
		+++ b/src/default_css.txt
		@@ -1,37 +0,0 @@
1		-// This is the template file for the default CSS for Fossil. Lines
2		-// beginning with "//" are stripped out by the pre-processor and never
3		-// reach the web browser.
4		-//
5		-// Each repository skin has skin-specific CSS. The rules contained in this
6		-// file are appended to the skin-CSS as required. Each rule is evaluated
7		-// separately and is only appended to the final CSS if there is not an
8		-// overriding rule with the same selector in the skin-CSS.
9		-/ghboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;/overflow: auto;/lbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;margin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;*/
10		- margin: 0 0 0 0.2em /* leave a gap between this and the neighboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;-top: 0Selboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;/overflow: auto;/lbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;margin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;/
11		- margin: 0 0 0 0.2em /* leave a gap between this and the neighboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;margin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;/
12		- margin: 0 0 0 0.2em /* leave a gap between this and the neighboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;/overflow: auto;/lbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;margin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;*/
13		- margin: 0 0 0 0.2em /* leave a gap between this and the neighboring scrollbar */ margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;5em 0.button{
14		- align-self: flex20em /* Posts which overflow this value get an
15		- Expand/Collapse toggle injected at page-load.
16		- It's currently intentionally set low for
17		- demonstration purposes. /PostBody Selinput[type=checkbar / margin: 0ov:margin: 0.2em 0 0solz-index: -1;
18		-}
19		-input[type=checkbox].forum-post-collapser:checked ~ label.forum-post-collapser:10000em /* som10Selnot(:checked)200emdisplay: block4Sel)/WVCIiIv/WVCIiIv///Note: the mkcss utility does not support line breaks in data URIs.d='M4,5gin: 0.2em 0 0soliddamonospa0soliddamonospace dimargin: 0.2 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;/overflow: auto;/lbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;margin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-chilmargin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;*/
20		- margin: 0 0 0 0.2em /* leave a gap between this and the neighboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;/
21		- margin:mhe neighboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;/overflow: auto;/lbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;margin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;*/
22		- margin: 0 0 0 0.2em /* leave a gap between this and the neighboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;-top: 0Selboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;/overflow: auto;/lbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;margin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;/
23		- margin: 0 0 0 0.2em /* leave a gap between this and the neighboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;margin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;/
24		- margin: 0 0 0 0.2em /* leave a gap between this and the neighboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;/overflow: auto;/lbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;margin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;*/
25		- margin: 0 0 0 0.2em /* leave a gap between this and the neighboring scrollbar */ margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;5em 0.button{
26		- align-self: flex20em /* Posts which overflow this value get an
27		- Expand/Collapse toggle injected at page-load.
28		- It's currently intentionally set low for
29		- demonstration purposes. /PostBody Selinput[type=checkbar / margin: 0ov:margin: 0.2em 0 0solz-index: -1;
30		-}
31		-input[type=checkbox].forum-post-collapser:checked ~ label.forum-post-collapser:10000em /* som10Selnot(:checked)200emdisplay: block4Selmargin: 0.2em 0 0e neighboring scrollbar */ margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3abm//#setup_skinedit_css_defaults {
32		- max-width: 98%;
33		- font-family: monospace;
34		-// These are for the UL-based implementation:
35		- column-width: auto;
36		- column-count: 2child(2)/for tesmargin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;/
37		- mar

	--- a/src/default_css.txt
	+++ b/src/default_css.txt
	@@ -1,37 +0,0 @@
1	// This is the template file for the default CSS for Fossil. Lines
2	// beginning with "//" are stripped out by the pre-processor and never
3	// reach the web browser.
4	//
5	// Each repository skin has skin-specific CSS. The rules contained in this
6	// file are appended to the skin-CSS as required. Each rule is evaluated
7	// separately and is only appended to the final CSS if there is not an
8	// overriding rule with the same selector in the skin-CSS.
9	/ghboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;/overflow: auto;/lbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;margin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;*/
10	margin: 0 0 0 0.2em /* leave a gap between this and the neighboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;-top: 0Selboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;/overflow: auto;/lbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;margin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;/
11	margin: 0 0 0 0.2em /* leave a gap between this and the neighboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;margin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;/
12	margin: 0 0 0 0.2em /* leave a gap between this and the neighboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;/overflow: auto;/lbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;margin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;*/
13	margin: 0 0 0 0.2em /* leave a gap between this and the neighboring scrollbar */ margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;5em 0.button{
14	align-self: flex20em /* Posts which overflow this value get an
15	Expand/Collapse toggle injected at page-load.
16	It's currently intentionally set low for
17	demonstration purposes. /PostBody Selinput[type=checkbar / margin: 0ov:margin: 0.2em 0 0solz-index: -1;
18	}
19	input[type=checkbox].forum-post-collapser:checked ~ label.forum-post-collapser:10000em /* som10Selnot(:checked)200emdisplay: block4Sel)/WVCIiIv/WVCIiIv///Note: the mkcss utility does not support line breaks in data URIs.d='M4,5gin: 0.2em 0 0soliddamonospa0soliddamonospace dimargin: 0.2 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;/overflow: auto;/lbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;margin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-chilmargin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;*/
20	margin: 0 0 0 0.2em /* leave a gap between this and the neighboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;/
21	margin:mhe neighboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;/overflow: auto;/lbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;margin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;*/
22	margin: 0 0 0 0.2em /* leave a gap between this and the neighboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;-top: 0Selboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;/overflow: auto;/lbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;margin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;/
23	margin: 0 0 0 0.2em /* leave a gap between this and the neighboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;margin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;/
24	margin: 0 0 0 0.2em /* leave a gap between this and the neighboring scrollbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;/overflow: auto;/lbar / margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;margin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;*/
25	margin: 0 0 0 0.2em /* leave a gap between this and the neighboring scrollbar */ margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3ab,1:51Xp@3dm,3zyj3Q;5em 0.button{
26	align-self: flex20em /* Posts which overflow this value get an
27	Expand/Collapse toggle injected at page-load.
28	It's currently intentionally set low for
29	demonstration purposes. /PostBody Selinput[type=checkbar / margin: 0ov:margin: 0.2em 0 0solz-index: -1;
30	}
31	input[type=checkbox].forum-post-collapser:checked ~ label.forum-post-collapser:10000em /* som10Selnot(:checked)200emdisplay: block4Selmargin: 0.2em 0 0e neighboring scrollbar */ margin: 0ov:nth-ofinsdamonospace div -badiv:nth-of-type(1)div:nth-of-type(1) {gin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expaem 0 0soliddamonosnth-of-type(2)3A@3abm//#setup_skinedit_css_defaults {
32	max-width: 98%;
33	font-family: monospace;
34	// These are for the UL-based implementation:
35	column-width: auto;
36	column-count: 2child(2)/for tesmargin: 0.2em 0 0soliddamonospace diinsdamonospace div.sel > span:not(.expanded)�⇣> :nth-child(2)/for testing only://background: magenta;/
37	mar

	--- a/src/default_css.txt
	+++ b/src/default_css.txt
	@@ -1,37 +0,0 @@

M src/main.mk

+3 -8

		--- src/main.mk
		+++ src/main.mk
		@@ -217,10 +217,11 @@
217	217	$(SRCDIR)/../skins/xekri/footer.txt \
218	218	$(SRCDIR)/../skins/xekri/header.txt \
219	219	$(SRCDIR)/accordion.js \
220	220	$(SRCDIR)/ci_edit.js \
221	221	$(SRCDIR)/copybtn.js \
	222	+ $(SRCDIR)/default.css \
222	223	$(SRCDIR)/diff.tcl \
223	224	$(SRCDIR)/forum.js \
224	225	$(SRCDIR)/fossil.bootstrap.js \
225	226	$(SRCDIR)/fossil.confirmer.js \
226	227	$(SRCDIR)/fossil.dom.js \
		@@ -571,13 +572,10 @@
571	572	$(XBCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR)/mkbuiltin.c
572	573
573	574	$(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c
574	575	$(XBCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
575	576
576		-$(OBJDIR)/mkcss: $(SRCDIR)/mkcss.c
577		- $(XBCC) -o $(OBJDIR)/mkcss $(SRCDIR)/mkcss.c
578		-
579	577	$(OBJDIR)/codecheck1: $(SRCDIR)/codecheck1.c
580	578	$(XBCC) -o $(OBJDIR)/codecheck1 $(SRCDIR)/codecheck1.c
581	579
582	580	# Run the test suite.
583	581	# Other flags that can be included in TESTFLAGS are:
		@@ -596,13 +594,10 @@
596	594	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) $(TESTFLAGS)
597	595
598	596	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
599	597	$(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
600	598
601		-$(OBJDIR)/default_css.h: $(SRCDIR)/default_css.txt $(OBJDIR)/mkcss
602		- $(OBJDIR)/mkcss $(SRCDIR)/default_css.txt $(OBJDIR)/default_css.h
603		-
604	599	# Setup the options used to compile the included SQLite library.
605	600	SQLITE_OPTIONS = -DNDEBUG=1 \
606	601	-DSQLITE_DQS=0 \
607	602	-DSQLITE_THREADSAFE=0 \
608	603	-DSQLITE_DEFAULT_MEMSTATUS=0 \
		@@ -740,11 +735,11 @@
740	735	$(OBJDIR)/mkindex $(TRANS_SRC) >$@
741	736
742	737	$(OBJDIR)/builtin_data.h: $(OBJDIR)/mkbuiltin $(EXTRA_FILES)
743	738	$(OBJDIR)/mkbuiltin --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
744	739
745		-$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(OBJDIR)/default_css.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
	740	+$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
746	741	$(OBJDIR)/makeheaders $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
747	742	$(OBJDIR)/alerts_.c:$(OBJDIR)/alerts.h \
748	743	$(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
749	744	$(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
750	745	$(OBJDIR)/backlink_.c:$(OBJDIR)/backlink.h \
		@@ -1805,11 +1800,11 @@
1805	1800	$(OBJDIR)/statrep.h: $(OBJDIR)/headers
1806	1801
1807	1802	$(OBJDIR)/style_.c: $(SRCDIR)/style.c $(OBJDIR)/translate
1808	1803	$(OBJDIR)/translate $(SRCDIR)/style.c >$@
1809	1804
1810		-$(OBJDIR)/style.o: $(OBJDIR)/style_.c $(OBJDIR)/style.h $(OBJDIR)/default_css.h $(SRCDIR)/config.h
	1805	+$(OBJDIR)/style.o: $(OBJDIR)/style_.c $(OBJDIR)/style.h $(SRCDIR)/config.h
1811	1806	$(XTCC) -o $(OBJDIR)/style.o -c $(OBJDIR)/style_.c
1812	1807
1813	1808	$(OBJDIR)/style.h: $(OBJDIR)/headers
1814	1809
1815	1810	$(OBJDIR)/sync_.c: $(SRCDIR)/sync.c $(OBJDIR)/translate
1816	1811

	--- src/main.mk
	+++ src/main.mk
	@@ -217,10 +217,11 @@
217	$(SRCDIR)/../skins/xekri/footer.txt \
218	$(SRCDIR)/../skins/xekri/header.txt \
219	$(SRCDIR)/accordion.js \
220	$(SRCDIR)/ci_edit.js \
221	$(SRCDIR)/copybtn.js \

222	$(SRCDIR)/diff.tcl \
223	$(SRCDIR)/forum.js \
224	$(SRCDIR)/fossil.bootstrap.js \
225	$(SRCDIR)/fossil.confirmer.js \
226	$(SRCDIR)/fossil.dom.js \
	@@ -571,13 +572,10 @@
571	$(XBCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR)/mkbuiltin.c
572
573	$(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c
574	$(XBCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
575
576	$(OBJDIR)/mkcss: $(SRCDIR)/mkcss.c
577	$(XBCC) -o $(OBJDIR)/mkcss $(SRCDIR)/mkcss.c
578
579	$(OBJDIR)/codecheck1: $(SRCDIR)/codecheck1.c
580	$(XBCC) -o $(OBJDIR)/codecheck1 $(SRCDIR)/codecheck1.c
581
582	# Run the test suite.
583	# Other flags that can be included in TESTFLAGS are:
	@@ -596,13 +594,10 @@
596	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) $(TESTFLAGS)
597
598	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
599	$(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
600
601	$(OBJDIR)/default_css.h: $(SRCDIR)/default_css.txt $(OBJDIR)/mkcss
602	$(OBJDIR)/mkcss $(SRCDIR)/default_css.txt $(OBJDIR)/default_css.h
603
604	# Setup the options used to compile the included SQLite library.
605	SQLITE_OPTIONS = -DNDEBUG=1 \
606	-DSQLITE_DQS=0 \
607	-DSQLITE_THREADSAFE=0 \
608	-DSQLITE_DEFAULT_MEMSTATUS=0 \
	@@ -740,11 +735,11 @@
740	$(OBJDIR)/mkindex $(TRANS_SRC) >$@
741
742	$(OBJDIR)/builtin_data.h: $(OBJDIR)/mkbuiltin $(EXTRA_FILES)
743	$(OBJDIR)/mkbuiltin --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
744
745	$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(OBJDIR)/default_css.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
746	$(OBJDIR)/makeheaders $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
747	$(OBJDIR)/alerts_.c:$(OBJDIR)/alerts.h \
748	$(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
749	$(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
750	$(OBJDIR)/backlink_.c:$(OBJDIR)/backlink.h \
	@@ -1805,11 +1800,11 @@
1805	$(OBJDIR)/statrep.h: $(OBJDIR)/headers
1806
1807	$(OBJDIR)/style_.c: $(SRCDIR)/style.c $(OBJDIR)/translate
1808	$(OBJDIR)/translate $(SRCDIR)/style.c >$@
1809
1810	$(OBJDIR)/style.o: $(OBJDIR)/style_.c $(OBJDIR)/style.h $(OBJDIR)/default_css.h $(SRCDIR)/config.h
1811	$(XTCC) -o $(OBJDIR)/style.o -c $(OBJDIR)/style_.c
1812
1813	$(OBJDIR)/style.h: $(OBJDIR)/headers
1814
1815	$(OBJDIR)/sync_.c: $(SRCDIR)/sync.c $(OBJDIR)/translate
1816

	--- src/main.mk
	+++ src/main.mk
	@@ -217,10 +217,11 @@
217	$(SRCDIR)/../skins/xekri/footer.txt \
218	$(SRCDIR)/../skins/xekri/header.txt \
219	$(SRCDIR)/accordion.js \
220	$(SRCDIR)/ci_edit.js \
221	$(SRCDIR)/copybtn.js \
222	$(SRCDIR)/default.css \
223	$(SRCDIR)/diff.tcl \
224	$(SRCDIR)/forum.js \
225	$(SRCDIR)/fossil.bootstrap.js \
226	$(SRCDIR)/fossil.confirmer.js \
227	$(SRCDIR)/fossil.dom.js \
	@@ -571,13 +572,10 @@
572	$(XBCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR)/mkbuiltin.c
573
574	$(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c
575	$(XBCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
576



577	$(OBJDIR)/codecheck1: $(SRCDIR)/codecheck1.c
578	$(XBCC) -o $(OBJDIR)/codecheck1 $(SRCDIR)/codecheck1.c
579
580	# Run the test suite.
581	# Other flags that can be included in TESTFLAGS are:
	@@ -596,13 +594,10 @@
594	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) $(TESTFLAGS)
595
596	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
597	$(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
598



599	# Setup the options used to compile the included SQLite library.
600	SQLITE_OPTIONS = -DNDEBUG=1 \
601	-DSQLITE_DQS=0 \
602	-DSQLITE_THREADSAFE=0 \
603	-DSQLITE_DEFAULT_MEMSTATUS=0 \
	@@ -740,11 +735,11 @@
735	$(OBJDIR)/mkindex $(TRANS_SRC) >$@
736
737	$(OBJDIR)/builtin_data.h: $(OBJDIR)/mkbuiltin $(EXTRA_FILES)
738	$(OBJDIR)/mkbuiltin --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
739
740	$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
741	$(OBJDIR)/makeheaders $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
742	$(OBJDIR)/alerts_.c:$(OBJDIR)/alerts.h \
743	$(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
744	$(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
745	$(OBJDIR)/backlink_.c:$(OBJDIR)/backlink.h \
	@@ -1805,11 +1800,11 @@
1800	$(OBJDIR)/statrep.h: $(OBJDIR)/headers
1801
1802	$(OBJDIR)/style_.c: $(SRCDIR)/style.c $(OBJDIR)/translate
1803	$(OBJDIR)/translate $(SRCDIR)/style.c >$@
1804
1805	$(OBJDIR)/style.o: $(OBJDIR)/style_.c $(OBJDIR)/style.h $(SRCDIR)/config.h
1806	$(XTCC) -o $(OBJDIR)/style.o -c $(OBJDIR)/style_.c
1807
1808	$(OBJDIR)/style.h: $(OBJDIR)/headers
1809
1810	$(OBJDIR)/sync_.c: $(SRCDIR)/sync.c $(OBJDIR)/translate
1811

M src/makemake.tcl

+8 -40

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -176,10 +176,11 @@
176	176	set extra_files {
177	177	diff.tcl
178	178	markdown.md
179	179	wiki.wiki
180	180	*.js
	181	+ default.css
181	182	style.*.css
182	183	../skins//.txt
183	184	sounds/*.wav
184	185	}
185	186
		@@ -349,13 +350,10 @@
349	350	$(XBCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR)/mkbuiltin.c
350	351
351	352	$(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c
352	353	$(XBCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
353	354
354		-$(OBJDIR)/mkcss: $(SRCDIR)/mkcss.c
355		- $(XBCC) -o $(OBJDIR)/mkcss $(SRCDIR)/mkcss.c
356		-
357	355	$(OBJDIR)/codecheck1: $(SRCDIR)/codecheck1.c
358	356	$(XBCC) -o $(OBJDIR)/codecheck1 $(SRCDIR)/codecheck1.c
359	357
360	358	# Run the test suite.
361	359	# Other flags that can be included in TESTFLAGS are:
		@@ -376,13 +374,10 @@
376	374	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
377	375	$(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \
378	376	$(SRCDIR)/../manifest \
379	377	$(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
380	378
381		-$(OBJDIR)/default_css.h: $(SRCDIR)/default_css.txt $(OBJDIR)/mkcss
382		- $(OBJDIR)/mkcss $(SRCDIR)/default_css.txt $(OBJDIR)/default_css.h
383		-
384	379	# Setup the options used to compile the included SQLite library.
385	380	SQLITE_OPTIONS = <<<SQLITE_OPTIONS>>>
386	381
387	382	# Setup the options used to compile the included SQLite shell.
388	383	SHELL_OPTIONS = <<<SHELL_OPTIONS>>>
		@@ -475,19 +470,18 @@
475	470	writeln "\t\$(OBJDIR)/mkindex \$(TRANS_SRC) >\$@\n"
476	471
477	472	writeln "\$(OBJDIR)/builtin_data.h: \$(OBJDIR)/mkbuiltin \$(EXTRA_FILES)"
478	473	writeln "\t\$(OBJDIR)/mkbuiltin --prefix \$(SRCDIR)/ \$(EXTRA_FILES) >\$@\n"
479	474
480		-writeln "\$(OBJDIR)/headers:\t\$(OBJDIR)/page_index.h \$(OBJDIR)/builtin_data.h \$(OBJDIR)/default_css.h \$(OBJDIR)/makeheaders \$(OBJDIR)/VERSION.h"
	475	+writeln "\$(OBJDIR)/headers:\t\$(OBJDIR)/page_index.h \$(OBJDIR)/builtin_data.h \$(OBJDIR)/makeheaders \$(OBJDIR)/VERSION.h"
481	476	writeln "\t\$(OBJDIR)/makeheaders $mhargs"
482	477	writeln "\ttouch \$(OBJDIR)/headers"
483	478	writeln "\$(OBJDIR)/headers: Makefile"
484	479	writeln "\$(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 : \$(SRCDIR)/json_detail.h"
485	480	writeln "Makefile:"
486	481	set extra_h(dispatch) " \$(OBJDIR)/page_index.h "
487	482	set extra_h(builtin) " \$(OBJDIR)/builtin_data.h "
488		-set extra_h(style) " \$(OBJDIR)/default_css.h "
489	483
490	484	foreach s [lsort $src] {
491	485	writeln "\$(OBJDIR)/${s}_.c:\t\$(SRCDIR)/$s.c \$(OBJDIR)/translate"
492	486	writeln "\t\$(OBJDIR)/translate \$(SRCDIR)/$s.c >\$@\n"
493	487	writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h$extra_h($s)\$(SRCDIR)/config.h"
		@@ -1014,11 +1008,10 @@
1014	1008	TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe)
1015	1009	MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe)
1016	1010	MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe)
1017	1011	MKBUILTIN = $(subst /,\,$(OBJDIR)/mkbuiltin.exe)
1018	1012	MKVERSION = $(subst /,\,$(OBJDIR)/mkversion.exe)
1019		-MKCSS = $(subst /,\,$(OBJDIR)/mkcss.exe)
1020	1013	CODECHECK1 = $(subst /,\,$(OBJDIR)/codecheck1.exe)
1021	1014	CAT = type
1022	1015	CP = copy
1023	1016	GREP = find
1024	1017	MV = copy
		@@ -1029,11 +1022,10 @@
1029	1022	TRANSLATE = $(OBJDIR)/translate.exe
1030	1023	MAKEHEADERS = $(OBJDIR)/makeheaders.exe
1031	1024	MKINDEX = $(OBJDIR)/mkindex.exe
1032	1025	MKBUILTIN = $(OBJDIR)/mkbuiltin.exe
1033	1026	MKVERSION = $(OBJDIR)/mkversion.exe
1034		-MKCSS = $(OBJDIR)/mkcss.exe
1035	1027	CODECHECK1 = $(OBJDIR)/codecheck1.exe
1036	1028	CAT = cat
1037	1029	CP = cp
1038	1030	GREP = grep
1039	1031	MV = mv
		@@ -1043,11 +1035,11 @@
1043	1035	endif}
1044	1036
1045	1037	writeln {
1046	1038	all: $(OBJDIR) $(APPNAME)
1047	1039
1048		-$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h $(OBJDIR)/default_css.h
	1040	+$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
1049	1041	ifdef USE_WINDOWS
1050	1042	$(CAT) $(subst /,\,$(SRCDIR)\miniz.c) \| $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h)
1051	1043	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
1052	1044	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
1053	1045	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
		@@ -1088,13 +1080,10 @@
1088	1080	$(XBCC) -o $@ $(SRCDIR)/mkbuiltin.c
1089	1081
1090	1082	$(MKVERSION): $(SRCDIR)/mkversion.c
1091	1083	$(XBCC) -o $@ $(SRCDIR)/mkversion.c
1092	1084
1093		-$(MKCSS): $(SRCDIR)/mkcss.c
1094		- $(XBCC) -o $@ $(SRCDIR)/mkcss.c
1095		-
1096	1085	$(CODECHECK1): $(SRCDIR)/codecheck1.c
1097	1086	$(XBCC) -o $@ $(SRCDIR)/codecheck1.c
1098	1087
1099	1088	# WARNING. DANGER. Running the test suite modifies the repository the
1100	1089	# build is done from, i.e. the checkout belongs to. Do not sync/push
		@@ -1103,13 +1092,10 @@
1103	1092	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
1104	1093
1105	1094	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(MKVERSION)
1106	1095	$(MKVERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$@
1107	1096
1108		-$(OBJDIR)/default_css.h: $(SRCDIR)/default_css.txt $(MKCSS)
1109		- $(MKCSS) $(SRCDIR)/default_css.txt $@
1110		-
1111	1097	# The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
1112	1098	# to 1. If it is set to 1, then there is no need to build or link
1113	1099	# the sqlite3.o object. Instead, the system SQLite will be linked
1114	1100	# using -lsqlite3.
1115	1101	SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
		@@ -1231,18 +1217,17 @@
1231	1217	writeln "\t\$(MKINDEX) \$(TRANS_SRC) >\$@\n"
1232	1218
1233	1219	writeln "\$(OBJDIR)/builtin_data.h:\t\$(MKBUILTIN) \$(EXTRA_FILES)"
1234	1220	writeln "\t\$(MKBUILTIN) --prefix \$(SRCDIR)/ \$(EXTRA_FILES) >\$@\n"
1235	1221
1236		-writeln "\$(OBJDIR)/headers:\t\$(OBJDIR)/page_index.h \$(OBJDIR)/builtin_data.h \$(OBJDIR)/default_css.h \$(MAKEHEADERS) \$(OBJDIR)/VERSION.h"
	1222	+writeln "\$(OBJDIR)/headers:\t\$(OBJDIR)/page_index.h \$(OBJDIR)/builtin_data.h \$(MAKEHEADERS) \$(OBJDIR)/VERSION.h"
1237	1223	writeln "\t\$(MAKEHEADERS) $mhargs"
1238	1224	writeln "\techo Done >\$(OBJDIR)/headers\n"
1239	1225	writeln "\$(OBJDIR)/headers: Makefile\n"
1240	1226	writeln "Makefile:\n"
1241	1227	set extra_h(main) " \$(OBJDIR)/page_index.h "
1242	1228	set extra_h(builtin) " \$(OBJDIR)/builtin_data.h "
1243		-set extra_h(style) " \$(OBJDIR)/default_css.h "
1244	1229
1245	1230	foreach s [lsort $src] {
1246	1231	writeln "\$(OBJDIR)/${s}_.c:\t\$(SRCDIR)/$s.c \$(TRANSLATE)"
1247	1232	writeln "\t\$(TRANSLATE) \$(SRCDIR)/$s.c >\$@\n"
1248	1233	writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h$extra_h($s)\$(SRCDIR)/config.h"
		@@ -1388,13 +1373,10 @@
1388	1373	$(BCC) -o$@ $**
1389	1374
1390	1375	mkversion$E: $(SRCDIR)\mkversion.c
1391	1376	$(BCC) -o$@ $**
1392	1377
1393		-mkcss$E: $(SRCDIR)\mkcss.c
1394		- $(BCC) -o$@ $**
1395		-
1396	1378	codecheck1$E: $(SRCDIR)\codecheck1.c
1397	1379	$(BCC) -o$@ $**
1398	1380
1399	1381	$(OBJDIR)\shell$O : $(SRCDIR)\shell.c
1400	1382	$(TCC) -o$@ -c $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) $**
		@@ -1412,13 +1394,10 @@
1412	1394	cp $@ $@
1413	1395
1414	1396	VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
1415	1397	+$** > $@
1416	1398
1417		-default_css.h : mkcss$E $B\src\default_css.txt
1418		- +$** $B\src\default_css.txt $@
1419		-
1420	1399	page_index.h: mkindex$E $(SRC)
1421	1400	+$** > $@
1422	1401
1423	1402	builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
1424	1403	mkbuiltin$E --prefix $(SRCDIR)/ $(EXTRA_FILES) > $@
		@@ -1426,11 +1405,11 @@
1426	1405	clean:
1427	1406	-del $(OBJDIR)\*.obj
1428	1407	-del .obj _.c .h .map
1429	1408
1430	1409	realclean:
1431		- -del $(APPNAME) translate$E mkindex$E makeheaders$E mkversion$E codecheck1$E mkbuiltin$E mkcss$E
	1410	+ -del $(APPNAME) translate$E mkindex$E makeheaders$E mkversion$E codecheck1$E mkbuiltin$E
1432	1411
1433	1412	$(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
1434	1413	$(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
1435	1414	$(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
1436	1415	$(OBJDIR)\json_config$O : $(SRCDIR)\json_detail.h
		@@ -1453,11 +1432,11 @@
1453	1432	writeln "\t\$(TCC) -o\$@ -c ${s}_.c\n"
1454	1433	writeln "${s}_.c : \$(SRCDIR)\\$s.c"
1455	1434	writeln "\t+translate\$E \$** > \$@\n"
1456	1435	}
1457	1436
1458		-writeln -nonewline "headers: makeheaders\$E page_index.h builtin_data.h default_css.h VERSION.h\n\t +makeheaders\$E "
	1437	+writeln -nonewline "headers: makeheaders\$E page_index.h builtin_data.h VERSION.h\n\t +makeheaders\$E "
1459	1438	foreach s [lsort $src] {
1460	1439	writeln -nonewline "${s}_.c:$s.h "
1461	1440	}
1462	1441	writeln "\$(SRCDIR)\\sqlite3.h \$(SRCDIR)\\th.h VERSION.h \$(SRCDIR)\\cson_amalgamation.h"
1463	1442	writeln "\t@copy /Y nul: headers"
		@@ -1884,13 +1863,10 @@
1884	1863	$(BCC) $**
1885	1864
1886	1865	mkversion$E: $(SRCDIR)\mkversion.c
1887	1866	$(BCC) $**
1888	1867
1889		-mkcss$E: $(SRCDIR)\mkcss.c
1890		- $(BCC) $**
1891		-
1892	1868	codecheck1$E: $(SRCDIR)\codecheck1.c
1893	1869	$(BCC) $**
1894	1870
1895	1871	!if $(USE_SEE)!=0
1896	1872	SEE_FLAGS = /DSQLITE_HAS_CODEC=1 /DSQLITE_SHELL_DBKEY_PROC=fossil_key
		@@ -1924,13 +1900,10 @@
1924	1900	$** > $@
1925	1901
1926	1902	$(OX)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.c
1927	1903	$(TCC) /Fo$@ /c $**
1928	1904
1929		-default_css.h: mkcss$E $(SRCDIR)\default_css.txt
1930		- $** $@
1931		-
1932	1905	page_index.h: mkindex$E $(SRC)
1933	1906	$** > $@
1934	1907
1935	1908	builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
1936	1909	mkbuiltin$E --prefix $(SRCDIR)/ $(EXTRA_FILES) > $@
		@@ -1956,12 +1929,10 @@
1956	1929	-del mkindex$P 2>NUL
1957	1930	-del makeheaders$E 2>NUL
1958	1931	-del makeheaders$P 2>NUL
1959	1932	-del mkversion$E 2>NUL
1960	1933	-del mkversion$P 2>NUL
1961		- -del mkcss$E 2>NUL
1962		- -del mkcss$P 2>NUL
1963	1934	-del codecheck1$E 2>NUL
1964	1935	-del codecheck1$P 2>NUL
1965	1936	-del mkbuiltin$E 2>NUL
1966	1937	-del mkbuiltin$P 2>NUL
1967	1938
		@@ -1989,11 +1960,11 @@
1989	1960	}
1990	1961
1991	1962	writeln "fossil.res : \$B\\win\\fossil.rc"
1992	1963	writeln "\t\$(RCC) /fo \$@ \$**\n"
1993	1964
1994		-writeln "headers: makeheaders\$E page_index.h builtin_data.h default_css.h VERSION.h"
	1965	+writeln "headers: makeheaders\$E page_index.h builtin_data.h VERSION.h"
1995	1966	writeln -nonewline "\tmakeheaders\$E "
1996	1967	set i 0
1997	1968	foreach s [lsort $src] {
1998	1969	if {$i > 0} {
1999	1970	writeln " \\"
		@@ -2171,15 +2142,12 @@
2171	2142
2172	2143	# extracting version info from manifest
2173	2144	VERSION.h: version.exe ..\manifest.uuid ..\manifest ..\VERSION
2174	2145	version.exe ..\manifest.uuid ..\manifest ..\VERSION >$@
2175	2146
2176		-default_css.h: mkcss.exe default_css.txt
2177		- mkcss.exe default_css.txt $@
2178		-
2179	2147	# generate the simplified headers
2180		-headers: makeheaders.exe page_index.h builtin_data.h default_css.h VERSION.h ../src/sqlite3.h ../src/th.h
	2148	+headers: makeheaders.exe page_index.h builtin_data.h VERSION.h ../src/sqlite3.h ../src/th.h
2181	2149	makeheaders.exe $(foreach ts,$(TRANSLATEDSRC),$(ts):$(ts:_.c=.h)) ../src/sqlite3.h ../src/th.h VERSION.h
2182	2150	echo Done >$@
2183	2151
2184	2152	# compile C sources with relevant options
2185	2153
2186	2154
2187	2155	DELETED src/mkcss.c

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -176,10 +176,11 @@
176	set extra_files {
177	diff.tcl
178	markdown.md
179	wiki.wiki
180	*.js

181	style.*.css
182	../skins//.txt
183	sounds/*.wav
184	}
185
	@@ -349,13 +350,10 @@
349	$(XBCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR)/mkbuiltin.c
350
351	$(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c
352	$(XBCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
353
354	$(OBJDIR)/mkcss: $(SRCDIR)/mkcss.c
355	$(XBCC) -o $(OBJDIR)/mkcss $(SRCDIR)/mkcss.c
356
357	$(OBJDIR)/codecheck1: $(SRCDIR)/codecheck1.c
358	$(XBCC) -o $(OBJDIR)/codecheck1 $(SRCDIR)/codecheck1.c
359
360	# Run the test suite.
361	# Other flags that can be included in TESTFLAGS are:
	@@ -376,13 +374,10 @@
376	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
377	$(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \
378	$(SRCDIR)/../manifest \
379	$(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
380
381	$(OBJDIR)/default_css.h: $(SRCDIR)/default_css.txt $(OBJDIR)/mkcss
382	$(OBJDIR)/mkcss $(SRCDIR)/default_css.txt $(OBJDIR)/default_css.h
383
384	# Setup the options used to compile the included SQLite library.
385	SQLITE_OPTIONS = <<<SQLITE_OPTIONS>>>
386
387	# Setup the options used to compile the included SQLite shell.
388	SHELL_OPTIONS = <<<SHELL_OPTIONS>>>
	@@ -475,19 +470,18 @@
475	writeln "\t\$(OBJDIR)/mkindex \$(TRANS_SRC) >\$@\n"
476
477	writeln "\$(OBJDIR)/builtin_data.h: \$(OBJDIR)/mkbuiltin \$(EXTRA_FILES)"
478	writeln "\t\$(OBJDIR)/mkbuiltin --prefix \$(SRCDIR)/ \$(EXTRA_FILES) >\$@\n"
479
480	writeln "\$(OBJDIR)/headers:\t\$(OBJDIR)/page_index.h \$(OBJDIR)/builtin_data.h \$(OBJDIR)/default_css.h \$(OBJDIR)/makeheaders \$(OBJDIR)/VERSION.h"
481	writeln "\t\$(OBJDIR)/makeheaders $mhargs"
482	writeln "\ttouch \$(OBJDIR)/headers"
483	writeln "\$(OBJDIR)/headers: Makefile"
484	writeln "\$(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 : \$(SRCDIR)/json_detail.h"
485	writeln "Makefile:"
486	set extra_h(dispatch) " \$(OBJDIR)/page_index.h "
487	set extra_h(builtin) " \$(OBJDIR)/builtin_data.h "
488	set extra_h(style) " \$(OBJDIR)/default_css.h "
489
490	foreach s [lsort $src] {
491	writeln "\$(OBJDIR)/${s}_.c:\t\$(SRCDIR)/$s.c \$(OBJDIR)/translate"
492	writeln "\t\$(OBJDIR)/translate \$(SRCDIR)/$s.c >\$@\n"
493	writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h$extra_h($s)\$(SRCDIR)/config.h"
	@@ -1014,11 +1008,10 @@
1014	TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe)
1015	MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe)
1016	MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe)
1017	MKBUILTIN = $(subst /,\,$(OBJDIR)/mkbuiltin.exe)
1018	MKVERSION = $(subst /,\,$(OBJDIR)/mkversion.exe)
1019	MKCSS = $(subst /,\,$(OBJDIR)/mkcss.exe)
1020	CODECHECK1 = $(subst /,\,$(OBJDIR)/codecheck1.exe)
1021	CAT = type
1022	CP = copy
1023	GREP = find
1024	MV = copy
	@@ -1029,11 +1022,10 @@
1029	TRANSLATE = $(OBJDIR)/translate.exe
1030	MAKEHEADERS = $(OBJDIR)/makeheaders.exe
1031	MKINDEX = $(OBJDIR)/mkindex.exe
1032	MKBUILTIN = $(OBJDIR)/mkbuiltin.exe
1033	MKVERSION = $(OBJDIR)/mkversion.exe
1034	MKCSS = $(OBJDIR)/mkcss.exe
1035	CODECHECK1 = $(OBJDIR)/codecheck1.exe
1036	CAT = cat
1037	CP = cp
1038	GREP = grep
1039	MV = mv
	@@ -1043,11 +1035,11 @@
1043	endif}
1044
1045	writeln {
1046	all: $(OBJDIR) $(APPNAME)
1047
1048	$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h $(OBJDIR)/default_css.h
1049	ifdef USE_WINDOWS
1050	$(CAT) $(subst /,\,$(SRCDIR)\miniz.c) \| $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h)
1051	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
1052	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
1053	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
	@@ -1088,13 +1080,10 @@
1088	$(XBCC) -o $@ $(SRCDIR)/mkbuiltin.c
1089
1090	$(MKVERSION): $(SRCDIR)/mkversion.c
1091	$(XBCC) -o $@ $(SRCDIR)/mkversion.c
1092
1093	$(MKCSS): $(SRCDIR)/mkcss.c
1094	$(XBCC) -o $@ $(SRCDIR)/mkcss.c
1095
1096	$(CODECHECK1): $(SRCDIR)/codecheck1.c
1097	$(XBCC) -o $@ $(SRCDIR)/codecheck1.c
1098
1099	# WARNING. DANGER. Running the test suite modifies the repository the
1100	# build is done from, i.e. the checkout belongs to. Do not sync/push
	@@ -1103,13 +1092,10 @@
1103	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
1104
1105	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(MKVERSION)
1106	$(MKVERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$@
1107
1108	$(OBJDIR)/default_css.h: $(SRCDIR)/default_css.txt $(MKCSS)
1109	$(MKCSS) $(SRCDIR)/default_css.txt $@
1110
1111	# The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
1112	# to 1. If it is set to 1, then there is no need to build or link
1113	# the sqlite3.o object. Instead, the system SQLite will be linked
1114	# using -lsqlite3.
1115	SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
	@@ -1231,18 +1217,17 @@
1231	writeln "\t\$(MKINDEX) \$(TRANS_SRC) >\$@\n"
1232
1233	writeln "\$(OBJDIR)/builtin_data.h:\t\$(MKBUILTIN) \$(EXTRA_FILES)"
1234	writeln "\t\$(MKBUILTIN) --prefix \$(SRCDIR)/ \$(EXTRA_FILES) >\$@\n"
1235
1236	writeln "\$(OBJDIR)/headers:\t\$(OBJDIR)/page_index.h \$(OBJDIR)/builtin_data.h \$(OBJDIR)/default_css.h \$(MAKEHEADERS) \$(OBJDIR)/VERSION.h"
1237	writeln "\t\$(MAKEHEADERS) $mhargs"
1238	writeln "\techo Done >\$(OBJDIR)/headers\n"
1239	writeln "\$(OBJDIR)/headers: Makefile\n"
1240	writeln "Makefile:\n"
1241	set extra_h(main) " \$(OBJDIR)/page_index.h "
1242	set extra_h(builtin) " \$(OBJDIR)/builtin_data.h "
1243	set extra_h(style) " \$(OBJDIR)/default_css.h "
1244
1245	foreach s [lsort $src] {
1246	writeln "\$(OBJDIR)/${s}_.c:\t\$(SRCDIR)/$s.c \$(TRANSLATE)"
1247	writeln "\t\$(TRANSLATE) \$(SRCDIR)/$s.c >\$@\n"
1248	writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h$extra_h($s)\$(SRCDIR)/config.h"
	@@ -1388,13 +1373,10 @@
1388	$(BCC) -o$@ $**
1389
1390	mkversion$E: $(SRCDIR)\mkversion.c
1391	$(BCC) -o$@ $**
1392
1393	mkcss$E: $(SRCDIR)\mkcss.c
1394	$(BCC) -o$@ $**
1395
1396	codecheck1$E: $(SRCDIR)\codecheck1.c
1397	$(BCC) -o$@ $**
1398
1399	$(OBJDIR)\shell$O : $(SRCDIR)\shell.c
1400	$(TCC) -o$@ -c $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) $**
	@@ -1412,13 +1394,10 @@
1412	cp $@ $@
1413
1414	VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
1415	+$** > $@
1416
1417	default_css.h : mkcss$E $B\src\default_css.txt
1418	+$** $B\src\default_css.txt $@
1419
1420	page_index.h: mkindex$E $(SRC)
1421	+$** > $@
1422
1423	builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
1424	mkbuiltin$E --prefix $(SRCDIR)/ $(EXTRA_FILES) > $@
	@@ -1426,11 +1405,11 @@
1426	clean:
1427	-del $(OBJDIR)\*.obj
1428	-del .obj _.c .h .map
1429
1430	realclean:
1431	-del $(APPNAME) translate$E mkindex$E makeheaders$E mkversion$E codecheck1$E mkbuiltin$E mkcss$E
1432
1433	$(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
1434	$(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
1435	$(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
1436	$(OBJDIR)\json_config$O : $(SRCDIR)\json_detail.h
	@@ -1453,11 +1432,11 @@
1453	writeln "\t\$(TCC) -o\$@ -c ${s}_.c\n"
1454	writeln "${s}_.c : \$(SRCDIR)\\$s.c"
1455	writeln "\t+translate\$E \$** > \$@\n"
1456	}
1457
1458	writeln -nonewline "headers: makeheaders\$E page_index.h builtin_data.h default_css.h VERSION.h\n\t +makeheaders\$E "
1459	foreach s [lsort $src] {
1460	writeln -nonewline "${s}_.c:$s.h "
1461	}
1462	writeln "\$(SRCDIR)\\sqlite3.h \$(SRCDIR)\\th.h VERSION.h \$(SRCDIR)\\cson_amalgamation.h"
1463	writeln "\t@copy /Y nul: headers"
	@@ -1884,13 +1863,10 @@
1884	$(BCC) $**
1885
1886	mkversion$E: $(SRCDIR)\mkversion.c
1887	$(BCC) $**
1888
1889	mkcss$E: $(SRCDIR)\mkcss.c
1890	$(BCC) $**
1891
1892	codecheck1$E: $(SRCDIR)\codecheck1.c
1893	$(BCC) $**
1894
1895	!if $(USE_SEE)!=0
1896	SEE_FLAGS = /DSQLITE_HAS_CODEC=1 /DSQLITE_SHELL_DBKEY_PROC=fossil_key
	@@ -1924,13 +1900,10 @@
1924	$** > $@
1925
1926	$(OX)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.c
1927	$(TCC) /Fo$@ /c $**
1928
1929	default_css.h: mkcss$E $(SRCDIR)\default_css.txt
1930	$** $@
1931
1932	page_index.h: mkindex$E $(SRC)
1933	$** > $@
1934
1935	builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
1936	mkbuiltin$E --prefix $(SRCDIR)/ $(EXTRA_FILES) > $@
	@@ -1956,12 +1929,10 @@
1956	-del mkindex$P 2>NUL
1957	-del makeheaders$E 2>NUL
1958	-del makeheaders$P 2>NUL
1959	-del mkversion$E 2>NUL
1960	-del mkversion$P 2>NUL
1961	-del mkcss$E 2>NUL
1962	-del mkcss$P 2>NUL
1963	-del codecheck1$E 2>NUL
1964	-del codecheck1$P 2>NUL
1965	-del mkbuiltin$E 2>NUL
1966	-del mkbuiltin$P 2>NUL
1967
	@@ -1989,11 +1960,11 @@
1989	}
1990
1991	writeln "fossil.res : \$B\\win\\fossil.rc"
1992	writeln "\t\$(RCC) /fo \$@ \$**\n"
1993
1994	writeln "headers: makeheaders\$E page_index.h builtin_data.h default_css.h VERSION.h"
1995	writeln -nonewline "\tmakeheaders\$E "
1996	set i 0
1997	foreach s [lsort $src] {
1998	if {$i > 0} {
1999	writeln " \\"
	@@ -2171,15 +2142,12 @@
2171
2172	# extracting version info from manifest
2173	VERSION.h: version.exe ..\manifest.uuid ..\manifest ..\VERSION
2174	version.exe ..\manifest.uuid ..\manifest ..\VERSION >$@
2175
2176	default_css.h: mkcss.exe default_css.txt
2177	mkcss.exe default_css.txt $@
2178
2179	# generate the simplified headers
2180	headers: makeheaders.exe page_index.h builtin_data.h default_css.h VERSION.h ../src/sqlite3.h ../src/th.h
2181	makeheaders.exe $(foreach ts,$(TRANSLATEDSRC),$(ts):$(ts:_.c=.h)) ../src/sqlite3.h ../src/th.h VERSION.h
2182	echo Done >$@
2183
2184	# compile C sources with relevant options
2185
2186
2187	ELETED src/mkcss.c

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -176,10 +176,11 @@
176	set extra_files {
177	diff.tcl
178	markdown.md
179	wiki.wiki
180	*.js
181	default.css
182	style.*.css
183	../skins//.txt
184	sounds/*.wav
185	}
186
	@@ -349,13 +350,10 @@
350	$(XBCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR)/mkbuiltin.c
351
352	$(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c
353	$(XBCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
354



355	$(OBJDIR)/codecheck1: $(SRCDIR)/codecheck1.c
356	$(XBCC) -o $(OBJDIR)/codecheck1 $(SRCDIR)/codecheck1.c
357
358	# Run the test suite.
359	# Other flags that can be included in TESTFLAGS are:
	@@ -376,13 +374,10 @@
374	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
375	$(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \
376	$(SRCDIR)/../manifest \
377	$(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
378



379	# Setup the options used to compile the included SQLite library.
380	SQLITE_OPTIONS = <<<SQLITE_OPTIONS>>>
381
382	# Setup the options used to compile the included SQLite shell.
383	SHELL_OPTIONS = <<<SHELL_OPTIONS>>>
	@@ -475,19 +470,18 @@
470	writeln "\t\$(OBJDIR)/mkindex \$(TRANS_SRC) >\$@\n"
471
472	writeln "\$(OBJDIR)/builtin_data.h: \$(OBJDIR)/mkbuiltin \$(EXTRA_FILES)"
473	writeln "\t\$(OBJDIR)/mkbuiltin --prefix \$(SRCDIR)/ \$(EXTRA_FILES) >\$@\n"
474
475	writeln "\$(OBJDIR)/headers:\t\$(OBJDIR)/page_index.h \$(OBJDIR)/builtin_data.h \$(OBJDIR)/makeheaders \$(OBJDIR)/VERSION.h"
476	writeln "\t\$(OBJDIR)/makeheaders $mhargs"
477	writeln "\ttouch \$(OBJDIR)/headers"
478	writeln "\$(OBJDIR)/headers: Makefile"
479	writeln "\$(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 : \$(SRCDIR)/json_detail.h"
480	writeln "Makefile:"
481	set extra_h(dispatch) " \$(OBJDIR)/page_index.h "
482	set extra_h(builtin) " \$(OBJDIR)/builtin_data.h "

483
484	foreach s [lsort $src] {
485	writeln "\$(OBJDIR)/${s}_.c:\t\$(SRCDIR)/$s.c \$(OBJDIR)/translate"
486	writeln "\t\$(OBJDIR)/translate \$(SRCDIR)/$s.c >\$@\n"
487	writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h$extra_h($s)\$(SRCDIR)/config.h"
	@@ -1014,11 +1008,10 @@
1008	TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe)
1009	MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe)
1010	MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe)
1011	MKBUILTIN = $(subst /,\,$(OBJDIR)/mkbuiltin.exe)
1012	MKVERSION = $(subst /,\,$(OBJDIR)/mkversion.exe)

1013	CODECHECK1 = $(subst /,\,$(OBJDIR)/codecheck1.exe)
1014	CAT = type
1015	CP = copy
1016	GREP = find
1017	MV = copy
	@@ -1029,11 +1022,10 @@
1022	TRANSLATE = $(OBJDIR)/translate.exe
1023	MAKEHEADERS = $(OBJDIR)/makeheaders.exe
1024	MKINDEX = $(OBJDIR)/mkindex.exe
1025	MKBUILTIN = $(OBJDIR)/mkbuiltin.exe
1026	MKVERSION = $(OBJDIR)/mkversion.exe

1027	CODECHECK1 = $(OBJDIR)/codecheck1.exe
1028	CAT = cat
1029	CP = cp
1030	GREP = grep
1031	MV = mv
	@@ -1043,11 +1035,11 @@
1035	endif}
1036
1037	writeln {
1038	all: $(OBJDIR) $(APPNAME)
1039
1040	$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
1041	ifdef USE_WINDOWS
1042	$(CAT) $(subst /,\,$(SRCDIR)\miniz.c) \| $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h)
1043	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
1044	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
1045	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
	@@ -1088,13 +1080,10 @@
1080	$(XBCC) -o $@ $(SRCDIR)/mkbuiltin.c
1081
1082	$(MKVERSION): $(SRCDIR)/mkversion.c
1083	$(XBCC) -o $@ $(SRCDIR)/mkversion.c
1084



1085	$(CODECHECK1): $(SRCDIR)/codecheck1.c
1086	$(XBCC) -o $@ $(SRCDIR)/codecheck1.c
1087
1088	# WARNING. DANGER. Running the test suite modifies the repository the
1089	# build is done from, i.e. the checkout belongs to. Do not sync/push
	@@ -1103,13 +1092,10 @@
1092	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
1093
1094	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(MKVERSION)
1095	$(MKVERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$@
1096



1097	# The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
1098	# to 1. If it is set to 1, then there is no need to build or link
1099	# the sqlite3.o object. Instead, the system SQLite will be linked
1100	# using -lsqlite3.
1101	SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
	@@ -1231,18 +1217,17 @@
1217	writeln "\t\$(MKINDEX) \$(TRANS_SRC) >\$@\n"
1218
1219	writeln "\$(OBJDIR)/builtin_data.h:\t\$(MKBUILTIN) \$(EXTRA_FILES)"
1220	writeln "\t\$(MKBUILTIN) --prefix \$(SRCDIR)/ \$(EXTRA_FILES) >\$@\n"
1221
1222	writeln "\$(OBJDIR)/headers:\t\$(OBJDIR)/page_index.h \$(OBJDIR)/builtin_data.h \$(MAKEHEADERS) \$(OBJDIR)/VERSION.h"
1223	writeln "\t\$(MAKEHEADERS) $mhargs"
1224	writeln "\techo Done >\$(OBJDIR)/headers\n"
1225	writeln "\$(OBJDIR)/headers: Makefile\n"
1226	writeln "Makefile:\n"
1227	set extra_h(main) " \$(OBJDIR)/page_index.h "
1228	set extra_h(builtin) " \$(OBJDIR)/builtin_data.h "

1229
1230	foreach s [lsort $src] {
1231	writeln "\$(OBJDIR)/${s}_.c:\t\$(SRCDIR)/$s.c \$(TRANSLATE)"
1232	writeln "\t\$(TRANSLATE) \$(SRCDIR)/$s.c >\$@\n"
1233	writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h$extra_h($s)\$(SRCDIR)/config.h"
	@@ -1388,13 +1373,10 @@
1373	$(BCC) -o$@ $**
1374
1375	mkversion$E: $(SRCDIR)\mkversion.c
1376	$(BCC) -o$@ $**
1377



1378	codecheck1$E: $(SRCDIR)\codecheck1.c
1379	$(BCC) -o$@ $**
1380
1381	$(OBJDIR)\shell$O : $(SRCDIR)\shell.c
1382	$(TCC) -o$@ -c $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) $**
	@@ -1412,13 +1394,10 @@
1394	cp $@ $@
1395
1396	VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
1397	+$** > $@
1398



1399	page_index.h: mkindex$E $(SRC)
1400	+$** > $@
1401
1402	builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
1403	mkbuiltin$E --prefix $(SRCDIR)/ $(EXTRA_FILES) > $@
	@@ -1426,11 +1405,11 @@
1405	clean:
1406	-del $(OBJDIR)\*.obj
1407	-del .obj _.c .h .map
1408
1409	realclean:
1410	-del $(APPNAME) translate$E mkindex$E makeheaders$E mkversion$E codecheck1$E mkbuiltin$E
1411
1412	$(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
1413	$(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
1414	$(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
1415	$(OBJDIR)\json_config$O : $(SRCDIR)\json_detail.h
	@@ -1453,11 +1432,11 @@
1432	writeln "\t\$(TCC) -o\$@ -c ${s}_.c\n"
1433	writeln "${s}_.c : \$(SRCDIR)\\$s.c"
1434	writeln "\t+translate\$E \$** > \$@\n"
1435	}
1436
1437	writeln -nonewline "headers: makeheaders\$E page_index.h builtin_data.h VERSION.h\n\t +makeheaders\$E "
1438	foreach s [lsort $src] {
1439	writeln -nonewline "${s}_.c:$s.h "
1440	}
1441	writeln "\$(SRCDIR)\\sqlite3.h \$(SRCDIR)\\th.h VERSION.h \$(SRCDIR)\\cson_amalgamation.h"
1442	writeln "\t@copy /Y nul: headers"
	@@ -1884,13 +1863,10 @@
1863	$(BCC) $**
1864
1865	mkversion$E: $(SRCDIR)\mkversion.c
1866	$(BCC) $**
1867



1868	codecheck1$E: $(SRCDIR)\codecheck1.c
1869	$(BCC) $**
1870
1871	!if $(USE_SEE)!=0
1872	SEE_FLAGS = /DSQLITE_HAS_CODEC=1 /DSQLITE_SHELL_DBKEY_PROC=fossil_key
	@@ -1924,13 +1900,10 @@
1900	$** > $@
1901
1902	$(OX)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.c
1903	$(TCC) /Fo$@ /c $**
1904



1905	page_index.h: mkindex$E $(SRC)
1906	$** > $@
1907
1908	builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
1909	mkbuiltin$E --prefix $(SRCDIR)/ $(EXTRA_FILES) > $@
	@@ -1956,12 +1929,10 @@
1929	-del mkindex$P 2>NUL
1930	-del makeheaders$E 2>NUL
1931	-del makeheaders$P 2>NUL
1932	-del mkversion$E 2>NUL
1933	-del mkversion$P 2>NUL


1934	-del codecheck1$E 2>NUL
1935	-del codecheck1$P 2>NUL
1936	-del mkbuiltin$E 2>NUL
1937	-del mkbuiltin$P 2>NUL
1938
	@@ -1989,11 +1960,11 @@
1960	}
1961
1962	writeln "fossil.res : \$B\\win\\fossil.rc"
1963	writeln "\t\$(RCC) /fo \$@ \$**\n"
1964
1965	writeln "headers: makeheaders\$E page_index.h builtin_data.h VERSION.h"
1966	writeln -nonewline "\tmakeheaders\$E "
1967	set i 0
1968	foreach s [lsort $src] {
1969	if {$i > 0} {
1970	writeln " \\"
	@@ -2171,15 +2142,12 @@
2142
2143	# extracting version info from manifest
2144	VERSION.h: version.exe ..\manifest.uuid ..\manifest ..\VERSION
2145	version.exe ..\manifest.uuid ..\manifest ..\VERSION >$@
2146



2147	# generate the simplified headers
2148	headers: makeheaders.exe page_index.h builtin_data.h VERSION.h ../src/sqlite3.h ../src/th.h
2149	makeheaders.exe $(foreach ts,$(TRANSLATEDSRC),$(ts):$(ts:_.c=.h)) ../src/sqlite3.h ../src/th.h VERSION.h
2150	echo Done >$@
2151
2152	# compile C sources with relevant options
2153
2154
2155	ELETED src/mkcss.c

D src/mkcss.c

-168

		--- a/src/mkcss.c
		+++ b/src/mkcss.c
		@@ -1,168 +0,0 @@
1		-/*
2		-** This C program generates the "default_css.h" header file from
3		-** "default_css.txt" source file.
4		-**
5		-** The default_css.h header contains a definition of a structure
6		-** with lots of default CSS snippets. This information is used to
7		-** generate the /style.css page as follows:
8		-**
9		-** (1) Read the repository-specific CSS page from the skin
10		-** (2) Initialize the output to a copy of the repo-CSS from (1).
11		-** (3) For each entry in the cssDefaultList[], if the selector
12		-** described by cssDefaultList[i] is not found in the
13		-** repo-CSS, then append it to the output.
14		-**
15		-** The input file, "default_css.txt", is plain text with lots of
16		-** comments. This routine strips out the comments and breaks the
17		-** text up into individual cssDefaultList[] elements.
18		-**
19		-** To run this program:
20		-**
21		-** ./mkcss default_css.txt default_css.h
22		-**
23		-** In other words, there are two arguments. The first is the name of
24		-** the input file and the second is the name of the output file.
25		-** Either argument can be "-" to indicate standard input or output.
26		-**
27		-** Input Format Summary:
28		-**
29		-** # comment
30		-** selector {
31		-** rule; # comment
32		-** }
33		-** # comment
34		-**
35		-** It would be much easier to do this using a script, but that would
36		-** make the Fossil source-code less cross-platform because it would then
37		-** require that the script engine be installed on the build platform.
38		-*/
39		-#include <stdio.h>
40		-#include <string.h>
41		-#include <stdlib.h>
42		-#include <ctype.h>
43		-
44		-static FILE open_for_reading(const char zFilename){
45		- FILE *f;
46		- if( strcmp(zFilename, "-")==0 ) return stdin;
47		- f = fopen(zFilename, "r");
48		- if( f==0 ){
49		- fprintf(stderr, "cannot open \"%s\" for reading\n", zFilename);
50		- exit(1);
51		- }
52		- return f;
53		-}
54		-static FILE open_for_writing(const char zFilename){
55		- FILE *f;
56		- if( strcmp(zFilename, "-")==0 ) return stdout;
57		- f = fopen(zFilename, "w");
58		- if( f==0 ){
59		- fprintf(stderr, "cannot open \"%s\" for writing\n", zFilename);
60		- exit(1);
61		- }
62		- return f;
63		-}
64		-static void close_file(FILE *f){
65		- if( f!=stdin && f!=stdout){
66		- fclose(f);
67		- }
68		-}
69		-
70		-/*
71		-** Print a string as a quoted C-language string.
72		-*/
73		-static void clang_puts(FILE out, const char z){
74		- int i;
75		- while( z[0] ){
76		- for(i=0; z[i] && z[i]!='"' && z[i]!='\\'; i++){}
77		- fprintf(out, "%.*s", i, z);
78		- if( z[i] ){
79		- fprintf(out, "\\%c", z[i]);
80		- z += i+1;
81		- }else{
82		- z += i;
83		- }
84		- }
85		-}
86		-
87		-int main(int argc, char *argv[]){
88		- FILE in, out;
89		- int inRules = 0;
90		- int nLine = 0;
91		- int iStart = 0;
92		- const char *zInFile;
93		- const char *zOutFile;
94		- char z[1000];
95		- if( argc!=3 ){
96		- fprintf(stderr, "Usage: %s INPUTFILE OUTPUTFILE\n", argv[0]);
97		- return 1;
98		- }
99		- zInFile = argv[1];
100		- zOutFile = argv[2];
101		- in = open_for_reading(zInFile);
102		- out = open_for_writing(zOutFile);
103		-
104		- fprintf(out,
105		- "/* DO NOT EDIT\n"
106		- "** This code is generated automatically using 'mkcss.c'\n"
107		- "*/\n"
108		- "const struct strctCssDefaults {\n"
109		- " const char elementClass; / Name of element needed */\n"
110		- " const char value; / CSS text */\n"
111		- "} cssDefaultList[] = {\n"
112		- );
113		- while( fgets(z, sizeof(z), in) ){
114		- int n; /* Line length */
115		- int i;
116		- nLine++;
117		- if( z[0]=='/' && z[1]=='/' ) continue; /* Skip comments */
118		- if( z[0]=='-' && z[1]=='-' ) continue; /* Skip comments */
119		- if( z[0]=='#' && !isalnum(z[1]) ) continue; /* Skip comments */
120		- n = (int)strlen(z);
121		- while( n>0 && isspace(z[n-1]) ){ z[--n] = 0; }
122		- if( z[0]==0 ) continue; /* Blank lines */
123		- if( isspace(z[0]) ){
124		- if( !inRules ){
125		- fprintf(stderr, "%s:%d: CSS rule not within a selector\n",
126		- zInFile, nLine);
127		- exit(1);
128		- }
129		- for(i=0; isspace(z[i]); i++){}
130		- fprintf(out, " \" ");
131		- clang_puts(out, z+i);
132		- fprintf(out, "\\n\"\n");
133		- }else if( z[0]=='}' ){
134		- if( !inRules ){
135		- fprintf(stderr, "%s:%d: surplus CSS rule terminator\n",
136		- zInFile, nLine);
137		- exit(1);
138		- }
139		- fprintf(out, " },\n");
140		- inRules = 0;
141		- }else if( z[n-1]=='{' ){
142		- if( inRules ){
143		- fprintf(stderr, "%s:%d: selector where there should be rule\n",
144		- zInFile, nLine);
145		- exit(1);
146		- }
147		- inRules = 1;
148		- iStart = nLine;
149		- fprintf(out, " { \"");
150		- n--;
151		- while( n>0 && isspace(z[n-1]) ){ z[--n] = 0; }
152		- clang_puts(out, z);
153		- fprintf(out, "\",\n");
154		- }else{
155		- fprintf(stderr, "%s:%d: syntax error\n",
156		- zInFile, nLine);
157		- exit(1);
158		- }
159		- }
160		- if( inRules ){
161		- fprintf(stderr, "%s:%d: unterminated CSS rule\n", zInFile, iStart);
162		- exit(1);
163		- }
164		- close_file(in);
165		- fprintf(out, " {0,0}\n};\n");
166		- close_file(out);
167		- return 0;
168		-}

	--- a/src/mkcss.c
	+++ b/src/mkcss.c
	@@ -1,168 +0,0 @@
1	/*
2	** This C program generates the "default_css.h" header file from
3	** "default_css.txt" source file.
4	**
5	** The default_css.h header contains a definition of a structure
6	** with lots of default CSS snippets. This information is used to
7	** generate the /style.css page as follows:
8	**
9	** (1) Read the repository-specific CSS page from the skin
10	** (2) Initialize the output to a copy of the repo-CSS from (1).
11	** (3) For each entry in the cssDefaultList[], if the selector
12	** described by cssDefaultList[i] is not found in the
13	** repo-CSS, then append it to the output.
14	**
15	** The input file, "default_css.txt", is plain text with lots of
16	** comments. This routine strips out the comments and breaks the
17	** text up into individual cssDefaultList[] elements.
18	**
19	** To run this program:
20	**
21	** ./mkcss default_css.txt default_css.h
22	**
23	** In other words, there are two arguments. The first is the name of
24	** the input file and the second is the name of the output file.
25	** Either argument can be "-" to indicate standard input or output.
26	**
27	** Input Format Summary:
28	**
29	** # comment
30	** selector {
31	** rule; # comment
32	** }
33	** # comment
34	**
35	** It would be much easier to do this using a script, but that would
36	** make the Fossil source-code less cross-platform because it would then
37	** require that the script engine be installed on the build platform.
38	*/
39	#include <stdio.h>
40	#include <string.h>
41	#include <stdlib.h>
42	#include <ctype.h>
43
44	static FILE open_for_reading(const char zFilename){
45	FILE *f;
46	if( strcmp(zFilename, "-")==0 ) return stdin;
47	f = fopen(zFilename, "r");
48	if( f==0 ){
49	fprintf(stderr, "cannot open \"%s\" for reading\n", zFilename);
50	exit(1);
51	}
52	return f;
53	}
54	static FILE open_for_writing(const char zFilename){
55	FILE *f;
56	if( strcmp(zFilename, "-")==0 ) return stdout;
57	f = fopen(zFilename, "w");
58	if( f==0 ){
59	fprintf(stderr, "cannot open \"%s\" for writing\n", zFilename);
60	exit(1);
61	}
62	return f;
63	}
64	static void close_file(FILE *f){
65	if( f!=stdin && f!=stdout){
66	fclose(f);
67	}
68	}
69
70	/*
71	** Print a string as a quoted C-language string.
72	*/
73	static void clang_puts(FILE out, const char z){
74	int i;
75	while( z[0] ){
76	for(i=0; z[i] && z[i]!='"' && z[i]!='\\'; i++){}
77	fprintf(out, "%.*s", i, z);
78	if( z[i] ){
79	fprintf(out, "\\%c", z[i]);
80	z += i+1;
81	}else{
82	z += i;
83	}
84	}
85	}
86
87	int main(int argc, char *argv[]){
88	FILE in, out;
89	int inRules = 0;
90	int nLine = 0;
91	int iStart = 0;
92	const char *zInFile;
93	const char *zOutFile;
94	char z[1000];
95	if( argc!=3 ){
96	fprintf(stderr, "Usage: %s INPUTFILE OUTPUTFILE\n", argv[0]);
97	return 1;
98	}
99	zInFile = argv[1];
100	zOutFile = argv[2];
101	in = open_for_reading(zInFile);
102	out = open_for_writing(zOutFile);
103
104	fprintf(out,
105	"/* DO NOT EDIT\n"
106	"** This code is generated automatically using 'mkcss.c'\n"
107	"*/\n"
108	"const struct strctCssDefaults {\n"
109	" const char elementClass; / Name of element needed */\n"
110	" const char value; / CSS text */\n"
111	"} cssDefaultList[] = {\n"
112	);
113	while( fgets(z, sizeof(z), in) ){
114	int n; /* Line length */
115	int i;
116	nLine++;
117	if( z[0]=='/' && z[1]=='/' ) continue; /* Skip comments */
118	if( z[0]=='-' && z[1]=='-' ) continue; /* Skip comments */
119	if( z[0]=='#' && !isalnum(z[1]) ) continue; /* Skip comments */
120	n = (int)strlen(z);
121	while( n>0 && isspace(z[n-1]) ){ z[--n] = 0; }
122	if( z[0]==0 ) continue; /* Blank lines */
123	if( isspace(z[0]) ){
124	if( !inRules ){
125	fprintf(stderr, "%s:%d: CSS rule not within a selector\n",
126	zInFile, nLine);
127	exit(1);
128	}
129	for(i=0; isspace(z[i]); i++){}
130	fprintf(out, " \" ");
131	clang_puts(out, z+i);
132	fprintf(out, "\\n\"\n");
133	}else if( z[0]=='}' ){
134	if( !inRules ){
135	fprintf(stderr, "%s:%d: surplus CSS rule terminator\n",
136	zInFile, nLine);
137	exit(1);
138	}
139	fprintf(out, " },\n");
140	inRules = 0;
141	}else if( z[n-1]=='{' ){
142	if( inRules ){
143	fprintf(stderr, "%s:%d: selector where there should be rule\n",
144	zInFile, nLine);
145	exit(1);
146	}
147	inRules = 1;
148	iStart = nLine;
149	fprintf(out, " { \"");
150	n--;
151	while( n>0 && isspace(z[n-1]) ){ z[--n] = 0; }
152	clang_puts(out, z);
153	fprintf(out, "\",\n");
154	}else{
155	fprintf(stderr, "%s:%d: syntax error\n",
156	zInFile, nLine);
157	exit(1);
158	}
159	}
160	if( inRules ){
161	fprintf(stderr, "%s:%d: unterminated CSS rule\n", zInFile, iStart);
162	exit(1);
163	}
164	close_file(in);
165	fprintf(out, " {0,0}\n};\n");
166	close_file(out);
167	return 0;
168	}

	--- a/src/mkcss.c
	+++ b/src/mkcss.c
	@@ -1,168 +0,0 @@

M src/skins.c

-46

		--- src/skins.c
		+++ src/skins.c
		@@ -701,53 +701,10 @@
701	701	*/
702	702	const char elementClass; / Name of element needed */
703	703	const char value; / CSS text */
704	704	} cssDefaultList[];
705	705
706		-/*
707		-** Emits the list of built-in default CSS selectors. Intended
708		-** for use only from the /setup_skinedit page.
709		-*/
710		-static void skin_emit_css_defaults(){
711		- struct strctCssDefaults const * pCss;
712		- fossil_print("<h1>CSS Defaults</h1>");
713		- fossil_print("Fossil's list of its own CSS classes follows. ");
714		- fossil_print("See <a href=\"https://fossil-scm.org/fossil/"
715		- "doc/trunk/www/css-tricks.md\">this "
716		- "document</a> for more details.");
717		- /* To discuss: do we want to list only the default selectors or
718		- ** also their default values? The latter increases the size of the
719		- ** page considerably, but is arguably more useful. We could, of
720		- ** course, offer a URL param to toggle the view, but that currently
721		- ** seems like overkill.
722		- **
723		- ** Be sure to adjust the default_css.txt #setup_skinedit_css entry
724		- ** for whichever impl ends up being selected.
725		- */
726		-#if 1
727		- /* List impl which elides style values */
728		- fossil_print("<div class=\"columns\" "
729		- "id=\"setup_skinedit_css_defaults\"><ul>");
730		- for(pCss = &cssDefaultList[0]; pCss->value!=0; ++pCss){
731		- fossil_print("<li>%s</li>", pCss->elementClass);
732		- }
733		- fossil_print("</ul>");
734		-#else
735		- /* Table impl which also includes style values. */
736		- fossil_print("<table id=\"setup_skinedit_css_defaults\"><tbody>");
737		- for(pCss = &cssDefaultList[0]; pCss->value!=0; ++pCss){
738		- fossil_print("<tr><td>%s</td>", pCss->elementClass);
739		- /* A TD element apparently cannot be told to scroll its contents,
740		- ** so we require a DIV inside the value TD to scroll the long
741		- ** url(data:...) entries. */
742		- fossil_print("<td><div>%s</div></td>", pCss->value);
743		- fossil_print("</td></tr>");
744		- }
745		- fossil_print("</tbody></table>");
746		-#endif
747		-}
748		-
749	706	/*
750	707	** WEBPAGE: setup_skinedit
751	708	**
752	709	** Edit aspects of a skin determined by the w= query parameter.
753	710	** Requires Admin or Setup privileges.
		@@ -869,13 +826,10 @@
869	826	blob_reset(&from);
870	827	blob_reset(&to);
871	828	blob_reset(&out);
872	829	}
873	830	@ </div></form>
874		- if(ii==0/CSS/){
875		- skin_emit_css_defaults();
876		- }
877	831	style_footer();
878	832	db_end_transaction(0);
879	833	}
880	834
881	835	/*
882	836

	--- src/skins.c
	+++ src/skins.c
	@@ -701,53 +701,10 @@
701	*/
702	const char elementClass; / Name of element needed */
703	const char value; / CSS text */
704	} cssDefaultList[];
705
706	/*
707	** Emits the list of built-in default CSS selectors. Intended
708	** for use only from the /setup_skinedit page.
709	*/
710	static void skin_emit_css_defaults(){
711	struct strctCssDefaults const * pCss;
712	fossil_print("<h1>CSS Defaults</h1>");
713	fossil_print("Fossil's list of its own CSS classes follows. ");
714	fossil_print("See <a href=\"https://fossil-scm.org/fossil/"
715	"doc/trunk/www/css-tricks.md\">this "
716	"document</a> for more details.");
717	/* To discuss: do we want to list only the default selectors or
718	** also their default values? The latter increases the size of the
719	** page considerably, but is arguably more useful. We could, of
720	** course, offer a URL param to toggle the view, but that currently
721	** seems like overkill.
722	**
723	** Be sure to adjust the default_css.txt #setup_skinedit_css entry
724	** for whichever impl ends up being selected.
725	*/
726	#if 1
727	/* List impl which elides style values */
728	fossil_print("<div class=\"columns\" "
729	"id=\"setup_skinedit_css_defaults\"><ul>");
730	for(pCss = &cssDefaultList[0]; pCss->value!=0; ++pCss){
731	fossil_print("<li>%s</li>", pCss->elementClass);
732	}
733	fossil_print("</ul>");
734	#else
735	/* Table impl which also includes style values. */
736	fossil_print("<table id=\"setup_skinedit_css_defaults\"><tbody>");
737	for(pCss = &cssDefaultList[0]; pCss->value!=0; ++pCss){
738	fossil_print("<tr><td>%s</td>", pCss->elementClass);
739	/* A TD element apparently cannot be told to scroll its contents,
740	** so we require a DIV inside the value TD to scroll the long
741	** url(data:...) entries. */
742	fossil_print("<td><div>%s</div></td>", pCss->value);
743	fossil_print("</td></tr>");
744	}
745	fossil_print("</tbody></table>");
746	#endif
747	}
748
749	/*
750	** WEBPAGE: setup_skinedit
751	**
752	** Edit aspects of a skin determined by the w= query parameter.
753	** Requires Admin or Setup privileges.
	@@ -869,13 +826,10 @@
869	blob_reset(&from);
870	blob_reset(&to);
871	blob_reset(&out);
872	}
873	@ </div></form>
874	if(ii==0/CSS/){
875	skin_emit_css_defaults();
876	}
877	style_footer();
878	db_end_transaction(0);
879	}
880
881	/*
882

	--- src/skins.c
	+++ src/skins.c
	@@ -701,53 +701,10 @@
701	*/
702	const char elementClass; / Name of element needed */
703	const char value; / CSS text */
704	} cssDefaultList[];
705











































706	/*
707	** WEBPAGE: setup_skinedit
708	**
709	** Edit aspects of a skin determined by the w= query parameter.
710	** Requires Admin or Setup privileges.
	@@ -869,13 +826,10 @@
826	blob_reset(&from);
827	blob_reset(&to);
828	blob_reset(&out);
829	}
830	@ </div></form>



831	style_footer();
832	db_end_transaction(0);
833	}
834
835	/*
836

M src/style.c

+43 -55

		--- src/style.c
		+++ src/style.c
		@@ -987,33 +987,10 @@
987	987	*/
988	988	void style_sidebox_end(void){
989	989	@ </div>
990	990	}
991	991
992		-/*
993		-** Insert the cssDefaultList[] table, generated from default_css.txt
994		-** using the mkcss.c program.
995		-*/
996		-#include "default_css.h"
997		-
998		-/*
999		-** Append all of the default CSS to the CGI output.
1000		-*/
1001		-void cgi_append_default_css(void) {
1002		- int i;
1003		-
1004		- cgi_printf("%s", builtin_text("skins/default/css.txt"));
1005		- for( i=0; cssDefaultList[i].elementClass; i++ ){
1006		- if( cssDefaultList[i].elementClass[0] ){
1007		- cgi_printf("%s {\n%s\n}\n\n",
1008		- cssDefaultList[i].elementClass,
1009		- cssDefaultList[i].value
1010		- );
1011		- }
1012		- }
1013		-}
1014		-
1015	992	/*
1016	993	** Search string zCss for zSelector.
1017	994	**
1018	995	** Return true if found. Return false if not found
1019	996	*/
		@@ -1075,54 +1052,65 @@
1075	1052	cgi_set_content_type("application/javascript");
1076	1053	}
1077	1054	style_init_th1_vars(0);
1078	1055	Th_Render(zScript?zScript:"");
1079	1056	}
	1057	+
	1058	+/*
	1059	+** If one of the "name" or "page" URL parameters (in that order)
	1060	+** is set then this function looks for page/page group-specific
	1061	+** CSS and (if found) appends it to pOut, else it is a no-op.
	1062	+*/
	1063	+static void page_style_css_append_page_style(Blob *pOut){
	1064	+ const char *zPage = PD("name",P("page"));
	1065	+ char * zFile;
	1066	+ int nFile = 0;
	1067	+ const char *zBuiltin;
	1068	+
	1069	+ if(zPage==0 \|\| zPage[0]==0){
	1070	+ return;
	1071	+ }
	1072	+ zFile = mprintf("style.%s.css", zPage);
	1073	+ zBuiltin = (const char *)builtin_file(zFile, &nFile);
	1074	+ if(nFile>0){
	1075	+ blob_appendf(pOut,
	1076	+ "\n/***********************************************************\n"
	1077	+ "** Start of page-specific CSS for page %s...\n"
	1078	+ "***********************************************************/\n",
	1079	+ zPage);
	1080	+ blob_append(pOut, zBuiltin, nFile);
	1081	+ blob_appendf(pOut,
	1082	+ "\n/***********************************************************\n"
	1083	+ "** End of page-specific CSS for page %s.\n"
	1084	+ "***********************************************************/\n",
	1085	+ zPage);
	1086	+ fossil_free(zFile);
	1087	+ return;
	1088	+ }
	1089	+ /* Potential TODO: check for aliases/page groups. e.g. group all
	1090	+ ** /forumXYZ CSS into one file, all /setupXYZ into another, etc. As
	1091	+ ** of this writing, doing so would only shave a few kb from
	1092	+ ** default.css. */
	1093	+ fossil_free(zFile);
	1094	+}
1080	1095
1081	1096	/*
1082	1097	** WEBPAGE: style.css
1083	1098	**
1084	1099	** Return the style sheet.
1085	1100	*/
1086	1101	void page_style_css(void){
1087	1102	Blob css = empty_blob;
1088	1103	int i;
1089		- const char *zPage = PD("name",P("page"));
1090	1104
1091	1105	cgi_set_content_type("text/css");
1092	1106	/* Emit all default rules... */
1093		- for(i=1; cssDefaultList[i].elementClass; i++){
1094		- blob_appendf(&css, "%s {\n%s}\n",
1095		- cssDefaultList[i].elementClass,
1096		- cssDefaultList[i].value);
1097		- }
1098		- blob_append(&css,
1099		- "\n/***********************************************************\n"
1100		- "** All CSS above is generated automatically by Fossil to\n"
1101		- "** provide default rule implementations which the \"skin\"\n"
1102		- "** may cascade.\n"
1103		- "***********************************************************/\n",
1104		- -1);
1105		- if(zPage!=0 && zPage[0]!=0){
1106		- char * zFile = mprintf("style.%s.css", zPage);
1107		- int nFile = 0;
1108		- const char zBuiltin = (const char )builtin_file(zFile, &nFile);
1109		- if(nFile>0){
1110		- blob_appendf(&css,
1111		- "\n/***********************************************************\n"
1112		- "** Start of page-specific CSS for page %s...\n"
1113		- "***********************************************************/\n",
1114		- zPage);
1115		- blob_append(&css, zBuiltin, nFile);
1116		- blob_appendf(&css,
1117		- "\n/***********************************************************\n"
1118		- "** End of page-specific CSS for page %s.\n"
1119		- "***********************************************************/\n",
1120		- zPage);
1121		- }
1122		- fossil_free(zFile);
1123		- }
	1107	+ {
	1108	+ const char * zDefaults = (const char*)builtin_file("default.css", &i);
	1109	+ blob_append(&css, zDefaults, i);
	1110	+ }
	1111	+ page_style_css_append_page_style(&css);
1124	1112	blob_append(&css,
1125	1113	"\n/***********************************************************\n"
1126	1114	"** All CSS which follows is supplied by the repository \"skin\".\n"
1127	1115	"***********************************************************/\n",
1128	1116	-1);
1129	1117

	--- src/style.c
	+++ src/style.c
	@@ -987,33 +987,10 @@
987	*/
988	void style_sidebox_end(void){
989	@ </div>
990	}
991
992	/*
993	** Insert the cssDefaultList[] table, generated from default_css.txt
994	** using the mkcss.c program.
995	*/
996	#include "default_css.h"
997
998	/*
999	** Append all of the default CSS to the CGI output.
1000	*/
1001	void cgi_append_default_css(void) {
1002	int i;
1003
1004	cgi_printf("%s", builtin_text("skins/default/css.txt"));
1005	for( i=0; cssDefaultList[i].elementClass; i++ ){
1006	if( cssDefaultList[i].elementClass[0] ){
1007	cgi_printf("%s {\n%s\n}\n\n",
1008	cssDefaultList[i].elementClass,
1009	cssDefaultList[i].value
1010	);
1011	}
1012	}
1013	}
1014
1015	/*
1016	** Search string zCss for zSelector.
1017	**
1018	** Return true if found. Return false if not found
1019	*/
	@@ -1075,54 +1052,65 @@
1075	cgi_set_content_type("application/javascript");
1076	}
1077	style_init_th1_vars(0);
1078	Th_Render(zScript?zScript:"");
1079	}






































1080
1081	/*
1082	** WEBPAGE: style.css
1083	**
1084	** Return the style sheet.
1085	*/
1086	void page_style_css(void){
1087	Blob css = empty_blob;
1088	int i;
1089	const char *zPage = PD("name",P("page"));
1090
1091	cgi_set_content_type("text/css");
1092	/* Emit all default rules... */
1093	for(i=1; cssDefaultList[i].elementClass; i++){
1094	blob_appendf(&css, "%s {\n%s}\n",
1095	cssDefaultList[i].elementClass,
1096	cssDefaultList[i].value);
1097	}
1098	blob_append(&css,
1099	"\n/***********************************************************\n"
1100	"** All CSS above is generated automatically by Fossil to\n"
1101	"** provide default rule implementations which the \"skin\"\n"
1102	"** may cascade.\n"
1103	"***********************************************************/\n",
1104	-1);
1105	if(zPage!=0 && zPage[0]!=0){
1106	char * zFile = mprintf("style.%s.css", zPage);
1107	int nFile = 0;
1108	const char zBuiltin = (const char )builtin_file(zFile, &nFile);
1109	if(nFile>0){
1110	blob_appendf(&css,
1111	"\n/***********************************************************\n"
1112	"** Start of page-specific CSS for page %s...\n"
1113	"***********************************************************/\n",
1114	zPage);
1115	blob_append(&css, zBuiltin, nFile);
1116	blob_appendf(&css,
1117	"\n/***********************************************************\n"
1118	"** End of page-specific CSS for page %s.\n"
1119	"***********************************************************/\n",
1120	zPage);
1121	}
1122	fossil_free(zFile);
1123	}
1124	blob_append(&css,
1125	"\n/***********************************************************\n"
1126	"** All CSS which follows is supplied by the repository \"skin\".\n"
1127	"***********************************************************/\n",
1128	-1);
1129

	--- src/style.c
	+++ src/style.c
	@@ -987,33 +987,10 @@
987	*/
988	void style_sidebox_end(void){
989	@ </div>
990	}
991























992	/*
993	** Search string zCss for zSelector.
994	**
995	** Return true if found. Return false if not found
996	*/
	@@ -1075,54 +1052,65 @@
1052	cgi_set_content_type("application/javascript");
1053	}
1054	style_init_th1_vars(0);
1055	Th_Render(zScript?zScript:"");
1056	}
1057
1058	/*
1059	** If one of the "name" or "page" URL parameters (in that order)
1060	** is set then this function looks for page/page group-specific
1061	** CSS and (if found) appends it to pOut, else it is a no-op.
1062	*/
1063	static void page_style_css_append_page_style(Blob *pOut){
1064	const char *zPage = PD("name",P("page"));
1065	char * zFile;
1066	int nFile = 0;
1067	const char *zBuiltin;
1068
1069	if(zPage==0 \|\| zPage[0]==0){
1070	return;
1071	}
1072	zFile = mprintf("style.%s.css", zPage);
1073	zBuiltin = (const char *)builtin_file(zFile, &nFile);
1074	if(nFile>0){
1075	blob_appendf(pOut,
1076	"\n/***********************************************************\n"
1077	"** Start of page-specific CSS for page %s...\n"
1078	"***********************************************************/\n",
1079	zPage);
1080	blob_append(pOut, zBuiltin, nFile);
1081	blob_appendf(pOut,
1082	"\n/***********************************************************\n"
1083	"** End of page-specific CSS for page %s.\n"
1084	"***********************************************************/\n",
1085	zPage);
1086	fossil_free(zFile);
1087	return;
1088	}
1089	/* Potential TODO: check for aliases/page groups. e.g. group all
1090	** /forumXYZ CSS into one file, all /setupXYZ into another, etc. As
1091	** of this writing, doing so would only shave a few kb from
1092	** default.css. */
1093	fossil_free(zFile);
1094	}
1095
1096	/*
1097	** WEBPAGE: style.css
1098	**
1099	** Return the style sheet.
1100	*/
1101	void page_style_css(void){
1102	Blob css = empty_blob;
1103	int i;

1104
1105	cgi_set_content_type("text/css");
1106	/* Emit all default rules... */
1107	{
1108	const char * zDefaults = (const char*)builtin_file("default.css", &i);
1109	blob_append(&css, zDefaults, i);
1110	}
1111	page_style_css_append_page_style(&css);


























1112	blob_append(&css,
1113	"\n/***********************************************************\n"
1114	"** All CSS which follows is supplied by the repository \"skin\".\n"
1115	"***********************************************************/\n",
1116	-1);
1117

M win/Makefile.PellesCGMake

+1 -4

		--- win/Makefile.PellesCGMake
		+++ win/Makefile.PellesCGMake
		@@ -147,15 +147,12 @@
147	147
148	148	# extracting version info from manifest
149	149	VERSION.h: version.exe ..\manifest.uuid ..\manifest ..\VERSION
150	150	version.exe ..\manifest.uuid ..\manifest ..\VERSION >$@
151	151
152		-default_css.h: mkcss.exe default_css.txt
153		- mkcss.exe default_css.txt $@
154		-
155	152	# generate the simplified headers
156		-headers: makeheaders.exe page_index.h builtin_data.h default_css.h VERSION.h ../src/sqlite3.h ../src/th.h
	153	+headers: makeheaders.exe page_index.h builtin_data.h VERSION.h ../src/sqlite3.h ../src/th.h
157	154	makeheaders.exe $(foreach ts,$(TRANSLATEDSRC),$(ts):$(ts:_.c=.h)) ../src/sqlite3.h ../src/th.h VERSION.h
158	155	echo Done >$@
159	156
160	157	# compile C sources with relevant options
161	158
162	159

	--- win/Makefile.PellesCGMake
	+++ win/Makefile.PellesCGMake
	@@ -147,15 +147,12 @@
147
148	# extracting version info from manifest
149	VERSION.h: version.exe ..\manifest.uuid ..\manifest ..\VERSION
150	version.exe ..\manifest.uuid ..\manifest ..\VERSION >$@
151
152	default_css.h: mkcss.exe default_css.txt
153	mkcss.exe default_css.txt $@
154
155	# generate the simplified headers
156	headers: makeheaders.exe page_index.h builtin_data.h default_css.h VERSION.h ../src/sqlite3.h ../src/th.h
157	makeheaders.exe $(foreach ts,$(TRANSLATEDSRC),$(ts):$(ts:_.c=.h)) ../src/sqlite3.h ../src/th.h VERSION.h
158	echo Done >$@
159
160	# compile C sources with relevant options
161
162

	--- win/Makefile.PellesCGMake
	+++ win/Makefile.PellesCGMake
	@@ -147,15 +147,12 @@
147
148	# extracting version info from manifest
149	VERSION.h: version.exe ..\manifest.uuid ..\manifest ..\VERSION
150	version.exe ..\manifest.uuid ..\manifest ..\VERSION >$@
151



152	# generate the simplified headers
153	headers: makeheaders.exe page_index.h builtin_data.h VERSION.h ../src/sqlite3.h ../src/th.h
154	makeheaders.exe $(foreach ts,$(TRANSLATEDSRC),$(ts):$(ts:_.c=.h)) ../src/sqlite3.h ../src/th.h VERSION.h
155	echo Done >$@
156
157	# compile C sources with relevant options
158
159

M win/Makefile.dmc

+2 -8

		--- win/Makefile.dmc
		+++ win/Makefile.dmc
		@@ -71,13 +71,10 @@
71	71	$(BCC) -o$@ $**
72	72
73	73	mkversion$E: $(SRCDIR)\mkversion.c
74	74	$(BCC) -o$@ $**
75	75
76		-mkcss$E: $(SRCDIR)\mkcss.c
77		- $(BCC) -o$@ $**
78		-
79	76	codecheck1$E: $(SRCDIR)\codecheck1.c
80	77	$(BCC) -o$@ $**
81	78
82	79	$(OBJDIR)\shell$O : $(SRCDIR)\shell.c
83	80	$(TCC) -o$@ -c $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) $**
		@@ -95,13 +92,10 @@
95	92	cp $@ $@
96	93
97	94	VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
98	95	+$** > $@
99	96
100		-default_css.h : mkcss$E $B\src\default_css.txt
101		- +$** $B\src\default_css.txt $@
102		-
103	97	page_index.h: mkindex$E $(SRC)
104	98	+$** > $@
105	99
106	100	builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
107	101	mkbuiltin$E --prefix $(SRCDIR)/ $(EXTRA_FILES) > $@
		@@ -109,11 +103,11 @@
109	103	clean:
110	104	-del $(OBJDIR)\*.obj
111	105	-del .obj _.c .h .map
112	106
113	107	realclean:
114		- -del $(APPNAME) translate$E mkindex$E makeheaders$E mkversion$E codecheck1$E mkbuiltin$E mkcss$E
	108	+ -del $(APPNAME) translate$E mkindex$E makeheaders$E mkversion$E codecheck1$E mkbuiltin$E
115	109
116	110	$(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
117	111	$(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
118	112	$(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
119	113	$(OBJDIR)\json_config$O : $(SRCDIR)\json_detail.h
		@@ -981,8 +975,8 @@
981	975	$(TCC) -o$@ -c zip_.c
982	976
983	977	zip_.c : $(SRCDIR)\zip.c
984	978	+translate$E $** > $@
985	979
986		-headers: makeheaders$E page_index.h builtin_data.h default_css.h VERSION.h
	980	+headers: makeheaders$E page_index.h builtin_data.h VERSION.h
987	981	+makeheaders$E add_.c:add.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 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 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 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 wysiwyg_.c:wysiwyg.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
988	982	@copy /Y nul: headers
989	983

	--- win/Makefile.dmc
	+++ win/Makefile.dmc
	@@ -71,13 +71,10 @@
71	$(BCC) -o$@ $**
72
73	mkversion$E: $(SRCDIR)\mkversion.c
74	$(BCC) -o$@ $**
75
76	mkcss$E: $(SRCDIR)\mkcss.c
77	$(BCC) -o$@ $**
78
79	codecheck1$E: $(SRCDIR)\codecheck1.c
80	$(BCC) -o$@ $**
81
82	$(OBJDIR)\shell$O : $(SRCDIR)\shell.c
83	$(TCC) -o$@ -c $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) $**
	@@ -95,13 +92,10 @@
95	cp $@ $@
96
97	VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
98	+$** > $@
99
100	default_css.h : mkcss$E $B\src\default_css.txt
101	+$** $B\src\default_css.txt $@
102
103	page_index.h: mkindex$E $(SRC)
104	+$** > $@
105
106	builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
107	mkbuiltin$E --prefix $(SRCDIR)/ $(EXTRA_FILES) > $@
	@@ -109,11 +103,11 @@
109	clean:
110	-del $(OBJDIR)\*.obj
111	-del .obj _.c .h .map
112
113	realclean:
114	-del $(APPNAME) translate$E mkindex$E makeheaders$E mkversion$E codecheck1$E mkbuiltin$E mkcss$E
115
116	$(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
117	$(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
118	$(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
119	$(OBJDIR)\json_config$O : $(SRCDIR)\json_detail.h
	@@ -981,8 +975,8 @@
981	$(TCC) -o$@ -c zip_.c
982
983	zip_.c : $(SRCDIR)\zip.c
984	+translate$E $** > $@
985
986	headers: makeheaders$E page_index.h builtin_data.h default_css.h VERSION.h
987	+makeheaders$E add_.c:add.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 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 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 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 wysiwyg_.c:wysiwyg.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
988	@copy /Y nul: headers
989

	--- win/Makefile.dmc
	+++ win/Makefile.dmc
	@@ -71,13 +71,10 @@
71	$(BCC) -o$@ $**
72
73	mkversion$E: $(SRCDIR)\mkversion.c
74	$(BCC) -o$@ $**
75



76	codecheck1$E: $(SRCDIR)\codecheck1.c
77	$(BCC) -o$@ $**
78
79	$(OBJDIR)\shell$O : $(SRCDIR)\shell.c
80	$(TCC) -o$@ -c $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) $**
	@@ -95,13 +92,10 @@
92	cp $@ $@
93
94	VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
95	+$** > $@
96



97	page_index.h: mkindex$E $(SRC)
98	+$** > $@
99
100	builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
101	mkbuiltin$E --prefix $(SRCDIR)/ $(EXTRA_FILES) > $@
	@@ -109,11 +103,11 @@
103	clean:
104	-del $(OBJDIR)\*.obj
105	-del .obj _.c .h .map
106
107	realclean:
108	-del $(APPNAME) translate$E mkindex$E makeheaders$E mkversion$E codecheck1$E mkbuiltin$E
109
110	$(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
111	$(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
112	$(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
113	$(OBJDIR)\json_config$O : $(SRCDIR)\json_detail.h
	@@ -981,8 +975,8 @@
975	$(TCC) -o$@ -c zip_.c
976
977	zip_.c : $(SRCDIR)\zip.c
978	+translate$E $** > $@
979
980	headers: makeheaders$E page_index.h builtin_data.h VERSION.h
981	+makeheaders$E add_.c:add.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 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 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 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 wysiwyg_.c:wysiwyg.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
982	@copy /Y nul: headers
983

M win/Makefile.mingw

+4 -11

		--- win/Makefile.mingw
		+++ win/Makefile.mingw
		@@ -639,10 +639,11 @@
639	639	$(SRCDIR)/../skins/xekri/footer.txt \
640	640	$(SRCDIR)/../skins/xekri/header.txt \
641	641	$(SRCDIR)/accordion.js \
642	642	$(SRCDIR)/ci_edit.js \
643	643	$(SRCDIR)/copybtn.js \
	644	+ $(SRCDIR)/default.css \
644	645	$(SRCDIR)/diff.tcl \
645	646	$(SRCDIR)/forum.js \
646	647	$(SRCDIR)/fossil.bootstrap.js \
647	648	$(SRCDIR)/fossil.confirmer.js \
648	649	$(SRCDIR)/fossil.dom.js \
		@@ -983,11 +984,10 @@
983	984	TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe)
984	985	MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe)
985	986	MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe)
986	987	MKBUILTIN = $(subst /,\,$(OBJDIR)/mkbuiltin.exe)
987	988	MKVERSION = $(subst /,\,$(OBJDIR)/mkversion.exe)
988		-MKCSS = $(subst /,\,$(OBJDIR)/mkcss.exe)
989	989	CODECHECK1 = $(subst /,\,$(OBJDIR)/codecheck1.exe)
990	990	CAT = type
991	991	CP = copy
992	992	GREP = find
993	993	MV = copy
		@@ -998,11 +998,10 @@
998	998	TRANSLATE = $(OBJDIR)/translate.exe
999	999	MAKEHEADERS = $(OBJDIR)/makeheaders.exe
1000	1000	MKINDEX = $(OBJDIR)/mkindex.exe
1001	1001	MKBUILTIN = $(OBJDIR)/mkbuiltin.exe
1002	1002	MKVERSION = $(OBJDIR)/mkversion.exe
1003		-MKCSS = $(OBJDIR)/mkcss.exe
1004	1003	CODECHECK1 = $(OBJDIR)/codecheck1.exe
1005	1004	CAT = cat
1006	1005	CP = cp
1007	1006	GREP = grep
1008	1007	MV = mv
		@@ -1011,11 +1010,11 @@
1011	1010	RMDIR = rm -rf
1012	1011	endif
1013	1012
1014	1013	all: $(OBJDIR) $(APPNAME)
1015	1014
1016		-$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h $(OBJDIR)/default_css.h
	1015	+$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
1017	1016	ifdef USE_WINDOWS
1018	1017	$(CAT) $(subst /,\,$(SRCDIR)\miniz.c) \| $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h)
1019	1018	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
1020	1019	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
1021	1020	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
		@@ -1056,13 +1055,10 @@
1056	1055	$(XBCC) -o $@ $(SRCDIR)/mkbuiltin.c
1057	1056
1058	1057	$(MKVERSION): $(SRCDIR)/mkversion.c
1059	1058	$(XBCC) -o $@ $(SRCDIR)/mkversion.c
1060	1059
1061		-$(MKCSS): $(SRCDIR)/mkcss.c
1062		- $(XBCC) -o $@ $(SRCDIR)/mkcss.c
1063		-
1064	1060	$(CODECHECK1): $(SRCDIR)/codecheck1.c
1065	1061	$(XBCC) -o $@ $(SRCDIR)/codecheck1.c
1066	1062
1067	1063	# WARNING. DANGER. Running the test suite modifies the repository the
1068	1064	# build is done from, i.e. the checkout belongs to. Do not sync/push
		@@ -1071,13 +1067,10 @@
1071	1067	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
1072	1068
1073	1069	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(MKVERSION)
1074	1070	$(MKVERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$@
1075	1071
1076		-$(OBJDIR)/default_css.h: $(SRCDIR)/default_css.txt $(MKCSS)
1077		- $(MKCSS) $(SRCDIR)/default_css.txt $@
1078		-
1079	1072	# The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
1080	1073	# to 1. If it is set to 1, then there is no need to build or link
1081	1074	# the sqlite3.o object. Instead, the system SQLite will be linked
1082	1075	# using -lsqlite3.
1083	1076	SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
		@@ -1187,11 +1180,11 @@
1187	1180	$(MKINDEX) $(TRANS_SRC) >$@
1188	1181
1189	1182	$(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES)
1190	1183	$(MKBUILTIN) --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
1191	1184
1192		-$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(OBJDIR)/default_css.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h
	1185	+$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h
1193	1186	$(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
1194	1187	$(OBJDIR)/alerts_.c:$(OBJDIR)/alerts.h \
1195	1188	$(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
1196	1189	$(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
1197	1190	$(OBJDIR)/backlink_.c:$(OBJDIR)/backlink.h \
		@@ -2254,11 +2247,11 @@
2254	2247	$(OBJDIR)/statrep.h: $(OBJDIR)/headers
2255	2248
2256	2249	$(OBJDIR)/style_.c: $(SRCDIR)/style.c $(TRANSLATE)
2257	2250	$(TRANSLATE) $(SRCDIR)/style.c >$@
2258	2251
2259		-$(OBJDIR)/style.o: $(OBJDIR)/style_.c $(OBJDIR)/style.h $(OBJDIR)/default_css.h $(SRCDIR)/config.h
	2252	+$(OBJDIR)/style.o: $(OBJDIR)/style_.c $(OBJDIR)/style.h $(SRCDIR)/config.h
2260	2253	$(XTCC) -o $(OBJDIR)/style.o -c $(OBJDIR)/style_.c
2261	2254
2262	2255	$(OBJDIR)/style.h: $(OBJDIR)/headers
2263	2256
2264	2257	$(OBJDIR)/sync_.c: $(SRCDIR)/sync.c $(TRANSLATE)
2265	2258

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -639,10 +639,11 @@
639	$(SRCDIR)/../skins/xekri/footer.txt \
640	$(SRCDIR)/../skins/xekri/header.txt \
641	$(SRCDIR)/accordion.js \
642	$(SRCDIR)/ci_edit.js \
643	$(SRCDIR)/copybtn.js \

644	$(SRCDIR)/diff.tcl \
645	$(SRCDIR)/forum.js \
646	$(SRCDIR)/fossil.bootstrap.js \
647	$(SRCDIR)/fossil.confirmer.js \
648	$(SRCDIR)/fossil.dom.js \
	@@ -983,11 +984,10 @@
983	TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe)
984	MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe)
985	MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe)
986	MKBUILTIN = $(subst /,\,$(OBJDIR)/mkbuiltin.exe)
987	MKVERSION = $(subst /,\,$(OBJDIR)/mkversion.exe)
988	MKCSS = $(subst /,\,$(OBJDIR)/mkcss.exe)
989	CODECHECK1 = $(subst /,\,$(OBJDIR)/codecheck1.exe)
990	CAT = type
991	CP = copy
992	GREP = find
993	MV = copy
	@@ -998,11 +998,10 @@
998	TRANSLATE = $(OBJDIR)/translate.exe
999	MAKEHEADERS = $(OBJDIR)/makeheaders.exe
1000	MKINDEX = $(OBJDIR)/mkindex.exe
1001	MKBUILTIN = $(OBJDIR)/mkbuiltin.exe
1002	MKVERSION = $(OBJDIR)/mkversion.exe
1003	MKCSS = $(OBJDIR)/mkcss.exe
1004	CODECHECK1 = $(OBJDIR)/codecheck1.exe
1005	CAT = cat
1006	CP = cp
1007	GREP = grep
1008	MV = mv
	@@ -1011,11 +1010,11 @@
1011	RMDIR = rm -rf
1012	endif
1013
1014	all: $(OBJDIR) $(APPNAME)
1015
1016	$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h $(OBJDIR)/default_css.h
1017	ifdef USE_WINDOWS
1018	$(CAT) $(subst /,\,$(SRCDIR)\miniz.c) \| $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h)
1019	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
1020	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
1021	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
	@@ -1056,13 +1055,10 @@
1056	$(XBCC) -o $@ $(SRCDIR)/mkbuiltin.c
1057
1058	$(MKVERSION): $(SRCDIR)/mkversion.c
1059	$(XBCC) -o $@ $(SRCDIR)/mkversion.c
1060
1061	$(MKCSS): $(SRCDIR)/mkcss.c
1062	$(XBCC) -o $@ $(SRCDIR)/mkcss.c
1063
1064	$(CODECHECK1): $(SRCDIR)/codecheck1.c
1065	$(XBCC) -o $@ $(SRCDIR)/codecheck1.c
1066
1067	# WARNING. DANGER. Running the test suite modifies the repository the
1068	# build is done from, i.e. the checkout belongs to. Do not sync/push
	@@ -1071,13 +1067,10 @@
1071	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
1072
1073	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(MKVERSION)
1074	$(MKVERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$@
1075
1076	$(OBJDIR)/default_css.h: $(SRCDIR)/default_css.txt $(MKCSS)
1077	$(MKCSS) $(SRCDIR)/default_css.txt $@
1078
1079	# The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
1080	# to 1. If it is set to 1, then there is no need to build or link
1081	# the sqlite3.o object. Instead, the system SQLite will be linked
1082	# using -lsqlite3.
1083	SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
	@@ -1187,11 +1180,11 @@
1187	$(MKINDEX) $(TRANS_SRC) >$@
1188
1189	$(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES)
1190	$(MKBUILTIN) --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
1191
1192	$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(OBJDIR)/default_css.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h
1193	$(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
1194	$(OBJDIR)/alerts_.c:$(OBJDIR)/alerts.h \
1195	$(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
1196	$(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
1197	$(OBJDIR)/backlink_.c:$(OBJDIR)/backlink.h \
	@@ -2254,11 +2247,11 @@
2254	$(OBJDIR)/statrep.h: $(OBJDIR)/headers
2255
2256	$(OBJDIR)/style_.c: $(SRCDIR)/style.c $(TRANSLATE)
2257	$(TRANSLATE) $(SRCDIR)/style.c >$@
2258
2259	$(OBJDIR)/style.o: $(OBJDIR)/style_.c $(OBJDIR)/style.h $(OBJDIR)/default_css.h $(SRCDIR)/config.h
2260	$(XTCC) -o $(OBJDIR)/style.o -c $(OBJDIR)/style_.c
2261
2262	$(OBJDIR)/style.h: $(OBJDIR)/headers
2263
2264	$(OBJDIR)/sync_.c: $(SRCDIR)/sync.c $(TRANSLATE)
2265

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -639,10 +639,11 @@
639	$(SRCDIR)/../skins/xekri/footer.txt \
640	$(SRCDIR)/../skins/xekri/header.txt \
641	$(SRCDIR)/accordion.js \
642	$(SRCDIR)/ci_edit.js \
643	$(SRCDIR)/copybtn.js \
644	$(SRCDIR)/default.css \
645	$(SRCDIR)/diff.tcl \
646	$(SRCDIR)/forum.js \
647	$(SRCDIR)/fossil.bootstrap.js \
648	$(SRCDIR)/fossil.confirmer.js \
649	$(SRCDIR)/fossil.dom.js \
	@@ -983,11 +984,10 @@
984	TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe)
985	MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe)
986	MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe)
987	MKBUILTIN = $(subst /,\,$(OBJDIR)/mkbuiltin.exe)
988	MKVERSION = $(subst /,\,$(OBJDIR)/mkversion.exe)

989	CODECHECK1 = $(subst /,\,$(OBJDIR)/codecheck1.exe)
990	CAT = type
991	CP = copy
992	GREP = find
993	MV = copy
	@@ -998,11 +998,10 @@
998	TRANSLATE = $(OBJDIR)/translate.exe
999	MAKEHEADERS = $(OBJDIR)/makeheaders.exe
1000	MKINDEX = $(OBJDIR)/mkindex.exe
1001	MKBUILTIN = $(OBJDIR)/mkbuiltin.exe
1002	MKVERSION = $(OBJDIR)/mkversion.exe

1003	CODECHECK1 = $(OBJDIR)/codecheck1.exe
1004	CAT = cat
1005	CP = cp
1006	GREP = grep
1007	MV = mv
	@@ -1011,11 +1010,11 @@
1010	RMDIR = rm -rf
1011	endif
1012
1013	all: $(OBJDIR) $(APPNAME)
1014
1015	$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
1016	ifdef USE_WINDOWS
1017	$(CAT) $(subst /,\,$(SRCDIR)\miniz.c) \| $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h)
1018	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
1019	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
1020	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
	@@ -1056,13 +1055,10 @@
1055	$(XBCC) -o $@ $(SRCDIR)/mkbuiltin.c
1056
1057	$(MKVERSION): $(SRCDIR)/mkversion.c
1058	$(XBCC) -o $@ $(SRCDIR)/mkversion.c
1059



1060	$(CODECHECK1): $(SRCDIR)/codecheck1.c
1061	$(XBCC) -o $@ $(SRCDIR)/codecheck1.c
1062
1063	# WARNING. DANGER. Running the test suite modifies the repository the
1064	# build is done from, i.e. the checkout belongs to. Do not sync/push
	@@ -1071,13 +1067,10 @@
1067	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
1068
1069	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(MKVERSION)
1070	$(MKVERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$@
1071



1072	# The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
1073	# to 1. If it is set to 1, then there is no need to build or link
1074	# the sqlite3.o object. Instead, the system SQLite will be linked
1075	# using -lsqlite3.
1076	SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
	@@ -1187,11 +1180,11 @@
1180	$(MKINDEX) $(TRANS_SRC) >$@
1181
1182	$(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES)
1183	$(MKBUILTIN) --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
1184
1185	$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h
1186	$(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
1187	$(OBJDIR)/alerts_.c:$(OBJDIR)/alerts.h \
1188	$(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
1189	$(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
1190	$(OBJDIR)/backlink_.c:$(OBJDIR)/backlink.h \
	@@ -2254,11 +2247,11 @@
2247	$(OBJDIR)/statrep.h: $(OBJDIR)/headers
2248
2249	$(OBJDIR)/style_.c: $(SRCDIR)/style.c $(TRANSLATE)
2250	$(TRANSLATE) $(SRCDIR)/style.c >$@
2251
2252	$(OBJDIR)/style.o: $(OBJDIR)/style_.c $(OBJDIR)/style.h $(SRCDIR)/config.h
2253	$(XTCC) -o $(OBJDIR)/style.o -c $(OBJDIR)/style_.c
2254
2255	$(OBJDIR)/style.h: $(OBJDIR)/headers
2256
2257	$(OBJDIR)/sync_.c: $(SRCDIR)/sync.c $(TRANSLATE)
2258

M win/Makefile.msc

+2 -9

		--- win/Makefile.msc
		+++ win/Makefile.msc
		@@ -546,10 +546,11 @@
546	546	$(SRCDIR)\..\skins\xekri\footer.txt \
547	547	$(SRCDIR)\..\skins\xekri\header.txt \
548	548	$(SRCDIR)\accordion.js \
549	549	$(SRCDIR)\ci_edit.js \
550	550	$(SRCDIR)\copybtn.js \
	551	+ $(SRCDIR)\default.css \
551	552	$(SRCDIR)\diff.tcl \
552	553	$(SRCDIR)\forum.js \
553	554	$(SRCDIR)\fossil.bootstrap.js \
554	555	$(SRCDIR)\fossil.confirmer.js \
555	556	$(SRCDIR)\fossil.dom.js \
		@@ -963,13 +964,10 @@
963	964	$(BCC) $**
964	965
965	966	mkversion$E: $(SRCDIR)\mkversion.c
966	967	$(BCC) $**
967	968
968		-mkcss$E: $(SRCDIR)\mkcss.c
969		- $(BCC) $**
970		-
971	969	codecheck1$E: $(SRCDIR)\codecheck1.c
972	970	$(BCC) $**
973	971
974	972	!if $(USE_SEE)!=0
975	973	SEE_FLAGS = /DSQLITE_HAS_CODEC=1 /DSQLITE_SHELL_DBKEY_PROC=fossil_key
		@@ -1003,13 +1001,10 @@
1003	1001	$** > $@
1004	1002
1005	1003	$(OX)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.c
1006	1004	$(TCC) /Fo$@ /c $**
1007	1005
1008		-default_css.h: mkcss$E $(SRCDIR)\default_css.txt
1009		- $** $@
1010		-
1011	1006	page_index.h: mkindex$E $(SRC)
1012	1007	$** > $@
1013	1008
1014	1009	builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
1015	1010	mkbuiltin$E --prefix $(SRCDIR)/ $(EXTRA_FILES) > $@
		@@ -1035,12 +1030,10 @@
1035	1030	-del mkindex$P 2>NUL
1036	1031	-del makeheaders$E 2>NUL
1037	1032	-del makeheaders$P 2>NUL
1038	1033	-del mkversion$E 2>NUL
1039	1034	-del mkversion$P 2>NUL
1040		- -del mkcss$E 2>NUL
1041		- -del mkcss$P 2>NUL
1042	1035	-del codecheck1$E 2>NUL
1043	1036	-del codecheck1$P 2>NUL
1044	1037	-del mkbuiltin$E 2>NUL
1045	1038	-del mkbuiltin$P 2>NUL
1046	1039
		@@ -1913,11 +1906,11 @@
1913	1906	translate$E $** > $@
1914	1907
1915	1908	fossil.res : $B\win\fossil.rc
1916	1909	$(RCC) /fo $@ $**
1917	1910
1918		-headers: makeheaders$E page_index.h builtin_data.h default_css.h VERSION.h
	1911	+headers: makeheaders$E page_index.h builtin_data.h VERSION.h
1919	1912	makeheaders$E add_.c:add.h \
1920	1913	alerts_.c:alerts.h \
1921	1914	allrepo_.c:allrepo.h \
1922	1915	attach_.c:attach.h \
1923	1916	backlink_.c:backlink.h \
1924	1917

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -546,10 +546,11 @@
546	$(SRCDIR)\..\skins\xekri\footer.txt \
547	$(SRCDIR)\..\skins\xekri\header.txt \
548	$(SRCDIR)\accordion.js \
549	$(SRCDIR)\ci_edit.js \
550	$(SRCDIR)\copybtn.js \

551	$(SRCDIR)\diff.tcl \
552	$(SRCDIR)\forum.js \
553	$(SRCDIR)\fossil.bootstrap.js \
554	$(SRCDIR)\fossil.confirmer.js \
555	$(SRCDIR)\fossil.dom.js \
	@@ -963,13 +964,10 @@
963	$(BCC) $**
964
965	mkversion$E: $(SRCDIR)\mkversion.c
966	$(BCC) $**
967
968	mkcss$E: $(SRCDIR)\mkcss.c
969	$(BCC) $**
970
971	codecheck1$E: $(SRCDIR)\codecheck1.c
972	$(BCC) $**
973
974	!if $(USE_SEE)!=0
975	SEE_FLAGS = /DSQLITE_HAS_CODEC=1 /DSQLITE_SHELL_DBKEY_PROC=fossil_key
	@@ -1003,13 +1001,10 @@
1003	$** > $@
1004
1005	$(OX)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.c
1006	$(TCC) /Fo$@ /c $**
1007
1008	default_css.h: mkcss$E $(SRCDIR)\default_css.txt
1009	$** $@
1010
1011	page_index.h: mkindex$E $(SRC)
1012	$** > $@
1013
1014	builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
1015	mkbuiltin$E --prefix $(SRCDIR)/ $(EXTRA_FILES) > $@
	@@ -1035,12 +1030,10 @@
1035	-del mkindex$P 2>NUL
1036	-del makeheaders$E 2>NUL
1037	-del makeheaders$P 2>NUL
1038	-del mkversion$E 2>NUL
1039	-del mkversion$P 2>NUL
1040	-del mkcss$E 2>NUL
1041	-del mkcss$P 2>NUL
1042	-del codecheck1$E 2>NUL
1043	-del codecheck1$P 2>NUL
1044	-del mkbuiltin$E 2>NUL
1045	-del mkbuiltin$P 2>NUL
1046
	@@ -1913,11 +1906,11 @@
1913	translate$E $** > $@
1914
1915	fossil.res : $B\win\fossil.rc
1916	$(RCC) /fo $@ $**
1917
1918	headers: makeheaders$E page_index.h builtin_data.h default_css.h VERSION.h
1919	makeheaders$E add_.c:add.h \
1920	alerts_.c:alerts.h \
1921	allrepo_.c:allrepo.h \
1922	attach_.c:attach.h \
1923	backlink_.c:backlink.h \
1924

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -546,10 +546,11 @@
546	$(SRCDIR)\..\skins\xekri\footer.txt \
547	$(SRCDIR)\..\skins\xekri\header.txt \
548	$(SRCDIR)\accordion.js \
549	$(SRCDIR)\ci_edit.js \
550	$(SRCDIR)\copybtn.js \
551	$(SRCDIR)\default.css \
552	$(SRCDIR)\diff.tcl \
553	$(SRCDIR)\forum.js \
554	$(SRCDIR)\fossil.bootstrap.js \
555	$(SRCDIR)\fossil.confirmer.js \
556	$(SRCDIR)\fossil.dom.js \
	@@ -963,13 +964,10 @@
964	$(BCC) $**
965
966	mkversion$E: $(SRCDIR)\mkversion.c
967	$(BCC) $**
968



969	codecheck1$E: $(SRCDIR)\codecheck1.c
970	$(BCC) $**
971
972	!if $(USE_SEE)!=0
973	SEE_FLAGS = /DSQLITE_HAS_CODEC=1 /DSQLITE_SHELL_DBKEY_PROC=fossil_key
	@@ -1003,13 +1001,10 @@
1001	$** > $@
1002
1003	$(OX)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.c
1004	$(TCC) /Fo$@ /c $**
1005



1006	page_index.h: mkindex$E $(SRC)
1007	$** > $@
1008
1009	builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
1010	mkbuiltin$E --prefix $(SRCDIR)/ $(EXTRA_FILES) > $@
	@@ -1035,12 +1030,10 @@
1030	-del mkindex$P 2>NUL
1031	-del makeheaders$E 2>NUL
1032	-del makeheaders$P 2>NUL
1033	-del mkversion$E 2>NUL
1034	-del mkversion$P 2>NUL


1035	-del codecheck1$E 2>NUL
1036	-del codecheck1$P 2>NUL
1037	-del mkbuiltin$E 2>NUL
1038	-del mkbuiltin$P 2>NUL
1039
	@@ -1913,11 +1906,11 @@
1906	translate$E $** > $@
1907
1908	fossil.res : $B\win\fossil.rc
1909	$(RCC) /fo $@ $**
1910
1911	headers: makeheaders$E page_index.h builtin_data.h VERSION.h
1912	makeheaders$E add_.c:add.h \
1913	alerts_.c:alerts.h \
1914	allrepo_.c:allrepo.h \
1915	attach_.c:attach.h \
1916	backlink_.c:backlink.h \
1917

Fossil SCM

Keyboard Shortcuts