Fossil SCM

added thead, tfoot, tbody, col, colgroup and span to allowed html. So that pages generated by docbook and elyxer are accepted

renez 2010-10-01 15:39 trunk
Commit 172dccb66fa571b019bd59827dd6b28f3346e04c
Parent cabf810b0b45ef9…
1 file changed +63 -49
~ src/wikiformat.c
M src/wikiformat.c
+63 -49
--- src/wikiformat.c
+++ src/wikiformat.c
@@ -150,59 +150,65 @@
150150
 ** Except for MARKUP_INVALID, this must all be in alphabetical order
151151
 ** and in numerical sequence. The first markup type must be zero.
152152
 ** The value for MARKUP_XYZ must correspond to the <xyz> entry
153153
 ** in aAllowedMarkup[].
154154
 */
155
-#define MARKUP_INVALID 0
156
-#define MARKUP_A 1
157
-#define MARKUP_ADDRESS 2
158
-#define MARKUP_B 3
159
-#define MARKUP_BIG 4
160
-#define MARKUP_BLOCKQUOTE 5
161
-#define MARKUP_BR 6
162
-#define MARKUP_CENTER 7
163
-#define MARKUP_CITE 8
164
-#define MARKUP_CODE 9
165
-#define MARKUP_DD 10
166
-#define MARKUP_DFN 11
167
-#define MARKUP_DIV 12
168
-#define MARKUP_DL 13
169
-#define MARKUP_DT 14
170
-#define MARKUP_EM 15
171
-#define MARKUP_FONT 16
172
-#define MARKUP_H1 17
173
-#define MARKUP_H2 18
174
-#define MARKUP_H3 19
175
-#define MARKUP_H4 20
176
-#define MARKUP_H5 21
177
-#define MARKUP_H6 22
178
-#define MARKUP_HR 23
179
-#define MARKUP_I 24
180
-#define MARKUP_IMG 25
181
-#define MARKUP_KBD 26
182
-#define MARKUP_LI 27
183
-#define MARKUP_NOBR 28
184
-#define MARKUP_NOWIKI 29
185
-#define MARKUP_OL 30
186
-#define MARKUP_P 31
187
-#define MARKUP_PRE 32
188
-#define MARKUP_S 33
189
-#define MARKUP_SAMP 34
190
-#define MARKUP_SMALL 35
191
-#define MARKUP_STRIKE 36
192
-#define MARKUP_STRONG 37
193
-#define MARKUP_SUB 38
194
-#define MARKUP_SUP 39
195
-#define MARKUP_TABLE 40
196
-#define MARKUP_TD 41
197
-#define MARKUP_TH 42
198
-#define MARKUP_TR 43
199
-#define MARKUP_TT 44
200
-#define MARKUP_U 45
201
-#define MARKUP_UL 46
202
-#define MARKUP_VAR 47
203
-#define MARKUP_VERBATIM 48
155
+#define MARKUP_INVALID 0
156
+#define MARKUP_A 1
157
+#define MARKUP_ADDRESS 2
158
+#define MARKUP_B 3
159
+#define MARKUP_BIG 4
160
+#define MARKUP_BLOCKQUOTE 5
161
+#define MARKUP_BR 6
162
+#define MARKUP_CENTER 7
163
+#define MARKUP_CITE 8
164
+#define MARKUP_CODE 9
165
+#define MARKUP_COL 10
166
+#define MARKUP_COLGROUP 11
167
+#define MARKUP_DD 12
168
+#define MARKUP_DFN 13
169
+#define MARKUP_DIV 14
170
+#define MARKUP_DL 15
171
+#define MARKUP_DT 16
172
+#define MARKUP_EM 17
173
+#define MARKUP_FONT 18
174
+#define MARKUP_H1 19
175
+#define MARKUP_H2 20
176
+#define MARKUP_H3 21
177
+#define MARKUP_H4 22
178
+#define MARKUP_H5 23
179
+#define MARKUP_H6 24
180
+#define MARKUP_HR 25
181
+#define MARKUP_I 26
182
+#define MARKUP_IMG 27
183
+#define MARKUP_KBD 28
184
+#define MARKUP_LI 29
185
+#define MARKUP_NOBR 30
186
+#define MARKUP_NOWIKI 31
187
+#define MARKUP_OL 32
188
+#define MARKUP_P 33
189
+#define MARKUP_PRE 34
190
+#define MARKUP_S 35
191
+#define MARKUP_SAMP 36
192
+#define MARKUP_SMALL 37
193
+#define MARKUP_SPAN 38
194
+#define MARKUP_STRIKE 39
195
+#define MARKUP_STRONG 40
196
+#define MARKUP_SUB 41
197
+#define MARKUP_SUP 42
198
+#define MARKUP_TABLE 43
199
+#define MARKUP_TBODY 44
200
+#define MARKUP_TD 45
201
+#define MARKUP_TFOOT 46
202
+#define MARKUP_TH 47
203
+#define MARKUP_THEAD 48
204
+#define MARKUP_TR 49
205
+#define MARKUP_TT 50
206
+#define MARKUP_U 51
207
+#define MARKUP_UL 52
208
+#define MARKUP_VAR 53
209
+#define MARKUP_VERBATIM 54
204210
205211
 /*
206212
 ** The various markup is divided into the following types:
207213
 */
