Cocoa based Qt-4.6 needs to paint every character separately to match metrics computa...

[lyx.git] / src / insets / InsetTOC.cpp

diff --git a/src/insets/InsetTOC.cpp b/src/insets/InsetTOC.cpp
index 7270d18851a0d100b4143949b53ae2b9cee3f51c..bac2f43699b27c9aa5dd92656ab4aabfa3bea2d6 100644 (file)
--- a/src/insets/InsetTOC.cpp
+++ b/src/insets/InsetTOC.cpp
@@ -14,14 +14,16 @@
 
 #include "Buffer.h"
 #include "BufferParams.h"
+#include "Cursor.h"
 #include "DispatchResult.h"
+#include "Font.h"
 #include "FuncRequest.h"
 #include "Language.h"
 #include "LaTeXFeatures.h"
-#include "MetricsInfo.h"
 #include "OutputParams.h"
 #include "output_xhtml.h"
 #include "Paragraph.h"
+#include "ParagraphParameters.h"
 #include "TextClass.h"
 #include "TocBackend.h"
 
@@ -36,7 +38,7 @@ namespace lyx {
 
 
 InsetTOC::InsetTOC(Buffer * buf, InsetCommandParams const & p)
-       : InsetCommand(buf, p, "toc")
+       : InsetCommand(buf, p)
 {}
 
 
@@ -58,6 +60,21 @@ docstring InsetTOC::screenLabel() const
 }
 
 
+void InsetTOC::doDispatch(Cursor & cur, FuncRequest & cmd) {
+       switch (cmd.action()) {
+       case LFUN_MOUSE_RELEASE:
+               if (!cur.selection() && cmd.button() == mouse_button::button1) {
+                       showInsetDialog(&cur.bv());
+                       cur.dispatched();
+               }
+               break;
+       
+       default:
+               InsetCommand::doDispatch(cur, cmd);
+       }
+}
+
+
 int InsetTOC::plaintext(odocstream & os, OutputParams const &) const
 {
        os << screenLabel() << "\n\n";
@@ -91,31 +108,34 @@ docstring InsetTOC::xhtml(XHTMLStream &, OutputParams const & op) const
                return docstring();
 
        xs << html::StartTag("div", "class='toc'");
-       Language const * lang = buffer().params().language;
+
+       // Title of TOC
        static string toctitle = N_("Table of Contents");
-       docstring title = lang 
-                       ? translateIfPossible(from_ascii(toctitle), lang->code())
-                       : translateIfPossible(from_ascii(toctitle));
+       docstring title = buffer().B_(toctitle);
        xs << html::StartTag("div", tocattr)
                 << title
                 << html::EndTag("div");
+
+       // Output of TOC
        Toc::const_iterator it = toc.begin();
        Toc::const_iterator const en = toc.end();
        int lastdepth = 0;
        for (; it != en; ++it) {
-               Paragraph const & par = it->dit().innerParagraph();
+               // First, we need to manage increases and decreases of depth
                int const depth = it->depth();
+               
+               // Ignore stuff above the tocdepth
                if (depth > buffer().params().tocdepth)
                        continue;
-               Font const dummy;
+               
                if (depth > lastdepth) {
-                       xs.cr();
+                       xs << html::CR();
                        // open as many tags as we need to open to get to this level
                        // this includes the tag for the current level
                        for (int i = lastdepth + 1; i <= depth; ++i) {
                                stringstream attr;
                                attr << "class='lyxtoc-" << i << "'";
-                               xs << html::StartTag("div", attr.str());
+                               xs << html::StartTag("div", attr.str()) << html::CR();
                        }
                        lastdepth = depth;
                }
@@ -123,33 +143,50 @@ docstring InsetTOC::xhtml(XHTMLStream &, OutputParams const & op) const
                        // close as many as we have to close to get back to this level
                        // this includes closing the last tag at this level
                        for (int i = lastdepth; i >= depth; --i) 
-                               xs << html::EndTag("div");
+                               xs << html::EndTag("div") << html::CR();
                        // now open our tag
                        stringstream attr;
                        attr << "class='lyxtoc-" << depth << "'";
-                       xs << html::StartTag("div", attr.str());
+                       xs << html::StartTag("div", attr.str()) << html::CR();
                        lastdepth = depth;
                } else {
                        // no change of level, so close and open
-                       xs << html::EndTag("div");
+                       xs << html::EndTag("div") << html::CR();
                        stringstream attr;
                        attr << "class='lyxtoc-" << depth << "'";
-                       xs << html::StartTag("div", attr.str());
+                       xs << html::StartTag("div", attr.str()) << html::CR();
                }
-               string const parattr = "href='#" + par.magicLabel() + "' class='tocarrow'";
+               
+               // Now output TOC info for this entry
+               Paragraph const & par = it->dit().innerParagraph();
+
+               string const attr = "href='#" + par.magicLabel() + "' class='tocentry'";
+               xs << html::StartTag("a", attr);
+
+               // First the label, if there is one
+               docstring const & label = par.params().labelString();
+               if (!label.empty())
+                       xs << label << " ";
+               // Now the content of the TOC entry, taken from the paragraph itself
                OutputParams ours = op;
                ours.for_toc = true;
+               Font const dummy;
                par.simpleLyXHTMLOnePar(buffer(), xs, ours, dummy);
-               xs << " ";
+
+               xs << html::EndTag("a") << " ";
+
+               // Now a link to that paragraph
+               string const parattr = "href='#" + par.magicLabel() + "' class='tocarrow'";
                xs << html::StartTag("a", parattr);
                // FIXME XHTML 
                // There ought to be a simple way to customize this.
-               xs << XHTMLStream::NextRaw() << "&seArr;";
+               // Maybe if we had an InsetLayout for TOC...
+               xs << XHTMLStream::ESCAPE_NONE << "&gt;";
                xs << html::EndTag("a");                
        }
        for (int i = lastdepth; i > 0; --i) 
-               xs << html::EndTag("div");
-       xs << html::EndTag("div");
+               xs << html::EndTag("div") << html::CR();
+       xs << html::EndTag("div") << html::CR();
        return ods.str();
 }