Fix problem with unmatched <p> tags around highlighted code blocks

sysgears · Jan 28, 2014 · 631fa49 · 631fa49
1 parent 6cbc446
commit 631fa49
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/main/groovy/com/sysgears/grain/render/GroovyTemplate.groovy b/src/main/groovy/com/sysgears/grain/render/GroovyTemplate.groovy
@@ -99,7 +99,7 @@ class GroovyTemplate implements ResourceTemplate {
             scriptObject.run()
             String content = writer.toString()
             view = new ResourceView()
-            view.content = content.replaceAll('<p><figure', '<figure').replaceAll('</figure></p>', '</figure>')
+            view.content = content.replaceAll(/(?s)<p>(<figure.+?<\/figure>)<\/p>/, '$1')
             view.full = view.content
             view.bytes = view.full.bytes
             def renderTime = System.currentTimeMillis() - startRenderTime

diff --git a/src/main/groovy/com/sysgears/grain/render/TextTemplate.groovy b/src/main/groovy/com/sysgears/grain/render/TextTemplate.groovy
@@ -74,8 +74,7 @@ class TextTemplate implements ResourceTemplate {
         String content = contents.replaceAll(/```/, {
             this.fragments[codeIdx++]
         })
-        view.content = content.replaceAll('<p><figure', '<figure').
-                replaceAll('</figure></p>', '</figure>')
+        view.content = content.replaceAll(/(?s)<p>(<figure.+?<\/figure>)<\/p>/, '$1')
         view.full = view.content
         view.bytes = view.full.bytes