Hi Yuan!

See the attached patch.  I've added some more features to the font
locking, adhering to what Stefan mentioned.

WDYT?

-- 
Thanks,

Theo