From 97536e397fc138b581e04ebb1f26c8e41efdf38f Mon Sep 17 00:00:00 2001
From: John Schember <john@nachtimwald.com>
Date: Mon, 13 Dec 2010 18:38:37 -0500
Subject: [PATCH 1/2] FB2 Output: add blank line after paragraphs when
 insert-blank-line option used. Use <empty-line /> instead of CSS because not
 many readers support CSS in FB2 files.

---
 src/calibre/ebooks/fb2/fb2ml.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/calibre/ebooks/fb2/fb2ml.py b/src/calibre/ebooks/fb2/fb2ml.py
index 51bfaa7293..89c12db103 100644
--- a/src/calibre/ebooks/fb2/fb2ml.py
+++ b/src/calibre/ebooks/fb2/fb2ml.py
@@ -73,6 +73,10 @@ class FB2MLizer(object):
         text = re.sub(r'(?miu)<p>\s*</p>', '', text)
         text = re.sub(r'(?miu)\s+</p>', '</p>', text)
         text = re.sub(r'(?miu)</p><p>', '</p>\n\n<p>', text)
+        
+        if self.opts.insert_blank_line:
+            text = re.sub(r'(?miu)</p>', '</p><empty-line />', text)
+        
         return text
 
     def fb2_header(self):

From 3df1780251d802d7de47bbf0484a932e0bf945bf Mon Sep 17 00:00:00 2001
From: John Schember <john@nachtimwald.com>
Date: Mon, 13 Dec 2010 18:57:05 -0500
Subject: [PATCH 2/2] FB2 Output: Add support for some 2.1 style tags.

---
 src/calibre/ebooks/fb2/fb2ml.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/calibre/ebooks/fb2/fb2ml.py b/src/calibre/ebooks/fb2/fb2ml.py
index 89c12db103..5efc360f1f 100644
--- a/src/calibre/ebooks/fb2/fb2ml.py
+++ b/src/calibre/ebooks/fb2/fb2ml.py
@@ -297,6 +297,18 @@ class FB2MLizer(object):
             s_out, s_tags = self.handle_simple_tag('emphasis', tag_stack+tags)
             fb2_out += s_out
             tags += s_tags
+        elif tag in ('del', 'strike'):
+            s_out, s_tags = self.handle_simple_tag('strikethrough', tag_stack+tags)
+            fb2_out += s_out
+            tags += s_tags
+        elif tag == 'sub':
+            s_out, s_tags = self.handle_simple_tag('sub', tag_stack+tags)
+            fb2_out += s_out
+            tags += s_tags
+        elif tag == 'sup':
+            s_out, s_tags = self.handle_simple_tag('sup', tag_stack+tags)
+            fb2_out += s_out
+            tags += s_tags
 
         # Processes style information.
         if style['font-style'] == 'italic':
@@ -307,6 +319,10 @@ class FB2MLizer(object):
             s_out, s_tags = self.handle_simple_tag('strong', tag_stack+tags)
             fb2_out += s_out
             tags += s_tags
+        elif style['text-decoration'] == 'line-through':
+            s_out, s_tags = self.handle_simple_tag('strikethrough', tag_stack+tags)
+            fb2_out += s_out
+            tags += s_tags
 
         # Process element text.
         if hasattr(elem_tree, 'text') and elem_tree.text: