From 06cc39431c9f7b4b4c10ae23be5652aca453238b Mon Sep 17 00:00:00 2001
From: Jason Woofenden <jason@jasonwoof.com>
Date: Thu, 24 Dec 2015 11:43:46 -0500
Subject: [PATCH] fix any-other-end-tag, tweaks

---
 parse-html.coffee |   31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/parse-html.coffee b/parse-html.coffee
index b3b3f7f..adb9bab 100644
--- a/parse-html.coffee
+++ b/parse-html.coffee
@@ -1780,17 +1780,23 @@ parse_html = (args) ->
 
 	# 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.name is name and el.namespace is NS_HTML
+		node = open_els[0]
+		loop
+			if node.name is name and node.namespace is NS_HTML
 				generate_implied_end_tags name # arg is exception
-				parse_error() unless i is 0
-				while i >= 0
-					open_els.shift()
-					i -= 1
-				return
-			if special_elements[el.name] is el.namespace
+				unless node is open_els[0]
+					parse_error()
+				loop
+					el = open_els.shift()
+					if el is node
+						return
+			if special_elements[node.name] is node.namespace
 				parse_error()
 				return
+			for el, i in open_els
+				if node is el
+					node = open_els[i + 1]
+					break
 		return
 	ins_mode_in_body = (t) ->
 		if t.type is TYPE_TEXT and t.text is "\u0000"
@@ -2117,6 +2123,10 @@ parse_html = (args) ->
 			return
 		if t.type is TYPE_START_TAG and t.name is 'nobr'
 			reconstruct_afe()
+			if is_in_scope 'nobr', NS_HTML
+				parse_error()
+				adoption_agency 'nobr'
+				reconstruct_afe()
 			el = insert_html_element t
 			afe_push el
 			return
@@ -2168,7 +2178,8 @@ parse_html = (args) ->
 			unless is_input_hidden_tok t
 				flag_frameset_ok = false
 			return
-		if t.type is TYPE_START_TAG and (t.name is 'param' or t.name is 'source' or t.name is 'track')
+		if t.type is TYPE_START_TAG and (t.name is 'menuitem' or t.name is 'param' or t.name is 'source' or t.name is 'track')
+			# WHATWG adds 'menuitem' for this block
 			insert_html_element t
 			open_els.shift()
 			t.acknowledge_self_closing()
@@ -2724,7 +2735,7 @@ parse_html = (args) ->
 			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[0].namespace in NS_HTML
+			if open_els[0].name is 'option' and open_els[0].namespace is 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
-- 
1.7.10.4