Haaarrrgh --- the first patch in my previous mail does not work for all cases. Hairy stuff.... Here's what did _not_ work with my previous patch: #+html: