X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetFloatList.cpp;h=87e6bd2d343b412b9b68cc0c24508248f972ea4a;hb=2c357c1d23b7b83839a9beb8225d4f1ae4f793b4;hp=ab55cfab011efb5a1a41d99129ac4929bfae29d5;hpb=f7b1c86393d890d5d473279d88e26bb78f8c1275;p=lyx.git diff --git a/src/insets/InsetFloatList.cpp b/src/insets/InsetFloatList.cpp index ab55cfab01..87e6bd2d34 100644 --- a/src/insets/InsetFloatList.cpp +++ b/src/insets/InsetFloatList.cpp @@ -14,41 +14,57 @@ #include "Buffer.h" #include "BufferParams.h" -#include "debug.h" #include "DispatchResult.h" #include "Floating.h" #include "FloatList.h" #include "FuncRequest.h" -#include "gettext.h" #include "LaTeXFeatures.h" #include "Lexer.h" #include "MetricsInfo.h" #include "TocBackend.h" +#include "TextClass.h" +#include "support/debug.h" +#include "support/gettext.h" #include "support/lstrings.h" +#include -namespace lyx { - -using support::bformat; +using namespace std; +using namespace lyx::support; -using std::endl; -using std::string; -using std::ostream; +namespace lyx { InsetFloatList::InsetFloatList() - : InsetCommand(InsetCommandParams("floatlist"), "toc") + : InsetCommand(InsetCommandParams(FLOAT_LIST_CODE), "toc") {} InsetFloatList::InsetFloatList(string const & type) - : InsetCommand(InsetCommandParams("floatlist"), "toc") + : InsetCommand(InsetCommandParams(FLOAT_LIST_CODE), "toc") { setParam("type", from_ascii(type)); } +CommandInfo const * InsetFloatList::findInfo(string const & /* cmdName */) +{ + static const char * const paramnames[] = {"type", ""}; + static const bool isoptional[] = {false}; + static const CommandInfo info = {1, paramnames, isoptional}; + return &info; +} + + +//HACK +bool InsetFloatList::isCompatibleCommand(string const & s) +{ + string str = s.substr(0, 6); + return str == "listof"; +} + + docstring const InsetFloatList::getScreenLabel(Buffer const & buf) const { FloatList const & floats = buf.params().getTextClass().floats(); @@ -60,12 +76,6 @@ docstring const InsetFloatList::getScreenLabel(Buffer const & buf) const } -InsetCode InsetFloatList::lyxCode() const -{ - return FLOAT_LIST_CODE; -} - - void InsetFloatList::write(Buffer const &, ostream & os) const { os << "FloatList " << to_ascii(getParam("type")) << "\n"; @@ -79,12 +89,14 @@ void InsetFloatList::read(Buffer const & buf, Lexer & lex) if (lex.eatLine()) { setParam("type", lex.getDocString()); - LYXERR(Debug::INSETS) << "FloatList::float_type: " - << to_ascii(getParam("type")) << endl; + LYXERR(Debug::INSETS, "FloatList::float_type: " + << to_ascii(getParam("type"))); if (!floats.typeExist(to_ascii(getParam("type")))) lex.printError("InsetFloatList: Unknown float type: `$$Token'"); - } else + } else { lex.printError("InsetFloatList: Parse error: `$$Token'"); + } + while (lex.isOK()) { lex.next(); token = lex.getString();