X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetbibitem.C;h=89346660f835a460c6f43fd67d8cc08e06bbaa38;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=7243458d8860734b6beae1b4990920c25f2e668d;hpb=1fc0c01877f19d8194b6b22e61aa3db5fa2b1671;p=lyx.git diff --git a/src/insets/insetbibitem.C b/src/insets/insetbibitem.C index 7243458d88..89346660f8 100644 --- a/src/insets/insetbibitem.C +++ b/src/insets/insetbibitem.C @@ -21,14 +21,14 @@ #include "paragraph.h" #include "ParagraphList.h" -#include "frontends/font_metrics.h" - #include "support/lstrings.h" #include "support/std_ostream.h" #include "support/convert.h" -using lyx::docstring; -using lyx::support::prefixIs; + +namespace lyx { + +using support::prefixIs; using std::max; using std::string; @@ -36,14 +36,13 @@ 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, "bibitem"), counter(1) { - if (getContents().empty()) - setContents(key_prefix + convert(++key_counter)); + if (getParam("key").empty()) + setParam("key", key_prefix + convert(++key_counter)); } @@ -60,13 +59,16 @@ void InsetBibitem::doDispatch(LCursor & cur, FuncRequest & cmd) switch (cmd.action) { case LFUN_INSET_MODIFY: { - InsetCommandParams p; - InsetCommandMailer::string2params("bibitem", lyx::to_utf8(cmd.argument()), p); - if (!p.getCmdName().empty()) - setParams(p); - else - cur.noUpdate(); - break; + 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); } default: @@ -82,47 +84,31 @@ void InsetBibitem::setCounter(int c) } -// 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 +void InsetBibitem::read(Buffer const & buf, LyXLex & lex) { - os << "\n\\bibitem "; - if (!getOptions().empty()) - os << '[' << getOptions() << ']'; - os << '{' << getContents() << "}\n"; -} - + InsetCommand::read(buf, lex); -// This is necessary here because this is written without begin_inset -// This should be changed!!! (Jug) -void InsetBibitem::read(Buffer const &, LyXLex & lex) -{ - if (lex.eatLine()) - scanCommand(lex.getString()); - else - lex.printError("InsetCommand: Parse error: `$$Token'"); - - if (prefixIs(getContents(), key_prefix)) { - int const key = convert(getContents().substr(key_prefix.length())); + if (prefixIs(getParam("key"), key_prefix)) { + int const key = convert(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() ? convert(counter) : getOptions(); + docstring const & label = getParam("label"); + return label.empty() ? convert(counter) : label; } -string const InsetBibitem::getScreenLabel(Buffer const &) const +docstring const InsetBibitem::getScreenLabel(Buffer const &) const { - return getContents() + " [" + getBibLabel() + ']'; + return getParam("key") + " [" + getBibLabel() + ']'; } -int InsetBibitem::plaintext(Buffer const &, ostream & os, + +int InsetBibitem::plaintext(Buffer const &, odocstream & os, OutputParams const &) const { os << '[' << getCounter() << "] "; @@ -131,12 +117,33 @@ int InsetBibitem::plaintext(Buffer const &, ostream & os, // 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(); @@ -144,11 +151,20 @@ string const bibitemWidest(Buffer const & buffer) for (; it != end; ++it) { if (it->bibitem()) { - string const label = it->bibitem()->getBibLabel(); - docstring const dlab(label.begin(), label.end()); - - int const wx = - font_metrics::width(dlab, 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(); @@ -159,5 +175,8 @@ string const bibitemWidest(Buffer const & buffer) if (bitem && !bitem->getBibLabel().empty()) return bitem->getBibLabel(); - return "99"; + return from_ascii("99"); } + + +} // namespace lyx