$$-escaping eats parts of the content

[carl]

I'm using the following template:

<div xmlns:py="http://genshi.edgewall.org/"
     py:with="hello='World'">
<div >
  one $hello two $$hello three $$$hello four $$$$hello
 </div>
 <div >
  one $ hello two $${ $$hello $hello } three $$$hello four $$$$ hello
 </div>
</div>

This is what I get from genshi 0.4:

<div>
<div>
  one World$World$hello
 </div>
 <div>
  one $$hello World$World$ hello
 </div>
</div>

This is what I'd like to get:

<div>
<div>
  one World two $hello three $World four $$hello
 </div>
 <div>
  one $ hello two ${ $hello World } three $World four $$$$ hello
 </div>
</div>

or in words: Don't do anything with dollar signs that's not followed by [a-zA-Z_{]. If the number of $-signs (n) is odd, reduce the number of $-signs to (n-1)/2 and do an expression substitution, if it's even just reduce the number of $-signs to n/2.

[carl]

I think I found the problem, and I have attached a patch. This will not be exactly what I wanted above, but I think I can live with it as it is now.

[cmlenz]

Doh, this has actually already been fixed in [630] :-P