Fossil SCM

All <del> and <ins> markup in wiki and in markdown.

drh 2020-08-18 14:00 trunk
Commit ae9a9db55314ac7928e854b9f94ca3708ed9657723b7ff7c1e8465d58b833825
Parent 17c244de219d296…
1 file changed +51 -47
~ src/wikiformat.c
M src/wikiformat.c
+51 -47
--- src/wikiformat.c
+++ src/wikiformat.c
@@ -188,57 +188,59 @@
188188
 #define MARKUP_CITE 10
189189
 #define MARKUP_CODE 11
190190
 #define MARKUP_COL 12
191191
 #define MARKUP_COLGROUP 13
192192
 #define MARKUP_DD 14
193
-#define MARKUP_DFN 15
194
-#define MARKUP_DIV 16
195
-#define MARKUP_DL 17
196
-#define MARKUP_DT 18
197
-#define MARKUP_EM 19
198
-#define MARKUP_FONT 20
199
-#define MARKUP_HTML5_FOOTER 21
200
-#define MARKUP_H1 22
201
-#define MARKUP_H2 23
202
-#define MARKUP_H3 24
203
-#define MARKUP_H4 25
204
-#define MARKUP_H5 26
205
-#define MARKUP_H6 27
206
-#define MARKUP_HTML5_HEADER 28
207
-#define MARKUP_HR 29
208
-#define MARKUP_I 30
209
-#define MARKUP_IMG 31
210
-#define MARKUP_KBD 32
211
-#define MARKUP_LI 33
212
-#define MARKUP_HTML5_NAV 34
213
-#define MARKUP_NOBR 35
214
-#define MARKUP_NOWIKI 36
215
-#define MARKUP_OL 37
216
-#define MARKUP_P 38
217
-#define MARKUP_PRE 39
218
-#define MARKUP_S 40
219
-#define MARKUP_SAMP 41
220
-#define MARKUP_HTML5_SECTION 42
221
-#define MARKUP_SMALL 43
222
-#define MARKUP_SPAN 44
223
-#define MARKUP_STRIKE 45
224
-#define MARKUP_STRONG 46
225
-#define MARKUP_SUB 47
226
-#define MARKUP_SUP 48
227
-#define MARKUP_TABLE 49
228
-#define MARKUP_TBODY 50
229
-#define MARKUP_TD 51
230
-#define MARKUP_TFOOT 52
231
-#define MARKUP_TH 53
232
-#define MARKUP_THEAD 54
233
-#define MARKUP_TITLE 55
234
-#define MARKUP_TR 56
235
-#define MARKUP_TT 57
236
-#define MARKUP_U 58
237
-#define MARKUP_UL 59
238
-#define MARKUP_VAR 60
239
-#define MARKUP_VERBATIM 61
193
+#define MARKUP_DEL 15
194
+#define MARKUP_DFN 16
195
+#define MARKUP_DIV 17
196
+#define MARKUP_DL 18
197
+#define MARKUP_DT 19
198
+#define MARKUP_EM 20
199
+#define MARKUP_FONT 21
200
+#define MARKUP_HTML5_FOOTER 22
201
+#define MARKUP_H1 23
202
+#define MARKUP_H2 24
203
+#define MARKUP_H3 25
204
+#define MARKUP_H4 26
205
+#define MARKUP_H5 27
206
+#define MARKUP_H6 28
207
+#define MARKUP_HTML5_HEADER 29
208
+#define MARKUP_HR 30
209
+#define MARKUP_I 31
210
+#define MARKUP_IMG 32
211
+#define MARKUP_INS 33
212
+#define MARKUP_KBD 34
213
+#define MARKUP_LI 35
214
+#define MARKUP_HTML5_NAV 36
215
+#define MARKUP_NOBR 37
216
+#define MARKUP_NOWIKI 38
217
+#define MARKUP_OL 39
218
+#define MARKUP_P 40
219
+#define MARKUP_PRE 41
220
+#define MARKUP_S 42
221
+#define MARKUP_SAMP 43
222
+#define MARKUP_HTML5_SECTION 44
223
+#define MARKUP_SMALL 45
224
+#define MARKUP_SPAN 46
225
+#define MARKUP_STRIKE 47
226
+#define MARKUP_STRONG 48
227
+#define MARKUP_SUB 49
228
+#define MARKUP_SUP 50
229
+#define MARKUP_TABLE 51
230
+#define MARKUP_TBODY 52
231
+#define MARKUP_TD 53
232
+#define MARKUP_TFOOT 54
233
+#define MARKUP_TH 55
234
+#define MARKUP_THEAD 56
235
+#define MARKUP_TITLE 57
236
+#define MARKUP_TR 58
237
+#define MARKUP_TT 59
238
+#define MARKUP_U 60
239
+#define MARKUP_UL 61
240
+#define MARKUP_VAR 62
241
+#define MARKUP_VERBATIM 63
240242
241243
 /*
242244
 ** The various markup is divided into the following types:
243245
 */
