Fossil SCM

Merged in default.css branch: move default_css.txt to default.css (compiled in as-is as a builtin) and eliminate the no-longer-relevant mkcss tool. The over-the-wire size increase for the no-longer-stripped CSS is less than 1kb.

stephan 2020-06-14 05:37 trunk merge
Commit 8eec01d419508de90c844457eb0e8dd363d90b81efdbc6fdf77706c8c539401a
Parent 3c7825278bb42ef…
13 files changed +3 -28 +12 -37 +3 -8 +7 -37 -168 -46 +43 -56 +43 -56 +1 -4 +2 -9 +4 -11 +2 -6
~ src/default.css + src/default.css - src/default_css.txt ~ src/main.mk ~ src/makemake.tcl - src/mkcss.c ~ src/skins.c ~ src/style.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;*/
103
 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;*/
114
 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;*/
125
 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 @@
169
 It's currently intentionally set low for
1710
 demonstration purposes. */PostBody Selinput[type=checkbar */ margin: 0ov:margin: 0.2em 0 0solz-index: -1;
1811
 }
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
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
A src/default.css
+12
--- a/src/default.css
+++ b/src/default.css
@@ -0,0 +1,12 @@
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;*/
6
+ 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{
7
+ align-self: flex20em /* Posts which overflow this value get an
8
+ Expand/Collapse toggle injected at page-load.
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
--- a/src/default.css
+++ b/src/default.css
@@ -0,0 +1,12 @@
 
 
 
 
 
 
 
 
 
 
 
 
--- a/src/default.css
+++ b/src/default.css
@@ -0,0 +1,12 @@
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;*/
6 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{
7 align-self: flex20em /* Posts which overflow this value get an
8 Expand/Collapse toggle injected at page-load.
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
@@ -218,10 +218,11 @@
218218
 $(SRCDIR)/../skins/xekri/footer.txt \
219219
 $(SRCDIR)/../skins/xekri/header.txt \
220220
 $(SRCDIR)/accordion.js \
221221
 $(SRCDIR)/ci_edit.js \
222222
 $(SRCDIR)/copybtn.js \
223
+ $(SRCDIR)/default.css \
223224
 $(SRCDIR)/diff.tcl \
224225
 $(SRCDIR)/forum.js \
225226
 $(SRCDIR)/fossil.bootstrap.js \
226227
 $(SRCDIR)/fossil.confirmer.js \
227228
 $(SRCDIR)/fossil.dom.js \
@@ -574,13 +575,10 @@
574575
 $(XBCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR)/mkbuiltin.c
575576
576577
 $(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c
577578
 $(XBCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
578579
579
-$(OBJDIR)/mkcss: $(SRCDIR)/mkcss.c
580
- $(XBCC) -o $(OBJDIR)/mkcss $(SRCDIR)/mkcss.c
581
-
582580
 $(OBJDIR)/codecheck1: $(SRCDIR)/codecheck1.c
583581
 $(XBCC) -o $(OBJDIR)/codecheck1 $(SRCDIR)/codecheck1.c
584582
585583
 # Run the test suite.
586584
 # Other flags that can be included in TESTFLAGS are:
@@ -599,13 +597,10 @@
599597
 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) $(TESTFLAGS)
600598
601599
 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
602600
 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
603601
604
-$(OBJDIR)/default_css.h: $(SRCDIR)/default_css.txt $(OBJDIR)/mkcss
605
- $(OBJDIR)/mkcss $(SRCDIR)/default_css.txt $(OBJDIR)/default_css.h
606
-
607602
 # Setup the options used to compile the included SQLite library.
608603
 SQLITE_OPTIONS = -DNDEBUG=1 \
609604
 -DSQLITE_DQS=0 \
610605
 -DSQLITE_THREADSAFE=0 \
611606
 -DSQLITE_DEFAULT_MEMSTATUS=0 \
@@ -741,11 +736,11 @@
741736
 $(OBJDIR)/mkindex $(TRANS_SRC) >$@
742737
743738
 $(OBJDIR)/builtin_data.h: $(OBJDIR)/mkbuiltin $(EXTRA_FILES)
744739
 $(OBJDIR)/mkbuiltin --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
745740
746
-$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(OBJDIR)/default_css.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
741
+$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
747742
 $(OBJDIR)/makeheaders $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
748743
 $(OBJDIR)/ajax_.c:$(OBJDIR)/ajax.h \
749744
 $(OBJDIR)/alerts_.c:$(OBJDIR)/alerts.h \
750745
 $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
751746
 $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
@@ -1815,11 +1810,11 @@
18151810
 $(OBJDIR)/statrep.h: $(OBJDIR)/headers
18161811
18171812
 $(OBJDIR)/style_.c: $(SRCDIR)/style.c $(OBJDIR)/translate
18181813
 $(OBJDIR)/translate $(SRCDIR)/style.c >$@
18191814
1820
-$(OBJDIR)/style.o: $(OBJDIR)/style_.c $(OBJDIR)/style.h $(OBJDIR)/default_css.h $(SRCDIR)/config.h
1815
+$(OBJDIR)/style.o: $(OBJDIR)/style_.c $(OBJDIR)/style.h $(SRCDIR)/config.h
18211816
 $(XTCC) -o $(OBJDIR)/style.o -c $(OBJDIR)/style_.c
18221817
18231818
 $(OBJDIR)/style.h: $(OBJDIR)/headers
18241819
18251820
 $(OBJDIR)/sync_.c: $(SRCDIR)/sync.c $(OBJDIR)/translate
18261821
--- src/main.mk
+++ src/main.mk
@@ -218,10 +218,11 @@
218 $(SRCDIR)/../skins/xekri/footer.txt \
219 $(SRCDIR)/../skins/xekri/header.txt \
220 $(SRCDIR)/accordion.js \
221 $(SRCDIR)/ci_edit.js \
222 $(SRCDIR)/copybtn.js \
 
223 $(SRCDIR)/diff.tcl \
224 $(SRCDIR)/forum.js \
225 $(SRCDIR)/fossil.bootstrap.js \
226 $(SRCDIR)/fossil.confirmer.js \
227 $(SRCDIR)/fossil.dom.js \
@@ -574,13 +575,10 @@
574 $(XBCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR)/mkbuiltin.c
575
576 $(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c
577 $(XBCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
578
579 $(OBJDIR)/mkcss: $(SRCDIR)/mkcss.c
580 $(XBCC) -o $(OBJDIR)/mkcss $(SRCDIR)/mkcss.c
581
582 $(OBJDIR)/codecheck1: $(SRCDIR)/codecheck1.c
583 $(XBCC) -o $(OBJDIR)/codecheck1 $(SRCDIR)/codecheck1.c
584
585 # Run the test suite.
586 # Other flags that can be included in TESTFLAGS are:
@@ -599,13 +597,10 @@
599 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) $(TESTFLAGS)
600
601 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
602 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
603
604 $(OBJDIR)/default_css.h: $(SRCDIR)/default_css.txt $(OBJDIR)/mkcss
605 $(OBJDIR)/mkcss $(SRCDIR)/default_css.txt $(OBJDIR)/default_css.h
606
607 # Setup the options used to compile the included SQLite library.
608 SQLITE_OPTIONS = -DNDEBUG=1 \
609 -DSQLITE_DQS=0 \
610 -DSQLITE_THREADSAFE=0 \
611 -DSQLITE_DEFAULT_MEMSTATUS=0 \
@@ -741,11 +736,11 @@
741 $(OBJDIR)/mkindex $(TRANS_SRC) >$@
742
743 $(OBJDIR)/builtin_data.h: $(OBJDIR)/mkbuiltin $(EXTRA_FILES)
744 $(OBJDIR)/mkbuiltin --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
745
746 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(OBJDIR)/default_css.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
747 $(OBJDIR)/makeheaders $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
748 $(OBJDIR)/ajax_.c:$(OBJDIR)/ajax.h \
749 $(OBJDIR)/alerts_.c:$(OBJDIR)/alerts.h \
750 $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
751 $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
@@ -1815,11 +1810,11 @@
1815 $(OBJDIR)/statrep.h: $(OBJDIR)/headers
1816
1817 $(OBJDIR)/style_.c: $(SRCDIR)/style.c $(OBJDIR)/translate
1818 $(OBJDIR)/translate $(SRCDIR)/style.c >$@
1819
1820 $(OBJDIR)/style.o: $(OBJDIR)/style_.c $(OBJDIR)/style.h $(OBJDIR)/default_css.h $(SRCDIR)/config.h
1821 $(XTCC) -o $(OBJDIR)/style.o -c $(OBJDIR)/style_.c
1822
1823 $(OBJDIR)/style.h: $(OBJDIR)/headers
1824
1825 $(OBJDIR)/sync_.c: $(SRCDIR)/sync.c $(OBJDIR)/translate
1826
--- src/main.mk
+++ src/main.mk
@@ -218,10 +218,11 @@
218 $(SRCDIR)/../skins/xekri/footer.txt \
219 $(SRCDIR)/../skins/xekri/header.txt \
220 $(SRCDIR)/accordion.js \
221 $(SRCDIR)/ci_edit.js \
222 $(SRCDIR)/copybtn.js \
223 $(SRCDIR)/default.css \
224 $(SRCDIR)/diff.tcl \
225 $(SRCDIR)/forum.js \
226 $(SRCDIR)/fossil.bootstrap.js \
227 $(SRCDIR)/fossil.confirmer.js \
228 $(SRCDIR)/fossil.dom.js \
@@ -574,13 +575,10 @@
575 $(XBCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR)/mkbuiltin.c
576
577 $(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c
578 $(XBCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
579
 
 
 
580 $(OBJDIR)/codecheck1: $(SRCDIR)/codecheck1.c
581 $(XBCC) -o $(OBJDIR)/codecheck1 $(SRCDIR)/codecheck1.c
582
583 # Run the test suite.
584 # Other flags that can be included in TESTFLAGS are:
@@ -599,13 +597,10 @@
597 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) $(TESTFLAGS)
598
599 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
600 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
601
 
 
 
602 # Setup the options used to compile the included SQLite library.
603 SQLITE_OPTIONS = -DNDEBUG=1 \
604 -DSQLITE_DQS=0 \
605 -DSQLITE_THREADSAFE=0 \
606 -DSQLITE_DEFAULT_MEMSTATUS=0 \
@@ -741,11 +736,11 @@
736 $(OBJDIR)/mkindex $(TRANS_SRC) >$@
737
738 $(OBJDIR)/builtin_data.h: $(OBJDIR)/mkbuiltin $(EXTRA_FILES)
739 $(OBJDIR)/mkbuiltin --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
740
741 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
742 $(OBJDIR)/makeheaders $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
743 $(OBJDIR)/ajax_.c:$(OBJDIR)/ajax.h \
744 $(OBJDIR)/alerts_.c:$(OBJDIR)/alerts.h \
745 $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
746 $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
@@ -1815,11 +1810,11 @@
1810 $(OBJDIR)/statrep.h: $(OBJDIR)/headers
1811
1812 $(OBJDIR)/style_.c: $(SRCDIR)/style.c $(OBJDIR)/translate
1813 $(OBJDIR)/translate $(SRCDIR)/style.c >$@
1814
1815 $(OBJDIR)/style.o: $(OBJDIR)/style_.c $(OBJDIR)/style.h $(SRCDIR)/config.h
1816 $(XTCC) -o $(OBJDIR)/style.o -c $(OBJDIR)/style_.c
1817
1818 $(OBJDIR)/style.h: $(OBJDIR)/headers
1819
1820 $(OBJDIR)/sync_.c: $(SRCDIR)/sync.c $(OBJDIR)/translate
1821
M src/makemake.tcl
+7 -37
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -177,10 +177,11 @@
177177
 set extra_files {
178178
 diff.tcl
179179
 markdown.md
180180
 wiki.wiki
181181
 *.js
182
+ default.css
182183
 style.*.css
183184
 ../skins/*/*.txt
184185
 sounds/*.wav
185186
 }
186187
@@ -349,13 +350,10 @@
349350
 $(XBCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR)/mkbuiltin.c
350351
351352
 $(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c
352353
 $(XBCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
353354
354
-$(OBJDIR)/mkcss: $(SRCDIR)/mkcss.c
355
- $(XBCC) -o $(OBJDIR)/mkcss $(SRCDIR)/mkcss.c
356
-
357355
 $(OBJDIR)/codecheck1: $(SRCDIR)/codecheck1.c
358356
 $(XBCC) -o $(OBJDIR)/codecheck1 $(SRCDIR)/codecheck1.c
359357
360358
 # Run the test suite.
361359
 # Other flags that can be included in TESTFLAGS are:
@@ -376,13 +374,10 @@
376374
 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
377375
 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \
378376
 $(SRCDIR)/../manifest \
379377
 $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
380378
381
-$(OBJDIR)/default_css.h: $(SRCDIR)/default_css.txt $(OBJDIR)/mkcss
382
- $(OBJDIR)/mkcss $(SRCDIR)/default_css.txt $(OBJDIR)/default_css.h
383
-
384379
 # Setup the options used to compile the included SQLite library.
385380
 SQLITE_OPTIONS = <<<SQLITE_OPTIONS>>>
386381
387382
 # Setup the options used to compile the included SQLite shell.
388383
 SHELL_OPTIONS = <<<SHELL_OPTIONS>>>
@@ -475,20 +470,19 @@
475470
 writeln "\t\$(OBJDIR)/mkindex \$(TRANS_SRC) >\$@\n"
476471
477472
 writeln "\$(OBJDIR)/builtin_data.h: \$(OBJDIR)/mkbuiltin \$(EXTRA_FILES)"
478473
 writeln "\t\$(OBJDIR)/mkbuiltin --prefix \$(SRCDIR)/ \$(EXTRA_FILES) >\$@\n"
479474
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"
481476
 writeln "\t\$(OBJDIR)/makeheaders $mhargs"
482477
 writeln "\ttouch \$(OBJDIR)/headers"
483478
 writeln "\$(OBJDIR)/headers: Makefile"
484479
 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"
485480
486481
 writeln "Makefile:"
487482
 set extra_h(dispatch) " \$(OBJDIR)/page_index.h "
488483
 set extra_h(builtin) " \$(OBJDIR)/builtin_data.h "
489
-set extra_h(style) " \$(OBJDIR)/default_css.h "
490484
491485
 foreach s [lsort $src] {
492486
 writeln "\$(OBJDIR)/${s}_.c:\t\$(SRCDIR)/$s.c \$(OBJDIR)/translate"
493487
 writeln "\t\$(OBJDIR)/translate \$(SRCDIR)/$s.c >\$@\n"
494488
 writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h$extra_h($s)\$(SRCDIR)/config.h"
@@ -1015,11 +1009,10 @@
10151009
 TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe)
10161010
 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe)
10171011
 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe)
10181012
 MKBUILTIN = $(subst /,\,$(OBJDIR)/mkbuiltin.exe)
10191013
 MKVERSION = $(subst /,\,$(OBJDIR)/mkversion.exe)
1020
-MKCSS = $(subst /,\,$(OBJDIR)/mkcss.exe)
10211014
 CODECHECK1 = $(subst /,\,$(OBJDIR)/codecheck1.exe)
10221015
 CAT = type
10231016
 CP = copy
10241017
 GREP = find
10251018
 MV = copy
@@ -1030,11 +1023,10 @@
10301023
 TRANSLATE = $(OBJDIR)/translate.exe
10311024
 MAKEHEADERS = $(OBJDIR)/makeheaders.exe
10321025
 MKINDEX = $(OBJDIR)/mkindex.exe
10331026
 MKBUILTIN = $(OBJDIR)/mkbuiltin.exe
10341027
 MKVERSION = $(OBJDIR)/mkversion.exe
1035
-MKCSS = $(OBJDIR)/mkcss.exe
10361028
 CODECHECK1 = $(OBJDIR)/codecheck1.exe
10371029
 CAT = cat
10381030
 CP = cp
10391031
 GREP = grep
10401032
 MV = mv
@@ -1044,11 +1036,11 @@
10441036
 endif}
10451037
10461038
 writeln {
10471039
 all: $(OBJDIR) $(APPNAME)
10481040
1049
-$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h $(OBJDIR)/default_css.h
1041
+$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
10501042
 ifdef USE_WINDOWS
10511043
 $(CAT) $(subst /,\,$(SRCDIR)\miniz.c) | $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h)
10521044
 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
10531045
 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
10541046
 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
@@ -1089,13 +1081,10 @@
10891081
 $(XBCC) -o $@ $(SRCDIR)/mkbuiltin.c
10901082
10911083
 $(MKVERSION): $(SRCDIR)/mkversion.c
10921084
 $(XBCC) -o $@ $(SRCDIR)/mkversion.c
10931085
1094
-$(MKCSS): $(SRCDIR)/mkcss.c
1095
- $(XBCC) -o $@ $(SRCDIR)/mkcss.c
1096
-
10971086
 $(CODECHECK1): $(SRCDIR)/codecheck1.c
10981087
 $(XBCC) -o $@ $(SRCDIR)/codecheck1.c
10991088
11001089
 # WARNING. DANGER. Running the test suite modifies the repository the
11011090
 # build is done from, i.e. the checkout belongs to. Do not sync/push
@@ -1104,13 +1093,10 @@
11041093
 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
11051094
11061095
 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(MKVERSION)
11071096
 $(MKVERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$@
11081097
1109
-$(OBJDIR)/default_css.h: $(SRCDIR)/default_css.txt $(MKCSS)
1110
- $(MKCSS) $(SRCDIR)/default_css.txt $@
1111
-
11121098
 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
11131099
 # to 1. If it is set to 1, then there is no need to build or link
11141100
 # the sqlite3.o object. Instead, the system SQLite will be linked
11151101
 # using -lsqlite3.
11161102
 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
@@ -1232,18 +1218,17 @@
12321218
 writeln "\t\$(MKINDEX) \$(TRANS_SRC) >\$@\n"
12331219
12341220
 writeln "\$(OBJDIR)/builtin_data.h:\t\$(MKBUILTIN) \$(EXTRA_FILES)"
12351221
 writeln "\t\$(MKBUILTIN) --prefix \$(SRCDIR)/ \$(EXTRA_FILES) >\$@\n"
12361222
1237
-writeln "\$(OBJDIR)/headers:\t\$(OBJDIR)/page_index.h \$(OBJDIR)/builtin_data.h \$(OBJDIR)/default_css.h \$(MAKEHEADERS) \$(OBJDIR)/VERSION.h"
1223
+writeln "\$(OBJDIR)/headers:\t\$(OBJDIR)/page_index.h \$(OBJDIR)/builtin_data.h \$(MAKEHEADERS) \$(OBJDIR)/VERSION.h"
12381224
 writeln "\t\$(MAKEHEADERS) $mhargs"
12391225
 writeln "\techo Done >\$(OBJDIR)/headers\n"
12401226
 writeln "\$(OBJDIR)/headers: Makefile\n"
12411227
 writeln "Makefile:\n"
12421228
 set extra_h(main) " \$(OBJDIR)/page_index.h "
12431229
 set extra_h(builtin) " \$(OBJDIR)/builtin_data.h "
1244
-set extra_h(style) " \$(OBJDIR)/default_css.h "
12451230
12461231
 foreach s [lsort $src] {
12471232
 writeln "\$(OBJDIR)/${s}_.c:\t\$(SRCDIR)/$s.c \$(TRANSLATE)"
12481233
 writeln "\t\$(TRANSLATE) \$(SRCDIR)/$s.c >\$@\n"
12491234
 writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h$extra_h($s)\$(SRCDIR)/config.h"
@@ -1389,13 +1374,10 @@
13891374
 $(BCC) -o$@ $**
13901375
13911376
 mkversion$E: $(SRCDIR)\mkversion.c
13921377
 $(BCC) -o$@ $**
13931378
1394
-mkcss$E: $(SRCDIR)\mkcss.c
1395
- $(BCC) -o$@ $**
1396
-
13971379
 codecheck1$E: $(SRCDIR)\codecheck1.c
13981380
 $(BCC) -o$@ $**
13991381
14001382
 $(OBJDIR)\shell$O : $(SRCDIR)\shell.c
14011383
 $(TCC) -o$@ -c $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) $**
@@ -1413,13 +1395,10 @@
14131395
 cp $@ $@
14141396
14151397
 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
14161398
 +$** > $@
14171399
1418
-default_css.h : mkcss$E $B\src\default_css.txt
1419
- +$** $B\src\default_css.txt $@
1420
-
14211400
 page_index.h: mkindex$E $(SRC)
14221401
 +$** > $@
14231402
14241403
 builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
14251404
 mkbuiltin$E --prefix $(SRCDIR)/ $(EXTRA_FILES) > $@
@@ -1427,11 +1406,11 @@
14271406
 clean:
14281407
 -del $(OBJDIR)\*.obj
14291408
 -del *.obj *_.c *.h *.map
14301409
14311410
 realclean:
1432
- -del $(APPNAME) translate$E mkindex$E makeheaders$E mkversion$E codecheck1$E mkbuiltin$E mkcss$E
1411
+ -del $(APPNAME) translate$E mkindex$E makeheaders$E mkversion$E codecheck1$E mkbuiltin$E
14331412
14341413
 $(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
14351414
 $(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
14361415
 $(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
14371416
 $(OBJDIR)\json_config$O : $(SRCDIR)\json_detail.h
@@ -1453,11 +1432,11 @@
14531432
 writeln "\t\$(TCC) -o\$@ -c ${s}_.c\n"
14541433
 writeln "${s}_.c : \$(SRCDIR)\\$s.c"
14551434
 writeln "\t+translate\$E \$** > \$@\n"
14561435
 }
14571436
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 "
14591438
 foreach s [lsort $src] {
14601439
 writeln -nonewline "${s}_.c:$s.h "
14611440
 }
14621441
 writeln "\$(SRCDIR)\\sqlite3.h \$(SRCDIR)\\th.h VERSION.h \$(SRCDIR)\\cson_amalgamation.h"
14631442
 writeln "\t@copy /Y nul: headers"
@@ -1916,13 +1895,10 @@
19161895
 $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
19171896
19181897
 "$(OBJDIR)\mkversion$E": "$(SRCDIR)\mkversion.c"
19191898
 $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
19201899
1921
-"$(OBJDIR)\mkcss$E": "$(SRCDIR)\mkcss.c"
1922
- $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1923
-
19241900
 "$(OBJDIR)\codecheck1$E": "$(SRCDIR)\codecheck1.c"
19251901
 $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
19261902
19271903
 !if $(USE_SEE)!=0
19281904
 SEE_FLAGS = /DSQLITE_HAS_CODEC=1 /DSQLITE_SHELL_DBKEY_PROC=fossil_key
@@ -1956,13 +1932,10 @@
19561932
 $** > $@
19571933
19581934
 "$(OX)\cson_amalgamation$O" : "$(SRCDIR)\cson_amalgamation.c"
19591935
 $(TCC) /Fo$@ /Fd$(@D)\ -c $**
19601936
1961
-"$(OX)\default_css.h": "$(OBJDIR)\mkcss$E" "$(SRCDIR)\default_css.txt"
1962
- $** $@
1963
-
19641937
 "$(OX)\page_index.h": "$(OBJDIR)\mkindex$E" $(SRC)
19651938
 $** > $@
19661939
19671940
 "$(OX)\builtin_data.h": "$(OBJDIR)\mkbuiltin$E" "$(OX)\builtin_data.reslist"
19681941
 "$(OBJDIR)\mkbuiltin$E" --prefix "$(SRCDIR)/" --reslist "$(OX)\builtin_data.reslist" > $@
@@ -2215,15 +2188,12 @@
22152188
22162189
 # extracting version info from manifest
22172190
 VERSION.h: version.exe ..\manifest.uuid ..\manifest ..\VERSION
22182191
 version.exe ..\manifest.uuid ..\manifest ..\VERSION >$@
22192192
2220
-default_css.h: mkcss.exe default_css.txt
2221
- mkcss.exe default_css.txt $@
2222
-
22232193
 # generate the simplified headers
2224
-headers: makeheaders.exe page_index.h builtin_data.h default_css.h VERSION.h ../src/sqlite3.h ../src/th.h
2194
+headers: makeheaders.exe page_index.h builtin_data.h VERSION.h ../src/sqlite3.h ../src/th.h
22252195
 makeheaders.exe $(foreach ts,$(TRANSLATEDSRC),$(ts):$(ts:_.c=.h)) ../src/sqlite3.h ../src/th.h VERSION.h
22262196
 echo Done >$@
22272197
22282198
 # compile C sources with relevant options
22292199
22302200
22312201
DELETED src/mkcss.c
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -177,10 +177,11 @@
177 set extra_files {
178 diff.tcl
179 markdown.md
180 wiki.wiki
181 *.js
 
182 style.*.css
183 ../skins/*/*.txt
184 sounds/*.wav
185 }
186
@@ -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,20 +470,19 @@
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
486 writeln "Makefile:"
487 set extra_h(dispatch) " \$(OBJDIR)/page_index.h "
488 set extra_h(builtin) " \$(OBJDIR)/builtin_data.h "
489 set extra_h(style) " \$(OBJDIR)/default_css.h "
490
491 foreach s [lsort $src] {
492 writeln "\$(OBJDIR)/${s}_.c:\t\$(SRCDIR)/$s.c \$(OBJDIR)/translate"
493 writeln "\t\$(OBJDIR)/translate \$(SRCDIR)/$s.c >\$@\n"
494 writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h$extra_h($s)\$(SRCDIR)/config.h"
@@ -1015,11 +1009,10 @@
1015 TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe)
1016 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe)
1017 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe)
1018 MKBUILTIN = $(subst /,\,$(OBJDIR)/mkbuiltin.exe)
1019 MKVERSION = $(subst /,\,$(OBJDIR)/mkversion.exe)
1020 MKCSS = $(subst /,\,$(OBJDIR)/mkcss.exe)
1021 CODECHECK1 = $(subst /,\,$(OBJDIR)/codecheck1.exe)
1022 CAT = type
1023 CP = copy
1024 GREP = find
1025 MV = copy
@@ -1030,11 +1023,10 @@
1030 TRANSLATE = $(OBJDIR)/translate.exe
1031 MAKEHEADERS = $(OBJDIR)/makeheaders.exe
1032 MKINDEX = $(OBJDIR)/mkindex.exe
1033 MKBUILTIN = $(OBJDIR)/mkbuiltin.exe
1034 MKVERSION = $(OBJDIR)/mkversion.exe
1035 MKCSS = $(OBJDIR)/mkcss.exe
1036 CODECHECK1 = $(OBJDIR)/codecheck1.exe
1037 CAT = cat
1038 CP = cp
1039 GREP = grep
1040 MV = mv
@@ -1044,11 +1036,11 @@
1044 endif}
1045
1046 writeln {
1047 all: $(OBJDIR) $(APPNAME)
1048
1049 $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h $(OBJDIR)/default_css.h
1050 ifdef USE_WINDOWS
1051 $(CAT) $(subst /,\,$(SRCDIR)\miniz.c) | $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h)
1052 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
1053 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
1054 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
@@ -1089,13 +1081,10 @@
1089 $(XBCC) -o $@ $(SRCDIR)/mkbuiltin.c
1090
1091 $(MKVERSION): $(SRCDIR)/mkversion.c
1092 $(XBCC) -o $@ $(SRCDIR)/mkversion.c
1093
1094 $(MKCSS): $(SRCDIR)/mkcss.c
1095 $(XBCC) -o $@ $(SRCDIR)/mkcss.c
1096
1097 $(CODECHECK1): $(SRCDIR)/codecheck1.c
1098 $(XBCC) -o $@ $(SRCDIR)/codecheck1.c
1099
1100 # WARNING. DANGER. Running the test suite modifies the repository the
1101 # build is done from, i.e. the checkout belongs to. Do not sync/push
@@ -1104,13 +1093,10 @@
1104 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
1105
1106 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(MKVERSION)
1107 $(MKVERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$@
1108
1109 $(OBJDIR)/default_css.h: $(SRCDIR)/default_css.txt $(MKCSS)
1110 $(MKCSS) $(SRCDIR)/default_css.txt $@
1111
1112 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
1113 # to 1. If it is set to 1, then there is no need to build or link
1114 # the sqlite3.o object. Instead, the system SQLite will be linked
1115 # using -lsqlite3.
1116 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
@@ -1232,18 +1218,17 @@
1232 writeln "\t\$(MKINDEX) \$(TRANS_SRC) >\$@\n"
1233
1234 writeln "\$(OBJDIR)/builtin_data.h:\t\$(MKBUILTIN) \$(EXTRA_FILES)"
1235 writeln "\t\$(MKBUILTIN) --prefix \$(SRCDIR)/ \$(EXTRA_FILES) >\$@\n"
1236
1237 writeln "\$(OBJDIR)/headers:\t\$(OBJDIR)/page_index.h \$(OBJDIR)/builtin_data.h \$(OBJDIR)/default_css.h \$(MAKEHEADERS) \$(OBJDIR)/VERSION.h"
1238 writeln "\t\$(MAKEHEADERS) $mhargs"
1239 writeln "\techo Done >\$(OBJDIR)/headers\n"
1240 writeln "\$(OBJDIR)/headers: Makefile\n"
1241 writeln "Makefile:\n"
1242 set extra_h(main) " \$(OBJDIR)/page_index.h "
1243 set extra_h(builtin) " \$(OBJDIR)/builtin_data.h "
1244 set extra_h(style) " \$(OBJDIR)/default_css.h "
1245
1246 foreach s [lsort $src] {
1247 writeln "\$(OBJDIR)/${s}_.c:\t\$(SRCDIR)/$s.c \$(TRANSLATE)"
1248 writeln "\t\$(TRANSLATE) \$(SRCDIR)/$s.c >\$@\n"
1249 writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h$extra_h($s)\$(SRCDIR)/config.h"
@@ -1389,13 +1374,10 @@
1389 $(BCC) -o$@ $**
1390
1391 mkversion$E: $(SRCDIR)\mkversion.c
1392 $(BCC) -o$@ $**
1393
1394 mkcss$E: $(SRCDIR)\mkcss.c
1395 $(BCC) -o$@ $**
1396
1397 codecheck1$E: $(SRCDIR)\codecheck1.c
1398 $(BCC) -o$@ $**
1399
1400 $(OBJDIR)\shell$O : $(SRCDIR)\shell.c
1401 $(TCC) -o$@ -c $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) $**
@@ -1413,13 +1395,10 @@
1413 cp $@ $@
1414
1415 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
1416 +$** > $@
1417
1418 default_css.h : mkcss$E $B\src\default_css.txt
1419 +$** $B\src\default_css.txt $@
1420
1421 page_index.h: mkindex$E $(SRC)
1422 +$** > $@
1423
1424 builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
1425 mkbuiltin$E --prefix $(SRCDIR)/ $(EXTRA_FILES) > $@
@@ -1427,11 +1406,11 @@
1427 clean:
1428 -del $(OBJDIR)\*.obj
1429 -del *.obj *_.c *.h *.map
1430
1431 realclean:
1432 -del $(APPNAME) translate$E mkindex$E makeheaders$E mkversion$E codecheck1$E mkbuiltin$E mkcss$E
1433
1434 $(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
1435 $(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
1436 $(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
1437 $(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"
@@ -1916,13 +1895,10 @@
1916 $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1917
1918 "$(OBJDIR)\mkversion$E": "$(SRCDIR)\mkversion.c"
1919 $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1920
1921 "$(OBJDIR)\mkcss$E": "$(SRCDIR)\mkcss.c"
1922 $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1923
1924 "$(OBJDIR)\codecheck1$E": "$(SRCDIR)\codecheck1.c"
1925 $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1926
1927 !if $(USE_SEE)!=0
1928 SEE_FLAGS = /DSQLITE_HAS_CODEC=1 /DSQLITE_SHELL_DBKEY_PROC=fossil_key
@@ -1956,13 +1932,10 @@
1956 $** > $@
1957
1958 "$(OX)\cson_amalgamation$O" : "$(SRCDIR)\cson_amalgamation.c"
1959 $(TCC) /Fo$@ /Fd$(@D)\ -c $**
1960
1961 "$(OX)\default_css.h": "$(OBJDIR)\mkcss$E" "$(SRCDIR)\default_css.txt"
1962 $** $@
1963
1964 "$(OX)\page_index.h": "$(OBJDIR)\mkindex$E" $(SRC)
1965 $** > $@
1966
1967 "$(OX)\builtin_data.h": "$(OBJDIR)\mkbuiltin$E" "$(OX)\builtin_data.reslist"
1968 "$(OBJDIR)\mkbuiltin$E" --prefix "$(SRCDIR)/" --reslist "$(OX)\builtin_data.reslist" > $@
@@ -2215,15 +2188,12 @@
2215
2216 # extracting version info from manifest
2217 VERSION.h: version.exe ..\manifest.uuid ..\manifest ..\VERSION
2218 version.exe ..\manifest.uuid ..\manifest ..\VERSION >$@
2219
2220 default_css.h: mkcss.exe default_css.txt
2221 mkcss.exe default_css.txt $@
2222
2223 # generate the simplified headers
2224 headers: makeheaders.exe page_index.h builtin_data.h default_css.h VERSION.h ../src/sqlite3.h ../src/th.h
2225 makeheaders.exe $(foreach ts,$(TRANSLATEDSRC),$(ts):$(ts:_.c=.h)) ../src/sqlite3.h ../src/th.h VERSION.h
2226 echo Done >$@
2227
2228 # compile C sources with relevant options
2229
2230
2231 ELETED src/mkcss.c
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -177,10 +177,11 @@
177 set extra_files {
178 diff.tcl
179 markdown.md
180 wiki.wiki
181 *.js
182 default.css
183 style.*.css
184 ../skins/*/*.txt
185 sounds/*.wav
186 }
187
@@ -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,20 +470,19 @@
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
481 writeln "Makefile:"
482 set extra_h(dispatch) " \$(OBJDIR)/page_index.h "
483 set extra_h(builtin) " \$(OBJDIR)/builtin_data.h "
 
484
485 foreach s [lsort $src] {
486 writeln "\$(OBJDIR)/${s}_.c:\t\$(SRCDIR)/$s.c \$(OBJDIR)/translate"
487 writeln "\t\$(OBJDIR)/translate \$(SRCDIR)/$s.c >\$@\n"
488 writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h$extra_h($s)\$(SRCDIR)/config.h"
@@ -1015,11 +1009,10 @@
1009 TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe)
1010 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe)
1011 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe)
1012 MKBUILTIN = $(subst /,\,$(OBJDIR)/mkbuiltin.exe)
1013 MKVERSION = $(subst /,\,$(OBJDIR)/mkversion.exe)
 
1014 CODECHECK1 = $(subst /,\,$(OBJDIR)/codecheck1.exe)
1015 CAT = type
1016 CP = copy
1017 GREP = find
1018 MV = copy
@@ -1030,11 +1023,10 @@
1023 TRANSLATE = $(OBJDIR)/translate.exe
1024 MAKEHEADERS = $(OBJDIR)/makeheaders.exe
1025 MKINDEX = $(OBJDIR)/mkindex.exe
1026 MKBUILTIN = $(OBJDIR)/mkbuiltin.exe
1027 MKVERSION = $(OBJDIR)/mkversion.exe
 
1028 CODECHECK1 = $(OBJDIR)/codecheck1.exe
1029 CAT = cat
1030 CP = cp
1031 GREP = grep
1032 MV = mv
@@ -1044,11 +1036,11 @@
1036 endif}
1037
1038 writeln {
1039 all: $(OBJDIR) $(APPNAME)
1040
1041 $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
1042 ifdef USE_WINDOWS
1043 $(CAT) $(subst /,\,$(SRCDIR)\miniz.c) | $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h)
1044 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
1045 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
1046 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
@@ -1089,13 +1081,10 @@
1081 $(XBCC) -o $@ $(SRCDIR)/mkbuiltin.c
1082
1083 $(MKVERSION): $(SRCDIR)/mkversion.c
1084 $(XBCC) -o $@ $(SRCDIR)/mkversion.c
1085
 
 
 
1086 $(CODECHECK1): $(SRCDIR)/codecheck1.c
1087 $(XBCC) -o $@ $(SRCDIR)/codecheck1.c
1088
1089 # WARNING. DANGER. Running the test suite modifies the repository the
1090 # build is done from, i.e. the checkout belongs to. Do not sync/push
@@ -1104,13 +1093,10 @@
1093 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
1094
1095 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(MKVERSION)
1096 $(MKVERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$@
1097
 
 
 
1098 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
1099 # to 1. If it is set to 1, then there is no need to build or link
1100 # the sqlite3.o object. Instead, the system SQLite will be linked
1101 # using -lsqlite3.
1102 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
@@ -1232,18 +1218,17 @@
1218 writeln "\t\$(MKINDEX) \$(TRANS_SRC) >\$@\n"
1219
1220 writeln "\$(OBJDIR)/builtin_data.h:\t\$(MKBUILTIN) \$(EXTRA_FILES)"
1221 writeln "\t\$(MKBUILTIN) --prefix \$(SRCDIR)/ \$(EXTRA_FILES) >\$@\n"
1222
1223 writeln "\$(OBJDIR)/headers:\t\$(OBJDIR)/page_index.h \$(OBJDIR)/builtin_data.h \$(MAKEHEADERS) \$(OBJDIR)/VERSION.h"
1224 writeln "\t\$(MAKEHEADERS) $mhargs"
1225 writeln "\techo Done >\$(OBJDIR)/headers\n"
1226 writeln "\$(OBJDIR)/headers: Makefile\n"
1227 writeln "Makefile:\n"
1228 set extra_h(main) " \$(OBJDIR)/page_index.h "
1229 set extra_h(builtin) " \$(OBJDIR)/builtin_data.h "
 
1230
1231 foreach s [lsort $src] {
1232 writeln "\$(OBJDIR)/${s}_.c:\t\$(SRCDIR)/$s.c \$(TRANSLATE)"
1233 writeln "\t\$(TRANSLATE) \$(SRCDIR)/$s.c >\$@\n"
1234 writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h$extra_h($s)\$(SRCDIR)/config.h"
@@ -1389,13 +1374,10 @@
1374 $(BCC) -o$@ $**
1375
1376 mkversion$E: $(SRCDIR)\mkversion.c
1377 $(BCC) -o$@ $**
1378
 
 
 
1379 codecheck1$E: $(SRCDIR)\codecheck1.c
1380 $(BCC) -o$@ $**
1381
1382 $(OBJDIR)\shell$O : $(SRCDIR)\shell.c
1383 $(TCC) -o$@ -c $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) $**
@@ -1413,13 +1395,10 @@
1395 cp $@ $@
1396
1397 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
1398 +$** > $@
1399
 
 
 
1400 page_index.h: mkindex$E $(SRC)
1401 +$** > $@
1402
1403 builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
1404 mkbuiltin$E --prefix $(SRCDIR)/ $(EXTRA_FILES) > $@
@@ -1427,11 +1406,11 @@
1406 clean:
1407 -del $(OBJDIR)\*.obj
1408 -del *.obj *_.c *.h *.map
1409
1410 realclean:
1411 -del $(APPNAME) translate$E mkindex$E makeheaders$E mkversion$E codecheck1$E mkbuiltin$E
1412
1413 $(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
1414 $(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
1415 $(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
1416 $(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"
@@ -1916,13 +1895,10 @@
1895 $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1896
1897 "$(OBJDIR)\mkversion$E": "$(SRCDIR)\mkversion.c"
1898 $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1899
 
 
 
1900 "$(OBJDIR)\codecheck1$E": "$(SRCDIR)\codecheck1.c"
1901 $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1902
1903 !if $(USE_SEE)!=0
1904 SEE_FLAGS = /DSQLITE_HAS_CODEC=1 /DSQLITE_SHELL_DBKEY_PROC=fossil_key
@@ -1956,13 +1932,10 @@
1932 $** > $@
1933
1934 "$(OX)\cson_amalgamation$O" : "$(SRCDIR)\cson_amalgamation.c"
1935 $(TCC) /Fo$@ /Fd$(@D)\ -c $**
1936
 
 
 
1937 "$(OX)\page_index.h": "$(OBJDIR)\mkindex$E" $(SRC)
1938 $** > $@
1939
1940 "$(OX)\builtin_data.h": "$(OBJDIR)\mkbuiltin$E" "$(OX)\builtin_data.reslist"
1941 "$(OBJDIR)\mkbuiltin$E" --prefix "$(SRCDIR)/" --reslist "$(OX)\builtin_data.reslist" > $@
@@ -2215,15 +2188,12 @@
2188
2189 # extracting version info from manifest
2190 VERSION.h: version.exe ..\manifest.uuid ..\manifest ..\VERSION
2191 version.exe ..\manifest.uuid ..\manifest ..\VERSION >$@
2192
 
 
 
2193 # generate the simplified headers
2194 headers: makeheaders.exe page_index.h builtin_data.h VERSION.h ../src/sqlite3.h ../src/th.h
2195 makeheaders.exe $(foreach ts,$(TRANSLATEDSRC),$(ts):$(ts:_.c=.h)) ../src/sqlite3.h ../src/th.h VERSION.h
2196 echo Done >$@
2197
2198 # compile C sources with relevant options
2199
2200
2201 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 @@
701701
 */
702702
 const char *elementClass; /* Name of element needed */
703703
 const char *value; /* CSS text */
704704
 } cssDefaultList[];
705705
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
-
749706
 /*
750707
 ** WEBPAGE: setup_skinedit
751708
 **
752709
 ** Edit aspects of a skin determined by the w= query parameter.
753710
 ** Requires Admin or Setup privileges.
@@ -869,13 +826,10 @@
869826
 blob_reset(&from);
870827
 blob_reset(&to);
871828
 blob_reset(&out);
872829
 }
873830
 @ </div></form>
874
- if(ii==0/*CSS*/){
875
- skin_emit_css_defaults();
876
- }
877831
 style_footer();
