Fossil SCM

Added ABBR tag to the HTML whitelist, per [forum:3ae85115a8253ae4|forum post 3ae85115a82]. Ammended markdown help to refer to the safe-html setting.

stephan 2022-05-23 18:21 trunk
Commit 11064e46929294e89cb1b50625e85350d7969f0cfece94a5bfebf40e10cadb97
Parent 3984c8384892747…
2 files changed +2 -1 +66 -63
~ src/markdown.md ~ src/wikiformat.c
M src/markdown.md
+2 -1
--- src/markdown.md
+++ src/markdown.md
@@ -187,11 +187,12 @@
187187
 > are subject to further interpretation as Markdown sources.
188188
189189
 ## Miscellaneous ##
190190
191191
 > * In-line images are made using **\!\[alt-text\]\(image-URL\)**.
192
-> * Use HTML for advanced formatting such as forms.
192
+> * Use HTML for advanced formatting such as forms, noting that certain
193
+> tags are [disallowed in some contexts](/help?cmd=safe-html).
193194
 > * **\<!--** HTML-style comments **-->** are supported.
194195
 > * Escape special characters (ex: **\[** **\(** **\|** **\***)
195196
 > using backslash (ex: **\\\[** **\\\(** **\\\|** **\\\***).
196197
 > * A line consisting of **---**, **\*\*\***, or **\_\_\_** is a horizontal
197198
 > rule. Spaces and extra **-**/**\***/**_** are allowed.
198199
--- src/markdown.md
+++ src/markdown.md
@@ -187,11 +187,12 @@
187 > are subject to further interpretation as Markdown sources.
188
189 ## Miscellaneous ##
190
191 > * In-line images are made using **\!\[alt-text\]\(image-URL\)**.
192 > * Use HTML for advanced formatting such as forms.
 
193 > * **\<!--** HTML-style comments **-->** are supported.
194 > * Escape special characters (ex: **\[** **\(** **\|** **\***)
195 > using backslash (ex: **\\\[** **\\\(** **\\\|** **\\\***).
196 > * A line consisting of **---**, **\*\*\***, or **\_\_\_** is a horizontal
197 > rule. Spaces and extra **-**/**\***/**_** are allowed.
198
--- src/markdown.md
+++ src/markdown.md
@@ -187,11 +187,12 @@
187 > are subject to further interpretation as Markdown sources.
188
189 ## Miscellaneous ##
190
191 > * In-line images are made using **\!\[alt-text\]\(image-URL\)**.
192 > * Use HTML for advanced formatting such as forms, noting that certain
193 > tags are [disallowed in some contexts](/help?cmd=safe-html).
194 > * **\<!--** HTML-style comments **-->** are supported.
195 > * Escape special characters (ex: **\[** **\(** **\|** **\***)
196 > using backslash (ex: **\\\[** **\\\(** **\\\|** **\\\***).
197 > * A line consisting of **---**, **\*\*\***, or **\_\_\_** is a horizontal
198 > rule. Spaces and extra **-**/**\***/**_** are allowed.
199
M src/wikiformat.c
+66 -63
--- src/wikiformat.c
+++ src/wikiformat.c
@@ -175,76 +175,77 @@
175175
 ** Allowed markup.
176176
 **
177177
 ** Except for MARKUP_INVALID, this must all be in alphabetical order
178178
 ** and in numerical sequence. The first markup type must be zero.
179179
 ** The value for MARKUP_XYZ must correspond to the <xyz> entry
180
-** in aAllowedMarkup[].
180
+** in aMarkup[].
181181
 */
182182
 #define MARKUP_INVALID 0
183183
 #define MARKUP_A 1
184
-#define MARKUP_ADDRESS 2
185
-#define MARKUP_HTML5_ARTICLE 3
186
-#define MARKUP_HTML5_ASIDE 4
187
-#define MARKUP_B 5
188
-#define MARKUP_BIG 6
189
-#define MARKUP_BLOCKQUOTE 7
190
-#define MARKUP_BR 8
191
-#define MARKUP_CENTER 9
192
-#define MARKUP_CITE 10
193
-#define MARKUP_CODE 11
194
-#define MARKUP_COL 12
195
-#define MARKUP_COLGROUP 13
196
-#define MARKUP_DD 14
197
-#define MARKUP_DEL 15
198
-#define MARKUP_DFN 16
199
-#define MARKUP_DIV 17
200
-#define MARKUP_DL 18
201
-#define MARKUP_DT 19
202
-#define MARKUP_EM 20
203
-#define MARKUP_FONT 21
204
-#define MARKUP_HTML5_FOOTER 22
205
-#define MARKUP_H1 23
206
-#define MARKUP_H2 24
207
-#define MARKUP_H3 25
208
-#define MARKUP_H4 26
209
-#define MARKUP_H5 27
210
-#define MARKUP_H6 28
211
-#define MARKUP_HTML5_HEADER 29
212
-#define MARKUP_HR 30
213
-#define MARKUP_I 31
214
-#define MARKUP_IMG 32
215
-#define MARKUP_INS 33
216
-#define MARKUP_KBD 34
217
-#define MARKUP_LI 35
218
-#define MARKUP_HTML5_NAV 36
219
-#define MARKUP_NOBR 37
220
-#define MARKUP_NOWIKI 38
221
-#define MARKUP_OL 39
222
-#define MARKUP_P 40
223
-#define MARKUP_PRE 41
224
-#define MARKUP_S 42
225
-#define MARKUP_SAMP 43
226
-#define MARKUP_HTML5_SECTION 44
227
-#define MARKUP_SMALL 45
228
-#define MARKUP_SPAN 46
229
-#define MARKUP_STRIKE 47
230
-#define MARKUP_STRONG 48
231
-#define MARKUP_SUB 49
232
-#define MARKUP_SUP 50
233
-#define MARKUP_TABLE 51
234
-#define MARKUP_TBODY 52
235
-#define MARKUP_TD 53
236
-#define MARKUP_TFOOT 54
237
-#define MARKUP_TH 55
238
-#define MARKUP_THEAD 56
239
-#define MARKUP_TITLE 57
240
-#define MARKUP_TR 58
241
-#define MARKUP_TT 59
242
-#define MARKUP_U 60
243
-#define MARKUP_UL 61
244
-#define MARKUP_VAR 62
245
-#define MARKUP_VERBATIM 63
184
+#define MARKUP_ABBR 2
185
+#define MARKUP_ADDRESS 3
186
+#define MARKUP_HTML5_ARTICLE 4
187
+#define MARKUP_HTML5_ASIDE 5
188
+#define MARKUP_B 6
189
+#define MARKUP_BIG 7
190
+#define MARKUP_BLOCKQUOTE 8
191
+#define MARKUP_BR 9
192
+#define MARKUP_CENTER 10
193
+#define MARKUP_CITE 11
194
+#define MARKUP_CODE 12
195
+#define MARKUP_COL 13
196
+#define MARKUP_COLGROUP 14
197
+#define MARKUP_DD 15
198
+#define MARKUP_DEL 16
199
+#define MARKUP_DFN 17
200
+#define MARKUP_DIV 18
201
+#define MARKUP_DL 19
202
+#define MARKUP_DT 20
203
+#define MARKUP_EM 21
204
+#define MARKUP_FONT 22
205
+#define MARKUP_HTML5_FOOTER 23
206
+#define MARKUP_H1 24
207
+#define MARKUP_H2 25
208
+#define MARKUP_H3 26
209
+#define MARKUP_H4 27
210
+#define MARKUP_H5 28
211
+#define MARKUP_H6 29
212
+#define MARKUP_HTML5_HEADER 30
213
+#define MARKUP_HR 31
214
+#define MARKUP_I 32
215
+#define MARKUP_IMG 33
216
+#define MARKUP_INS 34
217
+#define MARKUP_KBD 35
218
+#define MARKUP_LI 36
219
+#define MARKUP_HTML5_NAV 37
220
+#define MARKUP_NOBR 38
221
+#define MARKUP_NOWIKI 39
222
+#define MARKUP_OL 40
223
+#define MARKUP_P 41
224
+#define MARKUP_PRE 42
225
+#define MARKUP_S 43
226
+#define MARKUP_SAMP 44
227
+#define MARKUP_HTML5_SECTION 45
228
+#define MARKUP_SMALL 46
229
+#define MARKUP_SPAN 47
230
+#define MARKUP_STRIKE 48
231
+#define MARKUP_STRONG 49
232
+#define MARKUP_SUB 50
233
+#define MARKUP_SUP 51
234
+#define MARKUP_TABLE 52
235
+#define MARKUP_TBODY 53
236
+#define MARKUP_TD 54
237
+#define MARKUP_TFOOT 55
238
+#define MARKUP_TH 56
239
+#define MARKUP_THEAD 57
240
+#define MARKUP_TITLE 58
241
+#define MARKUP_TR 59
242
+#define MARKUP_TT 60
243
+#define MARKUP_U 61
244
+#define MARKUP_UL 62
245
+#define MARKUP_VAR 63
246
+#define MARKUP_VERBATIM 64
246247
247248
 /*
248249
 ** The various markup is divided into the following types:
249250
 */
250251
 #define MUTYPE_SINGLE 0x0001 /* <img>, <br>, or <hr> */
@@ -279,10 +280,12 @@
279280
 } aMarkup[] = {
280281
 { 0, MARKUP_INVALID, 0, 0 },
281282
 { "a", MARKUP_A, MUTYPE_HYPERLINK,
282283
 AMSK_HREF|AMSK_NAME|AMSK_CLASS|AMSK_TARGET|AMSK_STYLE|
283284
 AMSK_TITLE},
285
+ { "abbr", MARKUP_ABBR, MUTYPE_FONT,
286
+ AMSK_ID|AMSK_CLASS|AMSK_STYLE },
284287
 { "address", MARKUP_ADDRESS, MUTYPE_BLOCK, AMSK_STYLE },
285288
 { "article", MARKUP_HTML5_ARTICLE, MUTYPE_BLOCK,
286289
 AMSK_ID|AMSK_CLASS|AMSK_STYLE },
287290
 { "aside", MARKUP_HTML5_ASIDE, MUTYPE_BLOCK,
288291
 AMSK_ID|AMSK_CLASS|AMSK_STYLE },
289292
--- src/wikiformat.c
+++ src/wikiformat.c
@@ -175,76 +175,77 @@
175 ** Allowed markup.
176 **
177 ** Except for MARKUP_INVALID, this must all be in alphabetical order
178 ** and in numerical sequence. The first markup type must be zero.
179 ** The value for MARKUP_XYZ must correspond to the <xyz> entry
180 ** in aAllowedMarkup[].
181 */
182 #define MARKUP_INVALID 0
183 #define MARKUP_A 1
184 #define MARKUP_ADDRESS 2
185 #define MARKUP_HTML5_ARTICLE 3
186 #define MARKUP_HTML5_ASIDE 4
187 #define MARKUP_B 5
188 #define MARKUP_BIG 6
189 #define MARKUP_BLOCKQUOTE 7
190 #define MARKUP_BR 8
191 #define MARKUP_CENTER 9
192 #define MARKUP_CITE 10
193 #define MARKUP_CODE 11
194 #define MARKUP_COL 12
195 #define MARKUP_COLGROUP 13
196 #define MARKUP_DD 14
197 #define MARKUP_DEL 15
198 #define MARKUP_DFN 16
199 #define MARKUP_DIV 17
200 #define MARKUP_DL 18
201 #define MARKUP_DT 19
202 #define MARKUP_EM 20
203 #define MARKUP_FONT 21
204 #define MARKUP_HTML5_FOOTER 22
205 #define MARKUP_H1 23
206 #define MARKUP_H2 24
207 #define MARKUP_H3 25
208 #define MARKUP_H4 26
209 #define MARKUP_H5 27
210 #define MARKUP_H6 28
211 #define MARKUP_HTML5_HEADER 29
212 #define MARKUP_HR 30
213 #define MARKUP_I 31
214 #define MARKUP_IMG 32
215 #define MARKUP_INS 33
216 #define MARKUP_KBD 34
217 #define MARKUP_LI 35
218 #define MARKUP_HTML5_NAV 36
219 #define MARKUP_NOBR 37
220 #define MARKUP_NOWIKI 38
221 #define MARKUP_OL 39
222 #define MARKUP_P 40
223 #define MARKUP_PRE 41
224 #define MARKUP_S 42
225 #define MARKUP_SAMP 43
226 #define MARKUP_HTML5_SECTION 44
227 #define MARKUP_SMALL 45
228 #define MARKUP_SPAN 46
229 #define MARKUP_STRIKE 47
230 #define MARKUP_STRONG 48
231 #define MARKUP_SUB 49
232 #define MARKUP_SUP 50
233 #define MARKUP_TABLE 51
234 #define MARKUP_TBODY 52
235 #define MARKUP_TD 53
236 #define MARKUP_TFOOT 54
237 #define MARKUP_TH 55
238 #define MARKUP_THEAD 56
239 #define MARKUP_TITLE 57
240 #define MARKUP_TR 58
241 #define MARKUP_TT 59
242 #define MARKUP_U 60
243 #define MARKUP_UL 61
244 #define MARKUP_VAR 62
245 #define MARKUP_VERBATIM 63
 
246
247 /*
248 ** The various markup is divided into the following types:
249 */
250 #define MUTYPE_SINGLE 0x0001 /* <img>, <br>, or <hr> */
@@ -279,10 +280,12 @@
279 } aMarkup[] = {
280 { 0, MARKUP_INVALID, 0, 0 },
281 { "a", MARKUP_A, MUTYPE_HYPERLINK,
282 AMSK_HREF|AMSK_NAME|AMSK_CLASS|AMSK_TARGET|AMSK_STYLE|
283 AMSK_TITLE},
 
 
284 { "address", MARKUP_ADDRESS, MUTYPE_BLOCK, AMSK_STYLE },
285 { "article", MARKUP_HTML5_ARTICLE, MUTYPE_BLOCK,
286 AMSK_ID|AMSK_CLASS|AMSK_STYLE },
287 { "aside", MARKUP_HTML5_ASIDE, MUTYPE_BLOCK,
288 AMSK_ID|AMSK_CLASS|AMSK_STYLE },
289
--- src/wikiformat.c
+++ src/wikiformat.c
@@ -175,76 +175,77 @@
175 ** Allowed markup.
176 **
177 ** Except for MARKUP_INVALID, this must all be in alphabetical order
178 ** and in numerical sequence. The first markup type must be zero.
179 ** The value for MARKUP_XYZ must correspond to the <xyz> entry
180 ** in aMarkup[].
181 */
182 #define MARKUP_INVALID 0
183 #define MARKUP_A 1
184 #define MARKUP_ABBR 2
185 #define MARKUP_ADDRESS 3
186 #define MARKUP_HTML5_ARTICLE 4
187 #define MARKUP_HTML5_ASIDE 5
188 #define MARKUP_B 6
189 #define MARKUP_BIG 7
190 #define MARKUP_BLOCKQUOTE 8
191 #define MARKUP_BR 9
192 #define MARKUP_CENTER 10
193 #define MARKUP_CITE 11
194 #define MARKUP_CODE 12
195 #define MARKUP_COL 13
196 #define MARKUP_COLGROUP 14
197 #define MARKUP_DD 15
198 #define MARKUP_DEL 16
199 #define MARKUP_DFN 17
200 #define MARKUP_DIV 18
201 #define MARKUP_DL 19
202 #define MARKUP_DT 20
203 #define MARKUP_EM 21
204 #define MARKUP_FONT 22
205 #define MARKUP_HTML5_FOOTER 23
206 #define MARKUP_H1 24
207 #define MARKUP_H2 25
208 #define MARKUP_H3 26
209 #define MARKUP_H4 27
210 #define MARKUP_H5 28
211 #define MARKUP_H6 29
212 #define MARKUP_HTML5_HEADER 30
213 #define MARKUP_HR 31
214 #define MARKUP_I 32
215 #define MARKUP_IMG 33
216 #define MARKUP_INS 34
217 #define MARKUP_KBD 35
218 #define MARKUP_LI 36
219 #define MARKUP_HTML5_NAV 37
220 #define MARKUP_NOBR 38
221 #define MARKUP_NOWIKI 39
222 #define MARKUP_OL 40
223 #define MARKUP_P 41
224 #define MARKUP_PRE 42
225 #define MARKUP_S 43
226 #define MARKUP_SAMP 44
227 #define MARKUP_HTML5_SECTION 45
228 #define MARKUP_SMALL 46
229 #define MARKUP_SPAN 47
230 #define MARKUP_STRIKE 48
231 #define MARKUP_STRONG 49
232 #define MARKUP_SUB 50
233 #define MARKUP_SUP 51
234 #define MARKUP_TABLE 52
235 #define MARKUP_TBODY 53
236 #define MARKUP_TD 54
237 #define MARKUP_TFOOT 55
238 #define MARKUP_TH 56
239 #define MARKUP_THEAD 57
240 #define MARKUP_TITLE 58
241 #define MARKUP_TR 59
242 #define MARKUP_TT 60
243 #define MARKUP_U 61
244 #define MARKUP_UL 62
245 #define MARKUP_VAR 63
246 #define MARKUP_VERBATIM 64
247
248 /*
249 ** The various markup is divided into the following types:
250 */
251 #define MUTYPE_SINGLE 0x0001 /* <img>, <br>, or <hr> */
@@ -279,10 +280,12 @@
280 } aMarkup[] = {
281 { 0, MARKUP_INVALID, 0, 0 },
282 { "a", MARKUP_A, MUTYPE_HYPERLINK,
283 AMSK_HREF|AMSK_NAME|AMSK_CLASS|AMSK_TARGET|AMSK_STYLE|
284 AMSK_TITLE},
285 { "abbr", MARKUP_ABBR, MUTYPE_FONT,
286 AMSK_ID|AMSK_CLASS|AMSK_STYLE },
287 { "address", MARKUP_ADDRESS, MUTYPE_BLOCK, AMSK_STYLE },
288 { "article", MARKUP_HTML5_ARTICLE, MUTYPE_BLOCK,
289 AMSK_ID|AMSK_CLASS|AMSK_STYLE },
290 { "aside", MARKUP_HTML5_ASIDE, MUTYPE_BLOCK,
291 AMSK_ID|AMSK_CLASS|AMSK_STYLE },
292

Keyboard Shortcuts

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