Revised HTML lexer