/* This file is part of
- * ======================================================
- *
+ * ======================================================
+ *
* LyX, The Document Processor
- *
+ *
* Copyright 1995 Matthias Ettrich
- * Copyright 1995-2000 The LyX Team.
+ * Copyright 1995-2001 The LyX Team.
*
* ====================================================== */
#pragma implementation
#endif
-#include <cctype>
-
#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 "gettext.h"
+#include "BufferView.h"
+#include "debug.h"
+
+#include "frontends/Alert.h"
+#include "frontends/LyXView.h"
+
+#include "support/filetools.h"
#include "support/lyxfunctional.h"
+#include "support/path.h"
+#include "support/systemcall.h"
+
+#include "BoostFormat.h"
+
+#include <cctype>
+
+#ifndef CXX_GLOBAL_CSTD
+using std::isdigit;
+#endif
using std::vector;
using std::queue;
string const token_from("$$i");
string const token_base("$$b");
string const token_to("$$o");
+string const token_path("$$p");
//////////////////////////////////////////////////////////////////////////////
}
-bool Format::IsChildFormat() const
+bool Format::isChildFormat() const
{
if (name_.empty())
return false;
- return isdigit(name_[name_.length() - 1]);
+ return isdigit(name_[name_.length() - 1]);
}
-string const Format::ParentFormat() const
+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
+Format const * Formats::getFormat(string const & name) const
{
FormatList::const_iterator cit =
find_if(formatlist.begin(), formatlist.end(),
- compare_memfun(&Format::name, name));
+ lyx::compare_memfun(&Format::name, name));
if (cit != formatlist.end())
return &(*cit);
else
}
-int Formats::GetNumber(string const & name) const
+int Formats::getNumber(string const & name) const
{
FormatList::const_iterator cit =
find_if(formatlist.begin(), formatlist.end(),
- compare_memfun(&Format::name, name));
+ lyx::compare_memfun(&Format::name, name));
if (cit != formatlist.end())
return cit - formatlist.begin();
else
}
-void Formats::Add(string const & name)
+void Formats::add(string const & name)
{
- if (!GetFormat(name))
- Add(name, name, name, string());
+ if (!getFormat(name))
+ add(name, name, name, string());
}
-void Formats::Add(string const & name, string const & extension,
+void Formats::add(string const & name, string const & extension,
string const & prettyname, string const & shortcut)
{
- FormatList::iterator it =
+ FormatList::iterator it =
find_if(formatlist.begin(), formatlist.end(),
- compare_memfun(&Format::name, name));
+ lyx::compare_memfun(&Format::name, name));
if (it == formatlist.end())
formatlist.push_back(Format(name, extension, prettyname,
shortcut, ""));
}
-void Formats::Delete(string const & name)
+void Formats::erase(string const & name)
{
- FormatList::iterator it =
+ FormatList::iterator it =
find_if(formatlist.begin(), formatlist.end(),
- compare_memfun(&Format::name, name));
+ lyx::compare_memfun(&Format::name, name));
if (it != formatlist.end())
formatlist.erase(it);
}
-void Formats::Sort()
+void Formats::sort()
{
- sort(formatlist.begin(), formatlist.end());
+ std::sort(formatlist.begin(), formatlist.end());
}
-void Formats::SetViewer(string const & name, string const & command)
+void Formats::setViewer(string const & name, string const & command)
{
- Add(name);
+ add(name);
FormatList::iterator it =
find_if(formatlist.begin(), formatlist.end(),
- compare_memfun(&Format::name, name));
+ 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;
- Format const * format = GetFormat(format_name);
+ Format const * format = getFormat(format_name);
if (format && format->viewer().empty() &&
- format->IsChildFormat())
- format = GetFormat(format->ParentFormat());
+ format->isChildFormat())
+ format = getFormat(format->parentFormat());
if (!format || format->viewer().empty()) {
- WriteAlert(_("Can not view file"),
- _("No information for viewing ")
- + PrettyName(format_name));
+#if USE_BOOST_FORMAT
+ Alert::alert(_("Cannot view file"),
+ boost::io::str(boost::format(_("No information for viewing %1$s"))
+ % prettyName(format_name)));
+#else
+ Alert::alert(_("Cannot view file"),
+ _("No information for viewing ")
+ + prettyName(format_name));
+#endif
return false;
}
if (format_name == "dvi" &&
!lyxrc.view_dvi_paper_option.empty()) {
- command += " " + lyxrc.view_dvi_paper_option;
+ 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
+ command += ' ' + paper_size;
+ if (buffer->params.orientation
== BufferParams::ORIENTATION_LANDSCAPE)
command += 'r';
- }
+ }
+
+ if (!contains(command, token_from))
+ command += ' ' + token_from;
- command += " " + QuoteName(OnlyFilename((filename)));
+ command = subst(command, token_from,
+ QuoteName(OnlyFilename(filename)));
+ command = subst(command, token_path, QuoteName(OnlyPath(filename)));
- lyxerr << "Executing command: " << command << endl;
+ lyxerr[Debug::FILES] << "Executing command: " << command << endl;
ShowMessage(buffer, _("Executing command:"), command);
Path p(OnlyPath(filename));
- Systemcalls one;
- int const res = one.startscript(Systemcalls::SystemDontWait, command);
+ Systemcall one;
+ int const res = one.startscript(Systemcall::DontWait, command);
if (res) {
- WriteAlert(_("Can not view file"),
+ Alert::alert(_("Cannot view file"),
_("Error while executing"),
command.substr(0, 50));
return false;
}
-string const Formats::PrettyName(string const & name) const
+string const Formats::prettyName(string const & name) const
{
- Format const * format = GetFormat(name);
+ Format const * format = getFormat(name);
if (format)
return format->prettyname();
else
}
-string const Formats::Extension(string const & name) const
+string const Formats::extension(string const & name) const
{
- Format const * format = GetFormat(name);
+ Format const * format = getFormat(name);
if (format)
return format->extension();
else
//////////////////////////////////////////////////////////////////////////////
-void Converter::ReadFlags()
+void Converter::readFlags()
{
string flag_list(flags);
while (!flag_list.empty()) {
parselog = flag_value;
}
if (!result_dir.empty() && result_file.empty())
- result_file = "index." + formats.Extension(to);
+ 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());
+ // 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_no_case(a.To->prettyname(), b.To->prettyname())
+ return compare_ascii_no_case(a.To->prettyname(), b.To->prettyname())
< 0;
else
return i < 0;
};
-Converter const * Converters::GetConverter(string const & from,
+Converter const * Converters::getConverter(string const & from,
string const & to)
{
ConverterList::const_iterator cit =
- find_if(converterlist.begin(), converterlist.end(),
+ find_if(converterlist_.begin(), converterlist_.end(),
compare_Converter(from, to));
- if (cit != converterlist.end())
+ if (cit != converterlist_.end())
return &(*cit);
else
return 0;
}
-int Converters::GetNumber(string const & from, string const & to)
+int Converters::getNumber(string const & from, string const & to)
{
ConverterList::const_iterator cit =
- find_if(converterlist.begin(), converterlist.end(),
+ find_if(converterlist_.begin(), converterlist_.end(),
compare_Converter(from, to));
- if (cit != converterlist.end())
- return cit - converterlist.begin();
+ if (cit != converterlist_.end())
+ return cit - converterlist_.begin();
else
return -1;
}
-void Converters::Add(string const & from, string const & to,
+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(),
+ 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] == '*') {
+ 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, "");
+ 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 {
+ if (it == converterlist_.end()) {
+ converterlist_.push_back(converter);
+ } else {
converter.From = it->From;
converter.To = it->To;
*it = converter;
}
-void Converters::Delete(string const & from, string const & to)
+void Converters::erase(string const & from, string const & to)
{
- ConverterList::iterator it = find_if(converterlist.begin(),
- converterlist.end(),
+ ConverterList::iterator it = find_if(converterlist_.begin(),
+ converterlist_.end(),
compare_Converter(from, to));
- if (it != converterlist.end())
- converterlist.erase(it);
+ 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
+// 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)
+// 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);
+ ConverterList::iterator it = converterlist_.begin();
+ ConverterList::iterator end = converterlist_.end();
+ for (; it != 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)
+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);
+ 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()
+void Converters::sort()
{
- sort(converterlist.begin(), converterlist.end());
+ std::sort(converterlist_.begin(), converterlist_.end());
}
-int Converters::BFS_init(string const & start, bool clear_visited)
+int Converters::bfs_init(string const & start, bool clear_visited)
{
- int const s = formats.GetNumber(start);
+ int const s = formats.getNumber(start);
if (s < 0)
return s;
- Q = queue<int>();
+ Q_ = queue<int>();
if (clear_visited)
- fill(visited.begin(), visited.end(), false);
- if (visited[s] == false) {
- Q.push(s);
- visited[s] = true;
+ fill(visited_.begin(), visited_.end(), false);
+ if (visited_[s] == false) {
+ Q_.push(s);
+ visited_[s] = true;
}
return s;
}
vector<Format const *> const
-Converters::GetReachableTo(string const & target, bool clear_visited)
+Converters::getReachableTo(string const & target, bool clear_visited)
{
vector<Format const *> result;
- int const s = BFS_init(target, clear_visited);
+ int const s = bfs_init(target, clear_visited);
if (s < 0)
return result;
- while (!Q.empty()) {
- int const i = Q.front();
- Q.pop();
- if (i != s || target != "lyx")
- result.push_back(&formats.Get(i));
- for (vector<int>::iterator it = vertices[i].in_vertices.begin();
- it != vertices[i].in_vertices.end(); ++it)
- if (!visited[*it]) {
- visited[*it] = true;
- Q.push(*it);
+ while (!Q_.empty()) {
+ int const i = Q_.front();
+ Q_.pop();
+ if (i != s || target != "lyx") {
+ result.push_back(&formats.get(i));
+ }
+
+ vector<int>::iterator it = vertices_[i].in_vertices.begin();
+ vector<int>::iterator end = vertices_[i].in_vertices.end();
+ for (; it != end; ++it) {
+ if (!visited_[*it]) {
+ visited_[*it] = true;
+ Q_.push(*it);
}
+ }
}
return result;
vector<Format const *> const
-Converters::GetReachable(string const & from, bool only_viewable,
+Converters::getReachable(string const & from, bool only_viewable,
bool clear_visited)
{
vector<Format const *> result;
- if (BFS_init(from, clear_visited) < 0)
+ if (bfs_init(from, clear_visited) < 0)
return result;
- while (!Q.empty()) {
- int const i = Q.front();
- Q.pop();
- Format const & format = formats.Get(i);
+ while (!Q_.empty()) {
+ int const i = Q_.front();
+ Q_.pop();
+ Format const & format = formats.get(i);
if (format.name() == "lyx")
continue;
if (!only_viewable || !format.viewer().empty() ||
- format.IsChildFormat())
+ format.isChildFormat())
result.push_back(&format);
- for (vector<int>::iterator it = vertices[i].out_vertices.begin();
- it != vertices[i].out_vertices.end(); ++it)
- if (!visited[*it]) {
- visited[*it] = true;
- Q.push(*it);
+
+ vector<int>::const_iterator cit =
+ vertices_[i].out_vertices.begin();
+ vector<int>::const_iterator end =
+ vertices_[i].out_vertices.end();
+ for (; cit != end; ++cit)
+ if (!visited_[*cit]) {
+ visited_[*cit] = true;
+ Q_.push(*cit);
}
}
}
-bool Converters::IsReachable(string const & from, string const & to)
+bool Converters::isReachable(string const & from, string const & to)
{
if (from == to)
return true;
- int const s = BFS_init(from);
- int const t = formats.GetNumber(to);
+ int const s = bfs_init(from);
+ int const t = formats.getNumber(to);
if (s < 0 || t < 0)
return false;
- while (!Q.empty()) {
- int const i = Q.front();
- Q.pop();
+ while (!Q_.empty()) {
+ int const i = Q_.front();
+ Q_.pop();
if (i == t)
return true;
- for (vector<int>::iterator it = vertices[i].out_vertices.begin();
- it != vertices[i].out_vertices.end(); ++it)
- if (!visited[*it]) {
- visited[*it] = true;
- Q.push(*it);
+
+ vector<int>::const_iterator cit =
+ vertices_[i].out_vertices.begin();
+ vector<int>::const_iterator end =
+ vertices_[i].out_vertices.end();
+ for (; cit != end; ++cit) {
+ if (!visited_[*cit]) {
+ visited_[*cit] = true;
+ Q_.push(*cit);
}
+ }
}
return false;
Converters::EdgePath const
-Converters::GetPath(string const & from, string const & to)
+Converters::getPath(string const & from, string const & to)
{
EdgePath path;
if (from == to)
return path;
- int const s = BFS_init(from);
- int t = formats.GetNumber(to);
+ int const s = bfs_init(from);
+ int t = formats.getNumber(to);
if (s < 0 || t < 0)
return path;
vector<int> prev_vertex(formats.size());
bool found = false;
- while (!Q.empty()) {
- int const i = Q.front();
- Q.pop();
+ while (!Q_.empty()) {
+ int const i = Q_.front();
+ Q_.pop();
if (i == t) {
found = true;
break;
}
- for (vector<int>::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];
+
+ vector<int>::const_iterator beg =
+ vertices_[i].out_vertices.begin();
+ vector<int>::const_iterator cit = beg;
+ vector<int>::const_iterator end =
+ vertices_[i].out_vertices.end();
+ for (; cit != end; ++cit)
+ if (!visited_[*cit]) {
+ int const j = *cit;
+ visited_[j] = true;
+ Q_.push(j);
+ int const k = cit - beg;
+ prev_edge[j] = vertices_[i].out_edges[k];
prev_vertex[j] = i;
}
}
}
-bool Converters::UsePdflatex(EdgePath const & path)
+bool Converters::usePdflatex(EdgePath const & path)
{
for (EdgePath::const_iterator cit = path.begin();
cit != path.end(); ++cit) {
- Converter const & conv = converterlist[*cit];
+ Converter const & conv = converterlist_[*cit];
if (conv.latex)
return contains(conv.to, "pdf");
}
}
-bool Converters::Convert(Buffer const * buffer,
+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));
+ formats.extension(to_format));
if (from_format == to_format)
- return Move(from_file, to_file, false);
+ return move(from_file, to_file, false);
- EdgePath edgepath = GetPath(from_format, to_format);
+ 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));
return false;
}
string outfile = from_file;
for (EdgePath::const_iterator cit = edgepath.begin();
cit != edgepath.end(); ++cit) {
- Converter const & conv = converterlist[*cit];
+ Converter const & conv = converterlist_[*cit];
bool dummy = conv.To->dummy() && conv.to != "program";
if (!dummy)
- lyxerr << "Converting from "
+ lyxerr[Debug::FILES] << "Converting from "
<< conv.from << " to " << conv.to << endl;
infile = outfile;
outfile = conv.result_dir.empty()
subst(conv.result_file,
token_base, OnlyFilename(from_base)));
+ // if input and output files are equal, we use a
+ // temporary file as intermediary (JMarc)
+ string real_outfile;
+ if (outfile == infile) {
+ real_outfile = infile;
+ outfile = AddName(buffer->tmppath, "tmpfile.out");
+ }
+
if (conv.latex) {
run_latex = true;
string command = subst(conv.command, token_from, "");
- lyxerr << "Running " << command << endl;
+ lyxerr[Debug::FILES] << "Running " << command << endl;
if (!runLaTeX(buffer, command))
return false;
} else {
if (conv.need_aux && !run_latex
- && !latex_command.empty()) {
- lyxerr << "Running " << latex_command
- << " to update aux file"<< endl;
- runLaTeX(buffer, latex_command);
+ && !latex_command_.empty()) {
+ lyxerr[Debug::FILES]
+ << "Running " << latex_command_
+ << " to update aux file"<< endl;
+ runLaTeX(buffer, latex_command_);
}
string infile2 = (conv.original_dir)
command = subst(command, token_from, QuoteName(infile2));
command = subst(command, token_base, QuoteName(from_base));
command = subst(command, token_to, QuoteName(outfile2));
+ command = LibScriptSearch(command);
if (!conv.parselog.empty())
command += " 2> " + QuoteName(infile2 + ".out");
command = add_options(command,
dvipdfm_options(buffer));
- lyxerr << "Calling " << command << endl;
+ lyxerr[Debug::FILES] << "Calling " << command << endl;
if (buffer)
ShowMessage(buffer, _("Executing command:"), command);
- Systemcalls::Starttype type = (dummy)
- ? Systemcalls::SystemDontWait : Systemcalls::System;
- Systemcalls one;
+ Systemcall::Starttype type = (dummy)
+ ? Systemcall::DontWait : Systemcall::Wait;
+ Systemcall one;
int res;
if (conv.original_dir && buffer) {
- Path p(buffer->filepath);
+ Path p(buffer->filePath());
res = one.startscript(type, command);
} else
res = one.startscript(type, command);
+ if (!real_outfile.empty()) {
+ if (!lyx::rename(outfile, real_outfile))
+ res = -1;
+ else
+ lyxerr[Debug::FILES]
+ << "renaming file " << outfile
+ << " to " << real_outfile
+ << endl;
+ }
+
if (!conv.parselog.empty()) {
string const logfile = infile2 + ".log";
- string const command2 = conv.parselog +
+ string const script = LibScriptSearch(conv.parselog);
+ string const command2 = script +
" < " + QuoteName(infile2 + ".out") +
" > " + QuoteName(logfile);
- one.startscript(Systemcalls::System, command2);
+ one.startscript(Systemcall::Wait, command2);
if (!scanLog(buffer, command, logfile))
return false;
}
if (res) {
if (conv.to == "program")
- WriteAlert(_("There were errors during the Build process."),
+ Alert::alert(_("There were errors during the Build process."),
_("You should try to fix them."));
else
- WriteAlert(_("Can not convert file"),
- "Error while executing",
+ Alert::alert(_("Cannot convert file"),
+ _("Error while executing"),
command.substr(0, 50));
return false;
}
}
}
- Converter const & conv = converterlist[edgepath.back()];
+ Converter const & conv = converterlist_[edgepath.back()];
if (conv.To->dummy())
return true;
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);
+#if USE_BOOST_FORMAT
+ Alert::alert(_("Error while trying to move directory:"),
+ from, boost::io::str(boost::format(_("to %1$s")) % to));
+#else
+ Alert::alert(_("Error while trying to move directory:"),
+ from, _("to ") + to);
+#endif
return false;
}
}
return true;
- } else
- return Move(outfile, to_file, conv.latex);
+ } else
+ return move(outfile, to_file, conv.latex);
}
-// If from = /path/file.ext and to = /path2/file2.ext2 then this method
+
+// 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)
+bool Converters::move(string const & from, string const & to, bool copy)
{
if (from == to)
return true;
for (vector<string>::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());
+ string const 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)
+ lyxerr[Debug::FILES] << "moving " << from2
+ << " to " << to2 << endl;
+ bool const moved = (copy)
? lyx::copy(from2, to2)
: lyx::rename(from2, to2);
if (!moved && no_errors) {
- WriteAlert(_("Error while trying to move file:"),
+#if USE_BOOST_FORMAT
+ Alert::alert(_("Error while trying to move file:"),
+ from2, boost::io::str(boost::format(_("to %1$s")) % to2));
+#else
+ Alert::alert(_("Error while trying to move file:"),
from2, _("to ") + to2);
+#endif
no_errors = false;
}
}
return no_errors;
}
-bool Converters::Convert(Buffer const * buffer,
+
+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,
+ return convert(buffer, from_file, to_file_base, from_format, to_format,
to_file);
}
-
-void Converters::BuildGraph()
+void Converters::buildGraph()
{
- vertices = vector<Vertex>(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());
+ vertices_ = vector<Vertex>(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());
}
}
-bool Converters::FormatIsUsed(string const & format)
+bool Converters::formatIsUsed(string const & format)
{
- for (ConverterList::const_iterator cit = converterlist.begin();
- cit != converterlist.end(); ++cit)
+ ConverterList::const_iterator cit = converterlist_.begin();
+ ConverterList::const_iterator end = converterlist_.end();
+ for (; cit != end; ++cit) {
if (cit->from == format || cit->to == format)
return true;
+ }
return false;
}
return false;
BufferView * bv = buffer->getUser();
- bool need_redraw = false;
if (bv) {
- ProhibitInput(bv);
- // Remove all error insets
- need_redraw = bv->removeAutoInsets();
+ bv->owner()->prohibitInput();
+ // all error insets should have been removed by now
}
LaTeX latex("", filename, "");
if ((result & LaTeX::ERRORS)) {
// Insert all errors as errors boxes
bv->insertErrors(terr);
- need_redraw = true;
- }
- if (need_redraw) {
- bv->redraw();
- bv->fitCursor(bv->text);
+#warning repaint() or update() or nothing ?
+ bv->repaint();
+ bv->fitCursor();
}
- AllowInput(bv);
+ bv->owner()->allowInput();
}
if ((result & LaTeX::ERRORS)) {
}
string head;
split(command, head, ' ');
- WriteAlert(_("There were errors during running of ") + head,
+#if USE_BOOST_FORMAT
+ Alert::alert(boost::io::str(boost::format(_("There were errors during running of %1$s")) % head),
s, t);
+#else
+ Alert::alert(_("There were errors during running of ") + head,
+ s, t);
+#endif
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);
+ Alert::alert(_("Resulting file is empty"), s, t);
return false;
}
return true;
return false;
BufferView * bv = buffer->getUser();
- string name = buffer->getLatexName();
- bool need_redraw = false;
if (bv) {
- ProhibitInput(bv);
- bv->owner()->getMiniBuffer()->Set(_("Running LaTeX..."));
- // Remove all error insets
- need_redraw = bv->removeAutoInsets();
+ bv->owner()->prohibitInput();
+ bv->owner()->message(_("Running LaTeX..."));
+ // all the autoinsets have already been removed
}
-
- // do the LaTex run(s)
+ // do the LaTeX run(s)
+ string name = buffer->getLatexName();
+ LaTeX latex(command, name, buffer->filePath());
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) {
if ((result & LaTeX::ERRORS)) {
// Insert all errors as errors boxes
bv->insertErrors(terr);
- need_redraw = true;
- }
-
- // if we removed error insets before we ran LaTeX or if we inserted
- // error insets after we ran LaTeX this must be run:
- if (need_redraw) {
- bv->redraw();
- bv->fitCursor(bv->text);
+#warning repaint() or update() or nothing ?
+ bv->repaint();
+ bv->fitCursor();
}
}
// check return value from latex.run().
if ((result & LaTeX::NO_LOGFILE)) {
- WriteAlert(_("LaTeX did not work!"),
+ Alert::alert(_("LaTeX did not work!"),
_("Missing log file:"), name);
} else if ((result & LaTeX::ERRORS)) {
int num_errors = latex.getNumErrors();
s += _(" errors detected.");
t = _("You should try to fix them.");
}
- WriteAlert(_("There were errors during the LaTeX run."),
+ Alert::alert(_("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);
+ Alert::alert(_("Resulting file is empty"), s, t);
}
if (bv)
- AllowInput(bv);
-
- int const ERROR_MASK =
+ bv->owner()->allowInput();
+
+ int const ERROR_MASK =
LaTeX::NO_LOGFILE |
LaTeX::ERRORS |
LaTeX::NO_OUTPUT;
-
+
return (result & ERROR_MASK) == 0;
}
result += ' ' + buffer->params.paperwidth;
result += ',' + buffer->params.paperheight;
} else {
- string paper_option = papersize(buffer);
+ string const 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
return result;
if (buffer->params.papersize2 != BufferParams::VM_PAPER_CUSTOM) {
- string paper_size = papersize(buffer);
+ string const paper_size = papersize(buffer);
if (paper_size != "b5" && paper_size != "foolscap")
result = "-p "+ paper_size;
}
-vector<Converters::Vertex> Converters::vertices;
+vector<Converters::Vertex> Converters::vertices_;
/// The global instance