#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::destroyDir;
using support::FileName;
using support::getFormatFromContents;
-using support::isDirWriteable;
using support::libFileSearch;
using support::latex_path;
using support::ltrim;
namespace {
-int const LYX_FORMAT = 255;
+int const LYX_FORMAT = 263;
} // namespace anon
/// name of the file the buffer is associated with.
FileName filename;
- boost::scoped_ptr<Messages> messages;
-
/** Set to true only when the file is fully loaded.
* Used to prevent the premature generation of previews
* and by the citation inset.
Buffer::Buffer(string const & file, bool readonly)
: pimpl_(new Impl(*this, FileName(file), readonly))
{
- lyxerr[Debug::INFO] << "Buffer::Buffer()" << endl;
+ LYXERR(Debug::INFO) << "Buffer::Buffer()" << endl;
}
Buffer::~Buffer()
{
- lyxerr[Debug::INFO] << "Buffer::~Buffer()" << endl;
+ LYXERR(Debug::INFO) << "Buffer::~Buffer()" << endl;
// here the buffer should take care that it is
// saved properly, before it goes into the void.
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())));
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;
+ LYXERR(Debug::FILES) << "Log name calculated as: " << bname << endl;
return make_pair(Buffer::buildlog, bname.absFilename());
}
- lyxerr[Debug::FILES] << "Log name calculated as: " << fname << endl;
+ LYXERR(Debug::FILES) << "Log name calculated as: " << fname << endl;
return make_pair(Buffer::latexlog, fname.absFilename());
}
void Buffer::setFileName(string const & newfile)
{
- string const filename = makeAbsPath(newfile);
- pimpl_->filename = FileName(filename);
- params().filepath = onlyPath(filename);
+ pimpl_->filename = makeAbsPath(newfile);
+ params().filepath = onlyPath(pimpl_->filename.absFilename());
setReadonly(fs::is_readonly(pimpl_->filename.toFilesystemEncoding()));
updateTitles();
}
params().headheight.erase();
params().headsep.erase();
params().footskip.erase();
+ for (int i = 0; i < 4; ++i) {
+ params().user_defined_bullet(i) = ITEMIZE_DEFAULTS[i];
+ params().temp_bullet(i) = ITEMIZE_DEFAULTS[i];
+ }
ErrorList & errorList = errorLists_["Parse"];
continue;
}
- lyxerr[Debug::PARSER] << "Handling document header token: `"
+ LYXERR(Debug::PARSER) << "Handling document header token: `"
<< token << '\'' << endl;
string unknown = params().readToken(lex, token);
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;
}
for_each(text().paragraphs().begin(),
text().paragraphs().end(),
bind(&Paragraph::setInsetOwner, _1, &inset()));
- updateBibfilesCache();
return res;
}
}
-bool Buffer::readFile(string const & filename)
+bool Buffer::readString(std::string const & s)
+{
+ params().compressed = false;
+
+ // remove dummy empty par
+ paragraphs().clear();
+ LyXLex lex(0, 0);
+ std::istringstream is(s);
+ lex.setStream(is);
+ FileName const name(tempName());
+ switch (readFile(lex, name, true)) {
+ case failure:
+ return false;
+ case wrongversion: {
+ // We need to call lyx2lyx, so write the input to a file
+ std::ofstream os(name.toFilesystemEncoding().c_str());
+ os << s;
+ os.close();
+ return readFile(name);
+ }
+ case success:
+ break;
+ }
+
+ return true;
+}
+
+
+bool Buffer::readFile(FileName const & filename)
{
// Check if the file is compressed.
- FileName const name(makeAbsPath(filename));
- string const format = getFormatFromContents(name);
+ string const format = getFormatFromContents(filename);
if (format == "gzip" || format == "zip" || format == "compress") {
params().compressed = true;
}
// remove dummy empty par
paragraphs().clear();
LyXLex lex(0, 0);
- lex.setFile(name);
- if (!readFile(lex, filename))
+ lex.setFile(filename);
+ if (readFile(lex, filename) != success)
return false;
- // After we have read a file, we must ensure that the buffer
- // language is set and used in the gui.
- // If you know of a better place to put this, please tell me. (Lgb)
- updateDocLang(params().language);
-
return true;
}
}
-bool Buffer::readFile(LyXLex & lex, string const & filename)
+Buffer::ReadStatus Buffer::readFile(LyXLex & lex, FileName const & filename,
+ bool fromstring)
{
BOOST_ASSERT(!filename.empty());
if (!lex.isOK()) {
Alert::error(_("Document could not be read"),
- bformat(_("%1$s could not be read."), from_utf8(filename)));
- return false;
+ bformat(_("%1$s could not be read."), from_utf8(filename.absFilename())));
+ return failure;
}
lex.next();
string const token(lex.getString());
- if (!lex.isOK()) {
+ if (!lex) {
Alert::error(_("Document could not be read"),
- bformat(_("%1$s could not be read."), from_utf8(filename)));
- return false;
+ bformat(_("%1$s could not be read."), from_utf8(filename.absFilename())));
+ return failure;
}
// the first token _must_ be...
Alert::error(_("Document format failure"),
bformat(_("%1$s is not a LyX document."),
- from_utf8(filename)));
- return false;
+ from_utf8(filename.absFilename())));
+ return failure;
}
lex.next();
//lyxerr << "format: " << file_format << endl;
if (file_format != LYX_FORMAT) {
- string const tmpfile = tempName();
+
+ if (fromstring)
+ // lyx2lyx would fail
+ return wrongversion;
+
+ FileName const tmpfile(tempName());
if (tmpfile.empty()) {
Alert::error(_("Conversion failed"),
- bformat(_("%1$s is from an earlier"
+ bformat(_("%1$s is from a different"
" version of LyX, but a temporary"
" file for converting it could"
" not be created."),
- from_utf8(filename)));
- return false;
+ from_utf8(filename.absFilename())));
+ return failure;
}
FileName const lyx2lyx = libFileSearch("lyx2lyx", "lyx2lyx");
if (lyx2lyx.empty()) {
Alert::error(_("Conversion script not found"),
- bformat(_("%1$s is from an earlier"
+ bformat(_("%1$s is from a different"
" version of LyX, but the"
" conversion script lyx2lyx"
" could not be found."),
- from_utf8(filename)));
- return false;
+ from_utf8(filename.absFilename())));
+ return failure;
}
ostringstream command;
- command << os::python() << ' ' << quoteName(lyx2lyx.toFilesystemEncoding())
- << " -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 '"
+ LYXERR(Debug::INFO) << "Running '"
<< command_str << '\''
<< endl;
cmd_ret const ret = runCommand(command_str);
if (ret.first != 0) {
Alert::error(_("Conversion script failed"),
- bformat(_("%1$s is from an earlier version"
+ bformat(_("%1$s is from a different version"
" of LyX, but the lyx2lyx script"
" failed to convert it."),
- from_utf8(filename)));
- return false;
+ from_utf8(filename.absFilename())));
+ return failure;
} else {
bool const ret = readFile(tmpfile);
// Do stuff with tmpfile name and buffer name here.
- return ret;
+ return ret ? success : failure;
}
}
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()
//MacroTable::localMacros().clear();
pimpl_->file_fully_loaded = true;
- return true;
+ return success;
}
// We don't need autosaves in the immediate future. (Asger)
resetAutosaveTimers();
+ string const encodedFilename = pimpl_->filename.toFilesystemEncoding();
+
+ FileName backupName;
+ bool madeBackup = false;
+
// make a backup if the file already exists
- string s;
- if (lyxrc.make_backup && fs::exists(pimpl_->filename.toFilesystemEncoding())) {
- s = fileName() + '~';
+ if (lyxrc.make_backup && fs::exists(encodedFilename)) {
+ backupName = FileName(fileName() + '~');
if (!lyxrc.backupdir_path.empty())
- s = addName(lyxrc.backupdir_path,
- subst(os::internal_path(s),'/','!'));
+ backupName = FileName(addName(lyxrc.backupdir_path,
+ subst(os::internal_path(backupName.absFilename()), '/', '!')));
- // It might very well be that this variant is just
- // good enough. (Lgb)
- // 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(pimpl_->filename.toFilesystemEncoding(), s, false);
- }
- catch (fs::filesystem_error const & fe) {
+ fs::copy_file(encodedFilename, backupName.toFilesystemEncoding(), false);
+ madeBackup = true;
+ } catch (fs::filesystem_error const & fe) {
Alert::error(_("Backup failure"),
- bformat(_("LyX was not able to make a backup copy in %1$s.\n"
- "Please check if the directory exists and is writeable."),
- from_utf8(fs::path(s).branch_path().native_directory_string())));
- lyxerr[Debug::DEBUG] << "Fs error: "
- << fe.what() << endl;
+ bformat(_("Cannot create backup file %1$s.\n"
+ "Please check whether the directory exists and is writeable."),
+ from_utf8(backupName.absFilename())));
+ LYXERR(Debug::DEBUG) << "Fs error: " << fe.what() << endl;
}
}
if (writeFile(pimpl_->filename)) {
markClean();
removeAutosaveFile(fileName());
+ return true;
} else {
// Saving failed, so backup is not backup
- if (lyxrc.make_backup)
- rename(FileName(s), pimpl_->filename);
+ if (madeBackup)
+ rename(backupName, pimpl_->filename);
return false;
}
- return true;
}
if (!ofs)
return false;
- retval = do_writeFile(ofs);
+ retval = write(ofs);
} else {
ofstream ofs(fname.toFilesystemEncoding().c_str(), ios::out|ios::trunc);
if (!ofs)
return false;
- retval = do_writeFile(ofs);
+ retval = write(ofs);
}
return retval;
}
-bool Buffer::do_writeFile(ostream & ofs) const
+bool Buffer::write(ostream & ofs) const
{
#ifdef HAVE_LOCALE
// Use the standard "C" locale for file output.
}
-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();
- }
- }
- lyxerr[Debug::LATEX] << "makeLaTeXFile encoding: "
+ string const encoding = runparams.encoding->iconvName();
+ LYXERR(Debug::LATEX) << "makeLaTeXFile encoding: "
<< encoding << "..." << endl;
odocfstream ofs(encoding);
OutputParams runparams = runparams_in;
// validate the buffer.
- lyxerr[Debug::LATEX] << " Validating buffer..." << endl;
+ LYXERR(Debug::LATEX) << " Validating buffer..." << endl;
LaTeXFeatures features(*this, params(), runparams);
validate(features);
- lyxerr[Debug::LATEX] << " Buffer validation done." << endl;
+ LYXERR(Debug::LATEX) << " Buffer validation done." << endl;
texrow().reset();
texrow().newline();
texrow().newline();
}
- lyxerr[Debug::INFO] << "lyx document header finished" << endl;
+ LYXERR(Debug::INFO) << "lyx document header finished" << endl;
// There are a few differences between nice LaTeX and usual files:
// usual is \batchmode and has a
// special input@path to allow the including of figures
os << "\\begin{document}\n";
texrow().newline();
} // output_preamble
- lyxerr[Debug::INFO] << "preamble finished, now the body." << endl;
+ LYXERR(Debug::INFO) << "preamble finished, now the body." << endl;
if (!lyxrc.language_auto_begin) {
// FIXME UNICODE
os << "\\end{document}\n";
texrow().newline();
- lyxerr[Debug::LATEX] << "makeLaTeXFile...done" << endl;
+ LYXERR(Debug::LATEX) << "makeLaTeXFile...done" << endl;
} else {
- lyxerr[Debug::LATEX] << "LaTeXFile for inclusion made."
+ LYXERR(Debug::LATEX) << "LaTeXFile for inclusion made."
<< endl;
}
+ runparams_in.encoding = runparams.encoding;
// Just to be sure. (Asger)
texrow().newline();
- lyxerr[Debug::INFO] << "Finished making LaTeX file." << endl;
- lyxerr[Debug::INFO] << "Row count was " << texrow().rows() - 1
+ LYXERR(Debug::INFO) << "Finished making LaTeX file." << endl;
+ LYXERR(Debug::INFO) << "Row count was " << texrow().rows() - 1
<< '.' << endl;
}
}
-void Buffer::makeDocBookFile(string const & fname,
+void Buffer::makeDocBookFile(FileName const & fname,
OutputParams const & runparams,
bool const body_only)
{
- lyxerr[Debug::LATEX] << "makeDocBookFile..." << endl;
+ LYXERR(Debug::LATEX) << "makeDocBookFile..." << endl;
//ofstream ofs;
odocfstream ofs;
if (!openFileWrite(ofs, fname))
return;
- writeDocBookSource(ofs, fname, runparams, body_only);
+ writeDocBookSource(ofs, fname.absFilename(), runparams, body_only);
ofs.close();
if (ofs.fail())
busy(true);
// get LaTeX-Filename
- string const name = getLatexName();
- string const path = temppath();
+ FileName const path(temppath());
+ string const name = addName(path.absFilename(), getLatexName());
string const org_path = filePath();
support::Path p(path); // path to LaTeX file
message(_("Running chktex..."));
// Generate the LaTeX file if neccessary
- OutputParams runparams;
+ OutputParams runparams(¶ms().encoding());
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) {
Alert::error(_("chktex failure"),
_("Could not run chktex successfully."));
} else if (res > 0) {
+ ErrorList & errorList = errorLists_["ChkTeX"];
+ // Clear out old errors
+ errorList.clear();
// Fill-in the error list with the TeX errors
- bufferErrors(*this, terr, errorLists_["ChkTex"]);
+ bufferErrors(*this, terr, errorList);
}
busy(false);
// AMS Style is at document level
if (params().use_amsmath == BufferParams::package_on
- || tclass.provides(LyXTextClass::amsmath))
+ || tclass.provides("amsmath"))
features.require("amsmath");
if (params().use_esint == BufferParams::package_on)
features.require("esint");
// 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
for (InsetIterator it = inset_iterator_begin(inset()); it; ++it) {
if (it->lyxCode() == InsetBase::BIBTEX_CODE) {
InsetBibtex const & inset =
- dynamic_cast<InsetBibtex const &>(*it);
+ static_cast<InsetBibtex const &>(*it);
inset.fillWithBibKeys(*this, keys);
} else if (it->lyxCode() == InsetBase::INCLUDE_CODE) {
InsetInclude const & inset =
- dynamic_cast<InsetInclude const &>(*it);
+ static_cast<InsetInclude const &>(*it);
inset.fillWithBibKeys(*this, keys);
} 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));
+ static_cast<InsetBibitem const &>(*it);
+ // FIXME UNICODE
+ string const key = to_utf8(inset.getParam("key"));
+ docstring const label = inset.getParam("label");
+ DocIterator doc_it(it); doc_it.forwardPos();
+ docstring const ref = doc_it.paragraph().asString(*this, false);
+ docstring const info = label + "TheBibliographyRef" + ref;
+ keys.push_back(pair<string, docstring>(key, info));
}
}
}
for (InsetIterator it = inset_iterator_begin(inset()); it; ++it) {
if (it->lyxCode() == InsetBase::BIBTEX_CODE) {
InsetBibtex const & inset =
- dynamic_cast<InsetBibtex const &>(*it);
- vector<string> const bibfiles = inset.getFiles(*this);
+ static_cast<InsetBibtex const &>(*it);
+ vector<FileName> const bibfiles = inset.getFiles(*this);
bibfilesCache_.insert(bibfilesCache_.end(),
bibfiles.begin(),
bibfiles.end());
} else if (it->lyxCode() == InsetBase::INCLUDE_CODE) {
InsetInclude & inset =
- dynamic_cast<InsetInclude &>(*it);
+ static_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
if (tmp != this)
return tmp->getBibfilesCache();
+ // We update the cache when first used instead of at loading time.
+ if (bibfilesCache_.empty())
+ const_cast<Buffer *>(this)->updateBibfilesCache();
+
return bibfilesCache_;
}
BOOST_ASSERT(from);
BOOST_ASSERT(to);
- // Take care of l10n/i18n
- updateDocLang(to);
-
for_each(par_iterator_begin(),
par_iterator_end(),
bind(&Paragraph::changeLanguage, _1, params(), from, to));
}
-void Buffer::updateDocLang(Language const * nlang)
-{
- BOOST_ASSERT(nlang);
-
- pimpl_->messages.reset(new Messages(nlang->code()));
-
- updateLabels(*this);
-}
-
-
bool Buffer::isMultiLingual() const
{
ParConstIterator end = par_iterator_end();
docstring const Buffer::B_(string const & l10n) const
{
- if (pimpl_->messages.get())
- return pimpl_->messages->get(l10n);
+ Language const * lang = pimpl_->params.language;
+ if (lang)
+ return getMessages(lang->code()).get(l10n);
return _(l10n);
}
-docstring const Buffer::translateLabel(docstring const & label) const
-{
- if (support::isAscii(label))
- // Probably standard layout, try to translate
- return B_(to_ascii(label));
- else
- // This must be a user defined layout. We cannot translate
- // this, since gettext accepts only ascii keys.
- return label;
-}
-
-
bool Buffer::isClean() const
{
return pimpl_->lyx_clean;
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
for (InsetIterator it = inset_iterator_begin(inset()); it; ++it) {
if (it->lyxCode() == code) {
- InsetCommand & inset = dynamic_cast<InsetCommand &>(*it);
+ InsetCommand & inset = static_cast<InsetCommand &>(*it);
inset.replaceContents(to_utf8(from), to_utf8(to));
}
}
void Buffer::getSourceCode(odocstream & os, pit_type par_begin,
pit_type par_end, bool full_source)
{
- OutputParams runparams;
+ OutputParams runparams(¶ms().encoding());
runparams.nice = true;
runparams.flavor = OutputParams::LATEX;
- runparams.linelen = lyxrc.ascii_linelen;
+ runparams.linelen = lyxrc.plaintext_linelen;
// No side effect of file copying and image conversion
runparams.dryrun = true;
- /* Support for docbook temprarily commented out. */
if (full_source) {
os << "% Preview source code\n\n";
if (isLatex())
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