Links between citations and bibliography entries were broken in XHTML

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

diff --git a/src/insets/InsetTOC.cpp b/src/insets/InsetTOC.cpp
index b5159f937fda1edbcce1b7f62cae509110900b29..08d77bb32868d3310f0837eca54cea6d33fa6b9a 100644 (file)
--- a/src/insets/InsetTOC.cpp
+++ b/src/insets/InsetTOC.cpp
@@ -14,6 +14,7 @@
 
 #include "Buffer.h"
 #include "BufferParams.h"
+#include "BufferView.h"
 #include "Cursor.h"
 #include "DispatchResult.h"
 #include "Font.h"
@@ -36,6 +37,15 @@ using namespace std;
 
 namespace lyx {
 
+namespace {
+string cmd2type(string const & cmd)
+{
+       if (cmd == "lstlistoflistings")
+               return "listing";
+       return cmd;
+}
+}
+
 
 InsetTOC::InsetTOC(Buffer * buf, InsetCommandParams const & p)
        : InsetCommand(buf, p)
@@ -52,10 +62,18 @@ ParamInfo const & InsetTOC::findInfo(string const & /* cmdName */)
 }
 
 
+bool InsetTOC::isCompatibleCommand(string const & cmd)
+{
+       return cmd == defaultCommand() || cmd == "lstlistoflistings";
+}
+
+
 docstring InsetTOC::screenLabel() const
 {
        if (getCmdName() == "tableofcontents")
                return buffer().B_("Table of Contents");
+       if (getCmdName() == "lstlistoflistings")
+               return buffer().B_("List of Listings");
        return _("Unknown TOC type");
 }
 
@@ -64,7 +82,7 @@ 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.bv().showDialog("toc", params2string(params()));
                        cur.dispatched();
                }
                break;
@@ -75,10 +93,28 @@ void InsetTOC::doDispatch(Cursor & cur, FuncRequest & cmd) {
 }
 
 
-int InsetTOC::plaintext(odocstream & os, OutputParams const &) const
+docstring InsetTOC::layoutName() const
+{
+       if (getCmdName() == "lstlistoflistings")
+               return from_ascii("TOC:Listings");
+       return docstring();
+}
+
+
+void InsetTOC::validate(LaTeXFeatures & features) const
+{
+       InsetCommand::validate(features);
+       features.useInsetLayout(getLayout());
+       if (getCmdName() == "lstlistoflistings")
+               features.require("listings");
+}
+
+
+int InsetTOC::plaintext(odocstringstream & os,
+        OutputParams const &, size_t max_length) const
 {
        os << screenLabel() << "\n\n";
-       buffer().tocBackend().writePlaintextTocList(getCmdName(), os);
+       buffer().tocBackend().writePlaintextTocList(cmd2type(getCmdName()), os, max_length);
        return PLAINTEXT_NEWLINE;
 }
 
@@ -93,6 +129,9 @@ int InsetTOC::docbook(odocstream & os, OutputParams const &) const
 
 docstring InsetTOC::xhtml(XHTMLStream &, OutputParams const & op) const
 {
+       if (getCmdName() != "tableofcontents")
+               return docstring();
+
        Layout const & lay = buffer().params().documentClass().htmlTOCLayout();
        string const & tocclass = lay.defaultCSSClass();
        string const tocattr = "class='tochead " + tocclass + "'";
@@ -103,15 +142,14 @@ docstring InsetTOC::xhtml(XHTMLStream &, OutputParams const & op) const
        odocstringstream ods;
        XHTMLStream xs(ods);
 
-       Toc const & toc = buffer().tocBackend().toc("tableofcontents");
+       Toc const & toc = buffer().tocBackend().toc(cmd2type(getCmdName()));
        if (toc.empty())
                return docstring();
 
        xs << html::StartTag("div", "class='toc'");
 
        // Title of TOC
-       static string toctitle = N_("Table of Contents");
-       docstring title = buffer().B_(toctitle);
+       docstring title = screenLabel();
        xs << html::StartTag("div", tocattr)
                 << title
                 << html::EndTag("div");
@@ -121,6 +159,11 @@ docstring InsetTOC::xhtml(XHTMLStream &, OutputParams const & op) const
        Toc::const_iterator const en = toc.end();
        int lastdepth = 0;
        for (; it != en; ++it) {
+               // do not output entries that are not actually included in the output,
+               // e.g., stuff in non-active branches or notes or whatever.
+               if (!it->isOutput())
+                       continue;
+
                // First, we need to manage increases and decreases of depth
                int const depth = it->depth();
                
@@ -159,6 +202,10 @@ docstring InsetTOC::xhtml(XHTMLStream &, OutputParams const & op) const
                
                // 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())
@@ -168,7 +215,9 @@ docstring InsetTOC::xhtml(XHTMLStream &, OutputParams const & op) const
                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);