Release-1.3-rc1-20021128

1 files changed, 28 insertions, 169 deletions

diff --git a/src/latexgen.cpp b/src/latexgen.cpp
index 09ecae4..f95c174 100644
--- a/src/latexgen.cpp
+++ b/src/latexgen.cpp
@@ -1238,59 +1238,6 @@ void LatexGenerator::endSection(const char *lab,SectionInfo::SectionType)
   t << "}\\label{" << lab << "}" << endl;
 }
 
-//void LatexGenerator::writeSectionRef(const char *ref,const char *,
-//                                     const char *lab,const char *text)
-//{
-//  if (ref) // external reference
-//  {
-//    docify(text);
-//  }
-//  else // local reference
-//  {
-//    if (text && Config_getBool("PDF_HYPERLINKS"))
-//    {
-//      t << "\\hyperlink{";
-//      if (lab) t << lab; 
-//      t << "}{";
-//      docify(text);
-//      t << "}";
-//      //t << " {\\rm (p.\\,\\pageref{" << lab << "})}";
-//    }
-//    else
-//    {
-//      if (strcmp(lab,text)!=0) // lab!=text
-//      {
-//        // todo: don't hardcode p. here!
-//        t << "{\\bf ";
-//        docify(text);
-//        t << "} {\\rm (p.\\,\\pageref{" << lab << "})}";
-//      }
-//      else
-//      {
-//        t << "\\ref{" << lab << "}";
-//      }
-//    }
-//  }
-//}
-//
-//void LatexGenerator::writeSectionRefItem(const char *,const char *lab,
-//                                     const char *title)
-//{
-//  t << "\\item \\contentsline{section}{";
-//  docify(title);
-//  t << "}{\\ref{" << lab << "}}{}" << endl;
-//}
-//
-// TODO: remove this function
-//void LatexGenerator::writeSectionRefAnchor(const char *,const char *lab,
-//                                     const char *title)
-//{
-//  startBold();
-//  docify(title);
-//  endBold();
-//  t << " (p.\\,\\pageref{" << lab << "})" << endl;
-//}
-
 
 //void LatexGenerator::docifyStatic(QTextStream &t,const char *str)
 void LatexGenerator::docify(const char *str)
@@ -1364,42 +1311,42 @@ void LatexGenerator::endClassDiagram(ClassDiagram &d,
   d.writeFigure(t,dir,fileName);
 }
 
-//void LatexGenerator::writeFormula(const char *,const char *text)
-//{
-//  t << text;
-//}
 
-void LatexGenerator::startMemberItem(int annType) 
-{ 
-  if (!insideTabbing)
+void LatexGenerator::startAnonTypeScope(int indent)
+{
+  if (indent==0)
   {
-    t << "\\item " << endl; 
-    switch(annType)
-    {
-      case 0: break;
-      case 1:
-      default: 
-        t << "\\begin{tabbing}" << endl;
-        t << "xx\\=xx\\=xx\\=xx\\=xx\\=xx\\=xx\\=xx\\=xx\\=\\kill" << endl;
-        //printf("LatexGenerator::startMemberItem() insideTabbing=TRUE\n");
-        insideTabbing=TRUE;
-        break;
-    }
+    t << "\\begin{tabbing}" << endl;
+    t << "xx\\=xx\\=xx\\=xx\\=xx\\=xx\\=xx\\=xx\\=xx\\=\\kill" << endl;
+    //printf("LatexGenerator::startMemberItem() insideTabbing=TRUE\n");
+    insideTabbing=TRUE;
   }
 }
 
-void LatexGenerator::endMemberItem(bool endItem) 
+void LatexGenerator::endAnonTypeScope(int indent)
 {
-  if (insideTabbing && endItem)
+  if (indent==0)
   {
     t << endl << "\\end{tabbing}";
-    //printf("LatexGenerator::endMemberItem() insideTabbing=FALSE\n");
     insideTabbing=FALSE;
   }
+}
+
+void LatexGenerator::startMemberItem(int) 
+{ 
+  //printf("LatexGenerator::startMemberItem(%d)\n",annType);
+  if (!insideTabbing)
+  {
+    t << "\\item " << endl; 
+  }
+}
+
+void LatexGenerator::endMemberItem() 
+{
   if (insideTabbing)
   {
     t << "\\\\";
-  } 
+ } 
   t << endl; 
 }
 
