Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11834
Modified Files:
InlineParser.php
Log Message:
remove comment,
enable isohexchars inlineparsing (seems to work now)
Index: InlineParser.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/InlineParser.php,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -2 -b -p -d -r1.63 -r1.64
--- InlineParser.php 7 Feb 2005 15:38:25 -0000 1.63
+++ InlineParser.php 28 Feb 2005 17:35:44 -0000 1.64
@@ -2,5 +2,5 @@
rcs_id('$Id$');
/* Copyright (C) 2002 Geoffrey T. Dairiki <dairiki@xxxxxxxxxxx>
- * Copyright (C) 2004 Reini Urban
+ * Copyright (C) 2004,2005 Reini Urban
*
* This file is part of PhpWiki.
@@ -189,7 +189,4 @@ class RegexpSet
// Proposed premature optimization 1:
//$hugepat= "/ ( . $repeat ) ( (" . join(')|(',
array_values($matched)) . ") ) /Asx";
-/* currently:
- '/ ( . *? ) ( ($)|(~(?: [[:alnum:]]+ | .))|(&#\d{2,5};)|(\#? \[ .*? [^]\s]
.*? \])|((?<![[:alnum:]]) (?:http|https|mailto|ftp|news|nntp|ssh|gopher) :
[^\s<>"']+ (?<![ ,.?; \] \) ]))|((?<!
[[:alnum:]])(?:AbbeNormal|AcadWiki|Acronym|Advogato|AIWiki|ALife|Annotation|AnnotationWiki|AwarenessWiki|BcWireless|BenefitsWiki|BridgesWiki|bsdWiki|C2find|Cache|Category|CLiki|CmWiki|CreationMatters|DejaNews|DeWikiPedia|Dict|Dictionary|DiveIntoOsx|DocBook|DolphinWiki|DseWiki|EfnetCeeWiki|EfnetCppWiki|EfnetPythonWiki|EfnetXmlWiki|EljWiki|EmacsWiki|FinalEmpire|Foldoc|FoxWiki|FreeBSDman|FreeNetworks|FreshMeat|Google|GoogleGroups|GreenCheese|HammondWiki|Haribeau|IAWiki|MRQE|IMDB|ISBN|JargonFile|JiniWiki|JspWiki|KmWiki|KnowHow|LanifexWiki|LegoWiki|LinuxWiki|LugKR|MathSongsWiki|MbTest|MeatBall|MetaWiki|MetaWikiPedia|MoinMoin|MuWeb|NetVillage|OpenWiki|OrgPatterns|PangalacticOrg|PersonalTelco|php-function|p
hp-lookup|PhpWiki|PhpWikiCvs|PhpWikiDemo|Pikie|PolitizenWiki|PPR|PurlNet|PythonInfo|Python
Wiki|PyWiki|RFC|SeaPig|SeattleWireless|SenseisLibrary|Shakti|SourceForge|Squeak|StrikiWiki|SVGWiki|Tavi|Thesaurus|Thinki|TmNet|TMwiki|TWiki|TwistedWiki|Unreal|UseMod|VisualWorks|WebDevWikiNL|WebSeitzWiki|Why|Wiki|WikiPedia|WikiWorld|YpsiEyeball|ZWiki|Upload):
\S+ (?<![ ,.?;! \] \) " \' ]))|(
(?<![[:alnum:]])(?:[[:upper:]][[:lower:]]+){2,}(?![[:alnum:]]))|((?: (?<! %)
%%% (?! %) | <(?:br|BR)> ))|(''|__)|((?:(?<= \s|^|[-"'\/:]) (?: _ (?! _)|\* (?!
\*)|= (?! =))|(?<= =) (?: _ (?! _)|\* (?! \*)) (?! =)|(?<= _) (?: \* (?! \*)|=
(?! =)) (?! _)|(?<= \*) (?: _ (?! _)|= (?! =)) (?! \*)|(?<= { ) (?: _ (?! _)|\*
(?! \*)|= (?! =)) (?! } )|(?<= < ) (?: _ (?! _)|\* (?! \*)|= (?! =)) (?! >
)|(?<= \( ) (?: _ (?! _)|\* (?! \*)|= (?! =)) (?! \) ))(?= \S))|(<(?:
b|big|i|small|tt|em|strong|cite|code|dfn|kbd|samp|var|sup|sub )>)|(<(?:
abbr|acronym )(?: \stitle=[^>]*)?>)|(<\?plugin(?:-form)?\s[^\n]+?\?>) ) /
Asx'
-*/
if (! preg_match($hugepat, $text, $m)) {
return false;
@@ -670,5 +667,4 @@ class Markup_isohexchars extends SimpleM
//Plugin link
-
class InlineTransformer
{
@@ -682,5 +678,5 @@ class InlineTransformer
'old_emphasis', 'nestled_emphasis',
'html_emphasis', 'html_abbr', 'plugin',
- 'isonumchars', /*'isohexchars',
'html_entities',*/
+ 'isonumchars', 'isohexchars',
/*'html_entities',*/
);
foreach ($markup_types as $mtype) {
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
|
