#include "lyxtext.h"
#include "support/filetools.h"
#include "support/path.h"
+#include "lyxrc.h"
using std::ostream;
using std::ifstream;
using std::vector;
using std::pair;
-extern BufferView * current_view;
-
FD_bibitem_form * bibitem_form = 0;
FD_bibitem_form * create_form_bibitem_form(void);
+extern BufferView * current_view;
+// This is foul!
+// called from both InsetBibKey and InsetBibtex dialogs yet cast off
+// only to InsetBibKey holder. Real problems can ensue.
extern "C"
void bibitem_cb(FL_OBJECT *, long data)
{
InsetBibKey::Holder * holder =
static_cast<InsetBibKey::Holder*>
(bibitem_form->bibitem_form->u_vdata);
-
+
holder->inset->callback( bibitem_form, data );
}
}
-InsetBibKey::InsetBibKey(string const & key, string const & label)
- : InsetCommand("bibitem", key, label)
+InsetBibKey::InsetBibKey(InsetCommandParams const & p)
+ : InsetCommand(p)
{
counter = 1;
- if (key.empty())
- setCmdName(" ");
-}
-
-
-InsetBibKey::InsetBibKey(InsetBibKey const * b)
- : InsetCommand("bibitem", b->getContents(), b->getOptions())
-{
- counter = b->counter;
}
InsetBibKey::~InsetBibKey()
{
- if(bibitem_form && bibitem_form->bibitem_form
+ 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);
}
+Inset * InsetBibKey::Clone(Buffer const &) const
+{
+ InsetBibKey * b = new InsetBibKey(params());
+ b->setCounter(counter);
+ return b;
+}
+
+
void InsetBibKey::callback( FD_bibitem_form * form, long data )
{
switch (data) {
case 1:
- if(!holder.view->buffer()->isReadonly()) {
+ // Do NOT change this to
+ // holder.view->buffer() as this code is used by both
+ // InsetBibKey and InsetBibtex! Ughhhhhhh!!!!
+ if (!current_view->buffer()->isReadonly()) {
setContents(fl_get_input(form->key));
setOptions(fl_get_input(form->label));
// shouldn't mark the buffer dirty unless
// something was actually altered
- holder.view->updateInset( this, true );
+ current_view->updateInset( this, true );
} // fall through to Cancel
case 0:
fl_hide_form(form->bibitem_form);
}
-string InsetBibKey::getScreenLabel() const
+string const InsetBibKey::getScreenLabel() const
{
if (! getOptions().empty())
return getOptions();
*/
void InsetBibKey::Edit(BufferView * bv, int, int, unsigned int)
{
- if(bv->buffer()->isReadonly())
+ if (bv->buffer()->isReadonly())
WarnReadonly(bv->buffer()->fileName());
if (!bibitem_form) {
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_FULLBORDER,
+ fl_show_form(bibitem_form->bibitem_form,
+ FL_PLACE_MOUSE | FL_FREE_SIZE, FL_TRANSIENT,
_("Bibliography item"));
}
}
-InsetBibtex::InsetBibtex(string const & dbase, string const & style,
- Buffer * o)
- : InsetCommand("BibTeX", dbase, style), owner(o)
+InsetBibtex::InsetBibtex(InsetCommandParams const & p)
+ : InsetCommand(p)
{}
InsetBibtex::~InsetBibtex()
{
- if(bibitem_form && bibitem_form->bibitem_form
+ 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);
}
-string InsetBibtex::getScreenLabel() const
+string const InsetBibtex::getScreenLabel() const
{
return _("BibTeX Generated References");
}
-int InsetBibtex::Latex(Buffer const *, ostream & os,
+int InsetBibtex::Latex(Buffer const * buffer, 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->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 = getContents();
db_in = split(db_in, adb, ',');
while(!adb.empty()) {
- if (!owner->niceFile &&
- IsFileReadable(MakeAbsPath(adb, owner->filepath)+".bib"))
- adb = MakeAbsPath(adb, owner->filepath);
+ if (!buffer->niceFile &&
+ IsFileReadable(MakeAbsPath(adb, buffer->filepath)+".bib"))
+ adb = MakeAbsPath(adb, buffer->filepath);
db_out += adb;
db_out += ',';
db_out = strip(db_out, ',');
// Idem, but simpler
string style;
- if (!owner->niceFile
- && IsFileReadable(MakeAbsPath(getOptions(), owner->filepath)
+ if (!buffer->niceFile
+ && IsFileReadable(MakeAbsPath(getOptions(), buffer->filepath)
+ ".bst"))
- style = MakeAbsPath(getOptions(), owner->filepath);
+ style = MakeAbsPath(getOptions(), buffer->filepath);
else
style = getOptions();
// This method returns a comma separated list of Bibtex entries
-vector<pair<string,string> > InsetBibtex::getKeys() const
+vector<pair<string, string> > const InsetBibtex::getKeys(Buffer const * buffer) const
{
- // This hack is copied from InsetBibtex::Latex.
- // Is it still needed? Probably yes.
- // 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();
- //}
-
- Path p(owner->filepath);
+ Path p(buffer->filepath);
vector<pair<string,string> > keys;
string tmp;
string linebuf0;
while (getline(ifs, linebuf0)) {
string linebuf = frontStrip(strip(linebuf0));
- if( linebuf.empty() ) continue;
+ if (linebuf.empty() ) continue;
if (prefixIs(linebuf, "@")) {
linebuf = subst(linebuf, '{', '(');
linebuf = split(linebuf, tmp, '(');
keys.push_back(pair<string,string>(tmp,string()));
}
}
- } else if( !keys.empty() ) {
+ } else if (!keys.empty()) {
keys.back().second += linebuf + "\n";
}
}
fl_raise_form(bibitem_form->bibitem_form);
} else {
fl_show_form(bibitem_form->bibitem_form,
- FL_PLACE_MOUSE, FL_FULLBORDER,
+ FL_PLACE_MOUSE | FL_FREE_SIZE, FL_TRANSIENT,
_("BibTeX"));
}
}
bool InsetBibtex::addDatabase(string const & db)
{
string contents(getContents());
- if (!contains(contents, db.c_str())) {
+ if (!contains(contents, db)) {
if (!contents.empty())
contents += ",";
setContents(contents + db);
bool InsetBibtex::delDatabase(string const & db)
{
- if (contains(getContents(), db.c_str())) {
+ if (contains(getContents(), db)) {
string bd = db;
int n = tokenPos(getContents(), ',', bd);
if (n > 0) {
// Weird code, would someone care to explain this?(Lgb)
string tmp(", ");
tmp += bd;
- setContents(subst(getContents(), tmp.c_str(), ", "));
+ setContents(subst(getContents(), tmp, ", "));
} else if (n == 0)
setContents(split(getContents(), bd, ','));
else
{
int w = 0;
// Does look like a hack? It is! (but will change at 0.13)
- LyXParagraph * par = current_view->buffer()->paragraph;
+ LyXParagraph * par = bv->buffer()->paragraph;
while (par) {
if (par->bibkey) {
// ale070405
-string bibitemWidest(BufferView * bv)
+string const bibitemWidest(Buffer const * buffer)
{
int w = 0;
// Does look like a hack? It is! (but will change at 0.13)
- LyXParagraph * par = current_view->buffer()->paragraph;
+ LyXParagraph * par = buffer->paragraph;
+ BufferView * bv = buffer->getUser();
InsetBibKey * bkey = 0;
LyXFont font;
projects / lyx.git / blobdiff