X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffactory.cpp;h=c49da693105cac8270353242499c3962a369edd3;hb=1797f5218b8819874f9dbe97b44445b3b5d598a0;hp=16bc6cf8a9f9c59ec45e302827bf06d925fc3c4c;hpb=0894f32bc649ca146bf734c2470729863b2cdf42;p=lyx.git diff --git a/src/factory.cpp b/src/factory.cpp index 16bc6cf8a9..c49da69310 100644 --- a/src/factory.cpp +++ b/src/factory.cpp @@ -40,6 +40,8 @@ #include "insets/InsetLabel.h" #include "insets/InsetLine.h" #include "insets/InsetMarginal.h" +#include "insets/InsetNewline.h" +#include "insets/InsetNewpage.h" #include "insets/InsetNote.h" #include "insets/InsetBox.h" #include "insets/InsetBranch.h" @@ -62,7 +64,7 @@ #include "support/lstrings.h" #include "support/ExceptionMessage.h" -#include +#include "support/lassert.h" #include @@ -85,21 +87,23 @@ Inset * createInsetHelper(Buffer & buf, FuncRequest const & cmd) case LFUN_LINE_INSERT: return new InsetLine; - case LFUN_NEWPAGE_INSERT: - return new InsetNewpage; - - case LFUN_PAGEBREAK_INSERT: - return new InsetPagebreak; - - case LFUN_CLEARPAGE_INSERT: - return new InsetClearPage; - - case LFUN_CLEARDOUBLEPAGE_INSERT: - return new InsetClearDoublePage; + case LFUN_NEWPAGE_INSERT: { + string const name = cmd.getArg(0); + InsetNewpageParams inp; + if (name.empty() || name == "newpage") + inp.kind = InsetNewpageParams::NEWPAGE; + else if (name == "pagebreak") + inp.kind = InsetNewpageParams::PAGEBREAK; + else if (name == "clearpage") + inp.kind = InsetNewpageParams::CLEARPAGE; + else if (name == "cleardoublepage") + inp.kind = InsetNewpageParams::CLEARDOUBLEPAGE; + return new InsetNewpage(inp); + } case LFUN_FLEX_INSERT: { string s = cmd.getArg(0); - return new InsetFlex(buf, buf.params().documentClassPtr(), s); + return new InsetFlex(buf, s); } case LFUN_NOTE_INSERT: { @@ -154,7 +158,7 @@ Inset * createInsetHelper(Buffer & buf, FuncRequest const & cmd) string const argument = to_utf8(cmd.argument()); if (params.documentClass().floats().typeExist(argument)) { auto_ptr p(new InsetFloat(buf, argument)); - p->wide(true, params); + p->setWide(true, params); return p.release(); } lyxerr << "Non-existent float type: " << argument << endl; @@ -206,8 +210,11 @@ Inset * createInsetHelper(Buffer & buf, FuncRequest const & cmd) case LFUN_ENVIRONMENT_INSERT: return new InsetEnvironment(buf, cmd.argument()); - case LFUN_INFO_INSERT: - return new InsetInfo(buf, to_utf8(cmd.argument())); + case LFUN_INFO_INSERT: { + InsetInfo * inset = new InsetInfo(buf, to_utf8(cmd.argument())); + inset->updateInfo(); + return inset; + } case LFUN_INSET_INSERT: { string const name = cmd.getArg(0); @@ -219,38 +226,37 @@ Inset * createInsetHelper(Buffer & buf, FuncRequest const & cmd) case BIBITEM_CODE: { InsetCommandParams icp(code); - InsetCommandMailer::string2params(name, to_utf8(cmd.argument()), icp); + InsetCommand::string2params(name, to_utf8(cmd.argument()), icp); return new InsetBibitem(icp); } case BIBTEX_CODE: { InsetCommandParams icp(code); - InsetCommandMailer::string2params(name, to_utf8(cmd.argument()), icp); + InsetCommand::string2params(name, to_utf8(cmd.argument()), icp); return new InsetBibtex(icp); } case CITE_CODE: { InsetCommandParams icp(code); - InsetCommandMailer::string2params(name, to_utf8(cmd.argument()), icp); + InsetCommand::string2params(name, to_utf8(cmd.argument()), icp); return new InsetCitation(icp); } case ERT_CODE: { - InsetCollapsable::CollapseStatus st; - InsetERTMailer::string2params(to_utf8(cmd.argument()), st); - return new InsetERT(buf, st); + return new InsetERT(buf, + InsetERT::string2params(to_utf8(cmd.argument()))); } case LISTINGS_CODE: { InsetListingsParams par; - InsetListingsMailer::string2params(to_utf8(cmd.argument()), par); + InsetListings::string2params(to_utf8(cmd.argument()), par); return new InsetListings(buf, par); } case EXTERNAL_CODE: { InsetExternalParams iep; - InsetExternalMailer::string2params(to_utf8(cmd.argument()), buf, iep); - auto_ptr inset(new InsetExternal); + InsetExternal::string2params(to_utf8(cmd.argument()), buf, iep); + auto_ptr inset(new InsetExternal(buf)); inset->setBuffer(buf); inset->setParams(iep); return inset.release(); @@ -258,21 +264,21 @@ Inset * createInsetHelper(Buffer & buf, FuncRequest const & cmd) case GRAPHICS_CODE: { InsetGraphicsParams igp; - InsetGraphicsMailer::string2params(to_utf8(cmd.argument()), buf, igp); - auto_ptr inset(new InsetGraphics); + InsetGraphics::string2params(to_utf8(cmd.argument()), buf, igp); + auto_ptr inset(new InsetGraphics(buf)); inset->setParams(igp); return inset.release(); } case HYPERLINK_CODE: { InsetCommandParams icp(code); - InsetCommandMailer::string2params(name, to_utf8(cmd.argument()), icp); + InsetCommand::string2params(name, to_utf8(cmd.argument()), icp); return new InsetHyperlink(icp); } case INCLUDE_CODE: { InsetCommandParams icp(code); - InsetCommandMailer::string2params(name, to_utf8(cmd.argument()), icp); + InsetCommand::string2params(name, to_utf8(cmd.argument()), icp); return new InsetInclude(icp); } @@ -281,37 +287,37 @@ Inset * createInsetHelper(Buffer & buf, FuncRequest const & cmd) case NOMENCL_CODE: { InsetCommandParams icp(code); - InsetCommandMailer::string2params(name, lyx::to_utf8(cmd.argument()), icp); + InsetCommand::string2params(name, lyx::to_utf8(cmd.argument()), icp); return new InsetNomencl(icp); } case LABEL_CODE: { InsetCommandParams icp(code); - InsetCommandMailer::string2params(name, to_utf8(cmd.argument()), icp); + InsetCommand::string2params(name, to_utf8(cmd.argument()), icp); return new InsetLabel(icp); } case REF_CODE: { InsetCommandParams icp(code); - InsetCommandMailer::string2params(name, to_utf8(cmd.argument()), icp); + InsetCommand::string2params(name, to_utf8(cmd.argument()), icp); return new InsetRef(buf, icp); } case SPACE_CODE: { InsetSpaceParams isp; - InsetSpaceMailer::string2params(to_utf8(cmd.argument()), isp); + InsetSpace::string2params(to_utf8(cmd.argument()), isp); return new InsetSpace(isp); } case TOC_CODE: { InsetCommandParams icp(code); - InsetCommandMailer::string2params(name, to_utf8(cmd.argument()), icp); + InsetCommand::string2params(name, to_utf8(cmd.argument()), icp); return new InsetTOC(icp); } case VSPACE_CODE: { VSpace vspace; - InsetVSpaceMailer::string2params(to_utf8(cmd.argument()), vspace); + InsetVSpace::string2params(to_utf8(cmd.argument()), vspace); return new InsetVSpace(vspace); } @@ -396,10 +402,10 @@ Inset * createInsetHelper(Buffer & buf, FuncRequest const & cmd) } } - return 0; } + Inset * createInset(Buffer & buf, FuncRequest const & cmd) { Inset * inset = createInsetHelper(buf, cmd); @@ -408,28 +414,27 @@ Inset * createInset(Buffer & buf, FuncRequest const & cmd) return inset; } + Inset * readInset(Lexer & lex, Buffer const & buf) { // consistency check - if (lex.getString() != "\\begin_inset") { - lyxerr << "Buffer::readInset: Consistency check failed." - << endl; - } + if (lex.getString() != "\\begin_inset") + LYXERR0("Buffer::readInset: Consistency check failed."); auto_ptr inset; - lex.next(); - string tmptok = lex.getString(); + 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 the conversion - //mentioned below. - //Note that if we do want to do a single switch, we need to remove - //this "CommandInset" line---or replace it with a single "InsetType" line - //that would be used in all 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 + // the conversion mentioned below. Note that if we do want to do a + // single switch, we need to remove this "CommandInset" line---or + // replace it with a single "InsetType" line that would be used in all + // insets. if (tmptok == "CommandInset") { lex.next(); string const insetType = lex.getString(); @@ -473,8 +478,9 @@ Inset * readInset(Lexer & lex, Buffer const & buf) inset.reset(new InsetPrintNomencl(inscmd)); break; case REF_CODE: - if (!inscmd["name"].empty() || !inscmd["reference"].empty()) - inset.reset(new InsetRef(buf, inscmd)); + if (inscmd["name"].empty() && inscmd["reference"].empty()) + return 0; + inset.reset(new InsetRef(buf, inscmd)); break; case TOC_CODE: inset.reset(new InsetTOC(inscmd)); @@ -498,13 +504,13 @@ Inset * readInset(Lexer & lex, Buffer const & buf) if (tmptok == "Quotes") { inset.reset(new InsetQuotes); } else if (tmptok == "External") { - inset.reset(new InsetExternal); + inset.reset(new InsetExternal(const_cast(buf))); } else if (tmptok == "FormulaMacro") { inset.reset(new MathMacroTemplate); } else if (tmptok == "Formula") { inset.reset(new InsetMathHull); } else if (tmptok == "Graphics") { - inset.reset(new InsetGraphics); + inset.reset(new InsetGraphics(const_cast(buf))); } else if (tmptok == "Note") { inset.reset(new InsetNote(buf, tmptok)); } else if (tmptok == "Box") { @@ -512,11 +518,9 @@ Inset * readInset(Lexer & lex, Buffer const & buf) } else if (tmptok == "Flex") { lex.next(); string s = lex.getString(); - inset.reset(new InsetFlex(buf, - buf.params().documentClassPtr(), s)); + inset.reset(new InsetFlex(buf, s)); } else if (tmptok == "Branch") { - inset.reset(new InsetBranch(buf, - InsetBranchParams())); + inset.reset(new InsetBranch(buf, InsetBranchParams())); } else if (tmptok == "Environment") { lex.next(); inset.reset(new InsetEnvironment(buf, lex.getDocString())); @@ -536,6 +540,10 @@ Inset * readInset(Lexer & lex, Buffer const & buf) inset.reset(new InsetFoot(buf)); } else if (tmptok == "Marginal") { inset.reset(new InsetMarginal(buf)); + } else if (tmptok == "Newpage") { + inset.reset(new InsetNewpage); + } else if (tmptok == "Newline") { + inset.reset(new InsetNewline); } else if (tmptok == "OptArg") { inset.reset(new InsetOptArg(buf)); } else if (tmptok == "Float") {