#include "Cursor.h"
#include "CutAndPaste.h"
#include "DispatchResult.h"
-#include "EmbeddedFiles.h"
#include "ErrorList.h"
#include "factory.h"
#include "FloatList.h"
{
Private(BufferView & bv): wh_(0), cursor_(bv),
anchor_pit_(0), anchor_ypos_(0),
+ inlineCompletionUniqueChars_(0),
last_inset_(0), gui_(0)
{}
vector<int> par_height_;
///
- DocIterator inlineCompletionPos;
+ DocIterator inlineCompletionPos_;
///
- docstring inlineCompletion;
+ docstring inlineCompletion_;
///
- size_t inlineCompletionUniqueChars;
+ size_t inlineCompletionUniqueChars_;
/// keyboard mapping object.
Intl intl_;
if (tm.contains(bot_pit)) {
ParagraphMetrics const & pm = tm.parMetrics(bot_pit);
- BOOST_ASSERT(!pm.rows().empty());
+ LASSERT(!pm.rows().empty(), /**/);
// FIXME: smooth scrolling doesn't work in mathed.
CursorSlice const & cs = dit.innerTextSlice();
int offset = coordOffset(dit, dit.boundary()).y_;
}
// fix inline completion position
- if (d->inlineCompletionPos.fixIfBroken())
- d->inlineCompletionPos = DocIterator();
+ if (d->inlineCompletionPos_.fixIfBroken())
+ d->inlineCompletionPos_ = DocIterator();
tm.redoParagraph(bot_pit);
ParagraphMetrics const & pm = tm.parMetrics(bot_pit);
break;
}
- case LFUN_BUFFER_TOGGLE_EMBEDDING: {
- flag.setOnOff(buffer_.params().embedded);
- break;
- }
-
case LFUN_SCREEN_UP:
case LFUN_SCREEN_DOWN:
case LFUN_SCROLL:
InsetBibtex * inset = getInsetByCode<InsetBibtex>(tmpcur,
BIBTEX_CODE);
if (inset) {
- if (inset->addDatabase(to_utf8(cmd.argument())))
+ if (inset->addDatabase(cmd.argument()))
buffer_.updateBibfilesCache();
}
break;
InsetBibtex * inset = getInsetByCode<InsetBibtex>(tmpcur,
BIBTEX_CODE);
if (inset) {
- if (inset->delDatabase(to_utf8(cmd.argument())))
+ if (inset->delDatabase(cmd.argument()))
buffer_.updateBibfilesCache();
}
break;
buffer_.params().compressed = !buffer_.params().compressed;
break;
- case LFUN_BUFFER_TOGGLE_EMBEDDING: {
- // turn embedding on/off
- try {
- buffer_.embeddedFiles().enable(!buffer_.params().embedded, buffer_, true);
- } catch (ExceptionMessage const & message) {
- Alert::error(message.title_, message.details_);
- }
- break;
- }
-
case LFUN_NEXT_INSET_TOGGLE: {
// this is the real function we want to invoke
FuncRequest tmpcmd = FuncRequest(LFUN_INSET_TOGGLE, cmd.origin);
{
string const scroll_type = cmd.getArg(0);
int const scroll_step =
- (scroll_type == "line")? d->scrollbarParameters_.single_step
- : (scroll_type == "page")? d->scrollbarParameters_.page_step : 0;
+ (scroll_type == "line") ? d->scrollbarParameters_.single_step
+ : (scroll_type == "page") ? d->scrollbarParameters_.page_step : 0;
if (scroll_step == 0)
return;
string const scroll_quantity = cmd.getArg(1);
bool BufferView::mouseSetCursor(Cursor & cur, bool select)
{
- BOOST_ASSERT(&cur.bv() == this);
+ LASSERT(&cur.bv() == this, /**/);
if (!select)
// this event will clear selection so we save selection for
int old_height = tm.parMetrics(bottom_pit).height();
// make sure inline completion pointer is ok
- if (d->inlineCompletionPos.fixIfBroken())
- d->inlineCompletionPos = DocIterator();
+ if (d->inlineCompletionPos_.fixIfBroken())
+ d->inlineCompletionPos_ = DocIterator();
// In Single Paragraph mode, rebreak only
// the (main text, not inset!) paragraph containing the cursor.
TextMetrics & tm = textMetrics(&buftext);
// make sure inline completion pointer is ok
- if (d->inlineCompletionPos.fixIfBroken())
- d->inlineCompletionPos = DocIterator();
+ if (d->inlineCompletionPos_.fixIfBroken())
+ d->inlineCompletionPos_ = DocIterator();
if (d->anchor_pit_ >= npit)
// The anchor pit must have been deleted...
void BufferView::insertLyXFile(FileName const & fname)
{
- BOOST_ASSERT(d->cursor_.inTexted());
+ LASSERT(d->cursor_.inTexted(), /**/);
// Get absolute path of file and add ".lyx"
// to the filename if necessary
CursorSlice const & sl = dit[0];
TextMetrics const & tm = textMetrics(sl.text());
ParagraphMetrics const & pm = tm.parMetrics(sl.pit());
- BOOST_ASSERT(!pm.rows().empty());
+ LASSERT(!pm.rows().empty(), /**/);
y -= pm.rows()[0].ascent();
#if 1
// FIXME: document this mess
docstring const & BufferView::inlineCompletion() const
{
- return d->inlineCompletion;
+ return d->inlineCompletion_;
}
size_t const & BufferView::inlineCompletionUniqueChars() const
{
- return d->inlineCompletionUniqueChars;
+ return d->inlineCompletionUniqueChars_;
}
DocIterator const & BufferView::inlineCompletionPos() const
{
- return d->inlineCompletionPos;
+ return d->inlineCompletionPos_;
}
docstring const & completion, size_t uniqueChars)
{
uniqueChars = min(completion.size(), uniqueChars);
- bool changed = d->inlineCompletion != completion
- || d->inlineCompletionUniqueChars != uniqueChars;
+ bool changed = d->inlineCompletion_ != completion
+ || d->inlineCompletionUniqueChars_ != uniqueChars;
bool singlePar = true;
- d->inlineCompletion = completion;
- d->inlineCompletionUniqueChars = min(completion.size(), uniqueChars);
+ d->inlineCompletion_ = completion;
+ d->inlineCompletionUniqueChars_ = min(completion.size(), uniqueChars);
//lyxerr << "setInlineCompletion pos=" << pos << " completion=" << completion << " uniqueChars=" << uniqueChars << std::endl;
// at new position?
- DocIterator const & old = d->inlineCompletionPos;
+ DocIterator const & old = d->inlineCompletionPos_;
if (old != pos) {
//lyxerr << "inlineCompletionPos changed" << std::endl;
// old or pos are in another paragraph?
singlePar = false;
//lyxerr << "different paragraph" << std::endl;
}
- d->inlineCompletionPos = pos;
+ d->inlineCompletionPos_ = pos;
}
// set update flags