mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-28 04:17:43 +00:00
c5a4f61f33
I had no choice but to use string for the map key. This is
because the only information that could be passed to the controller is a
string.
With this new architecture, persistent error lists are now possible.
* Buffer
- errorList_, addError(), : deleted
- std::map<std::string, ErrorList> errorLists_ : new member
- errorList(std::string const & type): associated accessors
* buffer_funcs.C
- bufferErrors(Buffer const & buf, TeXErrors const & terr): now needs a third errorList argument
- bufferErrors(Buffer const & buf, ErrorList const & el): deleted.
* Converter
- convert(): now needs an ErrorList argument instead of filling the Buffer errorList member directly.
- runLaTeX(): ditto
- scanLog(): ditto
* CutAndPaste.C
- pasteParagraphList(): ditto
- pasteSelection(): ditto
* lyxtext.h/text.C
- readParagraph(): ditto
- LyXText::read(): ditto
* importer:
- Importer::Import(): ditto
* BufferView_pimpl.C
- loadLyXFile(): send the Buffer::errors() signal instead of calling LyXView::showErrorList() directly.
* exporter.C
- Export(): send the Buffer::errors() signal instead of calling LyXView::showErrorList() directly in lyxfunc.C
* ControlErrorList.C
- initialiseParams(): translation operation transfered here from LyXView::showErrorList().
* LyXView.C
- LoadLyXFile(): add a showErrorList("Parse") call.
- showErrorList(): simplified due to code transferred to the ControlErrorList.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14652 a592a061-630c-0410-9148-cb99ea01b6c8
117 lines
2.8 KiB
C
117 lines
2.8 KiB
C
/**
|
|
* \file importer.C
|
|
* This file is part of LyX, the document processor.
|
|
* Licence details can be found in the file COPYING.
|
|
*
|
|
* \author unknown
|
|
* \author Lars Gullik Bjønnes
|
|
* \author Jean-Marc Lasgouttes
|
|
*
|
|
* Full author contact details are available in file CREDITS.
|
|
*/
|
|
|
|
#include <config.h>
|
|
|
|
#include "importer.h"
|
|
#include "converter.h"
|
|
#include "format.h"
|
|
#include "frontends/LyXView.h"
|
|
#include "funcrequest.h"
|
|
#include "lyx_cb.h"
|
|
|
|
#include "bufferlist.h"
|
|
#include "support/filetools.h"
|
|
#include "frontends/Alert.h"
|
|
#include "gettext.h"
|
|
#include "BufferView.h"
|
|
#include "buffer_funcs.h"
|
|
|
|
using lyx::support::bformat;
|
|
using lyx::support::changeExtension;
|
|
using lyx::support::makeDisplayPath;
|
|
|
|
using std::find;
|
|
using std::string;
|
|
using std::vector;
|
|
|
|
|
|
extern BufferList bufferlist;
|
|
|
|
|
|
bool Importer::Import(LyXView * lv, string const & filename,
|
|
string const & format, ErrorList & errorList)
|
|
{
|
|
string const displaypath = makeDisplayPath(filename);
|
|
lv->message(bformat(_("Importing %1$s..."), displaypath));
|
|
|
|
string const lyxfile = changeExtension(filename, ".lyx");
|
|
|
|
string loader_format;
|
|
vector<string> loaders = Loaders();
|
|
if (find(loaders.begin(), loaders.end(), format) == loaders.end()) {
|
|
for (vector<string>::const_iterator it = loaders.begin();
|
|
it != loaders.end(); ++it) {
|
|
if (converters.isReachable(format, *it)) {
|
|
if (!converters.convert(0, filename, filename,
|
|
format, *it, errorList))
|
|
return false;
|
|
loader_format = *it;
|
|
break;
|
|
}
|
|
}
|
|
if (loader_format.empty()) {
|
|
Alert::error(_("Couldn't import file"),
|
|
bformat(_("No information for importing the format %1$s."),
|
|
formats.prettyName(format)));
|
|
return false;
|
|
}
|
|
} else
|
|
loader_format = format;
|
|
|
|
|
|
if (loader_format == "lyx") {
|
|
lv->loadLyXFile(lyxfile);
|
|
} else {
|
|
Buffer * const b = newFile(lyxfile, string(), true);
|
|
if (b)
|
|
lv->setBuffer(b);
|
|
else
|
|
return false;
|
|
bool as_paragraphs = loader_format == "textparagraph";
|
|
string filename2 = (loader_format == format) ? filename
|
|
: changeExtension(filename,
|
|
formats.extension(loader_format));
|
|
insertAsciiFile(lv->view(), filename2, as_paragraphs);
|
|
lv->dispatch(FuncRequest(LFUN_MARK_OFF));
|
|
}
|
|
|
|
// we are done
|
|
lv->message(_("imported."));
|
|
return true;
|
|
}
|
|
|
|
|
|
vector<Format const *> const Importer::GetImportableFormats()
|
|
{
|
|
vector<string> loaders = Loaders();
|
|
vector<Format const *> result =
|
|
converters.getReachableTo(loaders[0], true);
|
|
for (vector<string>::const_iterator it = loaders.begin() + 1;
|
|
it != loaders.end(); ++it) {
|
|
vector<Format const *> r =
|
|
converters.getReachableTo(*it, false);
|
|
result.insert(result.end(), r.begin(), r.end());
|
|
}
|
|
return result;
|
|
}
|
|
|
|
|
|
vector<string> const Importer::Loaders()
|
|
{
|
|
vector<string> v;
|
|
v.push_back("lyx");
|
|
v.push_back("text");
|
|
v.push_back("textparagraph");
|
|
return v;
|
|
}
|