Fossil SCM

Let's bring down the number of eol-spaces someswhat more. No functional changes.

jan.nijtmans 2015-10-02 10:35 trunk

Commit e757cd3d2345cc61089790bac48ed5c6e29bcd35

Parent 583e2f8f2c64190…

9 files changed +3 -3 +2 -2 +4 -4 +26 -26 +1 -1 +1 -1 +1 -1 +2 -2 +3 -3

~ ajax/i-test/rhino-test.js ~ ajax/index.html ~ ajax/wiki-editor.html ~ src/markdown.md ~ tools/cvs2fossil/changeset ~ tools/cvs2fossil/lib/c2f_pbreakacycle.tcl ~ tools/cvs2fossil/lib/c2f_prev.tcl ~ tools/cvs2fossil/lib/mem.tcl ~ tools/fossilwiki

M ajax/i-test/rhino-test.js

+3 -3

		--- ajax/i-test/rhino-test.js
		+++ ajax/i-test/rhino-test.js
		@@ -42,11 +42,11 @@
42	42	};
43	43	cb.onResponse = function(resp,req){
44	44	if(!TestApp.verbose) return;
45	45	print("GOT RESPONSE: "+(('string'===typeof resp) ? resp : WhAjaj.stringify(resp)));
46	46	};
47		-
	47	+
48	48	})();
49	49
50	50	/**
51	51	Throws an exception of cond is a falsy value.
52	52	*/
		@@ -127,11 +127,11 @@
127	127
128	128	function testIAmNobody(){
129	129	TestApp.fossil.whoami('/json/whoami');
130	130	assert('nobody' === TestApp.fossil.auth.name, 'User == nobody.' );
131	131	assert(!TestApp.fossil.auth.authToken, 'authToken is not set.' );
132		-
	132	+
133	133	}
134	134	testIAmNobody.description = 'Ensure that current user is "nobody".';
135	135
136	136
137	137	function testAnonymousLogin(){
		@@ -221,11 +221,11 @@
221	221	req = json = outs = osr = osb = undefined;
222	222	var ins = p.getInputStream();
223	223	var isr = new java.io.InputStreamReader(ins);
224	224	var br = new java.io.BufferedReader(isr);
225	225	var line;
226		-
	226	+
227	227	while( null !== (line=br.readLine())){
228	228	print(line);
229	229	}
230	230	br.close();
231	231	isr.close();
232	232

	--- ajax/i-test/rhino-test.js
	+++ ajax/i-test/rhino-test.js
	@@ -42,11 +42,11 @@
42	};
43	cb.onResponse = function(resp,req){
44	if(!TestApp.verbose) return;
45	print("GOT RESPONSE: "+(('string'===typeof resp) ? resp : WhAjaj.stringify(resp)));
46	};
47
48	})();
49
50	/**
51	Throws an exception of cond is a falsy value.
52	*/
	@@ -127,11 +127,11 @@
127
128	function testIAmNobody(){
129	TestApp.fossil.whoami('/json/whoami');
130	assert('nobody' === TestApp.fossil.auth.name, 'User == nobody.' );
131	assert(!TestApp.fossil.auth.authToken, 'authToken is not set.' );
132
133	}
134	testIAmNobody.description = 'Ensure that current user is "nobody".';
135
136
137	function testAnonymousLogin(){
	@@ -221,11 +221,11 @@
221	req = json = outs = osr = osb = undefined;
222	var ins = p.getInputStream();
223	var isr = new java.io.InputStreamReader(ins);
224	var br = new java.io.BufferedReader(isr);
225	var line;
226
227	while( null !== (line=br.readLine())){
228	print(line);
229	}
230	br.close();
231	isr.close();
232

	--- ajax/i-test/rhino-test.js
	+++ ajax/i-test/rhino-test.js
	@@ -42,11 +42,11 @@
42	};
43	cb.onResponse = function(resp,req){
44	if(!TestApp.verbose) return;
45	print("GOT RESPONSE: "+(('string'===typeof resp) ? resp : WhAjaj.stringify(resp)));
46	};
47
48	})();
49
50	/**
51	Throws an exception of cond is a falsy value.
52	*/
	@@ -127,11 +127,11 @@
