fix compilation pb ; update eu.po

[lyx.git] / src / insets / insettoc.C

diff --git a/src/insets/insettoc.C b/src/insets/insettoc.C
index b4bc07b8ebfaf838fabb6318cdcc9a2e83169105..72b8861d0cb3b7aeb272a3711609224cc61da256 100644 (file)
--- a/src/insets/insettoc.C
+++ b/src/insets/insettoc.C
@@ -12,17 +12,17 @@
 #include "debug.h"
 #include "buffer.h"
 
-using std::ostream;
-using std::endl;
+using std::vector;
 
 string const InsetTOC::getScreenLabel() const 
 {
-       string cmdname( getCmdName() );
-       if (cmdname == "tableofcontents" )
+       string const cmdname(getCmdName());
+       
+       if (cmdname == "tableofcontents")
                return _("Table of Contents");
-       else if (cmdname == "listofalgorithms" )
+       else if (cmdname == "listof{algorithm}{List of Algorithms}")
                return _("List of Algorithms");
-       else if (cmdname == "listoffigures" )
+       else if (cmdname == "listoffigures")
                return _("List of Figures");
        else
                return _("List of Tables");
@@ -31,12 +31,12 @@ string const InsetTOC::getScreenLabel() const
 
 Inset::Code InsetTOC::LyxCode() const
 {
-       string cmdname( getCmdName() );
-       if (cmdname == "tableofcontents" )
+       string const cmdname(getCmdName());
+       if (cmdname == "tableofcontents")
                return Inset::TOC_CODE;
-       else if (cmdname == "listofalgorithms" )
+       else if (cmdname == "listof{algorithm}{List of Algorithms}")
                return Inset::LOA_CODE;
-       else if (cmdname == "listoffigures" )
+       else if (cmdname == "listoffigures")
                return Inset::LOF_CODE; 
        else
                return Inset::LOT_CODE;
@@ -45,21 +45,22 @@ Inset::Code InsetTOC::LyxCode() const
 
 void InsetTOC::Edit(BufferView * bv, int, int, unsigned int)
 {
-       bv->owner()->getDialogs()->showTOC( this );
+       bv->owner()->getDialogs()->showTOC(this);
 }
 
 
-int InsetTOC::Ascii(Buffer const * buffer, ostream & os, int) const
+int InsetTOC::Ascii(Buffer const * buffer, std::ostream & os, int) const
 {
-       os << getScreenLabel() << endl << endl;
+       os << getScreenLabel() << "\n\n";
 
+#if 0
        Buffer::TocType type;
        string cmdname = getCmdName();
-       if (cmdname == "tableofcontents" )
+       if (cmdname == "tableofcontents")
                type = Buffer::TOC_TOC;
-       else if (cmdname == "listofalgorithms" )
+       else if (cmdname == "listof{algorithm}{List of Algorithms}")
                type = Buffer::TOC_LOA;
-       else if (cmdname == "listoffigures" )
+       else if (cmdname == "listoffigures")
                type = Buffer::TOC_LOF; 
        else
                type = Buffer::TOC_LOT;
@@ -70,23 +71,48 @@ int InsetTOC::Ascii(Buffer const * buffer, ostream & os, int) const
        for (vector<Buffer::TocItem>::const_iterator it = toc.begin();
             it != toc.end(); ++it)
                os << string(4 * it->depth, ' ') << it->str << endl;
-
-       os << endl;
+#else
+#ifdef WITH_WARNINGS
+#warning Fix Me! (Lgb)
+#endif
+       string type;
+       string const cmdname = getCmdName();
+       if (cmdname == "tableofcontents")
+               type = "TOC";
+       else if (cmdname == "listof{algorithm}{List of Algorithms}")
+               type = "LOA";
+       else if (cmdname == "listoffigures")
+               type = "LOF";
+       else 
+               type = "LOT";
+
+       Buffer::Lists const toc_list = buffer->getLists();
+       Buffer::Lists::const_iterator cit =
+               toc_list.find(type);
+       if (cit != toc_list.end()) {
+               Buffer::SingleList::const_iterator ccit = cit->second.begin();
+               Buffer::SingleList::const_iterator end = cit->second.end();
+               for (; ccit != end; ++ccit)
+                       os << string(4 * ccit->depth, ' ')
+                          << ccit->str << "\n";
+       }
+#endif
+       os << "\n";
        return 0;
 }
 
 
-int InsetTOC::Linuxdoc(Buffer const *, ostream & os) const
+int InsetTOC::Linuxdoc(Buffer const *, std::ostream & os) const
 {
-       if (getCmdName() == "tableofcontents" )
+       if (getCmdName() == "tableofcontents")
                os << "<toc>";
        return 0;
 }
 
 
-int InsetTOC::DocBook(Buffer const *, ostream & os) const
+int InsetTOC::DocBook(Buffer const *, std::ostream & os) const
 {
-       if (getCmdName() == "tableofcontents" )
+       if (getCmdName() == "tableofcontents")
                os << "<toc></toc>";
        return 0;
 }