Remove need to fix self closing tags by improving gumbo

Sigil-Ebook · Nov 25, 2015 · 716666a · 716666a
1 parent 3063085
commit 716666a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/src/Misc/GumboInterface.cpp b/src/Misc/GumboInterface.cpp
@@ -145,8 +145,6 @@ void GumboInterface::parse()
     if (!m_source.isEmpty() && (m_output == NULL)) {
 
         m_hasnbsp = m_source.contains("&nbsp;");
-        // fix any non html valid self-closing tags
-        m_source = fix_self_closing_tags(m_source);
         m_utf8src = m_source.toStdString();
         // remove any xml header line and any trailing whitespace
         if (m_utf8src.compare(0,5,"<?xml") == 0) {
@@ -457,9 +455,6 @@ QList<GumboWellFormedError> GumboInterface::error_check()
 
     if (!m_source.isEmpty() && (m_output == NULL)) {
 
-        // fix any non html valid self-closing tags
-        m_source = fix_self_closing_tags(m_source);
-
         m_utf8src = m_source.toStdString();
         // remove any xml header line and trailing whitespace
         if (m_utf8src.compare(0,5,"<?xml") == 0) {
@@ -1212,6 +1207,7 @@ std::string GumboInterface::prettyprint(GumboNode* node, int lvl, const std::str
 }
 
 
+#if 0
 
 // handle a few special cases that are hard to deal with inside of gumbo
 
@@ -1224,8 +1220,6 @@ static QStringList allowed_void_tags = QStringList() << "area"    << "base"
                                                      << "param"   << "source"   << "spacer" 
                                                      << "track"   << "wbr";
 
-#if 0
-
 // Handle the general case
 QString GumboInterface::fix_self_closing_tags(const QString &source)
 {
@@ -1256,8 +1250,6 @@ QString GumboInterface::fix_self_closing_tags(const QString &source)
     return newsource;
 }
 
-#else
-
 // Handle the specific problem of iframe being self-closed
 QString GumboInterface::fix_self_closing_tags(const QString &source)
 {

diff --git a/src/Misc/GumboInterface.h b/src/Misc/GumboInterface.h
@@ -143,7 +143,8 @@ class GumboInterface
 
     void replace_all(std::string &s, const char * s1, const char * s2);
 
-    QString fix_self_closing_tags(const QString & source);
+    // Hopefully now unneeded
+    // QString fix_self_closing_tags(const QString & source);
 
     QString                         m_source;
     GumboOutput*                    m_output;