From 6f621186c8e54dfd2d6dc620b26e9e34215456c4 Mon Sep 17 00:00:00 2001
From: alex <alex@cloudware.io>
Date: Sat, 21 Jul 2018 16:24:29 +0200
Subject: [PATCH] Trim trailing whitespace

If a license text had blank lines, they would result in a trailing
whitespace when prefixed with the line comments.

This change removes trailing whitespace from the middle lines,
leaving top and bottom as is.

Fixes #10
---
 testdata/expected/file.c     |  6 +++---
 testdata/expected/file.cc    |  6 +++---
 testdata/expected/file.cpp   |  6 +++---
 testdata/expected/file.cs    |  6 +++---
 testdata/expected/file.css   |  6 +++---
 testdata/expected/file.dart  |  6 +++---
 testdata/expected/file.el    |  6 +++---
 testdata/expected/file.erl   |  6 +++---
 testdata/expected/file.go    |  6 +++---
 testdata/expected/file.h     |  6 +++---
 testdata/expected/file.hh    |  6 +++---
 testdata/expected/file.hpp   |  6 +++---
 testdata/expected/file.hs    |  6 +++---
 testdata/expected/file.html  |  6 +++---
 testdata/expected/file.java  |  6 +++---
 testdata/expected/file.js    |  6 +++---
 testdata/expected/file.lisp  |  6 +++---
 testdata/expected/file.m     |  6 +++---
 testdata/expected/file.mm    |  6 +++---
 testdata/expected/file.php   |  6 +++---
 testdata/expected/file.proto |  6 +++---
 testdata/expected/file.py    |  6 +++---
 testdata/expected/file.rs    |  6 +++---
 testdata/expected/file.scala |  6 +++---
 testdata/expected/file.swift |  6 +++---
 testdata/expected/file.tf    |  6 +++---
 testdata/expected/file.xml   |  6 +++---
 testdata/expected/file1.sh   |  6 +++---
 testdata/expected/file2.sh   |  6 +++---
 tmpl.go                      | 20 +++++++++-----------
 30 files changed, 96 insertions(+), 98 deletions(-)

