Fossil SCM

Merge in the latest trunk changes.

drh 2020-08-18 14:02 sec2020 merge

Commit 917917aa55331052b80bb6525e54cb1260e8edf92faf17a00f412e16c3fe6f85

Parent 06d3789a2ad847c…

7 files changed +3 -3 +3 -3 -1 +2 -2 +2 -2 +51 -47 +12 -9

~ src/db.c ~ src/db.c ~ src/default.css ~ src/sync.c ~ src/sync.c ~ src/wikiformat.c ~ www/customskin.md

M src/db.c

+3 -3

		--- src/db.c
		+++ src/db.c
		@@ -3293,11 +3293,11 @@
3293	3293	**
3294	3294	** Options:
3295	3295	** --empty Initialize checkout as being empty, but still connected
3296	3296	** with the local repository. If you commit this checkout,
3297	3297	** it will become a new "initial" commit in the repository.
3298		-** --force Continue with the open even if the working directory is
	3298	+** -f\|--force Continue with the open even if the working directory is
3299	3299	** not empty.
3300	3300	** --force-missing Force opening a repository with missing content
3301	3301	** --keep Only modify the manifest and manifest.uuid files
3302	3302	** --nested Allow opening a repository inside an opened checkout
3303	3303	** --repodir DIR If REPOSITORY is a URI that will be cloned, store
		@@ -3337,11 +3337,11 @@
3337	3337	forceMissingFlag = find_option("force-missing",0,0)!=0;
3338	3338	allowNested = find_option("nested",0,0)!=0;
3339	3339	setmtimeFlag = find_option("setmtime",0,0)!=0;
3340	3340	zWorkDir = find_option("workdir",0,1);
3341	3341	zRepoDir = find_option("repodir",0,1);
3342		- bForce = find_option("force",0,0)!=0;
	3342	+ bForce = find_option("force","f",0)!=0;
3343	3343	if( find_option("symlinks",0,0)!=0 ) allowSymlinks = 1;
3344	3344	zPwd = file_getcwd(0,0);
3345	3345
3346	3346
3347	3347	/* We should be done with options.. */
		@@ -3377,11 +3377,11 @@
3377	3377	fossil_fatal("unable to make %s the working directory", zWorkDir);
3378	3378	}
3379	3379	}
3380	3380	if( keepFlag==0 && bForce==0 && file_directory_size(".", 0, 1)>0 ){
3381	3381	fossil_fatal("directory %s is not empty\n"
3382		- "use the --force option to override", file_getcwd(0,0));
	3382	+ "use the -f or --force option to override", file_getcwd(0,0));
3383	3383	}
3384	3384
3385	3385	if( db_open_local_v2(0, allowNested) ){
3386	3386	fossil_fatal("there is already an open tree at %s", g.zLocalRoot);
3387	3387	}
3388	3388

	--- src/db.c
	+++ src/db.c
	@@ -3293,11 +3293,11 @@
3293	**
3294	** Options:
3295	** --empty Initialize checkout as being empty, but still connected
3296	** with the local repository. If you commit this checkout,
3297	** it will become a new "initial" commit in the repository.
3298	** --force Continue with the open even if the working directory is
3299	** not empty.
3300	** --force-missing Force opening a repository with missing content
3301	** --keep Only modify the manifest and manifest.uuid files
3302	** --nested Allow opening a repository inside an opened checkout
3303	** --repodir DIR If REPOSITORY is a URI that will be cloned, store
	@@ -3337,11 +3337,11 @@
3337	forceMissingFlag = find_option("force-missing",0,0)!=0;
3338	allowNested = find_option("nested",0,0)!=0;
3339	setmtimeFlag = find_option("setmtime",0,0)!=0;
3340	zWorkDir = find_option("workdir",0,1);
3341	zRepoDir = find_option("repodir",0,1);
3342	bForce = find_option("force",0,0)!=0;
3343	if( find_option("symlinks",0,0)!=0 ) allowSymlinks = 1;
3344	zPwd = file_getcwd(0,0);
3345
3346
3347	/* We should be done with options.. */
	@@ -3377,11 +3377,11 @@
3377	fossil_fatal("unable to make %s the working directory", zWorkDir);
3378	}
3379	}
3380	if( keepFlag==0 && bForce==0 && file_directory_size(".", 0, 1)>0 ){
3381	fossil_fatal("directory %s is not empty\n"
3382	"use the --force option to override", file_getcwd(0,0));
3383	}
3384
3385	if( db_open_local_v2(0, allowNested) ){
3386	fossil_fatal("there is already an open tree at %s", g.zLocalRoot);
3387	}
3388

	--- src/db.c
	+++ src/db.c
	@@ -3293,11 +3293,11 @@
3293	**
3294	** Options:
3295	** --empty Initialize checkout as being empty, but still connected
3296	** with the local repository. If you commit this checkout,
3297	** it will become a new "initial" commit in the repository.
3298	** -f\|--force Continue with the open even if the working directory is
3299	** not empty.
3300	** --force-missing Force opening a repository with missing content
3301	** --keep Only modify the manifest and manifest.uuid files
3302	** --nested Allow opening a repository inside an opened checkout
3303	** --repodir DIR If REPOSITORY is a URI that will be cloned, store
	@@ -3337,11 +3337,11 @@