878832
 db_end_transaction(0);
879833
 }
880834
881835
 /*
882836
--- 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 -56
--- src/style.c
+++ src/style.c
@@ -987,33 +987,10 @@
987987
 */
988988
 void style_sidebox_end(void){
989989
 @ </div>
990990
 }
991991
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
-
1015992
 /*
1016993
 ** Search string zCss for zSelector.
1017994
 **
1018995
 ** Return true if found. Return false if not found
1019996
 */
@@ -1075,61 +1052,71 @@
10751052
 cgi_set_content_type("application/javascript");
10761053
 }
10771054
 style_init_th1_vars(0);
10781055
 Th_Render(zScript?zScript:"");
10791056
 }
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
+}
10801095
10811096
 /*
10821097
 ** WEBPAGE: style.css
10831098
 **
10841099
 ** Return the style sheet.
10851100
 */
10861101
 void page_style_css(void){
10871102
 Blob css = empty_blob;
10881103
 int i;
1089
- const char *zPage = PD("name",P("page"));
1104
+ const char * zDefaults;
10901105
10911106
 cgi_set_content_type("text/css");
10921107
 /* 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
- }
1108
+ zDefaults = (const char*)builtin_file("default.css", &i);
1109
+ blob_append(&css, zDefaults, i);
1110
+ /* Page-specific CSS, if any... */
1111
+ page_style_css_append_page_style(&css);
11241112
 blob_append(&css,
11251113
 "\n/***********************************************************\n"
11261114
 "** All CSS which follows is supplied by the repository \"skin\".\n"
11271115
 "***********************************************************/\n",
11281116
 -1);
11291117
 blob_append(&css,skin_get("css"),-1);
1130
-
11311118
 /* Process through TH1 in order to give an opportunity to substitute
11321119
 ** variables such as $baseurl.
11331120
 */
11341121
 Th_Store("baseurl", g.zBaseURL);
11351122
 Th_Store("secureurl", fossil_wants_https(1)? g.zHttpsURL: g.zBaseURL);
11361123
--- 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,61 +1052,71 @@
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 blob_append(&css,skin_get("css"),-1);
1130
1131 /* Process through TH1 in order to give an opportunity to substitute
1132 ** variables such as $baseurl.
1133 */
1134 Th_Store("baseurl", g.zBaseURL);
1135 Th_Store("secureurl", fossil_wants_https(1)? g.zHttpsURL: g.zBaseURL);
1136
--- 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,61 +1052,71 @@
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 const char * zDefaults;
1105
1106 cgi_set_content_type("text/css");
1107 /* Emit all default rules... */
1108 zDefaults = (const char*)builtin_file("default.css", &i);
1109 blob_append(&css, zDefaults, i);
1110 /* Page-specific CSS, if any... */
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 blob_append(&css,skin_get("css"),-1);
 
1118 /* Process through TH1 in order to give an opportunity to substitute
1119 ** variables such as $baseurl.
1120 */
1121 Th_Store("baseurl", g.zBaseURL);
1122 Th_Store("secureurl", fossil_wants_https(1)? g.zHttpsURL: g.zBaseURL);
1123
M src/style.c
+43 -56
--- src/style.c
+++ src/style.c
@@ -987,33 +987,10 @@
987987
 */
988988
 void style_sidebox_end(void){
989989
 @ </div>
990990
 }
991991
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
-
1015992
 /*
1016993
 ** Search string zCss for zSelector.
1017994
 **
1018995
 ** Return true if found. Return false if not found
1019996
 */
@@ -1075,61 +1052,71 @@
10751052
 cgi_set_content_type("application/javascript");
10761053
 }
