#include <config.h>
#include "tex2lyx.h"
+
#include "Context.h"
-#include "Layout.h"
#include "FloatList.h"
-#include "lengthcommon.h"
+#include "Layout.h"
+#include "Length.h"
+
#include "support/lstrings.h"
#include "support/convert.h"
#include "support/filetools.h"
-#include <boost/filesystem/operations.hpp>
#include <boost/tuple/tuple.hpp>
#include <iostream>
using support::contains;
using support::subst;
-namespace fs = boost::filesystem;
-
void parse_text_in_inset(Parser & p, ostream & os, unsigned flags, bool outer,
Context const & context)
// expects utf8)
for (char const * const * what = extensions; *what; ++what) {
string const trial = addExtension(name, *what);
- if (fs::exists(makeAbsPath(trial, path).toFilesystemEncoding()))
+ if (makeAbsPath(trial, path).exists())
return trial;
}
return string();
// therefore path is only used for testing
// FIXME UNICODE encoding of name and path may be
// wrong (makeAbsPath expects utf8)
- if (!fs::exists(makeAbsPath(name, path).toFilesystemEncoding())) {
+ if (!makeAbsPath(name, path).exists()) {
// The file extension is probably missing.
// Now try to find it out.
string const dvips_name =
// FIXME UNICODE encoding of name and path may be
// wrong (makeAbsPath expects utf8)
- if (fs::exists(makeAbsPath(name, path).toFilesystemEncoding()))
+ if (makeAbsPath(name, path).exists())
fix_relative_filename(name);
else
cerr << "Warning: Could not find graphics file '"
// FIXME UNICODE encoding of filename and path may be
// wrong (makeAbsPath expects utf8)
if ((t.cs() == "include" || t.cs() == "input") &&
- !fs::exists(makeAbsPath(filename, path).toFilesystemEncoding())) {
+ !makeAbsPath(filename, path).exists()) {
// The file extension is probably missing.
// Now try to find it out.
string const tex_name =
}
// FIXME UNICODE encoding of filename and path may be
// wrong (makeAbsPath expects utf8)
- if (fs::exists(makeAbsPath(filename, path).toFilesystemEncoding())) {
+ if (makeAbsPath(filename, path).exists()) {
string const abstexname =
makeAbsPath(filename, path).absFilename();
string const abslyxname =
opt1 + opt2 +
'{' + p.verbatim_item() + '}';
- if (opt2.empty()) {
- context.check_layout(os);
- begin_inset(os, "FormulaMacro");
- os << "\n" << ert;
- end_inset(os);
- } else
- // we cannot handle optional argument, so only output ERT
- handle_ert(os, ert, context);
+ context.check_layout(os);
+ begin_inset(os, "FormulaMacro");
+ os << "\n" << ert;
+ end_inset(os);
}
else if (t.cs() == "vspace") {