diff -r e1d06cd563da -r a9fe976e01a6 exports.cpp --- a/exports.cpp Tue Oct 16 09:53:22 2007 +0000 +++ b/exports.cpp Tue Oct 16 09:53:22 2007 +0000 @@ -151,26 +151,29 @@ // Make indentstring for (i=0;igetDepth();i++) actIndent+= indentPerDepth; - if (bo->getDepth()==0) + if (!bo->hasHiddenExportParent() ) { - ts << (bo->getHeading()+ "\n"); - for (j=0;jgetHeading().length();j++) ts<<"="; - ts << "\n"; - } else if (bo->getDepth()==1) - ts << ("\n"+getSectionString(bo) + bo->getHeading()+ "\n"); - else if (bo->getDepth()==2) - ts << (actIndent + " * " + bo->getHeading()+ "\n"); - else if (bo->getDepth()==3) - ts << (actIndent + " o " + bo->getHeading()+ "\n"); - else - ts << (actIndent + " - " + bo->getHeading()+ "\n"); - - // If necessary, write note - if (!bo->getNote().isEmpty()) - { - s =bo->getNoteASCII(); - s=s.replace ("\n","\n"+actIndent); - ts << (s+"\n\n"); + if (bo->getDepth()==0) + { + ts << (bo->getHeading()+ "\n"); + for (j=0;jgetHeading().length();j++) ts<<"="; + ts << "\n"; + } else if (bo->getDepth()==1) + ts << ("\n"+getSectionString(bo) + bo->getHeading()+ "\n"); + else if (bo->getDepth()==2) + ts << (actIndent + " * " + bo->getHeading()+ "\n"); + else if (bo->getDepth()==3) + ts << (actIndent + " o " + bo->getHeading()+ "\n"); + else + ts << (actIndent + " - " + bo->getHeading()+ "\n"); + + // If necessary, write note + if (!bo->getNote().isEmpty()) + { + s =bo->getNoteASCII(); + s=s.replace ("\n","\n"+actIndent); + ts << (s+"\n\n"); + } } bo=bo->next(); actIndent=""; @@ -201,20 +204,23 @@ bo=mapCenter->first(); while (bo) { - // If necessary, write note - if (!bo->getNote().isEmpty()) + if (!bo->hasHiddenExportParent() ) { - s =bo->getNoteASCII(); - s=s.replace ("\n","\n"+actIndent); - ts << ("\""+s+"\","); - } else - ts <<"\"\","; + // If necessary, write note + if (!bo->getNote().isEmpty()) + { + s =bo->getNoteASCII(); + s=s.replace ("\n","\n"+actIndent); + ts << ("\""+s+"\","); + } else + ts <<"\"\","; - // Make indentstring - for (i=0;igetDepth();i++) actIndent+= "\"\","; + // Make indentstring + for (i=0;igetDepth();i++) actIndent+= "\"\","; - // Write heading - ts << actIndent << "\"" << bo->getHeading()<<"\""<getHeading()<<"\""<next(); actIndent=""; @@ -340,27 +346,30 @@ BranchObj *bo; bo=mapCenter->first(); while (bo) { - if (bo->getDepth()==0); - else if (bo->getDepth()==1) { - ts << ("\\chapter{" + bo->getHeading()+ "}\n"); - } - else if (bo->getDepth()==2) { - ts << ("\\section{" + bo->getHeading()+ "}\n"); - } - else if (bo->getDepth()==3) { - ts << ("\\subsection{" + bo->getHeading()+ "}\n"); - } - else if (bo->getDepth()==4) { - ts << ("\\subsubsection{" + bo->getHeading()+ "}\n"); - } - else { - ts << ("\\paragraph*{" + bo->getHeading()+ "}\n"); - } - - // If necessary, write note - if (!bo->getNote().isEmpty()) { - ts << (bo->getNoteASCII()); - ts << ("\n"); + if (!bo->hasHiddenExportParent() ) + { + if (bo->getDepth()==0); + else if (bo->getDepth()==1) { + ts << ("\\chapter{" + bo->getHeading()+ "}\n"); + } + else if (bo->getDepth()==2) { + ts << ("\\section{" + bo->getHeading()+ "}\n"); + } + else if (bo->getDepth()==3) { + ts << ("\\subsection{" + bo->getHeading()+ "}\n"); + } + else if (bo->getDepth()==4) { + ts << ("\\subsubsection{" + bo->getHeading()+ "}\n"); + } + else { + ts << ("\\paragraph*{" + bo->getHeading()+ "}\n"); + } + + // If necessary, write note + if (!bo->getNote().isEmpty()) { + ts << (bo->getNoteASCII()); + ts << ("\n"); + } } bo=bo->next(); } @@ -386,22 +395,25 @@ bo=current->getFirstBranch(); if (bo) { - // Start list - r+="\n"; - while (bo) - { - r+=""; - r+=quotemeta(bo->getHeading()); - // If necessary, write note - if (!bo->getNote().isEmpty()) - r+=bo->getNoteOpenDoc(); - r+=""; - r+=buildList (bo); // recursivly add deeper branches - r+="\n"; - i++; - bo=current->getBranchNum(i); - } - r+="\n"; + if (!bo->hasHiddenExportParent() ) + { + // Start list + r+="\n"; + while (bo) + { + r+=""; + r+=quotemeta(bo->getHeading()); + // If necessary, write note + if (!bo->getNote().isEmpty()) + r+=bo->getNoteOpenDoc(); + r+=""; + r+=buildList (bo); // recursivly add deeper branches + r+="\n"; + i++; + bo=current->getBranchNum(i); + } + r+="\n"; + } } return r; } @@ -424,7 +436,7 @@ int j=0; // Walk sections - while (sectionBO) + while (sectionBO && !sectionBO->hasHiddenExportParent() ) { if (useSections) { @@ -442,7 +454,7 @@ // Walk mainpages pagesBO=sectionBO->getFirstBranch(); j=0; - while (pagesBO) + while (pagesBO && !pagesBO->hasHiddenExportParent() ) { // Add page with list of items onePage=pageTemplate;