X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetbib.C;h=7bebfb9d1fba3028f8881902b815f4a3227d342d;hb=3c8aba3b556871fb1100a2f98cd93d5d4e3f70c9;hp=ec5f1c064eb3ed3a3330bb1c372168757f2fbb74;hpb=dfe1bc44b44903faf77ef454c98c4c3e56c1d5e3;p=lyx.git diff --git a/src/insets/insetbib.C b/src/insets/insetbib.C index ec5f1c064e..7bebfb9d1f 100644 --- a/src/insets/insetbib.C +++ b/src/insets/insetbib.C @@ -1,6 +1,9 @@ - #include +#include +using std::ifstream; +using std::getline; + #include #ifdef __GNUG__ @@ -19,13 +22,15 @@ #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); @@ -36,14 +41,18 @@ extern "C" void bibitem_cb(FL_OBJECT *, long data) switch (data) { case 1: // OK, citation { - if(!current_view->currentBuffer()->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 @@ -52,14 +61,18 @@ extern "C" void bibitem_cb(FL_OBJECT *, long data) break; case 3: // OK, bibitem { - if(!current_view->currentBuffer()->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->currentBuffer()->text->RedoParagraph(); - current_view->currentBuffer()->update(1); + holder->view->text->RedoParagraph(); + holder->view->update(1); break; } // fall through to Cancel on RO-mode } @@ -69,30 +82,31 @@ extern "C" void bibitem_cb(FL_OBJECT *, long data) } } -FD_citation_form *create_form_citation_form(void) + +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)); + FL_OBJECT * obj; + 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); + 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); bibcombox = new Combox(FL_COMBOX_INPUT); - bibcombox->add(80,10,130,30, 120); - - 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); - 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); - 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); + 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); + 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); + 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_end_form(); //fdui->citation_form->fdui = fdui; @@ -101,26 +115,26 @@ FD_citation_form *create_form_citation_form(void) } /*---------------------------------------*/ -FD_bibitem_form *create_form_bibitem_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)); + FL_OBJECT * obj; + 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); - 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); - 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); - 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); + 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); + 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); + 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); + 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_end_form(); //fdui->bibitem_form->fdui = fdui; @@ -130,31 +144,37 @@ FD_bibitem_form *create_form_bibitem_form(void) /*---------------------------------------*/ -InsetCitation::InsetCitation(string const & key, string const & note): - InsetCommand("cite", key, note) +InsetCitation::InsetCitation(string const & key, string const & note) + : InsetCommand("cite", key, note) { } + + 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->currentBuffer()->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())) @@ -164,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")); } } @@ -177,7 +198,7 @@ string InsetCitation::getScreenLabel() const temp += contents; if (!options.empty()) { - temp += "," + options; + temp += ", " + options; } return temp + ']'; @@ -193,17 +214,19 @@ InsetBibKey::InsetBibKey(string const & key, string const & label): } -InsetBibKey::InsetBibKey(InsetBibKey const *b): +InsetBibKey::InsetBibKey(InsetBibKey const * b): InsetCommand("bibitem", b->contents, b->options) { counter = b->counter; } + 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) @@ -219,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(FILE *file) +void InsetBibKey::Write(ostream & os) const { - string s; + os << "\\bibitem "; if (!options.empty()) { - s += '['; - s += options + ']'; + os << '[' + << options << ']'; } - s += '{'; - s += contents + '}'; - fprintf(file,"\\bibitem %s\n", s.c_str()); + os << '{' + << contents << "}\n"; } @@ -243,31 +265,36 @@ string InsetBibKey::getScreenLabel() const /* The value in "Key:" isn't allways set right after a few bibkey insets have - been added/removed. Perhaps the wrong object is deleted/used somewhere upwards? + been added/removed. Perhaps the wrong object is deleted/used somewhere + upwards? (Joacim 1998-03-04) */ -void InsetBibKey::Edit(int, int) +void InsetBibKey::Edit(BufferView * bv, int, int, unsigned int) { - if(current_view->currentBuffer()->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); + fl_set_button_shortcut(bibitem_form->key, scex(_("Key:|#K")), 1); fl_set_object_label(bibitem_form->label, idex(_("Label:|#L"))); - fl_set_button_shortcut(bibitem_form->label,scex(_("Label:|#L")),1); + fl_set_button_shortcut(bibitem_form->label, scex(_("Label:|#L")), 1); fl_set_input(bibitem_form->key, getContents().c_str()); fl_set_input(bibitem_form->label, getOptions().c_str()); if (bibitem_form->bibitem_form->visible) { fl_raise_form(bibitem_form->bibitem_form); } else { - fl_show_form(bibitem_form->bibitem_form,FL_PLACE_MOUSE, + fl_show_form(bibitem_form->bibitem_form, FL_PLACE_MOUSE, FL_FULLBORDER, _("Bibliography item")); } @@ -276,14 +303,17 @@ void InsetBibKey::Edit(int, int) InsetBibtex::InsetBibtex(string const & dbase, string const & style, - Buffer *o) - :InsetCommand("BibTeX", dbase, style), owner(o) + Buffer * o) + : InsetCommand("BibTeX", dbase, style), owner(o) { } - InsetBibtex::~InsetBibtex() { + 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); } @@ -293,38 +323,29 @@ string InsetBibtex::getScreenLabel() const } -int InsetBibtex::Latex(FILE *file, signed char /*fragile*/) -{ - string bib; - signed char dummy = 0; - int result = Latex(bib, dummy); - fprintf(file, "%s", bib.c_str()); - return result; -} - - -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 // inset is cut and pasted. Such hacks will not be needed // later (JMarc) if (!owner) { - owner = current_view->currentBuffer(); + owner = current_view->buffer(); } // If we generate in a temp dir, we might need to give an // absolute path there. This is a bit complicated since we can // have a comma-separated list of bibliographies - string db_in, adb, db_out; - db_in = getContents(); - db_in=split(db_in, adb, ','); + string adb, db_out; + string db_in = getContents(); + db_in = split(db_in, adb, ','); while(!adb.empty()) { if (!owner->niceFile && - IsFileReadable(MakeAbsPath(adb,owner->filepath)+".bib")) - adb = MakeAbsPath(adb,owner->filepath); + IsFileReadable(MakeAbsPath(adb, owner->filepath)+".bib")) + adb = MakeAbsPath(adb, owner->filepath); db_out += adb; db_out += ','; - db_in=split(db_in, adb,','); + db_in= split(db_in, adb,','); } db_out = strip(db_out, ','); // Idem, but simpler @@ -336,83 +357,68 @@ 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->currentBuffer(); - } - - // We need to create absolute path names for bibliographies - // First look for bib-file in same directory as document, - // then in all directories listed in environment variable - // BIBINPUTS - string bibfiles, linebuf, tmp, keys; - bibfiles = getContents(); - bibfiles=split(bibfiles, tmp, ','); + // 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(); + bibfiles = split(bibfiles, tmp, ','); while(!tmp.empty()) { - if (IsFileReadable(MakeAbsPath(tmp,owner->filepath)+".bib")) - tmp = MakeAbsPath(tmp,owner->filepath)+".bib"; - else { - tmp = FileOpenSearch(GetEnvPath("BIBINPUTS"),tmp,"bib"); - if (tmp.empty()) - tmp = FileOpenSearch(GetEnvPath("BIBINPUT"), - tmp, "bib"); - } + string fil = findtexfile(ChangeExtension(tmp, "bib", false), + "bib"); + lyxerr[Debug::LATEX] << "Bibfile: " << fil << endl; // If we didn't find a matching file name just fail silently - if (!tmp.empty()) { - - // This is a _very_ simple parser for Bibtex database files. - // All it does is to look for lines starting in @ and not - // being @preamble and @string entries. + if (!fil.empty()) { + // This is a _very_ simple parser for Bibtex database + // files. All it does is to look for lines starting + // in @ and not being @preamble and @string entries. // It does NOT do any syntax checking! - FilePtr file(tmp,FilePtr::read); - char c; - - // On some systems where feof() is a macro, - // the () after file is needed (JMarc) - while (! feof(file())) { - c = fgetc(file); - - // At end of each line check if line begins with '@' - if ( c == '\n') { - if (prefixIs(linebuf, "@") ) { - linebuf = subst(linebuf, - '{', '('); + ifstream ifs(fil.c_str()); + string linebuf; + while (getline(ifs, linebuf)) { + linebuf = frontStrip(linebuf); + if (prefixIs(linebuf, "@")) { + linebuf = subst(linebuf, '{', '('); + linebuf = split(linebuf, tmp, '('); + tmp = lowercase(tmp); + if (!prefixIs(tmp, "@string") + && !prefixIs(tmp, "@preamble")) { linebuf = split(linebuf, - tmp,'('); - tmp = lowercase(tmp); - if (!prefixIs(tmp, "@string") && !prefixIs(tmp, "@preamble") ) { - linebuf = split(linebuf, tmp,','); - if (!tmp.empty()) - keys += strip(tmp) + ","; + tmp, ','); + tmp = frontStrip(strip(tmp)); + if (!tmp.empty()) { + keys += tmp; + keys += delim; } } - linebuf.clear(); - } else { - linebuf += c; } } } // Get next file name - bibfiles=split(bibfiles, tmp, ','); + bibfiles = split(bibfiles, tmp, ','); } return keys; } + // 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(); @@ -420,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()); @@ -454,10 +463,10 @@ bool InsetBibtex::delDatabase(string const & db) int n = tokenPos(contents, ',', bd); if (n > 0) { // Weird code, would someone care to explain this?(Lgb) - string tmp(","); + string tmp(", "); tmp += bd; - contents = subst(contents, tmp.c_str(), ","); - } else if (n==0) + contents = subst(contents, tmp.c_str(), ", "); + } else if (n == 0) contents = split(contents, bd, ','); else return false; @@ -470,31 +479,30 @@ bool InsetBibtex::delDatabase(string const & db) void BibitemUpdate(Combox * combox) { combox->clear(); - - if (!current_view->available()) - return; - - string tmp, bibkeys = current_view->currentBuffer()->getBibkeyList(','); - bibkeys=split(bibkeys, tmp,','); + + if (!current_view->available()) return; + + string tmp, bibkeys = current_view->buffer()->getBibkeyList(','); + bibkeys = split(bibkeys, tmp,','); while (!tmp.empty()) { - combox->addto(tmp.c_str()); - bibkeys=split(bibkeys, tmp,','); + combox->addto(tmp.c_str()); + bibkeys = split(bibkeys, tmp,','); } } // 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) - LyXParagraph *par = current_view->currentBuffer()->paragraph; + LyXParagraph * par = current_view->buffer()->paragraph; 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; } @@ -502,19 +510,19 @@ 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) - LyXParagraph * par = current_view->currentBuffer()->paragraph; - InsetBibKey * bkey=0; + LyXParagraph * par = current_view->buffer()->paragraph; + InsetBibKey * bkey = 0; LyXFont font; 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; }