Fossil SCM

Added missing AMSK_TITLE permissions for the ABBR tag and refactored the MARKUP_xyz macros into an enum to support the upcoming addition of a few more benign element types.

stephan 2022-05-23 21:25 trunk
Commit 81deb15c53f53486fe4636a8dd4f597e1f2110a964eee189fbb03662a5c055e4
Parent 11064e46929294e…
1 file changed +68 -66
~ src/wikiformat.c
M src/wikiformat.c
+68 -66
--- src/wikiformat.c
+++ src/wikiformat.c
@@ -177,75 +177,77 @@
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
180180
 ** in aMarkup[].
181181
 */
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
182
+enum markup_t {
183
+ MARKUP_INVALID = 0,
184
+ MARKUP_A,
185
+ MARKUP_ABBR,
186
+ MARKUP_ADDRESS,
187
+ MARKUP_HTML5_ARTICLE,
188
+ MARKUP_HTML5_ASIDE,
189
+ MARKUP_B,
190
+ MARKUP_BIG,
191
+ MARKUP_BLOCKQUOTE,
192
+ MARKUP_BR,
193
+ MARKUP_CENTER,
194
+ MARKUP_CITE,
195
+ MARKUP_CODE,
196
+ MARKUP_COL,
197
+ MARKUP_COLGROUP,
198
+ MARKUP_DD,
199
+ MARKUP_DEL,
200
+ MARKUP_DFN,
201
+ MARKUP_DIV,
202
+ MARKUP_DL,
203
+ MARKUP_DT,
204
+ MARKUP_EM,
205
+ MARKUP_FONT,
206
+ MARKUP_HTML5_FOOTER,
207
+ MARKUP_H1,
208
+ MARKUP_H2,
209
+ MARKUP_H3,
210
+ MARKUP_H4,
211
+ MARKUP_H5,
212
+ MARKUP_H6,
213
+ MARKUP_HTML5_HEADER,
214
+ MARKUP_HR,
215
+ MARKUP_I,
216
+ MARKUP_IMG,
217
+ MARKUP_INS,
218
+ MARKUP_KBD,
219
+ MARKUP_LI,
220
+ MARKUP_HTML5_NAV,
221
+ MARKUP_NOBR,
222
+ MARKUP_NOWIKI,
223
+ MARKUP_OL,
224
+ MARKUP_P,
225
+ MARKUP_PRE,
226
+ MARKUP_S,
227
+ MARKUP_SAMP,
228
+ MARKUP_HTML5_SECTION,
229
+ MARKUP_SMALL,
230
+ MARKUP_SPAN,
231
+ MARKUP_STRIKE,
232
+ MARKUP_STRONG,
233
+ MARKUP_SUB,
234
+ MARKUP_SUP,
235
+ MARKUP_TABLE,
236
+ MARKUP_TBODY,
237
+ MARKUP_TD,
238
+ MARKUP_TFOOT,
239
+ MARKUP_TH,
240
+ MARKUP_THEAD,
241
+ MARKUP_TITLE,
242
+ MARKUP_TR,
243
+ MARKUP_TT,
244
+ MARKUP_U,
245
+ MARKUP_UL,
246
+ MARKUP_VAR,
247
+ MARKUP_VERBATIM
248
+};
247249
248250
 /*
249251
 ** The various markup is divided into the following types:
250252
 */
251253
 #define MUTYPE_SINGLE 0x0001 /* <img>, <br>, or <hr> */
@@ -281,11 +283,11 @@
281283
 { 0, MARKUP_INVALID, 0, 0 },
282284
 { "a", MARKUP_A, MUTYPE_HYPERLINK,
283285
 AMSK_HREF|AMSK_NAME|AMSK_CLASS|AMSK_TARGET|AMSK_STYLE|
284286
 AMSK_TITLE},
285287
 { "abbr", MARKUP_ABBR, MUTYPE_FONT,
286
- AMSK_ID|AMSK_CLASS|AMSK_STYLE },
288
+ AMSK_ID|AMSK_CLASS|AMSK_STYLE|AMSK_TITLE },
287289
 { "address", MARKUP_ADDRESS, MUTYPE_BLOCK, AMSK_STYLE },
