#include "factory.h"
-#include "Buffer.h"
-#include "BufferParams.h"
-#include "FloatList.h"
#include "FuncRequest.h"
#include "Lexer.h"
#include "LyX.h"
-#include "TextClass.h"
#include "insets/InsetBibitem.h"
#include "insets/InsetBibtex.h"
#include "insets/InsetBranch.h"
#include "insets/InsetCaption.h"
#include "insets/InsetCitation.h"
+#include "insets/InsetCounter.h"
#include "insets/InsetFlex.h"
#include "insets/InsetERT.h"
#include "insets/InsetListings.h"
#include "insets/InsetHyperlink.h"
#include "insets/InsetInclude.h"
#include "insets/InsetIndex.h"
+#include "insets/InsetIndexMacro.cpp"
#include "insets/InsetInfo.h"
#include "insets/InsetIPA.h"
#include "insets/InsetIPAMacro.h"
#include "insets/InsetArgument.h"
#include "insets/InsetPhantom.h"
#include "insets/InsetPreview.h"
+#include "insets/InsetQuotes.h"
#include "insets/InsetRef.h"
#include "insets/InsetScript.h"
+#include "insets/InsetSeparator.h"
#include "insets/InsetSpace.h"
#include "insets/InsetTabular.h"
#include "insets/InsetTOC.h"
#include "insets/InsetVSpace.h"
#include "insets/InsetWrap.h"
-#include "mathed/MathMacroTemplate.h"
+#include "mathed/InsetMathMacroTemplate.h"
#include "mathed/InsetMathHull.h"
#include "frontends/alert.h"
#include "support/debug.h"
-#include "support/lstrings.h"
#include "support/ExceptionMessage.h"
-
-#include "support/lassert.h"
+#include "support/lstrings.h"
+#include "support/unique_ptr.h"
#include <sstream>
+
using namespace std;
using namespace lyx::support;
inp.kind = InsetNewpageParams::CLEARPAGE;
else if (name == "cleardoublepage")
inp.kind = InsetNewpageParams::CLEARDOUBLEPAGE;
+ else if (name == "nopagebreak")
+ inp.kind = InsetNewpageParams::NOPAGEBREAK;
return new InsetNewpage(inp);
}
+ case LFUN_SEPARATOR_INSERT: {
+ string const name = cmd.getArg(0);
+ InsetSeparatorParams inp;
+ if (name.empty() || name == "plain")
+ inp.kind = InsetSeparatorParams::PLAIN;
+ else if (name == "parbreak")
+ inp.kind = InsetSeparatorParams::PARBREAK;
+ else if (name == "latexpar")
+ inp.kind = InsetSeparatorParams::LATEXPAR;
+ else {
+ lyxerr << "Wrong argument for LyX function 'separator-insert'." << endl;
+ break;
+ }
+ return new InsetSeparator(inp);
+ }
+
case LFUN_FLEX_INSERT: {
string s = cmd.getArg(0);
return new InsetFlex(buf, s);
string const arg2 = cmd.getArg(1);
if (arg1 != "deco") {
LYXERR0("LFUN_IPAMACRO_INSERT: wrong argument");
- return 0;
+ return nullptr;
}
return new InsetIPADeco(buf, arg2);
}
+ case LFUN_INDEXMACRO_INSERT: {
+ string const arg = cmd.getArg(0);
+ if (arg != "see" && arg != "seealso"
+ && arg != "subentry" && arg != "sortkey") {
+ LYXERR0("LFUN_INDEXMACRO_INSERT: wrong argument");
+ return nullptr;
+ }
+ return new InsetIndexMacro(buf, arg);
+ }
+
case LFUN_ERT_INSERT:
return new InsetERT(buf);
string arg = cmd.getArg(0);
if (arg.empty()) {
LYXERR0("argument-insert needs an argument!");
- return 0;
+ return nullptr;
}
return new InsetArgument(buf, arg);
}
if (argument == "figure" || argument == "table")
return new InsetWrap(buf, argument);
lyxerr << "Non-existent wrapfig type: " << argument << endl;
- return 0;
+ return nullptr;
}
case LFUN_INDEX_INSERT: {
- docstring arg = cmd.argument();
+ docstring const & arg = cmd.argument();
return new InsetIndex(buf, InsetIndexParams(arg));
}
case LFUN_TABULAR_INSERT: {
if (cmd.argument().empty())
- return 0;
+ return nullptr;
istringstream ss(to_utf8(cmd.argument()));
int r = 0, c = 0;
ss >> r >> c;
return new InsetTabular(buf, r, c);
}
- case LFUN_CAPTION_INSERT:
- return new InsetCaption(buf);
+ case LFUN_CAPTION_INSERT: {
+ string arg = cmd.getArg(0);
+ if (arg.empty())
+ arg = "Standard";
+ return new InsetCaption(buf, arg);
+ }
case LFUN_INDEX_PRINT: {
InsetCommandParams icp(INDEX_PRINT_CODE);
case LFUN_INFO_INSERT: {
InsetInfo * inset = new InsetInfo(buf, to_utf8(cmd.argument()));
- inset->updateInfo();
return inset;
}
switch (code) {
case NO_CODE:
lyxerr << "No such inset '" << name << "'.";
- return 0;
-
+ return nullptr;
+
case BIBITEM_CODE: {
InsetCommandParams icp(code);
InsetCommand::string2params(to_utf8(cmd.argument()), icp);
return new InsetBibitem(buf, icp);
}
-
+
case BIBTEX_CODE: {
InsetCommandParams icp(code);
InsetCommand::string2params(to_utf8(cmd.argument()), icp);
return new InsetBibtex(buf, icp);
}
-
+
case CITE_CODE: {
InsetCommandParams icp(code);
InsetCommand::string2params(to_utf8(cmd.argument()), icp);
return new InsetCitation(buf, icp);
}
-
+
+ case COUNTER_CODE: {
+ InsetCommandParams icp(code);
+ InsetCommand::string2params(to_utf8(cmd.argument()), icp);
+ return new InsetCounter(buf, icp);
+ }
+
case ERT_CODE: {
return new InsetERT(buf,
InsetERT::string2params(to_utf8(cmd.argument())));
}
-
+
case EXTERNAL_CODE: {
InsetExternalParams iep;
InsetExternal::string2params(to_utf8(cmd.argument()), *buf, iep);
- auto_ptr<InsetExternal> inset(new InsetExternal(buf));
+ auto inset = make_unique<InsetExternal>(buf);
inset->setBuffer(*buf);
inset->setParams(iep);
return inset.release();
}
-
+
case GRAPHICS_CODE: {
InsetGraphicsParams igp;
InsetGraphics::string2params(to_utf8(cmd.argument()), *buf, igp);
- auto_ptr<InsetGraphics> inset(new InsetGraphics(buf));
+ auto inset = make_unique<InsetGraphics>(buf);
inset->setParams(igp);
return inset.release();
}
-
+
case HYPERLINK_CODE: {
InsetCommandParams icp(code);
InsetCommand::string2params(to_utf8(cmd.argument()), icp);
return new InsetHyperlink(buf, icp);
}
-
+
case INCLUDE_CODE: {
InsetCommandParams icp(code);
InsetCommand::string2params(to_utf8(cmd.argument()), icp);
return new InsetInclude(buf, icp);
}
-
+
case INDEX_CODE: {
- docstring arg = cmd.argument();
+ docstring const & arg = cmd.argument();
return new InsetIndex(buf, InsetIndexParams(arg));
}
-
+
case INDEX_PRINT_CODE: {
InsetCommandParams icp(code);
InsetCommand::string2params(to_utf8(cmd.argument()), icp);
return new InsetPrintIndex(buf, icp);
}
-
+
case LABEL_CODE: {
InsetCommandParams icp(code);
InsetCommand::string2params(to_utf8(cmd.argument()), icp);
return new InsetLabel(buf, icp);
}
-
+
case LINE_CODE: {
InsetCommandParams icp(code);
InsetCommand::string2params(to_utf8(cmd.argument()), icp);
return new InsetLine(buf, icp);
}
-
+
case LISTINGS_CODE: {
InsetListingsParams par;
InsetListings::string2params(to_utf8(cmd.argument()), par);
return new InsetListings(buf, par);
}
-
+
case NOMENCL_CODE: {
InsetCommandParams icp(code);
InsetCommand::string2params(to_utf8(cmd.argument()), icp);
return new InsetNomencl(buf, icp);
}
-
+
case REF_CODE: {
InsetCommandParams icp(code);
InsetCommand::string2params(to_utf8(cmd.argument()), icp);
InsetSpace::string2params(to_utf8(cmd.argument()), isp);
return new InsetSpace(isp);
}
-
+
case TOC_CODE: {
InsetCommandParams icp(code);
InsetCommand::string2params(to_utf8(cmd.argument()), icp);
return new InsetTOC(buf, icp);
}
-
+
case VSPACE_CODE: {
VSpace vspace;
InsetVSpace::string2params(to_utf8(cmd.argument()), vspace);
case PREVIEW_CODE:
return new InsetPreview(buf);
-
+
default:
lyxerr << "Inset '" << name << "' not permitted with LFUN_INSET_INSERT."
<< endl;
- return 0;
-
+ return nullptr;
+
}
} //end LFUN_INSET_INSERT
}
return new InsetSpace(isp);
}
- break;
default:
break;
lyx_exit(1);
} else if (message.type_ == WarningException) {
Alert::warning(message.title_, message.details_);
- return 0;
+ return nullptr;
}
}
- return 0;
+ return nullptr;
}
if (lex.getString() != "\\begin_inset")
LYXERR0("Buffer::readInset: Consistency check failed.");
- auto_ptr<Inset> inset;
+ unique_ptr<Inset> inset;
string tmptok;
lex >> tmptok;
// test the different insets
-
+
// FIXME It would be better if we did not have this branch and could
// just do one massive switch for all insets. But at present, it's
// easier to do it this way, and we can't do the massive switch until
lex.next();
string const insetType = lex.getString();
lex.pushToken(insetType);
-
+
InsetCode const code = insetCode(insetType);
-
+
//FIXME If we do the one massive switch, we cannot do this here, since
//we do not know in advance that we're dealing with a command inset.
//Worst case, we could put it in each case below. Better, we could
//pass the lexer to the constructor and let the params be built there.
InsetCommandParams inscmd(code);
- inscmd.read(lex);
+ inscmd.Read(lex, buf);
switch (code) {
case BIBITEM_CODE:
case BIBTEX_CODE:
inset.reset(new InsetBibtex(buf, inscmd));
break;
- case CITE_CODE:
+ case CITE_CODE:
inset.reset(new InsetCitation(buf, inscmd));
break;
+ case COUNTER_CODE:
+ inset.reset(new InsetCounter(buf, inscmd));
+ break;
case HYPERLINK_CODE:
inset.reset(new InsetHyperlink(buf, inscmd));
break;
break;
case REF_CODE:
if (inscmd["name"].empty() && inscmd["reference"].empty())
- return 0;
+ return nullptr;
inset.reset(new InsetRef(buf, inscmd));
break;
case TOC_CODE:
<< "'" << endl;
while (lex.isOK() && lex.getString() != "\\end_inset")
lex.next();
- return 0;
+ return nullptr;
}
inset->setBuffer(*buf);
- } else {
+ } else {
// FIXME This branch should be made to use inset codes
// as the preceding branch does. Unfortunately, that
// will take some doing. It requires converting the
} else if (tmptok == "External") {
inset.reset(new InsetExternal(buf));
} else if (tmptok == "FormulaMacro") {
- inset.reset(new MathMacroTemplate(buf));
+ inset.reset(new InsetMathMacroTemplate(buf));
} else if (tmptok == "Formula") {
inset.reset(new InsetMathHull(buf));
} else if (tmptok == "Graphics") {
inset.reset(new InsetNewpage);
} else if (tmptok == "Newline") {
inset.reset(new InsetNewline);
+ } else if (tmptok == "Separator") {
+ inset.reset(new InsetSeparator);
} else if (tmptok == "Argument") {
inset.reset(new InsetArgument(buf, tmptok));
} else if (tmptok == "Float") {
inset.reset(new InsetFloat(buf, string()));
} else if (tmptok == "Wrap") {
lex.next();
- string tmptok = lex.getString();
- inset.reset(new InsetWrap(buf, tmptok));
+ string tmptok2 = lex.getString();
+ inset.reset(new InsetWrap(buf, tmptok2));
} else if (tmptok == "Caption") {
- inset.reset(new InsetCaption(buf));
+ lex.eatLine();
+ string s = lex.getString();
+ inset.reset(new InsetCaption(buf, s));
} else if (tmptok == "Index") {
inset.reset(new InsetIndex(buf, InsetIndexParams()));
+ } else if (tmptok == "IndexMacro") {
+ string s = lex.getString();
+ inset.reset(new InsetIndexMacro(buf, s));
} else if (tmptok == "FloatList") {
inset.reset(new InsetFloatList(buf));
} else if (tmptok == "Info") {
<< "'" << endl;
while (lex.isOK() && lex.getString() != "\\end_inset")
lex.next();
- return 0;
+ return nullptr;
}
// Set the buffer reference for proper parsing of some insets
- // (InsetCollapsable for example)
+ // (InsetCollapsible for example)
inset->setBuffer(*buf);
inset->read(lex);
// Set again the buffer for insets that are created inside this inset
projects / lyx.git / blobdiff