MarkTraceur has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/60796


Change subject: WIP Try to fix the table attribute bug
......................................................................

WIP Try to fix the table attribute bug

There's a bug in http://parsoid.wmflabs.org/_rt/de/Feuer-Affe that causes
our RT tests to fail, as well it should. I'm trying to fix it but no luck yet.

Change-Id: Ia7efa7e2e9df3957dedaf8f8b4b16f2423d161d7
---
M js/lib/pegTokenizer.pegjs.txt
1 file changed, 11 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Parsoid 
refs/changes/96/60796/1

diff --git a/js/lib/pegTokenizer.pegjs.txt b/js/lib/pegTokenizer.pegjs.txt
index c9bd101..58ddaeb 100644
--- a/js/lib/pegTokenizer.pegjs.txt
+++ b/js/lib/pegTokenizer.pegjs.txt
@@ -651,6 +651,9 @@
         return null !== pegArgs.pegTokenizer.inline_breaks( input, pos, stops )
       }
 
+attr_inline_breaks
+  = & [\r\n]
+
 inline
   = c:(urltext / (! inline_breaks (inline_element / . )))+ {
       //console.warn('inline out:' + pp(c));
@@ -2384,7 +2387,7 @@
 
 attribute_preprocessor_text_single
   = r:( t:[^{}&'<]+ { return t.join(''); }
-  / !inline_breaks (
+  / !attr_inline_breaks (
       directive
     / [{}&<] )
   )*
@@ -2393,7 +2396,7 @@
   }
 attribute_preprocessor_text_single_broken
   = r:( t:[^{}&'<>|]+ { return t.join(''); }
-  / !inline_breaks (
+  / !attr_inline_breaks (
       directive
     / [{}&<] )
   )*
@@ -2402,7 +2405,7 @@
   }
 attribute_preprocessor_text_double
   = r:( t:[^{}&"<]+ { return t.join(''); }
-  / !inline_breaks (
+  / !attr_inline_breaks (
       directive
     / [{}&<] )
   )*
@@ -2412,7 +2415,7 @@
   }
 attribute_preprocessor_text_double_broken
   = r:( t:[^{}&"<>|]+ { return t.join(''); }
-  / !inline_breaks (
+  / !attr_inline_breaks (
       directive
     / [{}&<] )
   )*
@@ -2444,7 +2447,7 @@
 
 attribute_preprocessor_text_single_line
   = r:( t:[^{}&'<|!]+ { return t.join(''); }
-  / !inline_breaks (
+  / !attr_inline_breaks (
       directive
     / ![\r\n] [{}&<] )
   )* {
@@ -2452,7 +2455,7 @@
   }
 attribute_preprocessor_text_single_line_broken
   = r:( t:[^{}&'<>|!]+ { return t.join(''); }
-  / !inline_breaks (
+  / !attr_inline_breaks (
       directive
     / ![\r\n] [{}&<] )
   )* {
@@ -2460,7 +2463,7 @@
   }
 attribute_preprocessor_text_double_line
   = r:( t:[^{}&"<|!]+ { return t.join(''); }
-  / !inline_breaks (
+  / !attr_inline_breaks (
       directive
     / ![\r\n] [{}&<] )
   )* {
@@ -2468,7 +2471,7 @@
   }
 attribute_preprocessor_text_double_line_broken
   = r:( t:[^{}&"<>|!]+ { return t.join(''); }
-  / !inline_breaks (
+  / !attr_inline_breaks (
       directive
     / ![\r\n] [{}&<] )
   )* {

-- 
To view, visit https://gerrit.wikimedia.org/r/60796
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia7efa7e2e9df3957dedaf8f8b4b16f2423d161d7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: MarkTraceur <mtrac...@member.fsf.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to