mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-06 11:23:45 +00:00
f180e813fe
Regression atcfeddb929. If a flex inset has no layout upon saving (e.g. if a module has been deleted) then its name became lost. This checks whether the name resolution, introduced with the ObsoletedBy tag, comes back empty-handed (which it will if the layout is not defined). In this case, we do as was done beforecfeddb929. In addition, the use of support::token to strip "Flex:" off the beginning of the name introduces a regression if somebody used a name containing ":". This replaces it with support::split.
169 lines
4.0 KiB
C++
169 lines
4.0 KiB
C++
/**
|
|
* \file InsetFlex.cpp
|
|
* This file is part of LyX, the document processor.
|
|
* Licence details can be found in the file COPYING.
|
|
*
|
|
* \author Angus Leeming
|
|
* \author Martin Vermeer
|
|
* \author Jürgen Spitzmüller
|
|
*
|
|
* Full author contact details are available in file CREDITS.
|
|
*/
|
|
|
|
#include <config.h>
|
|
|
|
#include "InsetFlex.h"
|
|
|
|
#include "Buffer.h"
|
|
#include "BufferParams.h"
|
|
#include "Cursor.h"
|
|
#include "FuncRequest.h"
|
|
#include "FuncStatus.h"
|
|
#include "Language.h"
|
|
#include "Lexer.h"
|
|
#include "ParIterator.h"
|
|
#include "TextClass.h"
|
|
|
|
#include "support/gettext.h"
|
|
#include "support/lstrings.h"
|
|
|
|
#include <ostream>
|
|
|
|
using namespace std;
|
|
|
|
namespace lyx {
|
|
|
|
|
|
InsetFlex::InsetFlex(Buffer * buf, string const & layoutName)
|
|
: InsetCollapsable(buf), name_(layoutName)
|
|
{}
|
|
|
|
|
|
InsetFlex::InsetFlex(InsetFlex const & in)
|
|
: InsetCollapsable(in), name_(in.name_)
|
|
{}
|
|
|
|
|
|
// special code for InsetFlex when there is not the explicit Flex:: prefix
|
|
InsetLayout const & InsetFlex::getLayout() const
|
|
{
|
|
if (!buffer_)
|
|
return DocumentClass::plainInsetLayout();
|
|
|
|
DocumentClass const & dc = buffer().params().documentClass();
|
|
docstring const dname = from_utf8(name_);
|
|
if (dc.hasInsetLayout(dname))
|
|
return dc.insetLayout(dname);
|
|
return dc.insetLayout(from_utf8("Flex:" + name_));
|
|
}
|
|
|
|
|
|
InsetLayout::InsetDecoration InsetFlex::decoration() const
|
|
{
|
|
InsetLayout::InsetDecoration const dec = getLayout().decoration();
|
|
return dec == InsetLayout::DEFAULT ? InsetLayout::CONGLOMERATE : dec;
|
|
}
|
|
|
|
|
|
void InsetFlex::write(ostream & os) const
|
|
{
|
|
os << "Flex ";
|
|
string name;
|
|
if (name_.empty())
|
|
name = "undefined";
|
|
else {
|
|
InsetLayout const & il = getLayout();
|
|
// use il.name(), since this resolves obsoleted InsetLayout names
|
|
if (il.name() == "undefined")
|
|
// This is the name of the plain_insetlayout_. We assume that the
|
|
// name resolution has failed.
|
|
name = name_;
|
|
else {
|
|
name = to_utf8(il.name());
|
|
// Remove the "Flex:" prefix, if it is present
|
|
if (support::prefixIs(name, "Flex:"))
|
|
name = support::split(name, ':');
|
|
}
|
|
}
|
|
os << name << "\n";
|
|
InsetCollapsable::write(os);
|
|
}
|
|
|
|
|
|
bool InsetFlex::getStatus(Cursor & cur, FuncRequest const & cmd,
|
|
FuncStatus & flag) const
|
|
{
|
|
switch (cmd.action()) {
|
|
case LFUN_INSET_DISSOLVE:
|
|
if (!cmd.argument().empty()) {
|
|
InsetLayout const & il = getLayout();
|
|
InsetLayout::InsetLyXType const type =
|
|
translateLyXType(to_utf8(cmd.argument()));
|
|
if (il.lyxtype() == type) {
|
|
FuncRequest temp_cmd(LFUN_INSET_DISSOLVE);
|
|
return InsetCollapsable::getStatus(cur, temp_cmd, flag);
|
|
} else
|
|
return false;
|
|
}
|
|
// fall-through
|
|
default:
|
|
return InsetCollapsable::getStatus(cur, cmd, flag);
|
|
}
|
|
}
|
|
|
|
|
|
void InsetFlex::doDispatch(Cursor & cur, FuncRequest & cmd)
|
|
{
|
|
switch (cmd.action()) {
|
|
case LFUN_INSET_DISSOLVE:
|
|
if (!cmd.argument().empty()) {
|
|
InsetLayout const & il = getLayout();
|
|
InsetLayout::InsetLyXType const type =
|
|
translateLyXType(to_utf8(cmd.argument()));
|
|
|
|
if (il.lyxtype() == type) {
|
|
FuncRequest temp_cmd(LFUN_INSET_DISSOLVE);
|
|
InsetCollapsable::doDispatch(cur, temp_cmd);
|
|
} else
|
|
cur.undispatched();
|
|
break;
|
|
}
|
|
// fall-through
|
|
default:
|
|
InsetCollapsable::doDispatch(cur, cmd);
|
|
break;
|
|
}
|
|
}
|
|
|
|
|
|
void InsetFlex::updateBuffer(ParIterator const & it, UpdateType utype)
|
|
{
|
|
BufferParams const & bp = buffer().masterBuffer()->params();
|
|
InsetLayout const & il = getLayout();
|
|
docstring custom_label = translateIfPossible(il.labelstring());
|
|
|
|
Counters & cnts = bp.documentClass().counters();
|
|
docstring const & count = il.counter();
|
|
bool const have_counter = cnts.hasCounter(count);
|
|
if (have_counter) {
|
|
cnts.step(count, utype);
|
|
custom_label += ' ' +
|
|
cnts.theCounter(count, it.paragraph().getParLanguage(bp)->code());
|
|
}
|
|
setLabel(custom_label);
|
|
|
|
bool const save_counter = have_counter && utype == OutputUpdate;
|
|
if (save_counter) {
|
|
// we assume the counter is local to this inset
|
|
// if this turns out to be wrong in some case, we will
|
|
// need a layout flag
|
|
cnts.saveLastCounter();
|
|
}
|
|
InsetCollapsable::updateBuffer(it, utype);
|
|
if (save_counter)
|
|
cnts.restoreLastCounter();
|
|
}
|
|
|
|
|
|
} // namespace lyx
|