anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug #9096: Load all the files specified on the command line, and then dispatch whatever commands we are given to those Buffers.

Browse Source 
Original patch due to Benjamin Piwowarski. Updated for 2.2 by Richard Heck.
This commit is contained in:
Richard Heck 2015-11-07 17:04:32 -05:00
parent c01a533acc
commit a8f57334e2
2 changed files with 39 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
src/LyX.cpp
View File

@ -472,21 +472,51 @@ int LyX::execWithoutGui(int & argc, char * argv[])
return exit_status; return exit_status;
} }
// this is correct, since return values are inverted. // Used to keep track of which buffers were explicitly loaded by user request.
exit_status = !loadFiles(); // This is necessary because master and child document buffers are loaded, even
// if they were not named on the command line. We do not want to dispatch to
// those.
vector<Buffer *> command_line_buffers;
if (pimpl_->batch_commands.empty() || pimpl_->buffer_list_.empty()) { // Load the files specified on the command line
vector<string>::const_iterator it = pimpl_->files_to_load_.begin();
vector<string>::const_iterator end = pimpl_->files_to_load_.end();
for (; it != end; ++it) {
// get absolute path of file and add ".lyx" to the filename if necessary
FileName fname = fileSearch(string(), os::internal_path(*it), "lyx",
may_not_exist);
if (fname.empty())
continue;
Buffer * buf = pimpl_->buffer_list_.newBuffer(fname.absFileName());
LYXERR(Debug::FILES, "Loading " << fname);
if (buf->loadLyXFile() == Buffer::ReadSuccess) {
ErrorList const & el = buf->errorList("Parse");
if (!el.empty())
for_each(el.begin(), el.end(),
bind(&LyX::printError, this, _1));
command_line_buffers.push_back(buf);
} else {
pimpl_->buffer_list_.release(buf);
docstring const error_message =
bformat(_("LyX failed to load the following file: %1$s"),
from_utf8(fname.absFileName()));
lyxerr << to_utf8(error_message) << endl;
exit_status = 1; // failed
}
}
if (exit_status || pimpl_->batch_commands.empty() || pimpl_->buffer_list_.empty()) {
prepareExit(); prepareExit();
return exit_status; return exit_status;
} }
BufferList::iterator begin = pimpl_->buffer_list_.begin(); // Iterate through the buffers that were specified on the command line
bool final_success = false; bool final_success = false;
for (BufferList::iterator I = begin; I != pimpl_->buffer_list_.end(); ++I) { vector<Buffer *>::iterator buf_it = command_line_buffers.begin();
Buffer * buf = *I; for (; buf_it != command_line_buffers.end(); ++buf_it) {
if (buf != buf->masterBuffer()) Buffer * buf = *buf_it;
continue;
vector<string>::const_iterator bcit = pimpl_->batch_commands.begin(); vector<string>::const_iterator bcit = pimpl_->batch_commands.begin();
vector<string>::const_iterator bcend = pimpl_->batch_commands.end(); vector<string>::const_iterator bcend = pimpl_->batch_commands.end();
DispatchResult dr; DispatchResult dr;
@ -501,42 +531,6 @@ int LyX::execWithoutGui(int & argc, char * argv[])
} }
bool LyX::loadFiles()
{
LATTEST(!use_gui);
bool success = true;
vector<string>::const_iterator it = pimpl_->files_to_load_.begin();
vector<string>::const_iterator end = pimpl_->files_to_load_.end();
for (; it != end; ++it) {
// get absolute path of file and add ".lyx" to
// the filename if necessary
FileName fname = fileSearch(string(), os::internal_path(*it), "lyx",
may_not_exist);
if (fname.empty())
continue;
Buffer * buf = pimpl_->buffer_list_.newBuffer(fname.absFileName());
if (buf->loadLyXFile() == Buffer::ReadSuccess) {
ErrorList const & el = buf->errorList("Parse");
if (!el.empty())
for_each(el.begin(), el.end(),
bind(&LyX::printError, this, _1));
}
else {
pimpl_->buffer_list_.release(buf);
docstring const error_message =
bformat(_("LyX failed to load the following file: %1$s"),
from_utf8(fname.absFileName()));
lyxerr << to_utf8(error_message) << endl;
success = false;
}
}
return success;
}
void execBatchCommands() void execBatchCommands()
{ {
LAPPERR(singleton_); LAPPERR(singleton_);

7
src/LyX.h
View File

@ -91,13 +91,6 @@ private:
/// Execute batch commands if available. /// Execute batch commands if available.
void execCommands(); void execCommands();
/// Load files passed at command-line.
/// return true on success false if we encounter an error
/**
This method is used only in non-GUI mode.
*/
bool loadFiles();
/// initial LyX set up /// initial LyX set up
bool init(); bool init();
/** Check for the existence of the user's support directory and, /** Check for the existence of the user's support directory and,