Index: src/wikiformat.c
==================================================================
--- src/wikiformat.c
+++ src/wikiformat.c
@@ -1,7 +1,7 @@
/*
-** Copyright (c) 2007 D. Richard Hipp
+** Copyright (c) 2007, 2009 D. Richard Hipp
**
** This program is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public
** License version 2 as published by the Free Software Foundation.
**
@@ -156,56 +156,57 @@
** in aAllowedMarkup[].
*/
#define MARKUP_INVALID 0
#define MARKUP_A 1
#define MARKUP_ADDRESS 2
-#define MARKUP_B 3
-#define MARKUP_BIG 4
-#define MARKUP_BLOCKQUOTE 5
-#define MARKUP_BR 6
-#define MARKUP_CENTER 7
-#define MARKUP_CITE 8
-#define MARKUP_CODE 9
-#define MARKUP_DD 10
-#define MARKUP_DFN 11
-#define MARKUP_DIV 12
-#define MARKUP_DL 13
-#define MARKUP_DT 14
-#define MARKUP_EM 15
-#define MARKUP_FONT 16
-#define MARKUP_H1 17
-#define MARKUP_H2 18
-#define MARKUP_H3 19
-#define MARKUP_H4 20
-#define MARKUP_H5 21
-#define MARKUP_H6 22
-#define MARKUP_HR 23
-#define MARKUP_I 24
-#define MARKUP_IMG 25
-#define MARKUP_KBD 26
-#define MARKUP_LI 27
-#define MARKUP_NOBR 28
-#define MARKUP_NOWIKI 29
-#define MARKUP_OL 30
-#define MARKUP_P 31
-#define MARKUP_PRE 32
-#define MARKUP_S 33
-#define MARKUP_SAMP 34
-#define MARKUP_SMALL 35
-#define MARKUP_STRIKE 36
-#define MARKUP_STRONG 37
-#define MARKUP_SUB 38
-#define MARKUP_SUP 39
-#define MARKUP_TABLE 40
-#define MARKUP_TD 41
-#define MARKUP_TH 42
-#define MARKUP_TR 43
-#define MARKUP_TT 44
-#define MARKUP_U 45
-#define MARKUP_UL 46
-#define MARKUP_VAR 47
-#define MARKUP_VERBATIM 48
+#define MARKUP_ANNOTATION 3
+#define MARKUP_B 4
+#define MARKUP_BIG 5
+#define MARKUP_BLOCKQUOTE 6
+#define MARKUP_BR 7
+#define MARKUP_CENTER 8
+#define MARKUP_CITE 9
+#define MARKUP_CODE 10
+#define MARKUP_DD 11
+#define MARKUP_DFN 12
+#define MARKUP_DIV 13
+#define MARKUP_DL 14
+#define MARKUP_DT 15
+#define MARKUP_EM 16
+#define MARKUP_FONT 17
+#define MARKUP_H1 18
+#define MARKUP_H2 19
+#define MARKUP_H3 20
+#define MARKUP_H4 21
+#define MARKUP_H5 22
+#define MARKUP_H6 23
+#define MARKUP_HR 24
+#define MARKUP_I 25
+#define MARKUP_IMG 26
+#define MARKUP_KBD 27
+#define MARKUP_LI 28
+#define MARKUP_NOBR 29
+#define MARKUP_NOWIKI 30
+#define MARKUP_OL 31
+#define MARKUP_P 32
+#define MARKUP_PRE 33
+#define MARKUP_S 34
+#define MARKUP_SAMP 35
+#define MARKUP_SMALL 36
+#define MARKUP_STRIKE 37
+#define MARKUP_STRONG 38
+#define MARKUP_SUB 39
+#define MARKUP_SUP 40
+#define MARKUP_TABLE 41
+#define MARKUP_TD 42
+#define MARKUP_TH 43
+#define MARKUP_TR 44
+#define MARKUP_TT 45
+#define MARKUP_U 46
+#define MARKUP_UL 47
+#define MARKUP_VAR 48
+#define MARKUP_VERBATIM 49
/*
** The various markup is divided into the following types:
*/
#define MUTYPE_SINGLE 0x0001 /* ,
, or