127
128	function testIAmNobody(){
129	TestApp.fossil.whoami('/json/whoami');
130	assert('nobody' === TestApp.fossil.auth.name, 'User == nobody.' );
131	assert(!TestApp.fossil.auth.authToken, 'authToken is not set.' );
132
133	}
134	testIAmNobody.description = 'Ensure that current user is "nobody".';
135
136
137	function testAnonymousLogin(){
	@@ -221,11 +221,11 @@
221	req = json = outs = osr = osb = undefined;
222	var ins = p.getInputStream();
223	var isr = new java.io.InputStreamReader(ins);
224	var br = new java.io.BufferedReader(isr);
225	var line;
226
227	while( null !== (line=br.readLine())){
228	print(line);
229	}
230	br.close();
231	isr.close();
232

M ajax/index.html

+2 -2

		--- ajax/index.html
		+++ ajax/index.html
		@@ -3,18 +3,18 @@
3	3	<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
4	4
5	5	<head>
6	6	<title>Fossil/JSON raw request sending</title>
7	7	<meta http-equiv="content-type" content="text/html;charset=utf-8" />
8		- <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js"></script>
	8	+ <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js"></script>
9	9	<script type="text/javascript" src="js/whajaj.js"></script>
10	10	<script type="text/javascript" src="js/fossil-ajaj.js"></script>
11	11
12	12	<style type='text/css'>
13	13	th {
14	14	text-align: left;
15		- background-color: #ececec;
	15	+ background-color: #ececec;
16	16	}
17	17
18	18	.dangerWillRobinson {
19	19	background-color: yellow;
20	20	}
21	21

	--- ajax/index.html
	+++ ajax/index.html
	@@ -3,18 +3,18 @@
3	<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
4
5	<head>
6	<title>Fossil/JSON raw request sending</title>
7	<meta http-equiv="content-type" content="text/html;charset=utf-8" />
8	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js"></script>
9	<script type="text/javascript" src="js/whajaj.js"></script>
10	<script type="text/javascript" src="js/fossil-ajaj.js"></script>
11
12	<style type='text/css'>
13	th {
14	text-align: left;
15	background-color: #ececec;
16	}
17
18	.dangerWillRobinson {
19	background-color: yellow;
20	}
21

	--- ajax/index.html
	+++ ajax/index.html
	@@ -3,18 +3,18 @@
3	<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
4
5	<head>
6	<title>Fossil/JSON raw request sending</title>
7	<meta http-equiv="content-type" content="text/html;charset=utf-8" />
8	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js"></script>
9	<script type="text/javascript" src="js/whajaj.js"></script>
10	<script type="text/javascript" src="js/fossil-ajaj.js"></script>
11
12	<style type='text/css'>
13	th {
14	text-align: left;
15	background-color: #ececec;
16	}
17
18	.dangerWillRobinson {
19	background-color: yellow;
20	}
21

M ajax/wiki-editor.html

+4 -4

		--- ajax/wiki-editor.html
		+++ ajax/wiki-editor.html
		@@ -3,18 +3,18 @@
3	3	<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
4	4
5	5	<head>
6	6	<title>Fossil/JSON Wiki Editor Prototype</title>
7	7	<meta http-equiv="content-type" content="text/html;charset=utf-8" />
8		- <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
	8	+ <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
9	9	<script type="text/javascript" src="js/whajaj.js"></script>
10	10	<script type="text/javascript" src="js/fossil-ajaj.js"></script>
11	11
12	12	<style type='text/css'>
13	13	th {
14	14	text-align: left;
15		- background-color: #ececec;
	15	+ background-color: #ececec;
16	16	}
17	17
18	18	.dangerWillRobinson {
19	19	background-color: yellow;
20	20	}
		@@ -215,11 +215,11 @@
215	215	var k, v, li = [];
216	216	for( k in TheApp.pages ){
217	217	if(!TheApp.pages.hasOwnProperty(k)) continue;
218	218	li.push(k);
219	219	}
220		- return li;
	220	+ return li;
221	221	})();
222	222	var i, p, a, tgt = TheApp.jqe.pageListArea;
223	223	tgt.text('');
224	224	function makeLink(name){
225	225	var link = jQuery('<span></span>');
		@@ -322,11 +322,11 @@
322	322
323	323	<br>
324	324	<b>Login:</b>
325	325	<br/>
326	326	<input type='button' value='Anon. Login' onclick='TheApp.cgi.login()' />
327		-or:
	327	+or:
328	328	name:<input type='text' id='textUser' value='json-demo' size='12'/>
329	329	pw:<input type='password' id='textPassword' value='json-demo' size='12'/>
330	330	<input type='button' value='login' onclick='TheApp.cgi.login(jQuery("#textUser").val(),jQuery("#textPassword").val(),{onResponse:TheApp.onLogin})' />
331	331	<input type='button' value='logout' onclick='TheApp.cgi.logout()' />
332	332
333	333

	--- ajax/wiki-editor.html
	+++ ajax/wiki-editor.html
	@@ -3,18 +3,18 @@
3	<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
4
5	<head>
6	<title>Fossil/JSON Wiki Editor Prototype</title>
7	<meta http-equiv="content-type" content="text/html;charset=utf-8" />
8	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
9	<script type="text/javascript" src="js/whajaj.js"></script>
10	<script type="text/javascript" src="js/fossil-ajaj.js"></script>
11
12	<style type='text/css'>
13	th {
14	text-align: left;
15	background-color: #ececec;
16	}
17
18	.dangerWillRobinson {
19	background-color: yellow;
20	}
	@@ -215,11 +215,11 @@
215	var k, v, li = [];
216	for( k in TheApp.pages ){
217	if(!TheApp.pages.hasOwnProperty(k)) continue;
218	li.push(k);
219	}
220	return li;
221	})();
222	var i, p, a, tgt = TheApp.jqe.pageListArea;
223	tgt.text('');
224	function makeLink(name){
225	var link = jQuery('<span></span>');
	@@ -322,11 +322,11 @@
322
323	<br>
324	<b>Login:</b>
325	<br/>
326	<input type='button' value='Anon. Login' onclick='TheApp.cgi.login()' />
327	or:
328	name:<input type='text' id='textUser' value='json-demo' size='12'/>
329	pw:<input type='password' id='textPassword' value='json-demo' size='12'/>
330	<input type='button' value='login' onclick='TheApp.cgi.login(jQuery("#textUser").val(),jQuery("#textPassword").val(),{onResponse:TheApp.onLogin})' />
331	<input type='button' value='logout' onclick='TheApp.cgi.logout()' />
332
333

	--- ajax/wiki-editor.html
	+++ ajax/wiki-editor.html
	@@ -3,18 +3,18 @@
3	<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
4
5	<head>
6	<title>Fossil/JSON Wiki Editor Prototype</title>
7	<meta http-equiv="content-type" content="text/html;charset=utf-8" />
8	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
9	<script type="text/javascript" src="js/whajaj.js"></script>
10	<script type="text/javascript" src="js/fossil-ajaj.js"></script>
11
12	<style type='text/css'>
13	th {
14	text-align: left;
15	background-color: #ececec;
16	}
17
18	.dangerWillRobinson {
19	background-color: yellow;
20	}
	@@ -215,11 +215,11 @@
215	var k, v, li = [];
216	for( k in TheApp.pages ){
217	if(!TheApp.pages.hasOwnProperty(k)) continue;
218	li.push(k);
219	}
220	return li;
221	})();
222	var i, p, a, tgt = TheApp.jqe.pageListArea;
223	tgt.text('');
224	function makeLink(name){
225	var link = jQuery('<span></span>');
	@@ -322,11 +322,11 @@
322
323	<br>
324	<b>Login:</b>
325	<br/>
326	<input type='button' value='Anon. Login' onclick='TheApp.cgi.login()' />
327	or:
328	name:<input type='text' id='textUser' value='json-demo' size='12'/>
329	pw:<input type='password' id='textPassword' value='json-demo' size='12'/>
330	<input type='button' value='login' onclick='TheApp.cgi.login(jQuery("#textUser").val(),jQuery("#textPassword").val(),{onResponse:TheApp.onLogin})' />
331	<input type='button' value='logout' onclick='TheApp.cgi.logout()' />
332
333

M src/markdown.md

+26 -26

		--- src/markdown.md
		+++ src/markdown.md
		@@ -1,10 +1,10 @@
1	1	# Markdown formatting rules
2	2
3		-In addition to its native Wiki formatting syntax, Fossil supports Markdown syntax as specified by
4		-[John Gruber's original Markdown implementation](http://daringfireball.net/projects/markdown/).
5		-For lots of examples - not repeated here - please refer to its
	3	+In addition to its native Wiki formatting syntax, Fossil supports Markdown syntax as specified by
	4	+[John Gruber's original Markdown implementation](http://daringfireball.net/projects/markdown/).
	5	+For lots of examples - not repeated here - please refer to its
6	6	[syntax description](http://daringfireball.net/projects/markdown/syntax), of which the page you
7	7	are reading is an extract.
8	8
9	9	This page itself uses Markdown formatting.
10	10
		@@ -12,18 +12,18 @@
12	12
13	13	- Block elements
14	14
15	15	* A paragraph is a group of consecutive lines. Paragraphs are separated by blank lines.
16	16
17		- * A Header is a line of text underlined with equal signs or hyphens, or prefixed by a
	17	+ * A Header is a line of text underlined with equal signs or hyphens, or prefixed by a
18	18	number of hash marks.
19	19
20	20	* Block quotes are blocks of text prefixed by '>'.
21	21
22	22	* Ordered list items are prefixed by a number and a period. Unordered list items
23	23	are prefixed by a hyphen, asterisk or plus sign. Prefix and item text are separated by
24		- whitespace.
	24	+ whitespace.
25	25
26	26	* Code blocks are formed by lines of text (possibly including empty lines) prefixed by
27	27	at least 4 spaces or a tab.
28	28
29	29	* A horizontal rule is a line consisting of 3 or more asterisks, hyphens or underscores,
		@@ -34,26 +34,26 @@
34	34	* 3 types of links exist:
35	35
36	36	- automatic links are URLs or email addresses enclosed in angle brackets
37	37	('<' and '>'), and are displayed as such.
38	38
39		- - inline links consist of the displayed link text in square brackets ('[' and ']'),
40		- followed by the link target in parentheses.
	39	+ - inline links consist of the displayed link text in square brackets ('[' and ']'),
	40	+ followed by the link target in parentheses.
41	41
42		- - reference links separate _link instance_ from _link definition_. A link instance
43		- consists of the displayed link text in square brackets, followed by a link definition name
44		- in square brackets.
	42	+ - reference links separate _link instance_ from _link definition_. A link instance
	43	+ consists of the displayed link text in square brackets, followed by a link definition name
	44	+ in square brackets.
45	45	The corresponding link definition can occur anywhere on the page, and consists
46		- of the link definition name in square brackets followed by a colon, whitespace and the
	46	+ of the link definition name in square brackets followed by a colon, whitespace and the
47	47	link target.
48	48
49	49	* Emphasis can be given by wrapping text in one or two asterisks or underscores - use
50	50	one for HTML `<em>`, and two for `<strong>` emphasis.
51	51
52	52	* A code span is text wrapped in backticks ('`').
53	53
54		- * Images use a syntax much like inline or reference links, but with alt attribute text
	54	+ * Images use a syntax much like inline or reference links, but with alt attribute text
55	55	('img alt=...') instead of link text, and the first pair of square
56	56	brackets in an image instance prefixed by an exclamation mark.
57	57
58	58	- Inline HTML is mostly interpreted automatically.
59	59
		@@ -88,11 +88,11 @@
88	88	### Block quotes
89	89
90	90	Not every line in a paragraph needs to be prefixed by '>' in order to make it a block quote,
91	91	only the first line.
92	92
93		-Block quoted paragraphs can be nested by using multiple '>' characters as prefix.
	93	+Block quoted paragraphs can be nested by using multiple '>' characters as prefix.
94	94
95	95	Within a block quote, Markdown formatting (e.g. lists, emphasis) still works as normal.
96	96
97	97	### Lists
98	98
		@@ -99,20 +99,20 @@
99	99	A list item prefix need not occur first on its line; up to 3 leading spaces are allowed
100	100	(4 spaces would make a code block out of the following text).
101	101
102	102	For unordered lists, asterisks, hyphens and plus signs can be used interchangeably.
103	103
104		-For ordered lists, arbitrary numbers can be used as part of an item prefix; the items will be
105		-renumbered during rendering. However, future implementations may demand that the number used
	104	+For ordered lists, arbitrary numbers can be used as part of an item prefix; the items will be
	105	+renumbered during rendering. However, future implementations may demand that the number used
106	106	for the first item in a list indicates an offset to be used for subsequent items.
107	107
108	108	For list items spanning multiple lines, subsequent lines can be indented using an arbitrary amount
109	109	of whitespace.
110	110
111	111	List items will be wrapped in HTML `<p>` tags if they are separated by blank lines.
112	112
113		-A list item may span multiple paragraphs. At least the first line of each such paragraph must
	113	+A list item may span multiple paragraphs. At least the first line of each such paragraph must
114	114	be indented using at least 4 spaces or a tab character.
115	115
116	116	Block quotes within list items must have their '>' delimiters indented using 4 up to 7 spaces.
117	117
118	118	Code blocks within list items need to be indented _twice_, that is, using 8 spaces or 2 tab
		@@ -131,31 +131,31 @@
131	131
132	132	### Links
133	133
134	134	#### Automatic links
135	135
136		-When rendering automatic links to email addresses, HTML encoding obfuscation is used to
	136	+When rendering automatic links to email addresses, HTML encoding obfuscation is used to
137	137	prevent some spambots from harvesting.
138	138
139	139	#### Inline links
140	140
141	141	Links to resources on the same server can use relative paths (i.e. can start with a '/').
142	142
143		-An optional title for the link (e.g. to have mouseover text in the browser) may be given behind
144		-the link target but within the parentheses, in single and double quotes, and separated from the
145		-link target by whitespace.
	143	+An optional title for the link (e.g. to have mouseover text in the browser) may be given behind
	144	+the link target but within the parentheses, in single and double quotes, and separated from the
	145	+link target by whitespace.
146	146
147	147	#### Reference links
148	148
149		-> Each reference link consists of
	149	+> Each reference link consists of
150	150	>
151	151	> - one or more _link instances_ at appropriate locations in the page text
152	152	> - a single _link definition_ at an arbitrary location on the page
153		->
	153	+>
154	154	> During rendering, each link instance is resolved, and the corresponding definition is
155	155	> filled in. No separate link definition clauses occur in the rendered output.
156		->
	156	+>
157	157	> There are 3 fields involved in link instances and definitions:
158	158	>
159	159	> - link text (i.e. the text that is displayed at the resulting link)
160	160	> - link definition name (i.e. an unique ID binding link instances to link definition)
161	161	> - link target (a target URL for the link)
		@@ -197,11 +197,11 @@
197	197	### Code spans
198	198
199	199	To include a literal backtick character in a code span, use multiple backticks as opening and
200	200	closing delimiters.
201	201
202		-Whitespace may exist immediately after the opening delimiter and before the closing delimiter
	202	+Whitespace may exist immediately after the opening delimiter and before the closing delimiter
203	203	of a code span, to allow for code fragments starting or ending with a backtick.
204	204
205	205	Within a code span - like within a code block - angle brackets and ampersands are automatically encoded to make including
206	206	HTML fragments easier.
207	207
		@@ -209,17 +209,17 @@
209	209
210	210	If necessary, HTML must be used to specify image dimensions. Markdown has no provision for this.
211	211
212	212	### Inline HTML
213	213
214		-Start and end tags of
	214	+Start and end tags of
215	215	a HTML block level construct (`<div>`, `<table>` etc) must be separated from surrounding
216	216	context using blank lines, and must both occur at the start of a line.
217	217
218	218	No extra unwanted `<p>` HTML tags are added around HTML block level tags.
219	219
220		-Markdown formatting within HTML block level tags is not processed; however, formatting within
	220	+Markdown formatting within HTML block level tags is not processed; however, formatting within
221	221	span level tags (e.g. `<mark>`) is processed normally.
222	222
223	223	### Escaping Markdown punctuation
224	224
225	225	The following punctuation characters can be escaped using backslash:
226	226

	--- src/markdown.md
	+++ src/markdown.md
	@@ -1,10 +1,10 @@
1	# Markdown formatting rules
2
3	In addition to its native Wiki formatting syntax, Fossil supports Markdown syntax as specified by
4	[John Gruber's original Markdown implementation](http://daringfireball.net/projects/markdown/).
5	For lots of examples - not repeated here - please refer to its
6	[syntax description](http://daringfireball.net/projects/markdown/syntax), of which the page you
7	are reading is an extract.
8
9	This page itself uses Markdown formatting.
10
	@@ -12,18 +12,18 @@
12
13	- Block elements
14
15	* A paragraph is a group of consecutive lines. Paragraphs are separated by blank lines.
16
17	* A Header is a line of text underlined with equal signs or hyphens, or prefixed by a
18	number of hash marks.
19
20	* Block quotes are blocks of text prefixed by '>'.
21
22	* Ordered list items are prefixed by a number and a period. Unordered list items
23	are prefixed by a hyphen, asterisk or plus sign. Prefix and item text are separated by
24	whitespace.
25
26	* Code blocks are formed by lines of text (possibly including empty lines) prefixed by
27	at least 4 spaces or a tab.
28
29	* A horizontal rule is a line consisting of 3 or more asterisks, hyphens or underscores,
	@@ -34,26 +34,26 @@
34	* 3 types of links exist:
35
36	- automatic links are URLs or email addresses enclosed in angle brackets
37	('<' and '>'), and are displayed as such.
38
39	- inline links consist of the displayed link text in square brackets ('[' and ']'),
40	followed by the link target in parentheses.
41
42	- reference links separate _link instance_ from _link definition_. A link instance
43	consists of the displayed link text in square brackets, followed by a link definition name
44	in square brackets.
45	The corresponding link definition can occur anywhere on the page, and consists
46	of the link definition name in square brackets followed by a colon, whitespace and the
47	link target.
48
49	* Emphasis can be given by wrapping text in one or two asterisks or underscores - use
50	one for HTML `<em>`, and two for `<strong>` emphasis.
51
52	* A code span is text wrapped in backticks ('`').
53
54	* Images use a syntax much like inline or reference links, but with alt attribute text
55	('img alt=...') instead of link text, and the first pair of square
56	brackets in an image instance prefixed by an exclamation mark.
57
58	- Inline HTML is mostly interpreted automatically.
59
	@@ -88,11 +88,11 @@
88	### Block quotes
89
90	Not every line in a paragraph needs to be prefixed by '>' in order to make it a block quote,
91	only the first line.
92
93	Block quoted paragraphs can be nested by using multiple '>' characters as prefix.
94
95	Within a block quote, Markdown formatting (e.g. lists, emphasis) still works as normal.
96
97	### Lists
98
	@@ -99,20 +99,20 @@
99	A list item prefix need not occur first on its line; up to 3 leading spaces are allowed
100	(4 spaces would make a code block out of the following text).
101
102	For unordered lists, asterisks, hyphens and plus signs can be used interchangeably.
103
104	For ordered lists, arbitrary numbers can be used as part of an item prefix; the items will be
105	renumbered during rendering. However, future implementations may demand that the number used
106	for the first item in a list indicates an offset to be used for subsequent items.
107
108	For list items spanning multiple lines, subsequent lines can be indented using an arbitrary amount
109	of whitespace.
110
111	List items will be wrapped in HTML `<p>` tags if they are separated by blank lines.
112
113	A list item may span multiple paragraphs. At least the first line of each such paragraph must
114	be indented using at least 4 spaces or a tab character.
115
116	Block quotes within list items must have their '>' delimiters indented using 4 up to 7 spaces.
117
118	Code blocks within list items need to be indented _twice_, that is, using 8 spaces or 2 tab
	@@ -131,31 +131,31 @@
131
132	### Links
133
134	#### Automatic links
135
136	When rendering automatic links to email addresses, HTML encoding obfuscation is used to
137	prevent some spambots from harvesting.
138
139	#### Inline links
140
141	Links to resources on the same server can use relative paths (i.e. can start with a '/').
142
143	An optional title for the link (e.g. to have mouseover text in the browser) may be given behind
144	the link target but within the parentheses, in single and double quotes, and separated from the
145	link target by whitespace.
146
147	#### Reference links
148
149	> Each reference link consists of
150	>
151	> - one or more _link instances_ at appropriate locations in the page text
152	> - a single _link definition_ at an arbitrary location on the page
153	>
154	> During rendering, each link instance is resolved, and the corresponding definition is
155	> filled in. No separate link definition clauses occur in the rendered output.
156	>
157	> There are 3 fields involved in link instances and definitions:
158	>
159	> - link text (i.e. the text that is displayed at the resulting link)
160	> - link definition name (i.e. an unique ID binding link instances to link definition)
161	> - link target (a target URL for the link)
	@@ -197,11 +197,11 @@
197	### Code spans
198
199	To include a literal backtick character in a code span, use multiple backticks as opening and
200	closing delimiters.
201
202	Whitespace may exist immediately after the opening delimiter and before the closing delimiter
203	of a code span, to allow for code fragments starting or ending with a backtick.
204
205	Within a code span - like within a code block - angle brackets and ampersands are automatically encoded to make including
206	HTML fragments easier.
207
	@@ -209,17 +209,17 @@
209
210	If necessary, HTML must be used to specify image dimensions. Markdown has no provision for this.
211
212	### Inline HTML
213
214	Start and end tags of
215	a HTML block level construct (`<div>`, `<table>` etc) must be separated from surrounding
216	context using blank lines, and must both occur at the start of a line.
217
218	No extra unwanted `<p>` HTML tags are added around HTML block level tags.
219
220	Markdown formatting within HTML block level tags is not processed; however, formatting within
221	span level tags (e.g. `<mark>`) is processed normally.
222
223	### Escaping Markdown punctuation
224
225	The following punctuation characters can be escaped using backslash:
226

	--- src/markdown.md
	+++ src/markdown.md
	@@ -1,10 +1,10 @@
1	# Markdown formatting rules
2
3	In addition to its native Wiki formatting syntax, Fossil supports Markdown syntax as specified by
4	[John Gruber's original Markdown implementation](http://daringfireball.net/projects/markdown/).
5	For lots of examples - not repeated here - please refer to its
6	[syntax description](http://daringfireball.net/projects/markdown/syntax), of which the page you
7	are reading is an extract.
8
9	This page itself uses Markdown formatting.
10
	@@ -12,18 +12,18 @@
12
13	- Block elements
14
15	* A paragraph is a group of consecutive lines. Paragraphs are separated by blank lines.
16
17	* A Header is a line of text underlined with equal signs or hyphens, or prefixed by a
18	number of hash marks.
19
20	* Block quotes are blocks of text prefixed by '>'.
21
22	* Ordered list items are prefixed by a number and a period. Unordered list items
23	are prefixed by a hyphen, asterisk or plus sign. Prefix and item text are separated by
24	whitespace.
25
26	* Code blocks are formed by lines of text (possibly including empty lines) prefixed by
27	at least 4 spaces or a tab.
28
29	* A horizontal rule is a line consisting of 3 or more asterisks, hyphens or underscores,
	@@ -34,26 +34,26 @@
34	* 3 types of links exist:
35
36	- automatic links are URLs or email addresses enclosed in angle brackets
37	('<' and '>'), and are displayed as such.
38
39	- inline links consist of the displayed link text in square brackets ('[' and ']'),
40	followed by the link target in parentheses.
41
42	- reference links separate _link instance_ from _link definition_. A link instance
43	consists of the displayed link text in square brackets, followed by a link definition name
44	in square brackets.
45	The corresponding link definition can occur anywhere on the page, and consists
46	of the link definition name in square brackets followed by a colon, whitespace and the
47	link target.
48
49	* Emphasis can be given by wrapping text in one or two asterisks or underscores - use
50	one for HTML `<em>`, and two for `<strong>` emphasis.
51
52	* A code span is text wrapped in backticks ('`').
53
54	* Images use a syntax much like inline or reference links, but with alt attribute text
55	('img alt=...') instead of link text, and the first pair of square
56	brackets in an image instance prefixed by an exclamation mark.
57
58	- Inline HTML is mostly interpreted automatically.
59
	@@ -88,11 +88,11 @@
88	### Block quotes
89
90	Not every line in a paragraph needs to be prefixed by '>' in order to make it a block quote,
91	only the first line.
92
93	Block quoted paragraphs can be nested by using multiple '>' characters as prefix.
94
95	Within a block quote, Markdown formatting (e.g. lists, emphasis) still works as normal.
96
97	### Lists
98
	@@ -99,20 +99,20 @@
99	A list item prefix need not occur first on its line; up to 3 leading spaces are allowed
100	(4 spaces would make a code block out of the following text).
101
102	For unordered lists, asterisks, hyphens and plus signs can be used interchangeably.
103
104	For ordered lists, arbitrary numbers can be used as part of an item prefix; the items will be
105	renumbered during rendering. However, future implementations may demand that the number used
106	for the first item in a list indicates an offset to be used for subsequent items.
107
108	For list items spanning multiple lines, subsequent lines can be indented using an arbitrary amount
109	of whitespace.
110
111	List items will be wrapped in HTML `<p>` tags if they are separated by blank lines.
112
113	A list item may span multiple paragraphs. At least the first line of each such paragraph must
114	be indented using at least 4 spaces or a tab character.
115
116	Block quotes within list items must have their '>' delimiters indented using 4 up to 7 spaces.
117
118	Code blocks within list items need to be indented _twice_, that is, using 8 spaces or 2 tab
	@@ -131,31 +131,31 @@
131
132	### Links
133
134	#### Automatic links
135
136	When rendering automatic links to email addresses, HTML encoding obfuscation is used to
137	prevent some spambots from harvesting.
138
139	#### Inline links
140
141	Links to resources on the same server can use relative paths (i.e. can start with a '/').
142
143	An optional title for the link (e.g. to have mouseover text in the browser) may be given behind
144	the link target but within the parentheses, in single and double quotes, and separated from the
145	link target by whitespace.
146
147	#### Reference links
148
149	> Each reference link consists of
150	>
151	> - one or more _link instances_ at appropriate locations in the page text
152	> - a single _link definition_ at an arbitrary location on the page
153	>
154	> During rendering, each link instance is resolved, and the corresponding definition is
155	> filled in. No separate link definition clauses occur in the rendered output.
156	>
157	> There are 3 fields involved in link instances and definitions:
158	>
159	> - link text (i.e. the text that is displayed at the resulting link)
160	> - link definition name (i.e. an unique ID binding link instances to link definition)
161	> - link target (a target URL for the link)
	@@ -197,11 +197,11 @@
197	### Code spans
198
199	To include a literal backtick character in a code span, use multiple backticks as opening and
200	closing delimiters.
201
202	Whitespace may exist immediately after the opening delimiter and before the closing delimiter
203	of a code span, to allow for code fragments starting or ending with a backtick.
204
205	Within a code span - like within a code block - angle brackets and ampersands are automatically encoded to make including
206	HTML fragments easier.
207
	@@ -209,17 +209,17 @@
209
210	If necessary, HTML must be used to specify image dimensions. Markdown has no provision for this.
211
212	### Inline HTML
213
214	Start and end tags of
215	a HTML block level construct (`<div>`, `<table>` etc) must be separated from surrounding
216	context using blank lines, and must both occur at the start of a line.
217
218	No extra unwanted `<p>` HTML tags are added around HTML block level tags.
219
220	Markdown formatting within HTML block level tags is not processed; however, formatting within
221	span level tags (e.g. `<mark>`) is processed normally.
222
223	### Escaping Markdown punctuation
224
225	The following punctuation characters can be escaped using backslash:
226

M tools/cvs2fossil/changeset

+1 -1

		--- tools/cvs2fossil/changeset
		+++ tools/cvs2fossil/changeset
		@@ -14,11 +14,11 @@
14	14	# # ## ### ##### ######## ############# #####################
15	15
16	16	## Helper application, debugging of cvs2fossil. This application
17	17	## extracts all information about a changeset and writes it nicely
18	18	## formatted to stdout. The changeset is specified by its internal
19		-## numerical id.
	19	+## numerical id.
20	20
21	21	# # ## ### ##### ######## ############# #####################
22	22	## Requirements, extended package management for local packages.
23	23
24	24	lappend auto_path [file join [file dirname [info script]] lib]
25	25

	--- tools/cvs2fossil/changeset
	+++ tools/cvs2fossil/changeset
	@@ -14,11 +14,11 @@
14	# # ## ### ##### ######## ############# #####################
15
16	## Helper application, debugging of cvs2fossil. This application
17	## extracts all information about a changeset and writes it nicely
18	## formatted to stdout. The changeset is specified by its internal
19	## numerical id.
20
21	# # ## ### ##### ######## ############# #####################
22	## Requirements, extended package management for local packages.
23
24	lappend auto_path [file join [file dirname [info script]] lib]
25

	--- tools/cvs2fossil/changeset
	+++ tools/cvs2fossil/changeset
	@@ -14,11 +14,11 @@
14	# # ## ### ##### ######## ############# #####################
15
16	## Helper application, debugging of cvs2fossil. This application
17	## extracts all information about a changeset and writes it nicely
18	## formatted to stdout. The changeset is specified by its internal
19	## numerical id.
20
21	# # ## ### ##### ######## ############# #####################
22	## Requirements, extended package management for local packages.
23
24	lappend auto_path [file join [file dirname [info script]] lib]
25

M tools/cvs2fossil/lib/c2f_pbreakacycle.tcl

+1 -1

		--- tools/cvs2fossil/lib/c2f_pbreakacycle.tcl
		+++ tools/cvs2fossil/lib/c2f_pbreakacycle.tcl
		@@ -270,11 +270,11 @@
270	270	set mins $minsa($item)
271	271	set maxp $maxp($item)
272	272	# Note that for the min successor position "" represents
273	273	# +infinity
274	274	integrity assert {
275		- ($mins eq "") \|\| ($maxp < $mins)
	275	+ ($mins eq "") \|\| ($maxp < $mins)
276	276	} {Item <$item> is backward at file level ($maxp >= $mins)}
277	277	}
278	278
279	279	# Save the limits for the splitter, and compute the border at
280	280	# which to split as the minimum of all minimal successor
281	281

	--- tools/cvs2fossil/lib/c2f_pbreakacycle.tcl
	+++ tools/cvs2fossil/lib/c2f_pbreakacycle.tcl
	@@ -270,11 +270,11 @@
270	set mins $minsa($item)
271	set maxp $maxp($item)
272	# Note that for the min successor position "" represents
273	# +infinity
274	integrity assert {
275	($mins eq "") \|\| ($maxp < $mins)
276	} {Item <$item> is backward at file level ($maxp >= $mins)}
277	}
278
279	# Save the limits for the splitter, and compute the border at
280	# which to split as the minimum of all minimal successor
281

	--- tools/cvs2fossil/lib/c2f_pbreakacycle.tcl
	+++ tools/cvs2fossil/lib/c2f_pbreakacycle.tcl
	@@ -270,11 +270,11 @@
270	set mins $minsa($item)
271	set maxp $maxp($item)
272	# Note that for the min successor position "" represents
273	# +infinity
274	integrity assert {
275	($mins eq "") \|\| ($maxp < $mins)
276	} {Item <$item> is backward at file level ($maxp >= $mins)}
277	}
278
279	# Save the limits for the splitter, and compute the border at
280	# which to split as the minimum of all minimal successor
281

M tools/cvs2fossil/lib/c2f_prev.tcl

+1 -1

		--- tools/cvs2fossil/lib/c2f_prev.tcl
		+++ tools/cvs2fossil/lib/c2f_prev.tcl
		@@ -1179,11 +1179,11 @@
1179	1179	typevariable mytchangesets -array {
1180	1180	sym::branch {}
1181	1181	sym::tag {}
1182	1182	rev {}
1183	1183	}
1184		-
	1184	+
1185	1185	typevariable myitemmap -array {} ; # Map from items (tagged)
1186	1186	# to the list of changesets
1187	1187	# containing it. Each item
1188	1188	# can be used by only one
1189	1189	# changeset.
1190	1190

	--- tools/cvs2fossil/lib/c2f_prev.tcl
	+++ tools/cvs2fossil/lib/c2f_prev.tcl
	@@ -1179,11 +1179,11 @@
1179	typevariable mytchangesets -array {
1180	sym::branch {}
1181	sym::tag {}
1182	rev {}
1183	}
1184
1185	typevariable myitemmap -array {} ; # Map from items (tagged)
1186	# to the list of changesets
1187	# containing it. Each item
1188	# can be used by only one
1189	# changeset.
1190

	--- tools/cvs2fossil/lib/c2f_prev.tcl
	+++ tools/cvs2fossil/lib/c2f_prev.tcl
	@@ -1179,11 +1179,11 @@
1179	typevariable mytchangesets -array {
1180	sym::branch {}
1181	sym::tag {}
1182	rev {}
1183	}
1184
1185	typevariable myitemmap -array {} ; # Map from items (tagged)
1186	# to the list of changesets
1187	# containing it. Each item
1188	# can be used by only one
1189	# changeset.
1190

M tools/cvs2fossil/lib/mem.tcl

+2 -2

		--- tools/cvs2fossil/lib/mem.tcl
		+++ tools/cvs2fossil/lib/mem.tcl
		@@ -48,12 +48,12 @@
48	48	variable lmba
49	49	variable mid
50	50
51	51	struct::list assign [minfo] _ _ _ cba _ mba
52	52
53		- set dc [expr $cba - $lcba] ; set lcba $cba
54		- set dm [expr $mba - $lmba] ; set lmba $mba
	53	+ set dc [expr $cba - $lcba] ; set lcba $cba
	54	+ set dm [expr $mba - $lmba] ; set lmba $mba
55	55
56	56	# projection: 1 2 3 4 5 6 7 6 8 10
57	57	return "[F [incr mid]] \| [F $cba] \| [F $dc] \| [F $mba] \| [F $dm] \|=\| "
58	58	}
59	59
60	60

	--- tools/cvs2fossil/lib/mem.tcl
	+++ tools/cvs2fossil/lib/mem.tcl
	@@ -48,12 +48,12 @@
48	variable lmba
49	variable mid
50
51	struct::list assign [minfo] _ _ _ cba _ mba
52
53	set dc [expr $cba - $lcba] ; set lcba $cba
54	set dm [expr $mba - $lmba] ; set lmba $mba
55
56	# projection: 1 2 3 4 5 6 7 6 8 10
57	return "[F [incr mid]] \| [F $cba] \| [F $dc] \| [F $mba] \| [F $dm] \|=\| "
58	}
59
60

	--- tools/cvs2fossil/lib/mem.tcl
	+++ tools/cvs2fossil/lib/mem.tcl
	@@ -48,12 +48,12 @@
48	variable lmba
49	variable mid
50
51	struct::list assign [minfo] _ _ _ cba _ mba
52
53	set dc [expr $cba - $lcba] ; set lcba $cba
54	set dm [expr $mba - $lmba] ; set lmba $mba
55
56	# projection: 1 2 3 4 5 6 7 6 8 10
57	return "[F [incr mid]] \| [F $cba] \| [F $dc] \| [F $mba] \| [F $dm] \|=\| "
58	}
59
60

M tools/fossilwiki

+3 -3

		--- tools/fossilwiki
		+++ tools/fossilwiki
		@@ -47,18 +47,18 @@
47	47	push @links,$1;
48	48	}
49	49
50	50	$numlinks = $#links;
51	51
52		- if (@links == ())
	52	+ if (@links == ())
53	53	{
54	54	push @terminals, $page;
55	55	}
56	56	else
57	57	{
58	58	my @internals = grep { $_ !~ /(http:)\|(mailto:)\|(https:)/ } @links;
59		- if (@internals == ())
	59	+ if (@internals == ())
60	60	{
61	61	push @nointernals, $page;
62	62	}
63	63	else
64	64	{
		@@ -116,11 +116,11 @@
116	116	print ("badlink: '$link'\n");
117	117	}
118	118	foreach $page ( sort keys %links )
119	119	{
120	120	my @links = @{$links{$page}{'links'}};
121		- if (@links != ())
	121	+ if (@links != ())
122	122	{
123	123	if ($page eq $mainpage)
124	124	{
125	125	print "links: * '$page' * -> ", join (", ", @links), "\n";
126	126	}
127	127

	--- tools/fossilwiki
	+++ tools/fossilwiki
	@@ -47,18 +47,18 @@
47	push @links,$1;
48	}
49
50	$numlinks = $#links;
51
52	if (@links == ())
53	{
54	push @terminals, $page;
55	}
56	else
57	{
58	my @internals = grep { $_ !~ /(http:)\|(mailto:)\|(https:)/ } @links;
59	if (@internals == ())
60	{
61	push @nointernals, $page;
62	}
63	else
64	{
	@@ -116,11 +116,11 @@
116	print ("badlink: '$link'\n");
117	}
118	foreach $page ( sort keys %links )
119	{
120	my @links = @{$links{$page}{'links'}};
121	if (@links != ())
122	{
123	if ($page eq $mainpage)
124	{
125	print "links: * '$page' * -> ", join (", ", @links), "\n";
126	}
127

	--- tools/fossilwiki
	+++ tools/fossilwiki
	@@ -47,18 +47,18 @@
47	push @links,$1;
48	}
49
50	$numlinks = $#links;
51
52	if (@links == ())
53	{
54	push @terminals, $page;
55	}
56	else
57	{
58	my @internals = grep { $_ !~ /(http:)\|(mailto:)\|(https:)/ } @links;
59	if (@internals == ())
60	{
61	push @nointernals, $page;
62	}
63	else
64	{
	@@ -116,11 +116,11 @@
116	print ("badlink: '$link'\n");
117	}
118	foreach $page ( sort keys %links )
119	{
120	my @links = @{$links{$page}{'links'}};
121	if (@links != ())
122	{
123	if ($page eq $mainpage)
124	{
125	print "links: * '$page' * -> ", join (", ", @links), "\n";
126	}
127

Fossil SCM

Keyboard Shortcuts