* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
- * \author André Pönitz
+ * \author André Pönitz
*
* Full author contact details are available in file CREDITS.
*/
#include "insets/InsetBibitem.h"
#include "insets/InsetBibtex.h"
+#include "insets/InsetBox.h"
+#include "insets/InsetBranch.h"
#include "insets/InsetCaption.h"
#include "insets/InsetCitation.h"
#include "insets/InsetFlex.h"
#include "insets/InsetFloatList.h"
#include "insets/InsetFoot.h"
#include "insets/InsetGraphics.h"
+#include "insets/InsetHyperlink.h"
#include "insets/InsetInclude.h"
#include "insets/InsetIndex.h"
#include "insets/InsetInfo.h"
-#include "insets/InsetNomencl.h"
#include "insets/InsetLabel.h"
#include "insets/InsetLine.h"
#include "insets/InsetMarginal.h"
#include "insets/InsetNewline.h"
#include "insets/InsetNewpage.h"
+#include "insets/InsetNomencl.h"
#include "insets/InsetNote.h"
-#include "insets/InsetBox.h"
-#include "insets/InsetBranch.h"
#include "insets/InsetOptArg.h"
-#include "insets/InsetNewpage.h"
+#include "insets/InsetPhantom.h"
+#include "insets/InsetPreview.h"
#include "insets/InsetRef.h"
#include "insets/InsetSpace.h"
#include "insets/InsetTabular.h"
#include "insets/InsetTOC.h"
-#include "insets/InsetHyperlink.h"
#include "insets/InsetVSpace.h"
#include "insets/InsetWrap.h"
namespace Alert = frontend::Alert;
-Inset * createInsetHelper(Buffer & buf, FuncRequest const & cmd)
+Inset * createInsetHelper(Buffer * buf, FuncRequest const & cmd)
{
- BufferParams const & params = buf.params();
-
try {
- switch (cmd.action) {
+ switch (cmd.action()) {
case LFUN_LINE_INSERT:
return new InsetLine;
return new InsetBranch(buf, InsetBranchParams(arg));
}
+ case LFUN_PHANTOM_INSERT: {
+ string arg = cmd.getArg(0);
+ if (arg.empty())
+ arg = "Phantom";
+ return new InsetPhantom(buf, arg);
+ }
+
case LFUN_ERT_INSERT:
return new InsetERT(buf);
case LFUN_OPTIONAL_INSERT:
return new InsetOptArg(buf);
- case LFUN_FLOAT_INSERT: {
- // check if the float type exists
- string const argument = to_utf8(cmd.argument());
- if (buf.params().documentClass().floats().typeExist(argument))
- return new InsetFloat(buf, argument);
- lyxerr << "Non-existent float type: " << argument << endl;
- }
+ case LFUN_FLOAT_INSERT:
+ return new InsetFloat(buf, to_utf8(cmd.argument()));
case LFUN_FLOAT_WIDE_INSERT: {
- // check if the float type exists
- string const argument = to_utf8(cmd.argument());
- if (params.documentClass().floats().typeExist(argument)) {
- auto_ptr<InsetFloat> p(new InsetFloat(buf, argument));
- p->setWide(true, params);
- return p.release();
- }
- lyxerr << "Non-existent float type: " << argument << endl;
- return 0;
+ InsetFloat * fl = new InsetFloat(buf, to_utf8(cmd.argument()));
+ fl->setWide(true);
+ return fl;
}
case LFUN_WRAP_INSERT: {
return 0;
}
- case LFUN_INDEX_INSERT:
- return new InsetIndex(buf);
+ case LFUN_INDEX_INSERT: {
+ docstring arg = cmd.argument();
+ return new InsetIndex(buf, InsetIndexParams(arg));
+ }
case LFUN_NOMENCL_INSERT: {
InsetCommandParams icp(NOMENCL_CODE);
icp["symbol"] = cmd.argument();
- return new InsetNomencl(icp);
+ return new InsetNomencl(buf, icp);
}
case LFUN_TABULAR_INSERT: {
case LFUN_CAPTION_INSERT:
return new InsetCaption(buf);
- case LFUN_INDEX_PRINT:
- return new InsetPrintIndex(InsetCommandParams(INDEX_PRINT_CODE));
+ case LFUN_INDEX_PRINT: {
+ InsetCommandParams icp(INDEX_PRINT_CODE);
+ icp["type"] = cmd.argument();
+ return new InsetPrintIndex(buf, icp);
+ }
- case LFUN_NOMENCL_PRINT:
- return new InsetPrintNomencl(InsetCommandParams(NOMENCL_PRINT_CODE));
+ case LFUN_NOMENCL_PRINT: {
+ InsetCommandParams icp(NOMENCL_PRINT_CODE);
+ icp["set_width"] = from_ascii("auto");
+ return new InsetPrintNomencl(buf, icp);
+ }
case LFUN_TOC_INSERT:
- return new InsetTOC(InsetCommandParams(TOC_CODE));
+ return new InsetTOC(buf, InsetCommandParams(TOC_CODE));
case LFUN_INFO_INSERT: {
InsetInfo * inset = new InsetInfo(buf, to_utf8(cmd.argument()));
return inset;
}
+ case LFUN_PREVIEW_INSERT:
+ return new InsetPreview(buf);
+
case LFUN_INSET_INSERT: {
string const name = cmd.getArg(0);
InsetCode code = insetCode(name);
case CITE_CODE: {
InsetCommandParams icp(code);
InsetCommand::string2params(name, to_utf8(cmd.argument()), icp);
- return new InsetCitation(icp);
+ return new InsetCitation(buf, icp);
}
case ERT_CODE: {
case EXTERNAL_CODE: {
InsetExternalParams iep;
- InsetExternal::string2params(to_utf8(cmd.argument()), buf, iep);
+ InsetExternal::string2params(to_utf8(cmd.argument()), *buf, iep);
auto_ptr<InsetExternal> inset(new InsetExternal(buf));
- inset->setBuffer(buf);
+ inset->setBuffer(*buf);
inset->setParams(iep);
return inset.release();
}
case GRAPHICS_CODE: {
InsetGraphicsParams igp;
- InsetGraphics::string2params(to_utf8(cmd.argument()), buf, igp);
+ InsetGraphics::string2params(to_utf8(cmd.argument()), *buf, igp);
auto_ptr<InsetGraphics> inset(new InsetGraphics(buf));
inset->setParams(igp);
return inset.release();
case HYPERLINK_CODE: {
InsetCommandParams icp(code);
InsetCommand::string2params(name, to_utf8(cmd.argument()), icp);
- return new InsetHyperlink(icp);
+ return new InsetHyperlink(buf, icp);
}
case INCLUDE_CODE: {
InsetCommandParams icp(code);
InsetCommand::string2params(name, to_utf8(cmd.argument()), icp);
- return new InsetInclude(icp);
+ return new InsetInclude(buf, icp);
}
- case INDEX_CODE:
- return new InsetIndex(buf);
+ case INDEX_CODE: {
+ docstring arg = cmd.argument();
+ return new InsetIndex(buf, InsetIndexParams(arg));
+ }
+
+ case INDEX_PRINT_CODE: {
+ InsetCommandParams icp(code);
+ InsetCommand::string2params(name, to_utf8(cmd.argument()), icp);
+ return new InsetPrintIndex(buf, icp);
+ }
case NOMENCL_CODE: {
InsetCommandParams icp(code);
- InsetCommand::string2params(name, lyx::to_utf8(cmd.argument()), icp);
- return new InsetNomencl(icp);
+ InsetCommand::string2params(name, to_utf8(cmd.argument()), icp);
+ return new InsetNomencl(buf, icp);
}
case LABEL_CODE: {
InsetCommandParams icp(code);
InsetCommand::string2params(name, to_utf8(cmd.argument()), icp);
- return new InsetLabel(icp);
+ return new InsetLabel(buf, icp);
}
case REF_CODE: {
case TOC_CODE: {
InsetCommandParams icp(code);
InsetCommand::string2params(name, to_utf8(cmd.argument()), icp);
- return new InsetTOC(icp);
+ return new InsetTOC(buf, icp);
}
case VSPACE_CODE: {
InsetVSpace::string2params(to_utf8(cmd.argument()), vspace);
return new InsetVSpace(vspace);
}
+
+ case PREVIEW_CODE:
+ return new InsetPreview(buf);
default:
lyxerr << "Inset '" << name << "' not permitted with LFUN_INSET_INSERT."
return 0;
}
- } //end LFUN_INSET_INSERT
+ } //end LFUN_INSET_INSERT
case LFUN_SPACE_INSERT: {
string const name = cmd.getArg(0);
break;
}
InsetSpaceParams isp;
+ // The tests for isp.math might be disabled after a file format change
if (name == "normal")
isp.kind = InsetSpaceParams::NORMAL;
else if (name == "protected")
isp.kind = InsetSpaceParams::PROTECTED;
else if (name == "thin")
isp.kind = InsetSpaceParams::THIN;
+ else if (isp.math && name == "med")
+ isp.kind = InsetSpaceParams::MEDIUM;
+ else if (isp.math && name == "thick")
+ isp.kind = InsetSpaceParams::THICK;
else if (name == "quad")
isp.kind = InsetSpaceParams::QUAD;
else if (name == "qquad")
isp.kind = InsetSpaceParams::ENSKIP;
else if (name == "negthinspace")
isp.kind = InsetSpaceParams::NEGTHIN;
+ else if (isp.math && name == "negmedspace")
+ isp.kind = InsetSpaceParams::NEGMEDIUM;
+ else if (isp.math && name == "negthickspace")
+ isp.kind = InsetSpaceParams::NEGTHICK;
else if (name == "hfill")
isp.kind = InsetSpaceParams::HFILL;
else if (name == "hfill*")
else if (name == "hrulefill")
isp.kind = InsetSpaceParams::HRULEFILL;
else if (name == "hspace") {
- if (len.empty() || !isValidLength(len)) {
+ if (len.empty() || !isValidGlueLength(len)) {
lyxerr << "LyX function 'space-insert hspace' "
<< "needs a valid length argument." << endl;
break;
}
isp.kind = InsetSpaceParams::CUSTOM;
- isp.length = Length(len);
+ isp.length = GlueLength(len);
}
else if (name == "hspace*") {
- if (len.empty() || !isValidLength(len)) {
+ if (len.empty() || !isValidGlueLength(len)) {
lyxerr << "LyX function 'space-insert hspace*' "
<< "needs a valid length argument." << endl;
break;
}
isp.kind = InsetSpaceParams::CUSTOM_PROTECTED;
- isp.length = Length(len);
+ isp.length = GlueLength(len);
}
else {
lyxerr << "Wrong argument for LyX function 'space-insert'." << endl;
}
-Inset * createInset(Buffer & buf, FuncRequest const & cmd)
+Inset * createInset(Buffer * buf, FuncRequest const & cmd)
{
Inset * inset = createInsetHelper(buf, cmd);
if (inset)
- inset->setBuffer(buf);
+ inset->setBuffer(*buf);
return inset;
}
-Inset * readInset(Lexer & lex, Buffer const & buf)
+Inset * readInset(Lexer & lex, Buffer * buf)
{
// consistency check
if (lex.getString() != "\\begin_inset")
inset.reset(new InsetBibtex(buf, inscmd));
break;
case CITE_CODE:
- inset.reset(new InsetCitation(inscmd));
+ inset.reset(new InsetCitation(buf, inscmd));
break;
case HYPERLINK_CODE:
- inset.reset(new InsetHyperlink(inscmd));
+ inset.reset(new InsetHyperlink(buf, inscmd));
break;
case INCLUDE_CODE:
- inset.reset(new InsetInclude(inscmd));
+ inset.reset(new InsetInclude(buf, inscmd));
break;
case INDEX_PRINT_CODE:
- inset.reset(new InsetPrintIndex(inscmd));
+ inset.reset(new InsetPrintIndex(buf, inscmd));
break;
case LABEL_CODE:
- inset.reset(new InsetLabel(inscmd));
+ inset.reset(new InsetLabel(buf, inscmd));
break;
case NOMENCL_CODE:
- inset.reset(new InsetNomencl(inscmd));
+ inset.reset(new InsetNomencl(buf, inscmd));
break;
case NOMENCL_PRINT_CODE:
- inset.reset(new InsetPrintNomencl(inscmd));
+ inset.reset(new InsetPrintNomencl(buf, inscmd));
break;
case REF_CODE:
if (inscmd["name"].empty() && inscmd["reference"].empty())
inset.reset(new InsetRef(buf, inscmd));
break;
case TOC_CODE:
- inset.reset(new InsetTOC(inscmd));
+ inset.reset(new InsetTOC(buf, inscmd));
break;
case NO_CODE:
default:
lex.next();
return 0;
}
- inset->setBuffer(const_cast<Buffer &>(buf));
+ inset->setBuffer(*buf);
} else {
// FIXME This branch should be made to use inset codes as the preceding
// branch does. Unfortunately, that will take some doing. It requires
// can be translated to inset codes using insetCode(). And the insets'
// write() routines should use insetName() rather than hardcoding it.
if (tmptok == "Quotes") {
- inset.reset(new InsetQuotes);
+ inset.reset(new InsetQuotes(buf));
} else if (tmptok == "External") {
- inset.reset(new InsetExternal(const_cast<Buffer &>(buf)));
+ inset.reset(new InsetExternal(buf));
} else if (tmptok == "FormulaMacro") {
- inset.reset(new MathMacroTemplate);
+ inset.reset(new MathMacroTemplate(buf));
} else if (tmptok == "Formula") {
- inset.reset(new InsetMathHull);
+ inset.reset(new InsetMathHull(buf));
} else if (tmptok == "Graphics") {
- inset.reset(new InsetGraphics(const_cast<Buffer &>(buf)));
+ inset.reset(new InsetGraphics(buf));
} else if (tmptok == "Note") {
inset.reset(new InsetNote(buf, tmptok));
} else if (tmptok == "Box") {
inset.reset(new InsetBox(buf, tmptok));
} else if (tmptok == "Flex") {
- lex.next();
+ lex.eatLine();
string s = lex.getString();
inset.reset(new InsetFlex(buf, s));
} else if (tmptok == "Branch") {
inset.reset(new InsetBranch(buf, InsetBranchParams()));
+ } else if (tmptok == "Phantom") {
+ inset.reset(new InsetPhantom(buf, tmptok));
} else if (tmptok == "ERT") {
inset.reset(new InsetERT(buf));
} else if (tmptok == "listings") {
} else if (tmptok == "OptArg") {
inset.reset(new InsetOptArg(buf));
} else if (tmptok == "Float") {
- lex.next();
- string tmptok = lex.getString();
- inset.reset(new InsetFloat(buf, tmptok));
+ inset.reset(new InsetFloat(buf, string()));
} else if (tmptok == "Wrap") {
lex.next();
string tmptok = lex.getString();
} else if (tmptok == "Caption") {
inset.reset(new InsetCaption(buf));
} else if (tmptok == "Index") {
- inset.reset(new InsetIndex(buf));
+ inset.reset(new InsetIndex(buf, InsetIndexParams()));
} else if (tmptok == "FloatList") {
- inset.reset(new InsetFloatList);
+ inset.reset(new InsetFloatList(buf));
} else if (tmptok == "Info") {
inset.reset(new InsetInfo(buf));
+ } else if (tmptok == "Preview") {
+ inset.reset(new InsetPreview(buf));
} else {
lyxerr << "unknown Inset type '" << tmptok
<< "'" << endl;
// Set the buffer reference for proper parsing of some insets
// (InsetCollapsable for example)
- inset->setBuffer(const_cast<Buffer &>(buf));
+ inset->setBuffer(*buf);
inset->read(lex);
// Set again the buffer for insets that are created inside this inset
// (InsetMathHull for example).
- inset->setBuffer(const_cast<Buffer &>(buf));
+ inset->setBuffer(*buf);
}
return inset.release();
}
projects / lyx.git / blobdiff