Flex "inline" note style a bit - allow css formatting. Fixes for drop…

…cap processing
rupor-github · May 8, 2017 · dcce547 · dcce547
1 parent 57ba746
commit dcce547
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/modules/fb2html.py b/modules/fb2html.py
@@ -822,7 +822,7 @@ def parse_format(self, elem, tag=None, css=None, href=None):
                 page = self.pages_list[self.current_file]
                 text = ''
                 for w in elem.text.split(' '):
-                    text = ' '.join([text, w])
+                    text = w if text == '' else ' '.join([text, w])
                     if self.page_length + len(text) >= self.characters_per_page:
                         hs = self.insert_hyphenation(text)
                         if dodropcaps > 0:
@@ -916,7 +916,7 @@ def parse_format(self, elem, tag=None, css=None, href=None):
 
             if self.current_notes:
                 if self.notes_mode == 'inline' and tag == 'span':
-                    self.buff.append('<span class="inlinenote">[{0}]</span>'.format(save_html(self.insert_hyphenation(''.join(self.current_notes[0][1])))))
+                    self.buff.append('<span class="inlinenote">{0}</span>'.format(save_html(self.insert_hyphenation(''.join(self.current_notes[0][1])))))
                     self.current_notes = []
                 elif self.notes_mode == 'block' and tag == 'p':
                     self.buff.append('<div class="blocknote">')

diff --git a/profiles/default.css b/profiles/default.css
@@ -217,6 +217,14 @@ p.title {
     color: #6e6e6e;
 }
 
+.inlinenote::before { 
+    content: "["; 
+} 
+
+.inlinenote::after { 
+    content: "]"; 
+}
+
 .blocknote {
     font-style: italic;
     font-size: 80%;

diff --git a/version.py b/version.py
@@ -4,4 +4,4 @@
 
 WINDOWS = platform.system().lower() == "windows"
 
-VERSION = u'3.6.18'
+VERSION = u'3.6.19'