Support having "word" modifier expand from hat

[pokey]

If the user says "word air", it should refer to the subword containing the a with a hat. Similarly "char air" should be just the a

Implementation

• [ ] Change hat-token map to store just the range of the decorated character itself rather than the range of the whole token
• [ ] Figure out how to essentially insert a weak containing stage after any decorated mark. Something like that