#include "lyxtext.h"
#include "lyxrc.h"
#include "lyxvc.h"
-#include "lyx_main.h"
#include "messages.h"
#include "output.h"
#include "output_docbook.h"
#include "pariterator.h"
#include "sgml.h"
#include "texrow.h"
+#include "TocBackend.h"
#include "undo.h"
#include "version.h"
#include "insets/insetinclude.h"
#include "insets/insettext.h"
-#include "mathed/math_macrotemplate.h"
-#include "mathed/math_macrotable.h"
-#include "mathed/math_support.h"
+#include "mathed/MathMacroTemplate.h"
+#include "mathed/MathMacroTable.h"
+#include "mathed/MathSupport.h"
#include "frontends/Alert.h"
#include "support/lyxalgo.h"
#include "support/filetools.h"
#include "support/fs_extras.h"
-# include <boost/iostreams/filtering_stream.hpp>
-# include <boost/iostreams/filter/gzip.hpp>
-# include <boost/iostreams/device/file.hpp>
-namespace io = boost::iostreams;
#include "support/lyxlib.h"
#include "support/os.h"
#include "support/path.h"
#include "support/textutils.h"
#include "support/convert.h"
+#include <boost/iostreams/filtering_stream.hpp>
+#include <boost/iostreams/filter/gzip.hpp>
+#include <boost/iostreams/device/file.hpp>
#include <boost/bind.hpp>
#include <boost/filesystem/exception.hpp>
#include <boost/filesystem/operations.hpp>
#if defined (HAVE_UTIME_H)
-# include <utime.h>
+#include <utime.h>
#elif defined (HAVE_SYS_UTIME_H)
-# include <sys/utime.h>
+#include <sys/utime.h>
#endif
#include <iomanip>
#include <fstream>
-using lyx::docstring;
-using lyx::pos_type;
-using lyx::pit_type;
-
-using lyx::support::addName;
-using lyx::support::bformat;
-using lyx::support::changeExtension;
-using lyx::support::cmd_ret;
-using lyx::support::createBufferTmpDir;
-using lyx::support::destroyDir;
-using lyx::support::getFormatFromContents;
-using lyx::support::isDirWriteable;
-using lyx::support::libFileSearch;
-using lyx::support::latex_path;
-using lyx::support::ltrim;
-using lyx::support::makeAbsPath;
-using lyx::support::makeDisplayPath;
-using lyx::support::makeLatexName;
-using lyx::support::onlyFilename;
-using lyx::support::onlyPath;
-using lyx::support::Path;
-using lyx::support::quoteName;
-using lyx::support::removeAutosaveFile;
-using lyx::support::rename;
-using lyx::support::runCommand;
-using lyx::support::split;
-using lyx::support::subst;
-using lyx::support::tempName;
-using lyx::support::trim;
-
-namespace os = lyx::support::os;
+namespace lyx {
+
+using support::addName;
+using support::bformat;
+using support::changeExtension;
+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 support::makeAbsPath;
+using support::makeDisplayPath;
+using support::makeLatexName;
+using support::onlyFilename;
+using support::onlyPath;
+using support::quoteName;
+using support::removeAutosaveFile;
+using support::rename;
+using support::runCommand;
+using support::split;
+using support::subst;
+using support::tempName;
+using support::trim;
+
+namespace Alert = frontend::Alert;
+namespace os = support::os;
namespace fs = boost::filesystem;
+namespace io = boost::iostreams;
using std::endl;
using std::for_each;
using std::make_pair;
-using std::ifstream;
using std::ios;
using std::map;
using std::ostream;
using std::string;
-// all these externs should eventually be removed.
-extern BufferList bufferlist;
-
namespace {
-int const LYX_FORMAT = 249;
+int const LYX_FORMAT = 255;
} // 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;
///
MacroTable macros;
+
+ ///
+ TocBackend toc_backend;
};
-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)
+ 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"), temppath()));
+ bformat(_("Could not remove the temporary directory %1$s"),
+ from_utf8(temppath())));
}
// Remove any previewed LaTeX snippets associated with this buffer.
- lyx::graphics::Previews::get().removeLoader(*this);
+ graphics::Previews::get().removeLoader(*this);
}
}
+TocBackend & Buffer::tocBackend()
+{
+ return pimpl_->toc_backend;
+}
+
+
+TocBackend const & Buffer::tocBackend() const
+{
+ return pimpl_->toc_backend;
+}
+
+
string const Buffer::getLatexName(bool const no_path) const
{
string const name = changeExtension(makeLatexName(fileName()), ".tex");
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));
+ string const filename = makeAbsPath(newfile);
+ pimpl_->filename = FileName(filename);
+ params().filepath = onlyPath(filename);
+ setReadonly(fs::is_readonly(pimpl_->filename.toFilesystemEncoding()));
updateTitles();
}
void unknownClass(string const & unknown)
{
Alert::warning(_("Unknown document class"),
- bformat(_("Using the default document class, because the "
- "class %1$s is unknown."), unknown));
+ bformat(_("Using the default document class, because the "
+ "class %1$s is unknown."), from_utf8(unknown)));
}
} // anon
unknownClass(unknown);
} else {
++unknown_tokens;
- string const s = bformat(_("Unknown token: "
- "%1$s %2$s\n"),
- token,
- lex.getString());
+ docstring const s = bformat(_("Unknown token: "
+ "%1$s %2$s\n"),
+ from_utf8(token),
+ lex.getDocString());
errorList.push_back(ErrorItem(_("Document header error"),
s, -1, 0, 0));
}
}
}
if (begin_header_line) {
- string const s = _("\\begin_header is missing");
+ docstring const s = _("\\begin_header is missing");
errorList.push_back(ErrorItem(_("Document header error"),
s, -1, 0, 0));
}
lex.next();
string const token = lex.getString();
if (token != "\\begin_document") {
- string const s = _("\\begin_document is missing");
+ docstring const s = _("\\begin_document is missing");
errorList.push_back(ErrorItem(_("Document header error"),
s, -1, 0, 0));
}
if (!params().getLyXTextClass().load(filePath())) {
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.", theclass));
+ _("Using the default document class, because the "
+ "class %1$s could not be loaded."), from_utf8(theclass)));
params().textclass = 0;
}
} else if (*cit == '\t') {
if (!par.isFreeSpacing()) {
// tabs are like spaces here
- par.insertChar(pos, ' ', font);
+ par.insertChar(pos, ' ', font, params().trackChanges);
++pos;
space_inserted = true;
} else {
const pos_type n = 8 - pos % 8;
for (pos_type i = 0; i < n; ++i) {
- par.insertChar(pos, ' ', font);
+ par.insertChar(pos, ' ', font, params().trackChanges);
++pos;
}
space_inserted = true;
}
-/* FIXME: not needed anymore?
} else if (!isPrintable(*cit)) {
// Ignore unprintables
continue;
-*/
} else {
// just insert the character
- par.insertChar(pos, *cit, font);
+ par.insertChar(pos, *cit, font, params().trackChanges);
++pos;
space_inserted = (*cit == ' ');
}
}
-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."), 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."), 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."),
- 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."),
- filename));
+ " not be created."),
+ 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."),
- filename));
+ " could not be found."),
+ 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 '"
Alert::error(_("Conversion script failed"),
bformat(_("%1$s is from an earlier version"
" of LyX, but the lyx2lyx script"
- " failed to convert it."),
- filename));
+ " failed to convert it."),
+ from_utf8(filename.absFilename())));
return false;
} else {
bool const ret = readFile(tmpfile);
if (readDocument(lex)) {
Alert::error(_("Document format failure"),
bformat(_("%1$s ended unexpectedly, which means"
- " that it is probably corrupted."),
- filename));
+ " that it is probably corrupted."),
+ 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"),
- bformat(_("LyX was not able to make a backup copy in %1$s.\n"
- "Please check if the directory exists and is writeable."),
- fs::path(s).branch_path().native_directory_string()));
+ 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;
}
}
- 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;
}
-void Buffer::makeLaTeXFile(string const & fname,
+bool Buffer::makeLaTeXFile(FileName const & fname,
string const & original_path,
OutputParams const & runparams,
bool output_preamble, bool output_body)
{
- lyxerr[Debug::LATEX] << "makeLaTeXFile..." << endl;
+ string const encoding = params().encoding().iconvName();
+ lyxerr[Debug::LATEX] << "makeLaTeXFile encoding: "
+ << encoding << "..." << endl;
- ofstream ofs;
+ odocfstream ofs(encoding);
if (!openFileWrite(ofs, fname))
- return;
+ return false;
- writeLaTeXSource(ofs, original_path,
+ try {
+ writeLaTeXSource(ofs, original_path,
runparams, output_preamble, output_body);
+ }
+ catch (iconv_codecvt_facet_exception &) {
+ Alert::error(_("Encoding error"),
+ _("Some characters of your document are not "
+ "representable in the chosen encoding.\n"
+ "Changing the document encoding to utf8 could help."));
+ return false;
+ }
ofs.close();
- if (ofs.fail())
+ if (ofs.fail()) {
lyxerr << "File '" << fname << "' was not closed properly." << endl;
+ Alert::error(_("Error closing file"),
+ _("The output file could not be closed properly.\n"
+ " Probably some characters of your document are not "
+ "representable in the chosen encoding.\n"
+ "Changing the document encoding to utf8 could help."));
+ return false;
+ }
+ return true;
}
-void Buffer::writeLaTeXSource(ostream & os,
+void Buffer::writeLaTeXSource(odocstream & os,
string const & original_path,
OutputParams const & runparams_in,
bool const output_preamble, bool const output_body)
texrow().newline();
}
if (!original_path.empty()) {
- string const inputpath = latex_path(original_path);
+ // FIXME UNICODE
+ // We don't know the encoding of inputpath
+ docstring const inputpath = from_utf8(latex_path(original_path));
os << "\\makeatletter\n"
- << "\\def\\input@path{{"
- << inputpath << "/}}\n"
- << "\\makeatother\n";
+ << "\\def\\input@path{{"
+ << inputpath << "/}}\n"
+ << "\\makeatother\n";
texrow().newline();
texrow().newline();
texrow().newline();
lyxerr[Debug::INFO] << "preamble finished, now the body." << endl;
if (!lyxrc.language_auto_begin) {
- os << subst(lyxrc.language_command_begin, "$$lang",
- params().language->babel())
- << endl;
+ // FIXME UNICODE
+ os << from_utf8(subst(lyxrc.language_command_begin,
+ "$$lang",
+ params().language->babel()))
+ << '\n';
texrow().newline();
}
texrow().newline();
if (!lyxrc.language_auto_end) {
- os << subst(lyxrc.language_command_end, "$$lang",
- params().language->babel())
- << endl;
+ os << from_utf8(subst(lyxrc.language_command_end,
+ "$$lang",
+ params().language->babel()))
+ << '\n';
texrow().newline();
}
}
-void Buffer::makeDocBookFile(string const & fname,
+void Buffer::makeDocBookFile(FileName const & fname,
OutputParams const & runparams,
bool const body_only)
{
lyxerr[Debug::LATEX] << "makeDocBookFile..." << endl;
- ofstream ofs;
+ //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())
}
-void Buffer::writeDocBookSource(ostream & os, string const & fname,
+void Buffer::writeDocBookSource(odocstream & os, string const & fname,
OutputParams const & runparams,
bool const only_body)
{
texrow().reset();
LyXTextClass const & tclass = params().getLyXTextClass();
- string const & top_element = tclass.latexname();
+ string const top_element = tclass.latexname();
if (!only_body) {
if (runparams.flavor == OutputParams::XML)
- os << "<?xml version=\"1.0\" encoding=\""
- << params().language->encoding()->name() << "\"?>\n";
+ os << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
- os << "<!DOCTYPE " << top_element << " ";
+ // FIXME UNICODE
+ os << "<!DOCTYPE " << from_ascii(top_element) << ' ';
- if (! tclass.class_header().empty()) os << tclass.class_header();
+ // FIXME UNICODE
+ if (! tclass.class_header().empty())
+ os << from_ascii(tclass.class_header());
else if (runparams.flavor == OutputParams::XML)
os << "PUBLIC \"-//OASIS//DTD DocBook XML//EN\" "
<< "\"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd\"";
else
os << " PUBLIC \"-//OASIS//DTD DocBook V4.2//EN\"";
- string preamble = params().preamble;
+ docstring preamble = from_utf8(params().preamble);
if (runparams.flavor != OutputParams::XML ) {
preamble += "<!ENTITY % output.print.png \"IGNORE\">\n";
preamble += "<!ENTITY % output.print.pdf \"IGNORE\">\n";
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();
if (!preamble.empty()) {
- os << "\n [ " << preamble << " ]";
+ os << "\n [ " << preamble << " ]";
}
os << ">\n\n";
}
busy(true);
// get LaTeX-Filename
- string const name = getLatexName();
+ string const name = getLatexName(false);
string const path = temppath();
string const org_path = filePath();
- Path p(path); // path to LaTeX file
+ support::Path p(path); // path to LaTeX file
message(_("Running chktex..."));
// Generate the LaTeX file if neccessary
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) {
{
LyXTextClass const & tclass = params().getLyXTextClass();
- if (features.isAvailable("dvipost") && params().tracking_changes
- && params().output_changes)
+ if (features.isAvailable("dvipost") && params().outputChanges)
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)));
}
-void Buffer::getLabelList(vector<string> & list) const
+void Buffer::getLabelList(vector<docstring> & list) const
{
/// if this is a child document and the parent is already loaded
/// Use the parent's list instead [ale990407]
// 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
switch (func.action) {
case LFUN_BUFFER_EXPORT: {
- bool const tmp = Exporter::Export(this, lyx::to_utf8(func.argument()), false);
+ bool const tmp = Exporter::Export(this, to_utf8(func.argument()), false);
if (result)
*result = tmp;
break;
ParIterator Buffer::par_iterator_begin()
{
- return ::par_iterator_begin(inset());
+ return lyx::par_iterator_begin(inset());
}
ParIterator Buffer::par_iterator_end()
{
- return ::par_iterator_end(inset());
+ return lyx::par_iterator_end(inset());
}
ParConstIterator Buffer::par_iterator_begin() const
{
- return ::par_const_iterator_begin(inset());
+ return lyx::par_const_iterator_begin(inset());
}
ParConstIterator Buffer::par_iterator_end() const
{
- return ::par_const_iterator_end(inset());
+ return lyx::par_const_iterator_end(inset());
}
}
-string const Buffer::B_(string const & l10n) const
+docstring const Buffer::B_(string const & l10n) const
{
- if (pimpl_->messages.get()) {
+ if (pimpl_->messages.get())
return pimpl_->messages->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;
DepClean::iterator it = pimpl_->dep_clean.begin();
DepClean::const_iterator const end = pimpl_->dep_clean.end();
- for (; it != end; ++it) {
+ for (; it != end; ++it)
it->second = false;
- }
}
-string const & Buffer::fileName() const
+string const Buffer::fileName() const
{
- return pimpl_->filename;
+ return pimpl_->filename.absFilename();
}
Buffer const * Buffer::getMasterBuffer() const
{
if (!params().parentname.empty()
- && bufferlist.exists(params().parentname)) {
- Buffer const * buf = bufferlist.getBuffer(params().parentname);
+ && theBufferList().exists(params().parentname)) {
+ Buffer const * buf = theBufferList().getBuffer(params().parentname);
if (buf)
return buf->getMasterBuffer();
}
Buffer * Buffer::getMasterBuffer()
{
if (!params().parentname.empty()
- && bufferlist.exists(params().parentname)) {
- Buffer * buf = bufferlist.getBuffer(params().parentname);
+ && theBufferList().exists(params().parentname)) {
+ Buffer * buf = theBufferList().getBuffer(params().parentname);
if (buf)
return buf->getMasterBuffer();
}
}
-MacroData const & Buffer::getMacro(std::string const & name) const
+MacroData const & Buffer::getMacro(docstring const & name) const
{
return pimpl_->macros.get(name);
}
-bool Buffer::hasMacro(string const & name) const
+bool Buffer::hasMacro(docstring const & name) const
{
return pimpl_->macros.has(name);
}
-void Buffer::insertMacro(string const & name, MacroData const & data)
+void Buffer::insertMacro(docstring const & name, MacroData const & data)
{
MacroTable::globalMacros().insert(name, data);
pimpl_->macros.insert(name, data);
}
-void Buffer::changeRefsIfUnique(string const & from, string const & to)
+void Buffer::changeRefsIfUnique(docstring const & from, docstring const & to,
+ InsetBase::Code code)
{
+ //FIXME: This does not work for child documents yet.
+ BOOST_ASSERT(code == InsetBase::CITE_CODE || code == InsetBase::REF_CODE);
// Check if the label 'from' appears more than once
- vector<string> labels;
- getLabelList(labels);
+ vector<docstring> labels;
+
+ if (code == InsetBase::CITE_CODE) {
+ vector<pair<string, docstring> > keys;
+ fillWithBibKeys(keys);
+ vector<pair<string, docstring> >::const_iterator bit = keys.begin();
+ vector<pair<string, docstring> >::const_iterator bend = keys.end();
+
+ for (; bit != bend; ++bit)
+ // FIXME UNICODE
+ labels.push_back(from_utf8(bit->first));
+ } else
+ getLabelList(labels);
if (lyx::count(labels.begin(), labels.end(), from) > 1)
return;
- InsetBase::Code code = InsetBase::REF_CODE;
-
- ParIterator it = par_iterator_begin();
- ParIterator end = par_iterator_end();
- for ( ; it != end; ++it) {
- bool changed_inset = false;
- for (InsetList::iterator it2 = it->insetlist.begin();
- it2 != it->insetlist.end(); ++it2) {
- if (it2->inset->lyxCode() == code) {
- InsetCommand * inset = static_cast<InsetCommand *>(it2->inset);
- if (inset->getContents() == from) {
- inset->setContents(to);
- //inset->setButtonLabel();
- changed_inset = true;
- }
- }
+ for (InsetIterator it = inset_iterator_begin(inset()); it; ++it) {
+ if (it->lyxCode() == code) {
+ InsetCommand & inset = dynamic_cast<InsetCommand &>(*it);
+ inset.replaceContents(to_utf8(from), to_utf8(to));
}
}
}
-void Buffer::getSourceCode(ostream & os, lyx::pit_type par_begin, lyx::pit_type par_end, bool full_source)
+void Buffer::getSourceCode(odocstream & os, pit_type par_begin,
+ pit_type par_end, bool full_source)
{
OutputParams runparams;
runparams.nice = true;
// 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())
+ if (isLatex())
writeLaTeXSource(os, filePath(), runparams, true, true);
- else
+ else {
writeDocBookSource(os, fileName(), runparams, false);
+ }
} else {
runparams.par_begin = par_begin;
runparams.par_end = par_end;
if (par_begin + 1 == par_end)
os << "% Preview source code for paragraph " << par_begin << "\n\n";
else
- os << "% Preview source code from paragraph " << par_begin << " to " << par_end - 1 << "\n\n";
+ os << "% Preview source code from paragraph " << par_begin
+ << " to " << par_end - 1 << "\n\n";
// output paragraphs
if (isLatex()) {
texrow().reset();
latexParagraphs(*this, paragraphs(), os, texrow(), runparams);
- } else // DocBook
+ } else {
+ // DocBook
docbookParagraphs(paragraphs(), *this, os, runparams);
+ }
}
}
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;
{
return errorLists_[type];
}
+
+
+} // namespace lyx
projects / lyx.git / blobdiff