#include "buffer.h"
#include "author.h"
+#include "BranchList.h"
#include "buffer_funcs.h"
#include "bufferlist.h"
#include "bufferparams.h"
+#include "counters.h"
#include "Bullet.h"
#include "Chktex.h"
#include "debug.h"
+#include "encoding.h"
#include "errorlist.h"
#include "exporter.h"
#include "format.h"
#include "funcrequest.h"
#include "gettext.h"
-#include "iterators.h"
+#include "insetiterator.h"
#include "language.h"
#include "LaTeX.h"
#include "LaTeXFeatures.h"
#include "LyXAction.h"
#include "lyxlex.h"
+#include "lyxtext.h"
#include "lyxrc.h"
#include "lyxvc.h"
+#include "lyx_main.h"
#include "messages.h"
#include "output.h"
#include "output_docbook.h"
#include "output_latex.h"
-#include "output_linuxdoc.h"
#include "paragraph.h"
#include "paragraph_funcs.h"
#include "ParagraphParameters.h"
-#include "PosIterator.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/MathMacroTemplate.h"
+#include "mathed/MathMacroTable.h"
+#include "mathed/MathSupport.h"
+
#include "frontends/Alert.h"
#include "graphics/Previews.h"
-#include "support/FileInfo.h"
+#include "support/types.h"
+#include "support/lyxalgo.h"
#include "support/filetools.h"
-#include "support/gzstream.h"
+#include "support/fs_extras.h"
#include "support/lyxlib.h"
#include "support/os.h"
#include "support/path.h"
#include "support/textutils.h"
-#include "support/tostr.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>
-#include "support/std_sstream.h"
-
-#include <iomanip>
-#include <stack>
-
+#if defined (HAVE_UTIME_H)
#include <utime.h>
-
-#ifdef HAVE_LOCALE
+#elif defined (HAVE_SYS_UTIME_H)
+#include <sys/utime.h>
#endif
-using lyx::pos_type;
-
-using lyx::support::AddName;
-using lyx::support::atoi;
-using lyx::support::bformat;
-using lyx::support::ChangeExtension;
-using lyx::support::cmd_ret;
-using lyx::support::CreateBufferTmpDir;
-using lyx::support::destroyDir;
-using lyx::support::FileInfo;
-using lyx::support::FileInfo;
-using lyx::support::getExtFromContents;
-using lyx::support::IsDirWriteable;
-using lyx::support::IsFileWriteable;
-using lyx::support::LibFileSearch;
-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::strToInt;
-using lyx::support::subst;
-using lyx::support::tempName;
-using lyx::support::trim;
-
-namespace os = lyx::support::os;
+#include <iomanip>
+#include <stack>
+#include <sstream>
+#include <fstream>
+
+
+namespace lyx {
+
+using support::addName;
+using support::bformat;
+using support::changeExtension;
+using support::cmd_ret;
+using support::createBufferTmpDir;
+using support::destroyDir;
+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::ifstream;
using std::ios;
+using std::map;
using std::ostream;
using std::ostringstream;
using std::ofstream;
using std::string;
-// all these externs should eventually be removed.
-extern BufferList bufferlist;
-
namespace {
-const int LYX_FORMAT = 225;
+int const LYX_FORMAT = 254;
} // namespace anon
typedef std::map<string, bool> DepClean;
-struct Buffer::Impl
+class Buffer::Impl
{
+public:
Impl(Buffer & parent, string const & file, bool readonly);
limited_stack<Undo> undostack;
limited_stack<Undo> redostack;
BufferParams params;
- ParagraphList paragraphs;
LyXVC lyxvc;
string temppath;
- bool nicefile;
TexRow texrow;
- /// need to regenerate .tex ?
+ /// need to regenerate .tex?
DepClean dep_clean;
- /// is save needed
+ /// is save needed?
mutable bool lyx_clean;
- /// is autosave needed
+ /// is autosave needed?
mutable bool bak_clean;
- /// is this a unnamed file (New...)
+ /// is this a unnamed file (New...)?
bool unnamed;
/// buffer is r/o
/// name of the file the buffer is associated with.
string filename;
- /// The path to the document file.
- string filepath;
-
boost::scoped_ptr<Messages> messages;
- /** set to true only when the file is fully loaded.
+ /** Set to true only when the file is fully loaded.
* Used to prevent the premature generation of previews
* and by the citation inset.
*/
bool file_fully_loaded;
+
+ /// our LyXText that should be wrapped in an InsetText
+ InsetText inset;
+
+ ///
+ MacroTable macros;
+
+ ///
+ TocBackend toc_backend;
};
Buffer::Impl::Impl(Buffer & parent, string const & file, bool readonly_)
- : nicefile(true),
- lyx_clean(true), bak_clean(true), unnamed(false), read_only(readonly_),
- filename(file), filepath(OnlyPath(file)), file_fully_loaded(false)
+ : 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);
- if (readonly_ || lyxrc.use_tempdir)
- temppath = CreateBufferTmpDir();
+ temppath = createBufferTmpDir();
+ params.filepath = onlyPath(file);
+ // 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 ronly)
- : pimpl_(new Impl(*this, file, ronly))
+Buffer::Buffer(string const & file, bool readonly)
+ : pimpl_(new Impl(*this, file, readonly))
{
lyxerr[Debug::INFO] << "Buffer::Buffer()" << endl;
}
closing();
- if (!temppath().empty() && destroyDir(temppath()) != 0) {
+ if (!temppath().empty() && !destroyDir(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())));
}
- paragraphs().clear();
-
// Remove any previewed LaTeX snippets associated with this buffer.
- lyx::graphics::Previews::get().removeLoader(*this);
+ graphics::Previews::get().removeLoader(*this);
+}
+
+
+LyXText & Buffer::text() const
+{
+ return const_cast<LyXText &>(pimpl_->inset.text_);
+}
+
+
+InsetBase & Buffer::inset() const
+{
+ return const_cast<InsetText &>(pimpl_->inset);
}
ParagraphList & Buffer::paragraphs()
{
- return pimpl_->paragraphs;
+ return text().paragraphs();
}
ParagraphList const & Buffer::paragraphs() const
{
- return pimpl_->paragraphs;
+ return text().paragraphs();
}
}
-bool & Buffer::niceFile()
+TexRow & Buffer::texrow()
{
- return pimpl_->nicefile;
+ return pimpl_->texrow;
}
-bool Buffer::niceFile() const
+TexRow const & Buffer::texrow() const
{
- return pimpl_->nicefile;
+ return pimpl_->texrow;
}
-TexRow & Buffer::texrow()
+TocBackend & Buffer::tocBackend()
{
- return pimpl_->texrow;
+ return pimpl_->toc_backend;
}
-TexRow const & Buffer::texrow() const
+TocBackend const & Buffer::tocBackend() const
{
- return pimpl_->texrow;
+ return pimpl_->toc_backend;
}
-string const Buffer::getLatexName(bool no_path) const
+string const Buffer::getLatexName(bool const no_path) const
{
- string const name = ChangeExtension(MakeLatexName(fileName()), ".tex");
- return no_path ? OnlyFilename(name) : name;
+ string const name = changeExtension(makeLatexName(fileName()), ".tex");
+ return no_path ? onlyFilename(name) : name;
}
if (filename.empty())
return make_pair(Buffer::latexlog, string());
- string path = OnlyPath(filename);
+ string const path = temppath();
- if (lyxrc.use_tempdir || !IsDirWriteable(path))
- path = temppath();
-
- string const fname = AddName(path,
- OnlyFilename(ChangeExtension(filename,
+ string const fname = addName(path,
+ onlyFilename(changeExtension(filename,
".log")));
string const bname =
- AddName(path, OnlyFilename(
- ChangeExtension(filename,
+ addName(path, onlyFilename(
+ changeExtension(filename,
formats.extension("literate") + ".out")));
// If no Latex log or Build log is newer, show Build log
- FileInfo const f_fi(fname);
- FileInfo const b_fi(bname);
-
- if (b_fi.exist() &&
- (!f_fi.exist() || f_fi.getModificationTime() < b_fi.getModificationTime())) {
+ if (fs::exists(bname) &&
+ (!fs::exists(fname) || fs::last_write_time(fname) < fs::last_write_time(bname))) {
lyxerr[Debug::FILES] << "Log name calculated as: " << bname << endl;
return make_pair(Buffer::buildlog, bname);
}
}
-void Buffer::setReadonly(bool flag)
+void Buffer::setReadonly(bool const flag)
{
if (pimpl_->read_only != flag) {
pimpl_->read_only = flag;
void Buffer::setFileName(string const & newfile)
{
- pimpl_->filename = MakeAbsPath(newfile);
- pimpl_->filepath = OnlyPath(pimpl_->filename);
- setReadonly(IsFileWriteable(pimpl_->filename) == 0);
+ pimpl_->filename = makeAbsPath(newfile);
+ params().filepath = onlyPath(pimpl_->filename);
+ setReadonly(fs::is_readonly(pimpl_->filename));
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
+
int Buffer::readHeader(LyXLex & lex)
{
int unknown_tokens = 0;
+ int line = -1;
+ int begin_header_line = -1;
+
+ // Initialize parameters that may be/go lacking in header:
+ params().branchlist().clear();
+ params().preamble.erase();
+ params().options.erase();
+ params().float_placement.erase();
+ params().paperwidth.erase();
+ params().paperheight.erase();
+ params().leftmargin.erase();
+ params().rightmargin.erase();
+ params().topmargin.erase();
+ params().bottommargin.erase();
+ params().headheight.erase();
+ params().headsep.erase();
+ params().footskip.erase();
+
+ ErrorList & errorList = errorLists_["Parse"];
while (lex.isOK()) {
- lex.nextToken();
+ lex.next();
string const token = lex.getString();
if (token.empty())
if (token == "\\end_header")
break;
- lyxerr[Debug::PARSER] << "Handling header token: `"
- << token << '\'' << endl;
+ ++line;
+ if (token == "\\begin_header") {
+ begin_header_line = line;
+ continue;
+ }
+ lyxerr[Debug::PARSER] << "Handling document header token: `"
+ << token << '\'' << endl;
string unknown = params().readToken(lex, token);
if (!unknown.empty()) {
- if (unknown[0] != '\\') {
+ if (unknown[0] != '\\' && token == "\\textclass") {
unknownClass(unknown);
} else {
++unknown_tokens;
- string const s = bformat(_("Unknown token: "
- "%1$s %2$s\n"),
- token,
- lex.getString());
- error(ErrorItem(_("Header error"), s,
- -1, 0, 0));
+ docstring const s = bformat(_("Unknown token: "
+ "%1$s %2$s\n"),
+ from_utf8(token),
+ from_utf8(lex.getString()));
+ errorList.push_back(ErrorItem(_("Document header error"),
+ s, -1, 0, 0));
}
}
}
+ if (begin_header_line) {
+ docstring const s = _("\\begin_header is missing");
+ errorList.push_back(ErrorItem(_("Document header error"),
+ s, -1, 0, 0));
+ }
+
return unknown_tokens;
}
-// candidate for move to BufferView
-// (at least some parts in the beginning of the func)
-//
// Uwe C. Schroeder
// changed to be public and have one parameter
-// if par = 0 normal behavior
-// else insert behavior
// Returns false if "\end_document" is not read (Asger)
-bool Buffer::readBody(LyXLex & lex, ParagraphList::iterator pit)
-{
- Paragraph::depth_type depth = 0;
- bool the_end_read = false;
-
- if (paragraphs().empty()) {
- readHeader(lex);
- if (!params().getLyXTextClass().load()) {
- 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));
- params().textclass = 0;
- }
- } else {
- // We don't want to adopt the parameters from the
- // document we insert, so read them into a temporary buffer
- // and then discard it
+bool Buffer::readDocument(LyXLex & lex)
+{
+ ErrorList & errorList = errorLists_["Parse"];
+ errorList.clear();
- Buffer tmpbuf("", false);
- tmpbuf.readHeader(lex);
+ lex.next();
+ string const token = lex.getString();
+ if (token != "\\begin_document") {
+ docstring const s = _("\\begin_document is missing");
+ errorList.push_back(ErrorItem(_("Document header error"),
+ s, -1, 0, 0));
}
- while (lex.isOK()) {
- lex.nextToken();
- string const token = lex.getString();
-
- if (token.empty())
- continue;
-
- lyxerr[Debug::PARSER] << "Handling token: `"
- << token << '\'' << endl;
+ // we are reading in a brand new document
+ BOOST_ASSERT(paragraphs().empty());
- if (token == "\\end_document") {
- the_end_read = true;
- continue;
- }
-
- readParagraph(lex, token, paragraphs(), pit, depth);
+ readHeader(lex);
+ 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."), from_utf8(theclass)));
+ params().textclass = 0;
}
- return the_end_read;
-}
-
-
-int Buffer::readParagraph(LyXLex & lex, string const & token,
- ParagraphList & pars, ParagraphList::iterator & pit,
- lyx::depth_type & depth)
-{
- static Change current_change;
- int unknown = 0;
-
- if (token == "\\begin_layout") {
- lex.pushToken(token);
+ bool const res = text().read(*this, lex, errorList);
+ for_each(text().paragraphs().begin(),
+ text().paragraphs().end(),
+ bind(&Paragraph::setInsetOwner, _1, &inset()));
+ updateBibfilesCache();
- Paragraph par;
- par.params().depth(depth);
- if (params().tracking_changes)
- par.trackChanges();
- LyXFont f(LyXFont::ALL_INHERIT, params().language);
- par.setFont(0, f);
-
- // insert after
- if (pit != pars.end())
- ++pit;
-
- pit = pars.insert(pit, par);
-
- // FIXME: goddamn InsetTabular makes us pass a Buffer
- // not BufferParams
- ::readParagraph(*this, *pit, lex);
-
- } else if (token == "\\begin_deeper") {
- ++depth;
- } else if (token == "\\end_deeper") {
- if (!depth) {
- lex.printError("\\end_deeper: " "depth is already null");
- } else {
- --depth;
- }
- } else {
- ++unknown;
- }
- return unknown;
+ return res;
}
// needed to insert the selection
-void Buffer::insertStringAsLines(ParagraphList::iterator & par, pos_type & pos,
- LyXFont const & fn,string const & str)
+void Buffer::insertStringAsLines(ParagraphList & pars,
+ pit_type & pit, pos_type & pos,
+ LyXFont const & fn, docstring const & str, bool autobreakrows)
{
- LyXLayout_ptr const & layout = par->layout();
-
LyXFont font = fn;
- par->checkInsertChar(font);
// insert the string, don't insert doublespace
bool space_inserted = true;
- bool autobreakrows = !par->inInset() ||
- static_cast<InsetText *>(par->inInset())->getAutoBreakRows();
- for(string::const_iterator cit = str.begin();
+ for (docstring::const_iterator cit = str.begin();
cit != str.end(); ++cit) {
+ Paragraph & par = pars[pit];
if (*cit == '\n') {
- if (autobreakrows && (!par->empty() || par->allowEmpty())) {
- breakParagraph(params(), paragraphs(), par, pos,
- layout->isEnvironment());
- ++par;
+ if (autobreakrows && (!par.empty() || par.allowEmpty())) {
+ breakParagraph(params(), pars, pit, pos,
+ par.layout()->isEnvironment());
+ ++pit;
pos = 0;
space_inserted = true;
} else {
}
// do not insert consecutive spaces if !free_spacing
} else if ((*cit == ' ' || *cit == '\t') &&
- space_inserted && !par->isFreeSpacing()) {
+ space_inserted && !par.isFreeSpacing()) {
continue;
} else if (*cit == '\t') {
- if (!par->isFreeSpacing()) {
+ 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 nb = 8 - pos % 8;
- for (pos_type a = 0; a < nb ; ++a) {
- par->insertChar(pos, ' ', font);
+ const pos_type n = 8 - pos % 8;
+ for (pos_type i = 0; i < n; ++i) {
+ par.insertChar(pos, ' ', font, params().trackChanges);
++pos;
}
space_inserted = true;
}
- } else if (!IsPrintable(*cit)) {
+ } 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)
{
// Check if the file is compressed.
- string const format = getExtFromContents(filename);
+ string const format = getFormatFromContents(filename);
if (format == "gzip" || format == "zip" || format == "compress") {
params().compressed = true;
}
- bool ret = readFile(filename, paragraphs().begin());
+ // remove dummy empty par
+ paragraphs().clear();
+ LyXLex lex(0, 0);
+ lex.setFile(filename);
+ if (!readFile(lex, filename))
+ 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 ret;
-}
-
-
-bool Buffer::readFile(string const & filename, ParagraphList::iterator pit)
-{
- LyXLex lex(0, 0);
- lex.setFile(filename);
-
- return readFile(lex, filename, pit);
+ return true;
}
}
-void Buffer::fully_loaded(bool value)
+void Buffer::fully_loaded(bool const value)
{
pimpl_->file_fully_loaded = value;
}
-bool Buffer::readFile(LyXLex & lex, string const & filename,
- ParagraphList::iterator pit)
+bool Buffer::readFile(LyXLex & lex, string 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)));
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)));
return false;
}
Alert::error(_("Document format failure"),
bformat(_("%1$s is not a LyX document."),
- filename));
+ from_utf8(filename)));
return false;
}
- lex.eatLine();
+ lex.next();
string tmp_format = lex.getString();
//lyxerr << "LyX Format: `" << tmp_format << '\'' << endl;
// if present remove ".," from string.
//lyxerr << " dot found at " << dot << endl;
if (dot != string::npos)
tmp_format.erase(dot, 1);
- int file_format = strToInt(tmp_format);
+ int const file_format = convert<int>(tmp_format);
//lyxerr << "format: " << file_format << endl;
- if (file_format > LYX_FORMAT) {
- Alert::warning(_("Document format failure"),
- bformat(_("%1$s was created with a newer"
- " version of LyX. This is likely to"
- " cause problems."),
- filename));
- } else if (file_format < LYX_FORMAT) {
+ if (file_format != LYX_FORMAT) {
string const tmpfile = tempName();
- string command = LibFileSearch("lyx2lyx", "lyx2lyx");
- if (command.empty()) {
+ 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)));
+ return false;
+ }
+ string 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)));
return false;
}
- command += " -t"
- + tostr(LYX_FORMAT)
- + " -o " + tmpfile + ' '
- + QuoteName(filename);
+ ostringstream command;
+ command << os::python() << ' ' << quoteName(lyx2lyx)
+ << " -t " << convert<string>(LYX_FORMAT)
+ << " -o " << quoteName(tmpfile) << ' '
+ << quoteName(filename);
+ string const command_str = command.str();
+
lyxerr[Debug::INFO] << "Running '"
- << command << '\''
+ << command_str << '\''
<< endl;
- cmd_ret const ret = RunCommand(command);
+
+ cmd_ret const ret = runCommand(command_str);
if (ret.first != 0) {
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)));
return false;
} else {
- bool ret = readFile(tmpfile, pit);
+ bool const ret = readFile(tmpfile);
// Do stuff with tmpfile name and buffer name here.
return ret;
}
}
- bool the_end = readBody(lex, pit);
- params().setPaperStuff();
-
- if (!the_end) {
+ 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)));
}
+
+ //lyxerr << "removing " << MacroTable::localMacros().size()
+ // << " temporary macro entries" << endl;
+ //MacroTable::localMacros().clear();
+
pimpl_->file_fully_loaded = true;
return true;
}
if (lyxrc.make_backup) {
s = fileName() + '~';
if (!lyxrc.backupdir_path.empty())
- s = AddName(lyxrc.backupdir_path,
- subst(os::slashify_path(s),'/','!'));
-
- // Rename is the wrong way of making a backup,
- // this is the correct way.
- /* truss cp fil fil2:
- lstat("LyXVC3.lyx", 0xEFFFF898) Err#2 ENOENT
- stat("LyXVC.lyx", 0xEFFFF688) = 0
- open("LyXVC.lyx", O_RDONLY) = 3
- open("LyXVC3.lyx", O_WRONLY|O_CREAT|O_TRUNC, 0600) = 4
- fstat(4, 0xEFFFF508) = 0
- fstat(3, 0xEFFFF508) = 0
- read(3, " # T h i s f i l e w".., 8192) = 5579
- write(4, " # T h i s f i l e w".., 5579) = 5579
- read(3, 0xEFFFD4A0, 8192) = 0
- close(4) = 0
- close(3) = 0
- chmod("LyXVC3.lyx", 0100644) = 0
- lseek(0, 0, SEEK_CUR) = 46440
- _exit(0)
- */
-
- // Should probably have some more error checking here.
- // Doing it this way, also makes the inodes stay the same.
- // This is still not a very good solution, in particular we
- // might loose the owner of the backup.
- FileInfo finfo(fileName());
- if (finfo.exist()) {
- mode_t fmode = finfo.getMode();
- struct utimbuf times = {
- finfo.getAccessTime(),
- finfo.getModificationTime() };
-
- ifstream ifs(fileName().c_str());
- ofstream ofs(s.c_str(), ios::out|ios::trunc);
- if (ifs && ofs) {
- ofs << ifs.rdbuf();
- ifs.close();
- ofs.close();
- ::chmod(s.c_str(), fmode);
-
- if (::utime(s.c_str(), ×)) {
- lyxerr << "utime error." << endl;
- }
- } else {
- lyxerr << "LyX was not able to make "
- "backup copy. Beware." << endl;
- }
+ s = addName(lyxrc.backupdir_path,
+ subst(os::internal_path(s),'/','!'));
+
+ // 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(fileName(), 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."),
+ from_utf8(fs::path(s).branch_path().native_directory_string())));
+ lyxerr[Debug::DEBUG] << "Fs error: "
+ << fe.what() << endl;
}
}
removeAutosaveFile(fileName());
} else {
// Saving failed, so backup is not backup
- if (lyxrc.make_backup) {
+ if (lyxrc.make_backup)
rename(s, fileName());
- }
return false;
}
return true;
bool Buffer::writeFile(string const & fname) const
{
- if (pimpl_->read_only && (fname == fileName())) {
- return false;
- }
-
- FileInfo finfo(fname);
- if (finfo.exist() && !finfo.writable()) {
+ if (pimpl_->read_only && fname == fileName())
return false;
- }
- bool retval;
+ bool retval = false;
if (params().compressed) {
- gz::ogzstream ofs(fname.c_str());
-
+ io::filtering_ostream ofs(io::gzip_compressor() | io::file_sink(fname));
if (!ofs)
return false;
retval = do_writeFile(ofs);
-
} else {
- ofstream ofs(fname.c_str());
+ ofstream ofs(fname.c_str(), ios::out|ios::trunc);
if (!ofs)
return false;
bool Buffer::do_writeFile(ostream & ofs) const
{
-
#ifdef HAVE_LOCALE
// Use the standard "C" locale for file output.
ofs.imbue(std::locale::classic());
// write out a comment in the top of the file
ofs << "#LyX " << lyx_version
<< " created this file. For more info see http://www.lyx.org/\n"
- << "\\lyxformat " << LYX_FORMAT << "\n";
+ << "\\lyxformat " << LYX_FORMAT << "\n"
+ << "\\begin_document\n";
- // now write out the buffer paramters.
+ // now write out the buffer parameters.
+ ofs << "\\begin_header\n";
params().writeFile(ofs);
-
ofs << "\\end_header\n";
- Paragraph::depth_type depth = 0;
-
- // this will write out all the paragraphs
- // using recursive descent.
- ParagraphList::const_iterator pit = paragraphs().begin();
- ParagraphList::const_iterator pend = paragraphs().end();
- for (; pit != pend; ++pit)
- pit->write(*this, ofs, params(), depth);
+ // write the text
+ ofs << "\n\\begin_body\n";
+ text().write(*this, ofs);
+ ofs << "\n\\end_body\n";
// Write marker that shows file is complete
- ofs << "\n\\end_document" << endl;
+ ofs << "\\end_document" << endl;
// Shouldn't really be needed....
//ofs.close();
// which should include file system full errors.
bool status = true;
- if (!ofs.good()) {
+ if (!ofs) {
status = false;
-#if 0
- if (ofs.bad()) {
- lyxerr << "Buffer::writeFile: BAD ERROR!" << endl;
- } else {
- lyxerr << "Buffer::writeFile: NOT SO BAD ERROR!"
- << endl;
- }
-#endif
+ lyxerr << "File was not closed properly." << endl;
}
return status;
}
-void Buffer::makeLaTeXFile(string const & fname,
+bool Buffer::makeLaTeXFile(string const & fname,
string const & original_path,
OutputParams const & runparams,
bool output_preamble, bool output_body)
{
- lyxerr[Debug::LATEX] << "makeLaTeXFile..." << endl;
+ 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: "
+ << encoding << "..." << endl;
- ofstream ofs;
+ odocfstream ofs(encoding);
if (!openFileWrite(ofs, fname))
- return;
+ return false;
- makeLaTeXFile(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()) {
- lyxerr << "File was not closed properly." << endl;
+ 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::makeLaTeXFile(ostream & os,
+void Buffer::writeLaTeXSource(odocstream & os,
string const & original_path,
OutputParams const & runparams_in,
- bool output_preamble, bool output_body)
+ bool const output_preamble, bool const output_body)
{
OutputParams runparams = runparams_in;
- niceFile() = runparams.nice; // this will be used by Insetincludes.
// validate the buffer.
lyxerr[Debug::LATEX] << " Validating buffer..." << endl;
- LaTeXFeatures features(*this, params());
+ LaTeXFeatures features(*this, params(), runparams);
validate(features);
lyxerr[Debug::LATEX] << " Buffer validation done." << endl;
texrow().reset();
+
// The starting paragraph of the coming rows is the
// first paragraph of the document. (Asger)
texrow().start(paragraphs().begin()->id(), 0);
texrow().newline();
texrow().newline();
}
- lyxerr[Debug::INFO] << "lyx 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
// input@path is set when the actual parameter
// original_path is set. This is done for usual tex-file, but not
// for nice-latex-file. (Matthias 250696)
+ // Note that input@path is only needed for something the user does
+ // in the preamble, included .tex files or ERT, files included by
+ // LyX work without it.
if (output_preamble) {
if (!runparams.nice) {
// code for usual, NOT nice-latex-file
texrow().newline();
}
if (!original_path.empty()) {
- string inputpath = os::external_path(original_path);
- subst(inputpath, "~", "\\string~");
+ // 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();
}
+ // if we are doing a real file with body, even if this is the
+ // child of some other buffer, let's cut the link here.
+ // This happens for example if only a child document is printed.
+ string save_parentname;
+ if (output_preamble) {
+ save_parentname = params().parentname;
+ params().parentname.erase();
+ }
+
+ // the real stuff
latexParagraphs(*this, paragraphs(), os, texrow(), runparams);
+ // Restore the parenthood if needed
+ if (output_preamble)
+ params().parentname = save_parentname;
+
// add this just in case after all the paragraphs
os << endl;
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();
}
lyxerr[Debug::INFO] << "Finished making LaTeX file." << endl;
lyxerr[Debug::INFO] << "Row count was " << texrow().rows() - 1
<< '.' << endl;
-
- // we want this to be true outside previews (for insetexternal)
- niceFile() = true;
}
}
-bool Buffer::isLinuxDoc() const
-{
- return params().getLyXTextClass().outputType() == LINUXDOC;
-}
-
-
bool Buffer::isLiterate() const
{
return params().getLyXTextClass().outputType() == LITERATE;
}
-bool Buffer::isSGML() const
-{
- LyXTextClass const & tclass = params().getLyXTextClass();
-
- return tclass.outputType() == LINUXDOC ||
- tclass.outputType() == DOCBOOK;
-}
-
-
-void Buffer::makeLinuxDocFile(string const & fname,
+void Buffer::makeDocBookFile(string const & fname,
OutputParams const & runparams,
- bool body_only )
+ bool const body_only)
{
- ofstream ofs;
+ lyxerr[Debug::LATEX] << "makeDocBookFile..." << endl;
+
+ //ofstream ofs;
+ odocfstream ofs;
if (!openFileWrite(ofs, fname))
return;
- niceFile() = runparams.nice; // this will be used by included files.
-
- LaTeXFeatures features(*this, params());
-
- validate(features);
-
- texrow().reset();
-
- LyXTextClass const & tclass = params().getLyXTextClass();
-
- string top_element = tclass.latexname();
-
- if (!body_only) {
- ofs << "<!doctype linuxdoc system";
-
- string preamble = params().preamble;
- string const name = runparams.nice ? ChangeExtension(pimpl_->filename, ".sgml")
- : fname;
- preamble += features.getIncludedFiles(name);
- preamble += features.getLyXSGMLEntities();
-
- if (!preamble.empty()) {
- ofs << " [ " << preamble << " ]";
- }
- ofs << ">\n\n";
-
- if (params().options.empty())
- sgml::openTag(ofs, 0, false, top_element);
- else {
- string top = top_element;
- top += ' ';
- top += params().options;
- sgml::openTag(ofs, 0, false, top);
- }
- }
-
- ofs << "<!-- LyX " << lyx_version
- << " created this file. For more info see http://www.lyx.org/"
- << " -->\n";
-
- linuxdocParagraphs(*this, paragraphs(), ofs, runparams);
-
- if (!body_only) {
- ofs << "\n\n";
- sgml::closeTag(ofs, 0, false, top_element);
- }
+ writeDocBookSource(ofs, fname, runparams, body_only);
ofs.close();
- // How to check for successful close
-
- // we want this to be true outside previews (for insetexternal)
- niceFile() = true;
+ if (ofs.fail())
+ lyxerr << "File '" << fname << "' was not closed properly." << endl;
}
-void Buffer::makeDocBookFile(string const & fname,
+void Buffer::writeDocBookSource(odocstream & os, string const & fname,
OutputParams const & runparams,
- bool only_body)
+ bool const only_body)
{
- ofstream ofs;
- if (!openFileWrite(ofs, fname))
- return;
-
- niceFile() = runparams.nice; // this will be used by Insetincludes.
-
- LaTeXFeatures features(*this, params());
+ LaTeXFeatures features(*this, params(), runparams);
validate(features);
texrow().reset();
LyXTextClass const & tclass = params().getLyXTextClass();
- string top_element = tclass.latexname();
+ string const top_element = tclass.latexname();
if (!only_body) {
- ofs << "<!DOCTYPE " << top_element
- << " PUBLIC \"-//OASIS//DTD DocBook V4.1//EN\"";
+ if (runparams.flavor == OutputParams::XML)
+ os << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
+
+ // FIXME UNICODE
+ os << "<!DOCTYPE " << from_ascii(top_element) << ' ';
+
+ // 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\"";
+
+ 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.eps \"IGNORE\">\n";
+ preamble += "<!ENTITY % output.print.bmp \"IGNORE\">\n";
+ }
- string preamble = params().preamble;
- string const name = runparams.nice ? ChangeExtension(pimpl_->filename, ".sgml")
+ string const name = runparams.nice ? changeExtension(pimpl_->filename, ".sgml")
: fname;
preamble += features.getIncludedFiles(name);
preamble += features.getLyXSGMLEntities();
if (!preamble.empty()) {
- ofs << "\n [ " << preamble << " ]";
+ os << "\n [ " << preamble << " ]";
}
- ofs << ">\n\n";
+ os << ">\n\n";
}
string top = top_element;
top += " lang=\"";
- top += params().language->code();
+ if (runparams.flavor == OutputParams::XML)
+ top += params().language->code();
+ else
+ top += params().language->code().substr(0,2);
top += '"';
if (!params().options.empty()) {
top += ' ';
top += params().options;
}
- sgml::openTag(ofs, 0, false, top);
- ofs << "<!-- DocBook file was created by LyX " << lyx_version
+ os << "<!-- " << ((runparams.flavor == OutputParams::XML)? "XML" : "SGML")
+ << " file was created by LyX " << lyx_version
<< "\n See http://www.lyx.org/ for more information -->\n";
- docbookParagraphs(*this, paragraphs(), ofs, runparams);
-
- ofs << "\n\n";
- sgml::closeTag(ofs, 0, false, top_element);
+ params().getLyXTextClass().counters().reset();
- ofs.close();
- // How to check for successful close
-
- // we want this to be true outside previews (for insetexternal)
- niceFile() = true;
+ sgml::openTag(os, top);
+ os << '\n';
+ docbookParagraphs(paragraphs(), *this, os, runparams);
+ sgml::closeTag(os, top_element);
}
// get LaTeX-Filename
string const name = getLatexName();
- string path = filePath();
+ string const path = temppath();
+ string const org_path = filePath();
- string const org_path = path;
- if (lyxrc.use_tempdir || !IsDirWriteable(path)) {
- path = temppath();
- }
-
- Path p(path); // path to LaTeX file
+ support::Path p(path); // path to LaTeX file
message(_("Running chktex..."));
// Generate the LaTeX file if neccessary
TeXErrors terr;
Chktex chktex(lyxrc.chktex_command, name, filePath());
- int res = chktex.run(terr); // run chktex
+ int const res = chktex.run(terr); // run chktex
if (res == -1) {
Alert::error(_("chktex failure"),
_("Could not run chktex successfully."));
} else if (res > 0) {
- // Insert all errors as errors boxes
- bufferErrors(*this, terr);
+ // Fill-in the error list with the TeX errors
+ bufferErrors(*this, terr, errorLists_["ChkTex"]);
}
busy(false);
+ errors("ChkTeX");
+
return res;
}
{
LyXTextClass const & tclass = params().getLyXTextClass();
- if (params().tracking_changes) {
+ if (features.isAvailable("dvipost") && params().outputChanges)
features.require("dvipost");
- features.require("color");
- }
// 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(std::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]
- if (!params().parentname.empty()
- && bufferlist.exists(params().parentname)) {
- Buffer const * tmp = bufferlist.getBuffer(params().parentname);
- if (tmp) {
- tmp->getLabelList(list);
- return;
- }
+ Buffer const * tmp = getMasterBuffer();
+ if (!tmp) {
+ lyxerr << "getMasterBuffer() failed!" << endl;
+ BOOST_ASSERT(tmp);
}
-
- for (inset_iterator it = inset_const_iterator_begin();
- it != inset_const_iterator_end(); ++it) {
- it->getLabelList(*this, list);
+ if (tmp != this) {
+ tmp->getLabelList(list);
+ return;
}
+
+ for (InsetIterator it = inset_iterator_begin(inset()); it; ++it)
+ it.nextInset()->getLabelList(*this, list);
}
// This is also a buffer property (ale)
-void Buffer::fillWithBibKeys(std::vector<std::pair<string, string> > & keys) const
+void Buffer::fillWithBibKeys(vector<pair<string, string> > & keys)
+ const
{
/// if this is a child document and the parent is already loaded
/// use the parent's list instead [ale990412]
- if (!params().parentname.empty() &&
- bufferlist.exists(params().parentname)) {
- Buffer const * tmp = bufferlist.getBuffer(params().parentname);
- if (tmp) {
- tmp->fillWithBibKeys(keys);
- return;
- }
+ Buffer const * tmp = getMasterBuffer();
+ BOOST_ASSERT(tmp);
+ if (tmp != this) {
+ tmp->fillWithBibKeys(keys);
+ return;
}
- for (inset_iterator it = inset_const_iterator_begin();
- it != inset_const_iterator_end(); ++it) {
- if (it->lyxCode() == InsetOld::BIBTEX_CODE) {
+ for (InsetIterator it = inset_iterator_begin(inset()); it; ++it) {
+ if (it->lyxCode() == InsetBase::BIBTEX_CODE) {
InsetBibtex const & inset =
dynamic_cast<InsetBibtex const &>(*it);
inset.fillWithBibKeys(*this, keys);
- } else if (it->lyxCode() == InsetOld::INCLUDE_CODE) {
+ } else if (it->lyxCode() == InsetBase::INCLUDE_CODE) {
InsetInclude const & inset =
dynamic_cast<InsetInclude const &>(*it);
inset.fillWithBibKeys(*this, keys);
- } else if (it->lyxCode() == InsetOld::BIBITEM_CODE) {
+ } else if (it->lyxCode() == InsetBase::BIBITEM_CODE) {
InsetBibitem const & inset =
dynamic_cast<InsetBibitem const &>(*it);
string const key = inset.getContents();
}
+void Buffer::updateBibfilesCache()
+{
+ // if this is a child document and the parent is already loaded
+ // update the parent's cache instead
+ Buffer * tmp = getMasterBuffer();
+ BOOST_ASSERT(tmp);
+ if (tmp != this) {
+ tmp->updateBibfilesCache();
+ return;
+ }
+
+ bibfilesCache_.clear();
+ 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);
+ bibfilesCache_.insert(bibfilesCache_.end(),
+ bibfiles.begin(),
+ bibfiles.end());
+ } else if (it->lyxCode() == InsetBase::INCLUDE_CODE) {
+ InsetInclude & inset =
+ dynamic_cast<InsetInclude &>(*it);
+ inset.updateBibfilesCache(*this);
+ vector<string> const & bibfiles =
+ inset.getBibfilesCache(*this);
+ bibfilesCache_.insert(bibfilesCache_.end(),
+ bibfiles.begin(),
+ bibfiles.end());
+ }
+ }
+}
+
+
+vector<string> const & Buffer::getBibfilesCache() const
+{
+ // if this is a child document and the parent is already loaded
+ // use the parent's cache instead
+ Buffer const * tmp = getMasterBuffer();
+ BOOST_ASSERT(tmp);
+ if (tmp != this)
+ return tmp->getBibfilesCache();
+
+ return bibfilesCache_;
+}
+
+
bool Buffer::isDepClean(string const & name) const
{
- DepClean::const_iterator it = pimpl_->dep_clean.find(name);
+ DepClean::const_iterator const it = pimpl_->dep_clean.find(name);
if (it == pimpl_->dep_clean.end())
return true;
return it->second;
bool dispatched = true;
switch (func.action) {
- case LFUN_EXPORT: {
- bool const tmp = Exporter::Export(this, func.argument, false);
+ case LFUN_BUFFER_EXPORT: {
+ bool const tmp = Exporter::Export(this, to_utf8(func.argument()), false);
if (result)
*result = tmp;
break;
void Buffer::changeLanguage(Language const * from, Language const * to)
{
- lyxerr << "Changing Language!" << endl;
+ BOOST_ASSERT(from);
+ BOOST_ASSERT(to);
// Take care of l10n/i18n
updateDocLang(to);
- ParIterator end = par_iterator_end();
- for (ParIterator it = par_iterator_begin(); it != end; ++it)
- it->changeLanguage(params(), from, to);
+ for_each(par_iterator_begin(),
+ par_iterator_end(),
+ bind(&Paragraph::changeLanguage, _1, params(), from, to));
+
+ text().current_font.setLanguage(to);
+ text().real_current_font.setLanguage(to);
}
void Buffer::updateDocLang(Language const * nlang)
{
+ BOOST_ASSERT(nlang);
+
pimpl_->messages.reset(new Messages(nlang->code()));
+
+ updateLabels(*this);
}
-bool Buffer::isMultiLingual()
+bool Buffer::isMultiLingual() const
{
- ParIterator end = par_iterator_end();
- for (ParIterator it = par_iterator_begin(); it != end; ++it)
+ ParConstIterator end = par_iterator_end();
+ for (ParConstIterator it = par_iterator_begin(); it != end; ++it)
if (it->isMultiLingual(params()))
return true;
}
-void Buffer::inset_iterator::setParagraph()
+ParIterator Buffer::getParFromID(int const id) const
{
- while (pit != pend) {
- it = pit->insetlist.begin();
- if (it != pit->insetlist.end())
- return;
- ++pit;
- }
-}
-
-
-ParIterator Buffer::getParFromID(int id) const
-{
-#warning FIXME: const correctness! (Andre)
- ParIterator it = const_cast<Buffer*>(this)->par_iterator_begin();
- ParIterator end = const_cast<Buffer*>(this)->par_iterator_end();
+ ParConstIterator it = par_iterator_begin();
+ ParConstIterator const end = par_iterator_end();
-#warning FIXME, perhaps this func should return a ParIterator? (Lgb)
if (id < 0) {
// John says this is called with id == -1 from undo
lyxerr << "getParFromID(), id: " << id << endl;
}
-bool Buffer::hasParWithID(int id) const
-{
- ParConstIterator it = par_iterator_begin();
- ParConstIterator end = par_iterator_end();
-
- if (id < 0) {
- // John says this is called with id == -1 from undo
- lyxerr << "hasParWithID(), id: " << id << endl;
- return 0;
- }
-
- for (; it != end; ++it)
- if (it->id() == id)
- return true;
-
- return false;
-}
-
-
-PosIterator Buffer::pos_iterator_begin()
-{
- return PosIterator(¶graphs(), paragraphs().begin(), 0);
-}
-
-
-PosIterator Buffer::pos_iterator_end()
+bool Buffer::hasParWithID(int const id) const
{
- return PosIterator(¶graphs(), paragraphs().end(), 0);
+ ParConstIterator const it = getParFromID(id);
+ return it != par_iterator_end();
}
ParIterator Buffer::par_iterator_begin()
{
- return ParIterator(paragraphs().begin(), paragraphs());
+ return lyx::par_iterator_begin(inset());
}
ParIterator Buffer::par_iterator_end()
{
- return ParIterator(paragraphs().end(), paragraphs());
+ return lyx::par_iterator_end(inset());
}
ParConstIterator Buffer::par_iterator_begin() const
{
- ParagraphList const & pars = paragraphs();
- return ParConstIterator(const_cast<ParagraphList&>(pars).begin(), pars);
+ return lyx::par_const_iterator_begin(inset());
}
ParConstIterator Buffer::par_iterator_end() const
{
- ParagraphList const & pars = paragraphs();
- return ParConstIterator(const_cast<ParagraphList&>(pars).end(), pars);
+ 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 can not translate
+ // this, since gettext accepts only ascii keys.
+ return label;
+}
+
+
bool Buffer::isClean() const
{
return pimpl_->lyx_clean;
}
-bool Buffer::isUnnamed()
+bool Buffer::isUnnamed() const
{
return pimpl_->unnamed;
}
+#ifdef WITH_WARNINGS
+#warning this function should be moved to buffer_pimpl.C
+#endif
void Buffer::markDirty()
{
if (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::filePath() const
{
- return pimpl_->filepath;
+ return params().filepath;
}
}
-Buffer::inset_iterator::inset_iterator()
- : pit(), pend()
-{}
-
-
-Buffer::inset_iterator::inset_iterator(base_type p, base_type e)
- : pit(p), pend(e)
+Buffer const * Buffer::getMasterBuffer() const
{
- setParagraph();
+ if (!params().parentname.empty()
+ && theBufferList().exists(params().parentname)) {
+ Buffer const * buf = theBufferList().getBuffer(params().parentname);
+ if (buf)
+ return buf->getMasterBuffer();
+ }
+
+ return this;
}
-Buffer::inset_iterator Buffer::inset_iterator_begin()
+Buffer * Buffer::getMasterBuffer()
{
- return inset_iterator(paragraphs().begin(), paragraphs().end());
+ if (!params().parentname.empty()
+ && theBufferList().exists(params().parentname)) {
+ Buffer * buf = theBufferList().getBuffer(params().parentname);
+ if (buf)
+ return buf->getMasterBuffer();
+ }
+
+ return this;
}
-Buffer::inset_iterator Buffer::inset_iterator_end()
+MacroData const & Buffer::getMacro(docstring const & name) const
{
- return inset_iterator(paragraphs().end(), paragraphs().end());
+ return pimpl_->macros.get(name);
}
-Buffer::inset_iterator Buffer::inset_const_iterator_begin() const
+bool Buffer::hasMacro(docstring const & name) const
{
- ParagraphList & pars = const_cast<ParagraphList&>(paragraphs());
- return inset_iterator(pars.begin(), pars.end());
+ return pimpl_->macros.has(name);
}
-Buffer::inset_iterator Buffer::inset_const_iterator_end() const
+void Buffer::insertMacro(docstring const & name, MacroData const & data)
{
- ParagraphList & pars = const_cast<ParagraphList&>(paragraphs());
- return inset_iterator(pars.end(), pars.end());
+ MacroTable::globalMacros().insert(name, data);
+ pimpl_->macros.insert(name, data);
}
-Buffer::inset_iterator & Buffer::inset_iterator::operator++()
+void Buffer::buildMacros()
{
- if (pit != pend) {
- ++it;
- if (it == pit->insetlist.end()) {
- ++pit;
- setParagraph();
+ // Start with global table.
+ pimpl_->macros = MacroTable::globalMacros();
+
+ // Now add our own.
+ ParagraphList const & pars = text().paragraphs();
+ for (size_t i = 0, n = pars.size(); i != n; ++i) {
+ //lyxerr << "searching main par " << i
+ // << " for macro definitions" << std::endl;
+ InsetList const & insets = pars[i].insetlist;
+ InsetList::const_iterator it = insets.begin();
+ InsetList::const_iterator end = insets.end();
+ for ( ; it != end; ++it) {
+ //lyxerr << "found inset code " << it->inset->lyxCode() << std::endl;
+ if (it->inset->lyxCode() == InsetBase::MATHMACRO_CODE) {
+ MathMacroTemplate const & mac
+ = static_cast<MathMacroTemplate const &>(*it->inset);
+ insertMacro(mac.name(), mac.asMacroData());
+ }
}
}
- return *this;
}
-Buffer::inset_iterator Buffer::inset_iterator::operator++(int)
+void Buffer::saveCursor(StableDocIterator cur, StableDocIterator anc)
{
- inset_iterator tmp = *this;
- ++*this;
- return tmp;
+ cursor_ = cur;
+ anchor_ = anc;
}
-Buffer::inset_iterator::reference Buffer::inset_iterator::operator*()
+void Buffer::changeRefsIfUnique(docstring const & from, docstring const & to,
+ InsetBase::Code code)
{
- return *it->inset;
-}
+ //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<docstring> labels;
+ if (code == InsetBase::CITE_CODE) {
+ vector<pair<string, string> > keys;
+ fillWithBibKeys(keys);
+ vector<pair<string, string> >::const_iterator bit = keys.begin();
+ vector<pair<string, string> >::const_iterator bend = keys.end();
-Buffer::inset_iterator::pointer Buffer::inset_iterator::operator->()
-{
- return it->inset;
-}
+ 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;
-ParagraphList::iterator Buffer::inset_iterator::getPar() const
-{
- return pit;
+ 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));
+ }
+ }
}
-lyx::pos_type Buffer::inset_iterator::getPos() const
+void Buffer::getSourceCode(odocstream & os, pit_type par_begin,
+ pit_type par_end, bool full_source)
{
- return it->pos;
+ OutputParams runparams;
+ runparams.nice = true;
+ runparams.flavor = OutputParams::LATEX;
+ runparams.linelen = lyxrc.ascii_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())
+ writeLaTeXSource(os, filePath(), runparams, true, true);
+ 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";
+ // output paragraphs
+ if (isLatex()) {
+ texrow().reset();
+ latexParagraphs(*this, paragraphs(), os, texrow(), runparams);
+ } else {
+ // DocBook
+ docbookParagraphs(paragraphs(), *this, os, runparams);
+ }
+ }
}
-bool operator==(Buffer::inset_iterator const & iter1,
- Buffer::inset_iterator const & iter2)
+ErrorList const & Buffer::errorList(string const & type) const
{
- return iter1.pit == iter2.pit
- && (iter1.pit == iter1.pend || iter1.it == iter2.it);
+ static ErrorList const emptyErrorList;
+ std::map<std::string, ErrorList>::const_iterator I = errorLists_.find(type);
+ if (I == errorLists_.end())
+ return emptyErrorList;
+
+ return I->second;
}
-bool operator!=(Buffer::inset_iterator const & iter1,
- Buffer::inset_iterator const & iter2)
+ErrorList & Buffer::errorList(string const & type)
{
- return !(iter1 == iter2);
+ return errorLists_[type];
}
+
+
+} // namespace lyx