#include "Context.h"
#include "debug.h"
-#include "LyXTextClass.h"
+#include "TextClass.h"
+#include "Layout.h"
#include "support/convert.h"
#include "support/filetools.h"
#include "support/lyxlib.h"
#include "support/ExceptionMessage.h"
#include "support/os.h"
-#include "support/package.h"
+#include "support/Package.h"
#include "support/unicode.h"
#include <boost/function.hpp>
using support::ltrim;
using support::makeAbsPath;
using support::onlyPath;
+using support::os::internal_path;
using support::rtrim;
-using support::isFileReadable;
namespace fs = boost::filesystem;
+LayoutPtr captionlayout;
// Hacks to allow the thing to link in the lyxlayout stuff
LyXErr lyxerr(std::cerr.rdbuf());
cerr << "Missing syntaxfile string after -s switch" << endl;
exit(1);
}
- syntaxfile = arg;
+ syntaxfile = internal_path(arg);
return 1;
}
cerr << "Missing directory for -sysdir switch" << endl;
exit(1);
}
- cl_system_support = arg;
+ cl_system_support = internal_path(arg);
return 1;
}
cerr << "Missing directory for -userdir switch" << endl;
exit(1);
}
- cl_user_support = arg;
+ cl_user_support = internal_path(arg);
return 1;
}
//p.dump();
stringstream ss;
- LyXTextClass textclass = parse_preamble(p, ss, documentclass);
+ TextClass textclass = parse_preamble(p, ss, documentclass);
+ captionlayout = LayoutPtr(Layout::forCaption());
active_environments.push_back("document");
Context context(true, textclass);
bool tex2lyx(string const &infilename, FileName const &outfilename)
{
- if (isFileReadable(outfilename)) {
+ if (outfilename.isFileReadable()) {
if (overwrite_files) {
cerr << "Overwriting existing file "
<< outfilename << endl;
lyx::support::os::init(argc, argv);
- try { support::init_package(to_utf8(from_local8bit(argv[0])),
+ try { support::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) {
if (message.type_ == support::ErrorException)
exit(1);
}
-
+
// Now every known option is parsed. Look for input and output
// file name (the latter is optional).
- string const infilename = makeAbsPath(to_utf8(from_local8bit(argv[1]))).absFilename();
+ string infilename = internal_path(to_utf8(from_local8bit(argv[1])));
+ infilename = makeAbsPath(infilename).absFilename();
+
string outfilename;
if (argc > 2) {
- outfilename = to_utf8(from_local8bit(argv[2]));
+ outfilename = internal_path(to_utf8(from_local8bit(argv[2])));
if (outfilename != "-")
- outfilename = makeAbsPath(to_utf8(from_local8bit(argv[2]))).absFilename();
+ outfilename = makeAbsPath(outfilename).absFilename();
} else
outfilename = changeExtension(infilename, ".lyx");