244246
 #define MUTYPE_SINGLE 0x0001 /* <img>, <br>, or <hr> */
@@ -290,10 +292,11 @@
290292
 { "col", MARKUP_COL, MUTYPE_SINGLE,
291293
 AMSK_ALIGN|AMSK_CLASS|AMSK_COLSPAN|AMSK_WIDTH|AMSK_STYLE },
292294
 { "colgroup", MARKUP_COLGROUP, MUTYPE_BLOCK,
293295
 AMSK_ALIGN|AMSK_CLASS|AMSK_COLSPAN|AMSK_WIDTH|AMSK_STYLE},
294296
 { "dd", MARKUP_DD, MUTYPE_LI, AMSK_STYLE },
297
+ { "del", MARKUP_DEL, MUTYPE_FONT, AMSK_STYLE },
295298
 { "dfn", MARKUP_DFN, MUTYPE_FONT, AMSK_STYLE },
296299
 { "div", MARKUP_DIV, MUTYPE_BLOCK,
297300
 AMSK_ID|AMSK_CLASS|AMSK_STYLE },
298301
 { "dl", MARKUP_DL, MUTYPE_LIST,
299302
 AMSK_COMPACT|AMSK_STYLE },
@@ -325,10 +328,11 @@
325328
 AMSK_STYLE|AMSK_CLASS },
326329
 { "i", MARKUP_I, MUTYPE_FONT, AMSK_STYLE },
327330
 { "img", MARKUP_IMG, MUTYPE_SINGLE,
328331
 AMSK_ALIGN|AMSK_ALT|AMSK_BORDER|AMSK_HEIGHT|
329332
 AMSK_HSPACE|AMSK_SRC|AMSK_VSPACE|AMSK_WIDTH|AMSK_STYLE },
333
+ { "ins", MARKUP_INS, MUTYPE_FONT, AMSK_STYLE },
330334
 { "kbd", MARKUP_KBD, MUTYPE_FONT, AMSK_STYLE },
331335
 { "li", MARKUP_LI, MUTYPE_LI,
332336
 AMSK_TYPE|AMSK_VALUE|AMSK_STYLE },
333337
 { "nav", MARKUP_HTML5_NAV, MUTYPE_BLOCK,
334338
 AMSK_ID|AMSK_CLASS|AMSK_STYLE },