3337	forceMissingFlag = find_option("force-missing",0,0)!=0;
3338	allowNested = find_option("nested",0,0)!=0;
3339	setmtimeFlag = find_option("setmtime",0,0)!=0;
3340	zWorkDir = find_option("workdir",0,1);
3341	zRepoDir = find_option("repodir",0,1);
3342	bForce = find_option("force","f",0)!=0;
3343	if( find_option("symlinks",0,0)!=0 ) allowSymlinks = 1;
3344	zPwd = file_getcwd(0,0);
3345
3346
3347	/* We should be done with options.. */
	@@ -3377,11 +3377,11 @@
3377	fossil_fatal("unable to make %s the working directory", zWorkDir);
3378	}
3379	}
3380	if( keepFlag==0 && bForce==0 && file_directory_size(".", 0, 1)>0 ){
3381	fossil_fatal("directory %s is not empty\n"
3382	"use the -f or --force option to override", file_getcwd(0,0));
3383	}
3384
3385	if( db_open_local_v2(0, allowNested) ){
3386	fossil_fatal("there is already an open tree at %s", g.zLocalRoot);
3387	}
3388

M src/db.c

+3 -3

		--- src/db.c
		+++ src/db.c
		@@ -3293,11 +3293,11 @@
3293	3293	**
3294	3294	** Options:
3295	3295	** --empty Initialize checkout as being empty, but still connected
3296	3296	** with the local repository. If you commit this checkout,
3297	3297	** it will become a new "initial" commit in the repository.
3298		-** --force Continue with the open even if the working directory is
	3298	+** -f\|--force Continue with the open even if the working directory is
3299	3299	** not empty.
3300	3300	** --force-missing Force opening a repository with missing content
3301	3301	** --keep Only modify the manifest and manifest.uuid files
3302	3302	** --nested Allow opening a repository inside an opened checkout
3303	3303	** --repodir DIR If REPOSITORY is a URI that will be cloned, store
		@@ -3337,11 +3337,11 @@
3337	3337	forceMissingFlag = find_option("force-missing",0,0)!=0;
3338	3338	allowNested = find_option("nested",0,0)!=0;
3339	3339	setmtimeFlag = find_option("setmtime",0,0)!=0;
3340	3340	zWorkDir = find_option("workdir",0,1);
3341	3341	zRepoDir = find_option("repodir",0,1);
3342		- bForce = find_option("force",0,0)!=0;
	3342	+ bForce = find_option("force","f",0)!=0;
3343	3343	if( find_option("symlinks",0,0)!=0 ) allowSymlinks = 1;
3344	3344	zPwd = file_getcwd(0,0);
3345	3345
3346	3346
3347	3347	/* We should be done with options.. */
		@@ -3377,11 +3377,11 @@
3377	3377	fossil_fatal("unable to make %s the working directory", zWorkDir);
3378	3378	}
3379	3379	}
3380	3380	if( keepFlag==0 && bForce==0 && file_directory_size(".", 0, 1)>0 ){
3381	3381	fossil_fatal("directory %s is not empty\n"
3382		- "use the --force option to override", file_getcwd(0,0));
	3382	+ "use the -f or --force option to override", file_getcwd(0,0));
3383	3383	}
3384	3384
3385	3385	if( db_open_local_v2(0, allowNested) ){
3386	3386	fossil_fatal("there is already an open tree at %s", g.zLocalRoot);
3387	3387	}
3388	3388

	--- src/db.c
	+++ src/db.c
	@@ -3293,11 +3293,11 @@
3293	**
3294	** Options:
3295	** --empty Initialize checkout as being empty, but still connected
3296	** with the local repository. If you commit this checkout,
3297	** it will become a new "initial" commit in the repository.
3298	** --force Continue with the open even if the working directory is
3299	** not empty.
3300	** --force-missing Force opening a repository with missing content
3301	** --keep Only modify the manifest and manifest.uuid files
3302	** --nested Allow opening a repository inside an opened checkout
3303	** --repodir DIR If REPOSITORY is a URI that will be cloned, store
	@@ -3337,11 +3337,11 @@
3337	forceMissingFlag = find_option("force-missing",0,0)!=0;
3338	allowNested = find_option("nested",0,0)!=0;
3339	setmtimeFlag = find_option("setmtime",0,0)!=0;
3340	zWorkDir = find_option("workdir",0,1);
3341	zRepoDir = find_option("repodir",0,1);
3342	bForce = find_option("force",0,0)!=0;
3343	if( find_option("symlinks",0,0)!=0 ) allowSymlinks = 1;
3344	zPwd = file_getcwd(0,0);
3345
3346
3347	/* We should be done with options.. */
	@@ -3377,11 +3377,11 @@
3377	fossil_fatal("unable to make %s the working directory", zWorkDir);
3378	}
3379	}
3380	if( keepFlag==0 && bForce==0 && file_directory_size(".", 0, 1)>0 ){
3381	fossil_fatal("directory %s is not empty\n"
3382	"use the --force option to override", file_getcwd(0,0));
3383	}
3384
3385	if( db_open_local_v2(0, allowNested) ){
3386	fossil_fatal("there is already an open tree at %s", g.zLocalRoot);
3387	}
3388

	--- src/db.c
	+++ src/db.c
	@@ -3293,11 +3293,11 @@
