#include <config.h>
#include "tex2lyx.h"
-#include "Context.h"
+#include "Context.h"
#include "TextClass.h"
#include "Layout.h"
+#include "support/lassert.h"
#include "support/convert.h"
#include "support/debug.h"
#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 <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;
//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);
return 2;
}
- lyx::support::os::init(argc, argv);
+ os::init(argc, argv);
- try { support::init_package(internal_path(to_utf8(from_local8bit(argv[0]))),
+ try { init_package(internal_path(to_utf8(from_local8bit(argv[0]))),
cl_system_support, cl_user_support,
- support::top_build_dir_is_two_levels_up);
- } catch (support::ExceptionMessage const & message) {
+ top_build_dir_is_two_levels_up);
+ } catch (ExceptionMessage const & message) {
cerr << to_utf8(message.title_) << ":\n"
<< to_utf8(message.details_) << endl;
- if (message.type_ == support::ErrorException)
+ 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])));
} else
outfilename = changeExtension(infilename, ".lyx");
- FileName const system_syntaxfile = lyx::support::libFileSearch("", "syntax.default");
+ FileName const system_syntaxfile = libFileSearch("", "syntax.default");
if (system_syntaxfile.empty()) {
cerr << "Error: Could not find syntax file \"syntax.default\"." << endl;
exit(1);