| | @@ -47,15 +47,17 @@ |
| 47 | 47 | ATTR_ALT, |
| 48 | 48 | ATTR_BGCOLOR, |
| 49 | 49 | ATTR_BORDER, |
| 50 | 50 | ATTR_CELLPADDING, |
| 51 | 51 | ATTR_CELLSPACING, |
| 52 | + ATTR_CHECKED, |
| 52 | 53 | ATTR_CLASS, |
| 53 | 54 | ATTR_CLEAR, |
| 54 | 55 | ATTR_COLOR, |
| 55 | 56 | ATTR_COLSPAN, |
| 56 | 57 | ATTR_COMPACT, |
| 58 | + ATTR_DISABLED, |
| 57 | 59 | ATTR_FACE, |
| 58 | 60 | ATTR_HEIGHT, |
| 59 | 61 | ATTR_HREF, |
| 60 | 62 | ATTR_HSPACE, |
| 61 | 63 | ATTR_ID, |
| | @@ -80,34 +82,36 @@ |
| 80 | 82 | AMSK_ALT = 0x00000002, |
| 81 | 83 | AMSK_BGCOLOR = 0x00000004, |
| 82 | 84 | AMSK_BORDER = 0x00000008, |
| 83 | 85 | AMSK_CELLPADDING = 0x00000010, |
| 84 | 86 | AMSK_CELLSPACING = 0x00000020, |
| 85 | | - AMSK_CLASS = 0x00000040, |
| 86 | | - AMSK_CLEAR = 0x00000080, |
| 87 | | - AMSK_COLOR = 0x00000100, |
| 88 | | - AMSK_COLSPAN = 0x00000200, |
| 89 | | - AMSK_COMPACT = 0x00000400, |
| 90 | | - AMSK_FACE = 0x00000800, |
| 91 | | - AMSK_HEIGHT = 0x00001000, |
| 92 | | - AMSK_HREF = 0x00002000, |
| 93 | | - AMSK_HSPACE = 0x00004000, |
| 94 | | - AMSK_ID = 0x00008000, |
| 95 | | - AMSK_LINKS = 0x00010000, |
| 96 | | - AMSK_NAME = 0x00020000, |
| 97 | | - AMSK_ROWSPAN = 0x00040000, |
| 98 | | - AMSK_SIZE = 0x00080000, |
| 99 | | - AMSK_SRC = 0x00100000, |
| 100 | | - AMSK_START = 0x00200000, |
| 101 | | - AMSK_STYLE = 0x00400000, |
| 102 | | - AMSK_TARGET = 0x00800000, |
| 103 | | - AMSK_TITLE = 0x01000000, |
| 104 | | - AMSK_TYPE = 0x02000000, |
| 105 | | - AMSK_VALIGN = 0x04000000, |
| 106 | | - AMSK_VALUE = 0x08000000, |
| 107 | | - AMSK_VSPACE = 0x10000000, |
| 108 | | - AMSK_WIDTH = 0x20000000 |
| 87 | + AMSK_CHECKED = 0x00000040, |
| 88 | + AMSK_CLASS = 0x00000080, |
| 89 | + AMSK_CLEAR = 0x00000100, |
| 90 | + AMSK_COLOR = 0x00000200, |
| 91 | + AMSK_COLSPAN = 0x00000400, |
| 92 | + AMSK_COMPACT = 0x00000800, |
| 93 | + AMSK_DISABLED = 0x00001000, |
| 94 | + AMSK_FACE = 0x00002000, |
| 95 | + AMSK_HEIGHT = 0x00004000, |
| 96 | + AMSK_HREF = 0x00008000, |
| 97 | + AMSK_HSPACE = 0x00010000, |
| 98 | + AMSK_ID = 0x00020000, |
| 99 | + AMSK_LINKS = 0x00040000, |
| 100 | + AMSK_NAME = 0x00080000, |
| 101 | + AMSK_ROWSPAN = 0x00100000, |
| 102 | + AMSK_SIZE = 0x00200000, |
| 103 | + AMSK_SRC = 0x00400000, |
| 104 | + AMSK_START = 0x00800000, |
| 105 | + AMSK_STYLE = 0x01000000, |
| 106 | + AMSK_TARGET = 0x02000000, |
| 107 | + AMSK_TITLE = 0x04000000, |
| 108 | + AMSK_TYPE = 0x08000000, |
| 109 | + AMSK_VALIGN = 0x10000000, |
| 110 | + AMSK_VALUE = 0x20000000, |
| 111 | + AMSK_VSPACE = 0x40000000, |
| 112 | + AMSK_WIDTH = 0x80000000 |
| 109 | 113 | }; |
| 110 | 114 | |
| 111 | 115 | static const struct AllowedAttribute { |
| 112 | 116 | const char *zName; |
| 113 | 117 | unsigned int iMask; |
| | @@ -120,15 +124,17 @@ |
| 120 | 124 | { "alt", AMSK_ALT }, |
| 121 | 125 | { "bgcolor", AMSK_BGCOLOR }, |
| 122 | 126 | { "border", AMSK_BORDER }, |
| 123 | 127 | { "cellpadding", AMSK_CELLPADDING }, |
| 124 | 128 | { "cellspacing", AMSK_CELLSPACING }, |
| 129 | + { "checked", AMSK_CHECKED }, |
| 125 | 130 | { "class", AMSK_CLASS }, |
| 126 | 131 | { "clear", AMSK_CLEAR }, |
| 127 | 132 | { "color", AMSK_COLOR }, |
| 128 | 133 | { "colspan", AMSK_COLSPAN }, |
| 129 | 134 | { "compact", AMSK_COMPACT }, |
| 135 | + { "disabled", AMSK_DISABLED }, |
| 130 | 136 | { "face", AMSK_FACE }, |
| 131 | 137 | { "height", AMSK_HEIGHT }, |
| 132 | 138 | { "href", AMSK_HREF }, |
| 133 | 139 | { "hspace", AMSK_HSPACE }, |
| 134 | 140 | { "id", AMSK_ID }, |
| | @@ -143,11 +149,11 @@ |
| 143 | 149 | { "title", AMSK_TITLE }, |
| 144 | 150 | { "type", AMSK_TYPE }, |
| 145 | 151 | { "valign", AMSK_VALIGN }, |
| 146 | 152 | { "value", AMSK_VALUE }, |
| 147 | 153 | { "vspace", AMSK_VSPACE }, |
| 148 | | - { "width", AMSK_WIDTH }, |
| 154 | + { "width", AMSK_WIDTH } |
| 149 | 155 | }; |
| 150 | 156 | |
| 151 | 157 | /* |
| 152 | 158 | ** Use binary search to locate a tag in the aAttribute[] table. |
| 153 | 159 | */ |
| | @@ -212,10 +218,11 @@ |
| 212 | 218 | MARKUP_H5, |
| 213 | 219 | MARKUP_H6, |
| 214 | 220 | MARKUP_HTML5_HEADER, |
| 215 | 221 | MARKUP_HR, |
| 216 | 222 | MARKUP_I, |
| 223 | + MARKUP_INPUT, |
| 217 | 224 | MARKUP_IMG, |
| 218 | 225 | MARKUP_INS, |
| 219 | 226 | MARKUP_KBD, |
| 220 | 227 | MARKUP_LI, |
| 221 | 228 | MARKUP_HTML5_NAV, |
| | @@ -335,10 +342,12 @@ |
| 335 | 342 | AMSK_ID|AMSK_CLASS|AMSK_STYLE }, |
| 336 | 343 | { "hr", MARKUP_HR, MUTYPE_SINGLE, |
| 337 | 344 | AMSK_ALIGN|AMSK_COLOR|AMSK_SIZE|AMSK_WIDTH| |
| 338 | 345 | AMSK_STYLE|AMSK_CLASS }, |
| 339 | 346 | { "i", MARKUP_I, MUTYPE_FONT, AMSK_STYLE }, |
| 347 | + { "input", MARKUP_INPUT, MUTYPE_SINGLE, |
| 348 | + AMSK_CHECKED|AMSK_CLASS|AMSK_DISABLED|AMSK_TYPE }, |
| 340 | 349 | { "img", MARKUP_IMG, MUTYPE_SINGLE, |
| 341 | 350 | AMSK_ALIGN|AMSK_ALT|AMSK_BORDER|AMSK_HEIGHT| |
| 342 | 351 | AMSK_HSPACE|AMSK_SRC|AMSK_VSPACE|AMSK_WIDTH|AMSK_STYLE }, |
| 343 | 352 | { "ins", MARKUP_INS, MUTYPE_FONT, AMSK_STYLE }, |
| 344 | 353 | { "kbd", MARKUP_KBD, MUTYPE_FONT, AMSK_STYLE }, |
| 345 | 354 | |