X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetTOC.cpp;h=29b7540cc277cbb2c690e5f15a2a2e50e4b49b12;hb=cc3e227cba3571bb8c383cd41348b932e3104df3;hp=08d77bb32868d3310f0837eca54cea6d33fa6b9a;hpb=65b74b9a1d54f524426a15128b2b599906f1e9a0;p=lyx.git diff --git a/src/insets/InsetTOC.cpp b/src/insets/InsetTOC.cpp index 08d77bb328..29b7540cc2 100644 --- a/src/insets/InsetTOC.cpp +++ b/src/insets/InsetTOC.cpp @@ -30,6 +30,7 @@ #include "support/debug.h" #include "support/gettext.h" +#include "support/lassert.h" #include @@ -44,7 +45,7 @@ string cmd2type(string const & cmd) return "listing"; return cmd; } -} +} // namespace InsetTOC::InsetTOC(Buffer * buf, InsetCommandParams const & p) @@ -86,7 +87,7 @@ void InsetTOC::doDispatch(Cursor & cur, FuncRequest & cmd) { cur.dispatched(); } break; - + default: InsetCommand::doDispatch(cur, cmd); } @@ -95,9 +96,13 @@ void InsetTOC::doDispatch(Cursor & cur, FuncRequest & cmd) { docstring InsetTOC::layoutName() const { - if (getCmdName() == "lstlistoflistings") - return from_ascii("TOC:Listings"); - return docstring(); + if (getCmdName() == "lstlistoflistings") { + if (buffer().params().use_minted) + return from_ascii("TOC:MintedListings"); + else + return from_ascii("TOC:Listings"); + } + return from_ascii("TOC"); } @@ -105,8 +110,12 @@ void InsetTOC::validate(LaTeXFeatures & features) const { InsetCommand::validate(features); features.useInsetLayout(getLayout()); - if (getCmdName() == "lstlistoflistings") - features.require("listings"); + if (getCmdName() == "lstlistoflistings") { + if (buffer().params().use_minted) + features.require("minted"); + else + features.require("listings"); + } } @@ -127,34 +136,29 @@ int InsetTOC::docbook(odocstream & os, OutputParams const &) const } -docstring InsetTOC::xhtml(XHTMLStream &, OutputParams const & op) const +void InsetTOC::makeTOCEntry(XHTMLStream & xs, + Paragraph const & par, 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 + "'"; - - // we'll use our own stream, because we are going to defer everything. - // that's how we deal with the fact that we're probably inside a standard - // paragraph, and we don't want to be. - odocstringstream ods; - XHTMLStream xs(ods); - - Toc const & toc = buffer().tocBackend().toc(cmd2type(getCmdName())); - if (toc.empty()) - return docstring(); + 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 << html::EndTag("a") << html::CR(); +} - xs << html::StartTag("div", "class='toc'"); - // Title of TOC - docstring title = screenLabel(); - xs << html::StartTag("div", tocattr) - << title - << html::EndTag("div"); - - // Output of TOC +void InsetTOC::makeTOCWithDepth(XHTMLStream & xs, + Toc const & toc, OutputParams const & op) const +{ Toc::const_iterator it = toc.begin(); Toc::const_iterator const en = toc.end(); int lastdepth = 0; @@ -165,12 +169,13 @@ docstring InsetTOC::xhtml(XHTMLStream &, OutputParams const & op) const continue; // First, we need to manage increases and decreases of depth + // If there's no depth to deal with, we artifically set it to 1. int const depth = it->depth(); - + // Ignore stuff above the tocdepth if (depth > buffer().params().tocdepth) continue; - + if (depth > lastdepth) { xs << html::CR(); // open as many tags as we need to open to get to this level @@ -185,7 +190,7 @@ docstring InsetTOC::xhtml(XHTMLStream &, OutputParams const & op) const else if (depth < lastdepth) { // 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) + for (int i = lastdepth; i >= depth; --i) xs << html::EndTag("div") << html::CR(); // now open our tag stringstream attr; @@ -199,36 +204,79 @@ docstring InsetTOC::xhtml(XHTMLStream &, OutputParams const & op) const attr << "class='lyxtoc-" << depth << "'"; xs << html::StartTag("div", attr.str()) << html::CR(); } - + // 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 << 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. - // Maybe if we had an InsetLayout for TOC... - xs << XHTMLStream::ESCAPE_NONE << ">"; - xs << html::EndTag("a"); + makeTOCEntry(xs, par, op); } - for (int i = lastdepth; i > 0; --i) + for (int i = lastdepth; i > 0; --i) xs << html::EndTag("div") << html::CR(); +} + + +void InsetTOC::makeTOCNoDepth(XHTMLStream & xs, + Toc const & toc, const OutputParams & op) const +{ + Toc::const_iterator it = toc.begin(); + Toc::const_iterator const en = toc.end(); + 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; + + xs << html::StartTag("div", "class='lyxtoc-flat'") << html::CR(); + + Paragraph const & par = it->dit().innerParagraph(); + makeTOCEntry(xs, par, op); + + xs << html::EndTag("div"); + } +} + + +docstring InsetTOC::xhtml(XHTMLStream &, OutputParams const & op) const +{ + string const & command = getCmdName(); + if (command != "tableofcontents" && command != "lstlistoflistings") { + LYXERR0("TOC type " << command << " not yet implemented."); + LASSERT(false, return docstring()); + } + + shared_ptr toc = + buffer().masterBuffer()->tocBackend().toc(cmd2type(command)); + if (toc->empty()) + return docstring(); + + // we'll use our own stream, because we are going to defer everything. + // that's how we deal with the fact that we're probably inside a standard + // paragraph, and we don't want to be. + odocstringstream ods; + XHTMLStream xs(ods); + + xs << html::StartTag("div", "class='toc'"); + + // Title of TOC + InsetLayout const & il = getLayout(); + string const & tag = il.htmltag(); + docstring title = screenLabel(); + Layout const & lay = buffer().params().documentClass().htmlTOCLayout(); + string const & tocclass = lay.defaultCSSClass(); + string const tocattr = "class='tochead " + tocclass + "'"; + xs << html::StartTag(tag, tocattr) + << title + << html::EndTag(tag); + + // with lists of listings, at least, there is no depth + // to worry about. so the code can be simpler. + bool const use_depth = (command == "tableofcontents"); + + // Output of TOC + if (use_depth) + makeTOCWithDepth(xs, *toc, op); + else + makeTOCNoDepth(xs, *toc, op); + xs << html::EndTag("div") << html::CR(); return ods.str(); }