#include "Lexer.h"
#include "LyXAction.h"
#include "LyX.h"
-#include "LyXFunc.h"
#include "LyXRC.h"
#include "LyXVC.h"
#include "output_docbook.h"
// Do not remove the comment below, so we get merge conflict in
// independent branches. Instead add your own.
-int const LYX_FORMAT = 375; // jspitzm: includeonly support
+int const LYX_FORMAT = 377; // uwestoehr: support for multirows
typedef map<string, bool> DepClean;
typedef map<docstring, pair<InsetLabel const *, Buffer::References> > RefCache;
class Buffer::Impl
{
public:
- Impl(Buffer & parent, FileName const & file, bool readonly, Buffer const * cloned_buffer);
+ Impl(Buffer * owner, FileName const & file, bool readonly, Buffer const * cloned_buffer);
~Impl()
{
delete inset;
}
+ /// search for macro in local (buffer) table or in children
+ MacroData const * getBufferMacro(docstring const & name,
+ DocIterator const & pos) const;
+
+ /// Update macro table starting with position of it \param it in some
+ /// text inset.
+ void updateMacros(DocIterator & it, DocIterator & scope);
+ ///
+ void setLabel(ParIterator & it, UpdateType utype) const;
+ ///
+ void collectRelatives(BufferSet & bufs) const;
+
+ /** If we have branches that use the file suffix
+ feature, return the file name with suffix appended.
+ */
+ support::FileName exportFileName() const;
+
+ Buffer * owner_;
+
BufferParams params;
LyXVC lyxvc;
FileName temppath;
/// map from the macro name to the position map,
/// which maps the macro definition position to the scope and the MacroData.
NamePositionScopeMacroMap macros;
- bool macro_lock;
+ /// This seem to change the way Buffer::getMacro() works
+ mutable bool macro_lock;
/// positions of child buffers in the buffer
typedef map<Buffer const * const, DocIterator> BufferPositionMap;
///
frontend::WorkAreaManager * wa_;
+ ///
+ frontend::GuiBufferDelegate * gui_;
///
Undo undo_;
/// A cache for the bibfiles (including bibfiles of loaded child
/// documents), needed for appropriate update of natbib labels.
- mutable support::FileNameList bibfilesCache_;
+ mutable support::FileNameList bibfiles_cache_;
// FIXME The caching mechanism could be improved. At present, we have a
// cache for each Buffer, that caches all the bibliography info for that
/// A cache for bibliography info
mutable BiblioInfo bibinfo_;
/// whether the bibinfo cache is valid
- bool bibinfoCacheValid_;
+ bool bibinfo_cache_valid_;
/// Cache of timestamps of .bib files
- map<FileName, time_t> bibfileStatus_;
+ map<FileName, time_t> bibfile_status_;
mutable RefCache ref_cache_;
// if parent_buffer is not loaded, then it has been unloaded,
// which means that parent_buffer is an invalid pointer. So we
// set it to null in that case.
- if (!theBufferList().isLoaded(parent_buffer))
+ // however, the BufferList doesn't know about cloned buffers, so
+ // they will always be regarded as unloaded. in that case, we hope
+ // for the best.
+ if (!cloned_buffer_ && !theBufferList().isLoaded(parent_buffer))
parent_buffer = 0;
return parent_buffer;
}
}
-Buffer::Impl::Impl(Buffer & parent, FileName const & file, bool readonly_,
+Buffer::Impl::Impl(Buffer * owner, FileName const & file, bool readonly_,
Buffer const * cloned_buffer)
- : lyx_clean(true), bak_clean(true), unnamed(false),
+ : owner_(owner), lyx_clean(true), bak_clean(true), unnamed(false),
read_only(readonly_), filename(file), file_fully_loaded(false),
- toc_backend(&parent), macro_lock(false), timestamp_(0),
- checksum_(0), wa_(0), undo_(parent), bibinfoCacheValid_(false),
+ toc_backend(owner), macro_lock(false), timestamp_(0),
+ checksum_(0), wa_(0), gui_(0), undo_(*owner), bibinfo_cache_valid_(false),
cloned_buffer_(cloned_buffer), parent_buffer(0)
{
if (!cloned_buffer_) {
temppath = createBufferTmpDir();
- lyxvc.setBuffer(&parent);
+ lyxvc.setBuffer(owner_);
if (use_gui)
wa_ = new frontend::WorkAreaManager;
return;
temppath = cloned_buffer_->d->temppath;
file_fully_loaded = true;
params = cloned_buffer_->d->params;
+ bibfiles_cache_ = cloned_buffer_->d->bibfiles_cache_;
+ bibinfo_ = cloned_buffer_->d->bibinfo_;
+ bibinfo_cache_valid_ = cloned_buffer_->d->bibinfo_cache_valid_;
+ bibfile_status_ = cloned_buffer_->d->bibfile_status_;
}
Buffer::Buffer(string const & file, bool readonly, Buffer const * cloned_buffer)
- : d(new Impl(*this, FileName(file), readonly, cloned_buffer)), gui_(0)
+ : d(new Impl(this, FileName(file), readonly, cloned_buffer))
{
LYXERR(Debug::INFO, "Buffer::Buffer()");
if (cloned_buffer) {
// saved properly, before it goes into the void.
// GuiView already destroyed
- gui_ = 0;
+ d->gui_ = 0;
if (isInternal()) {
// No need to do additional cleanups for internal buffer.
Impl::BufferPositionMap::iterator end = d->children_positions.end();
for (; it != end; ++it) {
Buffer * child = const_cast<Buffer *>(it->first);
+ if (d->cloned_buffer_)
+ delete child;
// The child buffer might have been closed already.
- if (theBufferList().isLoaded(child))
+ else if (theBufferList().isLoaded(child))
theBufferList().releaseChild(this, child);
}
child_clone->d->setParent(buffer_clone);
buffer_clone->setChild(dit, child_clone);
}
+ buffer_clone->d->macro_lock = false;
return buffer_clone;
}
string Buffer::latexName(bool const no_path) const
{
FileName latex_name =
- makeLatexName(exportFileName());
+ makeLatexName(d->exportFileName());
return no_path ? latex_name.onlyFileName()
: latex_name.absFilename();
}
-FileName Buffer::exportFileName() const
+FileName Buffer::Impl::exportFileName() const
{
docstring const branch_suffix =
- params().branchlist().getFilenameSuffix();
+ params.branchlist().getFilenameSuffix();
if (branch_suffix.empty())
- return fileName();
+ return filename;
- string const name = fileName().onlyFileNameWithoutExt()
+ string const name = filename.onlyFileNameWithoutExt()
+ to_utf8(branch_suffix);
- FileName res(fileName().onlyPath().absFilename() + "/" + name);
- res.changeExtension(fileName().extension());
+ FileName res(filename.onlyPath().absFilename() + "/" + name);
+ res.changeExtension(filename.extension());
return res;
}
{
if (d->read_only != flag) {
d->read_only = flag;
- setReadOnly(flag);
+ changed(false);
}
}
cmd_ret const ret = runCommand(command_str);
if (ret.first != 0) {
- Alert::error(_("Conversion script failed"),
- bformat(_("%1$s is from a different version"
+ if (file_format < LYX_FORMAT)
+ Alert::error(_("Conversion script failed"),
+ bformat(_("%1$s is from an older version"
" of LyX, but the lyx2lyx script"
" failed to convert it."),
from_utf8(filename.absFilename())));
+ else
+ Alert::error(_("Conversion script failed"),
+ bformat(_("%1$s is from a newer version"
+ " of LyX and cannot be converted by the"
+ " lyx2lyx script."),
+ from_utf8(filename.absFilename())));
return failure;
} else {
bool const ret = readFile(tmpfile);
bformat(_("%1$s ended unexpectedly, which means"
" that it is probably corrupted."),
from_utf8(filename.absFilename())));
+ return failure;
}
d->file_fully_loaded = true;
}
-// Should probably be moved to somewhere else: BufferView? LyXView?
+// Should probably be moved to somewhere else: BufferView? GuiView?
bool Buffer::save() const
{
// We don't need autosaves in the immediate future. (Asger)
// output the parent macros
MacroSet::iterator it = parentMacros.begin();
MacroSet::iterator end = parentMacros.end();
- for (; it != end; ++it)
- (*it)->write(os, true);
+ for (; it != end; ++it) {
+ int num_lines = (*it)->write(os, true);
+ d->texrow.newlines(num_lines);
+ }
+
} // output_preamble
d->texrow.start(paragraphs().begin()->id(), 0);
{
LaTeXFeatures features(*this, params(), runparams);
validate(features);
- updateLabels(UpdateMaster, true);
+ updateLabels(UpdateMaster, OutputUpdate);
checkBibInfoCache();
d->bibinfo_.makeCitationLabels(*this);
+ updateMacros();
+ updateMacroInstances();
if (!only_body) {
os << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
os << "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN\" \"http://www.w3.org/TR/MathML2/dtd/xhtml-math11-f.dtd\">\n";
// FIXME Language should be set properly.
os << "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n";
- // FIXME Header
os << "<head>\n";
// FIXME Presumably need to set this right
os << "<meta http-equiv=\"Content-type\" content=\"text/html;charset=UTF-8\" />\n";
- // FIXME Get this during validation? What about other meta-data?
- os << "<title>TBA</title>\n";
+ os << "<title>" << features.htmlTitle() << "</title>\n";
os << "\n<!-- Text Class Preamble -->\n"
<< features.getTClassHTMLPreamble()
return;
}
- d->bibfilesCache_.clear();
+ d->bibfiles_cache_.clear();
for (InsetIterator it = inset_iterator_begin(inset()); it; ++it) {
if (it->lyxCode() == BIBTEX_CODE) {
InsetBibtex const & inset =
static_cast<InsetBibtex const &>(*it);
support::FileNameList const bibfiles = inset.getBibFiles();
- d->bibfilesCache_.insert(d->bibfilesCache_.end(),
+ d->bibfiles_cache_.insert(d->bibfiles_cache_.end(),
bibfiles.begin(),
bibfiles.end());
} else if (it->lyxCode() == INCLUDE_CODE) {
inset.updateBibfilesCache();
support::FileNameList const & bibfiles =
inset.getBibfilesCache();
- d->bibfilesCache_.insert(d->bibfilesCache_.end(),
+ d->bibfiles_cache_.insert(d->bibfiles_cache_.end(),
bibfiles.begin(),
bibfiles.end());
}
}
// the bibinfo cache is now invalid
- d->bibinfoCacheValid_ = false;
+ d->bibinfo_cache_valid_ = false;
}
void Buffer::invalidateBibinfoCache()
{
- d->bibinfoCacheValid_ = false;
+ d->bibinfo_cache_valid_ = false;
}
return pbuf->getBibfilesCache();
// We update the cache when first used instead of at loading time.
- if (d->bibfilesCache_.empty())
+ if (d->bibfiles_cache_.empty())
const_cast<Buffer *>(this)->updateBibfilesCache(scope);
- return d->bibfilesCache_;
+ return d->bibfiles_cache_;
}
BiblioInfo const & Buffer::localBibInfo() const
{
- checkBibInfoCache();
return d->bibinfo_;
}
support::FileNameList::const_iterator en = bibfilesCache.end();
for (; ei != en; ++ ei) {
time_t lastw = ei->lastModified();
- time_t prevw = d->bibfileStatus_[*ei];
+ time_t prevw = d->bibfile_status_[*ei];
if (lastw != prevw) {
- d->bibinfoCacheValid_ = false;
- d->bibfileStatus_[*ei] = lastw;
+ d->bibinfo_cache_valid_ = false;
+ d->bibfile_status_[*ei] = lastw;
}
}
- if (!d->bibinfoCacheValid_) {
+ if (!d->bibinfo_cache_valid_) {
d->bibinfo_.clear();
for (InsetIterator it = inset_iterator_begin(inset()); it; ++it)
it->fillWithBibKeys(d->bibinfo_, it);
- d->bibinfoCacheValid_ = true;
+ d->bibinfo_cache_valid_ = true;
}
}
break;
case LFUN_BUFFER_EXPORT: {
- bool success = doExport(argument, false);
+ bool success = doExport(argument, false, false);
dr.setError(success);
if (!success)
dr.setMessage(bformat(_("Error exporting to format: %1$s."),
}
case LFUN_BUILD_PROGRAM:
- doExport("program", true);
+ doExport("program", true, false);
break;
case LFUN_BUFFER_CHKTEX:
break;
} else {
- doExport(format_name, true, filename);
+ doExport(format_name, true, false, filename);
}
// Substitute $$FName for filename
break;
}
- if (!doExport("dvi", true)) {
+ bool const update_unincluded =
+ params().maintain_unincluded_children
+ && !params().getIncludedChildren().empty();
+ if (!doExport("dvi", true, update_unincluded)) {
showPrintError(absFileName());
dr.setMessage(_("Error exporting to DVI."));
break;
}
+std::set<Language const *> Buffer::getLanguages() const
+{
+ std::set<Language const *> languages;
+ getLanguages(languages);
+ return languages;
+}
+
+
+void Buffer::getLanguages(std::set<Language const *> & languages) const
+{
+ ParConstIterator end = par_iterator_end();
+ for (ParConstIterator it = par_iterator_begin(); it != end; ++it)
+ it->getLanguages(languages);
+ // also children
+ std::vector<Buffer *> clist = getChildren();
+ for (vector<Buffer *>::const_iterator cit = clist.begin();
+ cit != clist.end(); ++cit)
+ (*cit)->getLanguages(languages);
+}
+
+
DocIterator Buffer::getParFromID(int const id) const
{
Buffer * buf = const_cast<Buffer *>(this);
}
-bool Buffer::isBakClean() const
-{
- return d->bak_clean;
-}
-
-
bool Buffer::isExternallyModified(CheckMethod method) const
{
LASSERT(d->filename.exists(), /**/);
}
-void Buffer::markBakClean() const
-{
- d->bak_clean = true;
-}
-
-
void Buffer::setUnnamed(bool flag)
{
d->unnamed = flag;
}
-void Buffer::collectRelatives(BufferSet & bufs) const
+void Buffer::Impl::collectRelatives(BufferSet & bufs) const
{
- bufs.insert(this);
+ bufs.insert(owner_);
if (parent())
- parent()->collectRelatives(bufs);
+ parent()->d->collectRelatives(bufs);
// loop over children
- Impl::BufferPositionMap::iterator it = d->children_positions.begin();
- Impl::BufferPositionMap::iterator end = d->children_positions.end();
+ BufferPositionMap::const_iterator it = children_positions.begin();
+ BufferPositionMap::const_iterator end = children_positions.end();
for (; it != end; ++it)
bufs.insert(const_cast<Buffer *>(it->first));
}
std::vector<Buffer const *> Buffer::allRelatives() const
{
BufferSet bufs;
- collectRelatives(bufs);
+ d->collectRelatives(bufs);
BufferSet::iterator it = bufs.begin();
std::vector<Buffer const *> ret;
for (; it != bufs.end(); ++it)
template<typename M>
-typename M::iterator greatest_below(M & m, typename M::key_type const & x)
+typename M::const_iterator greatest_below(M & m, typename M::key_type const & x)
{
if (m.empty())
return m.end();
- typename M::iterator it = m.lower_bound(x);
+ typename M::const_iterator it = m.lower_bound(x);
if (it == m.begin())
return m.end();
}
-MacroData const * Buffer::getBufferMacro(docstring const & name,
+MacroData const * Buffer::Impl::getBufferMacro(docstring const & name,
DocIterator const & pos) const
{
LYXERR(Debug::MACROS, "Searching for " << to_ascii(name) << " at " << pos);
return 0;
// we haven't found anything yet
- DocIterator bestPos = par_iterator_begin();
+ DocIterator bestPos = owner_->par_iterator_begin();
MacroData const * bestData = 0;
// find macro definitions for name
- Impl::NamePositionScopeMacroMap::iterator nameIt
- = d->macros.find(name);
- if (nameIt != d->macros.end()) {
+ NamePositionScopeMacroMap::const_iterator nameIt = macros.find(name);
+ if (nameIt != macros.end()) {
// find last definition in front of pos or at pos itself
- Impl::PositionScopeMacroMap::const_iterator it
+ PositionScopeMacroMap::const_iterator it
= greatest_below(nameIt->second, pos);
if (it != nameIt->second.end()) {
while (true) {
}
// find macros in included files
- Impl::PositionScopeBufferMap::const_iterator it
- = greatest_below(d->position_to_children, pos);
- if (it == d->position_to_children.end())
+ PositionScopeBufferMap::const_iterator it
+ = greatest_below(position_to_children, pos);
+ if (it == position_to_children.end())
// no children before
return bestData;
// scope ends behind pos?
if (pos < it->second.first) {
// look for macro in external file
- d->macro_lock = true;
+ macro_lock = true;
MacroData const * data
- = it->second.second->getMacro(name, false);
- d->macro_lock = false;
+ = it->second.second->getMacro(name, false);
+ macro_lock = false;
if (data) {
bestPos = it->first;
bestData = data;
}
// try previous file if there is one
- if (it == d->position_to_children.begin())
+ if (it == position_to_children.begin())
break;
--it;
}
return 0;
// query buffer macros
- MacroData const * data = getBufferMacro(name, pos);
+ MacroData const * data = d->getBufferMacro(name, pos);
if (data != 0)
return data;
}
-void Buffer::updateMacros(DocIterator & it, DocIterator & scope) const
+void Buffer::Impl::updateMacros(DocIterator & it, DocIterator & scope)
{
- pit_type lastpit = it.lastpit();
+ pit_type const lastpit = it.lastpit();
// look for macros in each paragraph
while (it.pit() <= lastpit) {
// get buffer of external file
InsetInclude const & inset =
static_cast<InsetInclude const &>(*iit->inset);
- d->macro_lock = true;
+ macro_lock = true;
Buffer * child = inset.getChildBuffer();
- d->macro_lock = false;
+ macro_lock = false;
if (!child)
continue;
// register its position, but only when it is
// included first in the buffer
- if (d->children_positions.find(child) ==
- d->children_positions.end())
- d->children_positions[child] = it;
+ if (children_positions.find(child) ==
+ children_positions.end())
+ children_positions[child] = it;
// register child with its scope
- d->position_to_children[it] = Impl::ScopeBuffer(scope, child);
+ position_to_children[it] = Impl::ScopeBuffer(scope, child);
continue;
}
// get macro data
MathMacroTemplate & macroTemplate =
static_cast<MathMacroTemplate &>(*iit->inset);
- MacroContext mc(this, it);
+ MacroContext mc(owner_, it);
macroTemplate.updateToContext(mc);
// valid?
// register macro
// FIXME (Abdel), I don't understandt why we pass 'it' here
// instead of 'macroTemplate' defined above... is this correct?
- d->macros[macroTemplate.name()][it] =
- Impl::ScopeMacro(scope, MacroData(const_cast<Buffer *>(this), it));
+ macros[macroTemplate.name()][it] =
+ Impl::ScopeMacro(scope, MacroData(const_cast<Buffer *>(owner_), it));
}
// next paragraph
DocIterator it = par_iterator_begin();
DocIterator outerScope = it;
outerScope.pit() = outerScope.lastpit() + 2;
- updateMacros(it, outerScope);
+ d->updateMacros(it, outerScope);
}
// Check if the label 'from' appears more than once
vector<docstring> labels;
string paramName;
+ checkBibInfoCache();
BiblioInfo const & keys = masterBibInfo();
BiblioInfo::const_iterator bit = keys.begin();
BiblioInfo::const_iterator bend = keys.end();
void Buffer::updateTocItem(std::string const & type,
DocIterator const & dit) const
{
- if (gui_)
- gui_->updateTocItem(type, dit);
+ if (d->gui_)
+ d->gui_->updateTocItem(type, dit);
}
void Buffer::structureChanged() const
{
- if (gui_)
- gui_->structureChanged();
+ if (d->gui_)
+ d->gui_->structureChanged();
}
void Buffer::errors(string const & err, bool from_master) const
{
- if (gui_)
- gui_->errors(err, from_master);
+ if (d->gui_)
+ d->gui_->errors(err, from_master);
}
void Buffer::message(docstring const & msg) const
{
- if (gui_)
- gui_->message(msg);
+ if (d->gui_)
+ d->gui_->message(msg);
}
void Buffer::setBusy(bool on) const
{
- if (gui_)
- gui_->setBusy(on);
-}
-
-
-void Buffer::setReadOnly(bool on) const
-{
- if (d->wa_)
- d->wa_->setReadOnly(on);
+ if (d->gui_)
+ d->gui_->setBusy(on);
}
void Buffer::resetAutosaveTimers() const
{
- if (gui_)
- gui_->resetAutosaveTimers();
+ if (d->gui_)
+ d->gui_->resetAutosaveTimers();
}
bool Buffer::hasGuiDelegate() const
{
- return gui_;
+ return d->gui_;
}
void Buffer::setGuiDelegate(frontend::GuiBufferDelegate * gui)
{
- gui_ = gui;
+ d->gui_ = gui;
}
// Perfect target for a thread...
void Buffer::autoSave() const
{
- if (isBakClean() || isReadonly()) {
+ if (d->bak_clean || isReadonly()) {
// We don't save now, but we'll try again later
resetAutosaveTimers();
return;
AutoSaveBuffer autosave(*this, getAutosaveFilename());
autosave.start();
- markBakClean();
+ d->bak_clean = true;
+
resetAutosaveTimers();
}
bool Buffer::doExport(string const & format, bool put_in_tempdir,
- string & result_file) const
+ bool includeall, string & result_file) const
{
string backend_format;
OutputParams runparams(¶ms().encoding());
runparams.flavor = OutputParams::LATEX;
runparams.linelen = lyxrc.plaintext_linelen;
+ runparams.includeall = includeall;
vector<string> backs = backends();
if (find(backs.begin(), backs.end(), format) == backs.end()) {
// Get shortest path to format
return true;
}
- result_file = changeExtension(exportFileName().absFilename(), ext);
+ result_file = changeExtension(d->exportFileName().absFilename(), ext);
// We need to copy referenced files (e. g. included graphics
// if format == "dvi") to the result dir.
vector<ExportedFile> const files =
runparams.exportdata->externalFiles(format);
string const dest = onlyPath(result_file);
CopyStatus status = SUCCESS;
- for (vector<ExportedFile>::const_iterator it = files.begin();
- it != files.end() && status != CANCEL; ++it) {
+
+ vector<ExportedFile>::const_iterator it = files.begin();
+ vector<ExportedFile>::const_iterator const en = files.end();
+ for (; it != en && status != CANCEL; ++it) {
string const fmt = formats.getFormatFromFile(it->sourceName);
status = copyFile(fmt, it->sourceName,
makeAbsPath(it->exportName, dest),
it->exportName, status == FORCE);
}
+
if (status == CANCEL) {
message(_("Document export cancelled."));
} else if (tmp_result_file.exists()) {
}
-bool Buffer::doExport(string const & format, bool put_in_tempdir) const
+bool Buffer::doExport(string const & format, bool put_in_tempdir,
+ bool includeall) const
{
string result_file;
- return doExport(format, put_in_tempdir, result_file);
+ // (1) export with all included children (omit \includeonly)
+ if (includeall && !doExport(format, put_in_tempdir, true, result_file))
+ return false;
+ // (2) export with included children only
+ return doExport(format, put_in_tempdir, false, result_file);
}
-bool Buffer::preview(string const & format) const
+bool Buffer::preview(string const & format, bool includeall) const
{
string result_file;
- if (!doExport(format, true, result_file))
+ // (1) export with all included children (omit \includeonly)
+ if (includeall && !doExport(format, true, true))
+ return false;
+ // (2) export with included children only
+ if (!doExport(format, true, false, result_file))
return false;
return formats.view(*this, FileName(result_file), format);
}
&& !LyXVC::file_not_found_hook(s))
return false;
- if (s.isReadableFile()
- && readFileHelper(s)) {
+ if (s.isReadableFile()){
+ // InsetInfo needs to know if file is under VCS
lyxvc().file_found_hook(s);
- setReadonly(!s.isWritable());
- return true;
+ if (readFileHelper(s)) {
+ setReadonly(!s.isWritable());
+ return true;
+ }
}
return false;
}
}
-void Buffer::updateLabels(UpdateScope scope, bool out) const
+void Buffer::updateLabels(UpdateScope scope, UpdateType utype) const
{
// Use the master text class also for child documents
Buffer const * const master = masterBuffer();
DocumentClass const & textclass = master->params().documentClass();
+
+ // do this only if we are the top-level Buffer
+ if (scope != UpdateMaster || master == this)
+ checkBibInfoCache();
// keep the buffers to be children in this set. If the call from the
// master comes back we can see which of them were actually seen (i.e.
// If this is a child document start with the master
if (master != this) {
bufToUpdate.insert(this);
- master->updateLabels(UpdateMaster, out);
+ master->updateLabels(UpdateMaster, utype);
// Do this here in case the master has no gui associated with it. Then,
// the TocModel is not updated and TocModel::toc_ is invalid (bug 5699).
- if (!master->gui_)
+ if (!master->d->gui_)
structureChanged();
// was buf referenced from the master (i.e. not in bufToUpdate anymore)?
// do the real work
ParIterator parit = cbuf.par_iterator_begin();
- updateLabels(parit, out);
+ updateLabels(parit, utype);
if (master != this)
// TocBackend update will be done later.
// set the label of a paragraph. This includes the counters.
-void Buffer::setLabel(ParIterator & it) const
+void Buffer::Impl::setLabel(ParIterator & it, UpdateType utype) const
{
- BufferParams const & bp = this->masterBuffer()->params();
+ BufferParams const & bp = owner_->masterBuffer()->params();
DocumentClass const & textclass = bp.documentClass();
Paragraph & par = it.paragraph();
Layout const & layout = par.layout();
if (layout.toclevel <= bp.secnumdepth
&& (layout.latextype != LATEX_ENVIRONMENT
|| it.text()->isFirstInSequence(it.pit()))) {
- counters.step(layout.counter);
+ counters.step(layout.counter, utype);
par.params().labelString(
par.expandLabel(layout, bp));
} else
// Maybe we have to reset the enumeration counter.
if (needEnumCounterReset(it))
counters.reset(enumcounter);
- counters.step(enumcounter);
+ counters.step(enumcounter, utype);
string const & lang = par.getParLanguage(bp)->code();
par.params().labelString(counters.theCounter(enumcounter, lang));
string const & type = counters.current_float();
docstring full_label;
if (type.empty())
- full_label = this->B_("Senseless!!! ");
+ full_label = owner_->B_("Senseless!!! ");
else {
- docstring name = this->B_(textclass.floats().getType(type).name());
+ docstring name = owner_->B_(textclass.floats().getType(type).name());
if (counters.hasCounter(from_utf8(type))) {
string const & lang = par.getParLanguage(bp)->code();
- counters.step(from_utf8(type));
+ counters.step(from_utf8(type), utype);
full_label = bformat(from_ascii("%1$s %2$s:"),
name,
counters.theCounter(from_utf8(type), lang));
}
-void Buffer::updateLabels(ParIterator & parit, bool out) const
+void Buffer::updateLabels(ParIterator & parit, UpdateType utype) const
{
LASSERT(parit.pit() == 0, /**/);
parit->params().depth(min(parit->params().depth(), maxdepth));
maxdepth = parit->getMaxDepthAfter();
+ if (utype == OutputUpdate) {
+ // track the active counters
+ // we have to do this for the master buffer, since the local
+ // buffer isn't tracking anything.
+ masterBuffer()->params().documentClass().counters().
+ setActiveLayout(parit->layout());
+ }
+
// set the counter for this paragraph
- setLabel(parit);
+ d->setLabel(parit, utype);
- // Now the insets
+ // now the insets
InsetList::const_iterator iit = parit->insetList().begin();
InsetList::const_iterator end = parit->insetList().end();
for (; iit != end; ++iit) {
parit.pos() = iit->pos;
- iit->inset->updateLabels(parit, out);
+ iit->inset->updateLabels(parit, utype);
}
}
}
projects / lyx.git / blobdiff