#include "Converter.h"
-#include "ConverterCache.h"
#include "Buffer.h"
#include "buffer_funcs.h"
#include "BufferParams.h"
-#include "debug.h"
+#include "ConverterCache.h"
+#include "Encoding.h"
+#include "ErrorList.h"
#include "Format.h"
-#include "gettext.h"
#include "Language.h"
#include "LaTeX.h"
#include "Mover.h"
-#include "frontends/Alert.h"
+#include "frontends/alert.h"
+#include "support/debug.h"
+#include "support/FileNameList.h"
#include "support/filetools.h"
-#include "support/lyxlib.h"
+#include "support/gettext.h"
+#include "support/lstrings.h"
#include "support/os.h"
-#include "support/path.h"
-#include "support/systemcall.h"
+#include "support/Package.h"
+#include "support/Path.h"
+#include "support/Systemcall.h"
+using namespace std;
+using namespace lyx::support;
namespace lyx {
-using support::addName;
-using support::bformat;
-using support::changeExtension;
-using support::compare_ascii_no_case;
-using support::contains;
-using support::dirList;
-using support::FileName;
-using support::getExtension;
-using support::isFileReadable;
-using support::libFileSearch;
-using support::libScriptSearch;
-using support::makeAbsPath;
-using support::makeRelPath;
-using support::onlyFilename;
-using support::onlyPath;
-using support::prefixIs;
-using support::quoteName;
-using support::removeExtension;
-using support::split;
-using support::subst;
-using support::Systemcall;
-
-using std::endl;
-using std::find_if;
-using std::string;
-using std::vector;
-using std::distance;
-
namespace Alert = lyx::frontend::Alert;
string const token_base("$$b");
string const token_to("$$o");
string const token_path("$$p");
-
+string const token_orig_path("$$r");
+string const token_encoding("$$e");
+string const token_latex_encoding("$$E");
string const add_options(string const & command, string const & options)
string result;
if (bp.papersize != PAPER_CUSTOM) {
- string const paper_size = bp.paperSizeName();
- if (paper_size != "b5" && paper_size != "foolscap")
+ string const paper_size = bp.paperSizeName(BufferParams::DVIPDFM);
+ if (!paper_size.empty())
result = "-p "+ paper_size;
if (bp.orientation == ORIENTATION_LANDSCAPE)
}
-class ConverterEqual : public std::binary_function<string, string, bool> {
+class ConverterEqual {
public:
ConverterEqual(string const & from, string const & to)
: from_(from), to_(to) {}
string const & c, string const & l)
: from(f), to(t), command(c), flags(l),
From(0), To(0), latex(false), xml(false),
- original_dir(false), need_aux(false)
+ need_aux(false)
{}
string flag_name, flag_value;
flag_list = split(flag_list, flag_value, ',');
flag_value = split(flag_value, flag_name, '=');
- if (flag_name == "latex")
+ if (flag_name == "latex") {
latex = true;
- else if (flag_name == "xml")
+ latex_flavor = flag_value.empty() ?
+ "latex" : flag_value;
+ } else if (flag_name == "xml")
xml = true;
- else if (flag_name == "originaldir")
- original_dir = true;
else if (flag_name == "needaux")
need_aux = true;
else if (flag_name == "resultdir")
}
-bool operator<(Converter const & a, Converter const & b)
-{
- // use the compare_ascii_no_case instead of compare_no_case,
- // because in turkish, 'i' is not the lowercase version of 'I',
- // and thus turkish locale breaks parsing of tags.
- int const i = compare_ascii_no_case(a.From->prettyname(),
- b.From->prettyname());
- if (i == 0)
- return compare_ascii_no_case(a.To->prettyname(),
- b.To->prettyname()) < 0;
- else
- return i < 0;
-}
-
-
Converter const * Converters::getConverter(string const & from,
string const & to) const
{
}
converter.readFlags();
- if (converter.latex && (latex_command_.empty() || to == "dvi"))
- latex_command_ = subst(command, token_from, "");
// If we have both latex & pdflatex, we set latex_command to latex.
// The latex_command is used to update the .aux file when running
// a converter that uses it.
+ if (converter.latex
+ && (latex_command_.empty() || converter.latex_flavor == "latex"))
+ latex_command_ = subst(command, token_from, "");
+ // Similarly, set xelatex_command to xelatex.
+ if (converter.latex
+ && (xelatex_command_.empty() || converter.latex_flavor == "xelatex"))
+ xelatex_command_ = subst(command, token_from, "");
if (it == converterlist_.end()) {
converterlist_.push_back(converter);
}
-void Converters::sort()
-{
- std::sort(converterlist_.begin(), converterlist_.end());
-}
-
-
OutputParams::FLAVOR Converters::getFlavor(Graph::EdgePath const & path)
{
for (Graph::EdgePath::const_iterator cit = path.begin();
cit != path.end(); ++cit) {
Converter const & conv = converterlist_[*cit];
if (conv.latex)
- if (contains(conv.to, "pdf"))
+ if (conv.latex_flavor == "xelatex")
+ return OutputParams::XETEX;
+ if (conv.latex_flavor == "lualatex")
+ return OutputParams::LUATEX;
+ if (conv.latex_flavor == "dvilualatex")
+ return OutputParams::DVILUATEX;
+ if (conv.latex_flavor == "pdflatex")
return OutputParams::PDFLATEX;
if (conv.xml)
return OutputParams::XML;
bool Converters::convert(Buffer const * buffer,
- FileName const & from_file, FileName const & to_file,
- FileName const & orig_from,
- string const & from_format, string const & to_format,
- ErrorList & errorList, int conversionflags)
+ FileName const & from_file, FileName const & to_file,
+ FileName const & orig_from,
+ string const & from_format, string const & to_format,
+ ErrorList & errorList, int conversionflags)
{
if (from_format == to_format)
return move(from_format, from_file, to_file, false);
// if no special converter defined, then we take the
// default one from ImageMagic.
string const from_ext = from_format.empty() ?
- getExtension(from_file.absFilename()) :
+ getExtension(from_file.absFileName()) :
formats.extension(from_format);
string const to_ext = formats.extension(to_format);
string const command =
- support::os::python() + ' ' +
+ os::python() + ' ' +
quoteName(libFileSearch("scripts", "convertDefault.py").toFilesystemEncoding()) +
' ' +
quoteName(from_ext + ':' + from_file.toFilesystemEncoding()) +
' ' +
quoteName(to_ext + ':' + to_file.toFilesystemEncoding());
- LYXERR(Debug::FILES)
- << "No converter defined! "
- "I use convertDefault.py:\n\t"
- << command << endl;
+ LYXERR(Debug::FILES, "No converter defined! "
+ "I use convertDefault.py:\n\t" << command);
Systemcall one;
- one.startscript(Systemcall::Wait, command);
- if (isFileReadable(to_file)) {
+ one.startscript(Systemcall::Wait, command, buffer ?
+ buffer->filePath() : string());
+ if (to_file.isReadableFile()) {
if (conversionflags & try_cache)
ConverterCache::get().add(orig_from,
to_format, to_file);
return true;
}
}
+
+ // only warn once per session and per file type
+ static std::map<string, string> warned;
+ if (warned.find(from_format) != warned.end() && warned.find(from_format)->second == to_format) {
+ return false;
+ }
+ warned.insert(make_pair(from_format, to_format));
+
Alert::error(_("Cannot convert file"),
bformat(_("No information for converting %1$s "
"format files to %2$s.\n"
OutputParams runparams(buffer ? &buffer->params().encoding() : 0);
runparams.flavor = getFlavor(edgepath);
+ if (buffer) {
+ runparams.use_japanese = buffer->params().bufferFormat() == "platex";
+ runparams.use_indices = buffer->params().use_indices;
+ runparams.bibtex_command = (buffer->params().bibtex_command == "default") ?
+ string() : buffer->params().bibtex_command;
+ runparams.index_command = (buffer->params().index_command == "default") ?
+ string() : buffer->params().index_command;
+ }
+
// Some converters (e.g. lilypond) can only output files to the
// current directory, so we need to change the current directory.
// This has the added benefit that all other files that may be
// generated by the converter are deleted when LyX closes and do not
// clutter the real working directory.
- string const path(onlyPath(from_file.absFilename()));
+ string const path(onlyPath(from_file.absFileName()));
// Prevent the compiler from optimizing away p
FileName pp(path);
- support::Path p(pp);
+ PathChanger p(pp);
// empty the error list before any new conversion takes place.
errorList.clear();
bool run_latex = false;
- string from_base = changeExtension(from_file.absFilename(), "");
- string to_base = changeExtension(to_file.absFilename(), "");
+ string from_base = changeExtension(from_file.absFileName(), "");
+ string to_base = changeExtension(to_file.absFileName(), "");
FileName infile;
FileName outfile = from_file;
for (Graph::EdgePath::const_iterator cit = edgepath.begin();
cit != edgepath.end(); ++cit) {
Converter const & conv = converterlist_[*cit];
bool dummy = conv.To->dummy() && conv.to != "program";
- if (!dummy)
- LYXERR(Debug::FILES) << "Converting from "
- << conv.from << " to " << conv.to << endl;
+ if (!dummy) {
+ LYXERR(Debug::FILES, "Converting from "
+ << conv.from << " to " << conv.to);
+ }
infile = outfile;
outfile = FileName(conv.result_dir.empty()
- ? changeExtension(from_file.absFilename(), conv.To->extension())
+ ? changeExtension(from_file.absFileName(), conv.To->extension())
: addName(subst(conv.result_dir,
token_base, from_base),
subst(conv.result_file,
- token_base, onlyFilename(from_base))));
+ token_base, onlyFileName(from_base))));
// if input and output files are equal, we use a
// temporary file as intermediary (JMarc)
FileName real_outfile;
if (outfile == infile) {
real_outfile = infile;
- outfile = FileName(addName(buffer->temppath(), "tmpfile.out"));
+ // when importing, a buffer does not necessarily exist
+ if (buffer)
+ outfile = FileName(addName(buffer->temppath(), "tmpfile.out"));
+ else
+ outfile = FileName(addName(package().temp_dir().absFileName(),
+ "tmpfile.out"));
}
if (conv.latex) {
run_latex = true;
- string const command = subst(conv.command, token_from, "");
- LYXERR(Debug::FILES) << "Running " << command << endl;
+ string command = conv.command;
+ command = subst(command, token_from, "");
+ command = subst(command, token_latex_encoding, buffer ?
+ buffer->params().encoding().latexName() : string());
+ LYXERR(Debug::FILES, "Running " << command);
if (!runLaTeX(*buffer, command, runparams, errorList))
return false;
} else {
if (conv.need_aux && !run_latex
&& !latex_command_.empty()) {
- LYXERR(Debug::FILES)
- << "Running " << latex_command_
- << " to update aux file"<< endl;
- runLaTeX(*buffer, latex_command_, runparams, errorList);
+ string const command = (buffer && buffer->params().useNonTeXFonts) ?
+ xelatex_command_ : latex_command_;
+ LYXERR(Debug::FILES, "Running " << command
+ << " to update aux file");
+ if (!runLaTeX(*buffer, command, runparams, errorList))
+ return false;
}
// FIXME UNICODE
- string const infile2 = (conv.original_dir)
- ? infile.absFilename() : to_utf8(makeRelPath(from_utf8(infile.absFilename()),
- from_utf8(path)));
- string const outfile2 = (conv.original_dir)
- ? outfile.absFilename() : to_utf8(makeRelPath(from_utf8(outfile.absFilename()),
- from_utf8(path)));
+ string const infile2 =
+ to_utf8(makeRelPath(from_utf8(infile.absFileName()), from_utf8(path)));
+ string const outfile2 =
+ to_utf8(makeRelPath(from_utf8(outfile.absFileName()), from_utf8(path)));
string command = conv.command;
command = subst(command, token_from, quoteName(infile2));
command = subst(command, token_base, quoteName(from_base));
command = subst(command, token_to, quoteName(outfile2));
+ command = subst(command, token_path, quoteName(onlyPath(infile.absFileName())));
+ command = subst(command, token_orig_path, quoteName(onlyPath(orig_from.absFileName())));
+ command = subst(command, token_encoding, buffer ? buffer->params().encoding().iconvName() : string());
command = libScriptSearch(command);
if (!conv.parselog.empty())
command = add_options(command,
dvipdfm_options(buffer->params()));
- LYXERR(Debug::FILES) << "Calling " << command << endl;
+ LYXERR(Debug::FILES, "Calling " << command);
if (buffer)
buffer->message(_("Executing command: ")
+ from_utf8(command));
- Systemcall::Starttype const type = (dummy)
- ? Systemcall::DontWait : Systemcall::Wait;
Systemcall one;
int res;
- if (conv.original_dir) {
- FileName path(buffer->filePath());
- support::Path p(path);
- res = one.startscript(type,
- to_filesystem8bit(from_utf8(command)));
- } else
- res = one.startscript(type,
- to_filesystem8bit(from_utf8(command)));
-
- if (!real_outfile.empty()) {
- Mover const & mover = getMover(conv.to);
- if (!mover.rename(outfile, real_outfile))
- res = -1;
- else
- LYXERR(Debug::FILES)
- << "renaming file " << outfile
- << " to " << real_outfile
- << endl;
- // Finally, don't forget to tell any future
- // converters to use the renamed file...
- outfile = real_outfile;
- }
-
- if (!conv.parselog.empty()) {
- string const logfile = infile2 + ".log";
- string const script = libScriptSearch(conv.parselog);
- string const command2 = script +
- " < " + quoteName(infile2 + ".out") +
- " > " + quoteName(logfile);
- one.startscript(Systemcall::Wait,
- to_filesystem8bit(from_utf8(command2)));
- if (!scanLog(*buffer, command, makeAbsPath(logfile, path), errorList))
- return false;
+ if (dummy) {
+ res = one.startscript(Systemcall::DontWait,
+ to_filesystem8bit(from_utf8(command)),
+ buffer ? buffer->filePath() : string());
+ // We're not waiting for the result, so we can't do anything
+ // else here.
+ } else {
+ res = one.startscript(Systemcall::Wait,
+ to_filesystem8bit(from_utf8(command)),
+ buffer ? buffer->filePath()
+ : string());
+ if (!real_outfile.empty()) {
+ Mover const & mover = getMover(conv.to);
+ if (!mover.rename(outfile, real_outfile))
+ res = -1;
+ else
+ LYXERR(Debug::FILES, "renaming file " << outfile
+ << " to " << real_outfile);
+ // Finally, don't forget to tell any future
+ // converters to use the renamed file...
+ outfile = real_outfile;
+ }
+
+ if (!conv.parselog.empty()) {
+ string const logfile = infile2 + ".log";
+ string const script = libScriptSearch(conv.parselog);
+ string const command2 = script +
+ " < " + quoteName(infile2 + ".out") +
+ " > " + quoteName(logfile);
+ one.startscript(Systemcall::Wait,
+ to_filesystem8bit(from_utf8(command2)),
+ buffer->filePath());
+ if (!scanLog(*buffer, command, makeAbsPath(logfile, path), errorList))
+ return false;
+ }
}
if (res) {
// FIXME: this should go out of here. For example, here we cannot say if
// it is a document (.lyx) or something else. Same goes for elsewhere.
Alert::error(_("Cannot convert file"),
- bformat(_("An error occurred whilst running %1$s"),
- from_utf8(command.substr(0, 50))));
+ bformat(_("An error occurred while running:\n%1$s"),
+ wrapParas(from_utf8(command))));
}
return false;
}
return true;
bool no_errors = true;
- string const path = onlyPath(from.absFilename());
- string const base = onlyFilename(removeExtension(from.absFilename()));
- string const to_base = removeExtension(to.absFilename());
- string const to_extension = getExtension(to.absFilename());
-
- vector<FileName> const files = dirList(FileName(path),
- getExtension(from.absFilename()));
- for (vector<FileName>::const_iterator it = files.begin();
+ string const path = onlyPath(from.absFileName());
+ string const base = onlyFileName(removeExtension(from.absFileName()));
+ string const to_base = removeExtension(to.absFileName());
+ string const to_extension = getExtension(to.absFileName());
+
+ support::FileNameList const files = FileName(path).dirList(getExtension(from.absFileName()));
+ for (support::FileNameList::const_iterator it = files.begin();
it != files.end(); ++it) {
- string const from2 = it->absFilename();
- string const file2 = onlyFilename(from2);
+ string const from2 = it->absFileName();
+ string const file2 = onlyFileName(from2);
if (prefixIs(file2, base)) {
string const to2 = changeExtension(
to_base + file2.substr(base.length()),
to_extension);
- LYXERR(Debug::FILES) << "moving " << from2
- << " to " << to2 << endl;
+ LYXERR(Debug::FILES, "moving " << from2 << " to " << to2);
Mover const & mover = getMover(fmt);
bool const moved = copy
int const result = latex.scanLogFile(terr);
if (result & LaTeX::ERRORS)
- bufferErrors(buffer, terr, errorList);
+ buffer.bufferErrors(terr, errorList);
return true;
}
namespace {
-class showMessage : public std::unary_function<docstring, void>, public boost::signals::trackable {
+class ShowMessage
+ : public boost::signals::trackable {
public:
- showMessage(Buffer const & b) : buffer_(b) {};
- void operator()(docstring const & m) const
- {
- buffer_.message(m);
- }
+ ShowMessage(Buffer const & b) : buffer_(b) {}
+ void operator()(docstring const & msg) const { buffer_.message(msg); }
private:
Buffer const & buffer_;
};
bool Converters::runLaTeX(Buffer const & buffer, string const & command,
OutputParams const & runparams, ErrorList & errorList)
{
- buffer.busy(true);
+ buffer.setBusy(true);
buffer.message(_("Running LaTeX..."));
runparams.document_language = buffer.params().language->babel();
// do the LaTeX run(s)
- string const name = buffer.getLatexName();
- LaTeX latex(command, runparams, FileName(makeAbsPath(name)));
+ string const name = buffer.latexName();
+ LaTeX latex(command, runparams, FileName(makeAbsPath(name)),
+ buffer.filePath());
TeXErrors terr;
- showMessage show(buffer);
+ ShowMessage show(buffer);
latex.message.connect(show);
int const result = latex.run(terr);
if (result & LaTeX::ERRORS)
- bufferErrors(buffer, terr, errorList);
+ buffer.bufferErrors(terr, errorList);
// check return value from latex.run().
- if ((result & LaTeX::NO_LOGFILE)) {
+ if ((result & LaTeX::NO_LOGFILE) && !buffer.isClone()) {
docstring const str =
bformat(_("LaTeX did not run successfully. "
"Additionally, LyX could not locate "
"the LaTeX log %1$s."), from_utf8(name));
Alert::error(_("LaTeX failed"), str);
- } else if (result & LaTeX::NO_OUTPUT) {
+ } else if ((result & LaTeX::NO_OUTPUT) && !buffer.isClone()) {
Alert::warning(_("Output is empty"),
_("An empty output file was generated."));
}
- buffer.busy(false);
+ buffer.setBusy(false);
int const ERROR_MASK =
LaTeX::NO_LOGFILE |
void Converters::buildGraph()
{
+ // clear graph's data structures
G_.init(formats.size());
- ConverterList::iterator beg = converterlist_.begin();
+ // each of the converters knows how to convert one format to another
+ // so, for each of them, we create an arrow on the graph, going from
+ // the one to the other
+ ConverterList::iterator it = converterlist_.begin();
ConverterList::iterator const end = converterlist_.end();
- for (ConverterList::iterator it = beg; it != end ; ++it) {
- int const s = formats.getNumber(it->from);
- int const t = formats.getNumber(it->to);
- G_.addEdge(s,t);
+ for (; it != end ; ++it) {
+ int const from = formats.getNumber(it->from);
+ int const to = formats.getNumber(it->to);
+ G_.addEdge(from, to);
}
}
-std::vector<Format const *> const
-Converters::intToFormat(std::vector<int> const & input)
+vector<Format const *> const
+Converters::intToFormat(vector<int> const & input)
{
vector<Format const *> result(input.size());
vector<Format const *> const
Converters::getReachable(string const & from, bool const only_viewable,
- bool const clear_visited)
+ bool const clear_visited, set<string> const & excludes)
{
+ set<int> excluded_numbers;;
+
+ set<string>::const_iterator sit = excludes.begin();
+ set<string>::const_iterator const end = excludes.end();
+ for (; sit != end; ++sit)
+ excluded_numbers.insert(formats.getNumber(*sit));
+
vector<int> const & reachables =
G_.getReachable(formats.getNumber(from),
only_viewable,
- clear_visited);
+ clear_visited,
+ excluded_numbers);
return intToFormat(reachables);
}
}
-Graph::EdgePath const
-Converters::getPath(string const & from, string const & to)
+Graph::EdgePath Converters::getPath(string const & from, string const & to)
{
return G_.getPath(formats.getNumber(from),
formats.getNumber(to));
}
+
+vector<Format const *> Converters::importableFormats()
+{
+ vector<string> l = loaders();
+ vector<Format const *> result = getReachableTo(l[0], true);
+ vector<string>::const_iterator it = l.begin() + 1;
+ vector<string>::const_iterator en = l.end();
+ for (; it != en; ++it) {
+ vector<Format const *> r = getReachableTo(*it, false);
+ result.insert(result.end(), r.begin(), r.end());
+ }
+ return result;
+}
+
+
+vector<Format const *> Converters::exportableFormats(bool only_viewable)
+{
+ vector<string> s = savers();
+ vector<Format const *> result = getReachable(s[0], only_viewable, true);
+ vector<string>::const_iterator it = s.begin() + 1;
+ vector<string>::const_iterator en = s.end();
+ for (; it != en; ++it) {
+ vector<Format const *> r =
+ getReachable(*it, only_viewable, false);
+ result.insert(result.end(), r.begin(), r.end());
+ }
+ return result;
+}
+
+
+vector<string> Converters::loaders() const
+{
+ vector<string> v;
+ v.push_back("lyx");
+ v.push_back("text");
+ v.push_back("textparagraph");
+ return v;
+}
+
+
+vector<string> Converters::savers() const
+{
+ vector<string> v;
+ v.push_back("docbook");
+ v.push_back("latex");
+ v.push_back("literate");
+ v.push_back("luatex");
+ v.push_back("dviluatex");
+ v.push_back("lyx");
+ v.push_back("xhtml");
+ v.push_back("pdflatex");
+ v.push_back("platex");
+ v.push_back("text");
+ v.push_back("xetex");
+ return v;
+}
+
+
} // namespace lyx
projects / lyx.git / blobdiff