Fossil SCM

Update the Fossil Wiki and Markdown cheat-sheets to include hyperlinks to one another.

drh 2020-08-22 19:07 trunk
Commit 0ae2dbd40a3e33530906ccaa38268cbbb186751bdd0d502fed5bf2e9c19d6622
Parent 659f6cd080d7825…
3 files changed +4 +2 +9 -2
~ src/markdown.md ~ src/wiki.c ~ src/wiki.wiki
M src/markdown.md
+4
--- src/markdown.md
+++ src/markdown.md
@@ -152,5 +152,9 @@
152152
 > * For documents that begin with a top-level heading (ex: **# heading #**),
153153
 > the heading is omitted from the body of the document and becomes the
154154
 > document title displayed at the top of the Fossil page.
155155
156156
 [daringfireball.net]: http://daringfireball.net/projects/markdown/syntax
157
+
158
+## See also:
159
+
160
+ * [Fossil Wiki Formatting Rules](/wiki_rules)
157161
--- src/markdown.md
+++ src/markdown.md
@@ -152,5 +152,9 @@
152 > * For documents that begin with a top-level heading (ex: **# heading #**),
153 > the heading is omitted from the body of the document and becomes the
154 > document title displayed at the top of the Fossil page.
155
156 [daringfireball.net]: http://daringfireball.net/projects/markdown/syntax
 
 
 
 
157
--- src/markdown.md
+++ src/markdown.md
@@ -152,5 +152,9 @@
152 > * For documents that begin with a top-level heading (ex: **# heading #**),
153 > the heading is omitted from the body of the document and becomes the
154 > document title displayed at the top of the Fossil page.
155
156 [daringfireball.net]: http://daringfireball.net/projects/markdown/syntax
157
158 ## See also:
159
160 * [Fossil Wiki Formatting Rules](/wiki_rules)
161
M src/wiki.c
+2
--- src/wiki.c
+++ src/wiki.c
@@ -220,10 +220,11 @@
220220
 if( fTxt ){
221221
 style_submenu_element("Formatted", "%R/md_rules");
222222
 }else{
223223
 style_submenu_element("Plain-Text", "%R/md_rules?txt=1");
224224
 }
225
+ style_submenu_element("Wiki", "%R/wiki_rules");
225226
 blob_init(&x, builtin_text("markdown.md"), -1);
226227
 blob_materialize(&x);
227228
 safe_html_context(DOCSRC_TRUSTED);
228229
 wiki_render_by_mimetype(&x, fTxt ? "text/plain" : "text/x-markdown");
229230
 blob_reset(&x);
@@ -242,10 +243,11 @@
242243
 if( fTxt ){
243244
 style_submenu_element("Formatted", "%R/wiki_rules");
244245
 }else{
245246
 style_submenu_element("Plain-Text", "%R/wiki_rules?txt=1");
246247
 }
248
+ style_submenu_element("Markdown","%R/md_rules");
247249
 blob_init(&x, builtin_text("wiki.wiki"), -1);
248250
 blob_materialize(&x);
249251
 safe_html_context(DOCSRC_TRUSTED);
250252
 wiki_render_by_mimetype(&x, fTxt ? "text/plain" : "text/x-fossil-wiki");
251253
 blob_reset(&x);
252254
--- src/wiki.c
+++ src/wiki.c
@@ -220,10 +220,11 @@
220 if( fTxt ){
221 style_submenu_element("Formatted", "%R/md_rules");
222 }else{
223 style_submenu_element("Plain-Text", "%R/md_rules?txt=1");
224 }
 
225 blob_init(&x, builtin_text("markdown.md"), -1);
226 blob_materialize(&x);
227 safe_html_context(DOCSRC_TRUSTED);
228 wiki_render_by_mimetype(&x, fTxt ? "text/plain" : "text/x-markdown");
229 blob_reset(&x);
@@ -242,10 +243,11 @@
242 if( fTxt ){
243 style_submenu_element("Formatted", "%R/wiki_rules");
244 }else{
245 style_submenu_element("Plain-Text", "%R/wiki_rules?txt=1");
246 }
 
247 blob_init(&x, builtin_text("wiki.wiki"), -1);
248 blob_materialize(&x);
249 safe_html_context(DOCSRC_TRUSTED);
250 wiki_render_by_mimetype(&x, fTxt ? "text/plain" : "text/x-fossil-wiki");
251 blob_reset(&x);
252
--- src/wiki.c
+++ src/wiki.c
@@ -220,10 +220,11 @@
220 if( fTxt ){
221 style_submenu_element("Formatted", "%R/md_rules");
222 }else{
223 style_submenu_element("Plain-Text", "%R/md_rules?txt=1");
224 }
225 style_submenu_element("Wiki", "%R/wiki_rules");
226 blob_init(&x, builtin_text("markdown.md"), -1);
227 blob_materialize(&x);
228 safe_html_context(DOCSRC_TRUSTED);
229 wiki_render_by_mimetype(&x, fTxt ? "text/plain" : "text/x-markdown");
230 blob_reset(&x);
@@ -242,10 +243,11 @@
243 if( fTxt ){
244 style_submenu_element("Formatted", "%R/wiki_rules");
245 }else{
246 style_submenu_element("Plain-Text", "%R/wiki_rules?txt=1");
247 }
248 style_submenu_element("Markdown","%R/md_rules");
249 blob_init(&x, builtin_text("wiki.wiki"), -1);
250 blob_materialize(&x);
251 safe_html_context(DOCSRC_TRUSTED);
252 wiki_render_by_mimetype(&x, fTxt ? "text/plain" : "text/x-fossil-wiki");
253 blob_reset(&x);
254
M src/wiki.wiki
+9 -2
--- src/wiki.wiki
+++ src/wiki.wiki
@@ -4,11 +4,12 @@
44
 # Bullets are "*" surrounded by two spaces at the beginning of a line
55
 # Enumeration items are "#" or a digit and a "." surrounded by two
66
 spaces at the beginning of a line
77
 # Indented paragraphs begin with a tab or two spaces
88
 # Hyperlinks are contained within square brackets:
9
- <nowiki>"[target]" or "[target|label]"</nowiki>
9
+ <nowiki>"<b>[</b><i>target</i><b>]</b>"
10
+ or "<b>[</b><i>target</i><b>|</b><i>label</i><b>]</b>"</nowiki>
1011
 # Most ordinary HTML works
1112
 # &lt;verbatim&gt; and &lt;nowiki&gt;
1213
1314
 We call the first five rules above the "wiki" formatting rules.
1415
 The last two rules are the HTML formatting rules.
@@ -54,12 +55,14 @@
5455
5556
 6. <b>HTML.</b>
5657
 The following standard HTML elements may be used:
5758
 &lt;a&gt; &lt;address&gt; &lt;article&gt; &lt;aside&gt; &lt;b&gt;
5859
 &lt;big&gt; &lt;blockquote&gt; &lt;br&gt; &lt;center&gt; &lt;cite&gt;
59
- &lt;code&gt; &lt;col&gt; &lt;colgroup&gt; &lt;dd&gt; &lt;dfn&gt;
60
+ &lt;code&gt; &lt;col&gt; &lt;colgroup&gt; &lt;dd&gt;
61
+ &lt;del&gt; &lt;dfn&gt;
6062
 &lt;div&gt; &lt;dl&gt; &lt;dt&gt; &lt;em&gt; &lt;font&gt; &lt;footer&gt;
63
+ &lt;ins&gt;
6164
 &lt;h1&gt; &lt;h2&gt; &lt;h3&gt; &lt;h4&gt; &lt;h5&gt; &lt;h6&gt;
6265
 &lt;header&gt; &lt;hr&gt; &lt;i&gt; &lt;img&gt; &lt;kbd&gt; &lt;li&gt;
6366
 &lt;nav&gt; &lt;nobr&gt; &lt;nowiki&gt; &lt;ol&gt; &lt;p&gt; &lt;pre&gt;
6467
 &lt;s&gt; &lt;samp&gt; &lt;section&gt; &lt;small&gt; &lt;span&gt;
6568
 &lt;strike&gt; &lt;strong&gt; &lt;sub&gt; &lt;sup&gt; &lt;table&gt;
@@ -74,5 +77,9 @@
7477
 7. <b>Special Markup.</b>
7578
 The &lt;nowiki&gt; tag disables all wiki formatting rules through
7679
 the matching &lt;/nowiki&gt; element. The &lt;verbatim&gt; tag works
7780
 like &lt;pre&gt; with the addition that it also disables all wiki
7881
 and HTML markup through the matching &lt;/verbatim&gt;.
82
+
83
+<h2>See Also</h2>
84
+
85
+ * [/md_rules|Markdown formatting rules]
7986
--- src/wiki.wiki
+++ src/wiki.wiki
@@ -4,11 +4,12 @@
4 # Bullets are "*" surrounded by two spaces at the beginning of a line
5 # Enumeration items are "#" or a digit and a "." surrounded by two
6 spaces at the beginning of a line
7 # Indented paragraphs begin with a tab or two spaces
8 # Hyperlinks are contained within square brackets:
9 <nowiki>"[target]" or "[target|label]"</nowiki>
 
10 # Most ordinary HTML works
11 # &lt;verbatim&gt; and &lt;nowiki&gt;
12
13 We call the first five rules above the "wiki" formatting rules.
14 The last two rules are the HTML formatting rules.
@@ -54,12 +55,14 @@
54
55 6. <b>HTML.</b>
56 The following standard HTML elements may be used:
57 &lt;a&gt; &lt;address&gt; &lt;article&gt; &lt;aside&gt; &lt;b&gt;
58 &lt;big&gt; &lt;blockquote&gt; &lt;br&gt; &lt;center&gt; &lt;cite&gt;
59 &lt;code&gt; &lt;col&gt; &lt;colgroup&gt; &lt;dd&gt; &lt;dfn&gt;
 
60 &lt;div&gt; &lt;dl&gt; &lt;dt&gt; &lt;em&gt; &lt;font&gt; &lt;footer&gt;
 
61 &lt;h1&gt; &lt;h2&gt; &lt;h3&gt; &lt;h4&gt; &lt;h5&gt; &lt;h6&gt;
62 &lt;header&gt; &lt;hr&gt; &lt;i&gt; &lt;img&gt; &lt;kbd&gt; &lt;li&gt;
63 &lt;nav&gt; &lt;nobr&gt; &lt;nowiki&gt; &lt;ol&gt; &lt;p&gt; &lt;pre&gt;
64 &lt;s&gt; &lt;samp&gt; &lt;section&gt; &lt;small&gt; &lt;span&gt;
65 &lt;strike&gt; &lt;strong&gt; &lt;sub&gt; &lt;sup&gt; &lt;table&gt;
@@ -74,5 +77,9 @@
74 7. <b>Special Markup.</b>
75 The &lt;nowiki&gt; tag disables all wiki formatting rules through
76 the matching &lt;/nowiki&gt; element. The &lt;verbatim&gt; tag works
77 like &lt;pre&gt; with the addition that it also disables all wiki
78 and HTML markup through the matching &lt;/verbatim&gt;.
 
 
 
 
79
--- src/wiki.wiki
+++ src/wiki.wiki
@@ -4,11 +4,12 @@
4 # Bullets are "*" surrounded by two spaces at the beginning of a line
5 # Enumeration items are "#" or a digit and a "." surrounded by two
6 spaces at the beginning of a line
7 # Indented paragraphs begin with a tab or two spaces
8 # Hyperlinks are contained within square brackets:
9 <nowiki>"<b>[</b><i>target</i><b>]</b>"
10 or "<b>[</b><i>target</i><b>|</b><i>label</i><b>]</b>"</nowiki>
11 # Most ordinary HTML works
12 # &lt;verbatim&gt; and &lt;nowiki&gt;
13
14 We call the first five rules above the "wiki" formatting rules.
15 The last two rules are the HTML formatting rules.
@@ -54,12 +55,14 @@
55
56 6. <b>HTML.</b>
57 The following standard HTML elements may be used:
58 &lt;a&gt; &lt;address&gt; &lt;article&gt; &lt;aside&gt; &lt;b&gt;
59 &lt;big&gt; &lt;blockquote&gt; &lt;br&gt; &lt;center&gt; &lt;cite&gt;
60 &lt;code&gt; &lt;col&gt; &lt;colgroup&gt; &lt;dd&gt;
61 &lt;del&gt; &lt;dfn&gt;
62 &lt;div&gt; &lt;dl&gt; &lt;dt&gt; &lt;em&gt; &lt;font&gt; &lt;footer&gt;
63 &lt;ins&gt;
64 &lt;h1&gt; &lt;h2&gt; &lt;h3&gt; &lt;h4&gt; &lt;h5&gt; &lt;h6&gt;
65 &lt;header&gt; &lt;hr&gt; &lt;i&gt; &lt;img&gt; &lt;kbd&gt; &lt;li&gt;
66 &lt;nav&gt; &lt;nobr&gt; &lt;nowiki&gt; &lt;ol&gt; &lt;p&gt; &lt;pre&gt;
67 &lt;s&gt; &lt;samp&gt; &lt;section&gt; &lt;small&gt; &lt;span&gt;
68 &lt;strike&gt; &lt;strong&gt; &lt;sub&gt; &lt;sup&gt; &lt;table&gt;
@@ -74,5 +77,9 @@
77 7. <b>Special Markup.</b>
78 The &lt;nowiki&gt; tag disables all wiki formatting rules through
79 the matching &lt;/nowiki&gt; element. The &lt;verbatim&gt; tag works
80 like &lt;pre&gt; with the addition that it also disables all wiki
81 and HTML markup through the matching &lt;/verbatim&gt;.
82
83 <h2>See Also</h2>
84
85 * [/md_rules|Markdown formatting rules]
86

Keyboard Shortcuts

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