Commit 66d184ce authored by Dimitri van Heesch's avatar Dimitri van Heesch
Browse files

Bug 688858 - SHORT_NAMES break references to \page in PDF output

parent 4fcc4168

src/index.cpp

+5 −2
Original line number Diff line number Diff line
@@ -4129,16 +4129,19 @@ static void writeIndex(OutputList &ol) 
        }

        QCString title = pd->title();

        if (title.isEmpty()) title=pd->name();



        ol.startIndexSection(isPageDocumentation);

        ol.parseText(title);

        ol.endIndexSection(isPageDocumentation);



        ol.pushGeneratorState(); // write TOC title (RTF only)

          ol.disableAllBut(OutputGenerator::RTF);

          ol.startIndexSection(isPageDocumentation2);

          ol.parseText(title);

          ol.endIndexSection(isPageDocumentation2);

        ol.popGeneratorState();

        ol.writeAnchor(0,pd->name());



        ol.writeAnchor(0,pd->getOutputFileBase());



        ol.writePageLink(pd->getOutputFileBase(),first);

        first=FALSE;

src/pagedef.cpp

+14 −0
Original line number Diff line number Diff line
@@ -61,6 +61,20 @@ QCString PageDef::getOutputFileBase() const 
    return m_fileName; 

}



void PageDef::setFileName(const char *name) 

{ 

  static bool shortNames = Config_getBool("SHORT_NAMES");

  if (shortNames)

  {

    m_fileName = convertNameToFile(name);

  }

  else

  {

    m_fileName = name; 

  }

}





void PageDef::addInnerCompound(Definition *def)

{

  if (def->definitionType()==Definition::TypePage)

src/pagedef.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ class PageDef : public Definition 
   ~PageDef();



    // setters

    void setFileName(const char *name) { m_fileName = name; }

    void setFileName(const char *name);

    void setShowToc(bool b);



    // getters