Permalink
Browse files

Fixup man only output to use generator state push pop

  • Loading branch information...
artur-kink committed Sep 26, 2016
1 parent 98d3f8e commit 051fb8a536e1d52aa0a0422186975852dd139c06
Showing with 17 additions and 9 deletions.
  1. +2 −1 src/classdef.cpp
  2. +2 −1 src/dirdef.cpp
  3. +2 −1 src/filedef.cpp
  4. +6 −3 src/groupdef.cpp
  5. +2 −1 src/namespacedef.cpp
  6. +3 −2 src/pagedef.cpp
@@ -954,9 +954,10 @@ void ClassDef::writeBriefDescription(OutputList &ol,bool exampleFlag)
if (hasBriefDescription())
{
ol.startParagraph();
ol.pushGeneratorState();
ol.disableAllBut(OutputGenerator::Man);
ol.writeString(" - ");
ol.enableAll();
ol.popGeneratorState();
ol.generateDoc(briefFile(),briefLine(),this,0,
briefDescription(),TRUE,FALSE,0,TRUE,FALSE);
ol.pushGeneratorState();
@@ -177,9 +177,10 @@ void DirDef::writeBriefDescription(OutputList &ol)
if (rootNode && !rootNode->isEmpty())
{
ol.startParagraph();
ol.pushGeneratorState();
ol.disableAllBut(OutputGenerator::Man);
ol.writeString(" - ");
ol.enableAll();
ol.popGeneratorState();
ol.writeDoc(rootNode,this,0);
ol.pushGeneratorState();
ol.disable(OutputGenerator::RTF);
@@ -373,9 +373,10 @@ void FileDef::writeBriefDescription(OutputList &ol)
if (rootNode && !rootNode->isEmpty())
{
ol.startParagraph();
ol.pushGeneratorState();
ol.disableAllBut(OutputGenerator::Man);
ol.writeString(" - ");
ol.enableAll();
ol.popGeneratorState();
ol.writeDoc(rootNode,this,0);
ol.pushGeneratorState();
ol.disable(OutputGenerator::RTF);
@@ -712,10 +712,8 @@ void GroupDef::writeDetailedDescription(OutputList &ol,const QCString &title)
)
{
ol.pushGeneratorState();
ol.disableAllBut(OutputGenerator::Man); // always print title for man page
if (pageDict->count()!=countMembers()) // not only pages -> classical layout
{
ol.enableAll();
ol.pushGeneratorState();
ol.disable(OutputGenerator::Html);
ol.writeRuler();
@@ -725,6 +723,10 @@ void GroupDef::writeDetailedDescription(OutputList &ol,const QCString &title)
ol.writeAnchor(0,"details");
ol.popGeneratorState();
}
else
{
ol.disableAllBut(OutputGenerator::Man); // always print title for man page
}
ol.startGroupHeader();
ol.parseText(title);
ol.endGroupHeader();
@@ -773,9 +775,10 @@ void GroupDef::writeBriefDescription(OutputList &ol)
if (rootNode && !rootNode->isEmpty())
{
ol.startParagraph();
ol.pushGeneratorState();
ol.disableAllBut(OutputGenerator::Man);
ol.writeString(" - ");
ol.enableAll();
ol.popGeneratorState();
ol.writeDoc(rootNode,this,0);
ol.pushGeneratorState();
ol.disable(OutputGenerator::RTF);
@@ -408,9 +408,10 @@ void NamespaceDef::writeBriefDescription(OutputList &ol)
if (rootNode && !rootNode->isEmpty())
{
ol.startParagraph();
ol.pushGeneratorState();
ol.disableAllBut(OutputGenerator::Man);
ol.writeString(" - ");
ol.enableAll();
ol.popGeneratorState();
ol.writeDoc(rootNode,this,0);
ol.pushGeneratorState();
ol.disable(OutputGenerator::RTF);
@@ -232,16 +232,17 @@ void PageDef::writePageDocumentation(OutputList &ol)
QCString docStr = documentation()+inbodyDocumentation();
if (!docStr.isEmpty())
{
ol.pushGeneratorState();
ol.disableAllBut(OutputGenerator::Man);
ol.writeString(" - ");
ol.enableAll();
ol.popGeneratorState();
}
ol.generateDoc(
docFile(), // fileName
docLine(), // startLine
this, // context
0, // memberdef
docStr, // docStr
docStr, // docStr
TRUE, // index words
FALSE // not an example
);

0 comments on commit 051fb8a

Please sign in to comment.