208214
 #define MUTYPE_SINGLE 0x0001 /* <img>, <br>, or <hr> */
@@ -241,10 +247,14 @@
241247
 { "blockquote", MARKUP_BLOCKQUOTE, MUTYPE_BLOCK, 0 },
242248
 { "br", MARKUP_BR, MUTYPE_SINGLE, AMSK_CLEAR },
243249
 { "center", MARKUP_CENTER, MUTYPE_BLOCK, 0 },
244250
 { "cite", MARKUP_CITE, MUTYPE_FONT, 0 },
245251
 { "code", MARKUP_CODE, MUTYPE_FONT, 0 },
252
+ { "col", MARKUP_COL, MUTYPE_SINGLE,
253
+ AMSK_ALIGN|AMSK_CLASS|AMSK_COLSPAN|AMSK_WIDTH },
254
+ { "colgroup", MARKUP_COLGROUP, MUTYPE_BLOCK,
255
+ AMSK_ALIGN|AMSK_CLASS|AMSK_COLSPAN|AMSK_WIDTH},
246256
 { "dd", MARKUP_DD, MUTYPE_LI, 0 },
247257
 { "dfn", MARKUP_DFN, MUTYPE_FONT, 0 },
248258
 { "div", MARKUP_DIV, MUTYPE_BLOCK, AMSK_ID|AMSK_CLASS },
249259
 { "dl", MARKUP_DL, MUTYPE_LIST, AMSK_COMPACT },
250260
 { "dt", MARKUP_DT, MUTYPE_LI, 0 },
@@ -273,23 +283,27 @@
273283
 { "p", MARKUP_P, MUTYPE_BLOCK, AMSK_ALIGN|AMSK_CLASS },
274284
 { "pre", MARKUP_PRE, MUTYPE_BLOCK, 0 },
275285
 { "s", MARKUP_S, MUTYPE_FONT, 0 },
276286
 { "samp", MARKUP_SAMP, MUTYPE_FONT, 0 },
277287
 { "small", MARKUP_SMALL, MUTYPE_FONT, 0 },
288
+ { "span", MARKUP_SPAN, MUTYPE_BLOCK, AMSK_ALIGN|AMSK_CLASS },
278289
 { "strike", MARKUP_STRIKE, MUTYPE_FONT, 0 },
279290
 { "strong", MARKUP_STRONG, MUTYPE_FONT, 0 },
280291
 { "sub", MARKUP_SUB, MUTYPE_FONT, 0 },
281292
 { "sup", MARKUP_SUP, MUTYPE_FONT, 0 },
282293
 { "table", MARKUP_TABLE, MUTYPE_TABLE,
283294
 AMSK_ALIGN|AMSK_BGCOLOR|AMSK_BORDER|AMSK_CELLPADDING|
284295
 AMSK_CELLSPACING|AMSK_HSPACE|AMSK_VSPACE|AMSK_CLASS },
296
+ { "tbody", MARKUP_TBODY, MUTYPE_BLOCK, AMSK_ALIGN|AMSK_CLASS },
285297
 { "td", MARKUP_TD, MUTYPE_TD,
286298
 AMSK_ALIGN|AMSK_BGCOLOR|AMSK_COLSPAN|
287299
 AMSK_ROWSPAN|AMSK_VALIGN|AMSK_CLASS },
