Account for old versions of Pygments

[lyx.git] / src / factory.cpp

diff --git a/src/factory.cpp b/src/factory.cpp
index 858e53f138de902f1d0823688d070a588f03b9e1..9fdc37da625b8432861c2ce93b19c0d926762c2d 100644 (file)
--- a/src/factory.cpp
+++ b/src/factory.cpp
@@ -52,6 +52,7 @@
 #include "insets/InsetPreview.h"
 #include "insets/InsetRef.h"
 #include "insets/InsetScript.h"
+#include "insets/InsetSeparator.h"
 #include "insets/InsetSpace.h"
 #include "insets/InsetTabular.h"
 #include "insets/InsetTOC.h"
@@ -64,13 +65,14 @@
 #include "frontends/alert.h"
 
 #include "support/debug.h"
-#include "support/lstrings.h"
 #include "support/ExceptionMessage.h"
-
 #include "support/lassert.h"
+#include "support/lstrings.h"
+#include "support/unique_ptr.h"
 
 #include <sstream>
 
+
 using namespace std;
 using namespace lyx::support;
 
@@ -99,6 +101,22 @@ Inset * createInsetHelper(Buffer * buf, FuncRequest const & cmd)
                        return new InsetNewpage(inp);
                }
 
+               case LFUN_SEPARATOR_INSERT: {
+                       string const name = cmd.getArg(0);
+                       InsetSeparatorParams inp;
+                       if (name.empty() || name == "plain")
+                               inp.kind = InsetSeparatorParams::PLAIN;
+                       else if (name == "parbreak")
+                               inp.kind = InsetSeparatorParams::PARBREAK;
+                       else if (name == "latexpar")
+                               inp.kind = InsetSeparatorParams::LATEXPAR;
+                       else {
+                               lyxerr << "Wrong argument for LyX function 'separator-insert'." << endl;
+                               break;
+                       }
+                       return new InsetSeparator(inp);
+               }
+
                case LFUN_FLEX_INSERT: {
                        string s = cmd.getArg(0);
                        return new InsetFlex(buf, s);
@@ -154,8 +172,14 @@ Inset * createInsetHelper(Buffer * buf, FuncRequest const & cmd)
                case LFUN_MARGINALNOTE_INSERT:
                        return new InsetMarginal(buf);
 
-               case LFUN_ARGUMENT_INSERT:
-                       return new InsetArgument(buf);
+               case LFUN_ARGUMENT_INSERT: {
+                       string arg = cmd.getArg(0);
+                       if (arg.empty()) {
+                               LYXERR0("argument-insert needs an argument!");
+                               return 0;
+                       }
+                       return new InsetArgument(buf, arg);
+               }
 
                case LFUN_FLOAT_INSERT: {
                        string argument = to_utf8(cmd.argument());
@@ -218,8 +242,12 @@ Inset * createInsetHelper(Buffer * buf, FuncRequest const & cmd)
                        return new InsetTabular(buf, r, c);
                }
 
-               case LFUN_CAPTION_INSERT:
-                       return new InsetCaption(buf);
+               case LFUN_CAPTION_INSERT: {
+                       string arg = cmd.getArg(0);
+                       if (arg.empty())
+                               arg = "Standard";
+                       return new InsetCaption(buf, arg);
+               }
 
                case LFUN_INDEX_PRINT:  {
                        InsetCommandParams icp(INDEX_PRINT_CODE);
@@ -282,7 +310,7 @@ Inset * createInsetHelper(Buffer * buf, FuncRequest const & cmd)
                        case EXTERNAL_CODE: {
                                InsetExternalParams iep;
                                InsetExternal::string2params(to_utf8(cmd.argument()), *buf, iep);
-                               auto_ptr<InsetExternal> inset(new InsetExternal(buf));
+                               auto inset = make_unique<InsetExternal>(buf);
                                inset->setBuffer(*buf);
                                inset->setParams(iep);
                                return inset.release();
@@ -291,7 +319,7 @@ Inset * createInsetHelper(Buffer * buf, FuncRequest const & cmd)
                        case GRAPHICS_CODE: {
                                InsetGraphicsParams igp;
                                InsetGraphics::string2params(to_utf8(cmd.argument()), *buf, igp);
-                               auto_ptr<InsetGraphics> inset(new InsetGraphics(buf));
+                               auto inset = make_unique<InsetGraphics>(buf);
                                inset->setParams(igp);
                                return inset.release();
                        }
@@ -487,7 +515,7 @@ Inset * readInset(Lexer & lex, Buffer * buf)
        if (lex.getString() != "\\begin_inset")
                LYXERR0("Buffer::readInset: Consistency check failed.");
 
-       auto_ptr<Inset> inset;
+       unique_ptr<Inset> inset;
 
        string tmptok;
        lex >> tmptok;
@@ -513,7 +541,7 @@ Inset * readInset(Lexer & lex, Buffer * buf)
                //Worst case, we could put it in each case below. Better, we could
                //pass the lexer to the constructor and let the params be built there.
                InsetCommandParams inscmd(code);
-               inscmd.read(lex);
+               inscmd.Read(lex, buf);
 
                switch (code) {
                        case BIBITEM_CODE:
@@ -563,13 +591,16 @@ Inset * readInset(Lexer & lex, Buffer * buf)
                                return 0;
                }
                inset->setBuffer(*buf);
-       } else { 
-               // FIXME This branch should be made to use inset codes as the preceding 
-               // branch does. Unfortunately, that will take some doing. It requires
-               // converting the representation of the insets in LyX files so that they
-               // use the inset names listed in Inset.cpp. Then, as above, the inset names
-               // can be translated to inset codes using insetCode(). And the insets'
-               // write() routines should use insetName() rather than hardcoding it.
+       } else {
+               // FIXME This branch should be made to use inset codes
+               // as the preceding branch does. Unfortunately, that
+               // will take some doing. It requires converting the
+               // representation of the insets in LyX files so that
+               // they use the inset names listed in Inset.cpp. Then,
+               // as above, the inset names can be translated to
+               // inset codes using insetCode(). And the insets'
+               // write() routines should use insetName() rather than
+               // hardcoding it.
                if (tmptok == "Quotes") {
                        inset.reset(new InsetQuotes(buf));
                } else if (tmptok == "External") {
@@ -614,8 +645,10 @@ Inset * readInset(Lexer & lex, Buffer * buf)
                        inset.reset(new InsetNewpage);
                } else if (tmptok == "Newline") {
                        inset.reset(new InsetNewline);
+               } else if (tmptok == "Separator") {
+                       inset.reset(new InsetSeparator);
                } else if (tmptok == "Argument") {
-                       inset.reset(new InsetArgument(buf));
+                       inset.reset(new InsetArgument(buf, tmptok));
                } else if (tmptok == "Float") {
                        inset.reset(new InsetFloat(buf, string()));
                } else if (tmptok == "Wrap") {
@@ -623,7 +656,9 @@ Inset * readInset(Lexer & lex, Buffer * buf)
                        string tmptok = lex.getString();
                        inset.reset(new InsetWrap(buf, tmptok));
                } else if (tmptok == "Caption") {
-                       inset.reset(new InsetCaption(buf));
+                       lex.eatLine();
+                       string s = lex.getString();
+                       inset.reset(new InsetCaption(buf, s));
                } else if (tmptok == "Index") {
                        inset.reset(new InsetIndex(buf, InsetIndexParams()));
                } else if (tmptok == "FloatList") {