mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-22 13:18:28 +00:00
whitespace changes to sync my tree
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5082 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
d756329293
commit
95d1d96798
@ -292,19 +292,19 @@ ButtonPolicy::SMInput FormCitation::input(FL_OBJECT * ob, long)
|
||||
fl_clear_browser(dialog_->browser_info);
|
||||
|
||||
string const tmp = formatted(biblio::getInfo(theMap,
|
||||
bibkeys[sel-1]),
|
||||
dialog_->browser_info->w-10);
|
||||
bibkeys[sel - 1]),
|
||||
dialog_->browser_info->w - 10);
|
||||
fl_add_browser_line(dialog_->browser_info, tmp.c_str());
|
||||
|
||||
// Highlight the selected browser_bib key in browser_cite if
|
||||
// present
|
||||
vector<string>::const_iterator cit =
|
||||
find(citekeys.begin(), citekeys.end(), bibkeys[sel-1]);
|
||||
find(citekeys.begin(), citekeys.end(), bibkeys[sel - 1]);
|
||||
|
||||
if (cit != citekeys.end()) {
|
||||
int const n = int(cit - citekeys.begin());
|
||||
fl_select_browser_line(dialog_->browser_cite, n+1);
|
||||
fl_set_browser_topline(dialog_->browser_cite, n+1);
|
||||
fl_select_browser_line(dialog_->browser_cite, n + 1);
|
||||
fl_set_browser_topline(dialog_->browser_cite, n + 1);
|
||||
}
|
||||
|
||||
if (!controller().bufferIsReadonly()) {
|
||||
@ -329,20 +329,20 @@ ButtonPolicy::SMInput FormCitation::input(FL_OBJECT * ob, long)
|
||||
|
||||
// Highlight the selected browser_cite key in browser_bib
|
||||
vector<string>::const_iterator cit =
|
||||
find(bibkeys.begin(), bibkeys.end(), citekeys[sel-1]);
|
||||
find(bibkeys.begin(), bibkeys.end(), citekeys[sel - 1]);
|
||||
|
||||
if (cit != bibkeys.end()) {
|
||||
int const n = int(cit - bibkeys.begin());
|
||||
fl_select_browser_line(dialog_->browser_bib, n+1);
|
||||
fl_set_browser_topline(dialog_->browser_bib, n+1);
|
||||
fl_select_browser_line(dialog_->browser_bib, n + 1);
|
||||
fl_set_browser_topline(dialog_->browser_bib, n + 1);
|
||||
|
||||
// Put into browser_info the additional info associated
|
||||
// with the selected browser_cite key
|
||||
fl_clear_browser(dialog_->browser_info);
|
||||
string const tmp =
|
||||
formatted(biblio::getInfo(theMap,
|
||||
citekeys[sel-1]),
|
||||
dialog_->browser_info->w-10);
|
||||
citekeys[sel - 1]),
|
||||
dialog_->browser_info->w - 10);
|
||||
fl_add_browser_line(dialog_->browser_info, tmp.c_str());
|
||||
}
|
||||
|
||||
@ -353,8 +353,8 @@ ButtonPolicy::SMInput FormCitation::input(FL_OBJECT * ob, long)
|
||||
|
||||
// Add the selected browser_bib key to browser_cite
|
||||
fl_addto_browser(dialog_->browser_cite,
|
||||
bibkeys[sel-1].c_str());
|
||||
citekeys.push_back(bibkeys[sel-1]);
|
||||
bibkeys[sel - 1].c_str());
|
||||
citekeys.push_back(bibkeys[sel - 1]);
|
||||
|
||||
int const n = int(citekeys.size());
|
||||
fl_select_browser_line(dialog_->browser_cite, n);
|
||||
@ -370,7 +370,7 @@ ButtonPolicy::SMInput FormCitation::input(FL_OBJECT * ob, long)
|
||||
|
||||
// Remove the selected key from browser_cite
|
||||
fl_delete_browser_line(dialog_->browser_cite, sel) ;
|
||||
citekeys.erase(citekeys.begin() + sel-1);
|
||||
citekeys.erase(citekeys.begin() + sel - 1);
|
||||
|
||||
setBibButtons(ON);
|
||||
setCiteButtons(OFF);
|
||||
@ -382,25 +382,25 @@ ButtonPolicy::SMInput FormCitation::input(FL_OBJECT * ob, long)
|
||||
return ButtonPolicy::SMI_NOOP;
|
||||
|
||||
// Move the selected key up one line
|
||||
vector<string>::iterator it = citekeys.begin() + sel-1;
|
||||
vector<string>::iterator it = citekeys.begin() + sel - 1;
|
||||
string const tmp = *it;
|
||||
|
||||
fl_delete_browser_line(dialog_->browser_cite, sel);
|
||||
citekeys.erase(it);
|
||||
|
||||
fl_insert_browser_line(dialog_->browser_cite, sel-1, tmp.c_str());
|
||||
fl_select_browser_line(dialog_->browser_cite, sel-1);
|
||||
citekeys.insert(it-1, tmp);
|
||||
fl_insert_browser_line(dialog_->browser_cite, sel - 1, tmp.c_str());
|
||||
fl_select_browser_line(dialog_->browser_cite, sel - 1);
|
||||
citekeys.insert(it - 1, tmp);
|
||||
setCiteButtons(ON);
|
||||
activate = ButtonPolicy::SMI_VALID;
|
||||
|
||||
} else if (ob == dialog_->button_down) {
|
||||
unsigned int const sel = fl_get_browser(dialog_->browser_cite);
|
||||
if (sel < 1 || sel > citekeys.size()-1)
|
||||
if (sel < 1 || sel > citekeys.size() - 1)
|
||||
return ButtonPolicy::SMI_NOOP;
|
||||
|
||||
// Move the selected key down one line
|
||||
vector<string>::iterator it = citekeys.begin() + sel-1;
|
||||
vector<string>::iterator it = citekeys.begin() + sel - 1;
|
||||
string const tmp = *it;
|
||||
|
||||
fl_delete_browser_line(dialog_->browser_cite, sel);
|
||||
|
@ -1589,7 +1589,7 @@ void InsetTabular::resetPos(BufferView * bv) const
|
||||
new_x += offset;
|
||||
cursor_.x(new_x);
|
||||
// cursor.x(getCellXPos(actcell) + offset);
|
||||
if ((actcol < tabular->columns()-1) && scroll(false) &&
|
||||
if ((actcol < tabular->columns() - 1) && scroll(false) &&
|
||||
(tabular->GetWidthOfTabular() < bv->workWidth()-20))
|
||||
{
|
||||
scroll(bv, 0.0F);
|
||||
|
@ -320,7 +320,7 @@ int Trans::Load(string const & language)
|
||||
return -1;
|
||||
|
||||
FreeKeymap();
|
||||
LyXLex lex(kmapTags, K_LAST-1);
|
||||
LyXLex lex(kmapTags, K_LAST - 1);
|
||||
lex.setFile(filename);
|
||||
|
||||
int const res = Load(lex);
|
||||
|
@ -349,7 +349,7 @@ VSpace::VSpace(string const & data)
|
||||
|
||||
string::size_type const length = input.length();
|
||||
|
||||
if (length > 1 && input[length-1] == '*') {
|
||||
if (length > 1 && input[length - 1] == '*') {
|
||||
keep_ = true;
|
||||
input.erase(length - 1);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user