X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetIndex.cpp;h=05da188678e31f0008f13186c8c9f0aad9a9e45b;hb=79cf3f5ec1088e7de988e889247ec300d42fb70b;hp=cb2704f2f91f508a60cdc026c9bc5ad892054e9a;hpb=94e992c5ed71c8b3fbb131e6269f9a1a6cd6ab16;p=lyx.git diff --git a/src/insets/InsetIndex.cpp b/src/insets/InsetIndex.cpp index cb2704f2f9..05da188678 100644 --- a/src/insets/InsetIndex.cpp +++ b/src/insets/InsetIndex.cpp @@ -28,6 +28,7 @@ #include "output_latex.h" #include "output_xhtml.h" #include "sgml.h" +#include "texstream.h" #include "TextClass.h" #include "TocBackend.h" @@ -54,7 +55,7 @@ namespace lyx { InsetIndex::InsetIndex(Buffer * buf, InsetIndexParams const & params) - : InsetCollapsable(buf), params_(params) + : InsetCollapsible(buf), params_(params) {} @@ -74,9 +75,10 @@ void InsetIndex::latex(otexstream & os, OutputParams const & runparams_in) const } // get contents of InsetText as LaTeX and plaintext - TexRow texrow; odocstringstream ourlatex; - otexstream ots(ourlatex, texrow); + // FIXME: do Tex/Row correspondence (I don't currently understand what is + // being generated from latexstr below) + otexstream ots(ourlatex); InsetText::latex(ots, runparams); odocstringstream ourplain; InsetText::plaintext(ourplain, runparams); @@ -128,7 +130,7 @@ void InsetIndex::latex(otexstream & os, OutputParams const & runparams_in) const // Don't do that if the user entered '@' himself, though. if (contains(*it, '\\') && !contains(*it, '@')) { // Plaintext might return nothing (e.g. for ERTs) - docstring const spart = + docstring const spart = (it2 < levels_plain.end() && !(*it2).empty()) ? *it2 : *it; // Now we need to validate that all characters in @@ -177,7 +179,7 @@ int InsetIndex::docbook(odocstream & os, OutputParams const & runparams) const docstring InsetIndex::xhtml(XHTMLStream & xs, OutputParams const &) const { - // we just print an anchor, taking the paragraph ID from + // we just print an anchor, taking the paragraph ID from // our own interior paragraph, which doesn't get printed std::string const magic = paragraphs().front().magicLabel(); std::string const attr = "id='" + magic + "'"; @@ -219,7 +221,7 @@ void InsetIndex::doDispatch(Cursor & cur, FuncRequest & cmd) break; default: - InsetCollapsable::doDispatch(cur, cmd); + InsetCollapsible::doDispatch(cur, cmd); break; } } @@ -241,7 +243,7 @@ bool InsetIndex::getStatus(Cursor & cur, FuncRequest const & cmd, from_utf8(cmd.getArg(1)) == params_.index); return true; } - return InsetCollapsable::getStatus(cur, cmd, flag); + return InsetCollapsible::getStatus(cur, cmd, flag); case LFUN_INSET_DIALOG_UPDATE: { Buffer const & realbuffer = *buffer().masterBuffer(); @@ -250,7 +252,7 @@ bool InsetIndex::getStatus(Cursor & cur, FuncRequest const & cmd, } default: - return InsetCollapsable::getStatus(cur, cmd, flag); + return InsetCollapsible::getStatus(cur, cmd, flag); } } @@ -258,11 +260,11 @@ bool InsetIndex::getStatus(Cursor & cur, FuncRequest const & cmd, ColorCode InsetIndex::labelColor() const { if (params_.index.empty() || params_.index == from_ascii("idx")) - return InsetCollapsable::labelColor(); + return InsetCollapsible::labelColor(); // FIXME UNICODE ColorCode c = lcolor.getFromLyXName(to_utf8(params_.index)); if (c == Color_none) - c = InsetCollapsable::labelColor(); + c = InsetCollapsible::labelColor(); return c; } @@ -313,14 +315,14 @@ void InsetIndex::write(ostream & os) const { os << to_utf8(layoutName()); params_.write(os); - InsetCollapsable::write(os); + InsetCollapsible::write(os); } void InsetIndex::read(Lexer & lex) { params_.read(lex); - InsetCollapsable::read(lex); + InsetCollapsible::read(lex); } @@ -348,7 +350,8 @@ void InsetIndex::string2params(string const & in, InsetIndexParams & params) } -void InsetIndex::addToToc(DocIterator const & cpit, bool output_active) const +void InsetIndex::addToToc(DocIterator const & cpit, bool output_active, + UpdateType utype, TocBackend & backend) const { DocIterator pit = cpit; pit.push_back(CursorSlice(const_cast(*this))); @@ -358,9 +361,11 @@ void InsetIndex::addToToc(DocIterator const & cpit, bool output_active) const type += ":" + to_utf8(params_.index); // this is unlikely to be terribly long text().forOutliner(str, INT_MAX); - buffer().tocBackend().toc(type)->push_back(TocItem(pit, 0, str, output_active)); + TocBuilder & b = backend.builder(type); + b.pushItem(pit, str, output_active); // Proceed with the rest of the inset. - InsetCollapsable::addToToc(cpit, output_active); + InsetCollapsible::addToToc(cpit, output_active, utype, backend); + b.pop(); } @@ -370,7 +375,7 @@ void InsetIndex::validate(LaTeXFeatures & features) const && !params_.index.empty() && params_.index != "idx") features.require("splitidx"); - InsetCollapsable::validate(features); + InsetCollapsible::validate(features); } @@ -431,8 +436,10 @@ ParamInfo const & InsetPrintIndex::findInfo(string const & /* cmdName */) static ParamInfo param_info_; if (param_info_.empty()) { param_info_.add("type", ParamInfo::LATEX_OPTIONAL, - ParamInfo::HANDLING_ESCAPE); - param_info_.add("name", ParamInfo::LATEX_REQUIRED); + ParamInfo::HANDLING_ESCAPE); + param_info_.add("name", ParamInfo::LATEX_OPTIONAL, + ParamInfo::HANDLING_LATEXIFY); + param_info_.add("literal", ParamInfo::LYX_INTERNAL); } return param_info_; } @@ -473,22 +480,22 @@ void InsetPrintIndex::doDispatch(Cursor & cur, FuncRequest & cmd) case LFUN_INSET_MODIFY: { if (cmd.argument() == from_ascii("toggle-subindex")) { - string cmd = getCmdName(); - if (contains(cmd, "printindex")) - cmd = subst(cmd, "printindex", "printsubindex"); + string scmd = getCmdName(); + if (contains(scmd, "printindex")) + scmd = subst(scmd, "printindex", "printsubindex"); else - cmd = subst(cmd, "printsubindex", "printindex"); + scmd = subst(scmd, "printsubindex", "printindex"); cur.recordUndo(); - setCmdName(cmd); + setCmdName(scmd); break; } else if (cmd.argument() == from_ascii("check-printindex*")) { - string cmd = getCmdName(); - if (suffixIs(cmd, '*')) + string scmd = getCmdName(); + if (suffixIs(scmd, '*')) break; - cmd += '*'; + scmd += '*'; cur.recordUndo(); setParam("type", docstring()); - setCmdName(cmd); + setCmdName(scmd); break; } InsetCommandParams p(INDEX_PRINT_CODE); @@ -543,7 +550,7 @@ bool InsetPrintIndex::getStatus(Cursor & cur, FuncRequest const & cmd, } else return InsetCommand::getStatus(cur, cmd, status); } - + case LFUN_INSET_DIALOG_UPDATE: { status.setEnabled(buffer().masterBuffer()->params().use_indices); return true; @@ -555,11 +562,20 @@ bool InsetPrintIndex::getStatus(Cursor & cur, FuncRequest const & cmd, } +void InsetPrintIndex::updateBuffer(ParIterator const &, UpdateType) +{ + Index const * index = + buffer().masterParams().indiceslist().findShortcut(getParam("type")); + if (index) + setParam("name", index->index()); +} + + void InsetPrintIndex::latex(otexstream & os, OutputParams const & runparams_in) const { if (!buffer().masterBuffer()->params().use_indices) { if (getParam("type") == from_ascii("idx")) - os << "\\printindex{}"; + os << "\\printindex" << termcmd; return; } OutputParams runparams = runparams_in; @@ -572,6 +588,7 @@ void InsetPrintIndex::validate(LaTeXFeatures & features) const features.require("makeidx"); if (buffer().masterBuffer()->params().use_indices) features.require("splitidx"); + InsetCommand::validate(features); } @@ -605,7 +622,7 @@ void parseItem(docstring & s, bool for_output) s.erase(loc); } - + void extractSubentries(docstring const & entry, docstring & main, docstring & sub1, docstring & sub2) { @@ -630,10 +647,10 @@ void extractSubentries(docstring const & entry, docstring & main, struct IndexEntry { - IndexEntry() + IndexEntry() {} - - IndexEntry(docstring const & s, DocIterator const & d) + + IndexEntry(docstring const & s, DocIterator const & d) : dit(d) { extractSubentries(s, main, sub, subsub); @@ -641,22 +658,22 @@ struct IndexEntry parseItem(sub, false); parseItem(subsub, false); } - + bool equal(IndexEntry const & rhs) const { return main == rhs.main && sub == rhs.sub && subsub == rhs.subsub; } - + bool same_sub(IndexEntry const & rhs) const { return main == rhs.main && sub == rhs.sub; } - + bool same_main(IndexEntry const & rhs) const { return main == rhs.main; } - + docstring main; docstring sub; docstring subsub; @@ -673,7 +690,7 @@ bool operator<(IndexEntry const & lhs, IndexEntry const & rhs) return (comp < 0); } -} // anon namespace +} // namespace docstring InsetPrintIndex::xhtml(XHTMLStream &, OutputParams const & op) const @@ -688,7 +705,7 @@ docstring InsetPrintIndex::xhtml(XHTMLStream &, OutputParams const & op) const // would need to be collected differently, say, during validation. if (bp.use_indices && getParam("type") != from_ascii("idx")) return docstring(); - + shared_ptr toc = buffer().tocBackend().toc("index"); if (toc->empty()) return docstring(); @@ -719,7 +736,7 @@ docstring InsetPrintIndex::xhtml(XHTMLStream &, OutputParams const & op) const XHTMLStream xs(ods); xs << html::StartTag("div", tocattr); - xs << html::StartTag(lay.htmltag(), lay.htmlattr()) + xs << html::StartTag(lay.htmltag(), lay.htmlattr()) << translateIfPossible(from_ascii("Index"), op.local_font->language()->lang()) << html::EndTag(lay.htmltag()); @@ -757,7 +774,7 @@ docstring InsetPrintIndex::xhtml(XHTMLStream &, OutputParams const & op) const // which means that it is the first sub-sub-entry within this // sub-entry. In that case, we do not want to close anything. if (level == 2 && !eit->same_sub(last)) { - // close sub-entry + // close sub-entry xs << html::EndTag("li") << html::CR(); // is this another sub-entry with the same main entry? if (!eit->same_main(last)) { @@ -785,7 +802,7 @@ docstring InsetPrintIndex::xhtml(XHTMLStream &, OutputParams const & op) const OutputParams ours = op; ours.for_toc = true; par.simpleLyXHTMLOnePar(buffer(), entstream, ours, dummy); - + // these will contain XHTML versions of the main entry, etc // remember that everything will already have been escaped, // so we'll need to use NextRaw() during output. @@ -796,13 +813,13 @@ docstring InsetPrintIndex::xhtml(XHTMLStream &, OutputParams const & op) const parseItem(main, true); parseItem(sub, true); parseItem(subsub, true); - + if (level == 3) { // another subsubentry - xs << html::StartTag("li", "class='subsubentry'") + xs << html::StartTag("li", "class='subsubentry'") << XHTMLStream::ESCAPE_NONE << subsub; } else if (level == 2) { - // there are two ways we can be here: + // there are two ways we can be here: // (i) we can actually be inside a sub-entry already and be about // to output the first sub-sub-entry. in this case, our sub // and the last sub will be the same. @@ -813,18 +830,18 @@ docstring InsetPrintIndex::xhtml(XHTMLStream &, OutputParams const & op) const // note that in this case, too, though, the sub-entry might already // have a sub-sub-entry. if (eit->sub != last.sub) - xs << html::StartTag("li", "class='subentry'") + xs << html::StartTag("li", "class='subentry'") << XHTMLStream::ESCAPE_NONE << sub; if (!subsub.empty()) { // it's actually a subsubentry, so we need to start that list xs << html::CR() - << html::StartTag("ul", "class='subsubentry'") - << html::StartTag("li", "class='subsubentry'") + << html::StartTag("ul", "class='subsubentry'") + << html::StartTag("li", "class='subsubentry'") << XHTMLStream::ESCAPE_NONE << subsub; level = 3; - } + } } else { - // there are also two ways we can be here: + // there are also two ways we can be here: // (i) we can actually be inside an entry already and be about // to output the first sub-entry. in this case, our main // and the last main will be the same. @@ -839,19 +856,19 @@ docstring InsetPrintIndex::xhtml(XHTMLStream &, OutputParams const & op) const if (!sub.empty()) { // there's a sub-entry, too xs << html::CR() - << html::StartTag("ul", "class='subentry'") - << html::StartTag("li", "class='subentry'") + << html::StartTag("ul", "class='subentry'") + << html::StartTag("li", "class='subentry'") << XHTMLStream::ESCAPE_NONE << sub; level = 2; if (!subsub.empty()) { // and a sub-sub-entry xs << html::CR() - << html::StartTag("ul", "class='subsubentry'") - << html::StartTag("li", "class='subsubentry'") + << html::StartTag("ul", "class='subsubentry'") + << html::StartTag("li", "class='subsubentry'") << XHTMLStream::ESCAPE_NONE << subsub; level = 3; } - } + } } } // finally, then, we can output the index link itself