10771054
 style_init_th1_vars(0);
10781055
 Th_Render(zScript?zScript:"");
10791056
 }
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
+}
10801095
10811096
 /*
10821097
 ** WEBPAGE: style.css
10831098
 **
10841099
 ** Return the style sheet.
10851100
 */
10861101
 void page_style_css(void){
10871102
 Blob css = empty_blob;
10881103
 int i;
1089
- const char *zPage = PD("name",P("page"));
1104
+ const char * zDefaults;
10901105
10911106
 cgi_set_content_type("text/css");
10921107
 /* 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
- }
1108
+ zDefaults = (const char*)builtin_file("default.css", &i);
1109
+ blob_append(&css, zDefaults, i);
1110
+ /* Page-specific CSS, if any... */
1111
+ page_style_css_append_page_style(&css);
11241112
 blob_append(&css,
11251113
 "\n/***********************************************************\n"
11261114
 "** All CSS which follows is supplied by the repository \"skin\".\n"
11271115
 "***********************************************************/\n",
11281116
 -1);
11291117
 blob_append(&css,skin_get("css"),-1);
1130
-
11311118
 /* Process through TH1 in order to give an opportunity to substitute
11321119
 ** variables such as $baseurl.
11331120
 */
11341121
 Th_Store("baseurl", g.zBaseURL);
11351122
 Th_Store("secureurl", fossil_wants_https(1)? g.zHttpsURL: g.zBaseURL);
11361123
--- 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,61 +1052,71 @@
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 blob_append(&css,skin_get("css"),-1);
1130
1131 /* Process through TH1 in order to give an opportunity to substitute
1132 ** variables such as $baseurl.
1133 */
1134 Th_Store("baseurl", g.zBaseURL);
1135 Th_Store("secureurl", fossil_wants_https(1)? g.zHttpsURL: g.zBaseURL);
1136
--- 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,61 +1052,71 @@
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 const char * zDefaults;
1105
1106 cgi_set_content_type("text/css");
1107 /* Emit all default rules... */
1108 zDefaults = (const char*)builtin_file("default.css", &i);
1109 blob_append(&css, zDefaults, i);
1110 /* Page-specific CSS, if any... */
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 blob_append(&css,skin_get("css"),-1);
 
1118 /* Process through TH1 in order to give an opportunity to substitute
1119 ** variables such as $baseurl.
1120 */
1121 Th_Store("baseurl", g.zBaseURL);
1122 Th_Store("secureurl", fossil_wants_https(1)? g.zHttpsURL: g.zBaseURL);
1123
M win/Makefile.PellesCGMake
+1 -4
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -147,15 +147,12 @@
147147
148148
 # extracting version info from manifest
149149
 VERSION.h: version.exe ..\manifest.uuid ..\manifest ..\VERSION
150150
 version.exe ..\manifest.uuid ..\manifest ..\VERSION >$@
151151
152
-default_css.h: mkcss.exe default_css.txt
153
- mkcss.exe default_css.txt $@
154
-
155152
 # 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
157154
 makeheaders.exe $(foreach ts,$(TRANSLATEDSRC),$(ts):$(ts:_.c=.h)) ../src/sqlite3.h ../src/th.h VERSION.h
158155
 echo Done >$@
159156
160157
 # compile C sources with relevant options
161158
162159
--- 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 -9
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -71,13 +71,10 @@
7171
 $(BCC) -o$@ $**
7272
7373
 mkversion$E: $(SRCDIR)\mkversion.c
7474
 $(BCC) -o$@ $**
7575
76
-mkcss$E: $(SRCDIR)\mkcss.c
77
- $(BCC) -o$@ $**
78
-
7976
 codecheck1$E: $(SRCDIR)\codecheck1.c
8077
 $(BCC) -o$@ $**
8178
8279
 $(OBJDIR)\shell$O : $(SRCDIR)\shell.c
8380
 $(TCC) -o$@ -c $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) $**
