/* This file is part of
- * ======================================================
- *
+ * ======================================================
+ *
* LyX, The Document Processor
- *
+ *
* Copyright 1995 Matthias Ettrich
* Copyright 1995-2001 The LyX Team.
*
{
if (name_.empty())
return false;
- return isdigit(name_[name_.length() - 1]);
+ return isdigit(name_[name_.length() - 1]);
}
}
-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(),
lyx::compare_memfun(&Format::name, name));
if (it == formatlist.end())
void Formats::erase(string const & name)
{
- FormatList::iterator it =
+ FormatList::iterator it =
find_if(formatlist.begin(), formatlist.end(),
lyx::compare_memfun(&Format::name, name));
if (it != formatlist.end())
if (paper_size == "letter")
paper_size = "us";
command += " " + paper_size;
- if (buffer->params.orientation
+ if (buffer->params.orientation
== BufferParams::ORIENTATION_LANDSCAPE)
command += 'r';
- }
+ }
command += " " + QuoteName(OnlyFilename((filename)));
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.
// 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).
+// a list (instead of a vector), but this will cause other problems).
void Converters::update(Formats const & formats)
{
ConverterList::iterator it = converterlist_.begin();
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) {
found = true;
break;
}
-
+
vector<int>::const_iterator beg =
vertices_[i].out_vertices.begin();
vector<int>::const_iterator cit = beg;
} else {
if (conv.need_aux && !run_latex
&& !latex_command_.empty()) {
- lyxerr[Debug::FILES]
- << "Running " << latex_command_
+ lyxerr[Debug::FILES]
+ << "Running " << latex_command_
<< " to update aux file"<< endl;
runLaTeX(buffer, latex_command_);
}
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(Systemcall::Wait, command2);
}
}
return true;
- } else
+ } 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)
{
string from2 = path + *it;
string to2 = to_base + it->substr(base.length());
to2 = ChangeExtension(to2, to_extension);
- lyxerr[Debug::FILES] << "moving " << from2
+ lyxerr[Debug::FILES] << "moving " << from2
<< " to " << to2 << endl;
bool moved = (copy)
? lyx::copy(from2, to2)
return false;
BufferView * bv = buffer->getUser();
- bool need_redraw = false;
if (bv) {
bv->owner()->prohibitInput();
- // Remove all error insets
- need_redraw = bv->removeAutoInsets();
+ // 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();
}
return false;
BufferView * bv = buffer->getUser();
- string name = buffer->getLatexName();
- bool need_redraw = false;
if (bv) {
bv->owner()->prohibitInput();
bv->owner()->message(_("Running LaTeX..."));
- // Remove all error insets
- need_redraw = bv->removeAutoInsets();
+ // all the autoinsets have already been removed
}
-
- // do the LaTex run(s)
- TeXErrors terr;
+ // do the LaTeX run(s)
+ string name = buffer->getLatexName();
LaTeX latex(command, name, buffer->filePath());
+ TeXErrors terr;
int result = latex.run(terr,
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();
}
if (bv)
bv->owner()->allowInput();
-
- int const ERROR_MASK =
+
+ int const ERROR_MASK =
LaTeX::NO_LOGFILE |
LaTeX::ERRORS |
LaTeX::NO_OUTPUT;
-
+
return (result & ERROR_MASK) == 0;
}
projects / lyx.git / blobdiff