X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Ffactory.C;h=44eb7c70f17d51a852ec60a7d5351cd4d28c04f3;hb=a9713c5563c924f4ab98bde3d9f24a5c1e4dd50e;hp=0c737dcb96cc2d12e980de3ffb28cdbf62cb2491;hpb=86e2d69f18bedbdd11a01e6aa3886cdc7d259060;p=lyx.git diff --git a/src/factory.C b/src/factory.C index 0c737dcb96..44eb7c70f1 100644 --- a/src/factory.C +++ b/src/factory.C @@ -17,29 +17,40 @@ #include "debug.h" #include "BufferView.h" #include "lyxtext.h" +#include "lyxlex.h" #include "insets/insetbibitem.h" #include "insets/insetbibtex.h" #include "insets/insetcaption.h" #include "insets/insetcite.h" +#include "insets/insetenv.h" #include "insets/insetert.h" #include "insets/insetexternal.h" #include "insets/insetfloat.h" +#include "insets/insetfloatlist.h" #include "insets/insetfoot.h" +#include "insets/insetgraphics.h" +#include "insets/insethfill.h" +#include "insets/insetinclude.h" #include "insets/insetindex.h" +#include "insets/insetlabel.h" #include "insets/insetmarginal.h" #include "insets/insetminipage.h" #include "insets/insetnote.h" #include "insets/insetoptarg.h" -#include "insets/insetparent.h" #include "insets/insetref.h" +#include "insets/insetspace.h" #include "insets/insettabular.h" #include "insets/insettext.h" #include "insets/insettoc.h" #include "insets/inseturl.h" #include "insets/insetwrap.h" +#include "mathed/formulamacro.h" +#include "mathed/formula.h" + #include "frontends/Dialogs.h" #include "frontends/LyXView.h" +#include "support/lstrings.h" #include @@ -51,6 +62,9 @@ Inset * createInset(FuncRequest const & cmd) BufferParams const & params = bv->buffer()->params; switch (cmd.action) { + case LFUN_HFILL: + return new InsetHFill(); + case LFUN_INSET_MINIPAGE: return new InsetMinipage(params); @@ -60,9 +74,6 @@ Inset * createInset(FuncRequest const & cmd) case LFUN_INSET_ERT: return new InsetERT(params); - case LFUN_INSET_EXTERNAL: - return new InsetExternal; - case LFUN_INSET_FOOTNOTE: return new InsetFoot(params); @@ -101,17 +112,17 @@ Inset * createInset(FuncRequest const & cmd) // Try and generate a valid index entry. InsetCommandParams icp("index"); string const contents = cmd.argument.empty() ? - bv->getLyXText()->getStringToIndex(bv) : + bv->getLyXText()->getStringToIndex() : cmd.argument; icp.setContents(contents); - string data = InsetCommandMailer::params2string(icp); + string data = InsetCommandMailer::params2string("index", icp); LyXView * lv = bv->owner(); if (icp.getContents().empty()) { lv->getDialogs().show("index", data, 0); } else { - FuncRequest fr(bv, LFUN_INDEX_APPLY, data); + FuncRequest fr(bv, LFUN_INSET_APPLY, data); lv->dispatch(fr); } return 0; @@ -124,7 +135,7 @@ Inset * createInset(FuncRequest const & cmd) ::sscanf(cmd.argument.c_str(),"%d%d", &r, &c); return new InsetTabular(*bv->buffer(), r, c); } - bv->owner()->getDialogs().showTabularCreate(); + bv->owner()->getDialogs().show("tabularcreate"); return 0; case LFUN_INSET_CAPTION: @@ -146,16 +157,8 @@ Inset * createInset(FuncRequest const & cmd) case LFUN_TOC_INSERT: return new InsetTOC(InsetCommandParams("tableofcontents")); - case LFUN_PARENTINSERT: - return new InsetParent( - InsetCommandParams("lyxparent", cmd.argument), *bv->buffer()); - - case LFUN_INSERT_URL: - { - InsetCommandParams p; - p.setFromString(cmd.argument); - return new InsetUrl(p); - } + case LFUN_ENVIRONMENT_INSERT: + return new InsetEnvironment(params, cmd.argument); #if 0 case LFUN_INSET_LIST: @@ -165,61 +168,231 @@ Inset * createInset(FuncRequest const & cmd) return new InsetTheorem; #endif - case LFUN_BIBITEM_APPLY: { - InsetCommandParams icp; - InsetCommandMailer::string2params(cmd.argument, icp); - return new InsetBibitem(icp); - } + case LFUN_INSET_INSERT: { + string const name = cmd.getArg(0); - case LFUN_BIBTEX_APPLY: { - InsetCommandParams icp; - InsetCommandMailer::string2params(cmd.argument, icp); - return new InsetBibtex(icp); - } + if (name == "bibitem") { + InsetCommandParams icp; + InsetCommandMailer::string2params(cmd.argument, icp); + return new InsetBibitem(icp); - case LFUN_CITATION_APPLY: { - InsetCommandParams icp; - InsetCommandMailer::string2params(cmd.argument, icp); - InsetCitation * inset = new InsetCitation(icp); - inset->setLoadingBuffer(bv->buffer(), false); - return inset; - } + } else if (name == "bibtex") { + InsetCommandParams icp; + InsetCommandMailer::string2params(cmd.argument, icp); + return new InsetBibtex(icp); - case LFUN_ERT_APPLY: { - InsetERT * inset = new InsetERT(params); - InsetERT::ERTStatus s; - InsetERTMailer::string2params(cmd.argument, s); - inset->status(bv, s); - return inset; - } + } else if (name == "citation") { + InsetCommandParams icp; + InsetCommandMailer::string2params(cmd.argument, icp); + InsetCitation * inset = new InsetCitation(icp); + inset->setLoadingBuffer(bv->buffer(), false); + return inset; - case LFUN_INDEX_APPLY: { - InsetCommandParams icp; - InsetCommandMailer::string2params(cmd.argument, icp); - return new InsetIndex(icp); - } + } else if (name == "ert") { + InsetERT * inset = new InsetERT(params); + InsetERT::ERTStatus s; + InsetERTMailer::string2params(cmd.argument, s); + inset->status(bv, s); + return inset; - case LFUN_REF_APPLY: { - InsetCommandParams icp; - InsetCommandMailer::string2params(cmd.argument, icp); - return new InsetRef(icp, *bv->buffer()); - } + } else if (name == "external") { + InsetExternal::Params iep; + InsetExternalMailer::string2params(cmd.argument, iep); + InsetExternal * inset = new InsetExternal; + string const fpath = cmd.view()->buffer()->filePath(); + inset->setParams(iep, fpath); + return inset; + + } else if (name == "graphics") { + InsetGraphicsParams igp; + InsetGraphicsMailer::string2params(cmd.argument, igp); + InsetGraphics * inset = new InsetGraphics; + inset->setParams(igp); + return inset; - case LFUN_TOC_APPLY: { - InsetCommandParams icp; - InsetCommandMailer::string2params(cmd.argument, icp); - return new InsetTOC(icp); + } else if (name == "include") { + InsetInclude::Params iip; + InsetIncludeMailer::string2params(cmd.argument, iip); + return new InsetInclude(iip); + + } else if (name == "index") { + InsetCommandParams icp; + InsetCommandMailer::string2params(cmd.argument, icp); + return new InsetIndex(icp); + + } else if (name == "label") { + InsetCommandParams icp; + InsetCommandMailer::string2params(cmd.argument, icp); + return new InsetLabel(icp); + + } else if (name == "ref") { + InsetCommandParams icp; + InsetCommandMailer::string2params(cmd.argument, icp); + return new InsetRef(icp, *bv->buffer()); + + } else if (name == "toc") { + InsetCommandParams icp; + InsetCommandMailer::string2params(cmd.argument, icp); + return new InsetTOC(icp); + + } else if (name == "url") { + InsetCommandParams icp; + InsetCommandMailer::string2params(cmd.argument, icp); + return new InsetUrl(icp); + } } - case LFUN_URL_APPLY: { - InsetCommandParams icp; - InsetCommandMailer::string2params(cmd.argument, icp); - return new InsetUrl(icp); + case LFUN_SPACE_INSERT: { + string const name = cmd.argument; + if (name == "normal") + return new InsetSpace(InsetSpace::NORMAL); + else if (name == "protected") + return new InsetSpace(InsetSpace::PROTECTED); + else if (name == "thin") + return new InsetSpace(InsetSpace::THIN); + else if (name == "quad") + return new InsetSpace(InsetSpace::QUAD); + else if (name == "qquad") + return new InsetSpace(InsetSpace::QQUAD); + else if (name == "enspace") + return new InsetSpace(InsetSpace::ENSPACE); + else if (name == "enskip") + return new InsetSpace(InsetSpace::ENSKIP); + else if (name == "negthinspace") + return new InsetSpace(InsetSpace::NEGTHIN); + else if (name.empty()) + lyxerr << "LyX function 'space' needs an argument." << endl; + else + lyxerr << "Wrong argument for LyX function 'space'." << endl; } + break; + default: break; } return 0; } + + +Inset * readInset(LyXLex & lex, Buffer const & buf) +{ + // consistency check + if (lex.getString() != "\\begin_inset") { + lyxerr << "Buffer::readInset: Consistency check failed." + << endl; + } + + Inset * inset = 0; + + lex.next(); + string const tmptok = lex.getString(); + + // test the different insets + if (tmptok == "LatexCommand") { + InsetCommandParams inscmd; + inscmd.read(lex); + + string const cmdName = inscmd.getCmdName(); + + // This strange command allows LyX to recognize "natbib" style + // citations: citet, citep, Citet etc. + if (compare_ascii_no_case(cmdName.substr(0,4), "cite") == 0) { + inset = new InsetCitation(inscmd); + } else if (cmdName == "bibitem") { + lex.printError("Wrong place for bibitem"); + inset = new InsetBibitem(inscmd); + } else if (cmdName == "bibtex") { + inset = new InsetBibtex(inscmd); + } else if (cmdName == "index") { + inset = new InsetIndex(inscmd); + } else if (cmdName == "include") { + inset = new InsetInclude(inscmd, buf); + } else if (cmdName == "label") { + inset = new InsetLabel(inscmd); + } else if (cmdName == "url" + || cmdName == "htmlurl") { + inset = new InsetUrl(inscmd); + } else if (cmdName == "ref" + || cmdName == "eqref" + || cmdName == "pageref" + || cmdName == "vref" + || cmdName == "vpageref" + || cmdName == "prettyref") { + if (!inscmd.getOptions().empty() + || !inscmd.getContents().empty()) { + inset = new InsetRef(inscmd, buf); + } + } else if (cmdName == "tableofcontents") { + inset = new InsetTOC(inscmd); + } else if (cmdName == "listofalgorithms") { + inset = new InsetFloatList("algorithm"); + } else if (cmdName == "listoffigures") { + inset = new InsetFloatList("figure"); + } else if (cmdName == "listoftables") { + inset = new InsetFloatList("table"); + } else if (cmdName == "printindex") { + inset = new InsetPrintIndex(inscmd); + } + } else { + if (tmptok == "Quotes") { + inset = new InsetQuotes; + } else if (tmptok == "External") { + inset = new InsetExternal; + } else if (tmptok == "FormulaMacro") { + inset = new InsetFormulaMacro; + } else if (tmptok == "Formula") { + inset = new InsetFormula; + } else if (tmptok == "Graphics") { + inset = new InsetGraphics; + } else if (tmptok == "Note") { + inset = new InsetNote(buf.params); + } else if (tmptok == "Include") { + InsetCommandParams p("Include"); + inset = new InsetInclude(p, buf); + } else if (tmptok == "Environment") { + lex.next(); + inset = new InsetEnvironment(buf.params, lex.getString()); + } else if (tmptok == "ERT") { + inset = new InsetERT(buf.params); + } else if (tmptok == "InsetSpace") { + inset = new InsetSpace; + } else if (tmptok == "Tabular") { + inset = new InsetTabular(buf); + } else if (tmptok == "Text") { + inset = new InsetText(buf.params); + } else if (tmptok == "Foot") { + inset = new InsetFoot(buf.params); + } else if (tmptok == "Marginal") { + inset = new InsetMarginal(buf.params); + } else if (tmptok == "OptArg") { + inset = new InsetOptArg(buf.params); + } else if (tmptok == "Minipage") { + inset = new InsetMinipage(buf.params); + } else if (tmptok == "Float") { + lex.next(); + string tmptok = lex.getString(); + inset = new InsetFloat(buf.params, tmptok); + } else if (tmptok == "Wrap") { + lex.next(); + string tmptok = lex.getString(); + inset = new InsetWrap(buf.params, tmptok); +#if 0 + } else if (tmptok == "List") { + inset = new InsetList; + } else if (tmptok == "Theorem") { + inset = new InsetList; +#endif + } else if (tmptok == "Caption") { + inset = new InsetCaption(buf.params); + } else if (tmptok == "FloatList") { + inset = new InsetFloatList; + } + + if (inset) + inset->read(&buf, lex); + } + + return inset; +}