Image macro now shows up in inline wiki markup

[Christian Boos]

Caught today live on t.e.o:

Not that good, especially for big images like this.

[Christian Boos]

snapshot from timeline:2012-06-28

[Christian Boos]

png!

[Christian Boos]

Ok, so currently is_inline is unconditionally True … maybe we should return True only if explicitly specified, that way if you really want to have a picture in, say, a section title, you'd have to add the inline parameter.

[flyhigh]

Same problem with JOSM Trac ​#8683

[flyhigh]

This happens if the Image macro is used within the first two lines of a ticket/comment.

[Ryan J Ollos <ryan.j.ollos@…>]

Replying to cboos:

Ok, so currently is_inline is unconditionally True … maybe we should return True only if explicitly specified, that way if you really want to have a picture in, say, a section title, you'd have to add the inline parameter.

I did some experimenting and it seems like a good solution. There was a similar issue for Bloodhound's activity feed (bh:#279), which was temporarily worked-around by using the CSS display: none for img elements. The solution presented in this ticket seems like a better solution, at least for the timeline.

I worked in ​t10751, adding another parameter to parse_args function. I considered calling trac.util.text.stripws in parse_args, but was unsure about this. I made an attempt at refactoring ImageMacro.expand_macro to use parse_args, which is the reason for the additional Image macro tests in the branch. The refactoring didn't work out - we need strict = True in parse_args to prevent a pathspec containing a = character from being interpreted as a kw argument, but with strict = True, a parameter such as margin-left=10 isn't interpreted as a kw argument. I didn't see a way to solve that issue without making the code more complex than before the start of the refactoring, so I abandoned it.

[Ryan J Ollos <ryan.j.ollos@…>]

It looks like I have an error in the comment for parse_args: :param: strict should be :param strict:. I'll wait for feedback in case other changes are needed before fixing that.

[Ryan J Ollos <ryan.j.ollos@…>]

Just spotted a place on the t.e.o site where there is an image in a section heading: see Clients. The patch proposed here would result in the need to edit that wiki markup to add the inline parameter. That makes me think the change should be targeted for a 1.1.x milestone rather than a 1.0.x milestone.

[Ryan J Ollos]

Requested again in ​gmessage:trac-users:Zgsn-pFu2ww/NL_HfDe4hs8J.

[Ryan J Ollos]

Proposed changes in log:rjollos.git:t10751.2.

[Jun Omae]

Looks good to me. I think it would lead no problem to apply it to 1.0-stable….

[Ryan J Ollos]

Thanks, I'll apply to 1.0-stable. I was on the fence about that anyway.

[Ryan J Ollos]

Committed to 1.0-stable in [13791:13793], merged to trunk in [13794:13796].