r7173 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r7172‎ | r7173 | r7174 >
Date:09:06, 19 January 2005
Author:vibber
Status:old
Tags:
Comment:
Update for tomg's changes to external link formatting and TOC. Currently passing 133 out of 136 tests.
Modified paths:
  • /trunk/phase3/maintenance/parserTests.txt (modified) (history)

Diff [purge]

Index: trunk/phase3/maintenance/parserTests.txt
——@@ -276,7 +276,7 @@
277277 !! input
278278 ; http://example.com/ : definition
279279 !! result
280 -<dl><dt> <a href="http://example.com/" class='external'>http://example.com/</a>&nbsp;</dt><dd> definition
 280+<dl><dt> <a href="http://example.com/" class='external free'>http://example.com/</a>&nbsp;</dt><dd> definition
281281 </dd></dl>
282282
283283 !! end
——@@ -286,7 +286,7 @@
287287 !! input
288288 ;[http://www.google.com/ Google]:Number one search engine
289289 !! result
290 -<dl><dt><a href="http://www.google.com/" class='external' title="http://www.google.com/">Google</a><span class='urlexpansion'>&nbsp;(<i>http://www.google.com/</i>)</span></dt><dd>Number one search engine
 290+<dl><dt><a href="http://www.google.com/" class='external text' title="http://www.google.com/">Google</a></dt><dd>Number one search engine
291291 </dd></dl>
292292
293293 !! end
——@@ -307,7 +307,7 @@
308308 !! input
309309 ; news:alt.wikipedia.rox: This isn't even a real newsgroup!
310310 !! result
311 -<dl><dt> <a href="news:alt.wikipedia.rox" class='external'>news:alt.wikipedia.rox</a></dt><dd> This isn't even a real newsgroup!
 311+<dl><dt> <a href="news:alt.wikipedia.rox" class='external free'>news:alt.wikipedia.rox</a></dt><dd> This isn't even a real newsgroup!
312312 </dd></dl>
313313
314314 !! end
——@@ -317,7 +317,7 @@
318318 !! input
319319 ; news:alt.wikipedia.rox -- don't crash or enter an infinite loop
320320 !! result
321 -<dl><dt> <a href="news:alt.wikipedia.rox" class='external'>news:alt.wikipedia.rox</a> -- don't crash or enter an infinite loop
 321+<dl><dt> <a href="news:alt.wikipedia.rox" class='external free'>news:alt.wikipedia.rox</a> -- don't crash or enter an infinite loop
322322 </dt></dl>
323323
324324 !! end
——@@ -327,7 +327,7 @@
328328 !! input
329329 ; [http://www.wikipedia2.org/ Wikipedia : The Next Generation]: OK, I made that up
330330 !! result
331 -<dl><dt> <a href="http://www.wikipedia2.org/" class='external' title="http://www.wikipedia2.org/">Wikipedia&nbsp;: The Next Generation</a><span class='urlexpansion'>&nbsp;(<i>http://www.wikipedia2.org/</i>)</span></dt><dd> OK, I made that up
 331+<dl><dt> <a href="http://www.wikipedia2.org/" class='external text' title="http://www.wikipedia2.org/">Wikipedia&nbsp;: The Next Generation</a></dt><dd> OK, I made that up
332332 </dd></dl>
333333
334334 !! end
——@@ -341,7 +341,7 @@
342342 !! input
343343 Non-bracketed: http://example.com
344344 !! result
345 -<p>Non-bracketed: <a href="http://example.com" class='external'>http://example.com</a>
 345+<p>Non-bracketed: <a href="http://example.com" class='external free'>http://example.com</a>
346346 </p>
347347 !! end
348348
——@@ -350,7 +350,7 @@
351351 !! input
352352 Numbered: [http://example.com]
353353 !! result
354 -<p>Numbered: <a href="http://example.com" class='external' title="http://example.com">[1]</a><span class='urlexpansion'>&nbsp;(<i>http://example.com</i>)</span>
 354+<p>Numbered: <a href="http://example.com" class='external autonumber' title="http://example.com">[1]</a>
355355 </p>
356356 !!end
357357
——@@ -359,7 +359,7 @@
360360 !! input
361361 Specified text: [http://example.com link]
362362 !! result
363 -<p>Specified text: <a href="http://example.com" class='external' title="http://example.com">link</a><span class='urlexpansion'>&nbsp;(<i>http://example.com</i>)</span>
 363+<p>Specified text: <a href="http://example.com" class='external text' title="http://example.com">link</a>
364364 </p>
365365 !!end
366366
——@@ -368,7 +368,7 @@
369369 !! input
370370 Trail (not sure if this is meant to work): [http://example.com link]s
371371 !! result
372 -<p>Trail (not sure if this is meant to work): <a href="http://example.com" class='external' title="http://example.com">link</a>s<span class='urlexpansion'>&nbsp;(<i>http://example.com</i>)</span>
 372+<p>Trail (not sure if this is meant to work): <a href="http://example.com" class='external text' title="http://example.com">link</a>s
373373 </p>
374374 !! end
375375
——@@ -377,7 +377,7 @@
378378 !! input
379379 http://example.com/1$2345
380380 !! result
381 -<p><a href="http://example.com/1$2345" class='external'>http://example.com/1$2345</a>
 381+<p><a href="http://example.com/1$2345" class='external free'>http://example.com/1$2345</a>
382382 </p>
383383 !! end
384384
——@@ -386,7 +386,7 @@
387387 !! input
388388 [http://example.com/1$2345]
389389 !! result
390 -<p><a href="http://example.com/1$2345" class='external' title="http://example.com/1$2345">[1]</a><span class='urlexpansion'>&nbsp;(<i>http://example.com/1$2345</i>)</span>
 390+<p><a href="http://example.com/1$2345" class='external autonumber' title="http://example.com/1$2345">[1]</a>
391391 </p>
392392 !!end
393393
——@@ -413,7 +413,7 @@
414414 !! input
415415 Link to non-http image, no img tag: ftp://example.com/test.jpg
416416 !! result
417 -<p>Link to non-http image, no img tag: <a href="ftp://example.com/test.jpg" class='external'>ftp://example.com/test.jpg</a>
 417+<p>Link to non-http image, no img tag: <a href="ftp://example.com/test.jpg" class='external free'>ftp://example.com/test.jpg</a>
418418 </p>
419419 !! end
420420
——@@ -422,7 +422,7 @@
423423 !! input
424424 Terminating separator: http://example.com/thing,
425425 !! result
426 -<p>Terminating separator: <a href="http://example.com/thing" class='external'>http://example.com/thing</a>,
 426+<p>Terminating separator: <a href="http://example.com/thing" class='external free'>http://example.com/thing</a>,
427427 </p>
428428 !! end
429429
——@@ -431,7 +431,7 @@
432432 !! input
433433 Intervening separator: http://example.com/1,2,3
434434 !! result
435 -<p>Intervening separator: <a href="http://example.com/1,2,3" class='external'>http://example.com/1,2,3</a>
 435+<p>Intervening separator: <a href="http://example.com/1,2,3" class='external free'>http://example.com/1,2,3</a>
436436 </p>
437437 !! end
438438
——@@ -440,7 +440,7 @@
441441 !! input
442442 Old bug with URL in query: [http://example.com/thing?url=http://example.com link]
443443 !! result
444 -<p>Old bug with URL in query: <a href="http://example.com/thing?url=http://example.com" class='external' title="http://example.com/thing?url=http://example.com">link</a><span class='urlexpansion'>&nbsp;(<i>http://example.com/thing?url=http://example.com</i>)</span>
 444+<p>Old bug with URL in query: <a href="http://example.com/thing?url=http://example.com" class='external text' title="http://example.com/thing?url=http://example.com">link</a>
445445 </p>
446446 !! end
447447
——@@ -449,7 +449,7 @@
450450 !! input
451451 And again with mixed protocols: [ftp://example.com?url=http://example.com link]
452452 !! result
453 -<p>And again with mixed protocols: <a href="ftp://example.com?url=http://example.com" class='external' title="ftp://example.com?url=http://example.com">link</a><span class='urlexpansion'>&nbsp;(<i>ftp://example.com?url=http://example.com</i>)</span>
 453+<p>And again with mixed protocols: <a href="ftp://example.com?url=http://example.com" class='external text' title="ftp://example.com?url=http://example.com">link</a>
454454 </p>
455455 !!end
456456
——@@ -458,7 +458,7 @@
459459 !! input
460460 URL in text: [http://example.com http://example.com]
461461 !! result
462 -<p>URL in text: <a href="http://example.com" class='external'>http://example.com</a>
 462+<p>URL in text: <a href="http://example.com" class='external free'>http://example.com</a>
463463 </p>
464464 !! end
465465
——@@ -467,7 +467,7 @@
468468 !! input
469469 ja-style clickable images: [http://example.com http://meta.wikimedia.org/upload/f/f1/Ncwikicol.png]
470470 !! result
471 -<p>ja-style clickable images: <a href="http://example.com" class='external' title="http://example.com"><img src="http://meta.wikimedia.org/upload/f/f1/Ncwikicol.png" alt="Ncwikicol.png" /></a><span class='urlexpansion'>&nbsp;(<i>http://example.com</i>)</span>
 471+<p>ja-style clickable images: <a href="http://example.com" class='external text' title="http://example.com"><img src="http://meta.wikimedia.org/upload/f/f1/Ncwikicol.png" alt="Ncwikicol.png" /></a>
472472 </p>
473473 !!end
474474
——@@ -476,7 +476,7 @@
477477 !! input
478478 Old &amp; use: http://x&y
479479 !! result
480 -<p>Old &amp; use: <a href="http://x&amp;y" class='external'>http://x&amp;y</a>
 480+<p>Old &amp; use: <a href="http://x&amp;y" class='external free'>http://x&amp;y</a>
481481 </p>
482482 !! end
483483
——@@ -485,7 +485,7 @@
486486 !! input
487487 http://www.jpeg.org
488488 !!result
489 -<p><a href="http://www.jpeg.org" class='external'>http://www.jpeg.org</a>
 489+<p><a href="http://www.jpeg.org" class='external free'>http://www.jpeg.org</a>
490490 </p>
491491 !! end
492492
——@@ -494,7 +494,7 @@
495495 !! input
496496 [http://www.unausa.org/newindex.asp?place=http://www.unausa.org/programs/mun.asp]
497497 !! result
498 -<p><a href="http://www.unausa.org/newindex.asp?place=http://www.unausa.org/programs/mun.asp" class='external' title="http://www.unausa.org/newindex.asp?place=http://www.unausa.org/programs/mun.asp">[1]</a><span class='urlexpansion'>&nbsp;(<i>http://www.unausa.org/newindex.asp?place=http://www.unausa.org/programs/mun.asp</i>)</span>
 498+<p><a href="http://www.unausa.org/newindex.asp?place=http://www.unausa.org/programs/mun.asp" class='external autonumber' title="http://www.unausa.org/newindex.asp?place=http://www.unausa.org/programs/mun.asp">[1]</a>
499499 </p>
500500 !! end
501501
——@@ -503,7 +503,7 @@
504504 !! input
505505 [http://www.example.com/foo http://www.example.com/bar]
506506 !! result
507 -<p><a href="http://www.example.com/foo" class='external' title="http://www.example.com/foo">http://www.example.com/bar</a><span class='urlexpansion'>&nbsp;(<i>http://www.example.com/foo</i>)</span>
 507+<p><a href="http://www.example.com/foo" class='external text' title="http://www.example.com/foo">http://www.example.com/bar</a>
508508 </p>
509509 !! end
510510
——@@ -512,7 +512,7 @@
513513 !! input
514514 http://www.example.com/<hello>
515515 !! result
516 -<p><a href="http://www.example.com/" class='external'>http://www.example.com/</a>&lt;hello&gt;
 516+<p><a href="http://www.example.com/" class='external free'>http://www.example.com/</a>&lt;hello&gt;
517517 </p>
518518 !!end
519519
——@@ -521,7 +521,7 @@
522522 !! input
523523 http://www.example.com/<b>html</b>
524524 !! result
525 -<p><a href="http://www.example.com/" class='external'>http://www.example.com/</a><b >html</b >
 525+<p><a href="http://www.example.com/" class='external free'>http://www.example.com/</a><b >html</b >
526526 </p>
527527 !!end
528528
——@@ -530,7 +530,7 @@
531531 !! input
532532 [http://www.example.com/<hello> stuff]
533533 !! result
534 -<p><a href="http://www.example.com/" class='external' title="http://www.example.com/">&lt;hello&gt; stuff</a><span class='urlexpansion'>&nbsp;(<i>http://www.example.com/</i>)</span>
 534+<p><a href="http://www.example.com/" class='external text' title="http://www.example.com/">&lt;hello&gt; stuff</a>
535535 </p>
536536 !!end
537537
——@@ -539,7 +539,7 @@
540540 !! input
541541 [http://www.example.com/<b>html</b> stuff]
542542 !! result
543 -<p><a href="http://www.example.com/" class='external' title="http://www.example.com/"><b >html</b > stuff</a><span class='urlexpansion'>&nbsp;(<i>http://www.example.com/</i>)</span>
 543+<p><a href="http://www.example.com/" class='external text' title="http://www.example.com/"><b >html</b > stuff</a>
544544 </p>
545545 !!end
546546
——@@ -548,7 +548,7 @@
549549 !! input
550550 http://www.example.com/"hello"
551551 !! result
552 -<p><a href="http://www.example.com/" class='external'>http://www.example.com/</a>"hello"
 552+<p><a href="http://www.example.com/" class='external free'>http://www.example.com/</a>"hello"
553553 </p>
554554 !!end
555555
——@@ -557,7 +557,7 @@
558558 !! input
559559 [http://www.example.com/"hello" stuff]
560560 !! result
561 -<p><a href="http://www.example.com/" class='external' title="http://www.example.com/">"hello" stuff</a><span class='urlexpansion'>&nbsp;(<i>http://www.example.com/</i>)</span>
 561+<p><a href="http://www.example.com/" class='external text' title="http://www.example.com/">"hello" stuff</a>
562562 </p>
563563 !!end
564564
——@@ -566,7 +566,7 @@
567567 !! input
568568 [http://www.example.com test]
569569 !! result
570 -<p>[<a href="http://www.example.com" class='external'>http://www.example.com</a> test]
 570+<p>[<a href="http://www.example.com" class='external free'>http://www.example.com</a> test]
571571 </p>
572572 !! end
573573
——@@ -887,7 +887,7 @@
888888 !! input
889889 [[http://www.example.org]]
890890 !! result
891 -<p>[<a href="http://www.example.org" class='external' title="http://www.example.org">[1]</a><span class='urlexpansion'>&nbsp;(<i>http://www.example.org</i>)</span>]
 891+<p>[<a href="http://www.example.org" class='external autonumber' title="http://www.example.org">[1]</a>]
892892 </p>
893893 !! end
894894
——@@ -907,7 +907,7 @@
908908 !! input
909909 Piped link to URL: [[http://www.example.org|an example URL]]
910910 !! result
911 -<p>Piped link to URL: [<a href="http://www.example.org|an" class='external' title="http://www.example.org|an">example URL</a><span class='urlexpansion'>&nbsp;(<i>http://www.example.org|an</i>)</span>]
 911+<p>Piped link to URL: [<a href="http://www.example.org|an" class='external text' title="http://www.example.org|an">example URL</a>]
912912 </p>
913913 !! end
914914
——@@ -1488,7 +1488,7 @@
14891489 !! input
14901490 [[Image:foobar.jpg|thumb|http://example.com]]
14911491 !! result
1492 -<div class="thumb tright"><div style="width:182px;"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title="http://example.com"><img src="/images/3/3a/Foobar.jpg" alt="http://example.com" width="180" height="180" longdesc="/wiki/Image:Foobar.jpg" /></a> <div class="thumbcaption" ><div class="magnify" style="float:right"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="Enlarge" /></a></div><a href="http://example.com" class='external'>http://example.com</a></div></div></div>
 1492+<div class="thumb tright"><div style="width:182px;"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title="http://example.com"><img src="/images/3/3a/Foobar.jpg" alt="http://example.com" width="180" height="180" longdesc="/wiki/Image:Foobar.jpg" /></a> <div class="thumbcaption" ><div class="magnify" style="float:right"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="Enlarge" /></a></div><a href="http://example.com" class='external free'>http://example.com</a></div></div></div>
14931493
14941494 !! end
14951495
——@@ -1673,29 +1673,30 @@
16741674 Some text
16751675 ===Another headline===
16761676 !! result
1677 -<table border="0" id="toc"><tr id="toctitle"><td align="center">
1678 -<b>Table of contents</b> <script type="text/javascript">showTocToggle("show","hide")</script></td></tr><tr id="tocinside"><td>
1679 -<div class="tocline"><a href="#Headline_1">1 Headline 1</a><br /></div>
1680 -<div class="tocindent">
1681 -<p><a href="#Subheadline_1">1.1 Subheadline 1</a><br />
1682 -</p>
1683 -<div class="tocindent">
1684 -<div class="tocindent">
1685 -<p><a href="#Skipping_a_level">1.1.1 Skipping a level</a><br />
1686 -</p>
1687 -<div class="tocindent">
1688 -<p><a href="#Skipping_a_level_2">1.1.1.1 Skipping a level</a><br />
1689 -</p>
 1677+<div id='toc'>
 1678+<div id='toctitle'><h2>Table of contents</h2></div>
 1679+<ul>
 1680+<li class='toclevel-1'><a href="#Headline_1"><span class="tocnumber">1</span> <span class="toctext">Headline 1</span></a>
 1681+<ul>
 1682+<li class='toclevel-2'><a href="#Subheadline_1"><span class="tocnumber">1.1</span> <span class="toctext">Subheadline 1</span></a>
 1683+<ul>
 1684+<li class='toclevel-3'><a href="#Skipping_a_level"><span class="tocnumber">1.1.1</span> <span class="toctext">Skipping a level</span></a>
 1685+<ul>
 1686+<li class='toclevel-4'><a href="#Skipping_a_level_2"><span class="tocnumber">1.1.1.1</span> <span class="toctext">Skipping a level</span></a></li>
 1687+</ul>
 1688+</li>
 1689+</ul>
 1690+</li>
 1691+</ul>
 1692+</li>
 1693+<li class='toclevel-1'><a href="#Headline_2"><span class="tocnumber">2</span> <span class="toctext">Headline 2</span></a>
 1694+<ul>
 1695+<li class='toclevel-2'><a href="#Another_headline"><span class="tocnumber">2.1</span> <span class="toctext">Another headline</span></a></li>
 1696+</ul>
 1697+</li>
 1698+</ul>
16901699 </div>
1691 -</div>
1692 -</div>
1693 -</div>
1694 -<div class="tocline"><a href="#Headline_2">2 Headline 2</a><br /></div>
1695 -<div class="tocindent">
1696 -<p><a href="#Another_headline">2.1 Another headline</a><br />
1697 -</p>
1698 -</div>
1699 -</td></tr></table>
 1700+<script type="text/javascript"> if (window.showTocToggle) { var tocShowText = "show"; var tocHideText = "hide"; showTocToggle(); } </script><div class='visualClear'></div>
17001701 <div class="editsection" style="float:right;margin-left:5px;">[<a href="https://www.mediawiki.org/index.php?title=Parser_test_script&amp;action=edit&amp;section=1" title="Parser test script">edit</a>]</div><a name="Headline_1"></a><h2> Headline 1 </h2>
17011702 <div class="editsection" style="float:right;margin-left:5px;">[<a href="https://www.mediawiki.org/index.php?title=Parser_test_script&amp;action=edit&amp;section=2" title="Parser test script">edit</a>]</div><a name="Subheadline_1"></a><h3> Subheadline 1 </h3>
17021703 <div class="editsection" style="float:right;margin-left:5px;">[<a href="https://www.mediawiki.org/index.php?title=Parser_test_script&amp;action=edit&amp;section=3" title="Parser test script">edit</a>]</div><a name="Skipping_a_level"></a><h5> Skipping a level </h5>
——@@ -1773,7 +1774,7 @@
17741775 !! input
17751776 http://example.com [[Image:foobar.jpg]]
17761777 !! result
1777 -<p><a href="http://example.com" class='external'>http://example.com</a> <a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="Image:foobar.jpg"><img src="/images/3/3a/Foobar.jpg" alt="Image:foobar.jpg" longdesc="/wiki/Image:Foobar.jpg" /></a>
 1778+<p><a href="http://example.com" class='external free'>http://example.com</a> <a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="Image:foobar.jpg"><img src="/images/3/3a/Foobar.jpg" alt="Image:foobar.jpg" longdesc="/wiki/Image:Foobar.jpg" /></a>
17781779 </p>
17791780 !!end
17801781
——@@ -1782,7 +1783,7 @@
17831784 !! input
17841785 http://example.com[[Image:foobar.jpg]]
17851786 !! result
1786 -<p><a href="http://example.com" class='external'>http://example.com</a><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="Image:foobar.jpg"><img src="/images/3/3a/Foobar.jpg" alt="Image:foobar.jpg" longdesc="/wiki/Image:Foobar.jpg" /></a>
 1787+<p><a href="http://example.com" class='external free'>http://example.com</a><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="Image:foobar.jpg"><img src="/images/3/3a/Foobar.jpg" alt="Image:foobar.jpg" longdesc="/wiki/Image:Foobar.jpg" /></a>
17871788 </p>
17881789 !!end
17891790
——@@ -1791,7 +1792,7 @@
17921793 !! input
17931794 http://en.wikinews.org/wiki/Wikinews:Workplace
17941795 !! result
1795 -<p><a href="http://en.wikinews.org/wiki/Wikinews:Workplace" class='external'>http://en.wikinews.org/wiki/Wikinews:Workplace</a>
 1796+<p><a href="http://en.wikinews.org/wiki/Wikinews:Workplace" class='external free'>http://en.wikinews.org/wiki/Wikinews:Workplace</a>
17961797 </p>
17971798 !!end
17981799

Status & tagging log