diff --git a/testdata/expected/file.c b/testdata/expected/file.c
index ca2511c..7876b80 100644
--- a/testdata/expected/file.c
+++ b/testdata/expected/file.c
@@ -1,12 +1,12 @@
 /*
  * Copyright 2016 Google Inc.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/testdata/expected/file.cc b/testdata/expected/file.cc
index 08f8e6f..53656ed 100644
--- a/testdata/expected/file.cc
+++ b/testdata/expected/file.cc
@@ -1,11 +1,11 @@
 // Copyright 2016 Google Inc.
-// 
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-// 
+//
 //      http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/testdata/expected/file.cpp b/testdata/expected/file.cpp
index 08f8e6f..53656ed 100644
--- a/testdata/expected/file.cpp
+++ b/testdata/expected/file.cpp
@@ -1,11 +1,11 @@
 // Copyright 2016 Google Inc.
-// 
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-// 
+//
 //      http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/testdata/expected/file.cs b/testdata/expected/file.cs
index 3634bcf..8137f4f 100644
--- a/testdata/expected/file.cs
+++ b/testdata/expected/file.cs
@@ -1,11 +1,11 @@
 // Copyright 2016 Google Inc.
-// 
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-// 
+//
 //      http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/testdata/expected/file.css b/testdata/expected/file.css
index d028d74..8c01d2d 100644
--- a/testdata/expected/file.css
+++ b/testdata/expected/file.css
@@ -1,12 +1,12 @@
 /**
  * Copyright 2016 Google Inc.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/testdata/expected/file.dart b/testdata/expected/file.dart
index decb9ee..8902b4a 100644
--- a/testdata/expected/file.dart
+++ b/testdata/expected/file.dart
@@ -1,11 +1,11 @@
 // Copyright 2016 Google Inc.
-// 
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-// 
+//
 //      http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/testdata/expected/file.el b/testdata/expected/file.el
index 1487198..aa2a060 100644
--- a/testdata/expected/file.el
+++ b/testdata/expected/file.el
@@ -1,11 +1,11 @@
 ;; Copyright 2016 Google Inc.
-;; 
+;;
 ;; Licensed under the Apache License, Version 2.0 (the "License");
 ;; you may not use this file except in compliance with the License.
 ;; You may obtain a copy of the License at
-;; 
+;;
 ;;      http://www.apache.org/licenses/LICENSE-2.0
-;; 
+;;
 ;; Unless required by applicable law or agreed to in writing, software
 ;; distributed under the License is distributed on an "AS IS" BASIS,
 ;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/testdata/expected/file.erl b/testdata/expected/file.erl
index 003d661..190d223 100644
--- a/testdata/expected/file.erl
+++ b/testdata/expected/file.erl
@@ -1,11 +1,11 @@
 % Copyright 2016 Google Inc.
-% 
+%
 % Licensed under the Apache License, Version 2.0 (the "License");
 % you may not use this file except in compliance with the License.
 % You may obtain a copy of the License at
-% 
+%
 %      http://www.apache.org/licenses/LICENSE-2.0
-% 
+%
 % Unless required by applicable law or agreed to in writing, software
 % distributed under the License is distributed on an "AS IS" BASIS,
 % WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/testdata/expected/file.go b/testdata/expected/file.go
index 864e0fc..7efc920 100644
--- a/testdata/expected/file.go
+++ b/testdata/expected/file.go
@@ -1,11 +1,11 @@
 // Copyright 2016 Google Inc.
-// 
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-// 
+//
 //      http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/testdata/expected/file.h b/testdata/expected/file.h
index 6eef681..fddab60 100644
--- a/testdata/expected/file.h
+++ b/testdata/expected/file.h
@@ -1,12 +1,12 @@
 /*
  * Copyright 2016 Google Inc.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/testdata/expected/file.hh b/testdata/expected/file.hh
index 406d417..817dc30 100644
--- a/testdata/expected/file.hh
+++ b/testdata/expected/file.hh
@@ -1,11 +1,11 @@
 // Copyright 2016 Google Inc.
-// 
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-// 
+//
 //      http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/testdata/expected/file.hpp b/testdata/expected/file.hpp
index 406d417..817dc30 100644
--- a/testdata/expected/file.hpp
+++ b/testdata/expected/file.hpp
@@ -1,11 +1,11 @@
 // Copyright 2016 Google Inc.
-// 
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-// 
+//
 //      http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/testdata/expected/file.hs b/testdata/expected/file.hs
index 54876ef..92f22dc 100644
--- a/testdata/expected/file.hs
+++ b/testdata/expected/file.hs
@@ -1,11 +1,11 @@
 -- Copyright 2016 Google Inc.
--- 
+--
 -- Licensed under the Apache License, Version 2.0 (the "License");
 -- you may not use this file except in compliance with the License.
 -- You may obtain a copy of the License at
--- 
+--
 --      http://www.apache.org/licenses/LICENSE-2.0
--- 
+--
 -- Unless required by applicable law or agreed to in writing, software
 -- distributed under the License is distributed on an "AS IS" BASIS,
 -- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/testdata/expected/file.html b/testdata/expected/file.html
index 108603b..60cb4e0 100644
--- a/testdata/expected/file.html
+++ b/testdata/expected/file.html
@@ -1,12 +1,12 @@
 <!--
  Copyright 2016 Google Inc.
- 
+
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/testdata/expected/file.java b/testdata/expected/file.java
index 92cf1a9..867a5df 100644
--- a/testdata/expected/file.java
+++ b/testdata/expected/file.java
@@ -1,11 +1,11 @@
 // Copyright 2016 Google Inc.
-// 
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-// 
+//
 //      http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/testdata/expected/file.js b/testdata/expected/file.js
index 7f035bd..2d28b46 100644
--- a/testdata/expected/file.js
+++ b/testdata/expected/file.js
@@ -1,12 +1,12 @@
 /**
  * Copyright 2016 Google Inc.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/testdata/expected/file.lisp b/testdata/expected/file.lisp
index bd5673f..87368ea 100644
--- a/testdata/expected/file.lisp
+++ b/testdata/expected/file.lisp
@@ -1,11 +1,11 @@
 ;; Copyright 2016 Google Inc.
-;; 
+;;
 ;; Licensed under the Apache License, Version 2.0 (the "License");
 ;; you may not use this file except in compliance with the License.
 ;; You may obtain a copy of the License at
-;; 
+;;
 ;;      http://www.apache.org/licenses/LICENSE-2.0
-;; 
+;;
 ;; Unless required by applicable law or agreed to in writing, software
 ;; distributed under the License is distributed on an "AS IS" BASIS,
 ;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/testdata/expected/file.m b/testdata/expected/file.m
index 4d6ac84..fb62e4c 100644
--- a/testdata/expected/file.m
+++ b/testdata/expected/file.m
@@ -1,11 +1,11 @@
 // Copyright 2016 Google Inc.
-// 
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-// 
+//
 //      http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/testdata/expected/file.mm b/testdata/expected/file.mm
index 4d6ac84..fb62e4c 100644
--- a/testdata/expected/file.mm
+++ b/testdata/expected/file.mm
@@ -1,11 +1,11 @@
 // Copyright 2016 Google Inc.
-// 
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-// 
+//
 //      http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/testdata/expected/file.php b/testdata/expected/file.php
index beb6392..d19e850 100644
--- a/testdata/expected/file.php
+++ b/testdata/expected/file.php
@@ -1,12 +1,12 @@
 <?php
 // Copyright 2016 Google Inc.
-// 
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-// 
+//
 //      http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/testdata/expected/file.proto b/testdata/expected/file.proto
index 7054ebc..29614d8 100644
--- a/testdata/expected/file.proto
+++ b/testdata/expected/file.proto
@@ -1,11 +1,11 @@
 // Copyright 2016 Google Inc.
-// 
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-// 
+//
 //      http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/testdata/expected/file.py b/testdata/expected/file.py
index c3b728a..0dd9b5e 100644
--- a/testdata/expected/file.py
+++ b/testdata/expected/file.py
@@ -1,11 +1,11 @@
 # Copyright 2016 Google Inc.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #      http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/testdata/expected/file.rs b/testdata/expected/file.rs
index c4d0dac..662098a 100644
--- a/testdata/expected/file.rs
+++ b/testdata/expected/file.rs
@@ -1,11 +1,11 @@
 // Copyright 2016 Google Inc.
-// 
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-// 
+//
 //      http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/testdata/expected/file.scala b/testdata/expected/file.scala
index 4ccde5e..05971de 100644
--- a/testdata/expected/file.scala
+++ b/testdata/expected/file.scala
@@ -1,11 +1,11 @@
 // Copyright 2016 Google Inc.
-// 
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-// 
+//
 //      http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/testdata/expected/file.swift b/testdata/expected/file.swift
index aba4fa9..63243f0 100644
--- a/testdata/expected/file.swift
+++ b/testdata/expected/file.swift
@@ -1,11 +1,11 @@
 // Copyright 2016 Google Inc.
-// 
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-// 
+//
 //      http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/testdata/expected/file.tf b/testdata/expected/file.tf
index 726f114..a6ce33e 100644
--- a/testdata/expected/file.tf
+++ b/testdata/expected/file.tf
@@ -1,12 +1,12 @@
 /**
  * Copyright 2016 Google Inc.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/testdata/expected/file.xml b/testdata/expected/file.xml
index 0f6c669..425179f 100644
--- a/testdata/expected/file.xml
+++ b/testdata/expected/file.xml
@@ -1,12 +1,12 @@
 <!--
  Copyright 2016 Google Inc.
- 
+
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/testdata/expected/file1.sh b/testdata/expected/file1.sh
index 6be5639..364f0ae 100644
--- a/testdata/expected/file1.sh
+++ b/testdata/expected/file1.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 # Copyright 2016 Google Inc.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #      http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/testdata/expected/file2.sh b/testdata/expected/file2.sh
index ba091c3..93232fd 100644
--- a/testdata/expected/file2.sh
+++ b/testdata/expected/file2.sh
@@ -1,12 +1,12 @@
 #!/usr/bin/go run prog.go $*
 # Copyright 2016 Google Inc.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #      http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/tmpl.go b/tmpl.go
index 73731f5..6119c1c 100644
--- a/tmpl.go
+++ b/tmpl.go
@@ -15,9 +15,12 @@
 package main
 
 import (
+	"bufio"
 	"bytes"
 	"fmt"
 	"html/template"
+	"strings"
+	"unicode"
 )
 
 var licenseTemplate = make(map[string]*template.Template)
@@ -47,21 +50,16 @@ func prefix(l string, d *copyrightData, top, mid, bot string) ([]byte, error) {
 	}
 	var out bytes.Buffer
 	if top != "" {
-		out.WriteString(top)
-		out.WriteRune('\n')
+		fmt.Fprintln(&out, top)
 	}
-	out.WriteString(mid)
-	for _, c := range buf.Bytes() {
-		out.WriteByte(c)
-		if c == '\n' {
-			out.WriteString(mid)
-		}
+	s := bufio.NewScanner(&buf)
+	for s.Scan() {
+		fmt.Fprintln(&out, strings.TrimRightFunc(mid+s.Text(), unicode.IsSpace))
 	}
 	if bot != "" {
-		out.WriteRune('\n')
-		out.WriteString(bot)
+		fmt.Fprintln(&out, bot)
 	}
-	out.Write([]byte{'\n', '\n'})
+	fmt.Fprintln(&out)
 	return out.Bytes(), nil
 }