X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetTOC.cpp;h=29b7540cc277cbb2c690e5f15a2a2e50e4b49b12;hb=c0adb03a7ae15cf6409ee3cb64f4cc91c24c052e;hp=6ed1fa91e94c534d81b5a730053ffaff84c38f26;hpb=050142de1bc5fa73242a46dacbb42f9645a95944;p=lyx.git

diff --git a/src/insets/InsetTOC.cpp b/src/insets/InsetTOC.cpp
index 6ed1fa91e9..29b7540cc2 100644
--- a/src/insets/InsetTOC.cpp
+++ b/src/insets/InsetTOC.cpp
@@ -45,7 +45,7 @@ string cmd2type(string const & cmd)
 		return "listing";
 	return cmd;
 }
-}
+} // namespace
 
 
 InsetTOC::InsetTOC(Buffer * buf, InsetCommandParams const & p)
@@ -87,7 +87,7 @@ void InsetTOC::doDispatch(Cursor & cur, FuncRequest & cmd) {
 			cur.dispatched();
 		}
 		break;
-	
+
 	default:
 		InsetCommand::doDispatch(cur, cmd);
 	}
@@ -96,8 +96,12 @@ void InsetTOC::doDispatch(Cursor & cur, FuncRequest & cmd) {
 
 docstring InsetTOC::layoutName() const
 {
-	if (getCmdName() == "lstlistoflistings")
-		return from_ascii("TOC:Listings");
+	if (getCmdName() == "lstlistoflistings") {
+		if (buffer().params().use_minted)
+			return from_ascii("TOC:MintedListings");
+		else
+			return from_ascii("TOC:Listings");
+	}
 	return from_ascii("TOC");
 }
 
@@ -106,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");
+	}
 }
 
 
@@ -128,7 +136,7 @@ int InsetTOC::docbook(odocstream & os, OutputParams const &) const
 }
 
 
-void InsetTOC::makeTOCEntry(XHTMLStream & xs, 
+void InsetTOC::makeTOCEntry(XHTMLStream & xs,
 		Paragraph const & par, OutputParams const & op) const
 {
 	string const attr = "href='#" + par.magicLabel() + "' class='tocentry'";
@@ -144,21 +152,12 @@ void InsetTOC::makeTOCEntry(XHTMLStream & xs,
 	Font const dummy;
 	par.simpleLyXHTMLOnePar(buffer(), xs, ours, dummy);
 
-	xs << html::EndTag("a") << " ";
-
-	// Now a link to the 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 << "&gt;";
-	xs << html::EndTag("a");		
+	xs << html::EndTag("a") << html::CR();
 }
 
 
-void InsetTOC::makeTOCWithDepth(XHTMLStream xs, 
-		Toc toc, OutputParams const & op) const
+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();
@@ -172,11 +171,11 @@ void InsetTOC::makeTOCWithDepth(XHTMLStream xs,
 		// 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
@@ -191,7 +190,7 @@ void InsetTOC::makeTOCWithDepth(XHTMLStream xs,
 		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;
@@ -205,18 +204,18 @@ void InsetTOC::makeTOCWithDepth(XHTMLStream xs,
 			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();
 		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 toc, const OutputParams & op) const
+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();
@@ -226,11 +225,11 @@ void InsetTOC::makeTOCNoDepth(XHTMLStream xs,
 		if (!it->isOutput())
 			continue;
 
-		xs << html::StartTag("div", "class='lyxtop-1'") << html::CR();
+		xs << html::StartTag("div", "class='lyxtoc-flat'") << html::CR();
 
 		Paragraph const & par = it->dit().innerParagraph();
 		makeTOCEntry(xs, par, op);
-		
+
 		xs << html::EndTag("div");
 	}
 }
@@ -241,17 +240,13 @@ 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();
+		LASSERT(false, return docstring());
 	}
 
-	// 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");
-
-	Layout const & lay = buffer().params().documentClass().htmlTOCLayout();
-	string const & tocclass = lay.defaultCSSClass();
-	string const tocattr = "class='tochead " + tocclass + "'";
+	shared_ptr<Toc const> 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
@@ -259,23 +254,28 @@ docstring InsetTOC::xhtml(XHTMLStream &, OutputParams const & op) const
 	odocstringstream ods;
 	XHTMLStream xs(ods);
 
-	Toc const & toc = buffer().tocBackend().toc(cmd2type(command));
-	if (toc.empty())
-		return docstring();
-
 	xs << html::StartTag("div", "class='toc'");
 
 	// Title of TOC
+	InsetLayout const & il = getLayout();
+	string const & tag = il.htmltag();
 	docstring title = screenLabel();
-	xs << html::StartTag("div", tocattr)
+	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("div");
+		 << 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);
+		makeTOCWithDepth(xs, *toc, op);
 	else
-		makeTOCNoDepth(xs, toc, op);
+		makeTOCNoDepth(xs, *toc, op);
 
 	xs << html::EndTag("div") << html::CR();
 	return ods.str();