From afa14c568ed6d323e5e33f1436c3f4a1698fe363 Mon Sep 17 00:00:00 2001
From: Jim Miller <retiefjimm@gmail.com>
Date: Sat, 10 Oct 2015 17:14:32 -0500
Subject: [PATCH] Fix for unNew with &amp; in chapter title.

---
 fanficfare/epubutils.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/fanficfare/epubutils.py b/fanficfare/epubutils.py
index 804f3bc..9798a71 100644
--- a/fanficfare/epubutils.py
+++ b/fanficfare/epubutils.py
@@ -265,21 +265,22 @@ def reset_orig_chapters_epub(inputio,outfile):
                 chapterorigtitle = None
                 tag = soup.find('meta',{'name':'chapterorigtitle'})
                 if tag:
-                    chapterorigtitle = tag['content'].replace('"','&quot;')
+                    chapterorigtitle = tag['content'].replace('&','&amp;').replace('"','&quot;')
 
                 # toctitle is separate for add_chapter_numbers:toconly users.
                 chaptertoctitle = None
                 tag = soup.find('meta',{'name':'chaptertoctitle'})
                 if tag:
-                    chaptertoctitle = tag['content'].replace('"','&quot;')
+                    chaptertoctitle = tag['content'].replace('&','&amp;').replace('"','&quot;')
                 elif chapterorigtitle:
                     chaptertoctitle = chapterorigtitle
 
                 chaptertitle = None
                 tag = soup.find('meta',{'name':'chaptertitle'})
                 if tag:
-                    chaptertitle = tag['content'].replace('"','&quot;')
+                    chaptertitle = tag['content'].replace('&','&amp;').replace('"','&quot;')
 
+                # logger.debug("chaptertitle:(%s) chapterorigtitle:(%s)"%(chaptertitle, chapterorigtitle))
                 if chaptertitle and chapterorigtitle and chapterorigtitle != chaptertitle:
                     origdata = data
                     # print("\n%s\n%s\n"%(chapterorigtitle,chaptertitle))