Thanks Uwe for giving a go to it. There are still a number of issues, though.
I would really have preferred math_indent to math_indentation, and you should get rid of the second version that is a string instead of a length. I am away for a few days, I will be more specific in a few days. JMarc