-
#include <config.h>
#include <fstream>
+using std::ifstream;
+
#include <cstdlib>
#ifdef __GNUG__
FD_bibitem_form * bibitem_form = 0;
static Combox * bibcombox = 0;
-extern void UpdateInset(Inset* inset, bool mark_dirty = true);
+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);
case 3: // OK, bibitem
{
if(!current_view->buffer()->isReadonly()) {
- InsetCommand *inset = static_cast<InsetCommand*>(bibitem_form->bibitem_form->u_vdata);
+ InsetCommand * inset = static_cast<InsetCommand*>(bibitem_form->bibitem_form->u_vdata);
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);
+ current_view->text->RedoParagraph();
+ current_view->update(1);
break;
} // fall through to Cancel on RO-mode
}
}
}
-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);
+ 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);
+ 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;
}
/*---------------------------------------*/
-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);
+ 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;
/*---------------------------------------*/
-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
void InsetCitation::Edit(int, int)
{
if(current_view->buffer()->isReadonly())
- WarnReadonly();
+ WarnReadonly(current_view->buffer()->fileName());
if (!citation_form) {
citation_form = create_form_citation_form();
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"));
}
}
}
-InsetBibKey::InsetBibKey(InsetBibKey const *b):
+InsetBibKey::InsetBibKey(InsetBibKey const * b):
InsetCommand("bibitem", b->contents, b->options)
{
counter = b->counter;
{
if(bibitem_form && bibitem_form->bibitem_form
&& bibitem_form->bibitem_form->visible)
- fl_hide_form(bibitem_form->bibitem_form);
+ fl_hide_form(bibitem_form->bibitem_form);
}
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)
{
string s;
if (!options.empty()) {
}
s += '{';
s += contents + '}';
- fprintf(file, "\\bibitem %s\n", s.c_str());
+ os << "\\bibitem " << s << "\n";
}
void InsetBibKey::Edit(int, int)
{
if(current_view->buffer()->isReadonly())
- WarnReadonly();
+ WarnReadonly(current_view->buffer()->fileName());
if (!bibitem_form) {
bibitem_form = create_form_bibitem_form();
InsetBibtex::InsetBibtex(string const & dbase, string const & style,
- Buffer *o)
- :InsetCommand("BibTeX", dbase, style), owner(o)
+ Buffer * o)
+ : InsetCommand("BibTeX", dbase, style), owner(o)
{
}
}
-int InsetBibtex::Latex(FILE *file, signed char /*fragile*/)
+int InsetBibtex::Latex(ostream & os, signed char /*fragile*/)
{
string bib;
signed char dummy = 0;
int result = Latex(bib, dummy);
- fprintf(file, "%s", bib.c_str());
+ os << bib;
return result;
}
-int InsetBibtex::Latex(string &file, signed char /*fragile*/)
+int InsetBibtex::Latex(string & file, signed char /*fragile*/)
{
// this looks like an horrible hack and it is :) The problem
// is that owner is not initialized correctly when the bib
// 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"))
// 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.
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
ifstream ifs(fil.c_str());
string linebuf;
while (getline(ifs, linebuf)) {
+ linebuf = frontStrip(linebuf);
if (prefixIs(linebuf, "@")) {
linebuf = subst(linebuf, '{', '(');
linebuf = split(linebuf, tmp, '(');
&& !prefixIs(tmp, "@preamble")) {
linebuf = split(linebuf,
tmp, ',');
+ tmp = frontStrip(strip(tmp));
if (!tmp.empty()) {
- keys += strip(tmp);
- keys += ", ";
+ keys += tmp;
+ keys += delim;
}
}
}
void BibitemUpdate(Combox * combox)
{
combox->clear();
-
- if (!current_view->available())
- return;
-
+
+ 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,',');
}
}
while (par) {
if (par->bibkey) {
int wx = par->bibkey->Width(font);
- if (wx>w) w = wx;
+ if (wx > w) w = wx;
}
par = par->next;
}
while (par) {
if (par->bibkey) {
int wx = par->bibkey->Width(font);
- if (wx>w) {
+ if (wx > w) {
w = wx;
bkey = par->bibkey;
}