#include "buffer.h"
#include "author.h"
+#include "BranchList.h"
#include "buffer_funcs.h"
#include "bufferlist.h"
#include "bufferparams.h"
#include "Bullet.h"
#include "Chktex.h"
#include "debug.h"
+#include "encoding.h"
#include "errorlist.h"
#include "exporter.h"
#include "format.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 "frontends/Alert.h"
#include "graphics/Previews.h"
-#include "support/FileInfo.h"
+#include "support/lyxalgo.h"
#include "support/filetools.h"
-#include "support/gzstream.h"
+#include "support/fs_extras.h"
+#ifdef USE_COMPRESSION
+# include "support/gzstream.h"
+#endif
#include "support/lyxlib.h"
#include "support/os.h"
#include "support/path.h"
#include "support/textutils.h"
-#include "support/tostr.h"
-#include "support/std_sstream.h"
+#include "support/convert.h"
#include <boost/bind.hpp>
+#include <boost/filesystem/operations.hpp>
+
+#if defined (HAVE_UTIME_H)
+# include <utime.h>
+#elif defined (HAVE_SYS_UTIME_H)
+# include <sys/utime.h>
+#endif
#include <iomanip>
#include <stack>
+#include <sstream>
+#include <fstream>
-#include <utime.h>
using lyx::pos_type;
-using lyx::par_type;
+using lyx::pit_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::getFormatFromContents;
using lyx::support::IsDirWriteable;
-using lyx::support::IsFileWriteable;
using lyx::support::LibFileSearch;
+using lyx::support::latex_path;
using lyx::support::ltrim;
using lyx::support::MakeAbsPath;
using lyx::support::MakeDisplayPath;
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;
+namespace fs = boost::filesystem;
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;
namespace {
-const int LYX_FORMAT = 232;
+int const LYX_FORMAT = 245;
} // 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;
/// our LyXText that should be wrapped in an InsetText
InsetText inset;
+
+ ///
+ MacroTable macros;
};
filename(file), filepath(OnlyPath(file)), file_fully_loaded(false),
inset(params)
{
+ inset.setAutoBreakRows(true);
lyxvc.buffer(&parent);
temppath = createBufferTmpDir();
// FIXME: And now do something if temppath == string(), because we
}
-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()));
}
}
-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;
// 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;
{
pimpl_->filename = MakeAbsPath(newfile);
pimpl_->filepath = OnlyPath(pimpl_->filename);
- setReadonly(IsFileWriteable(pimpl_->filename) == 0);
+ setReadonly(fs::is_readonly(pimpl_->filename));
updateTitles();
}
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().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();
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;
"%1$s %2$s\n"),
token,
lex.getString());
- error(ErrorItem(_("Header error"), s,
+ error(ErrorItem(_("Document header error"), s,
-1, 0, 0));
}
}
}
+ if (begin_header_line) {
+ string const s = _("\\begin_header is missing");
+ error(ErrorItem(_("Document header error"), s, -1, 0, 0));
+ }
return unknown_tokens;
}
// Uwe C. Schroeder
// changed to be public and have one parameter
// Returns false if "\end_document" is not read (Asger)
-bool Buffer::readBody(LyXLex & lex)
-{
- 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)
+{
+ lex.next();
+ string const token = lex.getString();
+ if (token != "\\begin_document") {
+ string const s = _("\\begin_document is missing");
+ error(ErrorItem(_("Document header error"), s, -1, 0, 0));
+ }
+
+ // we are reading in a brand new document
+ BOOST_ASSERT(paragraphs().empty());
- Buffer tmpbuf("", false);
- tmpbuf.readHeader(lex);
+ 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;
}
- return text().read(*this, lex);
+ bool const res = text().read(*this, lex);
+ for_each(text().paragraphs().begin(),
+ text().paragraphs().end(),
+ bind(&Paragraph::setInsetOwner, _1, &inset()));
+ return res;
}
// needed to insert the selection
void Buffer::insertStringAsLines(ParagraphList & pars,
- par_type & par, pos_type & pos,
- LyXFont const & fn, string const & str)
+ pit_type & pit, pos_type & pos,
+ LyXFont const & fn, string const & str, bool autobreakrows)
{
- LyXLayout_ptr const & layout = pars[par].layout();
-
LyXFont font = fn;
- pars[par].checkInsertChar(font);
// insert the string, don't insert doublespace
bool space_inserted = true;
- bool autobreakrows = !pars[par].inInset() ||
- static_cast<InsetText *>(pars[par].inInset())->getAutoBreakRows();
for (string::const_iterator cit = str.begin();
cit != str.end(); ++cit) {
+ Paragraph & par = pars[pit];
if (*cit == '\n') {
- if (autobreakrows && (!pars[par].empty() || pars[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 && !pars[par].isFreeSpacing()) {
+ space_inserted && !par.isFreeSpacing()) {
continue;
} else if (*cit == '\t') {
- if (!pars[par].isFreeSpacing()) {
+ if (!par.isFreeSpacing()) {
// tabs are like spaces here
- pars[par].insertChar(pos, ' ', font);
+ par.insertChar(pos, ' ', font);
++pos;
space_inserted = true;
} else {
const pos_type n = 8 - pos % 8;
for (pos_type i = 0; i < n; ++i) {
- pars[par].insertChar(pos, ' ', font);
+ par.insertChar(pos, ' ', font);
++pos;
}
space_inserted = true;
continue;
} else {
// just insert the character
- pars[par].insertChar(pos, *cit, font);
+ par.insertChar(pos, *cit, font);
++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;
}
// remove dummy empty par
paragraphs().clear();
- bool ret = readFile(filename, paragraphs().size());
+ LyXLex lex(0, 0);
+ lex.setFile(filename);
+ bool ret = readFile(lex, filename);
// After we have read a file, we must ensure that the buffer
// language is set and used in the gui.
}
-bool Buffer::readFile(string const & filename, par_type pit)
-{
- LyXLex lex(0, 0);
- lex.setFile(filename);
- return readFile(lex, filename, pit);
-}
-
-
bool Buffer::fully_loaded() const
{
return pimpl_->file_fully_loaded;
}
-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, par_type pit)
+bool Buffer::readFile(LyXLex & lex, string const & filename)
{
BOOST_ASSERT(!filename.empty());
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();
if (tmpfile.empty()) {
Alert::error(_("Conversion failed"),
filename));
return false;
}
- string command = LibFileSearch("lyx2lyx", "lyx2lyx");
- if (command.empty()) {
+ 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"
filename));
return false;
}
- command += " -t"
- + tostr(LYX_FORMAT)
- + " -o " + tmpfile + ' '
- + QuoteName(filename);
+ ostringstream command;
+ command << "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"
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);
- params().setPaperStuff();
-
-#warning Look here!
-#if 0
- if (token == "\\end_document")
- the_end_read = true;
-
- if (!the_end) {
+ if (readDocument(lex)) {
Alert::error(_("Document format failure"),
bformat(_("%1$s ended unexpectedly, which means"
" that it is probably corrupted."),
filename));
}
-#endif
+
+ //lyxerr << "removing " << MacroTable::localMacros().size()
+ // << " temporary macro entries" << endl;
+ //MacroTable::localMacros().clear();
+
pimpl_->file_fully_loaded = true;
return true;
}
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;
- }
+ 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)
+ if (fs::exists(fileName()) && fs::is_writable(fs::path(fileName()).branch_path())) {
+ //try {
+ fs::copy_file(fileName(), s, false);
+ //}
+ //catch (fs::filesystem_error const & fe) {
+ //lyxerr << "LyX was not able to make backup copy. Beware.\n"
+ // << fe.what() << endl;
+ //}
}
}
if (pimpl_->read_only && fname == fileName())
return false;
- FileInfo finfo(fname);
- if (finfo.exist() && !finfo.writable())
- return false;
-
- bool retval;
+ bool retval = false;
if (params().compressed) {
- gz::ogzstream ofs(fname.c_str());
+#ifdef USE_COMPRESSION
+ gz::ogzstream ofs(fname.c_str(), ios::out|ios::trunc);
if (!ofs)
return false;
retval = do_writeFile(ofs);
-
+#else
+ return false;
+#endif
} else {
- ofstream ofs(fname.c_str());
+ ofstream ofs(fname.c_str(), ios::out|ios::trunc);
if (!ofs)
return false;
// 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 parameters.
+ ofs << "\\begin_header\n";
params().writeFile(ofs);
-
ofs << "\\end_header\n";
// 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();
void Buffer::makeLaTeXFile(ostream & 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;
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
texrow().newline();
}
if (!original_path.empty()) {
- string inputpath = os::external_path(original_path);
- subst(inputpath, "~", "\\string~");
+ string const inputpath = latex_path(original_path);
os << "\\makeatletter\n"
<< "\\def\\input@path{{"
<< inputpath << "/}}\n"
void Buffer::makeLinuxDocFile(string const & fname,
OutputParams const & runparams,
- bool body_only)
+ bool const body_only)
{
ofstream ofs;
if (!openFileWrite(ofs, fname))
LyXTextClass const & tclass = params().getLyXTextClass();
- string top_element = tclass.latexname();
+ string const & top_element = tclass.latexname();
if (!body_only) {
ofs << tclass.class_header();
ofs << ">\n\n";
if (params().options.empty())
- sgml::openTag(ofs, 0, false, top_element);
+ sgml::openTag(ofs, top_element);
else {
string top = top_element;
top += ' ';
top += params().options;
- sgml::openTag(ofs, 0, false, top);
+ sgml::openTag(ofs, top);
}
}
if (!body_only) {
ofs << "\n\n";
- sgml::closeTag(ofs, 0, false, top_element);
+ sgml::closeTag(ofs, top_element);
}
ofs.close();
void Buffer::makeDocBookFile(string const & fname,
OutputParams const & runparams,
- bool only_body)
+ bool const only_body)
{
ofstream ofs;
if (!openFileWrite(ofs, fname))
texrow().reset();
LyXTextClass const & tclass = params().getLyXTextClass();
- string top_element = tclass.latexname();
+ string const & top_element = tclass.latexname();
if (!only_body) {
- ofs << subst(tclass.class_header(), "#", top_element);
+ if (runparams.flavor == OutputParams::XML)
+ ofs << "<?xml version=\"1.0\" encoding=\""
+ << params().language->encoding()->Name() << "\"?>\n";
+
+ ofs << "<!DOCTYPE " << top_element << " ";
+
+ if (! tclass.class_header().empty()) ofs << tclass.class_header();
+ else if (runparams.flavor == OutputParams::XML)
+ ofs << "PUBLIC \"-//OASIS//DTD DocBook XML//EN\" "
+ << "\"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd\"";
+ else
+ ofs << " PUBLIC \"-//OASIS//DTD DocBook V4.2//EN\"";
string preamble = 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 const name = runparams.nice ? ChangeExtension(pimpl_->filename, ".sgml")
: fname;
preamble += features.getIncludedFiles(name);
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 << "<!-- SGML/XML file was created by LyX " << lyx_version
+ ofs << "<!-- " << ((runparams.flavor == OutputParams::XML)? "XML" : "SGML")
+ << " file was created by LyX " << lyx_version
<< "\n See http://www.lyx.org/ for more information -->\n";
params().getLyXTextClass().counters().reset();
- docbookParagraphs(*this, paragraphs(), ofs, runparams);
- ofs << "\n\n";
- sgml::closeTag(ofs, 0, false, top_element);
+ sgml::openTag(ofs, top);
+ ofs << '\n';
+ docbookParagraphs(paragraphs(), *this, ofs, runparams);
+ sgml::closeTag(ofs, top_element);
ofs.close();
if (ofs.fail())
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"),
{
LyXTextClass const & tclass = params().getLyXTextClass();
- if (params().tracking_changes) {
+ if (features.isAvailable("dvipost") && params().tracking_changes
+ && params().output_changes) {
features.require("dvipost");
features.require("color");
}
}
-void Buffer::getLabelList(std::vector<string> & list) const
+void Buffer::getLabelList(vector<string> & list) const
{
/// if this is a child document and the parent is already loaded
/// Use the parent's list instead [ale990407]
return;
}
- for (InsetIterator it(inset()); it; ++it)
+ 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)
+void Buffer::fillWithBibKeys(vector<pair<string, string> > & keys)
const
{
/// if this is a child document and the parent is already loaded
return;
}
- for (InsetIterator it(inset()); it; ++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();
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;
void Buffer::changeLanguage(Language const * from, Language const * to)
{
+ BOOST_ASSERT(from);
+ BOOST_ASSERT(to);
+
lyxerr << "Changing Language!" << endl;
// 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));
}
void Buffer::updateDocLang(Language const * nlang)
{
+ BOOST_ASSERT(nlang);
+
pimpl_->messages.reset(new Messages(nlang->code()));
}
}
-ParIterator Buffer::getParFromID(int id) const
+ParIterator Buffer::getParFromID(int const 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
+bool Buffer::hasParWithID(int const 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;
+ ParConstIterator const it = getParFromID(id);
+ return it != par_iterator_end();
}
ParIterator Buffer::par_iterator_begin()
{
- return ParIterator(inset(), 0);
+ return ::par_iterator_begin(inset());
}
ParIterator Buffer::par_iterator_end()
{
- return ParIterator(DocumentIterator());
+ return ::par_iterator_end(inset());
}
ParConstIterator Buffer::par_iterator_begin() const
{
- return ParConstIterator(inset(), 0);
+ return ::par_const_iterator_begin(inset());
}
ParConstIterator Buffer::par_iterator_end() const
{
- return ParConstIterator(DocumentIterator());
+ return ::par_const_iterator_end(inset());
}
}
+#ifdef WITH_WARNINGS
+#warning this function should be moved to buffer_pimpl.C
+#endif
void Buffer::markDirty()
{
if (pimpl_->lyx_clean) {
return this;
}
+
+
+MacroData const & Buffer::getMacro(std::string const & name) const
+{
+ return pimpl_->macros.get(name);
+}
+
+
+bool Buffer::hasMacro(string const & name) const
+{
+ return pimpl_->macros.has(name);
+}
+
+
+void Buffer::insertMacro(string const & name, MacroData const & data)
+{
+ MacroTable::globalMacros().insert(name, data);
+ pimpl_->macros.insert(name, data);
+}
+
+
+void Buffer::buildMacros()
+{
+ // 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());
+ }
+ }
+ }
+}
+
+
+void Buffer::saveCursor(StableDocIterator cur, StableDocIterator anc)
+{
+ cursor_ = cur;
+ anchor_ = anc;
+}
+
+
+void Buffer::changeRefsIfUnique(string const & from, string const & to)
+{
+ // Check if the label 'from' appears more than once
+ vector<string> labels;
+ 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;
+ }
+ }
+ }
+ }
+}
+
projects / lyx.git / blobdiff