Make it compile when USE_BOOST_FORMAT is unset

[lyx.git] / src / insets / insetcommand.C

diff --git a/src/insets/insetcommand.C b/src/insets/insetcommand.C
index ed02526b3702dc917d26687ba4dfedf25e0b8bd4..7350cbcad6780282a092bf20d1572965c4da25fc 100644 (file)
--- a/src/insets/insetcommand.C
+++ b/src/insets/insetcommand.C
@@ -1,12 +1,13 @@
-/* This file is part of
- * ======================================================
- * 
- *           LyX, The Document Processor
- *      
- *         Copyright 1995 Matthias Ettrich
- *          Copyright 1995-2000 The LyX Team.
+/**
+ * \file insetcommand.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * ====================================================== */
+ * \author Angus Leeming
+ * \author Lars Gullik Bjønnes
+ *
+ * Full author contact details are available in file CREDITS
+ */
 
 #include <config.h>
 
@@ -16,153 +17,46 @@
 
 #include "insetcommand.h"
 #include "debug.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
 
 using std::ostream;
 using std::endl;
 
 
-InsetCommand::InsetCommand()
-{
-}
+InsetCommand::InsetCommand(InsetCommandParams const & p, bool)
+       : p_(p.getCmdName(), p.getContents(), p.getOptions())
+{}
 
 
-InsetCommand::InsetCommand(string const & cmd, string const & arg, 
-                          string const & opt)
-       : cmdname(cmd), options(opt), contents(arg)
+void InsetCommand::setParams(InsetCommandParams const & p)
 {
+       p_.setCmdName(p.getCmdName());
+       p_.setContents(p.getContents());
+       p_.setOptions(p.getOptions());
 }
 
 
-// In lyxf3 this will be just LaTeX
-void InsetCommand::Write(Buffer const *, ostream & os) const
-{
-       os << "LatexCommand " << getCommand() << "\n";
-}
-
-
-void InsetCommand::scanCommand(string const & cmd)
-{
-       string tcmdname, toptions, tcontents;
-
-       if (cmd.empty()) return;
-
-       enum { WS, CMDNAME, OPTION, CONTENT } state = WS;
-       
-       // Used to handle things like \command[foo[bar]]{foo{bar}}
-       int nestdepth = 0;
-
-       for (string::size_type i = 0; i < cmd.length(); ++i) {
-               char c = cmd[i];
-               if ((state == CMDNAME && c == ' ') ||
-                   (state == CMDNAME && c == '[') ||
-                   (state == CMDNAME && c == '{')) {
-                       state = WS;
-               }
-               if ((state == OPTION  && c == ']') ||
-                   (state == CONTENT && c == '}')) {
-                       if (nestdepth == 0) {
-                               state = WS;
-                       } else {
-                               --nestdepth;
-                       }
-               }
-               if ((state == OPTION  && c == '[') ||
-                   (state == CONTENT && c == '{')) {
-                       ++nestdepth;
-               }
-               switch (state) {
-               case CMDNAME:   tcmdname += c; break;
-               case OPTION:    toptions += c; break;
-               case CONTENT:   tcontents += c; break;
-               case WS:
-                       if (c == '\\') {
-                               state = CMDNAME;
-                       } else if (c == '[') {
-                               state = OPTION;
-                               nestdepth = 0; // Just to be sure
-                       } else if (c == '{') {
-                               state = CONTENT;
-                               nestdepth = 0; // Just to be sure
-                       }
-                       break;
-               }
-       }
-
-       // Don't mess with this.
-       if (!tcmdname.empty()) cmdname = tcmdname;
-       if (!toptions.empty()) options = toptions;
-       if (!tcontents.empty()) setContents(tcontents); 
-                       // setContents is overloaded in InsetInclude
-
-       if (lyxerr.debugging(Debug::PARSER))
-               lyxerr << "Command <" <<  cmd
-                      << "> == <" << getCommand()
-                      << "> == <" << getCmdName()
-                      << '|' << getContents()
-                      << '|' << getOptions() << '>' << endl;
-}
-
-
-// This function will not be necessary when lyx3
-void InsetCommand::Read(Buffer const *, LyXLex & lex)
-{    
-       string token;
-
-       if (lex.EatLine()) {
-               token = lex.GetString();
-               scanCommand(token);
-       } else
-               lex.printError("InsetCommand: Parse error: `$$Token'");
-       while (lex.IsOK()) {
-               lex.nextToken();
-               token = lex.GetString();
-               if (token == "\\end_inset")
-                       break;
-       }
-       if (token != "\\end_inset") {
-               lex.printError("Missing \\end_inset at this point. "
-                              "Read: `$$Token'");
-       }
-}
-
-
-int InsetCommand::Latex(Buffer const *, ostream & os, bool /*fragile*/, bool/*fs*/) const
+int InsetCommand::latex(Buffer const *, ostream & os,
+                       bool /*fragile*/, bool/*fs*/) const
 {
        os << getCommand();
        return 0;
 }
 
 
-int InsetCommand::Ascii(Buffer const *, ostream &) const
+int InsetCommand::ascii(Buffer const *, ostream &, int) const
 {
        return 0;
 }
 
 
-int InsetCommand::Linuxdoc(Buffer const *, ostream &) const
+int InsetCommand::linuxdoc(Buffer const *, ostream &) const
 {
        return 0;
 }
 
 
-int InsetCommand::DocBook(Buffer const *, ostream &) const
+int InsetCommand::docbook(Buffer const *, ostream &, bool) const
 {
        return 0;
 }
-
-
-Inset * InsetCommand::Clone() const
-{
-       return new InsetCommand(cmdname, contents, options);
-}
-
-
-string InsetCommand::getCommand() const
-{      
-       string s;
-       if (!cmdname.empty()) s += "\\"+cmdname;
-       if (!options.empty()) s += "["+options+']';
-       s += "{"+contents+'}';
-       return s;
-}