From 9500615466d142093ce7869ab4430ca04d0b7483 Mon Sep 17 00:00:00 2001
From: rupor <rupor0mail@gmail.com>
Date: Sat, 13 May 2017 08:58:18 -0400
Subject: [PATCH] A bit more pagination

---
 modules/fb2html.py | 8 ++++++--
 version.py         | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/fb2html.py b/modules/fb2html.py
index ab6c72a..8bfacff 100644
--- a/modules/fb2html.py
+++ b/modules/fb2html.py
@@ -821,8 +821,12 @@ def parse_format(self, elem, tag=None, css=None, href=None):
             if self.current_file in self.pages_list and self.page_length + len(elem.text) >= self.characters_per_page:
                 page = self.pages_list[self.current_file]
                 text = ''
+
                 for w in elem.text.split(' '):
-                    text = w if text == '' else ' '.join([text, w])
+                    if not text:
+                        text = ' ' if not w else w
+                    else:
+                        text = ' '.join([text, w])
                     if self.page_length + len(text) >= self.characters_per_page:
                         hs = self.insert_hyphenation(text)
                         if dodropcaps > 0:
@@ -830,7 +834,7 @@ def parse_format(self, elem, tag=None, css=None, href=None):
                             dodropcaps = 0
                         else:
                             self.buff.append(save_html(hs))
-                        self.buff.append('<a class="pagemarker" id="page_{0:d}"/>'.format(page))
+                        self.buff.append('<a class="pagemarker" id="page_{0:d}"/> '.format(page))
                         page += 1
                         text = ''
                         self.page_length = 0
diff --git a/version.py b/version.py
index 20b3a60..6f92d8c 100644
--- a/version.py
+++ b/version.py
@@ -4,4 +4,4 @@
 
 WINDOWS = platform.system().lower() == "windows"
 
-VERSION = u'3.6.20'
+VERSION = u'3.6.21'