3293	**
3294	** Options:
3295	** --empty Initialize checkout as being empty, but still connected
3296	** with the local repository. If you commit this checkout,
3297	** it will become a new "initial" commit in the repository.
3298	** -f\|--force Continue with the open even if the working directory is
3299	** not empty.
3300	** --force-missing Force opening a repository with missing content
3301	** --keep Only modify the manifest and manifest.uuid files
3302	** --nested Allow opening a repository inside an opened checkout
3303	** --repodir DIR If REPOSITORY is a URI that will be cloned, store
	@@ -3337,11 +3337,11 @@
3337	forceMissingFlag = find_option("force-missing",0,0)!=0;
3338	allowNested = find_option("nested",0,0)!=0;
3339	setmtimeFlag = find_option("setmtime",0,0)!=0;
3340	zWorkDir = find_option("workdir",0,1);
3341	zRepoDir = find_option("repodir",0,1);
3342	bForce = find_option("force","f",0)!=0;
3343	if( find_option("symlinks",0,0)!=0 ) allowSymlinks = 1;
3344	zPwd = file_getcwd(0,0);
3345
3346
3347	/* We should be done with options.. */
	@@ -3377,11 +3377,11 @@
3377	fossil_fatal("unable to make %s the working directory", zWorkDir);
3378	}
3379	}
3380	if( keepFlag==0 && bForce==0 && file_directory_size(".", 0, 1)>0 ){
3381	fossil_fatal("directory %s is not empty\n"
3382	"use the -f or --force option to override", file_getcwd(0,0));
3383	}
3384
3385	if( db_open_local_v2(0, allowNested) ){
3386	fossil_fatal("there is already an open tree at %s", g.zLocalRoot);
3387	}
3388

M src/default.css

-1

		--- src/default.css
		+++ src/default.css
		@@ -1155,11 +1155,10 @@
