#include <fstream>
using std::ifstream;
+using std::getline;
#include <cstdlib>
#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(BufferView *, 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);
switch (data) {
case 1: // OK, citation
{
- if(!current_view->buffer()->isReadonly()) {
- InsetCommand * inset = static_cast<InsetCommand*>(citation_form->citation_form->u_vdata);
+ InsetCitation::Holder * holder =
+ static_cast<InsetCitation::Holder*>
+ (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(current_view, inset);
+ holder->view->updateInset(inset, true);
break;
}
// fall through to Cancel on RO-mode
break;
case 3: // OK, bibitem
{
- if(!current_view->buffer()->isReadonly()) {
- InsetCommand * inset = static_cast<InsetCommand*>(bibitem_form->bibitem_form->u_vdata);
+ InsetBibKey::Holder * holder =
+ static_cast<InsetBibKey::Holder*>
+ (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
}
{
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()))
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);
}
// 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";
}
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);
{
}
-
-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
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 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();
// 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();
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());
// 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)
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;
}
-// ale070405
-string bibitemWidthest()
+// ale070405
+string bibitemWidthest(Painter & pain)
{
int w = 0;
// Does look like a hack? It is! (but will change at 0.13)
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;
projects / lyx.git / blobdiff