#include "lyxfont.h"
#include "lyxlex.h"
#include "paragraph.h"
-
-#include "frontends/font_metrics.h"
+#include "ParagraphList.h"
#include "support/lstrings.h"
-#include "support/tostr.h"
+#include "support/std_ostream.h"
+#include "support/convert.h"
+
-using lyx::support::prefixIs;
-using lyx::support::strToInt;
+namespace lyx {
+
+using support::prefixIs;
using std::max;
using std::string;
using std::auto_ptr;
-
+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), counter(1)
+ : InsetCommand(p, "bibitem"), counter(1)
{
- if (getContents().empty())
- setContents(key_prefix + tostr(++key_counter));
+ if (getParam("key").empty())
+ setParam("key", key_prefix + convert<docstring>(++key_counter));
}
-InsetBibitem::~InsetBibitem()
+auto_ptr<InsetBase> InsetBibitem::doClone() const
{
- InsetCommandMailer("bibitem", *this).hideDialog();
-}
-
-
-auto_ptr<InsetBase> InsetBibitem::clone() const
-{
- InsetBibitem * b = new InsetBibitem(params());
+ auto_ptr<InsetBibitem> b(new InsetBibitem(params()));
b->setCounter(counter);
return auto_ptr<InsetBase>(b);
}
-DispatchResult
-InsetBibitem::priv_dispatch(FuncRequest const & cmd,
- idx_type & idx, pos_type & pos)
+void InsetBibitem::doDispatch(LCursor & cur, FuncRequest & cmd)
{
switch (cmd.action) {
- case LFUN_INSET_EDIT:
- InsetCommandMailer("bibitem", *this).showDialog(cmd.view());
- return DispatchResult(DISPATCHED);
-
case LFUN_INSET_MODIFY: {
- InsetCommandParams p;
- InsetCommandMailer::string2params(cmd.argument, p);
- if (p.getCmdName().empty())
- return DispatchResult(DISPATCHED);
+ InsetCommandParams p("bibitem");
+ InsetCommandMailer::string2params("bibitem", to_utf8(cmd.argument()), p);
+ if (p.getCmdName().empty()) {
+ cur.noUpdate();
+ break;
+ }
+ if (p["key"] != params()["key"])
+ cur.bv().buffer()->changeRefsIfUnique(params()["key"],
+ p["key"], InsetBase::CITE_CODE);
setParams(p);
- cmd.view()->updateInset(this);
- cmd.view()->fitCursor();
- return DispatchResult(DISPATCHED);
}
default:
- return InsetCommand::priv_dispatch(cmd, idx, pos);
+ InsetCommand::doDispatch(cur, cmd);
+ break;
}
}
}
-// I'm sorry but this is still necessary because \bibitem is used also
-// as a LyX 2.x command, and lyxlex is not enough smart to understand
-// real LaTeX commands. Yes, that could be fixed, but would be a waste
-// of time cause LyX3 won't use lyxlex anyway. (ale)
-void InsetBibitem::write(Buffer const &, std::ostream & os) const
-{
- os << "\n\\bibitem ";
- if (!getOptions().empty())
- os << '[' << getOptions() << ']';
- os << '{' << getContents() << "}\n";
-}
-
-
-// This is necessary here because this is written without begin_inset
-// This should be changed!!! (Jug)
-void InsetBibitem::read(Buffer const &, LyXLex & lex)
+void InsetBibitem::read(Buffer const & buf, LyXLex & lex)
{
- if (lex.eatLine()) {
- scanCommand(lex.getString());
- } else {
- lex.printError("InsetCommand: Parse error: `$$Token'");
- }
+ InsetCommand::read(buf, lex);
- if (prefixIs(getContents(), key_prefix)) {
- int key = strToInt(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);
}
}
-string const InsetBibitem::getBibLabel() const
+docstring const InsetBibitem::getBibLabel() const
{
- return getOptions().empty() ? tostr(counter) : getOptions();
+ docstring const & label = getParam("label");
+ return label.empty() ? convert<docstring>(counter) : label;
}
-string const InsetBibitem::getScreenLabel(Buffer const &) const
+docstring const InsetBibitem::getScreenLabel(Buffer const &) const
{
- return getContents() + " [" + getBibLabel() + ']';
+ return getParam("key") + " [" + getBibLabel() + ']';
}
-// ale070405 This function maybe shouldn't be here. We'll fix this at 0.13.
-int bibitemMaxWidth(BufferView * bv, LyXFont const &)
+int InsetBibitem::plaintext(Buffer const &, odocstream & os,
+ OutputParams const &) const
{
- int w = 0;
- // Ha, now we are mainly at 1.2.0 and it is still here (Jug)
- // Does look like a hack? It is! (but will change at 0.13)
- ParagraphList::iterator it = bv->buffer()->paragraphs().begin();
- ParagraphList::iterator end = bv->buffer()->paragraphs().end();
- for (; it != end; ++it) {
- if (it->bibitem()) {
-#warning metrics broken!
- int const wx = it->bibitem()->width();
- if (wx > w)
- w = wx;
- }
- }
- return w;
+ os << '[' << getCounter() << "] ";
+ return 0;
}
// ale070405
-string const bibitemWidest(Buffer const & buffer)
+docstring const bibitemWidest(Buffer const & buffer)
{
int w = 0;
- // Does look like a hack? It is! (but will change at 0.13)
InsetBibitem const * bitem = 0;
+
+ // FIXME: this font is used unitialized for now but should be set to
+ // a proportional font. Here is what Georg Baum has to say about it:
+ /*
+ bibitemWidest() is supposed to find the bibitem with the widest label in the
+ output, because that is needed as an argument of the bibliography
+ environment to dtermine the correct indentation. To be 100% correct we
+ would need the metrics of the font that is used in the output, but usually
+ we don't have access to these.
+ In practice, any proportional font is probably good enough, since we don't
+ need to know the final with, we only need to know the which label is the
+ widest.
+ Unless there is an easy way to get the metrics of the output font I suggest
+ to use a hardcoded font like "Times" or so.
+
+ It is very important that the result of this function is the same both with
+ and without GUI. After thinking about this it is clear that no LyXFont
+ metrics should be used here, since these come from the gui. If we can't
+ easily get the LaTeX font metrics we should make our own poor mans front
+ metrics replacement, e.g. by hardcoding the metrics of the standard TeX
+ font.
+ */
LyXFont font;
ParagraphList::const_iterator it = buffer.paragraphs().begin();
for (; it != end; ++it) {
if (it->bibitem()) {
- int const wx =
- font_metrics::width(it->bibitem()->getBibLabel(),
- font);
+ docstring const label = it->bibitem()->getBibLabel();
+
+ // FIXME: we can't be sure using the following that the GUI
+ // version and the command-line version will give the same
+ // result.
+ //
+ //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
+ // that GUI and no-GUI gives the same bibitem (even if that is
+ // potentially the wrong one.
+ int const wx = label.size();
+
if (wx > w) {
w = wx;
bitem = it->bibitem();
if (bitem && !bitem->getBibLabel().empty())
return bitem->getBibLabel();
- return "99";
+ return from_ascii("99");
}
+
+
+} // namespace lyx
projects / lyx.git / blobdiff