X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetbib.C;h=7bebfb9d1fba3028f8881902b815f4a3227d342d;hb=3c8aba3b556871fb1100a2f98cd93d5d4e3f70c9;hp=09040ef2d107d7c09ffa05954f9174eebe684b83;hpb=0490083ef1d69e6347782ec15503532f6d6dc33b;p=lyx.git diff --git a/src/insets/insetbib.C b/src/insets/insetbib.C index 09040ef2d1..7bebfb9d1f 100644 --- a/src/insets/insetbib.C +++ b/src/insets/insetbib.C @@ -2,6 +2,7 @@ #include using std::ifstream; +using std::getline; #include @@ -21,13 +22,15 @@ using std::ifstream; #include "lyxtext.h" #include "support/filetools.h" +using std::ostream; +using std::endl; + extern BufferView * current_view; FD_citation_form * citation_form = 0; FD_bibitem_form * bibitem_form = 0; static Combox * bibcombox = 0; -extern void UpdateInset(Inset * inset, bool mark_dirty = true); void BibitemUpdate(Combox *); FD_citation_form * create_form_citation_form(void); FD_bibitem_form * create_form_bibitem_form(void); @@ -38,14 +41,18 @@ extern "C" void bibitem_cb(FL_OBJECT *, long data) switch (data) { case 1: // OK, citation { - if(!current_view->buffer()->isReadonly()) { - InsetCommand * inset = static_cast(citation_form->citation_form->u_vdata); + InsetCitation::Holder * holder = + static_cast + (citation_form->citation_form->u_vdata); + if(!holder->view->buffer()->isReadonly()) { + + InsetCitation * inset = holder->inset; inset->setContents(bibcombox->getline()); inset->setOptions(fl_get_input(citation_form->label)); fl_hide_form(citation_form->citation_form); // shouldn't mark the buffer dirty unless something // was actually altered - UpdateInset(inset); + holder->view->updateInset(inset, true); break; } // fall through to Cancel on RO-mode @@ -54,14 +61,18 @@ extern "C" void bibitem_cb(FL_OBJECT *, long data) break; case 3: // OK, bibitem { - if(!current_view->buffer()->isReadonly()) { - InsetCommand * inset = static_cast(bibitem_form->bibitem_form->u_vdata); + InsetBibKey::Holder * holder = + static_cast + (bibitem_form->bibitem_form->u_vdata); + + if(!holder->view->buffer()->isReadonly()) { + InsetBibKey * inset = holder->inset; inset->setContents(fl_get_input(bibitem_form->key)); inset->setOptions(fl_get_input(bibitem_form->label)); fl_hide_form(bibitem_form->bibitem_form); // Does look like a hack? It is! (but will change at 0.13) - current_view->text->RedoParagraph(); - current_view->update(1); + holder->view->text->RedoParagraph(); + holder->view->update(1); break; } // fall through to Cancel on RO-mode } @@ -84,7 +95,7 @@ FD_citation_form * create_form_citation_form(void) fl_set_object_lalign(obj, FL_ALIGN_RIGHT); bibcombox = new Combox(FL_COMBOX_INPUT); - bibcombox->add(80, 10, 130, 30, 120); + bibcombox->add(80, 10, 130, 30, 300); obj = fl_add_button(FL_RETURN_BUTTON, 20, 90, 90, 30, _("OK")); fl_set_object_lsize(obj, FL_NORMAL_SIZE); @@ -144,22 +155,26 @@ InsetCitation::~InsetCitation() { if(citation_form && citation_form->citation_form && citation_form->citation_form->visible - && citation_form->citation_form->u_vdata == this) + && citation_form->citation_form->u_vdata == &holder) fl_hide_form(citation_form->citation_form); } -void InsetCitation::Edit(int, int) +void InsetCitation::Edit(BufferView * bv, int, int, unsigned int) { - if(current_view->buffer()->isReadonly()) - WarnReadonly(current_view->buffer()->fileName()); + if(bv->buffer()->isReadonly()) + WarnReadonly(bv->buffer()->fileName()); if (!citation_form) { citation_form = create_form_citation_form(); fl_set_form_atclose(citation_form->citation_form, CancelCloseBoxCB, 0); } - citation_form->citation_form->u_vdata = this; + + holder.inset = this; + holder.view = bv; + + citation_form->citation_form->u_vdata = &holder; BibitemUpdate(bibcombox); if (!bibcombox->select_text(getContents().c_str())) @@ -209,7 +224,8 @@ InsetBibKey::InsetBibKey(InsetBibKey const * b): InsetBibKey::~InsetBibKey() { if(bibitem_form && bibitem_form->bibitem_form - && bibitem_form->bibitem_form->visible) + && bibitem_form->bibitem_form->visible + && bibitem_form->bibitem_form->u_vdata == &holder) fl_hide_form(bibitem_form->bibitem_form); } @@ -226,16 +242,15 @@ void InsetBibKey::setCounter(int c) // 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 InsetBibKey::Write(ostream & os) +void InsetBibKey::Write(ostream & os) const { - string s; + os << "\\bibitem "; if (!options.empty()) { - s += '['; - s += options + ']'; + os << '[' + << options << ']'; } - s += '{'; - s += contents + '}'; - os << "\\bibitem " << s << "\n"; + os << '{' + << contents << "}\n"; } @@ -254,17 +269,21 @@ string InsetBibKey::getScreenLabel() const upwards? (Joacim 1998-03-04) */ -void InsetBibKey::Edit(int, int) +void InsetBibKey::Edit(BufferView * bv, int, int, unsigned int) { - if(current_view->buffer()->isReadonly()) - WarnReadonly(current_view->buffer()->fileName()); + if(bv->buffer()->isReadonly()) + WarnReadonly(bv->buffer()->fileName()); if (!bibitem_form) { bibitem_form = create_form_bibitem_form(); fl_set_form_atclose(bibitem_form->bibitem_form, CancelCloseBoxCB, 0); } - bibitem_form->bibitem_form->u_vdata = this; + + holder.inset = this; + holder.view = bv; + + bibitem_form->bibitem_form->u_vdata = &holder; // InsetBibtex uses the same form, with different labels fl_set_object_label(bibitem_form->key, idex(_("Key:|#K"))); fl_set_button_shortcut(bibitem_form->key, scex(_("Key:|#K")), 1); @@ -289,24 +308,23 @@ InsetBibtex::InsetBibtex(string const & dbase, string const & style, { } - -string InsetBibtex::getScreenLabel() const +InsetBibtex::~InsetBibtex() { - return _("BibTeX Generated References"); + if(bibitem_form && bibitem_form->bibitem_form + && bibitem_form->bibitem_form->visible + && bibitem_form->bibitem_form->u_vdata == &holder) + fl_hide_form(bibitem_form->bibitem_form); } -int InsetBibtex::Latex(ostream & os, signed char /*fragile*/) +string InsetBibtex::getScreenLabel() const { - string bib; - signed char dummy = 0; - int result = Latex(bib, dummy); - os << bib; - return result; + return _("BibTeX Generated References"); } -int InsetBibtex::Latex(string & file, signed char /*fragile*/) +int InsetBibtex::Latex(ostream & os, + bool /*fragile*/, bool/*fs*/) const { // this looks like an horrible hack and it is :) The problem // is that owner is not initialized correctly when the bib @@ -339,12 +357,8 @@ int InsetBibtex::Latex(string & file, signed char /*fragile*/) else style = getOptions(); - file += "\\bibliographystyle{"; - file += style; - file += "}\n"; - file += "\\bibliography{"; - file += db_out; - file += "}\n"; + os << "\\bibliographystyle{" << style << "}\n" + << "\\bibliography{" << db_out << "}\n"; return 2; } @@ -354,9 +368,13 @@ string InsetBibtex::getKeys(char delim) { // This hack is copied from InsetBibtex::Latex. // Is it still needed? Probably yes. - if (!owner) { - owner = current_view->buffer(); - } + // Why is this needed here when it already is in Latex? + // Anyway we need a different way to get to the + // buffer the inset is in. (Lgb) + + //if (!owner) { + // owner = current_view->buffer(); + //} string tmp, keys; string bibfiles = getContents(); @@ -400,7 +418,7 @@ string InsetBibtex::getKeys(char delim) // BibTeX should have its own dialog. This is provisional. -void InsetBibtex::Edit(int, int) +void InsetBibtex::Edit(BufferView * bv, int, int, unsigned int) { if (!bibitem_form) { bibitem_form = create_form_bibitem_form(); @@ -408,7 +426,10 @@ void InsetBibtex::Edit(int, int) CancelCloseBoxCB, 0); } - bibitem_form->bibitem_form->u_vdata = this; + holder.inset = this; + holder.view = bv; + bibitem_form->bibitem_form->u_vdata = &holder; + fl_set_object_label(bibitem_form->key, _("Database:")); fl_set_object_label(bibitem_form->label, _("Style: ")); fl_set_input(bibitem_form->key, getContents().c_str()); @@ -472,7 +493,7 @@ void BibitemUpdate(Combox * combox) // ale070405 This function maybe shouldn't be here. We'll fix this at 0.13. -int bibitemMaxWidth(LyXFont const & font) +int bibitemMaxWidth(Painter & pain, LyXFont const & font) { int w = 0; // Does look like a hack? It is! (but will change at 0.13) @@ -480,7 +501,7 @@ int bibitemMaxWidth(LyXFont const & font) while (par) { if (par->bibkey) { - int wx = par->bibkey->Width(font); + int wx = par->bibkey->width(pain, font); if (wx > w) w = wx; } par = par->next; @@ -489,8 +510,8 @@ int bibitemMaxWidth(LyXFont const & font) } -// ale070405 -string bibitemWidthest() +// ale070405 +string bibitemWidthest(Painter & pain) { int w = 0; // Does look like a hack? It is! (but will change at 0.13) @@ -500,7 +521,7 @@ string bibitemWidthest() while (par) { if (par->bibkey) { - int wx = par->bibkey->Width(font); + int wx = par->bibkey->width(pain, font); if (wx > w) { w = wx; bkey = par->bibkey;