xyproto
diff --git a/‎engine/rendering.go‎
Lines changed: 2 additions & 1 deletion b/‎engine/rendering.go‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎engine/sse.go‎
Lines changed: 11 additions & 2 deletions b/‎engine/sse.go‎
Lines changed: 11 additions & 2 deletions
@@ -21,6 +21,7 @@ import (
 	"github.com/xyproto/algernon/themes"
 	"github.com/xyproto/algernon/utils"
 	lua "github.com/xyproto/gopher-lua"
+	"github.com/xyproto/huldra"
 	"github.com/xyproto/splash"
 	"github.com/yosssi/gcss"
 
@@ -654,7 +655,7 @@ func (ac *Config) PongoPage(w http.ResponseWriter, req *http.Request, filename s
 	}
 
 	// Check if we are dealing with HTML
-	if strings.Contains(buf.String(), "<html>") {
+	if huldra.IsHTML(buf.Bytes()) {
 
 		if linkInCSS || linkInGCSS {
 			// Link in stylesheet
 
@@ -7,6 +7,7 @@ import (
 	"text/template"
 
 	"github.com/xyproto/algernon/utils"
+	"github.com/xyproto/huldra"
 )
 
 const autoloadTemplate = `
@@ -96,16 +97,24 @@ func InsertScriptTag(htmldata, js []byte) []byte {
 		return js
 	}
 
+	// TODO: Write a better HTML manipulator. Create an external package.
+
 	// Place the script at the end of the body, if there is a body
 	switch {
 	case bytes.Contains(htmldata, []byte("</body>")):
 		return bytes.Replace(htmldata, []byte("</body>"), append(js, []byte("</body>")...), 1)
 	case bytes.Contains(htmldata, []byte("<head>")):
 		// If not, place the script in the <head>, if there is a head
 		return bytes.Replace(htmldata, []byte("<head>"), append([]byte("<head>"), js...), 1)
-	case bytes.Contains(htmldata, []byte("<html>")):
+	case huldra.IsHTML(htmldata):
+		const maxPosition = 200
+		htmlTagBytes, err := huldra.GetHTMLTag(htmldata, maxPosition) // try to retrieve the entire <html[...]> tag
+		if err != nil {
+			htmlTagBytes = []byte("<html>")
+		}
+		htmlAndHeadTagBytes := append(htmlTagBytes, []byte("<head>")...)
 		// If not, place the script in the <html> as a new <head>
-		return bytes.Replace(htmldata, []byte("<html>"), append(append([]byte("<html><head>"), js...), []byte("</head>")...), 1)
+		return bytes.Replace(htmldata, htmlTagBytes, append(append(htmlAndHeadTagBytes, js...), []byte("</head>")...), 1)
 	}
 
 	// In the unlikely event that no place to insert the JavaScript was found, just add the script tag to the end