From: <Cra...@nt...> - 2005-12-31 18:03:17
|
Author: CrawfordCurrie Date: 2005-12-31 10:01:56 -0800 (Sat, 31 Dec 2005) New Revision: 8054 Modified: twiki/branches/DEVELOP/data/TestCases/TestCaseAutoFormatting.txt twiki/branches/DEVELOP/data/TestCases/TestCaseAutoIncludeSubWebTopic.txt twiki/branches/DEVELOP/data/TestCases/TestCaseAutoMetaSearch.txt twiki/branches/DEVELOP/data/TestCases/TestCaseAutoSearch.txt twiki/branches/DEVELOP/data/TestCases/TestCaseAutoTOC.txt twiki/branches/DEVELOP/data/TestCases/TestCaseAutoWikiWordRendering.txt twiki/branches/DEVELOP/lib/TWiki/Render.pm Log: Item1217: tuned REs for matching emphasis; but TML is fundamentally flawed, in that the bracketing expressions are symmetrical. This makes it very difficult to write simple, clear syntax rules for emphasis; which is why it's never been documented, I suppose. Oh, and some testcase updates. Modified: twiki/branches/DEVELOP/data/TestCases/TestCaseAutoFormatting.txt =================================================================== --- twiki/branches/DEVELOP/data/TestCases/TestCaseAutoFormatting.txt 2005-12-31 16:30:10 UTC (rev 8053) +++ twiki/branches/DEVELOP/data/TestCases/TestCaseAutoFormatting.txt 2005-12-31 18:01:56 UTC (rev 8054) @@ -1,12 +1,12 @@ LinkAtStart <!-- /actual --> <!-- expected expand LINKATSTART --> -<span class="twikiNewLink">LinkAtStart<a title="Create this topic" href="%SCRIPTURL{"edit"}%/TestCases/LinkAtStart?topicparent=TestCases.TestCaseAutoFormatting" rel="nofollow"><sup>?</sup></a></span> +<span class="twikiNewLink">LinkAtStart<a title="Create this topic" href="%SCRIPTURLPATH{"edit"}%/TestCases/LinkAtStart?topicparent=TestCases.TestCaseAutoFormatting" rel="nofollow"><sup>?</sup></a></span> <!-- /expected --> Description: Simple formatting, as described in TWiki.TextFormattingRules -[[%SCRIPTURL{"view"}%/%WEB%/%TOPIC%?test=compare&debugenableplugins=TestFixturePlugin&skin=pattern][run this test]] +[[%SCRIPTURLPATH{"view"}%/%WEB%/%TOPIC%?test=compare&debugenableplugins=TestFixturePlugin&skin=pattern][run this test]] Designed by: Crawford Currie @@ -215,7 +215,7 @@ ---+++ Expected <!-- expected expand WIKIWORDAFTER --> -<span class="twikiNewLink">WikiWordBeforeList<a title="Create this topic" href="%SCRIPTURL{"edit"}%/TestCases/WikiWordBeforeList?topicparent=TestCases.TestCaseAutoFormatting" rel="nofollow"><sup>?</sup></a></span> +<span class="twikiNewLink">WikiWordBeforeList<a title="Create this topic" href="%SCRIPTURLPATH{"edit"}%/TestCases/WikiWordBeforeList?topicparent=TestCases.TestCaseAutoFormatting" rel="nofollow"><sup>?</sup></a></span> <ol> <li>Things</li> <li>Stuff @@ -227,7 +227,7 @@ <li>Something</li> <li>Hello kitty</li> </ol> -<span class="twikiNewLink">WikiWordAfterList<a title="Create this topic" href="%SCRIPTURL{"edit"}%/TestCases/WikiWordAfterList?topicparent=TestCases.TestCaseAutoFormatting" rel="nofollow"><sup>?</sup></a></span> +<span class="twikiNewLink">WikiWordAfterList<a title="Create this topic" href="%SCRIPTURLPATH{"edit"}%/TestCases/WikiWordAfterList?topicparent=TestCases.TestCaseAutoFormatting" rel="nofollow"><sup>?</sup></a></span> <!-- /expected --> ---+++ Actual <!-- actual --> @@ -338,18 +338,18 @@ ---++ Wiki Word Links ---+++ Expected <!-- expected expand WIKIWORDS --> -<a class="twikiLink" href="%SCRIPTURL{"view"}%/TestCases/WebPreferences">WebPreferences</a> +<a class="twikiLink" href="%SCRIPTURLPATH{"view"}%/TestCases/WebPreferences">WebPreferences</a> <p /> -<a class="twikiLink" href="%SCRIPTURL{"view"}%/%MAINWEB%/TWikiUsers">TWikiUsers</a> +<a class="twikiLink" href="%SCRIPTURLPATH{"view"}%/%MAINWEB%/TWikiUsers">TWikiUsers</a> <p /> -<span class="twikiNewLink">CompleteAndUtterNothing<a title="Create this topic" href="%SCRIPTURL{"edit"}%/TestCases/CompleteAndUtterNothing?topicparent=TestCases.TestCaseAutoFormatting" rel="nofollow"><sup>?</sup></a></span> +<span class="twikiNewLink">CompleteAndUtterNothing<a title="Create this topic" href="%SCRIPTURLPATH{"edit"}%/TestCases/CompleteAndUtterNothing?topicparent=TestCases.TestCaseAutoFormatting" rel="nofollow"><sup>?</sup></a></span> <p /> -<a class="twikiLink" href="%SCRIPTURL{"view"}%/TestCases/LinkBox">LinkBox</a> -<a class="twikiLink" href="%SCRIPTURL{"view"}%/TestCases/LinkBox">LinkBoxs</a> -<a class="twikiLink" href="%SCRIPTURL{"view"}%/TestCases/LinkBoxy">LinkBoxies</a> -<a class="twikiLink" href="%SCRIPTURL{"view"}%/TestCases/LinkBoxess">LinkBoxess</a> -<a class="twikiLink" href="%SCRIPTURL{"view"}%/TestCases/LinkBoxess">LinkBoxesses</a> -<a class="twikiLink" href="%SCRIPTURL{"view"}%/TestCases/LinkBox">LinkBoxes</a> +<a class="twikiLink" href="%SCRIPTURLPATH{"view"}%/TestCases/LinkBox">LinkBox</a> +<a class="twikiLink" href="%SCRIPTURLPATH{"view"}%/TestCases/LinkBox">LinkBoxs</a> +<a class="twikiLink" href="%SCRIPTURLPATH{"view"}%/TestCases/LinkBoxy">LinkBoxies</a> +<a class="twikiLink" href="%SCRIPTURLPATH{"view"}%/TestCases/LinkBoxess">LinkBoxess</a> +<a class="twikiLink" href="%SCRIPTURLPATH{"view"}%/TestCases/LinkBoxess">LinkBoxesses</a> +<a class="twikiLink" href="%SCRIPTURLPATH{"view"}%/TestCases/LinkBox">LinkBoxes</a> <!-- /expected --> ---+++ Actual <!-- actual --> @@ -370,16 +370,16 @@ ---++ Square Brackets ---+++ Expected <!-- expected expand SQUABS --> -<span class="twikiNewLink">wiki syntax<a title="Create this topic" href="%SCRIPTURL{"edit"}%/TestCases/WikiSyntax?topicparent=TestCases.TestCaseAutoFormatting" rel="nofollow"><sup>?</sup></a></span> +<span class="twikiNewLink">wiki syntax<a title="Create this topic" href="%SCRIPTURLPATH{"edit"}%/TestCases/WikiSyntax?topicparent=TestCases.TestCaseAutoFormatting" rel="nofollow"><sup>?</sup></a></span> <p /> -<a class="twikiLink" href="%SCRIPTURL{"view"}%/%MAINWEB%/TWikiUsers">Main.TWiki users</a> +<a class="twikiLink" href="%SCRIPTURLPATH{"view"}%/%MAINWEB%/TWikiUsers">Main.TWiki users</a> <p /> escaped: [<nop>[wiki syntax]] <p /> <a href="/relative/URL" target="_top">relative url</a> <p /> -<span class="twikiNewLink">filter%rubbish;from'thelink<a title="Create this topic" rel="nofollow" href="%SCRIPTURL{"edit"}%/TestCases/Filterrubbishfromthelink?topicparent=TestCases.TestCaseAutoFormatting"><sup>?</sup></a></span> +<span class="twikiNewLink">filter%rubbish;from'thelink<a title="Create this topic" rel="nofollow" href="%SCRIPTURLPATH{"edit"}%/TestCases/FilterRubbishFromThelink?topicparent=TestCases.TestCaseAutoFormatting"><sup>?</sup></a></span> <!-- /expected --> ---+++ Actual <!-- actual --> @@ -398,7 +398,7 @@ ---++ Protocol Links ---+++ Expected <!-- expected expand PROTOCOL --> -<span class="twikiNewLink">syntax<a title="Create this topic" href="%SCRIPTURL{"edit"}%/TestCases/WikiSyntax?topicparent=TestCases.TestCaseAutoFormatting" rel="nofollow"><sup>?</sup></a></span> +<span class="twikiNewLink">syntax<a title="Create this topic" href="%SCRIPTURLPATH{"edit"}%/TestCases/WikiSyntax?topicparent=TestCases.TestCaseAutoFormatting" rel="nofollow"><sup>?</sup></a></span> <p /> <a href="http://gnu.org" target="_top">GNU</a> <p /> @@ -416,9 +416,9 @@ ---++ Anchors ---+++ Expected <!-- expected expand ANCHOR --> -<a class="twikiAnchorLink" href="%SCRIPTURL{"view"}%/TestCases/TestCaseAutoFormatting#NotThere">TestCaseAutoFormatting#NotThere</a> +<a class="twikiAnchorLink" href="%SCRIPTURLPATH{"view"}%/TestCases/TestCaseAutoFormatting#NotThere">TestCaseAutoFormatting#NotThere</a> <p /> -<a class="twikiAnchorLink" href="%SCRIPTURL{"view"}%/TestCases/TestCaseAutoFormatting#MyAnchor">Jump</a> +<a class="twikiAnchorLink" href="%SCRIPTURLPATH{"view"}%/TestCases/TestCaseAutoFormatting#MyAnchor">Jump</a> <p /> <a name="MyAnchor"></a> To here <!-- /expected --> @@ -542,8 +542,8 @@ ---++ Anchor links ---+++ Expected <!-- expected expand --> -<span class="twikiNewLink">AnchorLink#AnchorName<a title="Create this topic" href="%SCRIPTURL{"edit"}%/TestCases/AnchorLink?topicparent=TestCases.TestCaseAutoFormatting" rel="nofollow"><sup>?</sup></a></span> -<a class="twikiAnchorLink" href="%SCRIPTURL{"view"}%/TWiki/TWikiVariables#VarWEBLIST">TWikiVariables#VarWEBLIST</a> +<span class="twikiNewLink">AnchorLink#AnchorName<a title="Create this topic" href="%SCRIPTURLPATH{"edit"}%/TestCases/AnchorLink?topicparent=TestCases.TestCaseAutoFormatting" rel="nofollow"><sup>?</sup></a></span> +<a class="twikiAnchorLink" href="%SCRIPTURLPATH{"view"}%/TWiki/TWikiVariables#VarWEBLIST">TWikiVariables#VarWEBLIST</a> <!-- /expected --> ---+++ Actual <!-- actual --> @@ -554,7 +554,7 @@ ---++ Link at end of topic ---+++ Expected <!-- expected expand LINKATEND --> -<span class="twikiNewLink">LinkAtEnd<a title="Create this topic" href="%SCRIPTURL{"edit"}%/TestCases/LinkAtEnd?topicparent=TestCases.TestCaseAutoFormatting" rel="nofollow"><sup>?</sup></a></span> +<span class="twikiNewLink">LinkAtEnd<a title="Create this topic" href="%SCRIPTURLPATH{"edit"}%/TestCases/LinkAtEnd?topicparent=TestCases.TestCaseAutoFormatting" rel="nofollow"><sup>?</sup></a></span> <!-- /expected --> ---+++ Actual <!-- actual --> Modified: twiki/branches/DEVELOP/data/TestCases/TestCaseAutoIncludeSubWebTopic.txt =================================================================== --- twiki/branches/DEVELOP/data/TestCases/TestCaseAutoIncludeSubWebTopic.txt 2005-12-31 16:30:10 UTC (rev 8053) +++ twiki/branches/DEVELOP/data/TestCases/TestCaseAutoIncludeSubWebTopic.txt 2005-12-31 18:01:56 UTC (rev 8054) @@ -3,7 +3,7 @@ Description: include a topic from a subweb -[[%SCRIPTURL{"view"}%/%WEB%/%TOPIC%?test=compare&debugenableplugins=TestFixturePlugin&skin=pattern][run this test]] +[[%SCRIPTURLPATH{"view"}%/%WEB%/%TOPIC%?test=compare&debugenableplugins=TestFixturePlugin&skin=pattern][run this test]] <!-- expected --> SUCCESS Modified: twiki/branches/DEVELOP/data/TestCases/TestCaseAutoMetaSearch.txt =================================================================== --- twiki/branches/DEVELOP/data/TestCases/TestCaseAutoMetaSearch.txt 2005-12-31 16:30:10 UTC (rev 8053) +++ twiki/branches/DEVELOP/data/TestCases/TestCaseAutoMetaSearch.txt 2005-12-31 18:01:56 UTC (rev 8054) @@ -3,14 +3,14 @@ Description: tests for METASEARCH tags -[[%SCRIPTURL{"view"}%/%WEB%/%TOPIC%?test=compare&debugenableplugins=TestFixturePlugin&skin=pattern][run this test]] +[[%SCRIPTURLPATH{"view"}%/%WEB%/%TOPIC%?test=compare&debugenableplugins=TestFixturePlugin&skin=pattern][run this test]] Designed by: Crawford Currie ---+ Search for parents Expected: <!-- expected expand --> -<a href="%SCRIPTURL{"view"}%/TestCases/%TOPIC%">%TOPIC%</a> +<a href="%SCRIPTURLPATH{"view"}%/TestCases/%TOPIC%">%TOPIC%</a> <!-- /expected --> Actual: <!-- actual --> @@ -19,7 +19,7 @@ ---+ Search for moved topic Expected: <!-- expected expand --> -Itwos <a href="%SCRIPTURL{"view"}%/TestCases/DeliberatelyMoved">DeliberatelyMoved</a> +Itwos <a href="%SCRIPTURLPATH{"view"}%/TestCases/DeliberatelyMoved">DeliberatelyMoved</a> <!-- /expected --> Actual: <!-- actual --> @@ -28,7 +28,7 @@ ---+ Search for field value Expected: <!-- expected expand --> -<a href="%SCRIPTURL{"view"}%/TestCases/DeliberatelyMoved">DeliberatelyMoved</a> +<a href="%SCRIPTURLPATH{"view"}%/TestCases/DeliberatelyMoved">DeliberatelyMoved</a> <!-- /expected --> Actual: <!-- actual --> Modified: twiki/branches/DEVELOP/data/TestCases/TestCaseAutoSearch.txt =================================================================== --- twiki/branches/DEVELOP/data/TestCases/TestCaseAutoSearch.txt 2005-12-31 16:30:10 UTC (rev 8053) +++ twiki/branches/DEVELOP/data/TestCases/TestCaseAutoSearch.txt 2005-12-31 18:01:56 UTC (rev 8054) @@ -4,7 +4,7 @@ Results dependent on templates used to render search results. Tests only make sense when this topic is viewed with "pattern" skin and standard search templates. -[[%SCRIPTURL{"view"}%/%WEB%/%TOPIC%?test=compare&debugenableplugins=TestFixturePlugin&skin=pattern][run this test]] +[[%SCRIPTURLPATH{"view"}%/%WEB%/%TOPIC%?test=compare&debugenableplugins=TestFixturePlugin&skin=pattern][run this test]] Designed by: Crawford Currie @@ -13,16 +13,16 @@ <!-- expected expand rex DEFAULT --> <div class="patternSearchString">Searched: <b>hit me with your rhythm stick</b></div><div class="patternSearchResultsBegin"></div> <div class="patternSearchResultsHeader" style="background-color:yellow"><span class="twikiLeft">Results from TestCases web</span><span class="twikiRight">retrieved at @TIME (GMT)</span><br class="twikiClear" /></div><div class="patternSearchResults"> -<div class="twikiTopRow"><div class="twikiLeft"><a href="%SCRIPTURL{"view"}%/TestCases/TestCaseAutoSearch"><b>TestCaseAutoSearch</b></a> </div> +<div class="twikiTopRow"><div class="twikiLeft"><a href="%SCRIPTURLPATH{"view"}%/TestCases/TestCaseAutoSearch"><b>TestCaseAutoSearch</b></a> </div> <div class="twikiRight twikiSRAuthor"> -<a class='twikiLink' href="%SCRIPTURL{"view"}%/%MAINWEB%/@WIKIWORD">@WIKIWORD</a></div> -<div class="twikiRight twikiSRRev"><span class="twikiNew">NEW</span> - <a href="%SCRIPTURL{"rdiff"}%/TestCases/TestCaseAutoSearch" rel='nofollow'>@DATE - @TIME</a> </div><br class="twikiClear" /></div> +<a class='twikiLink' href="%SCRIPTURLPATH{"view"}%/%MAINWEB%/@WIKIWORD">@WIKIWORD</a></div> +<div class="twikiRight twikiSRRev"><span class="twikiNew">NEW</span> - <a href="%SCRIPTURLPATH{"rdiff"}%/TestCases/TestCaseAutoSearch" rel='nofollow'>@DATE - @TIME</a> </div><br class="twikiClear" /></div> <div class="twikiBottomRow"> <div class="twikiSummary twikiGrayText">Description: Automated search function tests. Results dependent on templates used to render search results. Tests only make sense when this topic is viewed with "pattern ...</div></div></div><div class="patternSearchResults"> -<div class="twikiTopRow"><div class="twikiLeft"><a href="%SCRIPTURL{"view"}%/TestCases/WhatIsWikiWiki"><b>WhatIsWikiWiki</b></a></div> +<div class="twikiTopRow"><div class="twikiLeft"><a href="%SCRIPTURLPATH{"view"}%/TestCases/WhatIsWikiWiki"><b>WhatIsWikiWiki</b></a></div> <div class="twikiRight twikiSRAuthor"> -<a class='twikiLink' href="%SCRIPTURL{"view"}%/%MAINWEB%/@WIKIWORD">@WIKIWORD</a></div> -<div class="twikiRight twikiSRRev"><span class="twikiNew">NEW</span> - <a href="%SCRIPTURL{"rdiff"}%/TestCases/WhatIsWikiWiki" rel='nofollow'>@DATE - @TIME</a> </div><br class="twikiClear" /></div> +<a class='twikiLink' href="%SCRIPTURLPATH{"view"}%/%MAINWEB%/@WIKIWORD">@WIKIWORD</a></div> +<div class="twikiRight twikiSRRev"><span class="twikiNew">NEW</span> - <a href="%SCRIPTURLPATH{"rdiff"}%/TestCases/WhatIsWikiWiki" rel='nofollow'>@DATE - @TIME</a> </div><br class="twikiClear" /></div> <div class="twikiBottomRow"> <div class="twikiSummary twikiGrayText">This is a test fixture topic, used in TestCaseAutoSearch hit me with your rhythm stick hit me! hit me! schmerz ist gut, ich liebe dich hit me! hit me! hit me! ...</div></div></div> <div class="patternSearchResultCount">Number of topics: <b>2</b></div> @@ -56,16 +56,16 @@ ---++ Expected <!-- expected expand rex TWOWEBS --> <div class="patternSearchResults"> -<div class="twikiTopRow"><div class="twikiLeft"><a href="%SCRIPTURL{"view"}%/TestCases/WebPreferences"><b>WebPreferences</b></a> </div> +<div class="twikiTopRow"><div class="twikiLeft"><a href="%SCRIPTURLPATH{"view"}%/TestCases/WebPreferences"><b>WebPreferences</b></a> </div> <div class="twikiRight twikiSRAuthor"> -<a class='twikiLink' href="%SCRIPTURL{"view"}%/%MAINWEB%/@WIKIWORD">@WIKIWORD</a></div> -<div class="twikiRight twikiSRRev"><span class="twikiNew">NEW</span> - <a href="%SCRIPTURL{"rdiff"}%/TestCases/WebPreferences" rel='nofollow'>@DATE - @TIME</a></div><br class="twikiClear" /></div> +<a class='twikiLink' href="%SCRIPTURLPATH{"view"}%/%MAINWEB%/@WIKIWORD">@WIKIWORD</a></div> +<div class="twikiRight twikiSRRev"><span class="twikiNew">NEW</span> - <a href="%SCRIPTURLPATH{"rdiff"}%/TestCases/WebPreferences" rel='nofollow'>@DATE - @TIME</a></div><br class="twikiClear" /></div> <div class="twikiBottomRow"> <div class="twikiSummary twikiGrayText"></div></div></div><div class="patternSearchResults"> -<div class="twikiTopRow"><div class="twikiLeft"><a href="%SCRIPTURL{"view"}%/TWiki/WebPreferences"><b>WebPreferences</b></a> </div> +<div class="twikiTopRow"><div class="twikiLeft"><a href="%SCRIPTURLPATH{"view"}%/TWiki/WebPreferences"><b>WebPreferences</b></a> </div> <div class="twikiRight twikiSRAuthor"> -<a class='twikiLink' href="%SCRIPTURL{"view"}%/%MAINWEB%/@WIKIWORD">@WIKIWORD</a></div> -<div class="twikiRight twikiSRRev"><span class="twikiNew">NEW</span> - <a href="%SCRIPTURL{"rdiff"}%/TWiki/WebPreferences" rel='nofollow'>@DATE - @TIME</a></div><br class="twikiClear" /></div> +<a class='twikiLink' href="%SCRIPTURLPATH{"view"}%/%MAINWEB%/@WIKIWORD">@WIKIWORD</a></div> +<div class="twikiRight twikiSRRev"><span class="twikiNew">NEW</span> - <a href="%SCRIPTURLPATH{"rdiff"}%/TWiki/WebPreferences" rel='nofollow'>@DATE - @TIME</a></div><br class="twikiClear" /></div> <div class="twikiBottomRow"> <div class="twikiSummary twikiGrayText"></div></div></div> <!-- /expected --> @@ -78,16 +78,16 @@ ---++ Expected <!-- expected expand rex ALLWEBS --> <div class="patternSearchResults"> -<div class="twikiTopRow"><div class="twikiLeft"><a href="%SCRIPTURL{"view"}%/TWiki/WhatIsWikiWiki"><b>WhatIsWikiWiki</b></a> </div> +<div class="twikiTopRow"><div class="twikiLeft"><a href="%SCRIPTURLPATH{"view"}%/TWiki/WhatIsWikiWiki"><b>WhatIsWikiWiki</b></a> </div> <div class="twikiRight twikiSRAuthor"> -<a class='twikiLink' href="%SCRIPTURL{"view"}%/%MAINWEB%/@WIKIWORD">@WIKIWORD</a></div> -<div class="twikiRight twikiSRRev"><span class="twikiNew">NEW</span> - <a href="%SCRIPTURL{"rdiff"}%/TWiki/WhatIsWikiWiki" rel='nofollow'>@DATE - @TIME</a></div><br class="twikiClear" /></div> +<a class='twikiLink' href="%SCRIPTURLPATH{"view"}%/%MAINWEB%/@WIKIWORD">@WIKIWORD</a></div> +<div class="twikiRight twikiSRRev"><span class="twikiNew">NEW</span> - <a href="%SCRIPTURLPATH{"rdiff"}%/TWiki/WhatIsWikiWiki" rel='nofollow'>@DATE - @TIME</a></div><br class="twikiClear" /></div> <div class="twikiBottomRow"> <div class="twikiSummary twikiGrayText"></div></div></div><div class="patternSearchResults"> -<div class="twikiTopRow"><div class="twikiLeft"><a href="%SCRIPTURL{"view"}%/TestCases/WhatIsWikiWiki"><b>WhatIsWikiWiki</b></a> </div> +<div class="twikiTopRow"><div class="twikiLeft"><a href="%SCRIPTURLPATH{"view"}%/TestCases/WhatIsWikiWiki"><b>WhatIsWikiWiki</b></a> </div> <div class="twikiRight twikiSRAuthor"> -<a class='twikiLink' href="%SCRIPTURL{"view"}%/%MAINWEB%/@WIKIWORD">@WIKIWORD</a></div> -<div class="twikiRight twikiSRRev"><span class="twikiNew">NEW</span> - <a href="%SCRIPTURL{"rdiff"}%/TestCases/WhatIsWikiWiki" rel='nofollow'>@DATE - @TIME</a> </div><br class="twikiClear" /></div> +<a class='twikiLink' href="%SCRIPTURLPATH{"view"}%/%MAINWEB%/@WIKIWORD">@WIKIWORD</a></div> +<div class="twikiRight twikiSRRev"><span class="twikiNew">NEW</span> - <a href="%SCRIPTURLPATH{"rdiff"}%/TestCases/WhatIsWikiWiki" rel='nofollow'>@DATE - @TIME</a> </div><br class="twikiClear" /></div> <div class="twikiBottomRow"> <div class="twikiSummary twikiGrayText"></div></div></div> <!-- /expected --> @@ -100,11 +100,11 @@ ---++ Expected <!-- expected expand rex TOPICPARAMETER --> <div class="patternSearchResults"> -<div class="twikiTopRow"><div class="twikiLeft"><a href="%SCRIPTURL{"view"}%/TestCases/TestCaseAutoSearch"><b>TestCaseAutoSearch</b></a> </div> +<div class="twikiTopRow"><div class="twikiLeft"><a href="%SCRIPTURLPATH{"view"}%/TestCases/TestCaseAutoSearch"><b>TestCaseAutoSearch</b></a> </div> <div class="twikiRight twikiSRAuthor"> -<a class='twikiLink' href="%SCRIPTURL{"view"}%/%MAINWEB%/@WIKIWORD">@WIKIWORD</a></div> +<a class='twikiLink' href="%SCRIPTURLPATH{"view"}%/%MAINWEB%/@WIKIWORD">@WIKIWORD</a></div> <div class="twikiRight twikiSRRev"><span class="twikiNew">NEW</span> - -<a href="%SCRIPTURL{"rdiff"}%/TestCases/TestCaseAutoSearch" rel='nofollow'>@DATE - @TIME</a></div><br class="twikiClear" /></div> +<a href="%SCRIPTURLPATH{"rdiff"}%/TestCases/TestCaseAutoSearch" rel='nofollow'>@DATE - @TIME</a></div><br class="twikiClear" /></div> <div class="twikiBottomRow"> <div class="twikiSummary twikiGrayText"></div></div></div> <!-- /expected --> @@ -117,10 +117,10 @@ ---++ Expected <!-- expected rex expand EXCLUDETOPICTOPIC --> <div class="patternSearchResults"> -<div class="twikiTopRow"><div class="twikiLeft"><a href="%SCRIPTURL{"view"}%/TestCases/WhatIsWikiWiki"><b>WhatIsWikiWiki</b></a> </div> +<div class="twikiTopRow"><div class="twikiLeft"><a href="%SCRIPTURLPATH{"view"}%/TestCases/WhatIsWikiWiki"><b>WhatIsWikiWiki</b></a> </div> <div class="twikiRight twikiSRAuthor"> -<a class='twikiLink' href="%SCRIPTURL{"view"}%/%MAINWEB%/@WIKIWORD">@WIKIWORD</a></div> -<div class="twikiRight twikiSRRev"><span class="twikiNew">NEW</span> - <a href="%SCRIPTURL{"rdiff"}%/TestCases/WhatIsWikiWiki" rel='nofollow'>@DATE - @TIME</a> </div><br class="twikiClear" /></div> +<a class='twikiLink' href="%SCRIPTURLPATH{"view"}%/%MAINWEB%/@WIKIWORD">@WIKIWORD</a></div> +<div class="twikiRight twikiSRRev"><span class="twikiNew">NEW</span> - <a href="%SCRIPTURLPATH{"rdiff"}%/TestCases/WhatIsWikiWiki" rel='nofollow'>@DATE - @TIME</a> </div><br class="twikiClear" /></div> <div class="twikiBottomRow"> <div class="twikiSummary twikiGrayText"></div></div></div> <!-- /expected --> @@ -161,35 +161,35 @@ ---++ Expected <!-- expected expand rex MULTIPLE --> <div class="patternSearchResults"> -<div class="twikiTopRow"><div class="twikiLeft"><a href="%SCRIPTURL{"view"}%/TestCases/WhatIsWikiWiki"><b>WhatIsWikiWiki</b></a> </div> +<div class="twikiTopRow"><div class="twikiLeft"><a href="%SCRIPTURLPATH{"view"}%/TestCases/WhatIsWikiWiki"><b>WhatIsWikiWiki</b></a> </div> <div class="twikiRight twikiSRAuthor"> -<a class='twikiLink' href="%SCRIPTURL{"view"}%/%MAINWEB%/@WIKIWORD">@WIKIWORD</a></div> -<div class="twikiRight twikiSRRev"><span class="twikiNew">NEW</span> - <a href="%SCRIPTURL{"rdiff"}%/TestCases/WhatIsWikiWiki" rel='nofollow'>@DATE - @TIME</a></div><br class="twikiClear" /></div> +<a class='twikiLink' href="%SCRIPTURLPATH{"view"}%/%MAINWEB%/@WIKIWORD">@WIKIWORD</a></div> +<div class="twikiRight twikiSRRev"><span class="twikiNew">NEW</span> - <a href="%SCRIPTURLPATH{"rdiff"}%/TestCases/WhatIsWikiWiki" rel='nofollow'>@DATE - @TIME</a></div><br class="twikiClear" /></div> <div class="twikiBottomRow"> <div class="twikiSummary twikiGrayText"></div></div></div><div class="patternSearchResults"> -<div class="twikiTopRow"><div class="twikiLeft"><a href="%SCRIPTURL{"view"}%/TestCases/WhatIsWikiWiki"><b>WhatIsWikiWiki</b></a> </div> +<div class="twikiTopRow"><div class="twikiLeft"><a href="%SCRIPTURLPATH{"view"}%/TestCases/WhatIsWikiWiki"><b>WhatIsWikiWiki</b></a> </div> <div class="twikiRight twikiSRAuthor"> -<a class='twikiLink' href="%SCRIPTURL{"view"}%/%MAINWEB%/@WIKIWORD">@WIKIWORD</a></div> -<div class="twikiRight twikiSRRev"><span class="twikiNew">NEW</span> - <a href="%SCRIPTURL{"rdiff"}%/TestCases/WhatIsWikiWiki" rel='nofollow'>@DATE - @TIME</a> </div><br class="twikiClear" /></div> +<a class='twikiLink' href="%SCRIPTURLPATH{"view"}%/%MAINWEB%/@WIKIWORD">@WIKIWORD</a></div> +<div class="twikiRight twikiSRRev"><span class="twikiNew">NEW</span> - <a href="%SCRIPTURLPATH{"rdiff"}%/TestCases/WhatIsWikiWiki" rel='nofollow'>@DATE - @TIME</a> </div><br class="twikiClear" /></div> <div class="twikiBottomRow"> <div class="twikiSummary twikiGrayText"></div></div></div><div class="patternSearchResults"> -<div class="twikiTopRow"><div class="twikiLeft"><a href="%SCRIPTURL{"view"}%/TestCases/WhatIsWikiWiki"><b>WhatIsWikiWiki</b></a> </div> +<div class="twikiTopRow"><div class="twikiLeft"><a href="%SCRIPTURLPATH{"view"}%/TestCases/WhatIsWikiWiki"><b>WhatIsWikiWiki</b></a> </div> <div class="twikiRight twikiSRAuthor"> -<a class='twikiLink' href="%SCRIPTURL{"view"}%/%MAINWEB%/@WIKIWORD">@WIKIWORD</a></div> -<div class="twikiRight twikiSRRev"><span class="twikiNew">NEW</span> - <a href="%SCRIPTURL{"rdiff"}%/TestCases/WhatIsWikiWiki" rel='nofollow'>@DATE - @TIME</a></div><br class="twikiClear" /></div> +<a class='twikiLink' href="%SCRIPTURLPATH{"view"}%/%MAINWEB%/@WIKIWORD">@WIKIWORD</a></div> +<div class="twikiRight twikiSRRev"><span class="twikiNew">NEW</span> - <a href="%SCRIPTURLPATH{"rdiff"}%/TestCases/WhatIsWikiWiki" rel='nofollow'>@DATE - @TIME</a></div><br class="twikiClear" /></div> <div class="twikiBottomRow"> <div class="twikiSummary twikiGrayText"></div></div></div><div class="patternSearchResults"> -<div class="twikiTopRow"><div class="twikiLeft"><a href="%SCRIPTURL{"view"}%/TestCases/WhatIsWikiWiki"><b>WhatIsWikiWiki</b></a> </div> +<div class="twikiTopRow"><div class="twikiLeft"><a href="%SCRIPTURLPATH{"view"}%/TestCases/WhatIsWikiWiki"><b>WhatIsWikiWiki</b></a> </div> <div class="twikiRight twikiSRAuthor"> -<a class='twikiLink' href="%SCRIPTURL{"view"}%/%MAINWEB%/@WIKIWORD">@WIKIWORD</a></div> -<div class="twikiRight twikiSRRev"><span class="twikiNew">NEW</span> - <a href="%SCRIPTURL{"rdiff"}%/TestCases/WhatIsWikiWiki" rel='nofollow'>@DATE - @TIME</a> </div><br class="twikiClear" /></div> +<a class='twikiLink' href="%SCRIPTURLPATH{"view"}%/%MAINWEB%/@WIKIWORD">@WIKIWORD</a></div> +<div class="twikiRight twikiSRRev"><span class="twikiNew">NEW</span> - <a href="%SCRIPTURLPATH{"rdiff"}%/TestCases/WhatIsWikiWiki" rel='nofollow'>@DATE - @TIME</a> </div><br class="twikiClear" /></div> <div class="twikiBottomRow"> <div class="twikiSummary twikiGrayText"></div></div></div><div class="patternSearchResults"> -<div class="twikiTopRow"><div class="twikiLeft"><a href="%SCRIPTURL{"view"}%/TestCases/WhatIsWikiWiki"><b>WhatIsWikiWiki</b></a> </div> +<div class="twikiTopRow"><div class="twikiLeft"><a href="%SCRIPTURLPATH{"view"}%/TestCases/WhatIsWikiWiki"><b>WhatIsWikiWiki</b></a> </div> <div class="twikiRight twikiSRAuthor"> -<a class='twikiLink' href="%SCRIPTURL{"view"}%/%MAINWEB%/@WIKIWORD">@WIKIWORD</a></div> -<div class="twikiRight twikiSRRev"><span class="twikiNew">NEW</span> - <a href="%SCRIPTURL{"rdiff"}%/TestCases/WhatIsWikiWiki" rel='nofollow'>@DATE - @TIME</a></div><br class="twikiClear" /></div> +<a class='twikiLink' href="%SCRIPTURLPATH{"view"}%/%MAINWEB%/@WIKIWORD">@WIKIWORD</a></div> +<div class="twikiRight twikiSRRev"><span class="twikiNew">NEW</span> - <a href="%SCRIPTURLPATH{"rdiff"}%/TestCases/WhatIsWikiWiki" rel='nofollow'>@DATE - @TIME</a></div><br class="twikiClear" /></div> <div class="twikiBottomRow"> <div class="twikiSummary twikiGrayText"></div></div></div> <!-- /expected --> @@ -202,16 +202,16 @@ ---++ Expected <!-- expected expand rex REGEX --> <div class="patternSearchResults"> -<div class="twikiTopRow"><div class="twikiLeft"><a href="%SCRIPTURL{"view"}%/TestCases/TestCaseAutoSearch"><b>TestCaseAutoSearch</b></a> </div> +<div class="twikiTopRow"><div class="twikiLeft"><a href="%SCRIPTURLPATH{"view"}%/TestCases/TestCaseAutoSearch"><b>TestCaseAutoSearch</b></a> </div> <div class="twikiRight twikiSRAuthor"> -<a class='twikiLink' href="%SCRIPTURL{"view"}%/%MAINWEB%/@WIKIWORD">@WIKIWORD</a></div> -<div class="twikiRight twikiSRRev"><span class="twikiNew">NEW</span> - <a href="%SCRIPTURL{"rdiff"}%/TestCases/TestCaseAutoSearch" rel='nofollow'>@DATE - @TIME</a> </div><br class="twikiClear" /></div> +<a class='twikiLink' href="%SCRIPTURLPATH{"view"}%/%MAINWEB%/@WIKIWORD">@WIKIWORD</a></div> +<div class="twikiRight twikiSRRev"><span class="twikiNew">NEW</span> - <a href="%SCRIPTURLPATH{"rdiff"}%/TestCases/TestCaseAutoSearch" rel='nofollow'>@DATE - @TIME</a> </div><br class="twikiClear" /></div> <div class="twikiBottomRow"> <div class="twikiSummary twikiGrayText"></div></div></div><div class="patternSearchResults"> -<div class="twikiTopRow"><div class="twikiLeft"><a href="%SCRIPTURL{"view"}%/TestCases/WhatIsWikiWiki"><b>WhatIsWikiWiki</b></a> </div> +<div class="twikiTopRow"><div class="twikiLeft"><a href="%SCRIPTURLPATH{"view"}%/TestCases/WhatIsWikiWiki"><b>WhatIsWikiWiki</b></a> </div> <div class="twikiRight twikiSRAuthor"> -<a class='twikiLink' href="%SCRIPTURL{"view"}%/%MAINWEB%/@WIKIWORD">@WIKIWORD</a></div> -<div class="twikiRight twikiSRRev"><span class="twikiNew">NEW</span> - <a href="%SCRIPTURL{"rdiff"}%/TestCases/WhatIsWikiWiki" rel='nofollow'>@DATE - @TIME</a></div><br class="twikiClear" /></div> +<a class='twikiLink' href="%SCRIPTURLPATH{"view"}%/%MAINWEB%/@WIKIWORD">@WIKIWORD</a></div> +<div class="twikiRight twikiSRRev"><span class="twikiNew">NEW</span> - <a href="%SCRIPTURLPATH{"rdiff"}%/TestCases/WhatIsWikiWiki" rel='nofollow'>@DATE - @TIME</a></div><br class="twikiClear" /></div> <div class="twikiBottomRow"> <div class="twikiSummary twikiGrayText"></div></div></div> <!-- /expected --> @@ -224,16 +224,16 @@ ---++ Expected <!-- expected expand rex SCOPEALL --> <div class="patternSearchResults"> -<div class="twikiTopRow"><div class="twikiLeft"><a href="%SCRIPTURL{"view"}%/TestCases/WhatIsWikiWiki"><b>WhatIsWikiWiki</b></a> </div> +<div class="twikiTopRow"><div class="twikiLeft"><a href="%SCRIPTURLPATH{"view"}%/TestCases/WhatIsWikiWiki"><b>WhatIsWikiWiki</b></a> </div> <div class="twikiRight twikiSRAuthor"> -<a class='twikiLink' href="%SCRIPTURL{"view"}%/%MAINWEB%/@WIKIWORD">@WIKIWORD</a></div> -<div class="twikiRight twikiSRRev"><span class="twikiNew">NEW</span> - <a href="%SCRIPTURL{"rdiff"}%/TestCases/WhatIsWikiWiki" rel='nofollow'>@DATE - @TIME</a> </div><br class="twikiClear" /></div> +<a class='twikiLink' href="%SCRIPTURLPATH{"view"}%/%MAINWEB%/@WIKIWORD">@WIKIWORD</a></div> +<div class="twikiRight twikiSRRev"><span class="twikiNew">NEW</span> - <a href="%SCRIPTURLPATH{"rdiff"}%/TestCases/WhatIsWikiWiki" rel='nofollow'>@DATE - @TIME</a> </div><br class="twikiClear" /></div> <div class="twikiBottomRow"> <div class="twikiSummary twikiGrayText"></div></div></div><div class="patternSearchResults"> -<div class="twikiTopRow"><div class="twikiLeft"><a href="%SCRIPTURL{"view"}%/TestCases/TestCaseAutoSearch"><b>TestCaseAutoSearch</b></a> </div> +<div class="twikiTopRow"><div class="twikiLeft"><a href="%SCRIPTURLPATH{"view"}%/TestCases/TestCaseAutoSearch"><b>TestCaseAutoSearch</b></a> </div> <div class="twikiRight twikiSRAuthor"> -<a class='twikiLink' href="%SCRIPTURL{"view"}%/%MAINWEB%/@WIKIWORD">@WIKIWORD</a></div> -<div class="twikiRight twikiSRRev"><span class="twikiNew">NEW</span> - <a href="%SCRIPTURL{"rdiff"}%/TestCases/TestCaseAutoSearch" rel='nofollow'>@DATE - @TIME</a></div><br class="twikiClear" /></div> +<a class='twikiLink' href="%SCRIPTURLPATH{"view"}%/%MAINWEB%/@WIKIWORD">@WIKIWORD</a></div> +<div class="twikiRight twikiSRRev"><span class="twikiNew">NEW</span> - <a href="%SCRIPTURLPATH{"rdiff"}%/TestCases/TestCaseAutoSearch" rel='nofollow'>@DATE - @TIME</a></div><br class="twikiClear" /></div> <div class="twikiBottomRow"> <div class="twikiSummary twikiGrayText"></div></div></div> <!-- /expected --> @@ -246,10 +246,10 @@ ---++ Expected <!-- expected rex expand CASESENSITIVE --> <div class="patternSearchResults"> -<div class="twikiTopRow"><div class="twikiLeft"><a href="%SCRIPTURL{"view"}%/TestCases/TestCaseAutoSearch"><b>TestCaseAutoSearch</b></a> </div> +<div class="twikiTopRow"><div class="twikiLeft"><a href="%SCRIPTURLPATH{"view"}%/TestCases/TestCaseAutoSearch"><b>TestCaseAutoSearch</b></a> </div> <div class="twikiRight twikiSRAuthor"> -<a class='twikiLink' href="%SCRIPTURL{"view"}%/%MAINWEB%/@WIKIWORD">@WIKIWORD</a></div> -<div class="twikiRight twikiSRRev"><span class="twikiNew">NEW</span> - <a href="%SCRIPTURL{"rdiff"}%/TestCases/TestCaseAutoSearch" rel='nofollow'>@DATE - @TIME</a> </div><br class="twikiClear" /></div> +<a class='twikiLink' href="%SCRIPTURLPATH{"view"}%/%MAINWEB%/@WIKIWORD">@WIKIWORD</a></div> +<div class="twikiRight twikiSRRev"><span class="twikiNew">NEW</span> - <a href="%SCRIPTURLPATH{"rdiff"}%/TestCases/TestCaseAutoSearch" rel='nofollow'>@DATE - @TIME</a> </div><br class="twikiClear" /></div> <div class="twikiBottomRow"> <div class="twikiSummary twikiGrayText"></div></div></div> <!-- /expected --> Modified: twiki/branches/DEVELOP/data/TestCases/TestCaseAutoTOC.txt =================================================================== --- twiki/branches/DEVELOP/data/TestCases/TestCaseAutoTOC.txt 2005-12-31 16:30:10 UTC (rev 8053) +++ twiki/branches/DEVELOP/data/TestCases/TestCaseAutoTOC.txt 2005-12-31 18:01:56 UTC (rev 8054) @@ -2,7 +2,7 @@ Description: tests for TOCs included from other topics and with funny deprecated syntaxes. -[[%SCRIPTURL{"view"}%/%WEB%/%TOPIC%?test=compare&debugenableplugins=TestFixturePlugin&skin=pattern][run this test]] +[[%SCRIPTURLPATH{"view"}%/%WEB%/%TOPIC%?test=compare&debugenableplugins=TestFixturePlugin&skin=pattern][run this test]] Designed by: Crawford Currie @@ -11,15 +11,15 @@ <!-- expected expand --> <div class="twikiToc"> <ul> -<li> <a href="%SCRIPTURL{"view"}%/TestCases/TocFixture#Nonsense">Nonsense</a> +<li> <a href="#Nonsense">Nonsense</a> <ul> -<li> <a href="%SCRIPTURL{"view"}%/TestCases/TocFixture#Makes">Makes</a> +<li> <a href="#Makes">Makes</a> <ul> -<li> <a href="%SCRIPTURL{"view"}%/TestCases/TocFixture#Content">Content</a> +<li> <a href="#Content">Content</a> </li> </ul> </li> -<li> <a href="%SCRIPTURL{"view"}%/TestCases/TocFixture#Tests">Tests</a> +<li> <a href="#Tests">Tests</a> </li> </ul> </li> @@ -35,19 +35,19 @@ <div class="twikiToc"> <span class="twikiTocTitle">The Top</span> <ul> -<li> <a href="%SCRIPTURL{"view"}%/TestCases/TestCaseAutoTOC#H1_1">H1 <!--1--></a> +<li> <a href="#H1_1">H1 <!--1--></a> <ul> -<li> <a href="%SCRIPTURL{"view"}%/TestCases/TestCaseAutoTOC#H2">H2</a> +<li> <a href="#H2">H2</a> </li> </ul> </li> -<li> <a href="%SCRIPTURL{"view"}%/TestCases/TestCaseAutoTOC#H1_2">H1 <!--2--></a> +<li> <a href="#H1_2">H1 <!--2--></a> <ul> -<li> <a href="%SCRIPTURL{"view"}%/TestCases/TestCaseAutoTOC#H2">H2</a> +<li> <a href="#H2">H2</a> <ul> <li> <ul> -<li> <a href="%SCRIPTURL{"view"}%/TestCases/TestCaseAutoTOC#Don_t_ignore">Don't ignore</a> +<li> <a href="#Don_t_ignore">Don't ignore</a> </li> </ul> </li> @@ -55,15 +55,15 @@ </li> </ul> </li> -<li> <a href="%SCRIPTURL{"view"}%/TestCases/TestCaseAutoTOC#hash_H1">hash H1</a> +<li> <a href="#hash_H1">hash H1</a> <ul> -<li> <a href="%SCRIPTURL{"view"}%/TestCases/TestCaseAutoTOC#H2">H2</a> +<li> <a href="#H2">H2</a> </li> </ul> </li> -<li> <a href="%SCRIPTURL{"view"}%/TestCases/TestCaseAutoTOC#hash_H1">hash H1</a> +<li> <a href="#hash_H1">hash H1</a> <ul> -<li> <a href="%SCRIPTURL{"view"}%/TestCases/TestCaseAutoTOC#normal_H2">normal H2</a> +<li> <a href="#normal_H2">normal H2</a> </li> </ul> </li> Modified: twiki/branches/DEVELOP/data/TestCases/TestCaseAutoWikiWordRendering.txt =================================================================== --- twiki/branches/DEVELOP/data/TestCases/TestCaseAutoWikiWordRendering.txt 2005-12-31 16:30:10 UTC (rev 8053) +++ twiki/branches/DEVELOP/data/TestCases/TestCaseAutoWikiWordRendering.txt 2005-12-31 18:01:56 UTC (rev 8054) @@ -2,7 +2,7 @@ Description: Test case for checking the correct rendering of 'classic' wikiwords and underscore wikiwords, with variations for italic and code text, and square-bracket links. -[[%SCRIPTURL{"view"}%/%WEB%/%TOPIC%?test=compare&debugenableplugins=TestFixturePlugin&skin=pattern][run this test]] +[[%SCRIPTURLPATH{"view"}%/%WEB%/%TOPIC%?test=compare&debugenableplugins=TestFixturePlugin&skin=pattern][run this test]] Designed by: Arthur Clemens, Lynnwood Brown @@ -21,7 +21,7 @@ </verbatim> <!-- expected expand 1 --> -<a class="twikiLink" href="%SCRIPTURL{"view"}%/%WEB%/WebHome">WebHome</a> +<a class="twikiLink" href="%SCRIPTURLPATH{"view"}%/%WEB%/WebHome">WebHome</a> <!-- /expected --> <!-- actual --> @@ -36,7 +36,7 @@ </verbatim> <!-- expected expand 2 --> -<a class="twikiLink" href="%SCRIPTURL{"view"}%/%WEB%/WebHome">WebHome</a> +<a class="twikiLink" href="%SCRIPTURLPATH{"view"}%/%WEB%/WebHome">WebHome</a> <!-- /expected --> <!-- actual --> @@ -51,7 +51,7 @@ </verbatim> <!-- expected expand 3 --> -<a class="twikiLink" href="%SCRIPTURL{"view"}%/TWiki/WebHome">TWiki.WebHome</a> +<a class="twikiLink" href="%SCRIPTURLPATH{"view"}%/TWiki/WebHome">TWiki.WebHome</a> <!-- /expected --> <!-- actual --> @@ -66,7 +66,7 @@ </verbatim> <!-- expected expand 4 --> -<a class="twikiLink" href="%SCRIPTURL{"view"}%/TWiki/WebHome">home</a> +<a class="twikiLink" href="%SCRIPTURLPATH{"view"}%/TWiki/WebHome">home</a> <!-- /expected --> <!-- actual --> @@ -141,7 +141,7 @@ </verbatim> <!-- expected expand 9 --> -<a class="twikiLink" href="%SCRIPTURL{"view"}%/TestCases/Underscore_topic">Underscore_topic</a> +<a class="twikiLink" href="%SCRIPTURLPATH{"view"}%/TestCases/Underscore_topic">Underscore_topic</a> <!-- /expected --> <!-- actual --> @@ -156,7 +156,7 @@ </verbatim> <!-- expected expand 10 --> -<a class="twikiLink" href="%SCRIPTURL{"view"}%/TestCases/Underscore_topic">TestCases.Underscore_topic</a> +<a class="twikiLink" href="%SCRIPTURLPATH{"view"}%/TestCases/Underscore_topic">TestCases.Underscore_topic</a> <!-- /expected --> <!-- actual --> @@ -171,7 +171,7 @@ </verbatim> <!-- expected expand 11 --> -<a class="twikiLink" href="%SCRIPTURL{"view"}%/TestCases/Underscore_topic">topic</a> +<a class="twikiLink" href="%SCRIPTURLPATH{"view"}%/TestCases/Underscore_topic">topic</a> <!-- /expected --> <!-- actual --> @@ -261,7 +261,7 @@ </verbatim> <!-- expected expand 17 --> -<a class="twikiLink" href="%SCRIPTURL{"view"}%/TestCases/H_">H_</a> +<a class="twikiLink" href="%SCRIPTURLPATH{"view"}%/TestCases/H_">H_</a> <!-- /expected --> <!-- actual --> @@ -341,7 +341,7 @@ </verbatim> <!-- expected expand 22 --> -<em>text with <a class="twikiLink" href="%SCRIPTURL{"view"}%/TestCases/H_">H_</a> link</em> +<em>text with <a class="twikiLink" href="%SCRIPTURLPATH{"view"}%/TestCases/H_">H_</a> link</em> <!-- /expected --> <!-- actual --> @@ -432,20 +432,20 @@ <!-- expected expand 28 --> -<a target="_top" href="http://skyloom.com/frame/frame.html?url1=%SCRIPTURL{"view"}%/%BASEWEB%/%BASETOPIC%;url2=http://skyloom.com/frame/frameoptions.html">Click here</a> +<a target="_top" href="http://skyloom.com/frame/frame.html?url1=%SCRIPTURLPATH{"view"}%/%BASEWEB%/%BASETOPIC%;url2=http://skyloom.com/frame/frameoptions.html">Click here</a> <!-- /expected --> Actual: <!-- actual --> -[[http://skyloom.com/frame/frame.html?url1=%SCRIPTURL{"view"}%/%BASEWEB%/%BASETOPIC%;url2=http://skyloom.com/frame/frameoptions.html][Click here]] +[[http://skyloom.com/frame/frame.html?url1=%SCRIPTURLPATH{"view"}%/%BASEWEB%/%BASETOPIC%;url2=http://skyloom.com/frame/frameoptions.html][Click here]] <!-- /actual --> Expected: <!-- expected expand 29 --> -<a href="http://skyloom.com/frame/frame.html?url1=%SCRIPTURL{"view"}%/%BASEWEB%/%BASETOPIC%;url2=%SCRIPTURL{"view"}%/Sandbox/%BASETOPIC%Discussion#DisCuss" target="_top">Discuss this topic</a> +<a href="http://skyloom.com/frame/frame.html?url1=%SCRIPTURLPATH{"view"}%/%BASEWEB%/%BASETOPIC%;url2=%SCRIPTURLPATH{"view"}%/Sandbox/%BASETOPIC%Discussion#DisCuss" target="_top">Discuss this topic</a> <!-- /expected --> Actual: <!-- actual --> -[[http://skyloom.com/frame/frame.html?url1=%SCRIPTURL{"view"}%/%BASEWEB%/%BASETOPIC%;url2=%SCRIPTURL{"view"}%/Sandbox/%BASETOPIC%Discussion#DisCuss][Discuss this topic]] +[[http://skyloom.com/frame/frame.html?url1=%SCRIPTURLPATH{"view"}%/%BASEWEB%/%BASETOPIC%;url2=%SCRIPTURLPATH{"view"}%/Sandbox/%BASETOPIC%Discussion#DisCuss][Discuss this topic]] <!-- /actual --> Modified: twiki/branches/DEVELOP/lib/TWiki/Render.pm =================================================================== --- twiki/branches/DEVELOP/lib/TWiki/Render.pm 2005-12-31 16:30:10 UTC (rev 8053) +++ twiki/branches/DEVELOP/lib/TWiki/Render.pm 2005-12-31 18:01:56 UTC (rev 8054) @@ -59,9 +59,8 @@ # use like \b #SMELL: they really limit the number of places emphasis can happen. my $STARTWW = qr/^|(?<=[\s\(])/m; -my $ENDWW = qr/$|(?=[\s\,\.\;\:\!\?\)<])/m; +my $ENDWW = qr/$|(?=[\s,.;:!?)<])/m; - BEGIN { # Do a dynamic 'use locale' for this module if( $TWiki::cfg{UseLocale} ) { @@ -691,7 +690,7 @@ # filter out { entities (legacy) $link =~ s/\&\#[0-9]+\;//g; # Filter junk - $link =~ s/$TWiki::cfg{NameFilter}//g; + $link =~ s/$TWiki::cfg{NameFilter}+/ /g; # Capitalise first word $link =~ s/^(.)/\U$1/; # Collapse spaces and capitalise following letter @@ -1188,13 +1187,12 @@ # '#WikiName' anchors $text =~ s/^(\#)($TWiki::regex{wikiWordRegex})/CGI::a( { name=>$this->makeAnchorName( $2 )}, '')/geom; + $text =~ s/${STARTWW}==(\S+|\S[^\n]*\S)==$ENDWW/_fixedFontText($1,1)/gem; + $text =~ s/${STARTWW}__(\S+|\S[^\n]*\S)__$ENDWW/<strong><em>$1<\/em><\/strong>/gm; + $text =~ s/${STARTWW}\*(\S+|\S[^\n]*\S)\*$ENDWW/<strong>$1<\/strong>/gm; + $text =~ s/${STARTWW}_([^\s_]+|\S[^\n]*?[^\s_])_$ENDWW/<em>$1<\/em>/gm; + $text =~ s/${STARTWW}=([^\s=](\S*|[^\n]*?[^\s=]))=$ENDWW/_fixedFontText($1,0)/gem; - $text =~ s/${STARTWW}==([^\s]+?|[^\s].*?[^\s])==$ENDWW/_fixedFontText($1,1)/gem; - $text =~ s/${STARTWW}__([^\s]+?|[^\s].*?[^\s])__$ENDWW/<strong><em>$1<\/em><\/strong>/gm; - $text =~ s/${STARTWW}\*([^\s]+?|[^\s].*?[^\s])\*$ENDWW/<strong>$1<\/strong>/gm; - $text =~ s/${STARTWW}\_([^\s]+?|[^\s].*?[^\s])\_$ENDWW/<em>$1<\/em>/gm; - $text =~ s/${STARTWW}\=([^\s]+?|[^\s].*?[^\s])\=$ENDWW/_fixedFontText($1,0)/gem; - # Mailto # Email addresses must always be 7-bit, even within I18N sites |