| Index: trunk/phase3/tests/parser/parserTests.txt |
| — | — | @@ -1404,7 +1404,69 @@ |
| 1405 | 1405 | </table> |
| 1406 | 1406 | |
| 1407 | 1407 | !! end |
| | 1408 | + |
| 1408 | 1409 | !! test |
| | 1410 | +Table with list inside |
| | 1411 | +!! input |
| | 1412 | +{| |
| | 1413 | +|style="width: 5em; text-align: center"| gives |
| | 1414 | +|style="border: 1px dashed #2F6FAB; padding: 0.5em; margin: 0.5em"| |
| | 1415 | +# Some |
| | 1416 | +# list |
| | 1417 | +# Lorem |
| | 1418 | +# ipsum |
| | 1419 | +# dolor |
| | 1420 | +|} |
| | 1421 | +!! result |
| | 1422 | +<table> |
| | 1423 | +<tr> |
| | 1424 | +<td style="width: 5em; text-align: center">gives |
| | 1425 | +</td> |
| | 1426 | +<td style="border: 1px dashed #2F6FAB; padding: 0.5em; margin: 0.5em"> |
| | 1427 | +<ol><li> Some |
| | 1428 | +</li><li> list |
| | 1429 | +</li><li> Lorem |
| | 1430 | +</li><li> ipsum |
| | 1431 | +</li><li> dolor |
| | 1432 | +</li></ol> |
| | 1433 | +</td> |
| | 1434 | +</tr> |
| | 1435 | +</table> |
| | 1436 | + |
| | 1437 | +!! end |
| | 1438 | +!! test |
| | 1439 | +Simple paragraph |
| | 1440 | +!! input |
| | 1441 | +This is a simple paragraph. |
| | 1442 | +!! result |
| | 1443 | +<p>This is a simple paragraph. |
| | 1444 | +</p> |
| | 1445 | +!! end |
| | 1446 | + |
| | 1447 | +!! test |
| | 1448 | +Table with multiline contents |
| | 1449 | +!! input |
| | 1450 | +{| |
| | 1451 | +| Alice |
| | 1452 | +Bob |
| | 1453 | +dfdfg |
| | 1454 | +dfg |
| | 1455 | +|} |
| | 1456 | +!! result |
| | 1457 | +<table> |
| | 1458 | +<tr> |
| | 1459 | +<td>Alice |
| | 1460 | +<p>Bob |
| | 1461 | +dfdfg |
| | 1462 | +dfg |
| | 1463 | +</p> |
| | 1464 | +</td> |
| | 1465 | +</tr> |
| | 1466 | +</table> |
| | 1467 | + |
| | 1468 | +!! end |
| | 1469 | + |
| | 1470 | +!! test |
| 1409 | 1471 | Multiplication table |
| 1410 | 1472 | !! input |
| 1411 | 1473 | {| border="1" cellpadding="2" |
| — | — | @@ -5902,9 +5964,9 @@ |
| 5903 | 5965 | | |
| 5904 | 5966 | !! result |
| 5905 | 5967 | <p>{{{| |
| 5906 | | -</p><p><u class="|">}}}} > |
| 5907 | | -</p><p><br style="onmouseover='alert(document.cookie);'" /> |
| 5908 | | -</p><p>MOVE YOUR MOUSE CURSOR OVER THIS TEXT |
| | 5968 | +<u class="|">}}}} > |
| | 5969 | +<br style="onmouseover='alert(document.cookie);'" /> |
| | 5970 | +MOVE YOUR MOUSE CURSOR OVER THIS TEXT |
| 5909 | 5971 | </p> |
| 5910 | 5972 | <table> |
| 5911 | 5973 | <tr> |
| Index: trunk/phase3/includes/parser/Parser.php |
| — | — | @@ -966,7 +966,7 @@ |
| 967 | 967 | $output =& $currentElement['content']; |
| 968 | 968 | |
| 969 | 969 | } else { |
| 970 | | - $output .= "\n$outLine\n"; |
| | 970 | + $output .= "\n$outLine"; |
| 971 | 971 | } |
| 972 | 972 | } |
| 973 | 973 | |