#include "support/Systemcall.h"
#include <cstdlib>
+#include <algorithm>
#include <iostream>
#include <string>
#include <sstream>
CommandMap known_math_environments;
FullCommandMap possible_textclass_commands;
FullEnvironmentMap possible_textclass_environments;
+FullCommandMap possible_textclass_theorems;
int const LYX_FORMAT = LYX_FORMAT_TEX2LYX;
/// used modules
}
+void add_known_theorem(string const & theorem, string const & o1,
+ bool o2, docstring const & definition)
+{
+ vector<ArgumentType> arguments;
+ convertArgs(o1, o2, arguments);
+ if (!definition.empty())
+ possible_textclass_theorems[theorem] =
+ FullCommand(arguments, definition);
+}
+
+
Layout const * findLayoutWithoutModule(TextClass const & textclass,
string const & name, bool command)
{
typedef map<string, DocumentClassPtr> ModuleMap;
ModuleMap modules;
+
+
+bool addModule(string const module, LayoutFile const & baseClass, LayoutModuleList & m, vector<string> & visited)
+{
+ // avoid endless loop for circular dependency
+ vector<string>::const_iterator const vb = visited.begin();
+ vector<string>::const_iterator const ve = visited.end();
+ if (find(vb, ve, module) != ve) {
+ cerr << "Circular dependency detected for module " << module << '\n';
+ return false;
+ }
+ LyXModule const * const lm = theModuleList[module];
+ if (!lm) {
+ cerr << "Could not find module " << module << " in module list.\n";
+ return false;
+ }
+ bool foundone = false;
+ LayoutModuleList::const_iterator const exclmodstart = baseClass.excludedModules().begin();
+ LayoutModuleList::const_iterator const exclmodend = baseClass.excludedModules().end();
+ LayoutModuleList::const_iterator const provmodstart = baseClass.providedModules().begin();
+ LayoutModuleList::const_iterator const provmodend = baseClass.providedModules().end();
+ vector<string> const reqs = lm->getRequiredModules();
+ if (reqs.empty())
+ foundone = true;
+ else {
+ LayoutModuleList::const_iterator mit = m.begin();
+ LayoutModuleList::const_iterator men = m.end();
+ vector<string>::const_iterator rit = reqs.begin();
+ vector<string>::const_iterator ren = reqs.end();
+ for (; rit != ren; ++rit) {
+ if (find(mit, men, *rit) != men) {
+ foundone = true;
+ break;
+ }
+ if (find(provmodstart, provmodend, *rit) != provmodend) {
+ foundone = true;
+ break;
+ }
+ }
+ if (!foundone) {
+ visited.push_back(module);
+ for (rit = reqs.begin(); rit != ren; ++rit) {
+ if (find(exclmodstart, exclmodend, *rit) == exclmodend) {
+ if (addModule(*rit, baseClass, m, visited)) {
+ foundone = true;
+ break;
+ }
+ }
+ }
+ visited.pop_back();
+ }
+ }
+ if (!foundone) {
+ cerr << "Could not add required modules for " << module << ".\n";
+ return false;
+ }
+ if (!m.moduleCanBeAdded(module, &baseClass))
+ return false;
+ m.push_back(module);
+ return true;
+}
+
+
void initModules()
{
// Create list of dummy document classes if not already done.
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))
+ vector<string> v;
+ if (!addModule(module, baseClass, m, v))
continue;
- m.push_back(module);
modules[module] = getDocumentClass(baseClass, m);
}
init = false;
static set<string> failed[2];
// Only add the module if the command was actually defined in the LyX preamble
+ bool theorem = false;
if (command) {
if (possible_textclass_commands.find('\\' + name) == possible_textclass_commands.end())
return false;
} else {
- if (possible_textclass_environments.find(name) == possible_textclass_environments.end())
- return false;
+ if (possible_textclass_environments.find(name) == possible_textclass_environments.end()) {
+ if (possible_textclass_theorems.find(name) != possible_textclass_theorems.end())
+ theorem = true;
+ else
+ return false;
+ }
}
if (failed[command].find(name) != failed[command].end())
return false;
ModuleMap::iterator const end = modules.end();
for (ModuleMap::iterator it = modules.begin(); it != end; ++it) {
string const module = it->first;
- if (!used_modules.moduleCanBeAdded(module, &baseClass))
+ if (used_modules.moduleConflicts(module, &baseClass))
continue;
if (findLayoutWithoutModule(textclass, name, command))
continue;
possible_textclass_commands['\\' + name];
if (preamble.find(cmd.def) != docstring::npos)
add = true;
+ } else if (theorem) {
+ FullCommand const & thm =
+ possible_textclass_theorems[name];
+ if (preamble.find(thm.def) != docstring::npos)
+ add = true;
} else {
FullEnvironment const & env =
possible_textclass_environments[name];
}
+bool isProvided(string const & name)
+{
+ // This works only for features that are named like the LaTeX packages
+ return textclass.provides(name) || preamble.isPackageUsed(name);
+}
+
+
bool noweb_mode = false;
bool pdflatex = false;
bool xetex = false;
"\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"
- "\t-n translate a noweb (aka literate programming) file.\n"
+ "\t-n translate literate programming (noweb, sweave,... ) file.\n"
"\t-skipchildren Do not translate included child documents.\n"
"\t-roundtrip re-export created .lyx file infile.lyx.lyx to infile.lyx.tex.\n"
"\t-s syntaxfile read additional syntax file.\n"
{
// Set a sensible default encoding.
// This is used until an encoding command is found.
- // For child documents use the encoding of the master, else latin1,
- // since latin1 does not cause an iconv error if the actual encoding
- // is different (bug 7509).
+ // For child documents use the encoding of the master, else ISO8859-1,
+ // (formerly known by its latex name latin1), since ISO8859-1 does not
+ // cause an iconv error if the actual encoding is different (bug 7509).
if (encoding.empty()) {
if (preamble.inputencoding() == "auto")
- encoding = "latin1";
- else
- encoding = preamble.inputencoding();
+ encoding = "ISO8859-1";
+ else {
+ Encoding const * const enc = encodings.fromLyXName(
+ preamble.inputencoding(), true);
+ encoding = enc->iconvName();
+ }
}
Parser p(is);
//p.dump();
preamble.parse(p, documentclass, textclass);
+ list<string> removed_modules;
+ LayoutFile const & baseClass = LayoutFileList::get()[textclass.name()];
+ if (!used_modules.adaptToBaseClass(&baseClass, removed_modules)) {
+ cerr << "Could not load default modules for text class." << endl;
+ return false;
+ }
// Load preloaded modules.
// This needs to be done after the preamble is parsed, since the text
preamble.addModule(*it);
}
if (!preamble.writeLyXHeader(os, !active_environments.empty())) {
- cerr << "Could write LyX file header." << endl;
+ cerr << "Could not write LyX file header." << endl;
return false;
}
} // anonymous namespace
-bool tex2lyx(string const & infilename, FileName const & outfilename,
+bool tex2lyx(string const & infilename, FileName const & outfilename,
string const & encoding)
{
if (outfilename.isReadableFile()) {
easyParse(argc, argv);
- if (argc <= 1)
+ if (argc <= 1)
error_message("Not enough arguments.");
try {
// Read the encodings table.
FileName const symbols_path = libFileSearch(string(), "unicodesymbols");
if (symbols_path.empty()) {
- cerr << "Error: Could not find file \"unicodesymbols\"."
+ cerr << "Error: Could not find file \"unicodesymbols\"."
<< endl;
return EXIT_FAILURE;
}
FileName const enc_path = libFileSearch(string(), "encodings");
if (enc_path.empty()) {
- cerr << "Error: Could not find file \"encodings\"."
+ cerr << "Error: Could not find file \"encodings\"."
<< endl;
return EXIT_FAILURE;
}
encodings.read(enc_path, symbols_path);
- if (!default_encoding.empty() && !encodings.fromLaTeXName(default_encoding))
- error_message("Unknown LaTeX encoding `" + default_encoding + "'");
+ if (!default_encoding.empty()) {
+ Encoding const * const enc = encodings.fromLaTeXName(
+ default_encoding, Encoding::any, true);
+ if (!enc)
+ error_message("Unknown LaTeX encoding `" + default_encoding + "'");
+ default_encoding = enc->iconvName();
+ }
// Load the layouts
LayoutFileList::get().read();
projects / lyx.git / blobdiff