Image macro's width argument may not be respected

[Ryan J Ollos]

Demonstrated in comment:1:ticket:11384 (see edited markup), the width argument of the Image macro may be ignored.

The issue seems to be that the filename initially has a ZWSP at the end, and after I edited the comment the result was wider then yellow part pls.jpg, 100%\u200b (after splitting content to args in expand_marco we get [u'wider then yellow part pls.jpg', u'100%\u200b'].

I guess we can fix the immediate issue with:

trac/wiki/macros.py

@@ -537 +537 @@
         except Exception:
             browser_links = []
         while args:
-            arg = args.pop(0).strip()
+            arg = stripws(args.pop(0))
             if size_re.match(arg):
                 # 'width' keyword
                 attr['width'] = arg

trac/wiki/tests/macros.py

@@ -130 +130 @@
 ------------------------------
 <a style="padding:0; border:none" href="/wiki/WikiStart"><img src="/browser/%C2
 ============================== Strip unicode white-spaces and ZWSPs (#10668)
-[[Image(  <U+200B>source:« test ».png　 <U+200B>, nolink)]]
+[[Image(  <U+200B>source:« test ».png　 <U+200B>, nolink, 100%　 <U+200B>)]]
 ------------------------------
 <p>
-<img src="/browser/%C2%AB%20test%C2%A0%C2%BB.png?format=raw" alt="source:« test
+<img width="100%" alt="source:« test ».png" title="source:« test ».png" src="/b
 </p>
 ------------------------------
-<img src="/browser/%C2%AB%20test%C2%A0%C2%BB.png?format=raw" alt="source:« test
+<img width="100%" alt="source:« test ».png" title="source:« test ».png" src="/b
 ------------------------------
 ============================== Attachments on page with ':' characters (#10562)
 [[Image("page:fr":img.png<U+200B>,nolink)]]

Perhaps this would all be more robust by utilizing a function such as parse_args. I previously made an attempt at refactoring Image macro to use parse_args in comment:6:ticket:10751. Maybe that should be revisted.

[Ryan J Ollos]

Committed to 1.0-stable in [12313] and merged to trunk in [12314].