Fossil SCM

merge from trunk

wolfgang 2010-10-02 12:55 wolfgangFormat2CSS_2 merge

Commit f52c6f688618b6fa6d3e679a9b5f1ab65e4cc9c4

Parent f09603e66d78106…

4 files changed +2 -47 +8 +1 -1 +1 -1

~ src/wiki.c ~ src/wikiformat.c ~ win/fossil.rc + win/fossil.rc

M src/wiki.c

+2 -47

		--- src/wiki.c
		+++ src/wiki.c
		@@ -771,57 +771,12 @@
771	771	@ <p>You can also link to internal anchor names using [#anchor-name], providing
772	772	@ you have added the necessary "<a name="anchor-name"></a>"
773	773	@ tag to your wiki page.</p></li>
774	774	@ <li> <p><span class="wikiruleHead">HTML</span>.
775	775	@ The following standard HTML elements may be used:
776		- @ <a>
777		- @ <address>
778		- @ <b>
779		- @ <big>
780		- @ <blockquote>
781		- @ <br>
782		- @ <center>
783		- @ <cite>
784		- @ <code>
785		- @ <dd>
786		- @ <dfn>
787		- @ <div>
788		- @ <dl>
789		- @ <dt>
790		- @ <em>
791		- @ <font>
792		- @ <h1>
793		- @ <h2>
794		- @ <h3>
795		- @ <h4>
796		- @ <h5>
797		- @ <h6>
798		- @ <hr>
799		- @ <img>
800		- @ <i>
801		- @ <kbd>
802		- @ <li>
803		- @ <nobr>
804		- @ <ol>
805		- @ <p>
806		- @ <pre>
807		- @ <s>
808		- @ <samp>
809		- @ <small>
810		- @ <strike>
811		- @ <strong>
812		- @ <sub>
813		- @ <sup>
814		- @ <table>
815		- @ <td>
816		- @ <th>
817		- @ <tr>
818		- @ <tt>
819		- @ <u>
820		- @ <ul>
821		- @ <var>.
822		- @ In addition, there are two non-standard elements available:
	776	+ show_allowed_wiki_markup();
	777	+ @ . There are two non-standard elements available:
823	778	@ <verbatim> and <nowiki>.
824	779	@ No other elements are allowed. All attributes are checked and
825	780	@ only a few benign attributes are allowed on each element.
826	781	@ In particular, any attributes that specify javascript or CSS
827	782	@ are elided.</p></li>
828	783

	--- src/wiki.c
	+++ src/wiki.c
	@@ -771,57 +771,12 @@
771	@ <p>You can also link to internal anchor names using [#anchor-name], providing
772	@ you have added the necessary "<a name="anchor-name"></a>"
773	@ tag to your wiki page.</p></li>
774	@ <li> <p><span class="wikiruleHead">HTML</span>.
775	@ The following standard HTML elements may be used:
776	@ <a>
777	@ <address>
778	@ <b>
779	@ <big>
780	@ <blockquote>
781	@ <br>
782	@ <center>
783	@ <cite>
784	@ <code>
785	@ <dd>
786	@ <dfn>
787	@ <div>
788	@ <dl>
789	@ <dt>
790	@ <em>
791	@ <font>
792	@ <h1>
793	@ <h2>
794	@ <h3>
795	@ <h4>
796	@ <h5>
797	@ <h6>
798	@ <hr>
799	@ <img>
800	@ <i>
801	@ <kbd>
802	@ <li>
803	@ <nobr>
804	@ <ol>
805	@ <p>
806	@ <pre>
807	@ <s>
808	@ <samp>
809	@ <small>
810	@ <strike>
811	@ <strong>
812	@ <sub>
813	@ <sup>
814	@ <table>
815	@ <td>
816	@ <th>
817	@ <tr>
818	@ <tt>
819	@ <u>
820	@ <ul>
821	@ <var>.
822	@ In addition, there are two non-standard elements available:
823	@ <verbatim> and <nowiki>.
824	@ No other elements are allowed. All attributes are checked and
825	@ only a few benign attributes are allowed on each element.
826	@ In particular, any attributes that specify javascript or CSS
827	@ are elided.</p></li>
828

	--- src/wiki.c
	+++ src/wiki.c
	@@ -771,57 +771,12 @@
771	@ <p>You can also link to internal anchor names using [#anchor-name], providing
772	@ you have added the necessary "<a name="anchor-name"></a>"
773	@ tag to your wiki page.</p></li>
774	@ <li> <p><span class="wikiruleHead">HTML</span>.
775	@ The following standard HTML elements may be used:
776	show_allowed_wiki_markup();
777	@ . There are two non-standard elements available:













































778	@ <verbatim> and <nowiki>.
779	@ No other elements are allowed. All attributes are checked and
780	@ only a few benign attributes are allowed on each element.
781	@ In particular, any attributes that specify javascript or CSS
782	@ are elided.</p></li>
783

M src/wikiformat.c

		--- src/wikiformat.c
		+++ src/wikiformat.c
		@@ -309,10 +309,18 @@
309	309	{ "ul", MARKUP_UL, MUTYPE_LIST,
310	310	AMSK_TYPE\|AMSK_COMPACT },
311	311	{ "var", MARKUP_VAR, MUTYPE_FONT, 0 },
312	312	{ "verbatim", MARKUP_VERBATIM, MUTYPE_SPECIAL, AMSK_ID\|AMSK_TYPE },
313	313	};
	314	+
	315	+void show_allowed_wiki_markup( void ){
	316	+ int i; /* loop over allowedAttr */
	317	+
	318	+ for( i=1 ; i<=sizeof(aMarkup)/sizeof(aMarkup[0]) - 1 ; i++ ){
	319	+ @ <%s(aMarkup[i].zName)>
	320	+ }
	321	+}
314	322
315	323	/*
316	324	** Use binary search to locate a tag in the aMarkup[] table.
317	325	*/
318	326	static int findTag(const char *z){
319	327

	--- src/wikiformat.c
	+++ src/wikiformat.c
	@@ -309,10 +309,18 @@
309	{ "ul", MARKUP_UL, MUTYPE_LIST,
310	AMSK_TYPE\|AMSK_COMPACT },
311	{ "var", MARKUP_VAR, MUTYPE_FONT, 0 },
312	{ "verbatim", MARKUP_VERBATIM, MUTYPE_SPECIAL, AMSK_ID\|AMSK_TYPE },
313	};








314
315	/*
316	** Use binary search to locate a tag in the aMarkup[] table.
317	*/
318	static int findTag(const char *z){
319

	--- src/wikiformat.c
	+++ src/wikiformat.c
	@@ -309,10 +309,18 @@
309	{ "ul", MARKUP_UL, MUTYPE_LIST,
310	AMSK_TYPE\|AMSK_COMPACT },
311	{ "var", MARKUP_VAR, MUTYPE_FONT, 0 },
312	{ "verbatim", MARKUP_VERBATIM, MUTYPE_SPECIAL, AMSK_ID\|AMSK_TYPE },
313	};
314
315	void show_allowed_wiki_markup( void ){
316	int i; /* loop over allowedAttr */
317
318	for( i=1 ; i<=sizeof(aMarkup)/sizeof(aMarkup[0]) - 1 ; i++ ){
319	@ <%s(aMarkup[i].zName)>
320	}
321	}
322
323	/*
324	** Use binary search to locate a tag in the aMarkup[] table.
325	*/
326	static int findTag(const char *z){
327

M win/fossil.rc

+1 -1

		--- win/fossil.rc
		+++ win/fossil.rc
		@@ -17,11 +17,11 @@
17	17	BLOCK "StringFileInfo"
18	18	BEGIN
19	19	BLOCK "040904B0"
20	20	BEGIN
21	21	VALUE "FileDescription", "distributed source code control system with integrated wiki and ticket-system\0"
22		- VALUE "Comments", "compiler variant: "COMPILER_NAME"\0"
	22	+ VALUE "Comments", "compiler: "COMPILER_NAME"\0"
23	23	VALUE "FileVersion", MANIFEST_UUID"("COMPILER_NAME"\0"
24	24	VALUE "InternalName", "fossil\0"
25	25	VALUE "LegalCopyright", "Copyright (c) "MANIFEST_YEAR" D. Richard Hipp\0"
26	26	VALUE "OriginalFilename", "fossil.exe\0"
27	27	VALUE "ProductName", "fossil\0"
28	28

	--- win/fossil.rc
	+++ win/fossil.rc
	@@ -17,11 +17,11 @@
17	BLOCK "StringFileInfo"
18	BEGIN
19	BLOCK "040904B0"
20	BEGIN
21	VALUE "FileDescription", "distributed source code control system with integrated wiki and ticket-system\0"
22	VALUE "Comments", "compiler variant: "COMPILER_NAME"\0"
23	VALUE "FileVersion", MANIFEST_UUID"("COMPILER_NAME"\0"
24	VALUE "InternalName", "fossil\0"
25	VALUE "LegalCopyright", "Copyright (c) "MANIFEST_YEAR" D. Richard Hipp\0"
26	VALUE "OriginalFilename", "fossil.exe\0"
27	VALUE "ProductName", "fossil\0"
28

	--- win/fossil.rc
	+++ win/fossil.rc
	@@ -17,11 +17,11 @@
17	BLOCK "StringFileInfo"
18	BEGIN
19	BLOCK "040904B0"
20	BEGIN
21	VALUE "FileDescription", "distributed source code control system with integrated wiki and ticket-system\0"
22	VALUE "Comments", "compiler: "COMPILER_NAME"\0"
23	VALUE "FileVersion", MANIFEST_UUID"("COMPILER_NAME"\0"
24	VALUE "InternalName", "fossil\0"
25	VALUE "LegalCopyright", "Copyright (c) "MANIFEST_YEAR" D. Richard Hipp\0"
26	VALUE "OriginalFilename", "fossil.exe\0"
27	VALUE "ProductName", "fossil\0"
28

A win/fossil.rc

+1 -1

		--- win/fossil.rc
		+++ win/fossil.rc
		@@ -17,11 +17,11 @@
17	17	BLOCK "StringFileInfo"
18	18	BEGIN
19	19	BLOCK "040904B0"
20	20	BEGIN
21	21	VALUE "FileDescription", "distributed source code control system with integrated wiki and ticket-system\0"
22		- VALUE "Comments", "compiler variant: "COMPILER_NAME"\0"
	22	+ VALUE "Comments", "compiler: "COMPILER_NAME"\0"
23	23	VALUE "FileVersion", MANIFEST_UUID"("COMPILER_NAME"\0"
24	24	VALUE "InternalName", "fossil\0"
25	25	VALUE "LegalCopyright", "Copyright (c) "MANIFEST_YEAR" D. Richard Hipp\0"
26	26	VALUE "OriginalFilename", "fossil.exe\0"
27	27	VALUE "ProductName", "fossil\0"
28	28

	--- win/fossil.rc
	+++ win/fossil.rc
	@@ -17,11 +17,11 @@
17	BLOCK "StringFileInfo"
18	BEGIN
19	BLOCK "040904B0"
20	BEGIN
21	VALUE "FileDescription", "distributed source code control system with integrated wiki and ticket-system\0"
22	VALUE "Comments", "compiler variant: "COMPILER_NAME"\0"
23	VALUE "FileVersion", MANIFEST_UUID"("COMPILER_NAME"\0"
24	VALUE "InternalName", "fossil\0"
25	VALUE "LegalCopyright", "Copyright (c) "MANIFEST_YEAR" D. Richard Hipp\0"
26	VALUE "OriginalFilename", "fossil.exe\0"
27	VALUE "ProductName", "fossil\0"
28

	--- win/fossil.rc
	+++ win/fossil.rc
	@@ -17,11 +17,11 @@
17	BLOCK "StringFileInfo"
18	BEGIN
19	BLOCK "040904B0"
20	BEGIN
21	VALUE "FileDescription", "distributed source code control system with integrated wiki and ticket-system\0"
22	VALUE "Comments", "compiler: "COMPILER_NAME"\0"
23	VALUE "FileVersion", MANIFEST_UUID"("COMPILER_NAME"\0"
24	VALUE "InternalName", "fossil\0"
25	VALUE "LegalCopyright", "Copyright (c) "MANIFEST_YEAR" D. Richard Hipp\0"
26	VALUE "OriginalFilename", "fossil.exe\0"
27	VALUE "ProductName", "fossil\0"
28

Fossil SCM

Keyboard Shortcuts