From: rich Date: Wed, 26 Jul 2006 15:01:17 +0000 (+0000) Subject: Allow whitespace at the end of a macro line. X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=fa5363970b2ed0228e67d2b3f29cea0423a48b77;p=cocanwiki.git Allow whitespace at the end of a macro line. --- diff --git a/scripts/lib/wikilib.ml b/scripts/lib/wikilib.ml index a4a8e77..e0213d3 100644 --- a/scripts/lib/wikilib.ml +++ b/scripts/lib/wikilib.ml @@ -1,7 +1,7 @@ (* COCANWIKI - a wiki written in Objective CAML. * Written by Richard W.M. Jones . * Copyright (C) 2004 Merjis Ltd. - * $Id: wikilib.ml,v 1.6 2006/07/26 14:59:04 rich Exp $ + * $Id: wikilib.ml,v 1.7 2006/07/26 15:01:17 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 @@ -640,7 +640,7 @@ let numbered_re = Pcre.regexp "^(\\#)\\s+(.*)" let preformatted_re = Pcre.regexp "^ (.*)" let html_open_re = Pcre.regexp "^\\s*$" let html_close_re = Pcre.regexp "^\\s*$" -let macro_re = Pcre.regexp "^{{(\\w+)}}$" +let macro_re = Pcre.regexp "^{{(\\w+)}}\\s*$" let xhtml_of_content dbh hostid text = (* Split the text into lines. *)