X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetFlex.cpp;h=0b14973faa46fe06c323f4738371e5a62aa4a44d;hb=ed7d3a33abad4e1b5141b2ec626b542d1603782c;hp=2019af14f90d3e26137065bc7ca87a925099049c;hpb=dc2a6f95ff6c2dc721125a565cb418fc8c333d9a;p=lyx.git diff --git a/src/insets/InsetFlex.cpp b/src/insets/InsetFlex.cpp index 2019af14f9..0b14973faa 100644 --- a/src/insets/InsetFlex.cpp +++ b/src/insets/InsetFlex.cpp @@ -5,7 +5,7 @@ * * \author Angus Leeming * \author Martin Vermeer - * \author Jürgen Spitzmüller + * \author Jürgen Spitzmüller * * Full author contact details are available in file CREDITS. */ @@ -16,139 +16,152 @@ #include "Buffer.h" #include "BufferParams.h" -#include "BufferView.h" -#include "DispatchResult.h" +#include "Cursor.h" #include "FuncRequest.h" #include "FuncStatus.h" -#include "Cursor.h" -#include "gettext.h" +#include "Language.h" #include "Lexer.h" -#include "Text.h" -#include "MetricsInfo.h" -#include "Paragraph.h" -#include "paragraph_funcs.h" -#include "sgml.h" - -#include "frontends/FontMetrics.h" -#include "frontends/Painter.h" +#include "ParIterator.h" +#include "TextClass.h" -#include "support/convert.h" +#include "support/gettext.h" +#include "support/lstrings.h" -#include +#include +using namespace std; namespace lyx { -using std::string; -using std::ostream; - -InsetFlex::InsetFlex(BufferParams const & bp, - InsetLayout const & il) - : InsetCollapsable(bp, Collapsed, &il) -{ - params_.name = il.name; -} +InsetFlex::InsetFlex(Buffer * buf, string const & layoutName) + : InsetCollapsable(buf), name_(layoutName) +{} InsetFlex::InsetFlex(InsetFlex const & in) - : InsetCollapsable(in), params_(in.params_) + : InsetCollapsable(in), name_(in.name_) {} -Inset * InsetFlex::clone() const -{ - return new InsetFlex(*this); -} - - -bool InsetFlex::undefined() const -{ - return layout_->labelstring == from_utf8("UNDEFINED"); -} - - -docstring const InsetFlex::editMessage() const -{ - return _("Opened Flex Inset"); -} - - -void InsetFlex::write(Buffer const & buf, ostream & os) const +// special code for InsetFlex when there is not the explicit Flex:: prefix +InsetLayout const & InsetFlex::getLayout() const { - params_.write(os); - InsetCollapsable::write(buf, os); + 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_)); } -void InsetFlex::read(Buffer const & buf, Lexer & lex) +InsetLayout::InsetDecoration InsetFlex::decoration() const { - params_.read(lex); - InsetCollapsable::read(buf, lex); + InsetLayout::InsetDecoration const dec = getLayout().decoration(); + return dec == InsetLayout::DEFAULT ? InsetLayout::CONGLOMERATE : dec; } -int InsetFlex::plaintext(Buffer const & buf, odocstream & os, - OutputParams const & runparams) const +void InsetFlex::write(ostream & os) const { - return InsetText::plaintext(buf, os, runparams); -} - - -int InsetFlex::docbook(Buffer const & buf, odocstream & os, - OutputParams const & runparams) const -{ - ParagraphList::const_iterator beg = paragraphs().begin(); - ParagraphList::const_iterator par = paragraphs().begin(); - ParagraphList::const_iterator end = paragraphs().end(); - - if (!undefined()) - // FIXME UNICODE - sgml::openTag(os, layout_->latexname, - par->getID(buf, runparams) + layout_->latexparam); - - for (; par != end; ++par) { - par->simpleDocBookOnePar(buf, os, runparams, - outerFont(std::distance(beg, par), - paragraphs())); + 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, ':'); + } } - - if (!undefined()) - sgml::closeTag(os, layout_->latexname); - - return 0; + os << name << "\n"; + InsetCollapsable::write(os); } -void InsetFlex::textString(Buffer const & buf, odocstream & os) const +bool InsetFlex::getStatus(Cursor & cur, FuncRequest const & cmd, + FuncStatus & flag) const { - os << paragraphs().begin()->asString(buf, true); + 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 InsetFlexParams::write(ostream & os) const +void InsetFlex::doDispatch(Cursor & cur, FuncRequest & cmd) { - os << "Flex " << name << "\n"; + 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 InsetFlexParams::read(Lexer & lex) +void InsetFlex::updateBuffer(ParIterator const & it, UpdateType utype) { - while (lex.isOK()) { - lex.next(); - string token = lex.getString(); - - if (token == "Flex") { - lex.next(); - name = lex.getString(); - } - - // This is handled in Collapsable - else if (token == "status") { - lex.pushToken(token); - break; - } + 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(); }