288290
 { "article", MARKUP_HTML5_ARTICLE, MUTYPE_BLOCK,
289291
 AMSK_ID|AMSK_CLASS|AMSK_STYLE },
290292
 { "aside", MARKUP_HTML5_ASIDE, MUTYPE_BLOCK,
291293
 AMSK_ID|AMSK_CLASS|AMSK_STYLE },
292294
--- src/wikiformat.c
+++ src/wikiformat.c
@@ -177,75 +177,77 @@
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> */
@@ -281,11 +283,11 @@
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
--- src/wikiformat.c
+++ src/wikiformat.c
@@ -177,75 +177,77 @@
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 enum markup_t {
183 MARKUP_INVALID = 0,
184 MARKUP_A,
185 MARKUP_ABBR,
186 MARKUP_ADDRESS,
187 MARKUP_HTML5_ARTICLE,
188 MARKUP_HTML5_ASIDE,
189 MARKUP_B,
190 MARKUP_BIG,
191 MARKUP_BLOCKQUOTE,
192 MARKUP_BR,
193 MARKUP_CENTER,
194 MARKUP_CITE,
195 MARKUP_CODE,
196 MARKUP_COL,
197 MARKUP_COLGROUP,
198 MARKUP_DD,
199 MARKUP_DEL,
200 MARKUP_DFN,
201 MARKUP_DIV,
202 MARKUP_DL,
203 MARKUP_DT,
204 MARKUP_EM,
205 MARKUP_FONT,
206 MARKUP_HTML5_FOOTER,
207 MARKUP_H1,
208 MARKUP_H2,
209 MARKUP_H3,
210 MARKUP_H4,
211 MARKUP_H5,
212 MARKUP_H6,
213 MARKUP_HTML5_HEADER,
214 MARKUP_HR,
215 MARKUP_I,
216 MARKUP_IMG,
217 MARKUP_INS,
218 MARKUP_KBD,
219 MARKUP_LI,
220 MARKUP_HTML5_NAV,
221 MARKUP_NOBR,
222 MARKUP_NOWIKI,
223 MARKUP_OL,
224 MARKUP_P,
225 MARKUP_PRE,
226 MARKUP_S,
227 MARKUP_SAMP,
228 MARKUP_HTML5_SECTION,
229 MARKUP_SMALL,
230 MARKUP_SPAN,
231 MARKUP_STRIKE,
232 MARKUP_STRONG,
233 MARKUP_SUB,
234 MARKUP_SUP,
235 MARKUP_TABLE,
236 MARKUP_TBODY,
237 MARKUP_TD,
238 MARKUP_TFOOT,
239 MARKUP_TH,
240 MARKUP_THEAD,
241 MARKUP_TITLE,
242 MARKUP_TR,
243 MARKUP_TT,
244 MARKUP_U,
245 MARKUP_UL,
246 MARKUP_VAR,
247 MARKUP_VERBATIM
248 };
249
250 /*
251 ** The various markup is divided into the following types:
252 */
253 #define MUTYPE_SINGLE 0x0001 /* <img>, <br>, or <hr> */
@@ -281,11 +283,11 @@
283 { 0, MARKUP_INVALID, 0, 0 },
284 { "a", MARKUP_A, MUTYPE_HYPERLINK,
285 AMSK_HREF|AMSK_NAME|AMSK_CLASS|AMSK_TARGET|AMSK_STYLE|
286 AMSK_TITLE},
287 { "abbr", MARKUP_ABBR, MUTYPE_FONT,
288 AMSK_ID|AMSK_CLASS|AMSK_STYLE|AMSK_TITLE },
289 { "address", MARKUP_ADDRESS, MUTYPE_BLOCK, AMSK_STYLE },
290 { "article", MARKUP_HTML5_ARTICLE, MUTYPE_BLOCK,
291 AMSK_ID|AMSK_CLASS|AMSK_STYLE },
292 { "aside", MARKUP_HTML5_ASIDE, MUTYPE_BLOCK,
293 AMSK_ID|AMSK_CLASS|AMSK_STYLE },
294

Keyboard Shortcuts

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