#include "support/ExceptionMessage.h"
#include "support/filetools.h"
#include "support/lstrings.h"
-#include "support/lyxlib.h"
#include "support/os.h"
#include "support/Package.h"
-#include "support/unicode.h"
#include <fstream>
#include <iostream>
void add_known_command(string const & command, string const & o1,
- bool o2)
+ unsigned optionalsNum)
{
// We have to handle the following cases:
// definition o1 o2 invocation result
// \newcommand{\foo}[1][]{bar #1} "[1]" true \foo bar
// \newcommand{\foo}[1][]{bar #1} "[1]" true \foo[x] bar x
// \newcommand{\foo}[1][x]{bar #1} "[1]" true \foo[x] bar x
+ // and the same with \newlyxcommand
unsigned int nargs = 0;
vector<ArgumentType> arguments;
string const opt1 = rtrim(ltrim(o1, "["), "]");
if (isStrUnsignedInt(opt1)) {
// The command has arguments
nargs = convert<unsigned int>(opt1);
- if (nargs > 0 && o2) {
- // The first argument is optional
+ for (unsigned int i = 0; i < optionalsNum; ++i) {
arguments.push_back(optional);
--nargs;
}
//p.dump();
stringstream ss;
- TextClass textclass = parse_preamble(p, ss, documentclass);
+ TeX2LyXDocClass textclass;
+ parse_preamble(p, ss, documentclass, textclass);
captionlayout = LayoutPtr(Layout::forCaption());
active_environments.push_back("document");