@@ -95,13 +92,10 @@
9592
 cp $@ $@
9693
9794
 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
9895
 +$** > $@
9996
100
-default_css.h : mkcss$E $B\src\default_css.txt
101
- +$** $B\src\default_css.txt $@
102
-
10397
 page_index.h: mkindex$E $(SRC)
10498
 +$** > $@
10599
106100
 builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
107101
 mkbuiltin$E --prefix $(SRCDIR)/ $(EXTRA_FILES) > $@
@@ -109,11 +103,11 @@
109103
 clean:
110104
 -del $(OBJDIR)\*.obj
111105
 -del *.obj *_.c *.h *.map
112106
113107
 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
115109
116110
 $(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
117111
 $(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
118112
 $(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
119113
 $(OBJDIR)\json_config$O : $(SRCDIR)\json_detail.h
@@ -126,11 +120,10 @@
126120
 $(OBJDIR)\json_status$O : $(SRCDIR)\json_detail.h
127121
 $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h
128122
 $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h
129123
 $(OBJDIR)\json_user$O : $(SRCDIR)\json_detail.h
130124
 $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h
131
-
132125
133126
134127
 $(OBJDIR)\add$O : add_.c add.h
135128
 $(TCC) -o$@ -c add_.c
136129
@@ -987,8 +980,8 @@
987980
 $(TCC) -o$@ -c zip_.c
988981
989982
 zip_.c : $(SRCDIR)\zip.c
990983
 +translate$E $** > $@
991984
992
-headers: makeheaders$E page_index.h builtin_data.h default_css.h VERSION.h
985
+headers: makeheaders$E page_index.h builtin_data.h VERSION.h
993986
 +makeheaders$E add_.c:add.h ajax_.c:ajax.h alerts_.c:alerts.h allrepo_.c:allrepo.h attach_.c:attach.h backlink_.c:backlink.h backoffice_.c:backoffice.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h builtin_.c:builtin.h bundle_.c:bundle.h cache_.c:cache.h capabilities_.c:capabilities.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h cookies_.c:cookies.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h deltafunc_.c:deltafunc.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h dispatch_.c:dispatch.h doc_.c:doc.h encode_.c:encode.h etag_.c:etag.h event_.c:event.h export_.c:export.h extcgi_.c:extcgi.h file_.c:file.h fileedit_.c:fileedit.h finfo_.c:finfo.h foci_.c:foci.h forum_.c:forum.h fshell_.c:fshell.h fusefs_.c:fusefs.h fuzz_.c:fuzz.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h hname_.c:hname.h 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
994987
 @copy /Y nul: headers
995988
--- 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
@@ -126,11 +120,10 @@
126 $(OBJDIR)\json_status$O : $(SRCDIR)\json_detail.h
127 $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h
128 $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h
129 $(OBJDIR)\json_user$O : $(SRCDIR)\json_detail.h
130 $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h
131
132
133
134 $(OBJDIR)\add$O : add_.c add.h
135 $(TCC) -o$@ -c add_.c
136
@@ -987,8 +980,8 @@
987 $(TCC) -o$@ -c zip_.c
988
989 zip_.c : $(SRCDIR)\zip.c
990 +translate$E $** > $@
991
992 headers: makeheaders$E page_index.h builtin_data.h default_css.h VERSION.h
993 +makeheaders$E add_.c:add.h ajax_.c:ajax.h alerts_.c:alerts.h allrepo_.c:allrepo.h attach_.c:attach.h backlink_.c:backlink.h backoffice_.c:backoffice.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h builtin_.c:builtin.h bundle_.c:bundle.h cache_.c:cache.h capabilities_.c:capabilities.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h cookies_.c:cookies.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h deltafunc_.c:deltafunc.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h dispatch_.c:dispatch.h doc_.c:doc.h encode_.c:encode.h etag_.c:etag.h event_.c:event.h export_.c:export.h extcgi_.c:extcgi.h file_.c:file.h fileedit_.c:fileedit.h finfo_.c:finfo.h foci_.c:foci.h forum_.c:forum.h fshell_.c:fshell.h fusefs_.c:fusefs.h fuzz_.c:fuzz.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h hname_.c:hname.h 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
994 @copy /Y nul: headers
995
--- 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
@@ -126,11 +120,10 @@
120 $(OBJDIR)\json_status$O : $(SRCDIR)\json_detail.h
121 $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h
122 $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h
123 $(OBJDIR)\json_user$O : $(SRCDIR)\json_detail.h
124 $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h
 
125
126
127 $(OBJDIR)\add$O : add_.c add.h
128 $(TCC) -o$@ -c add_.c
129
@@ -987,8 +980,8 @@
980 $(TCC) -o$@ -c zip_.c
981
982 zip_.c : $(SRCDIR)\zip.c
983 +translate$E $** > $@
984
985 headers: makeheaders$E page_index.h builtin_data.h VERSION.h
986 +makeheaders$E add_.c:add.h ajax_.c:ajax.h alerts_.c:alerts.h allrepo_.c:allrepo.h attach_.c:attach.h backlink_.c:backlink.h backoffice_.c:backoffice.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h builtin_.c:builtin.h bundle_.c:bundle.h cache_.c:cache.h capabilities_.c:capabilities.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h cookies_.c:cookies.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h deltafunc_.c:deltafunc.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h dispatch_.c:dispatch.h doc_.c:doc.h encode_.c:encode.h etag_.c:etag.h event_.c:event.h export_.c:export.h extcgi_.c:extcgi.h file_.c:file.h fileedit_.c:fileedit.h finfo_.c:finfo.h foci_.c:foci.h forum_.c:forum.h fshell_.c:fshell.h fusefs_.c:fusefs.h fuzz_.c:fuzz.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h hname_.c:hname.h 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
987 @copy /Y nul: headers
988
M win/Makefile.mingw
+4 -11
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -640,10 +640,11 @@
640640
 $(SRCDIR)/../skins/xekri/footer.txt \
641641
 $(SRCDIR)/../skins/xekri/header.txt \
642642
 $(SRCDIR)/accordion.js \
643643
 $(SRCDIR)/ci_edit.js \
644644
 $(SRCDIR)/copybtn.js \
645
+ $(SRCDIR)/default.css \
645646
 $(SRCDIR)/diff.tcl \
646647
 $(SRCDIR)/forum.js \
647648
 $(SRCDIR)/fossil.bootstrap.js \
648649
 $(SRCDIR)/fossil.confirmer.js \
649650
 $(SRCDIR)/fossil.dom.js \
@@ -986,11 +987,10 @@
986987
 TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe)
987988
 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe)
988989
 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe)
