Commit 8295d3ff authored by Dimitri van Heesch's avatar Dimitri van Heesch
Browse files

Bug 700646 - XML output does not handle HTML entities in titles

parent 1e7e76af

src/latexdocvisitor.cpp

+3 −3
Original line number Diff line number Diff line
@@ -142,9 +142,9 @@ void LatexDocVisitor::visit(DocSymbol *s) 
    case DocSymbol::DoubleColon:  m_t << "::"; break;

    case DocSymbol::Percent: m_t << "\\%"; break;

    case DocSymbol::Pipe:    m_t << "$|$"; break;

    case DocSymbol::Copy:    m_t << "\\copyright"; break;

    case DocSymbol::Tm:      m_t << "\\texttrademark"; break;

    case DocSymbol::Reg:     m_t << "\\textregistered"; break;

    case DocSymbol::Copy:    m_t << "\\copyright{}"; break;

    case DocSymbol::Tm:      m_t << "\\texttrademark{}"; break;

    case DocSymbol::Reg:     m_t << "\\textregistered{}"; break;

    case DocSymbol::Apos:    m_t << "'"; break;

    case DocSymbol::Quot:    m_t << "\""; break;

    case DocSymbol::Lsquo:   m_t << "`"; break;

src/xmldocvisitor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -587,7 +587,7 @@ void XmlDocVisitor::visitPre(DocSection *s) 
  if (!s->anchor().isEmpty()) m_t << "_1" << s->anchor();

  m_t << "\">" << endl;

  m_t << "<title>";

  filter(s->title());

  filter(convertCharEntitiesToUTF8(s->title()));

  m_t << "</title>" << endl;

}

src/xmlgen.cpp

+5 −3
Original line number Diff line number Diff line
@@ -1838,20 +1838,22 @@ static void generateXMLForPage(PageDef *pd,FTextStream &ti,bool isExample) 
    QCString title;

    if (!pd->title().isEmpty() && pd->title().lower()!="notitle")

    {

      title = filterTitle(Doxygen::mainPage->title());

      title = filterTitle(convertCharEntitiesToUTF8(Doxygen::mainPage->title()));

    }

    else 

    {

      title = Config_getString("PROJECT_NAME");

    }

    t << "    <title>" << convertToXML(title) << "</title>" << endl;

    t << "    <title>" << convertToXML(convertCharEntitiesToUTF8(title)) 

      << "</title>" << endl;

  }

  else

  {

    SectionInfo *si = Doxygen::sectionDict->find(pd->name());

    if (si)

    {

      t << "    <title>" << convertToXML(si->title) << "</title>" << endl;

      t << "    <title>" << convertToXML(convertCharEntitiesToUTF8(si->title)) 

        << "</title>" << endl;

    }

  }

  writeInnerPages(pd->getSubPages(),t);