#include "BufferParams.h"
#include "BufferView.h"
#include "ColorSet.h"
+#include "Cursor.h"
#include "DispatchResult.h"
#include "Encoding.h"
#include "FuncRequest.h"
#include "output_latex.h"
#include "output_xhtml.h"
#include "sgml.h"
+#include "TextClass.h"
#include "TocBackend.h"
#include "support/debug.h"
#include "frontends/alert.h"
#include <ostream>
+#include <algorithm>
using namespace std;
using namespace lyx::support;
{}
-int InsetIndex::latex(odocstream & os,
- OutputParams const & runparams_in) const
+void InsetIndex::latex(otexstream & os, OutputParams const & runparams_in) const
{
OutputParams runparams(runparams_in);
runparams.inIndexEntry = true;
os << "\\index";
os << '{';
}
- int i = 0;
// get contents of InsetText as LaTeX and plaintext
+ TexRow texrow;
odocstringstream ourlatex;
- InsetText::latex(ourlatex, runparams);
+ otexstream ots(ourlatex, texrow);
+ InsetText::latex(ots, runparams);
odocstringstream ourplain;
InsetText::plaintext(ourplain, runparams);
docstring latexstr = ourlatex.str();
++it2;
}
// write the bit that followed "|"
- if (!cmd.empty())
+ if (!cmd.empty()) {
os << "|" << cmd;
+ }
os << '}';
- return i;
}
case LFUN_INSET_MODIFY: {
if (cmd.getArg(0) == "changetype") {
+ cur.recordUndoInset(ATOMIC_UNDO, this);
params_.index = from_utf8(cmd.getArg(1));
break;
}
InsetIndexParams params;
InsetIndex::string2params(to_utf8(cmd.argument()), params);
+ cur.recordUndoInset(ATOMIC_UNDO, this);
params_.index = params.index;
+ // what we really want here is a TOC update, but that means
+ // a full buffer update
+ cur.forceBufferUpdate();
break;
}
tip += ")";
}
tip += ": ";
- OutputParams rp(&buffer().params().encoding());
- odocstringstream ods;
- InsetText::plaintext(ods, rp);
- tip += ods.str();
- return wrapParas(tip);
+ return toolTipText(tip);
}
void InsetIndex::write(ostream & os) const
{
- os << to_utf8(name());
+ os << to_utf8(layoutName());
params_.write(os);
InsetCollapsable::write(os);
}
}
-void InsetIndex::addToToc(DocIterator const & cpit)
+void InsetIndex::addToToc(DocIterator const & cpit) const
{
DocIterator pit = cpit;
- pit.push_back(CursorSlice(*this));
- docstring const item = text().asString(0, 1, AS_STR_LABEL | AS_STR_INSETS);
- buffer().tocBackend().toc("index").push_back(TocItem(pit, 0, item));
+ pit.push_back(CursorSlice(const_cast<InsetIndex &>(*this)));
+ docstring str;
+ text().forToc(str, TOC_ENTRY_LENGTH);
+ buffer().tocBackend().toc("index").push_back(TocItem(pit, 0, str));
// Proceed with the rest of the inset.
InsetCollapsable::addToToc(cpit);
}
&& !params_.index.empty()
&& params_.index != "idx")
features.require("splitidx");
+ InsetCollapsable::validate(features);
}
-docstring InsetIndex::contextMenu(BufferView const &, int, int) const
+docstring InsetIndex::contextMenuName() const
{
return from_ascii("context-index");
}
///////////////////////////////////////////////////////////////////////
InsetPrintIndex::InsetPrintIndex(Buffer * buf, InsetCommandParams const & p)
- : InsetCommand(buf, p, "index_print")
+ : InsetCommand(buf, p)
{}
Index const * index = indiceslist.findShortcut(getParam("type"));
if (!index && !printall)
return _("Unknown index type!");
- docstring res = printall ? _("All indices") : index->index();
+ docstring res = printall ? _("All indexes") : index->index();
if (!multind)
res += " (" + _("non-active") + ")";
else if (contains(getCmdName(), "printsubindex"))
cmd = subst(cmd, "printindex", "printsubindex");
else
cmd = subst(cmd, "printsubindex", "printindex");
+ cur.recordUndo();
setCmdName(cmd);
break;
} else if (cmd.argument() == from_ascii("check-printindex*")) {
if (suffixIs(cmd, '*'))
break;
cmd += '*';
+ cur.recordUndo();
setParam("type", docstring());
setCmdName(cmd);
break;
}
InsetCommandParams p(INDEX_PRINT_CODE);
// FIXME UNICODE
- InsetCommand::string2params("index_print",
- to_utf8(cmd.argument()), p);
+ InsetCommand::string2params(to_utf8(cmd.argument()), p);
if (p.getCmdName().empty()) {
- cur.noUpdate();
+ cur.noScreenUpdate();
break;
}
setParams(p);
} if (cmd.getArg(0) == "index_print"
&& cmd.getArg(1) == "CommandInset") {
InsetCommandParams p(INDEX_PRINT_CODE);
- InsetCommand::string2params("index_print",
- to_utf8(cmd.argument()), p);
+ InsetCommand::string2params(to_utf8(cmd.argument()), p);
if (suffixIs(p.getCmdName(), '*')) {
status.setEnabled(true);
status.setOnOff(false);
}
-int InsetPrintIndex::latex(odocstream & os, OutputParams const & runparams_in) const
+void InsetPrintIndex::latex(otexstream & os, OutputParams const & runparams_in) const
{
if (!buffer().masterBuffer()->params().use_indices) {
if (getParam("type") == from_ascii("idx"))
os << "\\printindex{}";
- return 0;
+ return;
}
OutputParams runparams = runparams_in;
os << getCommand(runparams);
- return 0;
}
}
-docstring InsetPrintIndex::contextMenu(BufferView const &, int, int) const
+docstring InsetPrintIndex::contextMenuName() const
{
return buffer().masterBuffer()->params().use_indices ?
from_ascii("context-indexprint") : docstring();
// close last entry or entries, depending.
if (level == 3) {
// close this sub-sub-entry
- xs << html::EndTag("li");
- xs.cr();
+ xs << html::EndTag("li") << html::CR();
// is this another sub-sub-entry within the same sub-entry?
if (!eit->same_sub(last)) {
// close this level
- xs << html::EndTag("ul");
- xs.cr();
+ xs << html::EndTag("ul") << html::CR();
level = 2;
}
}
// sub-entry. In that case, we do not want to close anything.
if (level == 2 && !eit->same_sub(last)) {
// close sub-entry
- xs << html::EndTag("li");
- xs.cr();
+ xs << html::EndTag("li") << html::CR();
// is this another sub-entry with the same main entry?
if (!eit->same_main(last)) {
// close this level
- xs << html::EndTag("ul");
- xs.cr();
+ xs << html::EndTag("ul") << html::CR();
level = 1;
}
}
// close the entry.
if (level == 1 && !eit->same_main(last)) {
// close entry
- xs << html::EndTag("li");
- xs.cr();
+ xs << html::EndTag("li") << html::CR();
}
}
if (level == 3) {
// another subsubentry
xs << html::StartTag("li", "class='subsubentry'")
- << XHTMLStream::NextRaw() << subsub;
+ << XHTMLStream::ESCAPE_NONE << subsub;
} else if (level == 2) {
// there are two ways we can be here:
// (i) we can actually be inside a sub-entry already and be about
// have a sub-sub-entry.
if (eit->sub != last.sub)
xs << html::StartTag("li", "class='subentry'")
- << XHTMLStream::NextRaw() << sub;
+ << XHTMLStream::ESCAPE_NONE << sub;
if (!subsub.empty()) {
// it's actually a subsubentry, so we need to start that list
- xs.cr();
- xs << html::StartTag("ul", "class='subsubentry'")
+ xs << html::CR()
+ << html::StartTag("ul", "class='subsubentry'")
<< html::StartTag("li", "class='subsubentry'")
- << XHTMLStream::NextRaw() << subsub;
+ << XHTMLStream::ESCAPE_NONE << subsub;
level = 3;
}
} else {
xs << html::StartTag("li", "class='main'") << main;
if (!sub.empty()) {
// there's a sub-entry, too
- xs.cr();
- xs << html::StartTag("ul", "class='subentry'")
+ xs << html::CR()
+ << html::StartTag("ul", "class='subentry'")
<< html::StartTag("li", "class='subentry'")
- << XHTMLStream::NextRaw() << sub;
+ << XHTMLStream::ESCAPE_NONE << sub;
level = 2;
if (!subsub.empty()) {
// and a sub-sub-entry
- xs.cr();
- xs << html::StartTag("ul", "class='subsubentry'")
+ xs << html::CR()
+ << html::StartTag("ul", "class='subsubentry'")
<< html::StartTag("li", "class='subsubentry'")
- << XHTMLStream::NextRaw() << subsub;
+ << XHTMLStream::ESCAPE_NONE << subsub;
level = 3;
}
}
}
// now we have to close all the open levels
while (level > 0) {
- xs << html::EndTag("li") << html::EndTag("ul");
- xs.cr();
+ xs << html::EndTag("li") << html::EndTag("ul") << html::CR();
--level;
}
- xs << html::EndTag("div");
- xs.cr();
+ xs << html::EndTag("div") << html::CR();
return ods.str();
}
projects / lyx.git / blobdiff