989990
 MKBUILTIN = $(subst /,\,$(OBJDIR)/mkbuiltin.exe)
990991
 MKVERSION = $(subst /,\,$(OBJDIR)/mkversion.exe)
991
-MKCSS = $(subst /,\,$(OBJDIR)/mkcss.exe)
992992
 CODECHECK1 = $(subst /,\,$(OBJDIR)/codecheck1.exe)
993993
 CAT = type
994994
 CP = copy
995995
 GREP = find
996996
 MV = copy
@@ -1001,11 +1001,10 @@
10011001
 TRANSLATE = $(OBJDIR)/translate.exe
10021002
 MAKEHEADERS = $(OBJDIR)/makeheaders.exe
10031003
 MKINDEX = $(OBJDIR)/mkindex.exe
10041004
 MKBUILTIN = $(OBJDIR)/mkbuiltin.exe
10051005
 MKVERSION = $(OBJDIR)/mkversion.exe
1006
-MKCSS = $(OBJDIR)/mkcss.exe
10071006
 CODECHECK1 = $(OBJDIR)/codecheck1.exe
10081007
 CAT = cat
10091008
 CP = cp
10101009
 GREP = grep
10111010
 MV = mv
@@ -1014,11 +1013,11 @@
10141013
 RMDIR = rm -rf
