wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-15 18:39:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Improve parameter tokenization support especially for table rows"

Browse source
This commit is contained in:
Gabriel Wicke 2012-04-09 21:04:08 +00:00 committed by Gerrit Code Review
parent 01e02e888d dbdd320348
commit f99cb06e10
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
modules/parser/pegTokenizer.pegjs.txt
View file

@ -1566,10 +1566,10 @@ table_data_tag
b:nested_block { return b }
)*
{
if ( a == '' ) {
if ( a === '' ) {
a = [];
}
//console.warn("table data result: " + pp(td) + ", attribts: " + pp(a));
//console.warn("table data result: " + pp(td) + ", attribs: " + pp(a));
return [ new TagTk( 'td', a )]
.concat( td );
}
@ -1579,6 +1579,7 @@ table_heading_tags
"!"
th:table_heading_tag
ths:( "!!" tht:table_heading_tag { return tht } )* {
//console.warn( 'thts: ' + pp(th.concat(ths)));
return th.concat(ths);
}
@ -1953,11 +1954,17 @@ attribute_preprocessor_text_double
// Variants with the entire attribute on a single line
attribute_preprocessor_text_line
= r:( ts:(!inline_breaks t:[^=<>{\n\r&'"\t \[] {return t})+ { return ts.join(''); }
/ !inline_breaks (
directive
/ !'\n' [&%] )
)+ {
= r:( ts:[^=<>{\n\r&'"\t \[\]|{]+ { return ts.join(''); }
/ !inline_breaks
t:(
directive
/ !(newline / space / [\[>]) c:. {
//console.warn( 'aptl: ' + pp(c) );
return c
}
) { return t }
)+
{
//console.warn('prep');
return flatten_string ( r );
}