#include "Layout.h"
#include "Lexer.h"
#include "TextClass.h"
+
#include "support/convert.h"
+#include "support/FileName.h"
#include "support/filetools.h"
#include "support/lstrings.h"
#include <map>
using namespace std;
+using namespace lyx::support;
namespace lyx {
-using support::FileName;
-using support::libFileSearch;
-using support::isStrDbl;
-
// special columntypes
-extern std::map<char, int> special_columns;
+extern map<char, int> special_columns;
-std::map<string, vector<string> > used_packages;
+map<string, vector<string> > used_packages;
// needed to handle encodings with babel
bool one_language = true;
p.setCatCode('@', catOther);
}
- else if (t.cs() == "newcommand" || t.cs() == "renewcommand"
- || t.cs() == "providecommand") {
+ else if (t.cs() == "newcommand"
+ || t.cs() == "renewcommand"
+ || t.cs() == "providecommand"
+ || t.cs() == "newlyxcommand") {
bool star = false;
if (p.next_token().character() == '*') {
p.get_token();
// Force textclass if the user wanted it
if (!forceclass.empty())
h_textclass = forceclass;
- if (noweb_mode && !lyx::support::prefixIs(h_textclass, "literate-"))
+ if (noweb_mode && !prefixIs(h_textclass, "literate-"))
h_textclass.insert(0, "literate-");
FileName layoutfilename = libFileSearch("layouts", h_textclass, "layout");
if (layoutfilename.empty()) {