X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=parse-html.coffee;h=60a10f3fbfd2ba3e57a75d4f9c5c0cdc627d2a92;hb=60dfaaf9f047176c2c7a7eca7aa4b263537007d1;hp=55d73a31b03afd40f5cd393a615a6fd670cd5467;hpb=38367e9bad7bcad9f30c2c86d15feba64c71e1ad;p=peach-html5-editor.git diff --git a/parse-html.coffee b/parse-html.coffee index 55d73a3..60a10f3 100644 --- a/parse-html.coffee +++ b/parse-html.coffee @@ -195,8 +195,8 @@ is_space_tok = (t) -> return t.type is TYPE_TEXT && t.text.length is 1 and space_chars.indexOf(t.text) > -1 is_input_hidden_tok = (t) -> - return unless t.type is TYPE_START_TAG - for a of t.attrs_a + return false unless t.type is TYPE_START_TAG + for a in t.attrs_a if a[0] is 'type' if a[1].toLowerCase() is 'hidden' return true @@ -324,14 +324,15 @@ mathml_text_integration = { mi: NS_MATHML, mo: NS_MATHML, mn: NS_MATHML, ms: NS_MATHML, mtext: NS_MATHML } is_mathml_text_integration_point = (el) -> - return mathml_text_integration[el.name] = el.namespace + return mathml_text_integration[el.name] is el.namespace is_html_integration = (el) -> # DON'T PASS A TOKEN - if el.namespace is NS_MATHML and el.name is 'annotation-xml' - if el.attrs.encoding? - if el.attrs.encoding.toLowerCase() is 'text/html' - return true - if el.attrs.encoding.toLowerCase() is 'application/xhtml+xml' - return true + if el.namespace is NS_MATHML + if el.name is 'annotation-xml' + if el.attrs.encoding? + if el.attrs.encoding.toLowerCase() is 'text/html' + return true + if el.attrs.encoding.toLowerCase() is 'application/xhtml+xml' + return true return false if el.namespace is NS_SVG if el.name is 'foreignObject' or el.name is 'desc' or el.name is 'title' @@ -342,28 +343,25 @@ h_tags = { h1:NS_HTML, h2:NS_HTML, h3:NS_HTML, h4:NS_HTML, h5:NS_HTML, h6:NS_HTML } -# FIXME namespacify foster_parenting_targets = { - table: true - tbody: true - tfoot: true - thead: true - tr: true + table: NS_HTML + tbody: NS_HTML + tfoot: NS_HTML + thead: NS_HTML + tr: NS_HTML } -# FIXME namespacify -# all html I presume end_tag_implied = { - dd: true - dt: true - li: true - option: true - optgroup: true - p: true - rb: true - rp: true - rt: true - rtc: true + dd: NS_HTML + dt: NS_HTML + li: NS_HTML + option: NS_HTML + optgroup: NS_HTML + p: NS_HTML + rb: NS_HTML + rp: NS_HTML + rt: NS_HTML + rtc: NS_HTML } el_is_special = (e) -> @@ -512,8 +510,9 @@ decode_named_char_ref = (txt) -> return null if decoded is txt return g_dncr.cache[txt] = decoded -parse_html = (txt, parse_error_cb = null) -> - cur = 0 # index of next char in txt to be parsed +parse_html = (args) -> + txt = null + cur = null # index of next char in txt to be parsed # declare doc and tokenizer variables so they're in scope below doc = null open_els = null # stack of open elements @@ -538,8 +537,8 @@ parse_html = (txt, parse_error_cb = null) -> flag_parsing = false parse_error = -> - if parse_error_cb? - parse_error_cb cur + if args.error_cb? + args.error_cb cur else console.log "Parse error at character #{cur} of #{txt.length}" @@ -565,7 +564,7 @@ parse_html = (txt, parse_error_cb = null) -> # But first... the helpers template_tag_is_open = -> for t in open_els - if t.name is 'template' # maybe should also check: and t.namespace is 'html' + if t.name is 'template' and t.namespace is NS_HTML return true return false is_in_scope_x = (tag_name, scope, namespace) -> @@ -614,11 +613,12 @@ parse_html = (txt, parse_error_cb = null) -> return false return false # this checks for a particular element, not by name - el_is_in_scope = (el) -> - for t in open_els - if t is el + # this requires a namespace match + el_is_in_scope = (needle) -> + for el in open_els + if el is needle return true - if standard_scopers[t.name] is t.namespace + if standard_scopers[el.name] is el.namespace return false return false @@ -634,15 +634,15 @@ parse_html = (txt, parse_error_cb = null) -> open_els.shift() return clear_to_table_body_stopers = { - 'tbody': true - 'tfoot': true - 'thead': true - 'template': true - 'html': true + tbody: NS_HTML + tfoot: NS_HTML + thead: NS_HTML + template: NS_HTML + html: NS_HTML } clear_stack_to_table_body_context = -> loop - if clear_to_table_body_stopers[open_els[0].name]? + if clear_to_table_body_stopers[open_els[0].name] is open_els[0].namespace break open_els.shift() return @@ -832,7 +832,7 @@ parse_html = (txt, parse_error_cb = null) -> debug_log "tree: #{serialize_els doc.children, false, true}" debug_log "open_els: #{serialize_els open_els, true, true}" debug_log "afe: #{serialize_els afe, true, true}" - if open_els[0].name is subject + if open_els[0].name is subject and open_els[0].namespace is NS_HTML el = open_els[0] open_els.shift() # remove it from the list of active formatting elements (if found) @@ -1116,14 +1116,14 @@ parse_html = (txt, parse_error_cb = null) -> # http://www.w3.org/TR/html5/syntax.html#close-a-p-element close_p_element = -> generate_implied_end_tags 'p' # arg is exception - if open_els[0].name isnt 'p' + unless open_els[0].name is 'p' and open_els[0].namespace is NS_HTML parse_error() while open_els.length > 1 # just in case el = open_els.shift() - if el.name is 'p' + if el.name is 'p' and el.namespace is NS_HTML return close_p_if_in_button_scope = -> - if is_in_button_scope 'p' + if is_in_button_scope 'p', NS_HTML close_p_element() # http://www.w3.org/TR/html5/syntax.html#insert-a-character @@ -1184,7 +1184,7 @@ parse_html = (txt, parse_error_cb = null) -> # If foster parenting is enabled and target is a table, tbody, tfoot, # thead, or tr element Foster parenting happens when content is # misnested in tables. - if flag_foster_parenting and foster_parenting_targets[target.name] + if flag_foster_parenting and foster_parenting_targets[target.name] is target.namespace loop # once. this is here so we can ``break`` to "abort these substeps" # 1. Let last template be the last template element in the # stack of open elements, if any. @@ -1317,7 +1317,7 @@ parse_html = (txt, parse_error_cb = null) -> # 8.2.5.3 http://www.w3.org/TR/html5/syntax.html#closing-elements-that-have-implied-end-tags # http://www.w3.org/TR/html5/syntax.html#generate-implied-end-tags generate_implied_end_tags = (except = null) -> - while end_tag_implied[open_els[0].name] and open_els[0].name isnt except + while end_tag_implied[open_els[0].name] is open_els[0].namespace and open_els[0].name isnt except open_els.shift() # 8.2.5.4 The rules for parsing tokens in HTML content @@ -1394,6 +1394,7 @@ parse_html = (txt, parse_error_cb = null) -> el = insert_html_element t head_element_pointer = el ins_mode = ins_mode_in_head + return if t.type is TYPE_END_TAG if t.name is 'head' or t.name is 'body' or t.name is 'html' or t.name is 'br' # fall through to Anything else below @@ -1439,7 +1440,7 @@ parse_html = (txt, parse_error_cb = null) -> if t.type is TYPE_START_TAG and t.name is 'title' parse_generic_rcdata_text t return - if t.type is TYPE_START_TAG and ((t.name is 'noscript' and flag_scripting) or (t.name is 'noframes' or t.name is 'style')) + if t.type is TYPE_START_TAG and ((t.name is 'noscript' and flag_scripting) or t.name is 'noframes' or t.name is 'style') parse_generic_raw_text t return if t.type is TYPE_START_TAG and t.name is 'noscript' and flag_scripting is false @@ -1478,7 +1479,7 @@ parse_html = (txt, parse_error_cb = null) -> parse_error() loop el = open_els.shift() - if el.name is 'template' + if el.name is 'template' and el.namespace is NS_HTML break clear_afe_to_marker() template_ins_modes.shift() @@ -1501,14 +1502,14 @@ parse_html = (txt, parse_error_cb = null) -> if t.type is TYPE_DOCTYPE parse_error() return - if t.type is TYPE_START_TAG + if t.type is TYPE_START_TAG and t.name is 'html' ins_mode_in_body t return if t.type is TYPE_END_TAG and t.name is 'noscript' open_els.shift() ins_mode = ins_mode_in_head return - if (t.type is TYPE_TEXT and (t.text is "\t" or t.text is "\u000a" or t.text is "\u000c" or t.text is "\u000d" or t.text is ' ')) or t.type is TYPE_COMMENT or (t.type is TYPE_START_TAG and (t.name is 'basefont' or t.name is 'bgsound' or t.name is 'link' or t.name is 'meta' or t.name is 'noframes' or t.name is 'style')) + if is_space_tok(t) or t.type is TYPE_COMMENT or (t.type is TYPE_START_TAG and (t.name is 'basefont' or t.name is 'bgsound' or t.name is 'link' or t.name is 'meta' or t.name is 'noframes' or t.name is 'style')) ins_mode_in_head t return if t.type is TYPE_END_TAG and t.name is 'br' @@ -1577,7 +1578,7 @@ parse_html = (txt, parse_error_cb = null) -> # 8.2.5.4.7 http://www.w3.org/TR/html5/syntax.html#parsing-main-inbody in_body_any_other_end_tag = (name) -> # factored out because adoption agency calls it for el, i in open_els - if el.namespace is NS_HTML and el.name is name + if el.name is name and el.namespace is NS_HTML generate_implied_end_tags name # arg is exception parse_error() unless i is 0 while i >= 0 @@ -1665,7 +1666,7 @@ parse_html = (txt, parse_error_cb = null) -> stop_parsing() return if t.type is TYPE_END_TAG and t.name is 'body' - unless is_in_scope 'body' + unless is_in_scope 'body', NS_HTML parse_error() return ok_tags = { @@ -1682,7 +1683,7 @@ parse_html = (txt, parse_error_cb = null) -> ins_mode = ins_mode_after_body return if t.type is TYPE_END_TAG and t.name is 'html' - unless is_in_scope 'body' + unless is_in_scope 'body', NS_HTML parse_error() return ok_tags = { @@ -1705,7 +1706,7 @@ parse_html = (txt, parse_error_cb = null) -> return if t.type is TYPE_START_TAG and h_tags[t.name]? close_p_if_in_button_scope() - if h_tags[open_els[0]] is NS_HTML + if h_tags[open_els[0].name] is open_els[0].namespace parse_error() open_els.shift() insert_html_element t @@ -2108,7 +2109,7 @@ parse_html = (txt, parse_error_cb = null) -> return if t.type is TYPE_EOF parse_error() - if open_els[0].name is 'script' + if open_els[0].name is 'script' and open_els[0].namespace is NS_HTML open_els[0].flag 'already started', true open_els.shift() ins_mode = original_ins_mode @@ -2136,17 +2137,10 @@ parse_html = (txt, parse_error_cb = null) -> ins_mode_in_body t flag_foster_parenting = false return - can_in_table = { # FIXME do this inline like everywhere else - 'table': true - 'tbody': true - 'tfoot': true - 'thead': true - 'tr': true - } ins_mode_in_table = (t) -> switch t.type when TYPE_TEXT - if can_in_table[t.name] + if t.name is 'table' or t.name is 'tbody' or t.name is 'tfoot' or t.name is 'thead' or t.name is 'tr' original_ins_mode = ins_mode ins_mode = ins_mode_in_table_text process_token t @@ -2183,10 +2177,10 @@ parse_html = (txt, parse_error_cb = null) -> process_token t when 'table' parse_error() - if is_in_table_scope 'table' + if is_in_table_scope 'table', NS_HTML loop el = open_els.shift() - if el.name is 'table' + if el.name is 'table' and el.namespace is NS_HTML break reset_ins_mode() process_token t @@ -2213,14 +2207,14 @@ parse_html = (txt, parse_error_cb = null) -> when TYPE_END_TAG switch t.name when 'table' - if is_in_table_scope 'table' + if is_in_table_scope 'table', NS_HTML loop el = open_els.shift() - if el.name is 'table' + if el.name is 'table' and el.namespace is NS_HTML break reset_ins_mode() else - parse_error + parse_error() when 'body', 'caption', 'col', 'colgroup', 'html', 'tbody', 'td', 'tfoot', 'th', 'thead', 'tr' parse_error() when 'template' @@ -2261,13 +2255,13 @@ parse_html = (txt, parse_error_cb = null) -> # 8.2.5.4.11 http://www.w3.org/TR/html5/syntax.html#parsing-main-incaption ins_mode_in_caption = (t) -> if t.type is TYPE_END_TAG and t.name is 'caption' - if is_in_table_scope 'caption' + if is_in_table_scope 'caption', NS_HTML generate_implied_end_tags() if open_els[0].name isnt 'caption' parse_error() loop el = open_els.shift() - if el.name is 'caption' + if el.name is 'caption' and el.namespace is NS_HTML break clear_afe_to_marker() ins_mode = ins_mode_in_table @@ -2277,10 +2271,10 @@ parse_html = (txt, parse_error_cb = null) -> return if (t.type is TYPE_START_TAG and (t.name is 'caption' or t.name is 'col' or t.name is 'colgroup' or t.name is 'tbody' or t.name is 'td' or t.name is 'tfoot' or t.name is 'th' or t.name is 'thead' or t.name is 'tr')) or t.type is TYPE_END_TAG and t.name is 'table' parse_error() - if is_in_table_scope 'caption' + if is_in_table_scope 'caption', NS_HTML loop el = open_els.shift() - if el.name is 'caption' + if el.name is 'caption' and el.namespace is NS_HTML break clear_afe_to_marker() ins_mode = ins_mode_in_table @@ -2313,7 +2307,7 @@ parse_html = (txt, parse_error_cb = null) -> t.acknowledge_self_closing() return if t.type is TYPE_END_TAG and t.name is 'colgroup' - if open_els[0].name is 'colgroup' + if open_els[0].name is 'colgroup' and open_els.namespace is NS_HTML open_els.shift() ins_mode = ins_mode_in_table else @@ -2352,7 +2346,7 @@ parse_html = (txt, parse_error_cb = null) -> process_token t return if t.type is TYPE_END_TAG and (t.name is 'tbody' or t.name is 'tfoot' or t.name is 'thead') - unless is_in_table_scope t.name # fixfull check namespace + unless is_in_table_scope t.name, NS_HTML parse_error() return clear_stack_to_table_body_context() @@ -2362,10 +2356,10 @@ parse_html = (txt, parse_error_cb = null) -> if (t.type is TYPE_START_TAG and (t.name is 'caption' or t.name is 'col' or t.name is 'colgroup' or t.name is 'tbody' or t.name is 'tfoot' or t.name is 'thead')) or (t.type is TYPE_END_TAG and t.name is 'table') has = false for el in open_els - if el.name is 'tbody' or el.name is 'tfoot' or el.name is 'thead' + if el.namespace is NS_HTML and (el.name is 'tbody' or el.name is 'tfoot' or el.name is 'thead') has = true break - if table_scopers[el.name] + if table_scopers[el.name] is el.namespace break if !has parse_error() @@ -2390,7 +2384,7 @@ parse_html = (txt, parse_error_cb = null) -> afe_push_marker() return if t.type is TYPE_END_TAG and t.name is 'tr' - if is_in_table_scope 'tr' + if is_in_table_scope 'tr', NS_HTML clear_stack_to_table_row_context() open_els.shift() ins_mode = ins_mode_in_table_body @@ -2398,7 +2392,7 @@ parse_html = (txt, parse_error_cb = null) -> parse_error() return if (t.type is TYPE_START_TAG and (t.name is 'caption' or t.name is 'col' or t.name is 'colgroup' or t.name is 'tbody' or t.name is 'tfoot' or t.name is 'thead' or t.name is 'tr')) or t.type is TYPE_END_TAG and t.name is 'table' - if is_in_table_scope 'tr' + if is_in_table_scope 'tr', NS_HTML clear_stack_to_table_row_context() open_els.shift() ins_mode = ins_mode_in_table_body @@ -2407,8 +2401,8 @@ parse_html = (txt, parse_error_cb = null) -> parse_error() return if t.type is TYPE_END_TAG and (t.name is 'tbody' or t.name is 'tfoot' or t.name is 'thead') - if is_in_table_scope t.name # fixfull namespace - if is_in_table_scope 'tr' + if is_in_table_scope t.name, NS_HTML + if is_in_table_scope 'tr', NS_HTML clear_stack_to_table_row_context() open_els.shift() ins_mode = ins_mode_in_table_body @@ -2425,11 +2419,11 @@ parse_html = (txt, parse_error_cb = null) -> # http://www.w3.org/TR/html5/syntax.html#close-the-cell close_the_cell = -> generate_implied_end_tags() - unless open_els[0].name is 'td' or open_els[0] is 'th' + unless (open_els[0].name is 'td' or open_els[0] is 'th') and open_els[0].namespace is NS_HTML parse_error() loop el = open_els.shift() - if el.name is 'td' or el.name is 'th' + if el.namespace is NS_HTML and (el.name is 'td' or el.name is 'th') break clear_afe_to_marker() ins_mode = ins_mode_in_row @@ -2437,13 +2431,13 @@ parse_html = (txt, parse_error_cb = null) -> # 8.2.5.4.15 http://www.w3.org/TR/html5/syntax.html#parsing-main-intd ins_mode_in_cell = (t) -> if t.type is TYPE_END_TAG and (t.name is 'td' or t.name is 'th') - if is_in_table_scope t.name + if is_in_table_scope t.name, NS_HTML generate_implied_end_tags() - if open_els[0].name isnt t.name - parse_error + unless (open_els[0].name is t.name) and open_els[0].namespace is NS_HTML + parse_error() loop el = open_els.shift() - if el.name is t.name + if el.name is t.name and el.namespace is NS_HTML break clear_afe_to_marker() ins_mode = ins_mode_in_row @@ -2453,10 +2447,10 @@ parse_html = (txt, parse_error_cb = null) -> if t.type is TYPE_START_TAG and (t.name is 'caption' or t.name is 'col' or t.name is 'colgroup' or t.name is 'tbody' or t.name is 'td' or t.name is 'tfoot' or t.name is 'th' or t.name is 'thead' or t.name is 'tr') has = false for el in open_els - if el.name is 'td' or el.name is 'th' + if el.namespace is NS_HTML and (el.name is 'td' or el.name is 'th') has = true break - if table_scopers[el.name] + if table_scopers[el.name] is el.namespace break if !has parse_error() @@ -2468,7 +2462,7 @@ parse_html = (txt, parse_error_cb = null) -> parse_error() return if t.type is TYPE_END_TAG and (t.name is 'table' or t.name is 'tbody' or t.name is 'tfoot' or t.name is 'thead' or t.name is 'tr') - if is_in_table_scope t.name # fixfull namespace + if is_in_table_scope t.name, NS_HTML close_the_cell() process_token t else @@ -2495,36 +2489,37 @@ parse_html = (txt, parse_error_cb = null) -> ins_mode_in_body t return if t.type is TYPE_START_TAG and t.name is 'option' - if open_els[0].name is 'option' + if open_els[0].name is 'option' and open_els[0].namespace is NS_HTML open_els.shift() insert_html_element t return if t.type is TYPE_START_TAG and t.name is 'optgroup' - if open_els[0].name is 'option' + if open_els[0].name is 'option' and open_els[0].namespace is NS_HTML open_els.shift() - if open_els[0].name is 'optgroup' + if open_els[0].name is 'optgroup' and open_els[0].namespace is NS_HTML open_els.shift() insert_html_element t return if t.type is TYPE_END_TAG and t.name is 'optgroup' - if open_els[0].name is 'option' and open_els[1].name is 'optgroup' - open_els.shift() - if open_els[0].name is 'optgroup' + if open_els[0].name is 'option' and open_els[0].namespace in NS_HTML + if open_els[1].name is 'optgroup' and open_els[0].namespace is NS_HTML + open_els.shift() + if open_els[0].name is 'optgroup' and open_els[0].namespace is NS_HTML open_els.shift() else parse_error() return if t.type is TYPE_END_TAG and t.name is 'option' - if open_els[0].name is 'option' + if open_els[0].name is 'option' and open_els[0].namespace is NS_HTML open_els.shift() else parse_error() return if t.type is TYPE_END_TAG and t.name is 'select' - if is_in_select_scope 'select' + if is_in_select_scope 'select', NS_HTML loop el = open_els.shift() - if el.name is 'select' + if el.name is 'select' and el.namespace is NS_HTML break reset_ins_mode() else @@ -2534,7 +2529,7 @@ parse_html = (txt, parse_error_cb = null) -> parse_error() loop el = open_els.shift() - if el.name is 'select' + if el.name is 'select' and el.namespace is NS_HTML break reset_ins_mode() # spec says that this is the same as but it doesn't say @@ -2542,11 +2537,11 @@ parse_html = (txt, parse_error_cb = null) -> return if t.type is TYPE_START_TAG and (t.name is 'input' or t.name is 'keygen' or t.name is 'textarea') parse_error() - if is_in_select_scope 'select' + if is_in_select_scope 'select', NS_HTML return loop el = open_els.shift() - if el.name is 'select' + if el.name is 'select' and el.namespace is NS_HTML break reset_ins_mode() process_token t @@ -2567,7 +2562,7 @@ parse_html = (txt, parse_error_cb = null) -> parse_error() loop el = open_els.shift() - if el.name is 'select' + if el.name is 'select' and el.namespace is NS_HTML break reset_ins_mode() process_token t @@ -2578,7 +2573,7 @@ parse_html = (txt, parse_error_cb = null) -> return loop el = open_els.shift() - if el.name is 'select' + if el.name is 'select' and el.namespace is NS_HTML break reset_ins_mode() process_token t @@ -2635,7 +2630,7 @@ parse_html = (txt, parse_error_cb = null) -> parse_error() loop el = open_els.shift() - if el.name is 'template' # fixfull check namespace + if el.name is 'template' and el.namespace is NS_HTML break clear_afe_to_marker() template_ins_modes.shift() @@ -2686,7 +2681,6 @@ parse_html = (txt, parse_error_cb = null) -> insert_html_element t return if t.type is TYPE_END_TAG and t.name is 'frameset' - # TODO ?correct for: "if the current node is the root html element" if open_els.length is 1 parse_error() return # fragment case @@ -2703,7 +2697,6 @@ parse_html = (txt, parse_error_cb = null) -> ins_mode_in_head t return if t.type is TYPE_EOF - # TODO ?correct for: "if the current node is not the root html element" if open_els.length isnt 1 parse_error() stop_parsing() @@ -3041,9 +3034,9 @@ parse_html = (txt, parse_error_cb = null) -> is_appropriate_end_tag = (t) -> # spec says to check against "the tag name of the last start tag to # have been emitted from this tokenizer", but this is only called from - # the various "raw" states, which I'm pretty sure all push the start - # token onto open_els. TODO: verify this after the script data states - # are implemented + # the various "raw" states, so it's hopefully ok to assume that + # open_els[0].name will work instead TODO: verify this after the script + # data states are implemented debug_log "#{t.type}, #{t.name} open_els: #{serialize_els open_els, true, true}" return t.type is TYPE_END_TAG and t.name is open_els[0].name @@ -3185,6 +3178,11 @@ parse_html = (txt, parse_error_cb = null) -> tok_state = tok_state_self_closing_start_tag return # fall through + if c is '>' + if is_appropriate_end_tag tok_cur_tag + tok_state = tok_state_data + return tok_cur_tag + # fall through if is_uc_alpha(c) tok_cur_tag.name += c.toLowerCase() temporary_buffer += c @@ -3337,6 +3335,11 @@ parse_html = (txt, parse_error_cb = null) -> tok_state = tok_state_self_closing_start_tag return # fall through + if c is '>' + if is_appropriate_end_tag tok_cur_tag + tok_state = tok_state_data + return tok_cur_tag + # fall through if is_uc_alpha(c) tok_cur_tag.name += c.toLowerCase() temporary_buffer += c.toLowerCase() @@ -3517,16 +3520,16 @@ parse_html = (txt, parse_error_cb = null) -> return tmp when "\u0000" parse_error() - tok_cur_tag.attrs_a[0][0] = "\ufffd" + tok_cur_tag.attrs_a[0][0] += "\ufffd" when '"', "'", '<' parse_error() - tok_cur_tag.attrs_a[0][0] = c + tok_cur_tag.attrs_a[0][0] += c when '' # EOF parse_error() tok_state = tok_state_data else if is_uc_alpha(c) - tok_cur_tag.attrs_a[0][0] = c.toLowerCase() + tok_cur_tag.attrs_a[0][0] += c.toLowerCase() else tok_cur_tag.attrs_a[0][0] += c return null @@ -3724,7 +3727,7 @@ parse_html = (txt, parse_error_cb = null) -> return # Otherwise parse_error() - tok_cur_tag = new_comment_token '!' # TODO test ("!" right?) + tok_cur_tag = new_comment_token '' tok_state = tok_state_bogus_comment return @@ -3735,6 +3738,7 @@ parse_html = (txt, parse_error_cb = null) -> tok_state = tok_state_comment_start_dash when "\u0000" parse_error() + tok_state = tok_state_comment return new_character_token "\ufffd" when '>' parse_error() @@ -3747,6 +3751,7 @@ parse_html = (txt, parse_error_cb = null) -> return tok_cur_tag else tok_cur_tag.text += c + tok_state = tok_state_comment return null # 8.2.4.47 http://www.w3.org/TR/html5/syntax.html#comment-start-dash-state @@ -3970,12 +3975,12 @@ parse_html = (txt, parse_error_cb = null) -> return if c is '"' parse_error() - tok_cur_tag.public_identifier = '' # FIXME should this go in @attrs or @text? + tok_cur_tag.public_identifier = '' tok_state = tok_state_doctype_public_identifier_double_quoted return if c is "'" parse_error() - tok_cur_tag.public_identifier = '' # FIXME should this go in @attrs or @text? + tok_cur_tag.public_identifier = '' tok_state = tok_state_doctype_public_identifier_single_quoted return if c is '>' @@ -4002,12 +4007,12 @@ parse_html = (txt, parse_error_cb = null) -> return if c is '"' parse_error() - tok_cur_tag.public_identifier = '' # FIXME should this go in @attrs or @text? + tok_cur_tag.public_identifier = '' tok_state = tok_state_doctype_public_identifier_double_quoted return if c is "'" parse_error() - tok_cur_tag.public_identifier = '' # FIXME should this go in @attrs or @text? + tok_cur_tag.public_identifier = '' tok_state = tok_state_doctype_public_identifier_single_quoted return if c is '>' @@ -4295,7 +4300,9 @@ parse_html = (txt, parse_error_cb = null) -> else val = txt.substr cur, (next_gt - cur) cur = next_gt + 3 - val = val.replace "\u0000", "\ufffd" # fixfull spec doesn't say this + val = val.replace(new RegExp("\u0000", 'g'), "\ufffd") # fixfull spec doesn't say this + val = val.replace(new RegExp("\r\n", 'g'), "\n") # fixfull spec doesn't say this + val = val.replace(new RegExp("\r", 'g'), "\n") # fixfull spec doesn't say this return new_character_token val # fixfull split # 8.2.4.69 http://www.w3.org/TR/html5/syntax.html#consume-a-character-reference @@ -4376,13 +4383,15 @@ parse_html = (txt, parse_error_cb = null) -> # tree constructor initialization # see comments on TYPE_TAG/etc for the structure of this data + txt = args.html + cur = 0 doc = new Node TYPE_TAG, name: 'html', namespace: NS_HTML open_els = [] afe = [] # active formatting elements template_ins_modes = [] ins_mode = ins_mode_initial original_ins_mode = ins_mode # TODO check spec - flag_scripting = true # TODO might need an extra flag to get