X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fconverter.C;h=604e4d70f4048428c34125581fcfeaae90758d22;hb=15271fce0705ea5611647b5b3d1e993362ff5284;hp=9773b5fbcb74e37f5271fb73306e8aae8d81d413;hpb=4255b4a1b7dcb4d092c26aaccf7a5b240c8d7786;p=lyx.git diff --git a/src/converter.C b/src/converter.C index 9773b5fbcb..604e4d70f4 100644 --- a/src/converter.C +++ b/src/converter.C @@ -14,121 +14,186 @@ #pragma implementation #endif -#include +#include #include "converter.h" #include "lyxrc.h" #include "support/syscall.h" #include "support/path.h" +#include "support/filetools.h" #include "buffer.h" #include "bufferview_funcs.h" #include "LaTeX.h" #include "LyXView.h" -#include "minibuffer.h" #include "lyx_gui_misc.h" #include "lyx_cb.h" // ShowMessage() +#include "support/lyxfunctional.h" +#include "gettext.h" -using std::map; using std::vector; using std::queue; -using std::pair; using std::endl; +using std::fill; +using std::find_if; +using std::reverse; +using std::sort; -////////////////////////////////////////////////////////////////////////////// +namespace { + +string const token_from("$$i"); +string const token_base("$$b"); +string const token_to("$$o"); -map Formats::formats; -vector Converter::commands; -string Converter::latex_command; +////////////////////////////////////////////////////////////////////////////// inline string const add_options(string const & command, string const & options) { string head; - string tail = split(command, head, ' '); + string const tail = split(command, head, ' '); return head + ' ' + options + ' ' + tail; } +} // namespace anon + ////////////////////////////////////////////////////////////////////////////// -Format::Format(string const & n) - : name(n) -{ - struct Item { - char const * name; - char const * prettyname; - }; - Item items[] = { - { "tex", "LaTeX" }, - { "dvi", "DVI" }, - { "ps", "PostScript" }, - { "txt", "Ascii" }, - { "html", "HTML" }, - { "pdf", "PDF" }, - { "nw", "NoWeb/LaTeX"}, - { 0, 0} - }; - - prettyname = n; - for (int i = 0; items[i].name != 0; ++i) - if (items[i].name == n) { - prettyname = items[i].prettyname; - break; - } +bool Format::dummy() const +{ + return extension().empty(); +} + + +bool Format::IsChildFormat() const +{ + if (name_.empty()) + return false; + return isdigit(name_[name_.length() - 1]); +} + + +string const Format::ParentFormat() const +{ + return name_.substr(0, name_.length() - 1); +} + +////////////////////////////////////////////////////////////////////////////// + +// This method should return a reference, and throw an exception +// if the format named name cannot be found (Lgb) +Format const * Formats::GetFormat(string const & name) const +{ + FormatList::const_iterator cit = + find_if(formatlist.begin(), formatlist.end(), + lyx::compare_memfun(&Format::name, name)); + if (cit != formatlist.end()) + return &(*cit); + else + return 0; +} + + +int Formats::GetNumber(string const & name) const +{ + FormatList::const_iterator cit = + find_if(formatlist.begin(), formatlist.end(), + lyx::compare_memfun(&Format::name, name)); + if (cit != formatlist.end()) + return cit - formatlist.begin(); + else + return -1; } void Formats::Add(string const & name) { - if (formats.find(name) == formats.end()) - formats[name] = Format(name); + if (!GetFormat(name)) + Add(name, name, name, string()); } -void Formats::SetViewer(string const & name, string const & command) +void Formats::Add(string const & name, string const & extension, + string const & prettyname, string const & shortcut) { + FormatList::iterator it = + find_if(formatlist.begin(), formatlist.end(), + lyx::compare_memfun(&Format::name, name)); + if (it == formatlist.end()) + formatlist.push_back(Format(name, extension, prettyname, + shortcut, "")); + else { + string viewer = it->viewer(); + *it = Format(name, extension, prettyname, shortcut, viewer); + } +} + - string command2 = command; - if (!contains(command2,"$$FName")) - command2 += " $$FName"; +void Formats::Delete(string const & name) +{ + FormatList::iterator it = + find_if(formatlist.begin(), formatlist.end(), + lyx::compare_memfun(&Format::name, name)); + if (it != formatlist.end()) + formatlist.erase(it); +} + + +void Formats::Sort() +{ + sort(formatlist.begin(), formatlist.end()); +} + +void Formats::SetViewer(string const & name, string const & command) +{ Add(name); - GetFormat(name)->viewer = command2; + FormatList::iterator it = + find_if(formatlist.begin(), formatlist.end(), + lyx::compare_memfun(&Format::name, name)); + if (it != formatlist.end()) + it->setViewer(command); } -bool Formats::View(Buffer const * buffer, string const & filename) +bool Formats::View(Buffer const * buffer, string const & filename, + string const & format_name) const { if (filename.empty()) return false; - string extension = GetExtension(filename); - Format * format = GetFormat(extension); - if (!format || format->viewer.empty()) { + Format const * format = GetFormat(format_name); + if (format && format->viewer().empty() && + format->IsChildFormat()) + format = GetFormat(format->ParentFormat()); + if (!format || format->viewer().empty()) { WriteAlert(_("Can not view file"), _("No information for viewing ") - + Formats::PrettyName(extension)); + + PrettyName(format_name)); return false; } - string command = format->viewer; + string command = format->viewer(); - if (extension == "dvi" && + if (format_name == "dvi" && !lyxrc.view_dvi_paper_option.empty()) { - string options = lyxrc.view_dvi_paper_option; - options += " " + Converter::dvi_papersize(buffer); + command += " " + lyxrc.view_dvi_paper_option; + string paper_size = converters.papersize(buffer); + if (paper_size == "letter") + paper_size = "us"; + command += " " + paper_size; if (buffer->params.orientation == BufferParams::ORIENTATION_LANDSCAPE) - options += 'r'; - command = add_options(command, options); + command += 'r'; } - string command2 = subst(command, "$$FName", OnlyFilename(filename)); - lyxerr << "Executing command: " << command2 << endl; - ShowMessage(buffer, _("Executing command:"), command2); + command += " " + QuoteName(OnlyFilename((filename))); - command = subst(command, "$$FName", QuoteName(filename)); + lyxerr << "Executing command: " << command << endl; + ShowMessage(buffer, _("Executing command:"), command); + + Path p(OnlyPath(filename)); Systemcalls one; - int res = one.startscript(Systemcalls::SystemDontWait, command); + int const res = one.startscript(Systemcalls::SystemDontWait, command); if (res) { WriteAlert(_("Can not view file"), @@ -140,213 +205,361 @@ bool Formats::View(Buffer const * buffer, string const & filename) } -Format * Formats::GetFormat(string const & name) +string const Formats::PrettyName(string const & name) const { - map::iterator it = formats.find(name); - if (it != formats.end()) - return &(*it).second; + Format const * format = GetFormat(name); + if (format) + return format->prettyname(); else - return 0; + return name; } -string const Formats::PrettyName(string const & name) +string const Formats::Extension(string const & name) const { - string format; - Converter::SplitFormat(name, format); - Format * f = GetFormat(format); - if (f) - return f->prettyname; + Format const * format = GetFormat(name); + if (format) + return format->extension(); else - return format; + return name; } - ////////////////////////////////////////////////////////////////////////////// -void Converter::Add(string const & from, string const & to, - string const & command, string const & flags) +void Converter::ReadFlags() { - if (command == "none") - return; - - Command Com(from, to, command); - - if (from == "tex" && - (to == "dvi" || - (to == "pdf" && latex_command.empty()))) - latex_command = command; - - // Read the flags - string flag_name,flag_value; string flag_list(flags); while (!flag_list.empty()) { - flag_list = split(flag_list, flag_value,','); + string flag_name, flag_value; + flag_list = split(flag_list, flag_value, ','); flag_value = split(flag_value, flag_name, '='); - if (flag_name == "originaldir") - Com.original_dir = true; + if (flag_name == "latex") + latex = true; + else if (flag_name == "originaldir") + original_dir = true; else if (flag_name == "needaux") - Com.need_aux = true; + need_aux = true; else if (flag_name == "resultdir") - Com.result_dir = (flag_value.empty()) - ? "$$BaseName" : flag_value; + result_dir = (flag_value.empty()) + ? token_base : flag_value; else if (flag_name == "resultfile") - Com.result_file = flag_value; + result_file = flag_value; else if (flag_name == "parselog") - Com.parselog = flag_value; + parselog = flag_value; + } + if (!result_dir.empty() && result_file.empty()) + result_file = "index." + formats.Extension(to); + //if (!contains(command, token_from)) + // latex = true; +} + + +bool operator<(Converter const & a, Converter const & b) +{ + int const i = compare_no_case(a.From->prettyname(), + b.From->prettyname()); + if (i == 0) + return compare_no_case(a.To->prettyname(), b.To->prettyname()) + < 0; + else + return i < 0; +} + +////////////////////////////////////////////////////////////////////////////// + +class compare_Converter { +public: + compare_Converter(string const & f, string const & t) + : from(f), to(t) {} + bool operator()(Converter const & c) { + return c.from == from && c.to == to; + } +private: + string const & from; + string const & to; +}; + + +Converter const * Converters::GetConverter(string const & from, + string const & to) +{ + ConverterList::const_iterator cit = + find_if(converterlist.begin(), converterlist.end(), + compare_Converter(from, to)); + if (cit != converterlist.end()) + return &(*cit); + else + return 0; +} + + +int Converters::GetNumber(string const & from, string const & to) +{ + ConverterList::const_iterator cit = + find_if(converterlist.begin(), converterlist.end(), + compare_Converter(from, to)); + if (cit != converterlist.end()) + return cit - converterlist.begin(); + else + return -1; +} + + +void Converters::Add(string const & from, string const & to, + string const & command, string const & flags) +{ + formats.Add(from); + formats.Add(to); + ConverterList::iterator it = find_if(converterlist.begin(), + converterlist.end(), + compare_Converter(from, to)); + + Converter converter(from, to, command, flags); + if (it != converterlist.end() && !flags.empty() && flags[0] == '*') { + converter = *it; + converter.command = command; + converter.flags = flags; + } + 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 (it == converterlist.end()) + converterlist.push_back(converter); + else { + converter.From = it->From; + converter.To = it->To; + *it = converter; } - if (!Com.result_dir.empty() && Com.result_file.empty()) - Com.result_file = "index." + to; - - for (vector::iterator it = commands.begin(); - it != commands.end(); ++it) - if ((*it).from == from && (*it).to == to) { - *it = Com; - return; - } - commands.push_back(Com); - Formats::Add(from); - Formats::Add(to); } -vector const -Converter::GetReachable(string const & from, bool only_viewable) +void Converters::Delete(string const & from, string const & to) { - vector result; - Format * format = Formats::GetFormat(from); - if (!format) + ConverterList::iterator it = find_if(converterlist.begin(), + converterlist.end(), + compare_Converter(from, to)); + if (it != converterlist.end()) + converterlist.erase(it); +} + + +// This method updates the pointers From and To in all the converters. +// The code is not very efficient, but it doesn't matter as the number +// of formats and converters is small. +// Furthermore, this method is called only on startup, or after +// adding/deleting a format in FormPreferences (the latter calls can be +// eliminated if the formats in the Formats class are stored using a map or +// a list (instead of a vector), but this will cause other problems). +void Converters::Update(Formats const & formats) +{ + for (ConverterList::iterator it = converterlist.begin(); + it != converterlist.end(); ++it) { + it->From = formats.GetFormat(it->from); + it->To = formats.GetFormat(it->to); + } +} + + +// This method updates the pointers From and To in the last converter. +// It is called when adding a new converter in FormPreferences +void Converters::UpdateLast(Formats const & formats) +{ + if (converterlist.begin() != converterlist.end()) { + ConverterList::iterator it = converterlist.end()-1; + it->From = formats.GetFormat(it->from); + it->To = formats.GetFormat(it->to); + } +} + + +void Converters::Sort() +{ + sort(converterlist.begin(), converterlist.end()); +} + + +int Converters::BFS_init(string const & start, bool clear_visited) +{ + int const s = formats.GetNumber(start); + if (s < 0) + return s; + + Q = queue(); + if (clear_visited) + fill(visited.begin(), visited.end(), false); + if (visited[s] == false) { + Q.push(s); + visited[s] = true; + } + return s; +} + + +vector const +Converters::GetReachableTo(string const & target, bool clear_visited) +{ + vector result; + int const s = BFS_init(target, clear_visited); + if (s < 0) return result; - if (!only_viewable || !format->viewer.empty()) - result.push_back(FormatPair(format, 0, "")); + while (!Q.empty()) { + int const i = Q.front(); + Q.pop(); + if (i != s || target != "lyx") + result.push_back(&formats.Get(i)); + for (vector::iterator it = vertices[i].in_vertices.begin(); + it != vertices[i].in_vertices.end(); ++it) + if (!visited[*it]) { + visited[*it] = true; + Q.push(*it); + } + } + + return result; +} + - queue< vector::iterator > Q; - for (vector::iterator it = commands.begin(); - it != commands.end(); ++it) - if ((*it).from == from) { - Q.push(it); - (*it).visited = true; - } else - (*it).visited = false; +vector const +Converters::GetReachable(string const & from, bool only_viewable, + bool clear_visited) +{ + vector result; + + if (BFS_init(from, clear_visited) < 0) + return result; while (!Q.empty()) { - vector::iterator it = Q.front(); + int const i = Q.front(); Q.pop(); - format = Formats::GetFormat((*it).to); - if (!only_viewable || !format->viewer.empty()) - result.push_back(FormatPair(format, - Formats::GetFormat((*it).from), - (*it).command)); - for (vector::iterator it2 = commands.begin(); - it2 != commands.end(); ++it2) - if (!(*it2).visited && (*it).to == (*it2).from) { - Q.push(it2); - (*it2).visited = true; + Format const & format = formats.Get(i); + if (format.name() == "lyx") + continue; + if (!only_viewable || !format.viewer().empty() || + format.IsChildFormat()) + result.push_back(&format); + for (vector::iterator it = vertices[i].out_vertices.begin(); + it != vertices[i].out_vertices.end(); ++it) + if (!visited[*it]) { + visited[*it] = true; + Q.push(*it); } } return result; } -bool Converter::IsReachable(string const & from, string const & target_format) + +bool Converters::IsReachable(string const & from, string const & to) { - Format * format = Formats::GetFormat(from); - if (!format) - return false; - else if (format->name == target_format) + if (from == to) return true; - queue< vector::iterator > Q; - for (vector::iterator it = commands.begin(); - it != commands.end(); ++it) - if ((*it).from == from) { - Q.push(it); - (*it).visited = true; - } else - (*it).visited = false; + int const s = BFS_init(from); + int const t = formats.GetNumber(to); + if (s < 0 || t < 0) + return false; while (!Q.empty()) { - vector::iterator it = Q.front(); + int const i = Q.front(); Q.pop(); - format = Formats::GetFormat((*it).to); - if (format->name == target_format) + if (i == t) return true; - for (vector::iterator it2 = commands.begin(); - it2 != commands.end(); ++it2) - if (!(*it2).visited && (*it).to == (*it2).from) { - Q.push(it2); - (*it2).visited = true; + for (vector::iterator it = vertices[i].out_vertices.begin(); + it != vertices[i].out_vertices.end(); ++it) + if (!visited[*it]) { + visited[*it] = true; + Q.push(*it); } } + return false; } -bool Converter::Convert(Buffer const * buffer, string const & from_file, - string const & to_file, string const & using_format, - string * view_file) +Converters::EdgePath const +Converters::GetPath(string const & from, string const & to) { - if (view_file) - *view_file = to_file; + EdgePath path; + if (from == to) + return path; - string from_format = GetExtension(from_file); - string to_format = GetExtension(to_file); - if (from_format == to_format) - if (from_file != to_file) - return lyx::rename(from_file, to_file); - else - return true; + int const s = BFS_init(from); + int t = formats.GetNumber(to); + if (s < 0 || t < 0) + return path; - queue< vector::iterator > Q; - for (vector::iterator it = commands.begin(); - it != commands.end(); ++it) - if ((*it).from == from_format) { - Q.push(it); - (*it).visited = true; - (*it).previous = commands.end(); - } else - (*it).visited = false; - - if (Q.empty()) { - WriteAlert(_("Can not convert file"), - ("Unknown format ") + from_format); - return false; - } + vector prev_edge(formats.size()); + vector prev_vertex(formats.size()); bool found = false; - vector::iterator it; while (!Q.empty()) { - it = Q.front(); - if ((*it).to == to_format && - (using_format.empty() || using_format == (*it).from)) { + int const i = Q.front(); + Q.pop(); + if (i == t) { found = true; break; } - Q.pop(); - for (vector::iterator it2 = commands.begin(); - it2 != commands.end(); ++it2) - if (!(*it2).visited && (*it).to == (*it2).from) { - Q.push(it2); - (*it2).visited = true; - (*it2).previous = it; + for (vector::iterator it = vertices[i].out_vertices.begin(); + it != vertices[i].out_vertices.end(); ++it) + if (!visited[*it]) { + int const j = *it; + visited[j] = true; + Q.push(j); + int const k = it - vertices[i].out_vertices.begin(); + prev_edge[j] = vertices[i].out_edges[k]; + prev_vertex[j] = i; } } + if (!found) + return path; + + while (t != s) { + path.push_back(prev_edge[t]); + t = prev_vertex[t]; + } + reverse(path.begin(), path.end()); + return path; +} + + +bool Converters::UsePdflatex(EdgePath const & path) +{ + for (EdgePath::const_iterator cit = path.begin(); + cit != path.end(); ++cit) { + Converter const & conv = converterlist[*cit]; + if (conv.latex) + return contains(conv.to, "pdf"); + } + return false; +} + + +bool Converters::Convert(Buffer const * buffer, + string const & from_file, string const & to_file_base, + string const & from_format, string const & to_format, + string & to_file) +{ + to_file = ChangeExtension(to_file_base, + formats.Extension(to_format)); - if (!found) { + if (from_format == to_format) + return Move(from_file, to_file, false); + + EdgePath edgepath = GetPath(from_format, to_format); + if (edgepath.empty()) { WriteAlert(_("Can not convert file"), _("No information for converting from ") - + Formats::PrettyName(from_format) + _(" to ") - + Formats::PrettyName(to_format)); + + formats.PrettyName(from_format) + _(" to ") + + formats.PrettyName(to_format)); return false; } - vector< vector::iterator > S; - while (it != commands.end()) { - S.push_back(it); - it = (*it).previous; - } - string path = OnlyPath(from_file); Path p(path); @@ -355,65 +568,72 @@ bool Converter::Convert(Buffer const * buffer, string const & from_file, string to_base = ChangeExtension(to_file, ""); string infile; string outfile = from_file; - for (vector< vector::iterator >::reverse_iterator rit = - S.rbegin(); rit != S.rend(); ++rit) { - it = *rit; - lyxerr << "Converting from " - << (*it).from << " to " << (*it).to << endl; + for (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 << "Converting from " + << conv.from << " to " << conv.to << endl; infile = outfile; - outfile = (*it).result_dir.empty() - ? ChangeExtension(from_file, (*it).to) - : AddName(subst((*it).result_dir, - "$$BaseName", from_base), - subst((*it).result_file, - "$$BaseName", OnlyFilename(from_base))); - - if ((*it).from == "tex" && - ( (*it).to == "dvi" || (*it).to == "pdf") ) { - lyxrc.pdf_mode = (*it).to == "pdf"; - lyxerr << "Running " << (*it).command << endl; + outfile = conv.result_dir.empty() + ? ChangeExtension(from_file, conv.To->extension()) + : AddName(subst(conv.result_dir, + token_base, from_base), + subst(conv.result_file, + token_base, OnlyFilename(from_base))); + + if (conv.latex) { run_latex = true; - if (!runLaTeX(buffer, (*it).command)) + string command = subst(conv.command, token_from, ""); + lyxerr << "Running " << command << endl; + if (!runLaTeX(buffer, command)) return false; } else { - if ((*it).need_aux && !run_latex + if (conv.need_aux && !run_latex && !latex_command.empty()) { lyxerr << "Running " << latex_command << " to update aux file"<< endl; runLaTeX(buffer, latex_command); } - string infile2 = ((*it).original_dir) + string infile2 = (conv.original_dir) ? infile : MakeRelPath(infile, path); - string outfile2 = ((*it).original_dir) + string outfile2 = (conv.original_dir) ? outfile : MakeRelPath(outfile, path); - string command = (*it).command; - command = subst(command, "$$FName", QuoteName(infile2)); - command = subst(command, "$$BaseName", QuoteName(from_base)); - command = subst(command, "$$OutName", QuoteName(outfile2)); + 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)); - if (!(*it).parselog.empty()) + if (!conv.parselog.empty()) command += " 2> " + QuoteName(infile2 + ".out"); - if ((*it).from == "dvi" && (*it).to == "ps") + if (conv.from == "dvi" && conv.to == "ps") command = add_options(command, dvips_options(buffer)); + else if (conv.from == "dvi" && prefixIs(conv.to, "pdf")) + command = add_options(command, + dvipdfm_options(buffer)); lyxerr << "Calling " << command << endl; - ShowMessage(buffer, _("Executing command:"), command); - + if (buffer) + ShowMessage(buffer, _("Executing command:"), command); + + Systemcalls::Starttype type = (dummy) + ? Systemcalls::SystemDontWait : Systemcalls::System; Systemcalls one; int res; - if ((*it).original_dir) { + if (conv.original_dir && buffer) { Path p(buffer->filepath); - res = one.startscript(Systemcalls::System, command); + res = one.startscript(type, command); } else - res = one.startscript(Systemcalls::System, command); + res = one.startscript(type, command); - if (!(*it).parselog.empty()) { + if (!conv.parselog.empty()) { string const logfile = infile2 + ".log"; - string const command2 = (*it).parselog + + string const command2 = conv.parselog + " < " + QuoteName(infile2 + ".out") + " > " + QuoteName(logfile); one.startscript(Systemcalls::System, command2); @@ -422,7 +642,7 @@ bool Converter::Convert(Buffer const * buffer, string const & from_file, } if (res) { - if ((*it).to == "Program") + if (conv.to == "program") WriteAlert(_("There were errors during the Build process."), _("You should try to fix them.")); else @@ -434,42 +654,107 @@ bool Converter::Convert(Buffer const * buffer, string const & from_file, } } - if (!(*it).result_dir.empty()) { - if (view_file) - *view_file = AddName(subst((*it).result_dir, - "$$BaseName", to_base), - subst((*it).result_file, - "$$BaseName", OnlyFilename(to_base))); + Converter const & conv = converterlist[edgepath.back()]; + if (conv.To->dummy()) + return true; + + + if (!conv.result_dir.empty()) { + to_file = AddName(subst(conv.result_dir, token_base, to_base), + subst(conv.result_file, + token_base, OnlyFilename(to_base))); if (from_base != to_base) { - string from = subst((*it).result_dir, - "$$BaseName", from_base); - string to = subst((*it).result_dir, - "$$BaseName", to_base); - return lyx::rename(from, to); + string from = subst(conv.result_dir, + token_base, from_base); + string to = subst(conv.result_dir, + token_base, to_base); + if (!lyx::rename(from, to)) { + WriteAlert(_("Error while trying to move directory:"), + from, ("to ") + to); + return false; + } + } + return true; + } else + return Move(outfile, to_file, conv.latex); +} + +// If from = /path/file.ext and to = /path2/file2.ext2 then this method +// moves each /path/file*.ext file to /path2/file2*.ext2' +bool Converters::Move(string const & from, string const & to, bool copy) +{ + if (from == to) + return true; + + bool no_errors = true; + string const path = OnlyPath(from); + string const base = OnlyFilename(ChangeExtension(from, "")); + string const to_base = ChangeExtension(to, ""); + string const to_extension = GetExtension(to); + + vector files = DirList(OnlyPath(from), GetExtension(from)); + for (vector::const_iterator it = files.begin(); + it != files.end(); ++it) + if (prefixIs(*it, base)) { + string from2 = path + *it; + string to2 = to_base + (*it).substr(base.length()); + to2 = ChangeExtension(to2, to_extension); + lyxerr << "moving " << from2 << " to " << to2 << endl; + bool moved = (copy) + ? lyx::copy(from2, to2) + : lyx::rename(from2, to2); + if (!moved && no_errors) { + WriteAlert(_("Error while trying to move file:"), + from2, _("to ") + to2); + no_errors = false; + } } + return no_errors; +} - } else if (outfile != to_file) - if ((*it).from == "tex" && - ( (*it).to == "dvi" || (*it).to == "pdf") ) - return lyx::copy(outfile, to_file); - else - return lyx::rename(outfile, to_file); +bool Converters::Convert(Buffer const * buffer, + string const & from_file, string const & to_file_base, + string const & from_format, string const & to_format) +{ + string to_file; + return Convert(buffer, from_file, to_file_base, from_format, to_format, + to_file); +} - return true; + + +void Converters::BuildGraph() +{ + vertices = vector(formats.size()); + visited.resize(formats.size()); + + for (ConverterList::iterator it = converterlist.begin(); + it != converterlist.end(); ++it) { + int const s = formats.GetNumber(it->from); + int const t = formats.GetNumber(it->to); + vertices[t].in_vertices.push_back(s); + vertices[s].out_vertices.push_back(t); + vertices[s].out_edges.push_back(it - converterlist.begin()); + } } -string const Converter::SplitFormat(string const & str, string & format) +bool Converters::FormatIsUsed(string const & format) { - string using_format = split(str, format, ':'); - if (format.empty()) - format = "dvi"; - return using_format; + for (ConverterList::const_iterator cit = converterlist.begin(); + cit != converterlist.end(); ++cit) + if (cit->from == format || cit->to == format) + return true; + return false; } -bool Converter::scanLog(Buffer const * buffer, string const & command, + +bool Converters::scanLog(Buffer const * buffer, string const & command, string const & filename) { + if (!buffer) + return false; + BufferView * bv = buffer->getUser(); bool need_redraw = false; if (bv) { @@ -491,14 +776,9 @@ bool Converter::scanLog(Buffer const * buffer, string const & command, bv->redraw(); bv->fitCursor(bv->text); } - if (result & LaTeX::NO_OUTPUT) { - string const s = _("The operation resulted in"); - string const t = _("an empty file."); - WriteAlert(_("Resulting file is empty"), s, t); - return false; - } AllowInput(bv); } + if ((result & LaTeX::ERRORS)) { int num_errors = latex.getNumErrors(); string s; @@ -516,20 +796,28 @@ bool Converter::scanLog(Buffer const * buffer, string const & command, WriteAlert(_("There were errors during running of ") + head, s, t); return false; + } else if (result & LaTeX::NO_OUTPUT) { + string const s = _("The operation resulted in"); + string const t = _("an empty file."); + WriteAlert(_("Resulting file is empty"), s, t); + return false; } return true; } -bool Converter::runLaTeX(Buffer const * buffer, string const & command) + +bool Converters::runLaTeX(Buffer const * buffer, string const & command) { - + if (!buffer) + return false; + BufferView * bv = buffer->getUser(); string name = buffer->getLatexName(); bool need_redraw = false; if (bv) { ProhibitInput(bv); - bv->owner()->getMiniBuffer()->Set(_("Running LaTeX...")); + bv->owner()->message(_("Running LaTeX...")); // Remove all error insets need_redraw = bv->removeAutoInsets(); } @@ -539,7 +827,7 @@ bool Converter::runLaTeX(Buffer const * buffer, string const & command) TeXErrors terr; LaTeX latex(command, name, buffer->filepath); int result = latex.run(terr, - bv ? bv->owner()->getMiniBuffer() : 0); + bv ? bv->owner()->getLyXFunc() : 0); if (bv) { @@ -555,10 +843,6 @@ bool Converter::runLaTeX(Buffer const * buffer, string const & command) bv->redraw(); bv->fitCursor(bv->text); } - } else if (result & LaTeX::NO_OUTPUT) { - string const s = _("The operation resulted in"); - string const t = _("an empty file."); - WriteAlert(_("Resulting file is empty"), s, t); } // check return value from latex.run(). @@ -579,6 +863,10 @@ bool Converter::runLaTeX(Buffer const * buffer, string const & command) } WriteAlert(_("There were errors during the LaTeX run."), s, t); + } else if (result & LaTeX::NO_OUTPUT) { + string const s = _("The operation resulted in"); + string const t = _("an empty file."); + WriteAlert(_("Resulting file is empty"), s, t); } if (bv) @@ -594,7 +882,7 @@ bool Converter::runLaTeX(Buffer const * buffer, string const & command) } -string const Converter::dvi_papersize(Buffer const * buffer) +string const Converters::papersize(Buffer const * buffer) { char real_papersize = buffer->params.papersize; if (real_papersize == BufferParams::PAPER_DEFAULT) @@ -615,14 +903,17 @@ string const Converter::dvi_papersize(Buffer const * buffer) return "legal"; case BufferParams::PAPER_USLETTER: default: - return "us"; + return "letter"; } } -string const Converter::dvips_options(Buffer const * buffer) +string const Converters::dvips_options(Buffer const * buffer) { string result; + if (!buffer) + return result; + if (buffer->params.use_geometry && buffer->params.papersize2 == BufferParams::VM_PAPER_CUSTOM && !lyxrc.print_paper_dimension_flag.empty() @@ -633,9 +924,7 @@ string const Converter::dvips_options(Buffer const * buffer) result += ' ' + buffer->params.paperwidth; result += ',' + buffer->params.paperheight; } else { - string paper_option = dvi_papersize(buffer); - if (paper_option == "us") - paper_option = "letter"; + string paper_option = papersize(buffer); if (paper_option != "letter" || buffer->params.orientation != BufferParams::ORIENTATION_LANDSCAPE) { // dvips won't accept -t letter -t landscape. In all other @@ -644,12 +933,39 @@ string const Converter::dvips_options(Buffer const * buffer) result += ' ' + paper_option; } } - if (buffer->params.orientation == BufferParams::ORIENTATION_LANDSCAPE) + if (buffer->params.orientation == BufferParams::ORIENTATION_LANDSCAPE && + buffer->params.papersize2 != BufferParams::VM_PAPER_CUSTOM) result += ' ' + lyxrc.print_landscape_flag; return result; } -void Converter::init() + +string const Converters::dvipdfm_options(Buffer const * buffer) { - Formats::Add("txt"); + string result; + if (!buffer) + return result; + + if (buffer->params.papersize2 != BufferParams::VM_PAPER_CUSTOM) { + string paper_size = papersize(buffer); + if (paper_size != "b5" && paper_size != "foolscap") + result = "-p "+ paper_size; + + if (buffer->params.orientation == BufferParams::ORIENTATION_LANDSCAPE) + result += " -l"; + } + + return result; } + + +vector Converters::vertices; + + +/// The global instance +Formats formats; +Converters converters; + +// The global copy after reading lyxrc.defaults +Formats system_formats; +Converters system_converters;