10151014
 endif
10161015
10171016
 all: $(OBJDIR) $(APPNAME)
10181017
1019
-$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h $(OBJDIR)/default_css.h
1018
+$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
10201019
 ifdef USE_WINDOWS
10211020
 $(CAT) $(subst /,\,$(SRCDIR)\miniz.c) | $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h)
10221021
 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
10231022
 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
10241023
 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
@@ -1059,13 +1058,10 @@
10591058
 $(XBCC) -o $@ $(SRCDIR)/mkbuiltin.c
10601059
10611060
 $(MKVERSION): $(SRCDIR)/mkversion.c
10621061
 $(XBCC) -o $@ $(SRCDIR)/mkversion.c
10631062
1064
-$(MKCSS): $(SRCDIR)/mkcss.c
1065
- $(XBCC) -o $@ $(SRCDIR)/mkcss.c
1066
-
10671063
 $(CODECHECK1): $(SRCDIR)/codecheck1.c
10681064
 $(XBCC) -o $@ $(SRCDIR)/codecheck1.c
10691065
10701066
 # WARNING. DANGER. Running the test suite modifies the repository the
10711067
 # build is done from, i.e. the checkout belongs to. Do not sync/push
@@ -1074,13 +1070,10 @@
10741070
 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
10751071
10761072
 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(MKVERSION)
