#include "lyxtext.h"
#include "lyxrc.h"
#include "lyxvc.h"
-#include "lyx_main.h"
#include "messages.h"
#include "output.h"
#include "output_docbook.h"
using support::cmd_ret;
using support::createBufferTmpDir;
using support::destroyDir;
+using support::FileName;
using support::getFormatFromContents;
-using support::isDirWriteable;
using support::libFileSearch;
using support::latex_path;
using support::ltrim;
using std::for_each;
using std::make_pair;
-using std::ifstream;
using std::ios;
using std::map;
using std::ostream;
namespace {
-int const LYX_FORMAT = 253;
+int const LYX_FORMAT = 256;
} // namespace anon
class Buffer::Impl
{
public:
- Impl(Buffer & parent, string const & file, bool readonly);
+ Impl(Buffer & parent, FileName const & file, bool readonly);
limited_stack<Undo> undostack;
limited_stack<Undo> redostack;
bool read_only;
/// name of the file the buffer is associated with.
- string filename;
+ FileName filename;
boost::scoped_ptr<Messages> messages;
};
-Buffer::Impl::Impl(Buffer & parent, string const & file, bool readonly_)
+Buffer::Impl::Impl(Buffer & parent, FileName const & file, bool readonly_)
: lyx_clean(true), bak_clean(true), unnamed(false), read_only(readonly_),
filename(file), file_fully_loaded(false), inset(params),
toc_backend(&parent)
inset.setAutoBreakRows(true);
lyxvc.buffer(&parent);
temppath = createBufferTmpDir();
- params.filepath = onlyPath(file);
+ params.filepath = onlyPath(file.absFilename());
// FIXME: And now do something if temppath == string(), because we
// assume from now on that temppath points to a valid temp dir.
// See http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg67406.html
Buffer::Buffer(string const & file, bool readonly)
- : pimpl_(new Impl(*this, file, readonly))
+ : pimpl_(new Impl(*this, FileName(file), readonly))
{
lyxerr[Debug::INFO] << "Buffer::Buffer()" << endl;
}
closing();
- if (!temppath().empty() && !destroyDir(temppath())) {
+ if (!temppath().empty() && !destroyDir(FileName(temppath()))) {
Alert::warning(_("Could not remove temporary directory"),
bformat(_("Could not remove the temporary directory %1$s"),
from_utf8(temppath())));
string const path = temppath();
- string const fname = addName(path,
+ FileName const fname(addName(temppath(),
onlyFilename(changeExtension(filename,
- ".log")));
- string const bname =
+ ".log"))));
+ FileName const bname(
addName(path, onlyFilename(
changeExtension(filename,
- formats.extension("literate") + ".out")));
+ formats.extension("literate") + ".out"))));
// If no Latex log or Build log is newer, show Build log
- if (fs::exists(bname) &&
- (!fs::exists(fname) || fs::last_write_time(fname) < fs::last_write_time(bname))) {
+ if (fs::exists(bname.toFilesystemEncoding()) &&
+ (!fs::exists(fname.toFilesystemEncoding()) ||
+ fs::last_write_time(fname.toFilesystemEncoding()) < fs::last_write_time(bname.toFilesystemEncoding()))) {
lyxerr[Debug::FILES] << "Log name calculated as: " << bname << endl;
- return make_pair(Buffer::buildlog, bname);
+ return make_pair(Buffer::buildlog, bname.absFilename());
}
lyxerr[Debug::FILES] << "Log name calculated as: " << fname << endl;
- return make_pair(Buffer::latexlog, fname);
+ return make_pair(Buffer::latexlog, fname.absFilename());
}
void Buffer::setFileName(string const & newfile)
{
pimpl_->filename = makeAbsPath(newfile);
- params().filepath = onlyPath(pimpl_->filename);
- setReadonly(fs::is_readonly(pimpl_->filename));
+ params().filepath = onlyPath(pimpl_->filename.absFilename());
+ setReadonly(fs::is_readonly(pimpl_->filename.toFilesystemEncoding()));
updateTitles();
}
docstring const s = bformat(_("Unknown token: "
"%1$s %2$s\n"),
from_utf8(token),
- from_utf8(lex.getString()));
+ lex.getDocString());
errorList.push_back(ErrorItem(_("Document header error"),
s, -1, 0, 0));
}
string theclass = params().getLyXTextClass().name();
Alert::error(_("Can't load document class"), bformat(
_("Using the default document class, because the "
- " class %1$s could not be loaded."), from_utf8(theclass)));
+ "class %1$s could not be loaded."), from_utf8(theclass)));
params().textclass = 0;
}
}
space_inserted = true;
}
-/* FIXME: not needed anymore?
} else if (!isPrintable(*cit)) {
// Ignore unprintables
continue;
-*/
} else {
// just insert the character
par.insertChar(pos, *cit, font, params().trackChanges);
}
-bool Buffer::readFile(string const & filename)
+bool Buffer::readFile(FileName const & filename)
{
// Check if the file is compressed.
string const format = getFormatFromContents(filename);
}
-bool Buffer::readFile(LyXLex & lex, string const & filename)
+bool Buffer::readFile(LyXLex & lex, FileName const & filename)
{
BOOST_ASSERT(!filename.empty());
if (!lex.isOK()) {
Alert::error(_("Document could not be read"),
- bformat(_("%1$s could not be read."), from_utf8(filename)));
+ bformat(_("%1$s could not be read."), from_utf8(filename.absFilename())));
return false;
}
if (!lex.isOK()) {
Alert::error(_("Document could not be read"),
- bformat(_("%1$s could not be read."), from_utf8(filename)));
+ bformat(_("%1$s could not be read."), from_utf8(filename.absFilename())));
return false;
}
Alert::error(_("Document format failure"),
bformat(_("%1$s is not a LyX document."),
- from_utf8(filename)));
+ from_utf8(filename.absFilename())));
return false;
}
//lyxerr << "format: " << file_format << endl;
if (file_format != LYX_FORMAT) {
- string const tmpfile = tempName();
+ FileName const tmpfile(tempName());
if (tmpfile.empty()) {
Alert::error(_("Conversion failed"),
bformat(_("%1$s is from an earlier"
" version of LyX, but a temporary"
" file for converting it could"
" not be created."),
- from_utf8(filename)));
+ from_utf8(filename.absFilename())));
return false;
}
- string const lyx2lyx = libFileSearch("lyx2lyx", "lyx2lyx");
+ FileName const lyx2lyx = libFileSearch("lyx2lyx", "lyx2lyx");
if (lyx2lyx.empty()) {
Alert::error(_("Conversion script not found"),
bformat(_("%1$s is from an earlier"
" version of LyX, but the"
" conversion script lyx2lyx"
" could not be found."),
- from_utf8(filename)));
+ from_utf8(filename.absFilename())));
return false;
}
ostringstream command;
- command << os::python() << ' ' << quoteName(lyx2lyx)
- << " -t " << convert<string>(LYX_FORMAT)
- << " -o " << quoteName(tmpfile) << ' '
- << quoteName(filename);
+ command << os::python()
+ << ' ' << quoteName(lyx2lyx.toFilesystemEncoding())
+ << " -t " << convert<string>(LYX_FORMAT)
+ << " -o " << quoteName(tmpfile.toFilesystemEncoding())
+ << ' ' << quoteName(filename.toFilesystemEncoding());
string const command_str = command.str();
lyxerr[Debug::INFO] << "Running '"
bformat(_("%1$s is from an earlier version"
" of LyX, but the lyx2lyx script"
" failed to convert it."),
- from_utf8(filename)));
+ from_utf8(filename.absFilename())));
return false;
} else {
bool const ret = readFile(tmpfile);
Alert::error(_("Document format failure"),
bformat(_("%1$s ended unexpectedly, which means"
" that it is probably corrupted."),
- from_utf8(filename)));
+ from_utf8(filename.absFilename())));
}
//lyxerr << "removing " << MacroTable::localMacros().size()
// We don't need autosaves in the immediate future. (Asger)
resetAutosaveTimers();
- // make a backup
+ // make a backup if the file already exists
string s;
- if (lyxrc.make_backup) {
+ if (lyxrc.make_backup && fs::exists(pimpl_->filename.toFilesystemEncoding())) {
s = fileName() + '~';
if (!lyxrc.backupdir_path.empty())
s = addName(lyxrc.backupdir_path,
// But to use this we need fs::copy_file to actually do a copy,
// even when the target file exists. (Lgb)
try {
- fs::copy_file(fileName(), s, false);
+ fs::copy_file(pimpl_->filename.toFilesystemEncoding(), s, false);
}
catch (fs::filesystem_error const & fe) {
Alert::error(_("Backup failure"),
}
}
- if (writeFile(fileName())) {
+ if (writeFile(pimpl_->filename)) {
markClean();
removeAutosaveFile(fileName());
} else {
// Saving failed, so backup is not backup
if (lyxrc.make_backup)
- rename(s, fileName());
+ rename(FileName(s), pimpl_->filename);
return false;
}
return true;
}
-bool Buffer::writeFile(string const & fname) const
+bool Buffer::writeFile(FileName const & fname) const
{
- if (pimpl_->read_only && fname == fileName())
+ if (pimpl_->read_only && fname == pimpl_->filename)
return false;
bool retval = false;
if (params().compressed) {
- io::filtering_ostream ofs(io::gzip_compressor() | io::file_sink(fname));
+ io::filtering_ostream ofs(io::gzip_compressor() | io::file_sink(fname.toFilesystemEncoding()));
if (!ofs)
return false;
retval = do_writeFile(ofs);
} else {
- ofstream ofs(fname.c_str(), ios::out|ios::trunc);
+ ofstream ofs(fname.toFilesystemEncoding().c_str(), ios::out|ios::trunc);
if (!ofs)
return false;
}
-bool Buffer::makeLaTeXFile(string const & fname,
+bool Buffer::makeLaTeXFile(FileName const & fname,
string const & original_path,
OutputParams const & runparams,
bool output_preamble, bool output_body)
{
- string encoding;
- if (params().inputenc == "auto")
- encoding = params().language->encoding()->iconvName();
- else {
- Encoding const * enc = encodings.getFromLaTeXName(params().inputenc);
- if (enc)
- encoding = enc->iconvName();
- else {
- lyxerr << "Unknown inputenc value `"
- << params().inputenc
- << "'. Using `auto' instead." << endl;
- encoding = params().language->encoding()->iconvName();
- }
- }
+ string const encoding = params().encoding().iconvName();
lyxerr[Debug::LATEX] << "makeLaTeXFile encoding: "
<< encoding << "..." << endl;
}
-void Buffer::makeDocBookFile(string const & fname,
+void Buffer::makeDocBookFile(FileName const & fname,
OutputParams const & runparams,
bool const body_only)
{
if (!openFileWrite(ofs, fname))
return;
- writeDocBookSource(ofs, fname, runparams, body_only);
+ writeDocBookSource(ofs, fname.absFilename(), runparams, body_only);
ofs.close();
if (ofs.fail())
preamble += "<!ENTITY % output.print.bmp \"IGNORE\">\n";
}
- string const name = runparams.nice ? changeExtension(pimpl_->filename, ".sgml")
+ string const name = runparams.nice ? changeExtension(fileName(), ".sgml")
: fname;
preamble += features.getIncludedFiles(name);
preamble += features.getLyXSGMLEntities();
busy(true);
// get LaTeX-Filename
- string const name = getLatexName();
+ string const name = getLatexName(false);
string const path = temppath();
string const org_path = filePath();
OutputParams runparams;
runparams.flavor = OutputParams::LATEX;
runparams.nice = false;
- makeLaTeXFile(name, org_path, runparams);
+ makeLaTeXFile(FileName(name), org_path, runparams);
TeXErrors terr;
- Chktex chktex(lyxrc.chktex_command, name, filePath());
+ Chktex chktex(lyxrc.chktex_command, onlyFilename(name), filePath());
int const res = chktex.run(terr); // run chktex
if (res == -1) {
features.require("dvipost");
// AMS Style is at document level
- if (params().use_amsmath == BufferParams::AMS_ON
+ if (params().use_amsmath == BufferParams::package_on
|| tclass.provides(LyXTextClass::amsmath))
features.require("amsmath");
+ if (params().use_esint == BufferParams::package_on)
+ features.require("esint");
for_each(paragraphs().begin(), paragraphs().end(),
boost::bind(&Paragraph::validate, _1, boost::ref(features)));
// This is also a buffer property (ale)
-void Buffer::fillWithBibKeys(vector<pair<string, string> > & keys)
+void Buffer::fillWithBibKeys(vector<pair<string, docstring> > & keys)
const
{
/// if this is a child document and the parent is already loaded
} else if (it->lyxCode() == InsetBase::BIBITEM_CODE) {
InsetBibitem const & inset =
dynamic_cast<InsetBibitem const &>(*it);
- string const key = inset.getContents();
- string const opt = inset.getOptions();
- string const ref; // = pit->asString(this, false);
- string const info = opt + "TheBibliographyRef" + ref;
- keys.push_back(pair<string, string>(key, info));
+ // FIXME UNICODE
+ string const key = to_utf8(inset.getParam("key"));
+ docstring const label = inset.getParam("label");
+ docstring const ref; // = pit->asString(this, false);
+ docstring const info = label + "TheBibliographyRef" + ref;
+ keys.push_back(pair<string, docstring>(key, info));
}
}
}
if (it->lyxCode() == InsetBase::BIBTEX_CODE) {
InsetBibtex const & inset =
dynamic_cast<InsetBibtex const &>(*it);
- vector<string> const bibfiles = inset.getFiles(*this);
+ vector<FileName> const bibfiles = inset.getFiles(*this);
bibfilesCache_.insert(bibfilesCache_.end(),
bibfiles.begin(),
bibfiles.end());
InsetInclude & inset =
dynamic_cast<InsetInclude &>(*it);
inset.updateBibfilesCache(*this);
- vector<string> const & bibfiles =
+ vector<FileName> const & bibfiles =
inset.getBibfilesCache(*this);
bibfilesCache_.insert(bibfilesCache_.end(),
bibfiles.begin(),
}
-vector<string> const & Buffer::getBibfilesCache() const
+vector<FileName> const & Buffer::getBibfilesCache() const
{
// if this is a child document and the parent is already loaded
// use the parent's cache instead
// Probably standard layout, try to translate
return B_(to_ascii(label));
else
- // This must be a user defined layout. We can not translate
+ // This must be a user defined layout. We cannot translate
// this, since gettext accepts only ascii keys.
return label;
}
}
-string const & Buffer::fileName() const
+string const Buffer::fileName() const
{
- return pimpl_->filename;
+ return pimpl_->filename.absFilename();
}
vector<docstring> labels;
if (code == InsetBase::CITE_CODE) {
- vector<pair<string, string> > keys;
+ vector<pair<string, docstring> > keys;
fillWithBibKeys(keys);
- vector<pair<string, string> >::const_iterator bit = keys.begin();
- vector<pair<string, string> >::const_iterator bend = keys.end();
+ vector<pair<string, docstring> >::const_iterator bit = keys.begin();
+ vector<pair<string, docstring> >::const_iterator bend = keys.end();
for (; bit != bend; ++bit)
// FIXME UNICODE
} else
getLabelList(labels);
- // FIXME UNICODE
if (lyx::count(labels.begin(), labels.end(), from) > 1)
return;
ErrorList const & Buffer::errorList(string const & type) const
{
static ErrorList const emptyErrorList;
- std::map<std::string, ErrorList>::const_iterator I = errorLists_.find(type);
+ std::map<string, ErrorList>::const_iterator I = errorLists_.find(type);
if (I == errorLists_.end())
return emptyErrorList;
projects / lyx.git / blobdiff