}
/**
+ * Processes bolds and italics on a single line.
* Helper function for doAllQuotes()
*/
public function doQuotes( $text ) {
$arr[$i-1] .= "'";
$arr[$i] = "'''";
}
- # If there are more than 5 apostrophes in a row, assume they're all
- # text except for the last 5.
- else if ( strlen( $arr[$i] ) > 5 )
+ # If there are more than 6 apostrophes in a row, assume they're all
+ # text except for the last 6.
+ else if ( strlen( $arr[$i] ) > 6 )
{
- $arr[$i-1] .= str_repeat( "'", strlen( $arr[$i] ) - 5 );
- $arr[$i] = "'''''";
+ $arr[$i-1] .= str_repeat( "'", strlen( $arr[$i] ) - 6 );
+ $arr[$i] = "''''''";
}
# Count the number of occurrences of bold and italics mark-ups.
# We are not counting sequences of five apostrophes.
if ( strlen( $arr[$i] ) == 2 ) { $numitalics++; }
else if ( strlen( $arr[$i] ) == 3 ) { $numbold++; }
else if ( strlen( $arr[$i] ) == 5 ) { $numitalics++; $numbold++; }
+ else if ( strlen( $arr[$i] ) == 6 ) { $numbold+=2; }
}
$i++;
}
if ( ( $numbold % 2 == 1 ) && ( $numitalics % 2 == 1 ) )
{
$i = 0;
+
+ #These are indexes to the /next/ array entry than the
+ #one holding the text matching the condition.
$firstsingleletterword = -1;
$firstmultiletterword = -1;
$firstspace = -1;
+
foreach ( $arr as $r )
{
+ #Filter the "'''". Separators are on odd positions.
+ #$arr[0] will be an empty string if needed.
if ( ( $i % 2 == 1 ) and ( strlen( $r ) == 3 ) )
{
$x1 = substr ($arr[$i-1], -1);
if ($firstspace == -1) $firstspace = $i;
} else if ($x2 === ' ') {
if ($firstsingleletterword == -1) $firstsingleletterword = $i;
- } else {
+ } else if ($arr[$i-1] != "") {
if ($firstmultiletterword == -1) $firstmultiletterword = $i;
}
}
}
# Now let's actually convert our apostrophic mush to HTML!
- $output = '';
- $buffer = '';
- $state = '';
+ $output = ''; #Processed text
+ $buffer = ''; #Content if $state is 'both'
+ $state = ''; #Flags with the order of open tags: '|b|i|bi|ib|both'
$i = 0;
foreach ($arr as $r)
{
else # ($state == '')
{ $buffer = ''; $state = 'both'; }
}
+ else if (strlen ($r) == 6)
+ {
+ if ($state === 'b')
+ { $output .= '</b><b>'; $state = 'b'; }
+ else if ($state === 'i')
+ { $output .= '\'</i><b>'; $state = 'b'; }
+ else if ($state === 'bi')
+ { $output .= '\'</i></b>'; $state = ''; }
+ else if ($state === 'ib')
+ { $output .= '\'</b></i>'; $state = ''; }
+ else if ($state === 'both')
+ { $output .= '<i><b>'.$buffer.'</b><b>'; $state = 'ib'; }
+ else # ($state == '')
+ { $buffer = ''; $state = ''; }
+ }
}
$i++;
}
*[[Wikipedia:ro:Olteniţa]]
*[[Wikipedia:ro:Olteniţa]]
!! result
-<ul><li><a href="http://en.wikipedia.org/wiki/ro:Olteni%C5%A3a" class="extiw" title="wikipedia:ro:Olteniţa">Wikipedia:ro:Olteniţa</a>
-</li><li><a href="http://en.wikipedia.org/wiki/ro:Olteni%C5%A3a" class="extiw" title="wikipedia:ro:Olteniţa">Wikipedia:ro:Olteniţa</a>
+<ul><li><a href="http://en.wikipedia.org/wiki/ro:Olteni%C5%A3a" class="extiw" title="wikipedia:ro:Oltenita">Wikipedia:ro:Olteniţa</a>
+</li><li><a href="http://en.wikipedia.org/wiki/ro:Olteni%C5%A3a" class="extiw" title="wikipedia:ro:Oltenita">Wikipedia:ro:Olteniţa</a>
</li></ul>
!! end
!! input
[[Image:foobar.jpg|♀]]
!! result
-<p><a href="/wiki/File:Foobar.jpg" class="image" title="♀"><img alt="♀" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" /></a>
+<p><a href="/wiki/File:Foobar.jpg" class="image" title="?"><img alt="?" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" /></a>
</p>
!! end
[[fr:Nourriture]]
[[zh:食品]]
!! result
-es:Alimento fr:Nourriture zh:食品
+es:Alimento fr:Nourriture zh:??
!! end
###
</p>
!! end
-# Original result was this:
-# <p><b>bold</b><b>bold<i>bolditalics</i></b>
+# This was the original html, but it has also been
+# <p>'<i>bold'</i><b>bold<i>bolditalics</i></b>
# </p>
-# While that might be marginally more intuitive, maybe, the six-apostrophe
-# construct is clearly pathological and the result stated here (which is what
-# the parser actually does) is about as reasonable as anything.
+# See bug 18765.
!!test
Mixing markup for italics and bold
!! options
!! input
'''bold''''''bold''bolditalics'''''
!! result
-<p>'<i>bold'</i><b>bold<i>bolditalics</i></b>
+<p><b>bold</b><b>bold<i>bolditalics</i></b>
</p>
!! end
!! options
title=[[Dunav]] language=sr
!! input
-Both [[Dunav]] and [[Дунав]] are names for this river.
+Both [[Dunav]] and [[?????]] are names for this river.
!! result
-<p>Both <strong class="selflink">Dunav</strong> and <strong class="selflink">Дунав</strong> are names for this river.
+<p>Both <strong class="selflink">Dunav</strong> and <strong class="selflink">?????</strong> are names for this river.
</p>
!!end
!! options
language=sr
!! input
-Main Page can be written as [[Маин Паге]]
+Main Page can be written as [[???? ????]]
!! result
-<p>Main Page can be written as <a href="/wiki/Main_Page" title="Main Page">Маин Паге</a>
+<p>Main Page can be written as <a href="/wiki/Main_Page" title="Main Page">???? ????</a>
</p>
!!end
!! options
language=sr
!! input
-[[Main Page]] can be written as [[Маин Паге]] same as [[Маин Паге]].
+[[Main Page]] can be written as [[???? ????]] same as [[???? ????]].
!! result
-<p><a href="/wiki/Main_Page" title="Main Page">Main Page</a> can be written as <a href="/wiki/Main_Page" title="Main Page">Маин Паге</a> same as <a href="/wiki/Main_Page" title="Main Page">Маин Паге</a>.
+<p><a href="/wiki/Main_Page" title="Main Page">Main Page</a> can be written as <a href="/wiki/Main_Page" title="Main Page">???? ????</a> same as <a href="/wiki/Main_Page" title="Main Page">???? ????</a>.
</p>
!!end
!! options
language=sr
!! input
-{{тест}}
+{{????}}
!! result
<p>This is a test template
</p>
!! options
language=sr
!! input
-{{Template:тест}}
+{{Template:????}}
!! result
<p>This is a test template
</p>
!! options
language=sr
!! input
-{{парамтест|param=foo}}
+{{?????????|param=foo}}
!! result
<p>This is a test template with parameter foo
</p>
!! options
language=sr cat
!! input
-[[Category:МедиаWики Усер'с Гуиде]]
+[[Category:?????W??? ????'? ?????]]
!! result
-<a href="/wiki/%D0%9A%D0%B0%D1%82%D0%B5%D0%B3%D0%BE%D1%80%D0%B8%D1%98%D0%B0:MediaWiki_User%27s_Guide" title="Категорија:MediaWiki User's Guide">MediaWiki User's Guide</a>
+<a href="/wiki/%D0%9A%D0%B0%D1%82%D0%B5%D0%B3%D0%BE%D1%80%D0%B8%D1%98%D0%B0:MediaWiki_User%27s_Guide" title="??????????:MediaWiki User's Guide">MediaWiki User's Guide</a>
!! end
!! input
Latinski: -{Ne nuntium necare}-
!! result
-<p>Латински: Ne nuntium necare
+<p>????????: Ne nuntium necare
</p>
!! end
!! input
Latinski: -{Ne nuntium necare}-
!! result
-<p>Латински: Ne nuntium necare
+<p>????????: Ne nuntium necare
</p>
!! end
!! input
== -{Naslov}- ==
!! result
-<h2><span class="editsection">[<a href="/index.php?title=Parser_test&action=edit&section=1" title="Уреди део: Naslov">уреди</a>]</span> <span class="mw-headline" id="-.7BNaslov.7D-"> Naslov </span></h2>
+<h2><span class="editsection">[<a href="/index.php?title=Parser_test&action=edit&section=1" title="????? ???: Naslov">?????</a>]</span> <span class="mw-headline" id="-.7BNaslov.7D-"> Naslov </span></h2>
!! end
!! input
Fridrih IV je car.
!! result
-<p>Фридрих IV је цар.
+<p>??????? IV ?? ???.
</p>
!! end
language=cs
title=[[Main Page]]
!! input
-{{PRVNÍVELKÉ:ěščř}}
-{{prvnívelké:ěščř}}
-{{PRVNÍMALÉ:ěščř}}
-{{prvnímalé:ěščř}}
-{{MALÁ:ěščř}}
-{{malá:ěščř}}
-{{VELKÁ:ěščř}}
-{{velká:ěščř}}
+{{PRVNÍVELKÉ:ešcr}}
+{{prvnívelké:ešcr}}
+{{PRVNÍMALÉ:ešcr}}
+{{prvnímalé:ešcr}}
+{{MALÁ:ešcr}}
+{{malá:ešcr}}
+{{VELKÁ:ešcr}}
+{{velká:ešcr}}
!! result
-<p>Ěščř
-Ěščř
-ěščř
-ěščř
-ěščř
-ěščř
-ĚŠČŘ
-ĚŠČŘ
+<p>Ešcr
+Ešcr
+ešcr
+ešcr
+ešcr
+ešcr
+EŠCR
+EŠCR
</p>
!! end
!! input
[http://en.wikipedia.org/]
!! result
-<p><a href="http://en.wikipedia.org/" class="external autonumber" rel="nofollow">[۱]</a>
+<p><a href="http://en.wikipedia.org/" class="external autonumber" rel="nofollow">[?]</a>
</p>
!! end
!! input
/* External links */ removed bogus entries
!! result
-<span class="autocomment"><a href="/wiki/Main_Page#External_links" title="Main Page">→</a>External links: </span> removed bogus entries
+<span class="autocomment"><a href="/wiki/Main_Page#External_links" title="Main Page">?</a>External links: </span> removed bogus entries
!!end
!! test
!! input
/* External links */ removed bogus entries
!! result
-<span class="autocomment"><a href="#External_links">→</a>External links: </span> removed bogus entries
+<span class="autocomment"><a href="#External_links">?</a>External links: </span> removed bogus entries
!!end
!! test
<a href="/wiki/Main_Page#section" title="Main Page">#section</a>
!! end
+!! test
+Bold/italic markup handled differently depending on leading whitespace (bug 18765)
+!!input
+'''Look at ''this edit'''s complicated bold/italic markup!'''
+
+<!-- Comment -->'''Look at ''this edit'''s complicated bold/italic markup!'''
+
+<span> '''Look at ''this edit'''s complicated bold/italic markup!'''</span>
+
+<nowiki></nowiki> '''Look at ''this edit'''s complicated bold/italic markup!'''
+
+<!-- Hello world---> '''Look at ''this edit'''s complicated bold/italic markup!'''
+
+{|
+| '''Look at ''this edit'''s complicated bold/italic markup!'''
+|}
+
+'''This was Italic'' this was plain''' and this was bold'''
+but '''This is bold'' this is bold italic''' and this is bold'''
+
+<!-- Wishlist: Breaking because <span> and | are treated as text
+<span>'''Look at ''this edit'''s complicated bold/italic markup!'''</span>
+{|
+|'''Look at ''this edit'''s complicated bold/italic markup!'''
+|}
+-->
+!! result
+<p><b>Look at <i>this edit'</i>s complicated bold/italic markup!</b>
+</p><p><b>Look at <i>this edit'</i>s complicated bold/italic markup!</b>
+</p><p><span> <b>Look at <i>this edit'</i>s complicated bold/italic markup!</b></span>
+</p><p> <b>Look at <i>this edit'</i>s complicated bold/italic markup!</b>
+</p>
+<pre><b>Look at <i>this edit'</i>s complicated bold/italic markup!</b>
+</pre>
+<table>
+<tr>
+<td> <b>Look at <i>this edit'</i>s complicated bold/italic markup!</b>
+</td></tr></table>
+<p><b>This was Italic<i> this was plain'</i> and this was bold</b>
+but <b>This is bold<i> this is bold italic'</i> and this is bold</b>
+</p><p><br />
+</p>
+!! end
+
+!! test
+Six quotes
+!!input
+''Italic''''''Bold
+
+'''Bold''BoldItalic''''''Normal
+
+''Italic'''BoldItalic''''''Normal'''''
+
+'''''BoldItalic''''''MoreBoldItalic''
+
+''''''Normal
+!!result
+<p><i>Italic'</i><b>Bold</b>
+</p><p><b>Bold<i>BoldItalic'</i></b>Normal
+</p><p><i>Italic<b>BoldItalic'</b></i>Normal
+</p><p><i><b>BoldItalic</b><b>MoreBoldItalic</b></i>
+</p><p>Normal
+</p>
+!!end
+
+
+!! test
+Too many quotes
+!!input
+I '''like'''''quotes'''''''''''
+!! result
+<p>I <b>like</b><i>quotes''''''</i><b> </b>
+</p>
+!! end
+
+
+
+
TODO:
more images
more tables
math
-character entities
-and much more
-Try for 100% code coverage
+char
\ No newline at end of file
dépôts / lhc / web / wiklou.git / commitdiff