10771073
 $(MKVERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$@
10781074
1079
-$(OBJDIR)/default_css.h: $(SRCDIR)/default_css.txt $(MKCSS)
1080
- $(MKCSS) $(SRCDIR)/default_css.txt $@
1081
-
10821075
 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
10831076
 # to 1. If it is set to 1, then there is no need to build or link
10841077
 # the sqlite3.o object. Instead, the system SQLite will be linked
10851078
 # using -lsqlite3.
10861079
 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
@@ -1190,11 +1183,11 @@
11901183
 $(MKINDEX) $(TRANS_SRC) >$@
11911184
11921185
 $(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES)
11931186
 $(MKBUILTIN) --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
11941187
1195
-$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(OBJDIR)/default_css.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h
1188
+$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h
11961189
 $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
11971190
 $(OBJDIR)/ajax_.c:$(OBJDIR)/ajax.h \
11981191
 $(OBJDIR)/alerts_.c:$(OBJDIR)/alerts.h \
11991192
 $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
12001193
 $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
@@ -2266,11 +2259,11 @@
22662259
 $(OBJDIR)/statrep.h: $(OBJDIR)/headers
22672260
22682261
 $(OBJDIR)/style_.c: $(SRCDIR)/style.c $(TRANSLATE)
22692262
 $(TRANSLATE) $(SRCDIR)/style.c >$@
22702263
2271
-$(OBJDIR)/style.o: $(OBJDIR)/style_.c $(OBJDIR)/style.h $(OBJDIR)/default_css.h $(SRCDIR)/config.h
2264
+$(OBJDIR)/style.o: $(OBJDIR)/style_.c $(OBJDIR)/style.h $(SRCDIR)/config.h
22722265
 $(XTCC) -o $(OBJDIR)/style.o -c $(OBJDIR)/style_.c
22732266
22742267
 $(OBJDIR)/style.h: $(OBJDIR)/headers
22752268
22762269
 $(OBJDIR)/sync_.c: $(SRCDIR)/sync.c $(TRANSLATE)
22772270
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -640,10 +640,11 @@
640 $(SRCDIR)/../skins/xekri/footer.txt \
641 $(SRCDIR)/../skins/xekri/header.txt \
642 $(SRCDIR)/accordion.js \
643 $(SRCDIR)/ci_edit.js \
644 $(SRCDIR)/copybtn.js \
 
645 $(SRCDIR)/diff.tcl \
646 $(SRCDIR)/forum.js \
647 $(SRCDIR)/fossil.bootstrap.js \
648 $(SRCDIR)/fossil.confirmer.js \
649 $(SRCDIR)/fossil.dom.js \
@@ -986,11 +987,10 @@
986 TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe)
987 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe)
988 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe)
989 MKBUILTIN = $(subst /,\,$(OBJDIR)/mkbuiltin.exe)
990 MKVERSION = $(subst /,\,$(OBJDIR)/mkversion.exe)
991 MKCSS = $(subst /,\,$(OBJDIR)/mkcss.exe)
992 CODECHECK1 = $(subst /,\,$(OBJDIR)/codecheck1.exe)
993 CAT = type
994 CP = copy
995 GREP = find
996 MV = copy
@@ -1001,11 +1001,10 @@
1001 TRANSLATE = $(OBJDIR)/translate.exe
1002 MAKEHEADERS = $(OBJDIR)/makeheaders.exe
1003 MKINDEX = $(OBJDIR)/mkindex.exe
1004 MKBUILTIN = $(OBJDIR)/mkbuiltin.exe
1005 MKVERSION = $(OBJDIR)/mkversion.exe
1006 MKCSS = $(OBJDIR)/mkcss.exe
1007 CODECHECK1 = $(OBJDIR)/codecheck1.exe
1008 CAT = cat
1009 CP = cp
1010 GREP = grep
1011 MV = mv
@@ -1014,11 +1013,11 @@
1014 RMDIR = rm -rf
1015 endif
1016
1017 all: $(OBJDIR) $(APPNAME)
1018
1019 $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h $(OBJDIR)/default_css.h
1020 ifdef USE_WINDOWS
1021 $(CAT) $(subst /,\,$(SRCDIR)\miniz.c) | $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h)
1022 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
1023 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
1024 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
@@ -1059,13 +1058,10 @@
1059 $(XBCC) -o $@ $(SRCDIR)/mkbuiltin.c
1060
1061 $(MKVERSION): $(SRCDIR)/mkversion.c
1062 $(XBCC) -o $@ $(SRCDIR)/mkversion.c
1063
1064 $(MKCSS): $(SRCDIR)/mkcss.c
1065 $(XBCC) -o $@ $(SRCDIR)/mkcss.c
1066
1067 $(CODECHECK1): $(SRCDIR)/codecheck1.c
1068 $(XBCC) -o $@ $(SRCDIR)/codecheck1.c
1069
1070 # WARNING. DANGER. Running the test suite modifies the repository the
1071 # build is done from, i.e. the checkout belongs to. Do not sync/push
@@ -1074,13 +1070,10 @@
1074 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
1075
1076 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(MKVERSION)
1077 $(MKVERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$@
1078
1079 $(OBJDIR)/default_css.h: $(SRCDIR)/default_css.txt $(MKCSS)
1080 $(MKCSS) $(SRCDIR)/default_css.txt $@
1081
1082 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
1083 # to 1. If it is set to 1, then there is no need to build or link
1084 # the sqlite3.o object. Instead, the system SQLite will be linked
1085 # using -lsqlite3.
1086 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
@@ -1190,11 +1183,11 @@
1190 $(MKINDEX) $(TRANS_SRC) >$@
1191
1192 $(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES)
1193 $(MKBUILTIN) --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
1194
1195 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(OBJDIR)/default_css.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h
1196 $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
1197 $(OBJDIR)/ajax_.c:$(OBJDIR)/ajax.h \
1198 $(OBJDIR)/alerts_.c:$(OBJDIR)/alerts.h \
1199 $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
1200 $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
@@ -2266,11 +2259,11 @@
2266 $(OBJDIR)/statrep.h: $(OBJDIR)/headers
2267
2268 $(OBJDIR)/style_.c: $(SRCDIR)/style.c $(TRANSLATE)
2269 $(TRANSLATE) $(SRCDIR)/style.c >$@
2270
2271 $(OBJDIR)/style.o: $(OBJDIR)/style_.c $(OBJDIR)/style.h $(OBJDIR)/default_css.h $(SRCDIR)/config.h
2272 $(XTCC) -o $(OBJDIR)/style.o -c $(OBJDIR)/style_.c
2273
2274 $(OBJDIR)/style.h: $(OBJDIR)/headers
2275
2276 $(OBJDIR)/sync_.c: $(SRCDIR)/sync.c $(TRANSLATE)
2277
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -640,10 +640,11 @@
640 $(SRCDIR)/../skins/xekri/footer.txt \
641 $(SRCDIR)/../skins/xekri/header.txt \
642 $(SRCDIR)/accordion.js \
643 $(SRCDIR)/ci_edit.js \
644 $(SRCDIR)/copybtn.js \
645 $(SRCDIR)/default.css \
646 $(SRCDIR)/diff.tcl \
647 $(SRCDIR)/forum.js \
648 $(SRCDIR)/fossil.bootstrap.js \
649 $(SRCDIR)/fossil.confirmer.js \
650 $(SRCDIR)/fossil.dom.js \
@@ -986,11 +987,10 @@
987 TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe)
988 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe)
989 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe)
990 MKBUILTIN = $(subst /,\,$(OBJDIR)/mkbuiltin.exe)
991 MKVERSION = $(subst /,\,$(OBJDIR)/mkversion.exe)
 
992 CODECHECK1 = $(subst /,\,$(OBJDIR)/codecheck1.exe)
993 CAT = type
994 CP = copy
995 GREP = find
996 MV = copy
@@ -1001,11 +1001,10 @@
1001 TRANSLATE = $(OBJDIR)/translate.exe
1002 MAKEHEADERS = $(OBJDIR)/makeheaders.exe
1003 MKINDEX = $(OBJDIR)/mkindex.exe
1004 MKBUILTIN = $(OBJDIR)/mkbuiltin.exe
1005 MKVERSION = $(OBJDIR)/mkversion.exe
 
1006 CODECHECK1 = $(OBJDIR)/codecheck1.exe
1007 CAT = cat
1008 CP = cp
1009 GREP = grep
1010 MV = mv
@@ -1014,11 +1013,11 @@
1013 RMDIR = rm -rf
1014 endif
1015
1016 all: $(OBJDIR) $(APPNAME)
1017
1018 $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
1019 ifdef USE_WINDOWS
1020 $(CAT) $(subst /,\,$(SRCDIR)\miniz.c) | $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h)
1021 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
1022 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
1023 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
@@ -1059,13 +1058,10 @@
1058 $(XBCC) -o $@ $(SRCDIR)/mkbuiltin.c
1059
1060 $(MKVERSION): $(SRCDIR)/mkversion.c
1061 $(XBCC) -o $@ $(SRCDIR)/mkversion.c
1062
 
 
 
