Fixes gohugoio/hugo#6549

0xsmiler · Nov 29, 2019 · c1d7163 · c1d7163
1 parent cd33eaa
commit c1d7163
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/_test/extra.txt b/_test/extra.txt
@@ -8,3 +8,15 @@
 B</li>
 </ul>
 //= = = = = = = = = = = = = = = = = = = = = = = =//
+2
+//- - - - - - - - -//
+**test**\
+test**test**\
+**test**test\
+test**test**
+//- - - - - - - - -//
+<p><strong>test</strong><br />
+test<strong>test</strong><br />
+<strong>test</strong>test<br />
+test<strong>test</strong></p>
+//= = = = = = = = = = = = = = = = = = = = = = = =//
diff --git a/parser/parser.go b/parser/parser.go
@@ -1088,17 +1088,17 @@ func (p *parser) parseBlock(block text.BlockReader, parent ast.Node, pc Context)
 		lineLength := len(line)
 		hardlineBreak := false
 		softLinebreak := line[lineLength-1] == '\n'
-		if lineLength > 2 && line[lineLength-2] == '\\' && softLinebreak { // ends with \\n
+		if lineLength >= 2 && line[lineLength-2] == '\\' && softLinebreak { // ends with \\n
 			lineLength -= 2
 			hardlineBreak = true
 
-		} else if lineLength > 3 && line[lineLength-3] == '\\' && line[lineLength-2] == '\r' && softLinebreak { // ends with \\r\n
+		} else if lineLength >= 3 && line[lineLength-3] == '\\' && line[lineLength-2] == '\r' && softLinebreak { // ends with \\r\n
 			lineLength -= 3
 			hardlineBreak = true
-		} else if lineLength > 3 && line[lineLength-3] == ' ' && line[lineLength-2] == ' ' && softLinebreak { // ends with [space][space]\n
+		} else if lineLength >= 3 && line[lineLength-3] == ' ' && line[lineLength-2] == ' ' && softLinebreak { // ends with [space][space]\n
 			lineLength -= 3
 			hardlineBreak = true
-		} else if lineLength > 4 && line[lineLength-4] == ' ' && line[lineLength-3] == ' ' && line[lineLength-2] == '\r' && softLinebreak { // ends with [space][space]\r\n
+		} else if lineLength >= 4 && line[lineLength-4] == ' ' && line[lineLength-3] == ' ' && line[lineLength-2] == '\r' && softLinebreak { // ends with [space][space]\r\n
 			lineLength -= 4
 			hardlineBreak = true
 		}