@@ -1414,95 +1361,20 @@ void LatexGenerator::writeNonBreakableSpace(int)
 void LatexGenerator::startMemberList()  
 { 
   if (!insideTabbing)
+  {
     t << "\\begin{CompactItemize}" << endl; 
+  }
 }
 
 void LatexGenerator::endMemberList()    
 {
+  //printf("LatexGenerator::endMemberList(%d)\n",insideTabbing);
   if (!insideTabbing)
+  {
     t << "\\end{CompactItemize}"   << endl; 
+  }
 }
 
-//void LatexGenerator::startImage(const char *name,const char *size,bool hasCaption)
-//{
-//  if (hasCaption)
-//  {
-//    t << "\\begin{figure}[H]" << endl;
-//    t << "\\begin{center}" << endl;
-//  }
-//  else
-//  {
-//    t << "\\mbox{";
-//  }
-//  QCString gfxName = name;
-//  if (gfxName.right(4)==".eps") gfxName.left(gfxName.length()-4);
-//  //     "\\epsfig{file=" << name;
-//  t << "\\includegraphics";
-//  if (size) t << "[" << size << "]";
-//  t << "{" << gfxName << "}";
-//  if (hasCaption) 
-//  {
-//    t << "\\caption{";
-//  }
-//  else
-//  {
-//    t << "}" << endl;
-//  }
-//}
-//
-//void LatexGenerator::endImage(bool hasCaption)
-//{
-//  if (hasCaption)
-//  {
-//    t << "}" << endl;
-//    t << "\\end{center}" << endl;
-//    t << "\\end{figure}" << endl;
-//  }
-//}
-//
-//void LatexGenerator::startDotFile(const char *name,bool hasCaption)
-//{
-//  QCString baseName=name;
-//  int i;
-//  if ((i=baseName.findRev('/'))!=-1 || (i=baseName.findRev('\\'))!=-1)
-//  {
-//    baseName=baseName.right(baseName.length()-i-1); 
-//  }
-//  QCString outDir = Config_getString("LATEX_OUTPUT");
-//  writeDotGraphFromFile(name,outDir,baseName,EPS);
-//  if (hasCaption)
-//  {
-//    t << "\\begin{figure}[H]" << endl;
-//    t << "\\begin{center}" << endl;
-//  }
-//  else
-//    t << "\\mbox{";
-//  t << "\\includegraphics";
-//  if( Config_getBool("USE_PDFLATEX") )
-//  {
-//    t << "{" << baseName << ".pdf}";
-//  }
-//  else
-//  {
-//    t << "{" << baseName << ".eps}";
-//  }
-//
-//  if (hasCaption) 
-//    t << "\\caption{";
-//  else
-//    t << "}" << endl;
-//}
-//
-//void LatexGenerator::endDotFile(bool hasCaption)
-//{
-//  if (hasCaption)
-//  {
-//    t << "}" << endl;
-//    t << "\\end{center}" << endl;
-//    t << "\\end{figure}" << endl;
-//  }
-//}
-//
 
 void LatexGenerator::startMemberGroupHeader(bool hasHeader)
 {
@@ -1615,19 +1487,6 @@ void LatexGenerator::endParamList()
   t << "\\end{Desc}" << endl;
 }
 
-//void LatexGenerator::startSectionRefList()
-//{
-//  t << "\\footnotesize" << endl;
-//  t << "\\begin{multicols}{2}" << endl;
-//  t << "\\begin{CompactList}" << endl;
-//}
-
-//void LatexGenerator::endSectionRefList()
-//{
-//  t << "\\end{CompactList}" << endl;
-//  t << "\\end{multicols}" << endl;
-//  t << "\\normalsize" << endl;
-//}
 
 void LatexGenerator::printDoc(DocNode *n)
 {