X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetbib.C;h=7bebfb9d1fba3028f8881902b815f4a3227d342d;hb=3c8aba3b556871fb1100a2f98cd93d5d4e3f70c9;hp=44d8fa9f067b712e087ce3537886b483950d1826;hpb=75c5c8c9e51469822100d70a1ead0d7f8d3f69de;p=lyx.git diff --git a/src/insets/insetbib.C b/src/insets/insetbib.C index 44d8fa9f06..7bebfb9d1f 100644 --- a/src/insets/insetbib.C +++ b/src/insets/insetbib.C @@ -1,8 +1,8 @@ - #include #include using std::ifstream; +using std::getline; #include @@ -22,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); @@ -39,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 @@ -55,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->buffer()->text->RedoParagraph(); - current_view->buffer()->update(1); + holder->view->text->RedoParagraph(); + holder->view->update(1); break; } // fall through to Cancel on RO-mode } @@ -76,27 +86,27 @@ extern "C" void bibitem_cb(FL_OBJECT *, long data) FD_citation_form * create_form_citation_form(void) { FL_OBJECT * obj; - FD_citation_form *fdui = (FD_citation_form *) fl_calloc(1, sizeof(FD_citation_form)); + FD_citation_form * fdui = (FD_citation_form *) fl_calloc(1, sizeof(FD_citation_form)); fdui->citation_form = fl_bgn_form(FL_NO_BOX, 220, 130); obj = fl_add_box(FL_UP_BOX, 0, 0, 220, 130, ""); fdui->key = obj = fl_add_text(FL_NORMAL_TEXT, 20, 10, 60, 30, _("Key:")); - fl_set_object_lsize(obj, FL_NORMAL_SIZE); - fl_set_object_lalign(obj, FL_ALIGN_RIGHT); + fl_set_object_lsize(obj, FL_NORMAL_SIZE); + 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); - fl_set_object_callback(obj, bibitem_cb, 1); + fl_set_object_lsize(obj, FL_NORMAL_SIZE); + fl_set_object_callback(obj, bibitem_cb, 1); obj = fl_add_button(FL_NORMAL_BUTTON, 120, 90, 90, 30, idex(_("Cancel|^["))); - fl_set_button_shortcut(obj, scex(_("Cancel|^[")), 1); - fl_set_object_lsize(obj, FL_NORMAL_SIZE); - fl_set_object_callback(obj, bibitem_cb, 0); + fl_set_button_shortcut(obj, scex(_("Cancel|^[")), 1); + fl_set_object_lsize(obj, FL_NORMAL_SIZE); + fl_set_object_callback(obj, bibitem_cb, 0); fdui->label = obj = fl_add_input(FL_NORMAL_INPUT, 80, 50, 130, 30, idex(_("Remark:|#R"))); - fl_set_input_shortcut(obj, scex(_("Remark:|#R")), 1); - fl_set_object_lsize(obj, FL_NORMAL_SIZE); + fl_set_input_shortcut(obj, scex(_("Remark:|#R")), 1); + fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_end_form(); //fdui->citation_form->fdui = fdui; @@ -108,23 +118,23 @@ FD_citation_form * create_form_citation_form(void) FD_bibitem_form * create_form_bibitem_form(void) { FL_OBJECT * obj; - FD_bibitem_form *fdui = (FD_bibitem_form *) fl_calloc(1, sizeof(FD_bibitem_form)); + FD_bibitem_form * fdui = (FD_bibitem_form *) fl_calloc(1, sizeof(FD_bibitem_form)); fdui->bibitem_form = fl_bgn_form(FL_NO_BOX, 220, 130); obj = fl_add_box(FL_UP_BOX, 0, 0, 220, 130, ""); fdui->key = obj = fl_add_input(FL_NORMAL_INPUT, 80, 10, 130, 30, idex(_("Key:|#K"))); - fl_set_input_shortcut(obj, scex(_("Key:|#K")), 1); - fl_set_object_lsize(obj, FL_NORMAL_SIZE); + fl_set_input_shortcut(obj, scex(_("Key:|#K")), 1); + fl_set_object_lsize(obj, FL_NORMAL_SIZE); obj = fl_add_button(FL_RETURN_BUTTON, 20, 90, 90, 30, _("OK")); - fl_set_object_lsize(obj, FL_NORMAL_SIZE); - fl_set_object_callback(obj, bibitem_cb, 3); + fl_set_object_lsize(obj, FL_NORMAL_SIZE); + fl_set_object_callback(obj, bibitem_cb, 3); obj = fl_add_button(FL_NORMAL_BUTTON, 120, 90, 90, 30, idex(_("Cancel|^["))); - fl_set_button_shortcut(obj, scex(_("Cancel|^[")), 1); - fl_set_object_lsize(obj, FL_NORMAL_SIZE); - fl_set_object_callback(obj, bibitem_cb, 2); + fl_set_button_shortcut(obj, scex(_("Cancel|^[")), 1); + fl_set_object_lsize(obj, FL_NORMAL_SIZE); + fl_set_object_callback(obj, bibitem_cb, 2); fdui->label = obj = fl_add_input(FL_NORMAL_INPUT, 80, 50, 130, 30, idex(_("Label:|#L"))); - fl_set_input_shortcut(obj, scex(_("Label:|#L")), 1); - fl_set_object_lsize(obj, FL_NORMAL_SIZE); + fl_set_input_shortcut(obj, scex(_("Label:|#L")), 1); + fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_end_form(); //fdui->bibitem_form->fdui = fdui; @@ -145,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(); + 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())) @@ -170,7 +184,8 @@ void InsetCitation::Edit(int, int) if (citation_form->citation_form->visible) { fl_raise_form(citation_form->citation_form); } else { - fl_show_form(citation_form->citation_form, FL_PLACE_MOUSE, FL_FULLBORDER, + fl_show_form(citation_form->citation_form, + FL_PLACE_MOUSE, FL_FULLBORDER, _("Citation")); } } @@ -209,8 +224,9 @@ InsetBibKey::InsetBibKey(InsetBibKey const * b): InsetBibKey::~InsetBibKey() { if(bibitem_form && bibitem_form->bibitem_form - && bibitem_form->bibitem_form->visible) - fl_hide_form(bibitem_form->bibitem_form); + && bibitem_form->bibitem_form->visible + && bibitem_form->bibitem_form->u_vdata == &holder) + fl_hide_form(bibitem_form->bibitem_form); } void InsetBibKey::setCounter(int c) @@ -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(); + 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,24 +357,24 @@ 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; } // This method returns a comma separated list of Bibtex entries -string InsetBibtex::getKeys() +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(); @@ -364,7 +382,7 @@ string InsetBibtex::getKeys() while(!tmp.empty()) { string fil = findtexfile(ChangeExtension(tmp, "bib", false), "bib"); - lyxerr << "Bibfile: " << fil << endl; + lyxerr[Debug::LATEX] << "Bibfile: " << fil << endl; // If we didn't find a matching file name just fail silently if (!fil.empty()) { // This is a _very_ simple parser for Bibtex database @@ -374,6 +392,7 @@ string InsetBibtex::getKeys() ifstream ifs(fil.c_str()); string linebuf; while (getline(ifs, linebuf)) { + linebuf = frontStrip(linebuf); if (prefixIs(linebuf, "@")) { linebuf = subst(linebuf, '{', '('); linebuf = split(linebuf, tmp, '('); @@ -382,9 +401,10 @@ string InsetBibtex::getKeys() && !prefixIs(tmp, "@preamble")) { linebuf = split(linebuf, tmp, ','); + tmp = frontStrip(strip(tmp)); if (!tmp.empty()) { - keys += strip(tmp); - keys += ", "; + keys += tmp; + keys += delim; } } } @@ -398,7 +418,7 @@ string InsetBibtex::getKeys() // 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(); @@ -406,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()); @@ -470,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) @@ -478,8 +501,8 @@ int bibitemMaxWidth(LyXFont const & font) while (par) { if (par->bibkey) { - int wx = par->bibkey->Width(font); - if (wx>w) w = wx; + int wx = par->bibkey->width(pain, font); + if (wx > w) w = wx; } par = par->next; } @@ -487,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) @@ -498,8 +521,8 @@ string bibitemWidthest() while (par) { if (par->bibkey) { - int wx = par->bibkey->Width(font); - if (wx>w) { + int wx = par->bibkey->width(pain, font); + if (wx > w) { w = wx; bkey = par->bibkey; }