docbkx: improved tokenization properties