]> git.lyx.org Git - lyx.git/blobdiff - src/factory.C
Alfredo's second patch
[lyx.git] / src / factory.C
index 288aa0e15043192bde889bc9e3142ab6ab6855e3..0e88c5f7a845f6157d0437f599e27451b72d7d5b 100644 (file)
 #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/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 <cstdio>
 
@@ -52,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);
 
@@ -61,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);
 
@@ -102,7 +112,7 @@ 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);
 
@@ -125,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:
@@ -151,12 +161,8 @@ Inset * createInset(FuncRequest const & cmd)
                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:
@@ -166,7 +172,7 @@ Inset * createInset(FuncRequest const & cmd)
                return new InsetTheorem;
 #endif
 
-       case LFUN_INSET_APPLY: {
+       case LFUN_INSET_INSERT: {
                string const name = cmd.getArg(0);
 
                if (name == "bibitem") {
@@ -193,11 +199,36 @@ Inset * createInset(FuncRequest const & cmd)
                        inset->status(bv, s);
                        return inset;
 
+               } else if (name == "external") {
+                       InsetExternal::Params iep;
+                       InsetExternalMailer::string2params(cmd.argument, iep);
+                       InsetExternal * inset = new InsetExternal;
+                       inset->setFromParams(iep);
+                       return inset;
+
+               } else if (name == "graphics") {
+                       InsetGraphicsParams igp;
+                       InsetGraphicsMailer::string2params(cmd.argument, igp);
+                       InsetGraphics * inset = new InsetGraphics;
+                       string const fpath = cmd.view()->buffer()->filePath();
+                       inset->setParams(igp, fpath);
+                       return inset;
+
+               } 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);
@@ -222,3 +253,125 @@ Inset * createInset(FuncRequest const & cmd)
 
        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 (cmdName == "lyxparent") {
+                       inset = new InsetParent(inscmd, buf);
+               }
+       } 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 == "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;
+}