#include "LayoutFile.h"
#include "LayoutModuleList.h"
#include "ModuleList.h"
+#include "Preamble.h"
#include "TextClass.h"
#include "support/convert.h"
{}
-string const trim(string const & a, char const * p)
+string const trimSpaceAndEol(string const & a)
{
- // LASSERT(p, /**/);
-
- if (a.empty() || !*p)
- return a;
-
- size_t r = a.find_last_not_of(p);
- size_t l = a.find_first_not_of(p);
-
- // Is this the minimal test? (lgb)
- if (r == string::npos && l == string::npos)
- return string();
-
- return a.substr(l, r - l + 1);
+ return trim(a, " \t\n\r");
}
CommandMap known_math_environments;
FullCommandMap possible_textclass_commands;
FullEnvironmentMap possible_textclass_environments;
+int const LYX_FORMAT = LYX_FORMAT_TEX2LYX;
/// used modules
LayoutModuleList used_modules;
// This is needed since a module cannot be read on its own, only as
// part of a document class.
LayoutFile const & baseClass = LayoutFileList::get()[textclass.name()];
- typedef map<string, DocumentClass *> ModuleMap;
+ typedef map<string, DocumentClassPtr > ModuleMap;
static ModuleMap modules;
static bool init = true;
if (init) {
baseClass.load();
- DocumentClassBundle & bundle = DocumentClassBundle::get();
LyXModuleList::const_iterator const end = theModuleList.end();
LyXModuleList::const_iterator it = theModuleList.begin();
- for (; it != end; it++) {
+ for (; it != end; ++it) {
string const module = it->getID();
LayoutModuleList m;
// FIXME this excludes all modules that depend on another one
if (!m.moduleCanBeAdded(module, &baseClass))
continue;
m.push_back(module);
- modules[module] = &bundle.makeDocumentClass(baseClass, m);
+ modules[module] = getDocumentClass(baseClass, m);
}
init = false;
}
// needed since it is not unlikely that two different modules define a
// command with the same name.
ModuleMap::iterator const end = modules.end();
- for (ModuleMap::iterator it = modules.begin(); it != end; it++) {
+ for (ModuleMap::iterator it = modules.begin(); it != end; ++it) {
string const module = it->first;
if (!used_modules.moduleCanBeAdded(module, &baseClass))
continue;
continue;
if (findInsetLayoutWithoutModule(textclass, name, command))
continue;
- DocumentClass const * c = it->second;
+ DocumentClassConstPtr c = it->second;
Layout const * layout = findLayoutWithoutModule(*c, name, command);
InsetLayout const * insetlayout = layout ? 0 :
findInsetLayoutWithoutModule(*c, name, command);
bool noweb_mode = false;
bool pdflatex = false;
+bool xetex = false;
+bool have_CJK = false;
+bool is_nonCJKJapanese = false;
bool roundtrip = false;
string const arg = p.getArg('{', '}');
if (arg == "translate")
arguments.push_back(required);
+ else if (arg == "group")
+ arguments.push_back(req_group);
else if (arg == "item")
arguments.push_back(item);
+ else if (arg == "displaymath")
+ arguments.push_back(displaymath);
else
arguments.push_back(verbatim);
} else {
- p.getArg('[', ']');
- arguments.push_back(optional);
+ string const arg = p.getArg('[', ']');
+ if (arg == "group")
+ arguments.push_back(opt_group);
+ else
+ arguments.push_back(optional);
}
}
commands[command] = arguments;
{
map<string, cmd_helper> cmdmap;
+ cmdmap["-h"] = parse_help;
cmdmap["-help"] = parse_help;
cmdmap["--help"] = parse_help;
+ cmdmap["-v"] = parse_version;
cmdmap["-version"] = parse_version;
cmdmap["--version"] = parse_version;
cmdmap["-c"] = parse_class;
* You must ensure that \p parentFilePath is properly set before calling
* this function!
*/
-void tex2lyx(idocstream & is, ostream & os, string encoding)
+bool tex2lyx(idocstream & is, ostream & os, string encoding)
{
// Set a sensible default encoding.
// This is used until an encoding command is found.
// since latin1 does not cause an iconv error if the actual encoding
// is different (bug 7509).
if (encoding.empty()) {
- if (h_inputencoding == "auto")
+ if (preamble.inputencoding() == "auto")
encoding = "latin1";
else
- encoding = h_inputencoding;
+ encoding = preamble.inputencoding();
}
Parser p(is);
p.setEncoding(encoding);
//p.dump();
- ostringstream ps;
- parse_preamble(p, ps, documentclass, textclass);
+ preamble.parse(p, documentclass, textclass);
active_environments.push_back("document");
Context context(true, textclass);
stringstream ss;
+ // store the document language in the context to be able to handle the
+ // commands like \foreignlanguage and \textenglish etc.
+ context.font.language = preamble.language();
+ // parse the main text
parse_text(p, ss, FLAG_END, true, context);
if (Context::empty)
// Empty document body. LyX needs at least one paragraph.
active_environments.pop_back();
// We know the used modules only after parsing the full text
- ostringstream ms;
if (!used_modules.empty()) {
- ms << "\\begin_modules\n";
LayoutModuleList::const_iterator const end = used_modules.end();
LayoutModuleList::const_iterator it = used_modules.begin();
- for (; it != end; it++)
- ms << *it << '\n';
- ms << "\\end_modules\n";
+ for (; it != end; ++it)
+ preamble.addModule(*it);
+ }
+ if (!preamble.writeLyXHeader(os, !active_environments.empty())) {
+ cerr << "Could write LyX file header." << endl;
+ return false;
}
- os << subst(ps.str(), modules_placeholder, ms.str());
ss.seekg(0);
os << ss.str();
parsertest << p.get_token().asInput();
// <origfile> and parsertest.tex should now have identical content
#endif
+ return true;
}
}
string const oldParentFilePath = parentFilePath;
parentFilePath = onlyPath(infilename.absFileName());
- tex2lyx(is, os, encoding);
+ bool retval = tex2lyx(is, os, encoding);
parentFilePath = oldParentFilePath;
- return true;
+ return retval;
}
} // anonymous namespace
projects / lyx.git / blobdiff