fix(renderer): poor handling of windows carriage return

exec/renderer.go

@@ -61,18 +61,18 @@ func (r *Renderer) Visit(node nodes.Node) (nodes.Visitor, error) {
 		return nil, nil
 	case *nodes.Data:
 		output := n.Data.Val
-		if n.RemoveFirstLineReturn && output[0:1] == "\n" {
+		if n.RemoveFirstLineReturn && (output[0:1] == "\n" || output[0:2] == "\r\n") {
 			output = output[1:]
 		}
 		if n.Trim.Left {
-			output = strings.TrimLeft(output, " \n\t")
+			output = strings.TrimLeft(output, " \r\n\t")
 		}
 		if n.Trim.Right {
-			output = strings.TrimRight(output, " \n\t")
+			output = strings.TrimRight(output, " \r\n\t")
 		}
 		if n.RemoveTrailingWhiteSpaceFromLastLine {
 			lines := strings.Split(output, "\n")
-			lines = append(lines[0:len(lines)-1], strings.TrimRight(lines[len(lines)-1], " \n\t"))
+			lines = append(lines[0:len(lines)-1], strings.TrimRight(lines[len(lines)-1], " \n\t\r"))
 			output = strings.Join(lines, "\n")
 		}
 		_, err := io.WriteString(r.Output, output)

parser/parser.go

@@ -13,7 +13,7 @@ import (
 )
 
 var (
-	lineReturnWithOnlyWhiteSpace = regexp.MustCompile("^(\n|\r)[ \t]*$")
+	lineReturnWithOnlyWhiteSpace = regexp.MustCompile("^(\n|\r\n)[ \t]*$")
 )
 
 type ControlStructureGetter interface {

tokens/lexer.go

@@ -555,11 +555,6 @@ func isSpace(r rune) bool {
 	return r == ' ' || r == '\t'
 }
 
-// isEndOfLine reports whether r is an end-of-line character.
-func isEndOfLine(r rune) bool {
-	return r == '\r' || r == '\n'
-}
-
 // isAlphaNumeric reports whether r is an alphabetic, digit, or underscore.
 func isAlphaNumeric(r rune) bool {
 	return r == '_' || unicode.IsLetter(r) || unicode.IsDigit(r)