#include "lyxtextclass.h"
#include "lyxlex.h"
#include "support/filetools.h"
+#include "support/lstrings.h"
#include <algorithm>
#include <iostream>
#include <vector>
#include <map>
+
+namespace lyx {
+
using std::istringstream;
using std::ostream;
using std::ostringstream;
using std::cerr;
using std::endl;
-using lyx::support::LibFileSearch;
+using support::FileName;
+using support::libFileSearch;
// special columntypes
extern std::map<char, int> special_columns;
ss << '{' << p.verbatim_item() << '}';
ss << '{' << p.verbatim_item() << '}';
if (name != "lyxcode" && name != "lyxlist" &&
- name != "lyxrightadress" && name != "lyxaddress")
+ name != "lyxrightadress" &&
+ name != "lyxaddress" && name != "lyxgreyedout")
h_preamble << ss.str();
}
while (p.next_token().cat() != catBegin)
name += p.get_token().asString();
h_preamble << "\\def\\" << name << '{'
- << p.verbatim_item() << "}";
+ << p.verbatim_item() << "}";
}
else if (t.cs() == "newcolumntype") {
add_package("jurabib", jurabibsetup);
if (!jurabibsetup.empty()) {
h_preamble << "\\jurabibsetup{"
- << join(jurabibsetup, ",") << '}';
+ << join(jurabibsetup, ",") << '}';
}
}
p.skip_spaces();
// Force textclass if the user wanted it
- if (!forceclass.empty()) {
+ if (!forceclass.empty())
h_textclass = forceclass;
- }
- string layoutfilename = LibFileSearch("layouts", h_textclass, "layout");
+ if (noweb_mode && !lyx::support::prefixIs(h_textclass, "literate-"))
+ h_textclass.insert(0, "literate-");
+ FileName layoutfilename = libFileSearch("layouts", h_textclass, "layout");
if (layoutfilename.empty()) {
cerr << "Error: Could not find layout file for textclass \"" << h_textclass << "\"." << endl;
exit(1);
}
LyXTextClass textclass;
- textclass.Read(layoutfilename);
+ textclass.read(layoutfilename);
if (h_papersides.empty()) {
ostringstream ss;
ss << textclass.sides();
}
// }])
+
+
+} // namespace lyx