Index: branches/platonides/phase3/maintenance/parserTests.txt |
— | — | @@ -7611,15 +7611,21 @@ |
7612 | 7612 | |
7613 | 7613 | ''Italic'''BoldItalic''''''Normal''''' |
7614 | 7614 | |
| 7615 | +''Italic'''BoldItalic''''''Normal |
| 7616 | + |
7615 | 7617 | '''''BoldItalic''''''MoreBoldItalic'' |
7616 | 7618 | |
7617 | 7619 | ''''''Normal |
| 7620 | + |
| 7621 | +'''''Frabnaggilywort''''''s pegged revision. |
7618 | 7622 | !!result |
7619 | 7623 | <p><i>Italic'</i><b>Bold</b> |
7620 | | -</p><p><b>Bold<i>BoldItalic'</i></b>Normal |
| 7624 | +</p><p><b>Bold<i>BoldItalic'</i></b>Normal |
7621 | 7625 | </p><p><i>Italic<b>BoldItalic'</b></i>Normal |
| 7626 | +</p><p><i>Italic<b>BoldItalic'</b></i>Normal |
7622 | 7627 | </p><p><i><b>BoldItalic</b><b>MoreBoldItalic</b></i> |
7623 | 7628 | </p><p>Normal |
| 7629 | +</p><p><i><b>Frabnaggilywort'</b></i>s pegged revision. |
7624 | 7630 | </p> |
7625 | 7631 | !!end |
7626 | 7632 | |
Index: branches/platonides/phase3/includes/parser/Parser.php |
— | — | @@ -1126,7 +1126,9 @@ |
1127 | 1127 | if ( ( $numbold % 2 == 1 ) && ( $numitalics % 2 == 1 ) ) |
1128 | 1128 | { |
1129 | 1129 | |
1130 | | - # This algorithm moves the literal quote at the |
| 1130 | + # This algorithm takes as literal ' the first from six |
| 1131 | + # quotes, since <b></b>/</b><b> wouldn't be too useful, |
| 1132 | + # else it moves the literal quote at the |
1131 | 1133 | # right of a single word, at the right of a |
1132 | 1134 | # multiletter word or at the right of a space. |
1133 | 1135 | # Otherwise, it does nothing. |
— | — | @@ -1138,6 +1140,7 @@ |
1139 | 1141 | # texty quotes to ' which shouldn't matter. |
1140 | 1142 | |
1141 | 1143 | $quoteBalancerReplacements = array( |
| 1144 | + "/''''''(?!')/"=>"''''''", |
1142 | 1145 | "/(?<= [^ ])'''(?!')/"=>"'''", |
1143 | 1146 | "/(?<=[^ '])'''(?!')/"=>"'''", |
1144 | 1147 | "/(^|(?<=[^'])) '''(?!')/"=>" '''"); |