diff --git a/modules/creoleaddition.pl b/modules/creoleaddition.pl index 7cc15e34..faec8a81 100644 --- a/modules/creoleaddition.pl +++ b/modules/creoleaddition.pl @@ -22,7 +22,7 @@ creoleaddition is simply installable; simply: =cut package OddMuse; -$ModulesDescription .= '

$Id: creoleaddition.pl,v 1.24 2008/11/16 01:00:10 leycec Exp $

'; +$ModulesDescription .= '

$Id: creoleaddition.pl,v 1.25 2009/02/11 17:25:35 weakish Exp $

'; # ....................{ CONFIGURATION }.................... @@ -93,8 +93,8 @@ $RuleOrder{\&CreoleAdditionRule} = -11; sub CreoleAdditionRule { # ; definition list term if ($CreoleAdditionDefList and ( - ($bol and m/\G[ \t]*;[ \t]*(?=[^:]+?\n[ \t]*:[ \t]*)/cg) or - (InElement('dd') and m/\G[ \t]*\n[ \t]*;[ \t]*(?=[^:]+?\n[ \t]*:[ \t]*)/cg))) { + ($bol and m/\G[ \t]*;[ \t]*(?=[^:]*($FullUrlPattern)*[^:]*?\n[ \t]*:[ \t]*)/cg) or + (InElement('dd') and m/\G[ \t]*\n[ \t]*;[ \t]*(?=[^:]*($FullUrlPattern)*[^:]*?\n[ \t]*:[ \t]*)/cg))) { return CloseHtmlEnvironmentUntil('dd') .OpenHtmlEnvironment('dl', 1) diff --git a/t/creoleaddition.t b/t/creoleaddition.t index 05778d4f..862282ef 100644 --- a/t/creoleaddition.t +++ b/t/creoleaddition.t @@ -8,13 +8,14 @@ # You can get a copy of GPL version 2 at # http://www.gnu.org/licenses/gpl-2.0.html -# $Id: creoleaddition.t,v 1.11 2008/11/15 12:48:13 leycec Exp $ +# $Id: creoleaddition.t,v 1.12 2009/02/11 17:25:35 weakish Exp $ require 't/test.pl'; package OddMuse; -use Test::More tests => 22; +use Test::More tests => 26; clear_pages(); +add_module('creole.pl'); add_module('creoleaddition.pl'); run_tests(split('\n',<<'EOT')); @@ -50,6 +51,14 @@ H2O
dt1
dd1
dd2
;dt1 \n :dd1\n:dd2\n : dd3
dt1
dd1
dd2
dd3
+; **dt1**\n:dd1 +
dt1
dd1
+; {{{dt1}}}\n:dd1 +
dt1
dd1
+;[[http://www.toto.com|toto]] \n :Site of my friend Toto +
toto
Site of my friend Toto
+; {{{[[http://www.toto.com|toto]]}}} \n : Site of my friend Toto +
[[http://www.toto.com|toto]]
Site of my friend Toto
''my quote'' works ''what about x^^2^^'' my quote works what about x2 """ not a block quote """