*
* \author Angus Leeming
*
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
*/
#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "insetcommandparams.h"
-#include "lyxlex.h"
+
#include "debug.h"
+#include "lyxlex.h"
-#include "support/LOstream.h"
-using std::ostream;
+using std::string;
using std::endl;
+using std::ostream;
InsetCommandParams::InsetCommandParams()
InsetCommandParams::InsetCommandParams(string const & n,
string const & c,
- string const & o)
- : cmdname(n), contents(c), options(o), preview_(false)
+ string const & o,
+ string const & s)
+ : cmdname(n), contents(c), options(o), sec_options(s),
+ preview_(false)
{}
-string const InsetCommandParams::getAsString() const
-{
- return cmdname + "|++|" + contents + "|++|" + options;
-}
-
-
-void InsetCommandParams::setFromString(string const & b)
-{
- string::size_type idx = b.find("|++|");
- if (idx == string::npos) {
- cmdname = b;
- contents = "";
- options = "";
- return;
- }
-
- cmdname = b.substr(0, idx);
- string tmp = b.substr(idx+4);
-
- idx = tmp.find("|++|");
- if (idx == string::npos) {
- contents = tmp;
- options = "";
- } else {
- contents = tmp.substr(0, idx);
- options = tmp.substr(idx+4);
- }
-}
-
-
void InsetCommandParams::scanCommand(string const & cmd)
{
- string tcmdname, toptions, tcontents;
+ string tcmdname, toptions, tsecoptions, tcontents;
if (cmd.empty()) return;
- enum { WS, CMDNAME, OPTION, CONTENT } state = WS;
+ enum { WS, CMDNAME, OPTION, SECOPTION, 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];
+ char const c = cmd[i];
if ((state == CMDNAME && c == ' ') ||
(state == CMDNAME && c == '[') ||
(state == CMDNAME && c == '{')) {
state = WS;
}
if ((state == OPTION && c == ']') ||
+ (state == SECOPTION && c == ']') ||
(state == CONTENT && c == '}')) {
if (nestdepth == 0) {
state = WS;
}
}
if ((state == OPTION && c == '[') ||
+ (state == SECOPTION && c == '[') ||
(state == CONTENT && c == '{')) {
++nestdepth;
}
switch (state) {
case CMDNAME: tcmdname += c; break;
case OPTION: toptions += c; break;
+ case SECOPTION: tsecoptions += c; break;
case CONTENT: tcontents += c; break;
- case WS:
+ case WS: {
+ char const b = i? cmd[i-1]: 0;
if (c == '\\') {
state = CMDNAME;
- } else if (c == '[') {
+ } else if (c == '[' && b != ']') {
state = OPTION;
nestdepth = 0; // Just to be sure
+ } else if (c == '[' && b == ']') {
+ state = SECOPTION;
+ 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()) setCmdName(tcmdname);
if (!toptions.empty()) setOptions(toptions);
+ if (!tsecoptions.empty()) setSecOptions(tsecoptions);
if (!tcontents.empty()) setContents(tcontents);
if (lyxerr.debugging(Debug::PARSER))
<< "> == <" << getCommand()
<< "> == <" << getCmdName()
<< '|' << getContents()
- << '|' << getOptions() << '>' << endl;
+ << '|' << getOptions()
+ << '|' << getSecOptions() << '>' << endl;
}
string const InsetCommandParams::getCommand() const
{
string s;
- if (!getCmdName().empty()) s += "\\"+getCmdName();
- if (!getOptions().empty()) s += "["+getOptions()+']';
- s += "{"+getContents()+'}';
+ if (!getCmdName().empty()) s += '\\' + getCmdName();
+ if (!getOptions().empty()) s += '[' + getOptions() + ']';
+ if (!getSecOptions().empty()) {
+ // for cases like \command[][sec_option]{arg}
+ if (getOptions().empty()) s += "[]";
+ s += '[' + getSecOptions() + ']';
+ }
+ s += '{' + getContents() + '}';
return s;
}
return o1.getCmdName() == o2.getCmdName()
&& o1.getContents() == o2.getContents()
&& o1.getOptions() == o2.getOptions()
+ && o1.getSecOptions() == o2.getSecOptions()
&& o1.preview() == o2.preview();
}