335339
--- src/wikiformat.c
+++ src/wikiformat.c
@@ -188,57 +188,59 @@
188 #define MARKUP_CITE 10
189 #define MARKUP_CODE 11
190 #define MARKUP_COL 12
191 #define MARKUP_COLGROUP 13
192 #define MARKUP_DD 14
193 #define MARKUP_DFN 15
194 #define MARKUP_DIV 16
195 #define MARKUP_DL 17
196 #define MARKUP_DT 18
197 #define MARKUP_EM 19
198 #define MARKUP_FONT 20
199 #define MARKUP_HTML5_FOOTER 21
200 #define MARKUP_H1 22
201 #define MARKUP_H2 23
202 #define MARKUP_H3 24
203 #define MARKUP_H4 25
204 #define MARKUP_H5 26
205 #define MARKUP_H6 27
206 #define MARKUP_HTML5_HEADER 28
207 #define MARKUP_HR 29
208 #define MARKUP_I 30
209 #define MARKUP_IMG 31
210 #define MARKUP_KBD 32
211 #define MARKUP_LI 33
212 #define MARKUP_HTML5_NAV 34
213 #define MARKUP_NOBR 35
214 #define MARKUP_NOWIKI 36
215 #define MARKUP_OL 37
216 #define MARKUP_P 38
217 #define MARKUP_PRE 39
218 #define MARKUP_S 40
219 #define MARKUP_SAMP 41
220 #define MARKUP_HTML5_SECTION 42
221 #define MARKUP_SMALL 43
222 #define MARKUP_SPAN 44
223 #define MARKUP_STRIKE 45
224 #define MARKUP_STRONG 46
225 #define MARKUP_SUB 47
226 #define MARKUP_SUP 48
227 #define MARKUP_TABLE 49
228 #define MARKUP_TBODY 50
229 #define MARKUP_TD 51
230 #define MARKUP_TFOOT 52
231 #define MARKUP_TH 53
232 #define MARKUP_THEAD 54
233 #define MARKUP_TITLE 55
234 #define MARKUP_TR 56
235 #define MARKUP_TT 57
236 #define MARKUP_U 58
237 #define MARKUP_UL 59
238 #define MARKUP_VAR 60
239 #define MARKUP_VERBATIM 61
 
 
240
241 /*
242 ** The various markup is divided into the following types:
243 */
244 #define MUTYPE_SINGLE 0x0001 /* <img>, <br>, or <hr> */
@@ -290,10 +292,11 @@
290 { "col", MARKUP_COL, MUTYPE_SINGLE,
291 AMSK_ALIGN|AMSK_CLASS|AMSK_COLSPAN|AMSK_WIDTH|AMSK_STYLE },
292 { "colgroup", MARKUP_COLGROUP, MUTYPE_BLOCK,
293 AMSK_ALIGN|AMSK_CLASS|AMSK_COLSPAN|AMSK_WIDTH|AMSK_STYLE},
294 { "dd", MARKUP_DD, MUTYPE_LI, AMSK_STYLE },
 
295 { "dfn", MARKUP_DFN, MUTYPE_FONT, AMSK_STYLE },
296 { "div", MARKUP_DIV, MUTYPE_BLOCK,
297 AMSK_ID|AMSK_CLASS|AMSK_STYLE },
298 { "dl", MARKUP_DL, MUTYPE_LIST,
299 AMSK_COMPACT|AMSK_STYLE },
@@ -325,10 +328,11 @@
325 AMSK_STYLE|AMSK_CLASS },
326 { "i", MARKUP_I, MUTYPE_FONT, AMSK_STYLE },
327 { "img", MARKUP_IMG, MUTYPE_SINGLE,
328 AMSK_ALIGN|AMSK_ALT|AMSK_BORDER|AMSK_HEIGHT|
329 AMSK_HSPACE|AMSK_SRC|AMSK_VSPACE|AMSK_WIDTH|AMSK_STYLE },
 
