diff --git a/src/libprs500/__init__.py b/src/libprs500/__init__.py index 6eac0b89bd..9ce0dc8ba3 100644 --- a/src/libprs500/__init__.py +++ b/src/libprs500/__init__.py @@ -13,7 +13,7 @@ ## with this program; if not, write to the Free Software Foundation, Inc., ## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ''' E-book management software''' -__version__ = "0.3.60" +__version__ = "0.3.61" __docformat__ = "epytext" __author__ = "Kovid Goyal " __appname__ = 'libprs500' diff --git a/src/libprs500/ebooks/lrf/html/convert_from.py b/src/libprs500/ebooks/lrf/html/convert_from.py index d475d274fc..c4bbaaf8f5 100644 --- a/src/libprs500/ebooks/lrf/html/convert_from.py +++ b/src/libprs500/ebooks/lrf/html/convert_from.py @@ -229,8 +229,8 @@ class HTMLConverter(object): (re.compile(r"<\s*style.*?>(.*?)<\/\s*style\s*>", re.DOTALL|re.IGNORECASE), lambda match: match.group().replace('', '')), # remove

tags from within tags - (re.compile(r'.*?()', re.DOTALL|re.IGNORECASE), - lambda match: match.group().replace(match.group(1), '')), + (re.compile(r'(.*?)', re.DOTALL|re.IGNORECASE), + lambda match: re.compile(r'<.*?p.*?>', re.IGNORECASE).sub('', match.group())), ] # Fix Baen markup BAEN_SANCTIFY = [(re.compile(r'<\s*[Aa]\s+id="p[0-9]+"\s+name="p[0-9]+"\s*>\s*<\/[Aa]>'),