anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix crash on LateX export.

Browse Source 
* insetbibitem.C:
  - bibitemWidest() don't use theFontMetrics in non GUI mode.
  - Add 3 FIXMEs

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15332 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Abdelrazak Younes 2006-10-14 15:22:08 +00:00
parent d0463cf006
commit a41282a1d6
1 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/insets/insetbibitem.C
View File

@ -38,6 +38,9 @@ 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,9 +148,28 @@ docstring const bibitemWidest(Buffer const & buffer)
// Does look like a hack? It is! (but will change at 0.13) // Does look like a hack? It is! (but will change at 0.13)
InsetBibitem const * bitem = 0; InsetBibitem const * bitem = 0;
// FIXME font is used unitialized, is that correct? // 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:
/*
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; LyXFont font;
lyx::frontend::FontMetrics const & fm = theFontMetrics(font);
ParagraphList::const_iterator it = buffer.paragraphs().begin(); ParagraphList::const_iterator it = buffer.paragraphs().begin();
ParagraphList::const_iterator end = buffer.paragraphs().end(); ParagraphList::const_iterator end = buffer.paragraphs().end();
@ -156,8 +178,13 @@ docstring const bibitemWidest(Buffer const & buffer)
if (it->bibitem()) { if (it->bibitem()) {
docstring const label = it->bibitem()->getBibLabel(); docstring const label = it->bibitem()->getBibLabel();
int const wx = // FIXME 1: we can't be sure using the following that the GUI
fm.width(label); // version and the command-line version will give the same
// result.
// FIXME 2: this use_gui test should be transfered to the frontend.
int const wx = lyx::use_gui?
theFontMetrics(font).width(label): label.size();
if (wx > w) { if (wx > w) {
w = wx; w = wx;
bitem = it->bibitem(); bitem = it->bibitem();