#include "factory.h"
#include "Buffer.h"
-#include "BufferView.h"
#include "BufferParams.h"
-#include "debug.h"
#include "FloatList.h"
#include "FuncRequest.h"
-#include "Color.h"
#include "Lexer.h"
#include "LyX.h"
+#include "TextClass.h"
#include "insets/InsetBibitem.h"
#include "insets/InsetBibtex.h"
#include "insets/InsetBox.h"
#include "insets/InsetBranch.h"
#include "insets/InsetOptArg.h"
-#include "insets/InsetPagebreak.h"
+#include "insets/InsetNewpage.h"
#include "insets/InsetRef.h"
#include "insets/InsetSpace.h"
#include "insets/InsetTabular.h"
#include "frontends/alert.h"
+#include "support/debug.h"
#include "support/lstrings.h"
#include "support/ExceptionMessage.h"
#include <boost/assert.hpp>
-#include <boost/current_function.hpp>
#include <sstream>
-using std::auto_ptr;
-using std::endl;
-using std::string;
-
+using namespace std;
+using namespace lyx::support;
namespace lyx {
namespace Alert = frontend::Alert;
-using support::compare_ascii_no_case;
-
-Inset * createInset(BufferView * bv, FuncRequest const & cmd)
+Inset * createInset(Buffer & buf, FuncRequest const & cmd)
{
- BufferParams const & params = bv->buffer().params();
+ BufferParams const & params = buf.params();
try {
case LFUN_LINE_INSERT:
return new InsetLine;
+ case LFUN_NEWPAGE_INSERT:
+ return new InsetNewpage;
+
case LFUN_PAGEBREAK_INSERT:
return new InsetPagebreak;
case LFUN_FLEX_INSERT: {
string s = cmd.getArg(0);
- TextClass tclass = params.getTextClass();
- InsetLayout il = tclass.insetlayout(from_utf8(s));
- return new InsetFlex(params, il);
+ return new InsetFlex(params, params.getTextClassPtr(), s);
}
case LFUN_NOTE_INSERT: {
if (params.getTextClass().floats().typeExist(argument))
return new InsetFloat(params, argument);
lyxerr << "Non-existent float type: " << argument << endl;
- return 0;
}
case LFUN_FLOAT_WIDE_INSERT: {
case LFUN_NOMENCL_INSERT: {
InsetCommandParams icp(NOMENCL_CODE);
- icp["symbol"] = cmd.argument().empty() ?
- bv->cursor().innerText()->getStringToIndex(bv->cursor()) :
- cmd.argument();
+ icp["symbol"] = cmd.argument();
return new InsetNomencl(icp);
}
case LFUN_TABULAR_INSERT: {
if (cmd.argument().empty())
return 0;
- std::istringstream ss(to_utf8(cmd.argument()));
+ istringstream ss(to_utf8(cmd.argument()));
int r = 0, c = 0;
ss >> r >> c;
if (r <= 0)
r = 2;
if (c <= 0)
c = 2;
- return new InsetTabular(bv->buffer(), r, c);
+ return new InsetTabular(buf, r, c);
}
case LFUN_CAPTION_INSERT: {
auto_ptr<InsetCaption> inset(new InsetCaption(params));
inset->setAutoBreakRows(true);
inset->setDrawFrame(true);
- inset->setFrameColor(Color::captionframe);
+ inset->setFrameColor(Color_captionframe);
return inset.release();
}
}
case EXTERNAL_CODE: {
- Buffer const & buffer = bv->buffer();
InsetExternalParams iep;
- InsetExternalMailer::string2params(to_utf8(cmd.argument()), buffer, iep);
+ InsetExternalMailer::string2params(to_utf8(cmd.argument()), buf, iep);
auto_ptr<InsetExternal> inset(new InsetExternal);
- inset->setParams(iep, buffer);
+ inset->setParams(iep, buf);
return inset.release();
}
case GRAPHICS_CODE: {
- Buffer const & buffer = bv->buffer();
InsetGraphicsParams igp;
- InsetGraphicsMailer::string2params(to_utf8(cmd.argument()), buffer, igp);
+ InsetGraphicsMailer::string2params(to_utf8(cmd.argument()), buf, igp);
auto_ptr<InsetGraphics> inset(new InsetGraphics);
inset->setParams(igp);
return inset.release();
case REF_CODE: {
InsetCommandParams icp(code);
InsetCommandMailer::string2params(name, to_utf8(cmd.argument()), icp);
- return new InsetRef(icp, bv->buffer());
+ return new InsetRef(icp, buf);
}
case TOC_CODE: {
default:
lyxerr << "Inset '" << name << "' not permitted with LFUN_INSET_INSERT."
- << std::endl;
+ << endl;
return 0;
}
string const name = to_utf8(cmd.argument());
if (name == "normal")
return new InsetSpace(InsetSpace::NORMAL);
- else if (name == "protected")
+ if (name == "protected")
return new InsetSpace(InsetSpace::PROTECTED);
- else if (name == "thin")
+ if (name == "thin")
return new InsetSpace(InsetSpace::THIN);
- else if (name == "quad")
+ if (name == "quad")
return new InsetSpace(InsetSpace::QUAD);
- else if (name == "qquad")
+ if (name == "qquad")
return new InsetSpace(InsetSpace::QQUAD);
- else if (name == "enspace")
+ if (name == "enspace")
return new InsetSpace(InsetSpace::ENSPACE);
- else if (name == "enskip")
+ if (name == "enskip")
return new InsetSpace(InsetSpace::ENSKIP);
- else if (name == "negthinspace")
+ if (name == "negthinspace")
return new InsetSpace(InsetSpace::NEGTHIN);
- else if (name.empty())
+ if (name.empty())
lyxerr << "LyX function 'space' needs an argument." << endl;
else
lyxerr << "Wrong argument for LyX function 'space'." << endl;
break;
}
- } catch (support::ExceptionMessage const & message) {
- if (message.type_ == support::ErrorException) {
+ } catch (ExceptionMessage const & message) {
+ if (message.type_ == ErrorException) {
+ // This should never happen!
Alert::error(message.title_, message.details_);
- LyX::cref().emergencyCleanup();
- abort();
- } else if (message.type_ == support::WarningException) {
+ LyX::cref().exit(1);
+ } else if (message.type_ == WarningException) {
Alert::warning(message.title_, message.details_);
return 0;
}
auto_ptr<Inset> inset;
- TextClass tclass = buf.params().getTextClass();
-
lex.next();
string tmptok = lex.getString();
case INCLUDE_CODE:
inset.reset(new InsetInclude(inscmd));
break;
- case INDEX_CODE:
- inset.reset(new InsetIndex(buf.params()));
- break;
case INDEX_PRINT_CODE:
inset.reset(new InsetPrintIndex(inscmd));
break;
case NO_CODE:
default:
lyxerr << "unknown CommandInset '" << insetType
- << "'" << std::endl;
+ << "'" << endl;
while (lex.isOK() && lex.getString() != "\\end_inset")
lex.next();
return 0;
} else if (tmptok == "Flex") {
lex.next();
string s = lex.getString();
- InsetLayout il = tclass.insetlayout(from_utf8(s));
- inset.reset(new InsetFlex(buf.params(), il));
+ inset.reset(new InsetFlex(buf.params(),
+ buf.params().getTextClassPtr(), s));
} else if (tmptok == "Branch") {
inset.reset(new InsetBranch(buf.params(),
InsetBranchParams()));
inset.reset(new InsetInfo(buf.params()));
} else {
lyxerr << "unknown Inset type '" << tmptok
- << "'" << std::endl;
+ << "'" << endl;
while (lex.isOK() && lex.getString() != "\\end_inset")
lex.next();
return 0;
}
inset->read(buf, lex);
-
-// FIXME: hack..
- if (inset->lyxCode() == MATHMACRO_CODE) {
- MathMacroTemplate const * tmpl =
- static_cast<MathMacroTemplate*>(inset.get());
- MacroTable::globalMacros().insert
- (tmpl->name(), tmpl->asMacroData());
- LYXERR(Debug::DEBUG)
- << BOOST_CURRENT_FUNCTION
- << ": creating local macro " << to_utf8(tmpl->name())
- << endl;
- }
}
return inset.release();
projects / lyx.git / blobdiff