diff options
Diffstat (limited to 'hc.l')
| -rw-r--r-- | hc.l | 15 |
1 files changed, 10 insertions, 5 deletions
@@ -10,10 +10,7 @@ wsp [ \t\n\r\v\t] notwsp [^ \t\n\r\v\t] -ctrl [\x0-\x1f] -notctrl [^\x0-\x1f] -special ["'<>/=&] -notspecial [^"'<>/=&] +notspecial [^"'<>/=& \t\n\r\v\t] elname [A-Za-z0-9]+ attrname [^"'<>/=&\x0-\x1f\t\n\r\v\t ] endnm [^A-Za-z_\-0-9] @@ -23,7 +20,9 @@ endnm [^A-Za-z_\-0-9] [<] { BEGIN(ELM); return '<'; } +{wsp}+ { return tok_wsp; } {notspecial}+ { return tok_text; } +"<!--".*"-->" { return tok_text; } <ELM>a/{endnm} { BEGIN(ATT); return tok_el_a; } <ELM>abbr/{endnm} { BEGIN(ATT); return tok_el_abbr; } <ELM>acronym/{endnm} { BEGIN(ATT); return tok_el_acronym; } @@ -114,6 +113,8 @@ endnm [^A-Za-z_\-0-9] <ELM>ul/{endnm} { BEGIN(ATT); return tok_el_ul; } <ELM>var/{endnm} { BEGIN(ATT); return tok_el_var; } <ELM>{elname} { BEGIN(ATT); return tok_el_unknown; } +<ELM>{wsp}+ { return tok_wsp; } +<ELM>{notspecial}+ { return tok_text; } <ELM>. { return yytext[0]; } <ATT>accept/{endnm} { return tok_at_accept; } @@ -235,9 +236,13 @@ endnm [^A-Za-z_\-0-9] <ATT>vlink/{endnm} { return tok_at_vlink; } <ATT>vspace/{endnm} { return tok_at_vspace; } <ATT>width/{endnm} { return tok_at_width; } -<ATT>{attrname} { return tok_at_unknown; } +<ATT>{attrname}+ { return tok_at_unknown; } <ATT>[>] { BEGIN(INITIAL); return yytext[0]; } +<ATT>{wsp}+ { return tok_wsp; } +<ATT>{notspecial}+ { return tok_text; } +<ATT>\"[^\"]*\" { return tok_text; } +<ATT>'[^']*' { return tok_text; } <ATT>. { return yytext[0]; } %% |