1063 $(CODECHECK1): $(SRCDIR)/codecheck1.c
1064 $(XBCC) -o $@ $(SRCDIR)/codecheck1.c
1065
1066 # WARNING. DANGER. Running the test suite modifies the repository the
1067 # build is done from, i.e. the checkout belongs to. Do not sync/push
@@ -1074,13 +1070,10 @@
1070 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
1071
1072 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(MKVERSION)
1073 $(MKVERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$@
1074
 
 
 
1075 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
1076 # to 1. If it is set to 1, then there is no need to build or link
1077 # the sqlite3.o object. Instead, the system SQLite will be linked
1078 # using -lsqlite3.
1079 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
@@ -1190,11 +1183,11 @@
1183 $(MKINDEX) $(TRANS_SRC) >$@
1184
1185 $(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES)
1186 $(MKBUILTIN) --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
1187
1188 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h
1189 $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
1190 $(OBJDIR)/ajax_.c:$(OBJDIR)/ajax.h \
1191 $(OBJDIR)/alerts_.c:$(OBJDIR)/alerts.h \
1192 $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
1193 $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
@@ -2266,11 +2259,11 @@
2259 $(OBJDIR)/statrep.h: $(OBJDIR)/headers
2260
2261 $(OBJDIR)/style_.c: $(SRCDIR)/style.c $(TRANSLATE)
2262 $(TRANSLATE) $(SRCDIR)/style.c >$@
2263
2264 $(OBJDIR)/style.o: $(OBJDIR)/style_.c $(OBJDIR)/style.h $(SRCDIR)/config.h
2265 $(XTCC) -o $(OBJDIR)/style.o -c $(OBJDIR)/style_.c
2266
2267 $(OBJDIR)/style.h: $(OBJDIR)/headers
2268
2269 $(OBJDIR)/sync_.c: $(SRCDIR)/sync.c $(TRANSLATE)
2270
M win/Makefile.msc
+2 -6
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -561,10 +561,11 @@
561561
 "$(SRCDIR)\..\skins\xekri\footer.txt" \
562562
 "$(SRCDIR)\..\skins\xekri\header.txt" \
563563
 "$(SRCDIR)\accordion.js" \
564564
 "$(SRCDIR)\ci_edit.js" \
565565
 "$(SRCDIR)\copybtn.js" \
566
+ "$(SRCDIR)\default.css" \
566567
 "$(SRCDIR)\diff.tcl" \
567568
 "$(SRCDIR)\forum.js" \
568569
 "$(SRCDIR)\fossil.bootstrap.js" \
569570
 "$(SRCDIR)\fossil.confirmer.js" \
570571
 "$(SRCDIR)\fossil.dom.js" \
@@ -996,13 +997,10 @@
996997
 $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
997998
998999
 "$(OBJDIR)\mkversion$E": "$(SRCDIR)\mkversion.c"
9991000
 $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
10001001
1001
-"$(OBJDIR)\mkcss$E": "$(SRCDIR)\mkcss.c"
1002
- $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1003
-
10041002
 "$(OBJDIR)\codecheck1$E": "$(SRCDIR)\codecheck1.c"
10051003
 $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
10061004
10071005
 !if $(USE_SEE)!=0
10081006
 SEE_FLAGS = /DSQLITE_HAS_CODEC=1 /DSQLITE_SHELL_DBKEY_PROC=fossil_key
@@ -1036,13 +1034,10 @@
10361034
 $** > $@
10371035
10381036
 "$(OX)\cson_amalgamation$O" : "$(SRCDIR)\cson_amalgamation.c"
10391037
 $(TCC) /Fo$@ /Fd$(@D)\ -c $**
10401038
1041
-"$(OX)\default_css.h": "$(OBJDIR)\mkcss$E" "$(SRCDIR)\default_css.txt"
1042
- $** $@
1043
-
10441039
 "$(OX)\page_index.h": "$(OBJDIR)\mkindex$E" $(SRC)
10451040
 $** > $@
10461041
10471042
 "$(OX)\builtin_data.h": "$(OBJDIR)\mkbuiltin$E" "$(OX)\builtin_data.reslist"
10481043
 "$(OBJDIR)\mkbuiltin$E" --prefix "$(SRCDIR)/" --reslist "$(OX)\builtin_data.reslist" > $@
@@ -1154,10 +1149,11 @@
11541149
 echo "$(SRCDIR)\../skins/xekri/footer.txt" >> $@
11551150
 echo "$(SRCDIR)\../skins/xekri/header.txt" >> $@
11561151
 echo "$(SRCDIR)\accordion.js" >> $@
11571152
 echo "$(SRCDIR)\ci_edit.js" >> $@
11581153
 echo "$(SRCDIR)\copybtn.js" >> $@
1154
+ echo "$(SRCDIR)\default.css" >> $@
11591155
 echo "$(SRCDIR)\diff.tcl" >> $@
11601156
 echo "$(SRCDIR)\forum.js" >> $@
11611157
 echo "$(SRCDIR)\fossil.bootstrap.js" >> $@
11621158
 echo "$(SRCDIR)\fossil.confirmer.js" >> $@
11631159
 echo "$(SRCDIR)\fossil.dom.js" >> $@
11641160
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -561,10 +561,11 @@
561 "$(SRCDIR)\..\skins\xekri\footer.txt" \
562 "$(SRCDIR)\..\skins\xekri\header.txt" \
563 "$(SRCDIR)\accordion.js" \
564 "$(SRCDIR)\ci_edit.js" \
565 "$(SRCDIR)\copybtn.js" \
 
566 "$(SRCDIR)\diff.tcl" \
567 "$(SRCDIR)\forum.js" \
568 "$(SRCDIR)\fossil.bootstrap.js" \
569 "$(SRCDIR)\fossil.confirmer.js" \
570 "$(SRCDIR)\fossil.dom.js" \
@@ -996,13 +997,10 @@
996 $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
997
998 "$(OBJDIR)\mkversion$E": "$(SRCDIR)\mkversion.c"
999 $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1000
1001 "$(OBJDIR)\mkcss$E": "$(SRCDIR)\mkcss.c"
1002 $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1003
1004 "$(OBJDIR)\codecheck1$E": "$(SRCDIR)\codecheck1.c"
1005 $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1006
1007 !if $(USE_SEE)!=0
1008 SEE_FLAGS = /DSQLITE_HAS_CODEC=1 /DSQLITE_SHELL_DBKEY_PROC=fossil_key
@@ -1036,13 +1034,10 @@
1036 $** > $@
1037
1038 "$(OX)\cson_amalgamation$O" : "$(SRCDIR)\cson_amalgamation.c"
1039 $(TCC) /Fo$@ /Fd$(@D)\ -c $**
1040
1041 "$(OX)\default_css.h": "$(OBJDIR)\mkcss$E" "$(SRCDIR)\default_css.txt"
1042 $** $@
1043
1044 "$(OX)\page_index.h": "$(OBJDIR)\mkindex$E" $(SRC)
1045 $** > $@
1046
1047 "$(OX)\builtin_data.h": "$(OBJDIR)\mkbuiltin$E" "$(OX)\builtin_data.reslist"
1048 "$(OBJDIR)\mkbuiltin$E" --prefix "$(SRCDIR)/" --reslist "$(OX)\builtin_data.reslist" > $@
@@ -1154,10 +1149,11 @@
1154 echo "$(SRCDIR)\../skins/xekri/footer.txt" >> $@
1155 echo "$(SRCDIR)\../skins/xekri/header.txt" >> $@
1156 echo "$(SRCDIR)\accordion.js" >> $@
1157 echo "$(SRCDIR)\ci_edit.js" >> $@
1158 echo "$(SRCDIR)\copybtn.js" >> $@
 
1159 echo "$(SRCDIR)\diff.tcl" >> $@
1160 echo "$(SRCDIR)\forum.js" >> $@
1161 echo "$(SRCDIR)\fossil.bootstrap.js" >> $@
1162 echo "$(SRCDIR)\fossil.confirmer.js" >> $@
1163 echo "$(SRCDIR)\fossil.dom.js" >> $@
1164
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -561,10 +561,11 @@
561 "$(SRCDIR)\..\skins\xekri\footer.txt" \
562 "$(SRCDIR)\..\skins\xekri\header.txt" \
563 "$(SRCDIR)\accordion.js" \
564 "$(SRCDIR)\ci_edit.js" \
565 "$(SRCDIR)\copybtn.js" \
566 "$(SRCDIR)\default.css" \
567 "$(SRCDIR)\diff.tcl" \
568 "$(SRCDIR)\forum.js" \
569 "$(SRCDIR)\fossil.bootstrap.js" \
570 "$(SRCDIR)\fossil.confirmer.js" \
571 "$(SRCDIR)\fossil.dom.js" \
@@ -996,13 +997,10 @@
997 $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
998
999 "$(OBJDIR)\mkversion$E": "$(SRCDIR)\mkversion.c"
1000 $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1001
 
 
 
1002 "$(OBJDIR)\codecheck1$E": "$(SRCDIR)\codecheck1.c"
1003 $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1004
1005 !if $(USE_SEE)!=0
1006 SEE_FLAGS = /DSQLITE_HAS_CODEC=1 /DSQLITE_SHELL_DBKEY_PROC=fossil_key
@@ -1036,13 +1034,10 @@
1034 $** > $@
1035
1036 "$(OX)\cson_amalgamation$O" : "$(SRCDIR)\cson_amalgamation.c"
1037 $(TCC) /Fo$@ /Fd$(@D)\ -c $**
1038
 
 
 
1039 "$(OX)\page_index.h": "$(OBJDIR)\mkindex$E" $(SRC)
1040 $** > $@
1041
1042 "$(OX)\builtin_data.h": "$(OBJDIR)\mkbuiltin$E" "$(OX)\builtin_data.reslist"
1043 "$(OBJDIR)\mkbuiltin$E" --prefix "$(SRCDIR)/" --reslist "$(OX)\builtin_data.reslist" > $@
@@ -1154,10 +1149,11 @@
1149 echo "$(SRCDIR)\../skins/xekri/footer.txt" >> $@
1150 echo "$(SRCDIR)\../skins/xekri/header.txt" >> $@
1151 echo "$(SRCDIR)\accordion.js" >> $@
1152 echo "$(SRCDIR)\ci_edit.js" >> $@
1153 echo "$(SRCDIR)\copybtn.js" >> $@
1154 echo "$(SRCDIR)\default.css" >> $@
1155 echo "$(SRCDIR)\diff.tcl" >> $@
1156 echo "$(SRCDIR)\forum.js" >> $@
1157 echo "$(SRCDIR)\fossil.bootstrap.js" >> $@
1158 echo "$(SRCDIR)\fossil.confirmer.js" >> $@
1159 echo "$(SRCDIR)\fossil.dom.js" >> $@
1160

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button