#include <config.h>
#include "tex2lyx.h"
-#include "Context.h"
+#include "Context.h"
#include "TextClass.h"
#include "Layout.h"
+#include "support/assert.h"
#include "support/convert.h"
#include "support/debug.h"
#include "support/ExceptionMessage.h"
#include "support/lstrings.h"
#include "support/os.h"
#include "support/Package.h"
-#include "support/unicode.h"
+#include <cstdlib>
#include <fstream>
#include <iostream>
#include <string>
namespace lyx {
-// Hacks to allow the thing to link in the lyxlayout stuff
-LayoutPtr captionlayout;
-
-
string const trim(string const & a, char const * p)
{
- // BOOST_ASSERT(p);
+ // LASSERT(p, /**/);
if (a.empty() || !*p)
return a;
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
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);
- captionlayout = LayoutPtr(Layout::forCaption());
+ TeX2LyXDocClass textclass;
+ parse_preamble(p, ss, documentclass, textclass);
active_environments.push_back("document");
Context context(true, textclass);
if (message.type_ == ErrorException)
exit(1);
}
-
+
// Now every known option is parsed. Look for input and output
// file name (the latter is optional).
string infilename = internal_path(to_utf8(from_local8bit(argv[1])));
infilename = makeAbsPath(infilename).absFilename();
-
+
string outfilename;
if (argc > 2) {
outfilename = internal_path(to_utf8(from_local8bit(argv[2])));