// 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;
string documentclass;
string default_encoding;
string syntaxfile;
+bool copy_files = false;
bool overwrite_files = false;
int error_code = 0;
cerr << "Usage: tex2lyx [options] infile.tex [outfile.lyx]\n"
"Options:\n"
"\t-c textclass Declare the textclass.\n"
+ "\t-copyfiles Copy all included files to the directory of outfile.lyx.\n"
"\t-e encoding Set the default encoding (latex name).\n"
"\t-f Force overwrite of .lyx files.\n"
"\t-help Print this message and quit.\n"
}
+int parse_copyfiles(string const &, string const &)
+{
+ copy_files = true;
+ return 0;
+}
+
+
void easyParse(int & argc, char * argv[])
{
map<string, cmd_helper> cmdmap;
cmdmap["-sysdir"] = parse_sysdir;
cmdmap["-userdir"] = parse_userdir;
cmdmap["-roundtrip"] = parse_roundtrip;
+ cmdmap["-copyfiles"] = parse_copyfiles;
for (int i = 1; i < argc; ++i) {
map<string, cmd_helper>::const_iterator it
// path of the first parsed file
-string masterFilePath;
+string masterFilePathLyX;
+string masterFilePathTeX;
// path of the currently parsed file
-string parentFilePath;
+string parentFilePathTeX;
} // anonymous namespace
-string getMasterFilePath()
+string getMasterFilePath(bool input)
{
- return masterFilePath;
+ return input ? masterFilePathTeX : masterFilePathLyX;
}
-string getParentFilePath()
+string getParentFilePath(bool input)
{
- return parentFilePath;
+ if (input)
+ return parentFilePathTeX;
+ string const rel = to_utf8(makeRelPath(from_utf8(masterFilePathTeX),
+ from_utf8(parentFilePathTeX)));
+ if (rel.substr(0, 3) == "../") {
+ // The parent is not below the master - keep the path
+ return parentFilePathTeX;
+ }
+ return makeAbsPath(rel, masterFilePathLyX).absFileName();
+}
+
+
+bool copyFiles()
+{
+ return copy_files;
+}
+
+
+bool overwriteFiles()
+{
+ return overwrite_files;
}
* be used more than once for included documents.
* Caution: Overwrites the existing preamble settings if the new document
* contains a preamble.
- * You must ensure that \p parentFilePath is properly set before calling
+ * You must ensure that \p parentFilePathTeX is properly set before calling
* this function!
*/
bool tex2lyx(idocstream & is, ostream & os, string encoding)
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.
if (!used_modules.empty()) {
LayoutModuleList::const_iterator const end = used_modules.end();
LayoutModuleList::const_iterator it = used_modules.begin();
- for (; it != end; it++)
+ for (; it != end; ++it)
preamble.addModule(*it);
}
- if (!preamble.writeLyXHeader(os)) {
+ if (!preamble.writeLyXHeader(os, !active_environments.empty())) {
cerr << "Could write LyX file header." << endl;
return false;
}
<< "\" for reading." << endl;
return false;
}
- string const oldParentFilePath = parentFilePath;
- parentFilePath = onlyPath(infilename.absFileName());
+ string const oldParentFilePath = parentFilePathTeX;
+ parentFilePathTeX = onlyPath(infilename.absFileName());
bool retval = tex2lyx(is, os, encoding);
- parentFilePath = oldParentFilePath;
+ parentFilePathTeX = oldParentFilePath;
return retval;
}
command += " -f none";
if (pdflatex)
command += " -e pdflatex ";
+ else if (xetex)
+ command += " -e xetex ";
else
command += " -e latex ";
command += quoteName(outfilename.toFilesystemEncoding());
infilename = makeAbsPath(infilename).absFileName();
string outfilename;
- if (roundtrip) {
- if (argc > 2) {
- // Do not allow a user supplied output filename
- // (otherwise it could easily happen that LyX would
- // overwrite the original .tex file)
- cerr << "Error: output filename must not be given in roundtrip mode."
- << endl;
- return EXIT_FAILURE;
- }
- outfilename = changeExtension(infilename, ".lyx.lyx");
- } else if (argc > 2) {
+ if (argc > 2) {
outfilename = internal_path(os::utf8_argv(2));
if (outfilename != "-")
outfilename = makeAbsPath(outfilename).absFileName();
+ if (roundtrip) {
+ if (outfilename == "-") {
+ cerr << "Error: Writing to standard output is "
+ "not supported in roundtrip mode."
+ << endl;
+ return EXIT_FAILURE;
+ }
+ string texfilename = changeExtension(outfilename, ".tex");
+ if (equivalent(FileName(infilename), FileName(texfilename))) {
+ cerr << "Error: The input file `" << infilename
+ << "´ would be overwritten by the TeX file exported from `"
+ << outfilename << "´ in roundtrip mode." << endl;
+ return EXIT_FAILURE;
+ }
+ }
+ } else if (roundtrip) {
+ // avoid overwriting the input file
+ outfilename = changeExtension(infilename, ".lyx.lyx");
} else
outfilename = changeExtension(infilename, ".lyx");
theModuleList.read();
// The real work now.
- masterFilePath = onlyPath(infilename);
- parentFilePath = masterFilePath;
+ masterFilePathTeX = onlyPath(infilename);
+ parentFilePathTeX = masterFilePathTeX;
if (outfilename == "-") {
+ // assume same directory as input file
+ masterFilePathLyX = masterFilePathTeX;
if (tex2lyx(FileName(infilename), cout, default_encoding))
return EXIT_SUCCESS;
- } else if (roundtrip) {
- if (tex2tex(infilename, FileName(outfilename), default_encoding))
- return EXIT_SUCCESS;
} else {
- if (tex2lyx(infilename, FileName(outfilename), default_encoding))
- return EXIT_SUCCESS;
+ masterFilePathLyX = onlyPath(outfilename);
+ if (roundtrip) {
+ if (tex2tex(infilename, FileName(outfilename), default_encoding))
+ return EXIT_SUCCESS;
+ } else {
+ if (tex2lyx(infilename, FileName(outfilename), default_encoding))
+ return EXIT_SUCCESS;
+ }
}
return EXIT_FAILURE;
}
projects / lyx.git / blobdiff