330 { "kbd", MARKUP_KBD, MUTYPE_FONT, AMSK_STYLE },
331 { "li", MARKUP_LI, MUTYPE_LI,
332 AMSK_TYPE|AMSK_VALUE|AMSK_STYLE },
333 { "nav", MARKUP_HTML5_NAV, MUTYPE_BLOCK,
334 AMSK_ID|AMSK_CLASS|AMSK_STYLE },
335
--- src/wikiformat.c
+++ src/wikiformat.c
@@ -188,57 +188,59 @@
188 #define MARKUP_CITE 10
189 #define MARKUP_CODE 11
190 #define MARKUP_COL 12
191 #define MARKUP_COLGROUP 13
192 #define MARKUP_DD 14
193 #define MARKUP_DEL 15
194 #define MARKUP_DFN 16
195 #define MARKUP_DIV 17
196 #define MARKUP_DL 18
197 #define MARKUP_DT 19
198 #define MARKUP_EM 20
199 #define MARKUP_FONT 21
200 #define MARKUP_HTML5_FOOTER 22
201 #define MARKUP_H1 23
202 #define MARKUP_H2 24
203 #define MARKUP_H3 25
204 #define MARKUP_H4 26
205 #define MARKUP_H5 27
206 #define MARKUP_H6 28
207 #define MARKUP_HTML5_HEADER 29
208 #define MARKUP_HR 30
209 #define MARKUP_I 31
210 #define MARKUP_IMG 32
211 #define MARKUP_INS 33
212 #define MARKUP_KBD 34
213 #define MARKUP_LI 35
214 #define MARKUP_HTML5_NAV 36
215 #define MARKUP_NOBR 37
216 #define MARKUP_NOWIKI 38
217 #define MARKUP_OL 39
218 #define MARKUP_P 40
219 #define MARKUP_PRE 41
220 #define MARKUP_S 42
221 #define MARKUP_SAMP 43
222 #define MARKUP_HTML5_SECTION 44
223 #define MARKUP_SMALL 45
224 #define MARKUP_SPAN 46
225 #define MARKUP_STRIKE 47
226 #define MARKUP_STRONG 48
227 #define MARKUP_SUB 49
228 #define MARKUP_SUP 50
229 #define MARKUP_TABLE 51
230 #define MARKUP_TBODY 52
231 #define MARKUP_TD 53
232 #define MARKUP_TFOOT 54
233 #define MARKUP_TH 55
234 #define MARKUP_THEAD 56
235 #define MARKUP_TITLE 57
236 #define MARKUP_TR 58
237 #define MARKUP_TT 59
238 #define MARKUP_U 60
239 #define MARKUP_UL 61
240 #define MARKUP_VAR 62
241 #define MARKUP_VERBATIM 63
242
243 /*
244 ** The various markup is divided into the following types:
245 */
246 #define MUTYPE_SINGLE 0x0001 /* <img>, <br>, or <hr> */
@@ -290,10 +292,11 @@
292 { "col", MARKUP_COL, MUTYPE_SINGLE,
293 AMSK_ALIGN|AMSK_CLASS|AMSK_COLSPAN|AMSK_WIDTH|AMSK_STYLE },
294 { "colgroup", MARKUP_COLGROUP, MUTYPE_BLOCK,
295 AMSK_ALIGN|AMSK_CLASS|AMSK_COLSPAN|AMSK_WIDTH|AMSK_STYLE},
296 { "dd", MARKUP_DD, MUTYPE_LI, AMSK_STYLE },
297 { "del", MARKUP_DEL, MUTYPE_FONT, AMSK_STYLE },
298 { "dfn", MARKUP_DFN, MUTYPE_FONT, AMSK_STYLE },
299 { "div", MARKUP_DIV, MUTYPE_BLOCK,
300 AMSK_ID|AMSK_CLASS|AMSK_STYLE },
301 { "dl", MARKUP_DL, MUTYPE_LIST,
302 AMSK_COMPACT|AMSK_STYLE },
@@ -325,10 +328,11 @@
328 AMSK_STYLE|AMSK_CLASS },
329 { "i", MARKUP_I, MUTYPE_FONT, AMSK_STYLE },
330 { "img", MARKUP_IMG, MUTYPE_SINGLE,
331 AMSK_ALIGN|AMSK_ALT|AMSK_BORDER|AMSK_HEIGHT|
332 AMSK_HSPACE|AMSK_SRC|AMSK_VSPACE|AMSK_WIDTH|AMSK_STYLE },
333 { "ins", MARKUP_INS, MUTYPE_FONT, AMSK_STYLE },
334 { "kbd", MARKUP_KBD, MUTYPE_FONT, AMSK_STYLE },
335 { "li", MARKUP_LI, MUTYPE_LI,
336 AMSK_TYPE|AMSK_VALUE|AMSK_STYLE },
337 { "nav", MARKUP_HTML5_NAV, MUTYPE_BLOCK,
338 AMSK_ID|AMSK_CLASS|AMSK_STYLE },
339

Keyboard Shortcuts

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