34,7 → 34,6 |
|
if (!function_exists("wakka2callback")) |
{ |
include("formatters/tableaux.php"); //EF => tableaux |
function wakka2callback($things) |
{ |
$thing = $things[1]; |
54,11 → 53,6 |
return "<"; |
else if ($thing == ">") |
return ">"; |
//EF=> tableaux |
else if (preg_match("/^\[\|(.*)\|\]/s", $thing)) |
{ |
return parsetable($thing); |
} //end tableaux |
// bold |
else if ($thing == "**") |
{ |
188,7 → 182,7 |
// forced links |
// \S : any character that is not a whitespace character |
// \s : any whitespace character |
else if (preg_match("/^\[\[(\S*)\s+(.+)?\]\]$/", $thing, $matches)) |
else if (preg_match("/^\[\[(\S*)(\s+(.+))?\]\]$/", $thing, $matches)) |
{ |
list (, $url, $text) = $matches; |
if ($url) |
320,7 → 314,6 |
$text = chop($text)."\n"; |
$text = preg_replace_callback( |
"/(\%\%.*?\%\%|". |
"^\[\|.*?\|\]|". //EF => tableaux |
"\"\".*?\"\"|". |
"\[\[.*?\]\]|". |
"\b[a-z]+:\/\/\S+|". |