X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffactory.C;h=03a285a3c3e0e007b6eea7644f1f28878602148c;hb=37e82a546392d43f787826b85481a11f2a27af15;hp=fcfb662f8b4fa867aea6f336f39d74d1b02d41ac;hpb=b0cffd9fc0288a639a7271837ae8efb319d704be;p=lyx.git diff --git a/src/factory.C b/src/factory.C index fcfb662f8b..03a285a3c3 100644 --- a/src/factory.C +++ b/src/factory.C @@ -26,6 +26,7 @@ #include "insets/insetbibtex.h" #include "insets/insetcaption.h" #include "insets/insetcite.h" +#include "insets/insetcharstyle.h" #include "insets/insetenv.h" #include "insets/insetert.h" #include "insets/insetexternal.h" @@ -39,7 +40,6 @@ #include "insets/insetlabel.h" #include "insets/insetline.h" #include "insets/insetmarginal.h" -#include "insets/insetminipage.h" #include "insets/insetnote.h" #include "insets/insetbox.h" #include "insets/insetbranch.h" @@ -50,17 +50,21 @@ #include "insets/insettabular.h" #include "insets/insettoc.h" #include "insets/inseturl.h" +#include "insets/insetvspace.h" #include "insets/insetwrap.h" -#include "mathed/formulamacro.h" -#include "mathed/formula.h" + +#include "mathed/math_macrotemplate.h" +#include "mathed/math_hullinset.h" #include "frontends/Dialogs.h" #include "frontends/LyXView.h" + #include "support/lstrings.h" -#include "support/std_sstream.h" #include +#include + using lyx::support::compare_ascii_no_case; using std::auto_ptr; @@ -68,9 +72,8 @@ using std::endl; using std::string; -InsetOld * createInset(FuncRequest const & cmd) +InsetBase * createInset(BufferView * bv, FuncRequest const & cmd) { - BufferView * bv = cmd.view(); BufferParams const & params = bv->buffer()->params(); switch (cmd.action) { @@ -83,8 +86,11 @@ InsetOld * createInset(FuncRequest const & cmd) case LFUN_INSERT_PAGEBREAK: return new InsetPagebreak; - case LFUN_INSET_MINIPAGE: - return new InsetMinipage(params); + case LFUN_INSERT_CHARSTYLE: { + string s = cmd.getArg(0); + CharStyles::iterator found_cs = params.getLyXTextClass().charstyle(s); + return new InsetCharStyle(params, found_cs); + } case LFUN_INSERT_NOTE: { string arg = cmd.getArg(0); @@ -104,7 +110,7 @@ InsetOld * createInset(FuncRequest const & cmd) string arg = cmd.getArg(0); if (arg.empty()) arg = "none"; - return new InsetBranch(params, arg); + return new InsetBranch(params, InsetBranchParams(arg)); } case LFUN_INSET_ERT: @@ -149,7 +155,7 @@ InsetOld * createInset(FuncRequest const & cmd) // Try and generate a valid index entry. InsetCommandParams icp("index"); string const contents = cmd.argument.empty() ? - bv->getLyXText()->getStringToIndex() : + bv->getLyXText()->getStringToIndex(bv->cursor()) : cmd.argument; icp.setContents(contents); @@ -159,7 +165,7 @@ InsetOld * createInset(FuncRequest const & cmd) if (icp.getContents().empty()) { lv->getDialogs().show("index", data, 0); } else { - lv->dispatch(FuncRequest(bv, LFUN_INSET_APPLY, data)); + lv->dispatch(FuncRequest(LFUN_INSET_APPLY, data)); } return 0; } @@ -167,7 +173,7 @@ InsetOld * createInset(FuncRequest const & cmd) case LFUN_TABULAR_INSERT: if (!cmd.argument.empty()) { std::istringstream ss(cmd.argument); - int r, c; + int r = 0, c = 0; ss >> r >> c; if (r <= 0) r = 2; if (c <= 0) c = 2; @@ -176,14 +182,16 @@ InsetOld * createInset(FuncRequest const & cmd) bv->owner()->getDialogs().show("tabularcreate"); return 0; - case LFUN_INSET_CAPTION: - if (bv->innerInset()) { - auto_ptr inset(new InsetCaption(params)); - inset->setOwner(bv->innerInset()); - inset->setAutoBreakRows(true); - inset->setDrawFrame(InsetText::LOCKED); - inset->setFrameColor(LColor::captionframe); - return inset.release(); + case LFUN_INSET_CAPTION: { + UpdatableInset * up = bv->cursor().inset().asUpdatableInset(); + if (!up) { + auto_ptr inset(new InsetCaption(params)); + inset->setAutoBreakRows(true); + inset->setDrawFrame(true); + inset->setFrameColor(LColor::captionframe); + return inset.release(); + } + return 0; } case LFUN_INDEX_PRINT: @@ -208,28 +216,29 @@ InsetOld * createInset(FuncRequest const & cmd) if (name == "bibitem") { InsetCommandParams icp; - InsetCommandMailer::string2params(cmd.argument, icp); + InsetCommandMailer::string2params(name, cmd.argument, + icp); return new InsetBibitem(icp); } else if (name == "bibtex") { InsetCommandParams icp; - InsetCommandMailer::string2params(cmd.argument, icp); + InsetCommandMailer::string2params(name, cmd.argument, + icp); return new InsetBibtex(icp); } else if (name == "citation") { InsetCommandParams icp; - InsetCommandMailer::string2params(cmd.argument, icp); + InsetCommandMailer::string2params(name, cmd.argument, + icp); return new InsetCitation(icp); } else if (name == "ert") { - InsetERT * inset = new InsetERT(params); - InsetERT::ERTStatus s; - InsetERTMailer::string2params(cmd.argument, s); - inset->status(bv, s); - return inset; + InsetCollapsable::CollapseStatus st; + InsetERTMailer::string2params(cmd.argument, st); + return new InsetERT(params, st); } else if (name == "external") { - Buffer const & buffer = *cmd.view()->buffer(); + Buffer const & buffer = *bv->buffer(); InsetExternalParams iep; InsetExternalMailer::string2params(cmd.argument, buffer, iep); @@ -238,7 +247,7 @@ InsetOld * createInset(FuncRequest const & cmd) return inset.release(); } else if (name == "graphics") { - Buffer const & buffer = *cmd.view()->buffer(); + Buffer const & buffer = *bv->buffer(); InsetGraphicsParams igp; InsetGraphicsMailer::string2params(cmd.argument, buffer, igp); @@ -253,28 +262,38 @@ InsetOld * createInset(FuncRequest const & cmd) } else if (name == "index") { InsetCommandParams icp; - InsetCommandMailer::string2params(cmd.argument, icp); + InsetCommandMailer::string2params(name, cmd.argument, + icp); return new InsetIndex(icp); } else if (name == "label") { InsetCommandParams icp; - InsetCommandMailer::string2params(cmd.argument, icp); + InsetCommandMailer::string2params(name, cmd.argument, + icp); return new InsetLabel(icp); } else if (name == "ref") { InsetCommandParams icp; - InsetCommandMailer::string2params(cmd.argument, icp); + InsetCommandMailer::string2params(name, cmd.argument, + icp); return new InsetRef(icp, *bv->buffer()); } else if (name == "toc") { InsetCommandParams icp; - InsetCommandMailer::string2params(cmd.argument, icp); + InsetCommandMailer::string2params(name, cmd.argument, + icp); return new InsetTOC(icp); } else if (name == "url") { InsetCommandParams icp; - InsetCommandMailer::string2params(cmd.argument, icp); + InsetCommandMailer::string2params(name, cmd.argument, + icp); return new InsetUrl(icp); + + } else if (name == "vspace") { + VSpace vspace; + InsetVSpaceMailer::string2params(cmd.argument, vspace); + return new InsetVSpace(vspace); } } @@ -312,7 +331,7 @@ InsetOld * createInset(FuncRequest const & cmd) } -InsetOld * readInset(LyXLex & lex, Buffer const & buf) +InsetBase * readInset(LyXLex & lex, Buffer const & buf) { // consistency check if (lex.getString() != "\\begin_inset") { @@ -320,10 +339,12 @@ InsetOld * readInset(LyXLex & lex, Buffer const & buf) << endl; } - auto_ptr inset; + auto_ptr inset; + + LyXTextClass tclass = buf.params().getLyXTextClass(); lex.next(); - string const tmptok = lex.getString(); + string tmptok = lex.getString(); // test the different insets if (tmptok == "LatexCommand") { @@ -383,20 +404,23 @@ InsetOld * readInset(LyXLex & lex, Buffer const & buf) } else if (tmptok == "External") { inset.reset(new InsetExternal); } else if (tmptok == "FormulaMacro") { - inset.reset(new InsetFormulaMacro); + inset.reset(new MathMacroTemplate); } else if (tmptok == "Formula") { - inset.reset(new InsetFormula); + inset.reset(new MathHullInset); } else if (tmptok == "Graphics") { inset.reset(new InsetGraphics); - } else if (tmptok == "Note" || tmptok == "Comment" - || tmptok == "Greyedout") { + } else if (tmptok == "Note") { inset.reset(new InsetNote(buf.params(), tmptok)); - } else if (tmptok == "Boxed" || tmptok == "ovalbox" - || tmptok == "Shadowbox" || tmptok == "Doublebox" - || tmptok == "Ovalbox" || tmptok == "Frameless") { + } else if (tmptok == "Box") { inset.reset(new InsetBox(buf.params(), tmptok)); + } else if (tmptok == "CharStyle") { + lex.next(); + string s = lex.getString(); + CharStyles::iterator found_cs = tclass.charstyle(s); + inset.reset(new InsetCharStyle(buf.params(), found_cs)); } else if (tmptok == "Branch") { - inset.reset(new InsetBranch(buf.params(), string())); + inset.reset(new InsetBranch(buf.params(), + InsetBranchParams())); } else if (tmptok == "Include") { InsetCommandParams p("Include"); inset.reset(new InsetInclude(p)); @@ -411,14 +435,14 @@ InsetOld * readInset(LyXLex & lex, Buffer const & buf) inset.reset(new InsetTabular(buf)); } else if (tmptok == "Text") { inset.reset(new InsetText(buf.params())); + } else if (tmptok == "VSpace") { + inset.reset(new InsetVSpace); } else if (tmptok == "Foot") { inset.reset(new InsetFoot(buf.params())); } else if (tmptok == "Marginal") { inset.reset(new InsetMarginal(buf.params())); } else if (tmptok == "OptArg") { inset.reset(new InsetOptArg(buf.params())); - } else if (tmptok == "Minipage") { - inset.reset(new InsetMinipage(buf.params())); } else if (tmptok == "Float") { lex.next(); string tmptok = lex.getString(); @@ -446,6 +470,17 @@ InsetOld * readInset(LyXLex & lex, Buffer const & buf) } inset->read(buf, lex); + +#ifdef WITH_WARNINGS +#warning hack.. +#endif + if (inset->lyxCode() == InsetBase::MATHMACRO_CODE) { + MathMacroTemplate const * tmpl = + static_cast(inset.get()); + MacroTable::globalMacros().insert + (tmpl->name(), tmpl->asMacroData()); + lyxerr << "creating local macro " << tmpl->name() << endl; + } } return inset.release();