1155	1155	window width, and instead force a scrollbar
1156	1156	on them. */;
1157	1157	}
1158	1158	table.numbered-lines > tbody > tr {
1159	1159	font-family: monospace;
1160		- font-size: 1.2em;
1161	1160	line-height: 1.35;
1162	1161	white-space: pre;
1163	1162	}
1164	1163	table.numbered-lines > tbody > tr > td {
1165	1164	font-family: inherit;
1166	1165

	--- src/default.css
	+++ src/default.css
	@@ -1155,11 +1155,10 @@
1155	window width, and instead force a scrollbar
1156	on them. */;
1157	}
1158	table.numbered-lines > tbody > tr {
1159	font-family: monospace;
1160	font-size: 1.2em;
1161	line-height: 1.35;
1162	white-space: pre;
1163	}
1164	table.numbered-lines > tbody > tr > td {
1165	font-family: inherit;
1166

	--- src/default.css
	+++ src/default.css
	@@ -1155,11 +1155,10 @@
1155	window width, and instead force a scrollbar
1156	on them. */;
1157	}
1158	table.numbered-lines > tbody > tr {
1159	font-family: monospace;

1160	line-height: 1.35;
1161	white-space: pre;
1162	}
1163	table.numbered-lines > tbody > tr > td {
1164	font-family: inherit;
1165

M src/sync.c

+2 -2

		--- src/sync.c
		+++ src/sync.c
		@@ -511,20 +511,20 @@
511	511	**
512	512	** Usage: %fossil backup ?OPTIONS? FILE\|DIRECTORY
513	513	**
514	514	** Make a backup of the repository into the named file or into the named
515	515	** directory. This backup is guaranteed to be consistent even if there are
516		-** concurrent chnages taking place on the repository. In other words, it
	516	+** concurrent changes taking place on the repository. In other words, it
517	517	** is safe to run "fossil backup" on a repository that is in active use.
518	518	**
519	519	** Only the main repository database is backed up by this command. The
520	520	** open checkout file (if any) is not saved. Nor is the global configuration
521	521	** database.
522	522	**
523	523	** Options:
524	524	**
525		-** --overwrite OK to overwrite an existing file.
	525	+** --overwrite OK to overwrite an existing file
526	526	** -R NAME Filename of the repository to backup
527	527	*/
528	528	void backup_cmd(void){
529	529	char *zDest;
530	530	int bOverwrite = 0;
531	531

	--- src/sync.c
	+++ src/sync.c
	@@ -511,20 +511,20 @@
511	**
512	** Usage: %fossil backup ?OPTIONS? FILE\|DIRECTORY
513	**
514	** Make a backup of the repository into the named file or into the named
515	** directory. This backup is guaranteed to be consistent even if there are
516	** concurrent chnages taking place on the repository. In other words, it
517	** is safe to run "fossil backup" on a repository that is in active use.
518	**
519	** Only the main repository database is backed up by this command. The
520	** open checkout file (if any) is not saved. Nor is the global configuration
521	** database.
522	**
523	** Options:
524	**
525	** --overwrite OK to overwrite an existing file.
526	** -R NAME Filename of the repository to backup
527	*/
528	void backup_cmd(void){
529	char *zDest;
530	int bOverwrite = 0;
531

	--- src/sync.c
	+++ src/sync.c
	@@ -511,20 +511,20 @@
511	**
512	** Usage: %fossil backup ?OPTIONS? FILE\|DIRECTORY
513	**
514	** Make a backup of the repository into the named file or into the named
515	** directory. This backup is guaranteed to be consistent even if there are
516	** concurrent changes taking place on the repository. In other words, it
517	** is safe to run "fossil backup" on a repository that is in active use.
518	**
519	** Only the main repository database is backed up by this command. The
520	** open checkout file (if any) is not saved. Nor is the global configuration
521	** database.
522	**
523	** Options:
524	**
525	** --overwrite OK to overwrite an existing file
526	** -R NAME Filename of the repository to backup
527	*/
528	void backup_cmd(void){
529	char *zDest;
530	int bOverwrite = 0;
531

M src/sync.c

+2 -2

		--- src/sync.c
		+++ src/sync.c
		@@ -511,20 +511,20 @@
511	511	**
512	512	** Usage: %fossil backup ?OPTIONS? FILE\|DIRECTORY
513	513	**
514	514	** Make a backup of the repository into the named file or into the named
515	515	** directory. This backup is guaranteed to be consistent even if there are
516		-** concurrent chnages taking place on the repository. In other words, it
	516	+** concurrent changes taking place on the repository. In other words, it
517	517	** is safe to run "fossil backup" on a repository that is in active use.
518	518	**
519	519	** Only the main repository database is backed up by this command. The
520	520	** open checkout file (if any) is not saved. Nor is the global configuration
521	521	** database.
522	522	**
523	523	** Options:
524	524	**
525		-** --overwrite OK to overwrite an existing file.
	525	+** --overwrite OK to overwrite an existing file
526	526	** -R NAME Filename of the repository to backup
527	527	*/
528	528	void backup_cmd(void){
529	529	char *zDest;
530	530	int bOverwrite = 0;
531	531

	--- src/sync.c
	+++ src/sync.c
	@@ -511,20 +511,20 @@
511	**
512	** Usage: %fossil backup ?OPTIONS? FILE\|DIRECTORY
513	**
514	** Make a backup of the repository into the named file or into the named
515	** directory. This backup is guaranteed to be consistent even if there are
516	** concurrent chnages taking place on the repository. In other words, it
517	** is safe to run "fossil backup" on a repository that is in active use.
518	**
519	** Only the main repository database is backed up by this command. The
520	** open checkout file (if any) is not saved. Nor is the global configuration
521	** database.
522	**
523	** Options:
524	**
525	** --overwrite OK to overwrite an existing file.
526	** -R NAME Filename of the repository to backup
527	*/
528	void backup_cmd(void){
529	char *zDest;
530	int bOverwrite = 0;
531

	--- src/sync.c
	+++ src/sync.c
	@@ -511,20 +511,20 @@
511	**
512	** Usage: %fossil backup ?OPTIONS? FILE\|DIRECTORY
513	**
514	** Make a backup of the repository into the named file or into the named
515	** directory. This backup is guaranteed to be consistent even if there are
516	** concurrent changes taking place on the repository. In other words, it
517	** is safe to run "fossil backup" on a repository that is in active use.
518	**
519	** Only the main repository database is backed up by this command. The
520	** open checkout file (if any) is not saved. Nor is the global configuration
521	** database.
522	**
523	** Options:
524	**
525	** --overwrite OK to overwrite an existing file
526	** -R NAME Filename of the repository to backup
527	*/
528	void backup_cmd(void){
529	char *zDest;
530	int bOverwrite = 0;
531

M src/wikiformat.c

+51 -47

		--- src/wikiformat.c
		+++ src/wikiformat.c
		@@ -188,57 +188,59 @@
188	188	#define MARKUP_CITE 10
189	189	#define MARKUP_CODE 11
190	190	#define MARKUP_COL 12
191	191	#define MARKUP_COLGROUP 13
192	192	#define MARKUP_DD 14
193		-#define MARKUP_DFN 15
194		-#define MARKUP_DIV 16
195		-#define MARKUP_DL 17
196		-#define MARKUP_DT 18
197		-#define MARKUP_EM 19
198		-#define MARKUP_FONT 20
199		-#define MARKUP_HTML5_FOOTER 21
200		-#define MARKUP_H1 22
201		-#define MARKUP_H2 23
202		-#define MARKUP_H3 24
203		-#define MARKUP_H4 25
204		-#define MARKUP_H5 26
205		-#define MARKUP_H6 27
206		-#define MARKUP_HTML5_HEADER 28
207		-#define MARKUP_HR 29
208		-#define MARKUP_I 30
209		-#define MARKUP_IMG 31
210		-#define MARKUP_KBD 32
211		-#define MARKUP_LI 33
212		-#define MARKUP_HTML5_NAV 34
213		-#define MARKUP_NOBR 35
214		-#define MARKUP_NOWIKI 36
215		-#define MARKUP_OL 37
216		-#define MARKUP_P 38
217		-#define MARKUP_PRE 39
218		-#define MARKUP_S 40
219		-#define MARKUP_SAMP 41
220		-#define MARKUP_HTML5_SECTION 42
221		-#define MARKUP_SMALL 43
222		-#define MARKUP_SPAN 44
223		-#define MARKUP_STRIKE 45
224		-#define MARKUP_STRONG 46
225		-#define MARKUP_SUB 47
226		-#define MARKUP_SUP 48
227		-#define MARKUP_TABLE 49
228		-#define MARKUP_TBODY 50
229		-#define MARKUP_TD 51
230		-#define MARKUP_TFOOT 52
231		-#define MARKUP_TH 53
232		-#define MARKUP_THEAD 54
233		-#define MARKUP_TITLE 55
234		-#define MARKUP_TR 56
235		-#define MARKUP_TT 57
236		-#define MARKUP_U 58
237		-#define MARKUP_UL 59
238		-#define MARKUP_VAR 60
239		-#define MARKUP_VERBATIM 61
	193	+#define MARKUP_DEL 15
	194	+#define MARKUP_DFN 16
	195	+#define MARKUP_DIV 17
	196	+#define MARKUP_DL 18
	197	+#define MARKUP_DT 19
	198	+#define MARKUP_EM 20
	199	+#define MARKUP_FONT 21
	200	+#define MARKUP_HTML5_FOOTER 22
	201	+#define MARKUP_H1 23
	202	+#define MARKUP_H2 24
	203	+#define MARKUP_H3 25
	204	+#define MARKUP_H4 26
	205	+#define MARKUP_H5 27
	206	+#define MARKUP_H6 28
	207	+#define MARKUP_HTML5_HEADER 29
	208	+#define MARKUP_HR 30
	209	+#define MARKUP_I 31
	210	+#define MARKUP_IMG 32
	211	+#define MARKUP_INS 33
	212	+#define MARKUP_KBD 34
	213	+#define MARKUP_LI 35
	214	+#define MARKUP_HTML5_NAV 36
	215	+#define MARKUP_NOBR 37
	216	+#define MARKUP_NOWIKI 38
	217	+#define MARKUP_OL 39
	218	+#define MARKUP_P 40
	219	+#define MARKUP_PRE 41
	220	+#define MARKUP_S 42
	221	+#define MARKUP_SAMP 43
	222	+#define MARKUP_HTML5_SECTION 44
	223	+#define MARKUP_SMALL 45
	224	+#define MARKUP_SPAN 46
	225	+#define MARKUP_STRIKE 47
	226	+#define MARKUP_STRONG 48
	227	+#define MARKUP_SUB 49
	228	+#define MARKUP_SUP 50
	229	+#define MARKUP_TABLE 51
	230	+#define MARKUP_TBODY 52
	231	+#define MARKUP_TD 53
	232	+#define MARKUP_TFOOT 54
	233	+#define MARKUP_TH 55
	234	+#define MARKUP_THEAD 56
	235	+#define MARKUP_TITLE 57
	236	+#define MARKUP_TR 58
	237	+#define MARKUP_TT 59
	238	+#define MARKUP_U 60
	239	+#define MARKUP_UL 61
	240	+#define MARKUP_VAR 62
	241	+#define MARKUP_VERBATIM 63
240	242
241	243	/*
242	244	** The various markup is divided into the following types:
243	245	*/
244	246	#define MUTYPE_SINGLE 0x0001 /* <img>, <br>, or <hr> */
		@@ -290,10 +292,11 @@
290	292	{ "col", MARKUP_COL, MUTYPE_SINGLE,
291	293	AMSK_ALIGN\|AMSK_CLASS\|AMSK_COLSPAN\|AMSK_WIDTH\|AMSK_STYLE },
292	294	{ "colgroup", MARKUP_COLGROUP, MUTYPE_BLOCK,
293	295	AMSK_ALIGN\|AMSK_CLASS\|AMSK_COLSPAN\|AMSK_WIDTH\|AMSK_STYLE},
294	296	{ "dd", MARKUP_DD, MUTYPE_LI, AMSK_STYLE },
	297	+ { "del", MARKUP_DEL, MUTYPE_FONT, AMSK_STYLE },
295	298	{ "dfn", MARKUP_DFN, MUTYPE_FONT, AMSK_STYLE },
296	299	{ "div", MARKUP_DIV, MUTYPE_BLOCK,
297	300	AMSK_ID\|AMSK_CLASS\|AMSK_STYLE },
298	301	{ "dl", MARKUP_DL, MUTYPE_LIST,
299	302	AMSK_COMPACT\|AMSK_STYLE },
		@@ -325,10 +328,11 @@
325	328	AMSK_STYLE\|AMSK_CLASS },
326	329	{ "i", MARKUP_I, MUTYPE_FONT, AMSK_STYLE },
327	330	{ "img", MARKUP_IMG, MUTYPE_SINGLE,
328	331	AMSK_ALIGN\|AMSK_ALT\|AMSK_BORDER\|AMSK_HEIGHT\|
329	332	AMSK_HSPACE\|AMSK_SRC\|AMSK_VSPACE\|AMSK_WIDTH\|AMSK_STYLE },
	333	+ { "ins", MARKUP_INS, MUTYPE_FONT, AMSK_STYLE },
330	334	{ "kbd", MARKUP_KBD, MUTYPE_FONT, AMSK_STYLE },
331	335	{ "li", MARKUP_LI, MUTYPE_LI,
332	336	AMSK_TYPE\|AMSK_VALUE\|AMSK_STYLE },
333	337	{ "nav", MARKUP_HTML5_NAV, MUTYPE_BLOCK,
334	338	AMSK_ID\|AMSK_CLASS\|AMSK_STYLE },
335	339

	--- src/wikiformat.c
	+++ src/wikiformat.c
	@@ -188,57 +188,59 @@
188	#define MARKUP_CITE 10
189	#define MARKUP_CODE 11
190	#define MARKUP_COL 12
191	#define MARKUP_COLGROUP 13
192	#define MARKUP_DD 14
193	#define MARKUP_DFN 15
194	#define MARKUP_DIV 16
195	#define MARKUP_DL 17
196	#define MARKUP_DT 18
197	#define MARKUP_EM 19
198	#define MARKUP_FONT 20
199	#define MARKUP_HTML5_FOOTER 21
200	#define MARKUP_H1 22
201	#define MARKUP_H2 23
202	#define MARKUP_H3 24
203	#define MARKUP_H4 25
204	#define MARKUP_H5 26
205	#define MARKUP_H6 27
206	#define MARKUP_HTML5_HEADER 28
207	#define MARKUP_HR 29
208	#define MARKUP_I 30
209	#define MARKUP_IMG 31
210	#define MARKUP_KBD 32
211	#define MARKUP_LI 33
212	#define MARKUP_HTML5_NAV 34
213	#define MARKUP_NOBR 35
214	#define MARKUP_NOWIKI 36
215	#define MARKUP_OL 37
216	#define MARKUP_P 38
217	#define MARKUP_PRE 39
218	#define MARKUP_S 40
219	#define MARKUP_SAMP 41
220	#define MARKUP_HTML5_SECTION 42
221	#define MARKUP_SMALL 43
222	#define MARKUP_SPAN 44
223	#define MARKUP_STRIKE 45
224	#define MARKUP_STRONG 46
225	#define MARKUP_SUB 47
226	#define MARKUP_SUP 48
227	#define MARKUP_TABLE 49
228	#define MARKUP_TBODY 50
229	#define MARKUP_TD 51
230	#define MARKUP_TFOOT 52
231	#define MARKUP_TH 53
232	#define MARKUP_THEAD 54
233	#define MARKUP_TITLE 55
234	#define MARKUP_TR 56
235	#define MARKUP_TT 57
236	#define MARKUP_U 58
237	#define MARKUP_UL 59
238	#define MARKUP_VAR 60
239	#define MARKUP_VERBATIM 61


240
241	/*
242	** The various markup is divided into the following types:
243	*/
244	#define MUTYPE_SINGLE 0x0001 /* <img>, <br>, or <hr> */
	@@ -290,10 +292,11 @@
290	{ "col", MARKUP_COL, MUTYPE_SINGLE,
291	AMSK_ALIGN\|AMSK_CLASS\|AMSK_COLSPAN\|AMSK_WIDTH\|AMSK_STYLE },
292	{ "colgroup", MARKUP_COLGROUP, MUTYPE_BLOCK,
293	AMSK_ALIGN\|AMSK_CLASS\|AMSK_COLSPAN\|AMSK_WIDTH\|AMSK_STYLE},
294	{ "dd", MARKUP_DD, MUTYPE_LI, AMSK_STYLE },

295	{ "dfn", MARKUP_DFN, MUTYPE_FONT, AMSK_STYLE },
296	{ "div", MARKUP_DIV, MUTYPE_BLOCK,
297	AMSK_ID\|AMSK_CLASS\|AMSK_STYLE },
298	{ "dl", MARKUP_DL, MUTYPE_LIST,
299	AMSK_COMPACT\|AMSK_STYLE },
	@@ -325,10 +328,11 @@
325	AMSK_STYLE\|AMSK_CLASS },
326	{ "i", MARKUP_I, MUTYPE_FONT, AMSK_STYLE },
327	{ "img", MARKUP_IMG, MUTYPE_SINGLE,
328	AMSK_ALIGN\|AMSK_ALT\|AMSK_BORDER\|AMSK_HEIGHT\|
329	AMSK_HSPACE\|AMSK_SRC\|AMSK_VSPACE\|AMSK_WIDTH\|AMSK_STYLE },

330	{ "kbd", MARKUP_KBD, MUTYPE_FONT, AMSK_STYLE },
331	{ "li", MARKUP_LI, MUTYPE_LI,
332	AMSK_TYPE\|AMSK_VALUE\|AMSK_STYLE },
333	{ "nav", MARKUP_HTML5_NAV, MUTYPE_BLOCK,
334	AMSK_ID\|AMSK_CLASS\|AMSK_STYLE },
335

	--- src/wikiformat.c
	+++ src/wikiformat.c
	@@ -188,57 +188,59 @@
188	#define MARKUP_CITE 10
189	#define MARKUP_CODE 11
190	#define MARKUP_COL 12
191	#define MARKUP_COLGROUP 13
192	#define MARKUP_DD 14
193	#define MARKUP_DEL 15
194	#define MARKUP_DFN 16
195	#define MARKUP_DIV 17
196	#define MARKUP_DL 18
197	#define MARKUP_DT 19
198	#define MARKUP_EM 20
199	#define MARKUP_FONT 21
200	#define MARKUP_HTML5_FOOTER 22
201	#define MARKUP_H1 23
202	#define MARKUP_H2 24
203	#define MARKUP_H3 25
204	#define MARKUP_H4 26
205	#define MARKUP_H5 27
206	#define MARKUP_H6 28
207	#define MARKUP_HTML5_HEADER 29
208	#define MARKUP_HR 30
209	#define MARKUP_I 31
210	#define MARKUP_IMG 32
211	#define MARKUP_INS 33
212	#define MARKUP_KBD 34
213	#define MARKUP_LI 35
214	#define MARKUP_HTML5_NAV 36
215	#define MARKUP_NOBR 37
216	#define MARKUP_NOWIKI 38
217	#define MARKUP_OL 39
218	#define MARKUP_P 40
219	#define MARKUP_PRE 41
220	#define MARKUP_S 42
221	#define MARKUP_SAMP 43
222	#define MARKUP_HTML5_SECTION 44
223	#define MARKUP_SMALL 45
224	#define MARKUP_SPAN 46
225	#define MARKUP_STRIKE 47
226	#define MARKUP_STRONG 48
227	#define MARKUP_SUB 49
228	#define MARKUP_SUP 50
229	#define MARKUP_TABLE 51
230	#define MARKUP_TBODY 52
231	#define MARKUP_TD 53
232	#define MARKUP_TFOOT 54
233	#define MARKUP_TH 55
234	#define MARKUP_THEAD 56
235	#define MARKUP_TITLE 57
236	#define MARKUP_TR 58
237	#define MARKUP_TT 59
238	#define MARKUP_U 60
239	#define MARKUP_UL 61
240	#define MARKUP_VAR 62
241	#define MARKUP_VERBATIM 63
242
243	/*
244	** The various markup is divided into the following types:
245	*/
246	#define MUTYPE_SINGLE 0x0001 /* <img>, <br>, or <hr> */
	@@ -290,10 +292,11 @@
292	{ "col", MARKUP_COL, MUTYPE_SINGLE,
293	AMSK_ALIGN\|AMSK_CLASS\|AMSK_COLSPAN\|AMSK_WIDTH\|AMSK_STYLE },
294	{ "colgroup", MARKUP_COLGROUP, MUTYPE_BLOCK,
295	AMSK_ALIGN\|AMSK_CLASS\|AMSK_COLSPAN\|AMSK_WIDTH\|AMSK_STYLE},
296	{ "dd", MARKUP_DD, MUTYPE_LI, AMSK_STYLE },
297	{ "del", MARKUP_DEL, MUTYPE_FONT, AMSK_STYLE },
298	{ "dfn", MARKUP_DFN, MUTYPE_FONT, AMSK_STYLE },
299	{ "div", MARKUP_DIV, MUTYPE_BLOCK,
300	AMSK_ID\|AMSK_CLASS\|AMSK_STYLE },
301	{ "dl", MARKUP_DL, MUTYPE_LIST,
302	AMSK_COMPACT\|AMSK_STYLE },
	@@ -325,10 +328,11 @@
328	AMSK_STYLE\|AMSK_CLASS },
329	{ "i", MARKUP_I, MUTYPE_FONT, AMSK_STYLE },
330	{ "img", MARKUP_IMG, MUTYPE_SINGLE,
331	AMSK_ALIGN\|AMSK_ALT\|AMSK_BORDER\|AMSK_HEIGHT\|
332	AMSK_HSPACE\|AMSK_SRC\|AMSK_VSPACE\|AMSK_WIDTH\|AMSK_STYLE },
333	{ "ins", MARKUP_INS, MUTYPE_FONT, AMSK_STYLE },
334	{ "kbd", MARKUP_KBD, MUTYPE_FONT, AMSK_STYLE },
335	{ "li", MARKUP_LI, MUTYPE_LI,
336	AMSK_TYPE\|AMSK_VALUE\|AMSK_STYLE },
337	{ "nav", MARKUP_HTML5_NAV, MUTYPE_BLOCK,
338	AMSK_ID\|AMSK_CLASS\|AMSK_STYLE },
339

M www/customskin.md

+12 -9

		--- www/customskin.md
		+++ www/customskin.md
		@@ -68,12 +68,13 @@
68	68	<tr><td style='background-color:lightblue;text-align:center;'>Content Footer</td></tr>
69	69	<tr><td style='background-color:lightgreen;text-align:center;'>
70	70	Fossil-Generated HTML Footer</td></tr>
71	71	</tbody></table></blockquote>
72	72
73		-The green parts are generated by Fossil. The blue parts are things that
74		-you, the administrator, get to modify in order to customize the skin.
	73	+The green parts are usually generated by Fossil. The blue parts
	74	+are things that you, the administrator, get to modify in order to
	75	+customize the skin.
75	76
76	77	Fossil usually (but not always - [see below](#override))
77	78	generates the initial HTML Header section of a page. The
78	79	generated HTML Header will look something like this:
79	80
		@@ -85,31 +86,33 @@
85	86	<title>....</title>
86	87	<link rel="stylesheet" href="..." type="text/css" />
87	88	</head>
88	89	<body>
89	90
90		-In most cases, it is best to leave the Fossil-generated HTML Header alone.
91		-The configurable part of the skin begins with the Content Header section which
92		-should followign the following template:
	91	+In most cases, it is best to leave the Fossil-generated HTML Header
	92	+alone. (One exception is when the administrator needs to include links
	93	+to additional CSS files.) The configurable part of the skin begins
	94	+with the Content Header section which should follow this template:
93	95
94	96	<div class="header">
95	97	... top banner and menu bar ...
96	98	</div>
97	99
98		-Note that `<div class="header">` and `</div>` tags must be included in the
99		-Content Header text of the skin. In other words, you the administrator need
100		-to supply that text as part of your skin customization.
	100	+Note that `<div class="header">` and `</div>` tags must be included in
	101	+the Content Header text of the skin. In other words, you, the
	102	+administrator, need to supply that text as part of your skin
	103	+customization.
101	104
102	105	The Fossil-generated Content section immediately follows the Content Header.
103	106	The Content section will looks like this:
104	107
105	108	<div class="content">
106	109	... Fossil-generated content here ...
107	110	</div>
108	111
109	112	After the Content is the custom Content Footer section which should
110		-following this template:
	113	+follow this template:
111	114
112	115	<div class="footer">
113	116	... skin-specific stuff here ...
114	117	</div>
115	118	<script nonce="$nonce">
116	119

	--- www/customskin.md
	+++ www/customskin.md
	@@ -68,12 +68,13 @@
68	<tr><td style='background-color:lightblue;text-align:center;'>Content Footer</td></tr>
69	<tr><td style='background-color:lightgreen;text-align:center;'>
70	Fossil-Generated HTML Footer</td></tr>
71	</tbody></table></blockquote>
72
73	The green parts are generated by Fossil. The blue parts are things that
74	you, the administrator, get to modify in order to customize the skin.

75
76	Fossil usually (but not always - [see below](#override))
77	generates the initial HTML Header section of a page. The
78	generated HTML Header will look something like this:
79
	@@ -85,31 +86,33 @@
85	<title>....</title>
86	<link rel="stylesheet" href="..." type="text/css" />
87	</head>
88	<body>
89
90	In most cases, it is best to leave the Fossil-generated HTML Header alone.
91	The configurable part of the skin begins with the Content Header section which
92	should followign the following template:

93
94	<div class="header">
95	... top banner and menu bar ...
96	</div>
97
98	Note that `<div class="header">` and `</div>` tags must be included in the
99	Content Header text of the skin. In other words, you the administrator need
100	to supply that text as part of your skin customization.

101
102	The Fossil-generated Content section immediately follows the Content Header.
103	The Content section will looks like this:
104
105	<div class="content">
106	... Fossil-generated content here ...
107	</div>
108
109	After the Content is the custom Content Footer section which should
110	following this template:
111
112	<div class="footer">
113	... skin-specific stuff here ...
114	</div>
115	<script nonce="$nonce">
116

	--- www/customskin.md
	+++ www/customskin.md
	@@ -68,12 +68,13 @@
68	<tr><td style='background-color:lightblue;text-align:center;'>Content Footer</td></tr>
69	<tr><td style='background-color:lightgreen;text-align:center;'>
70	Fossil-Generated HTML Footer</td></tr>
71	</tbody></table></blockquote>
72
73	The green parts are usually generated by Fossil. The blue parts
74	are things that you, the administrator, get to modify in order to
75	customize the skin.
76
77	Fossil usually (but not always - [see below](#override))
78	generates the initial HTML Header section of a page. The
79	generated HTML Header will look something like this:
80
	@@ -85,31 +86,33 @@
86	<title>....</title>
87	<link rel="stylesheet" href="..." type="text/css" />
88	</head>
89	<body>
90
91	In most cases, it is best to leave the Fossil-generated HTML Header
92	alone. (One exception is when the administrator needs to include links
93	to additional CSS files.) The configurable part of the skin begins
94	with the Content Header section which should follow this template:
95
96	<div class="header">
97	... top banner and menu bar ...
98	</div>
99
100	Note that `<div class="header">` and `</div>` tags must be included in
101	the Content Header text of the skin. In other words, you, the
102	administrator, need to supply that text as part of your skin
103	customization.
104
105	The Fossil-generated Content section immediately follows the Content Header.
106	The Content section will looks like this:
107
108	<div class="content">
109	... Fossil-generated content here ...
110	</div>
111
112	After the Content is the custom Content Footer section which should
113	follow this template:
114
115	<div class="footer">
116	... skin-specific stuff here ...
117	</div>
118	<script nonce="$nonce">
119

Fossil SCM

Keyboard Shortcuts