| Index: trunk/extensions/VisualEditor/modules/parser/pegParser.pegjs.txt |
| — | — | @@ -647,10 +647,11 @@ |
| 648 | 648 | // = "[" target:url text:extlink_text "]" { return { type: 'extlink', target: target, text: text } } |
| 649 | 649 | |
| 650 | 650 | url |
| 651 | | - = proto:"http:" rest:([^ \]]+) { return proto + rest.join(''); } |
| | 651 | + = proto:"http:" rest:([^ \]\n]+) { return proto + rest.join(''); } |
| 652 | 652 | |
| | 653 | +// XXX: convert to syntax flags and generic inline! |
| 653 | 654 | extlink_text |
| 654 | | - = c:(inline_element / ch:[^\]] { return {type: 'TEXT', value: ch}; })+ |
| | 655 | + = c:(inline_element / ch:[^\]\n] { return {type: 'TEXT', value: ch}; })+ |
| 655 | 656 | |
| 656 | 657 | template |
| 657 | 658 | = "{{" target:template_target params:("|" p:template_param { return p })* "}}" { |
| — | — | @@ -665,7 +666,7 @@ |
| 666 | 667 | } |
| 667 | 668 | |
| 668 | 669 | template_target |
| 669 | | - = h:( !"}}" x:([^|]) { return x } )* { return h.join(''); } |
| | 670 | + = h:( !"}}" x:([^|\n]) { return x } )* { return h.join(''); } |
| 670 | 671 | |
| 671 | 672 | template_param |
| 672 | 673 | = name:template_param_name "=" c:template_param_text { |
| — | — | @@ -688,7 +689,7 @@ |
| 689 | 690 | } |
| 690 | 691 | |
| 691 | 692 | template_param_name |
| 692 | | - = h:( !"}}" x:([^=|]) { return x } )* { return h.join(''); } |
| | 693 | + = h:( !"}}" x:([^=|\n]) { return x } )* { return h.join(''); } |
| 693 | 694 | |
| 694 | 695 | template_param_text |
| 695 | 696 | = template_param_text_chunk* |
| — | — | @@ -701,7 +702,7 @@ |
| 702 | 703 | / template |
| 703 | 704 | / link |
| 704 | 705 | / quote |
| 705 | | - / !"}}" x:([^|]) { return x } |
| | 706 | + / !"}}" x:([^|\n]) { return x } |
| 706 | 707 | |
| 707 | 708 | link |
| 708 | 709 | = "[[" target:link_target text:("|" link_text)* "]]" { |
| — | — | @@ -720,7 +721,7 @@ |
| 721 | 722 | } |
| 722 | 723 | |
| 723 | 724 | link_target |
| 724 | | - = h:( !"]]" x:([^|]) { return x } )* { return h.join(''); } |
| | 725 | + = h:( !"]]" x:([^|\n]) { return x } )* { return h.join(''); } |
| 725 | 726 | |
| 726 | 727 | link_text |
| 727 | 728 | = h:( & { return setFlag('linkdesc'); } |
| — | — | @@ -856,7 +857,7 @@ |
| 857 | 858 | = "=" space* v:att_value {return v} |
| 858 | 859 | |
| 859 | 860 | att_value |
| 860 | | - = t:[^ \t'"<>=']+ { return [null, t.join('')]; } |
| | 861 | + = t:[^ \t'"<>='\n]+ { return [null, t.join('')]; } |
| 861 | 862 | / "'" t:[^'>]+ "'" { return unquote("'", t.join('')); } |
| 862 | 863 | / '"' t:[^">]+ '"' { return unquote('"', t.join('')); } |
| 863 | 864 | |