300
+ { "tfoot", MARKUP_TFOOT, MUTYPE_BLOCK, AMSK_ALIGN|AMSK_CLASS },
288301
 { "th", MARKUP_TH, MUTYPE_TD,
289302
 AMSK_ALIGN|AMSK_BGCOLOR|AMSK_COLSPAN|
290303
 AMSK_ROWSPAN|AMSK_VALIGN|AMSK_CLASS },
304
+ { "thead", MARKUP_THEAD, MUTYPE_BLOCK, AMSK_ALIGN|AMSK_CLASS },
291305
 { "tr", MARKUP_TR, MUTYPE_TR,
292306
 AMSK_ALIGN|AMSK_BGCOLOR||AMSK_VALIGN|AMSK_CLASS },
293307
 { "tt", MARKUP_TT, MUTYPE_FONT, 0 },
294308
 { "u", MARKUP_U, MUTYPE_FONT, 0 },
295309
 { "ul", MARKUP_UL, MUTYPE_LIST,
296310
--- src/wikiformat.c
+++ src/wikiformat.c
@@ -150,59 +150,65 @@
150 ** Except for MARKUP_INVALID, this must all be in alphabetical order
151 ** and in numerical sequence. The first markup type must be zero.
152 ** The value for MARKUP_XYZ must correspond to the <xyz> entry
153 ** in aAllowedMarkup[].
154 */
155 #define MARKUP_INVALID 0
156 #define MARKUP_A 1
157 #define MARKUP_ADDRESS 2
158 #define MARKUP_B 3
159 #define MARKUP_BIG 4
160 #define MARKUP_BLOCKQUOTE 5
161 #define MARKUP_BR 6
162 #define MARKUP_CENTER 7
163 #define MARKUP_CITE 8
164 #define MARKUP_CODE 9
165 #define MARKUP_DD 10
166 #define MARKUP_DFN 11
167 #define MARKUP_DIV 12
168 #define MARKUP_DL 13
169 #define MARKUP_DT 14
170 #define MARKUP_EM 15
171 #define MARKUP_FONT 16
172 #define MARKUP_H1 17
173 #define MARKUP_H2 18
174 #define MARKUP_H3 19
175 #define MARKUP_H4 20
176 #define MARKUP_H5 21
177 #define MARKUP_H6 22
178 #define MARKUP_HR 23
179 #define MARKUP_I 24
180 #define MARKUP_IMG 25
181 #define MARKUP_KBD 26
182 #define MARKUP_LI 27
183 #define MARKUP_NOBR 28
184 #define MARKUP_NOWIKI 29
185 #define MARKUP_OL 30
186 #define MARKUP_P 31
187 #define MARKUP_PRE 32
188 #define MARKUP_S 33
189 #define MARKUP_SAMP 34
190 #define MARKUP_SMALL 35
191 #define MARKUP_STRIKE 36
192 #define MARKUP_STRONG 37
193 #define MARKUP_SUB 38
194 #define MARKUP_SUP 39
195 #define MARKUP_TABLE 40
196 #define MARKUP_TD 41
197 #define MARKUP_TH 42
198 #define MARKUP_TR 43
199 #define MARKUP_TT 44
200 #define MARKUP_U 45
201 #define MARKUP_UL 46
202 #define MARKUP_VAR 47
203 #define MARKUP_VERBATIM 48
 
 
 
 
 
 
204
205 /*
206 ** The various markup is divided into the following types:
207 */
208 #define MUTYPE_SINGLE 0x0001 /* <img>, <br>, or <hr> */
@@ -241,10 +247,14 @@
241 { "blockquote", MARKUP_BLOCKQUOTE, MUTYPE_BLOCK, 0 },
242 { "br", MARKUP_BR, MUTYPE_SINGLE, AMSK_CLEAR },
243 { "center", MARKUP_CENTER, MUTYPE_BLOCK, 0 },
244 { "cite", MARKUP_CITE, MUTYPE_FONT, 0 },
245 { "code", MARKUP_CODE, MUTYPE_FONT, 0 },
 
 
 
 
246 { "dd", MARKUP_DD, MUTYPE_LI, 0 },
247 { "dfn", MARKUP_DFN, MUTYPE_FONT, 0 },
248 { "div", MARKUP_DIV, MUTYPE_BLOCK, AMSK_ID|AMSK_CLASS },
249 { "dl", MARKUP_DL, MUTYPE_LIST, AMSK_COMPACT },
250 { "dt", MARKUP_DT, MUTYPE_LI, 0 },
@@ -273,23 +283,27 @@
273 { "p", MARKUP_P, MUTYPE_BLOCK, AMSK_ALIGN|AMSK_CLASS },
274 { "pre", MARKUP_PRE, MUTYPE_BLOCK, 0 },
275 { "s", MARKUP_S, MUTYPE_FONT, 0 },
276 { "samp", MARKUP_SAMP, MUTYPE_FONT, 0 },
277 { "small", MARKUP_SMALL, MUTYPE_FONT, 0 },
 
278 { "strike", MARKUP_STRIKE, MUTYPE_FONT, 0 },
279 { "strong", MARKUP_STRONG, MUTYPE_FONT, 0 },
280 { "sub", MARKUP_SUB, MUTYPE_FONT, 0 },
281 { "sup", MARKUP_SUP, MUTYPE_FONT, 0 },
282 { "table", MARKUP_TABLE, MUTYPE_TABLE,
283 AMSK_ALIGN|AMSK_BGCOLOR|AMSK_BORDER|AMSK_CELLPADDING|
284 AMSK_CELLSPACING|AMSK_HSPACE|AMSK_VSPACE|AMSK_CLASS },
 
285 { "td", MARKUP_TD, MUTYPE_TD,
286 AMSK_ALIGN|AMSK_BGCOLOR|AMSK_COLSPAN|
287 AMSK_ROWSPAN|AMSK_VALIGN|AMSK_CLASS },
 
288 { "th", MARKUP_TH, MUTYPE_TD,
289 AMSK_ALIGN|AMSK_BGCOLOR|AMSK_COLSPAN|
290 AMSK_ROWSPAN|AMSK_VALIGN|AMSK_CLASS },
 
291 { "tr", MARKUP_TR, MUTYPE_TR,
292 AMSK_ALIGN|AMSK_BGCOLOR||AMSK_VALIGN|AMSK_CLASS },
293 { "tt", MARKUP_TT, MUTYPE_FONT, 0 },
294 { "u", MARKUP_U, MUTYPE_FONT, 0 },
295 { "ul", MARKUP_UL, MUTYPE_LIST,
296
--- src/wikiformat.c
+++ src/wikiformat.c
@@ -150,59 +150,65 @@
150 ** Except for MARKUP_INVALID, this must all be in alphabetical order
151 ** and in numerical sequence. The first markup type must be zero.
152 ** The value for MARKUP_XYZ must correspond to the <xyz> entry
153 ** in aAllowedMarkup[].
154 */
155 #define MARKUP_INVALID 0
156 #define MARKUP_A 1
157 #define MARKUP_ADDRESS 2
158 #define MARKUP_B 3
159 #define MARKUP_BIG 4
160 #define MARKUP_BLOCKQUOTE 5
161 #define MARKUP_BR 6
162 #define MARKUP_CENTER 7
163 #define MARKUP_CITE 8
164 #define MARKUP_CODE 9
165 #define MARKUP_COL 10
166 #define MARKUP_COLGROUP 11
167 #define MARKUP_DD 12
168 #define MARKUP_DFN 13
169 #define MARKUP_DIV 14
170 #define MARKUP_DL 15
171 #define MARKUP_DT 16
172 #define MARKUP_EM 17
173 #define MARKUP_FONT 18
174 #define MARKUP_H1 19
175 #define MARKUP_H2 20
176 #define MARKUP_H3 21
177 #define MARKUP_H4 22
178 #define MARKUP_H5 23
179 #define MARKUP_H6 24
180 #define MARKUP_HR 25
181 #define MARKUP_I 26
182 #define MARKUP_IMG 27
183 #define MARKUP_KBD 28
184 #define MARKUP_LI 29
185 #define MARKUP_NOBR 30
186 #define MARKUP_NOWIKI 31
187 #define MARKUP_OL 32
188 #define MARKUP_P 33
189 #define MARKUP_PRE 34
190 #define MARKUP_S 35
191 #define MARKUP_SAMP 36
192 #define MARKUP_SMALL 37
193 #define MARKUP_SPAN 38
194 #define MARKUP_STRIKE 39
195 #define MARKUP_STRONG 40
196 #define MARKUP_SUB 41
197 #define MARKUP_SUP 42
198 #define MARKUP_TABLE 43
199 #define MARKUP_TBODY 44
200 #define MARKUP_TD 45
201 #define MARKUP_TFOOT 46
202 #define MARKUP_TH 47
203 #define MARKUP_THEAD 48
204 #define MARKUP_TR 49
205 #define MARKUP_TT 50
206 #define MARKUP_U 51
207 #define MARKUP_UL 52
208 #define MARKUP_VAR 53
209 #define MARKUP_VERBATIM 54
210
211 /*
212 ** The various markup is divided into the following types:
213 */
214 #define MUTYPE_SINGLE 0x0001 /* <img>, <br>, or <hr> */
@@ -241,10 +247,14 @@
247 { "blockquote", MARKUP_BLOCKQUOTE, MUTYPE_BLOCK, 0 },
248 { "br", MARKUP_BR, MUTYPE_SINGLE, AMSK_CLEAR },
249 { "center", MARKUP_CENTER, MUTYPE_BLOCK, 0 },
250 { "cite", MARKUP_CITE, MUTYPE_FONT, 0 },
251 { "code", MARKUP_CODE, MUTYPE_FONT, 0 },
252 { "col", MARKUP_COL, MUTYPE_SINGLE,
253 AMSK_ALIGN|AMSK_CLASS|AMSK_COLSPAN|AMSK_WIDTH },
254 { "colgroup", MARKUP_COLGROUP, MUTYPE_BLOCK,
255 AMSK_ALIGN|AMSK_CLASS|AMSK_COLSPAN|AMSK_WIDTH},
256 { "dd", MARKUP_DD, MUTYPE_LI, 0 },
257 { "dfn", MARKUP_DFN, MUTYPE_FONT, 0 },
258 { "div", MARKUP_DIV, MUTYPE_BLOCK, AMSK_ID|AMSK_CLASS },
259 { "dl", MARKUP_DL, MUTYPE_LIST, AMSK_COMPACT },
260 { "dt", MARKUP_DT, MUTYPE_LI, 0 },
@@ -273,23 +283,27 @@
283 { "p", MARKUP_P, MUTYPE_BLOCK, AMSK_ALIGN|AMSK_CLASS },
284 { "pre", MARKUP_PRE, MUTYPE_BLOCK, 0 },
285 { "s", MARKUP_S, MUTYPE_FONT, 0 },
286 { "samp", MARKUP_SAMP, MUTYPE_FONT, 0 },
287 { "small", MARKUP_SMALL, MUTYPE_FONT, 0 },
288 { "span", MARKUP_SPAN, MUTYPE_BLOCK, AMSK_ALIGN|AMSK_CLASS },
289 { "strike", MARKUP_STRIKE, MUTYPE_FONT, 0 },
290 { "strong", MARKUP_STRONG, MUTYPE_FONT, 0 },
291 { "sub", MARKUP_SUB, MUTYPE_FONT, 0 },
292 { "sup", MARKUP_SUP, MUTYPE_FONT, 0 },
293 { "table", MARKUP_TABLE, MUTYPE_TABLE,
294 AMSK_ALIGN|AMSK_BGCOLOR|AMSK_BORDER|AMSK_CELLPADDING|
295 AMSK_CELLSPACING|AMSK_HSPACE|AMSK_VSPACE|AMSK_CLASS },
296 { "tbody", MARKUP_TBODY, MUTYPE_BLOCK, AMSK_ALIGN|AMSK_CLASS },
297 { "td", MARKUP_TD, MUTYPE_TD,
298 AMSK_ALIGN|AMSK_BGCOLOR|AMSK_COLSPAN|
299 AMSK_ROWSPAN|AMSK_VALIGN|AMSK_CLASS },
300 { "tfoot", MARKUP_TFOOT, MUTYPE_BLOCK, AMSK_ALIGN|AMSK_CLASS },
301 { "th", MARKUP_TH, MUTYPE_TD,
302 AMSK_ALIGN|AMSK_BGCOLOR|AMSK_COLSPAN|
303 AMSK_ROWSPAN|AMSK_VALIGN|AMSK_CLASS },
304 { "thead", MARKUP_THEAD, MUTYPE_BLOCK, AMSK_ALIGN|AMSK_CLASS },
305 { "tr", MARKUP_TR, MUTYPE_TR,
306 AMSK_ALIGN|AMSK_BGCOLOR||AMSK_VALIGN|AMSK_CLASS },
307 { "tt", MARKUP_TT, MUTYPE_FONT, 0 },
308 { "u", MARKUP_U, MUTYPE_FONT, 0 },
309 { "ul", MARKUP_UL, MUTYPE_LIST,
310

Keyboard Shortcuts

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