#include "support/std_ostream.h"
#include "support/convert.h"
-using lyx::docstring;
-using lyx::odocstream;
-using lyx::support::prefixIs;
+
+namespace lyx {
+
+using support::prefixIs;
using std::max;
using std::string;
using std::ostream;
int InsetBibitem::key_counter = 0;
-string const key_prefix = "key-";
+docstring const key_prefix = from_ascii("key-");
InsetBibitem::InsetBibitem(InsetCommandParams const & p)
: InsetCommand(p, "bibitem"), counter(1)
{
- if (getContents().empty())
- setContents(key_prefix + convert<string>(++key_counter));
+ if (getParam("key").empty())
+ setParam("key", key_prefix + convert<docstring>(++key_counter));
}
case LFUN_INSET_MODIFY: {
InsetCommandParams p("bibitem");
- InsetCommandMailer::string2params("bibitem", lyx::to_utf8(cmd.argument()), p);
+ InsetCommandMailer::string2params("bibitem", to_utf8(cmd.argument()), p);
if (p.getCmdName().empty()) {
cur.noUpdate();
break;
}
- if (p.getContents() != params().getContents())
- cur.bv().buffer()->changeRefsIfUnique(params().getContents(),
- p.getContents(), InsetBase::CITE_CODE);
+ if (p["key"] != params()["key"])
+ cur.bv().buffer()->changeRefsIfUnique(params()["key"],
+ p["key"], InsetBase::CITE_CODE);
setParams(p);
}
{
InsetCommand::read(buf, lex);
- if (prefixIs(getContents(), key_prefix)) {
- int const key = convert<int>(getContents().substr(key_prefix.length()));
+ if (prefixIs(getParam("key"), key_prefix)) {
+ int const key = convert<int>(getParam("key").substr(key_prefix.length()));
key_counter = max(key_counter, key);
}
}
docstring const InsetBibitem::getBibLabel() const
{
- // FIXME UNICODE
- return getOptions().empty() ?
- convert<docstring>(counter) :
- lyx::from_utf8(getOptions());
+ docstring const & label = getParam("label");
+ return label.empty() ? convert<docstring>(counter) : label;
}
docstring const InsetBibitem::getScreenLabel(Buffer const &) const
{
- // FIXME UNICODE
- return lyx::from_utf8(getContents()) + " [" + getBibLabel() + ']';
+ return getParam("key") + " [" + getBibLabel() + ']';
}
// version and the command-line version will give the same
// result.
//
- //int const wx = lyx::use_gui?
+ //int const wx = use_gui?
// theFontMetrics(font).width(label): label.size();
//
// So for now we just use the label size in order to be sure
if (bitem && !bitem->getBibLabel().empty())
return bitem->getBibLabel();
- return lyx::from_ascii("99");
+ return from_ascii("99");
}
+
+
+} // namespace lyx