anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-12 22:14:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

revert change from previous commit and remove the FontMetrics access completely in order to be sure that bibitemWidest() gives the same bibitem GUI and no-GUI modes (even if that is potentially the wrong one.).

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15333 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Abdelrazak Younes 2006-10-14 15:31:50 +00:00
parent a41282a1d6
commit e049e75b6f
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/insets/insetbibitem.C
View File

@ -21,8 +21,6 @@
#include "paragraph.h" #include "paragraph.h"
#include "ParagraphList.h" #include "ParagraphList.h"
#include "frontends/FontMetrics.h"
#include "support/lstrings.h" #include "support/lstrings.h"
#include "support/std_ostream.h" #include "support/std_ostream.h"
#include "support/convert.h" #include "support/convert.h"
@ -38,10 +36,6 @@ using std::ostream;
int InsetBibitem::key_counter = 0; int InsetBibitem::key_counter = 0;
string const key_prefix = "key-"; string const key_prefix = "key-";
namespace lyx {
extern bool use_gui;
}
InsetBibitem::InsetBibitem(InsetCommandParams const & p) InsetBibitem::InsetBibitem(InsetCommandParams const & p)
: InsetCommand(p, "bibitem"), counter(1) : InsetCommand(p, "bibitem"), counter(1)
{ {
@ -145,11 +139,11 @@ int InsetBibitem::plaintext(Buffer const &, lyx::odocstream & os,
docstring const bibitemWidest(Buffer const & buffer) docstring const bibitemWidest(Buffer const & buffer)
{ {
int w = 0; int w = 0;
// Does look like a hack? It is! (but will change at 0.13)
InsetBibitem const * bitem = 0; InsetBibitem const * bitem = 0;
// FIXME: this font is used unitialized for now but should be set to // FIXME: this font is used unitialized for now but should be set to
// a proportional font. Here is what Georg has to say about it: // 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 bibitemWidest() is supposed to find the bibitem with the widest label in the
output, because that is needed as an argument of the bibliography output, because that is needed as an argument of the bibliography
@ -178,12 +172,17 @@ docstring const bibitemWidest(Buffer const & buffer)
if (it->bibitem()) { if (it->bibitem()) {
docstring const label = it->bibitem()->getBibLabel(); docstring const label = it->bibitem()->getBibLabel();
// FIXME 1: we can't be sure using the following that the GUI // FIXME: we can't be sure using the following that the GUI
// version and the command-line version will give the same // version and the command-line version will give the same
// result. // result.
// FIXME 2: this use_gui test should be transfered to the frontend. //
int const wx = lyx::use_gui? //int const wx = lyx::use_gui?
theFontMetrics(font).width(label): label.size(); // 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) { if (wx > w) {
w = wx; w = wx;