Image macro documentation for defining width is incorrect

[sid]

The TracWikiMacros page incorrectly says that you can use this syntax to limit a displayed image width:

[[Image(pic.png, 120px)]]

The syntax that works is:

[[Image(pic.png, 120)]]

Here is a patch to fix that page and the code:

macros.py

@@ -291 +291 @@
     Examples:
     {{{
         [[Image(photo.jpg)]]                           # simplest
-        [[Image(photo.jpg, 120px)]]                    # with size
+        [[Image(photo.jpg, 120)]]                      # with image width size
         [[Image(photo.jpg, right)]]                    # aligned by keyword
         [[Image(photo.jpg, nolink)]]                   # without link to source
         [[Image(photo.jpg, align=right)]]              # aligned by attribute

[osimons]

Hmm. Wonder if the best would be to support both? If you do width=120px as a named argument, it works fine. Would be natural to keep the same behavior also without the keyword? If so, we could change the regexp like this:

trac/wiki/macros.py

@@ -323 +323 @@
         filespec = args[0]
 
         # style information
-        size_re = re.compile('[0-9]+%?$')
+        size_re = re.compile('[0-9]+(%|px)?$')
         attr_re = re.compile('(align|border|width|height|alt'
                              '|title|longdesc|class|id|usemap)=(.+)')
         quoted_re = re.compile("(?:[\"'])(.*)(?:[\"'])$")

I'll also use your wording to make it explicity that we set the width attribute.

Looks OK?

[Christian Boos]

Yeah, it's preferable to work as advertised, this might even be a regression from 0.10.

[osimons]

Fixed in [6319]. Closing.

[osimons]

#3814 marked as duplicate (one of two issues mentioned).