git.annexia.org
/
cocanwiki.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
17107c4
)
Allow <s>, <strike>, <big>, <small> and <tt>.
author
rich
<rich>
Sat, 9 Oct 2004 11:03:58 +0000
(11:03 +0000)
committer
rich
<rich>
Sat, 9 Oct 2004 11:03:58 +0000
(11:03 +0000)
scripts/wikilib.ml
patch
|
blob
|
history
diff --git
a/scripts/wikilib.ml
b/scripts/wikilib.ml
index
619f049
..
b11b590
100644
(file)
--- a/
scripts/wikilib.ml
+++ b/
scripts/wikilib.ml
@@
-1,7
+1,7
@@
(* COCANWIKI - a wiki written in Objective CAML.
* Written by Richard W.M. Jones <rich@merjis.com>.
* Copyright (C) 2004 Merjis Ltd.
(* COCANWIKI - a wiki written in Objective CAML.
* Written by Richard W.M. Jones <rich@merjis.com>.
* Copyright (C) 2004 Merjis Ltd.
- * $Id: wikilib.ml,v 1.1
0 2004/10/09 09:48:37
rich Exp $
+ * $Id: wikilib.ml,v 1.1
1 2004/10/09 11:03:58
rich Exp $
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-91,7
+91,7
@@
let obscure_mailto url =
(* This matches any markup. *)
let markup_re =
let link = "\\[\\[\\s*(?:.+?)\\s*(?:\\|.+?\\s*)?\\]\\]" in
(* This matches any markup. *)
let markup_re =
let link = "\\[\\[\\s*(?:.+?)\\s*(?:\\|.+?\\s*)?\\]\\]" in
- let tag = "</?(?:b|i|strong|em|code|
sup|sub|nowiki
|br)>" in
+ let tag = "</?(?:b|i|strong|em|code|
tt|sup|sub|nowiki|big|small|strike|s
|br)>" in
Pcre.regexp ("(.*?)((?:" ^ link ^ ")|(?:" ^ tag ^ "))(.*)")
(* This matches links only, and should be compatible with the link contained
Pcre.regexp ("(.*?)((?:" ^ link ^ ")|(?:" ^ tag ^ "))(.*)")
(* This matches links only, and should be compatible with the link contained
@@
-425,10
+425,12
@@
let allowed_elements =
"p", [];
"ul", []; "ol", []; "li", [];
"pre", []; "blockquote", ["cite"];
"p", [];
"ul", []; "ol", []; "li", [];
"pre", []; "blockquote", ["cite"];
- "strong", []; "em", []; "dfn", []; "code", []; "samp", []; "kbd", [];
- "var", []; "cite", []; "sup", []; "sub", []; "q", [];
+ "strong", []; "em", []; "dfn", []; "code", []; "tt", [];
+ "samp", []; "kbd", []; "var", []; "cite", [];
+ "sup", []; "sub", []; "q", [];
"abbr", []; "acronym", [];
"b", []; "i", [];
"abbr", []; "acronym", [];
"b", []; "i", [];
+ "big", []; "small", []; "strike", []; "s", [];
"div", []; "span", [];
"br", [];
] in
"div", []; "span", [];
"br", [];
] in