From b1a03e2d27b3e271beb067f9b7fb6c079792cf93 Mon Sep 17 00:00:00 2001
From: Niklas Fasching <niklas.fasching@gmail.com>
Date: Tue, 11 Dec 2018 16:08:58 +0100
Subject: [PATCH] Make highlightCodeBlock render enclosing div tags on separate
 lines

---
 main.go                     |  2 +-
 org/html.go                 |  2 +-
 org/testdata/blocks.html    | 10 +++++++---
 org/testdata/captions.html  |  4 +++-
 org/testdata/footnotes.html |  4 +++-
 org/testdata/lists.html     |  4 +++-
 6 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/main.go b/main.go
index 22e229b..0c1f8df 100644
--- a/main.go
+++ b/main.go
@@ -50,5 +50,5 @@ func highlightCodeBlock(source, lang string) string {
 	l = chroma.Coalesce(l)
 	it, _ := l.Tokenise(nil, source)
 	_ = html.New().Format(&w, styles.Get("friendly"), it)
-	return `<div class="highlight">` + w.String() + `</div>`
+	return `<div class="highlight">` + "\n" + w.String() + "\n" + `</div>`
 }
diff --git a/org/html.go b/org/html.go
index c64ee21..30aa1c1 100644
--- a/org/html.go
+++ b/org/html.go
@@ -34,7 +34,7 @@ var listTags = map[string][]string{
 func NewHTMLWriter() *HTMLWriter {
 	return &HTMLWriter{
 		HighlightCodeBlock: func(source, lang string) string {
-			return fmt.Sprintf(`<div class="highlight"><pre>%s</pre></div>`, html.EscapeString(source))
+			return fmt.Sprintf(`<div class="highlight">%s<pre>%s</pre>%s</div>`, "\n", html.EscapeString(source), "\n")
 		},
 	}
 }
diff --git a/org/testdata/blocks.html b/org/testdata/blocks.html
index 7b31dba..a86d2f7 100644
--- a/org/testdata/blocks.html
+++ b/org/testdata/blocks.html
@@ -1,12 +1,16 @@
 <div class="captioned">
-<div class="highlight"><pre>echo a bash source block</pre></div>
+<div class="highlight">
+<pre>echo a bash source block</pre>
+</div>
 <p class="caption">
 block!
 </p>
 </div>
-<div class="highlight"><pre>a source block without a language
+<div class="highlight">
+<pre>a source block without a language
 and a second line
-and a third one</pre></div>
+and a third one</pre>
+</div>
 <pre class="example">
 an example block
 with multiple lines
diff --git a/org/testdata/captions.html b/org/testdata/captions.html
index f4b068c..b42b6bc 100644
--- a/org/testdata/captions.html
+++ b/org/testdata/captions.html
@@ -2,7 +2,9 @@
 Anything can be captioned. Also captions are not real, correct captions but just a paragraph below the element (bothe wrapped into a div)
 </p>
 <div class="captioned">
-<div class="highlight"><pre>echo &#34;i have a caption!&#34;</pre></div>
+<div class="highlight">
+<pre>echo &#34;i have a caption!&#34;</pre>
+</div>
 <p class="caption">
 captioned soure block
 </p>
diff --git a/org/testdata/footnotes.html b/org/testdata/footnotes.html
index e7991a9..8d22415 100644
--- a/org/testdata/footnotes.html
+++ b/org/testdata/footnotes.html
@@ -40,7 +40,9 @@ and other elements
 <p>
 like blocks
 </p>
-<div class="highlight"><pre>other non-plain</pre></div>
+<div class="highlight">
+<pre>other non-plain</pre>
+</div>
 </li>
 <li>
 <p>
diff --git a/org/testdata/lists.html b/org/testdata/lists.html
index 708a94d..7e3a968 100644
--- a/org/testdata/lists.html
+++ b/org/testdata/lists.html
@@ -48,7 +48,9 @@ and some lines of text
 <p>
 and another subitem
 </p>
-<div class="highlight"><pre>echo with a block</pre></div>
+<div class="highlight">
+<pre>echo with a block</pre>
+</div>
 </li>
 <li>
 <p>