#include "mathed/formulabase.h"
extern LyXTextClass::size_type current_layout;
-extern int greek_kb_flag;
using std::vector;
using std::find_if;
extern BufferList bufferlist;
extern char ascii_type;
-extern bool math_insert_greek(BufferView *, char);
extern void sigchldchecker(pid_t pid, int * status);
extern int bibitemMaxWidth(BufferView *, LyXFont const &);
}
-bool BufferView::Pimpl::fitCursor(LyXText * text)
+bool BufferView::Pimpl::fitCursor()
{
lyx::Assert(screen_.get());
bv_->theLockingInset()->fitInsetCursor(bv_);
ret = true;
} else {
- ret = screen_->fitCursor(text, bv_);
+ ret = screen_->fitCursor(bv_->text, bv_);
}
bv_->owner()->getDialogs()->updateParagraph();
bv_->text->setSelection(bv_);
screen_->toggleToggle(bv_->text, bv_);
- fitCursor(bv_->text);
+ fitCursor();
+#if 0
screen_->showCursor(bv_->text, bv_);
+#else
+ showCursor();
+#endif
}
// Clear the selection
screen_->toggleSelection(bv_->text, bv_);
- bv_->text->clearSelection(bv_);
+ bv_->text->clearSelection();
bv_->text->fullRebreak(bv_);
+#if 0
screen_->update(bv_->text, bv_);
+#else
+ update();
+#endif
updateScrollbar();
// Single left click in math inset?
bv_->text->cursor.x_fix(bv_->text->cursor.x());
owner_->updateLayoutChoice();
- if (fitCursor(bv_->text)) {
+ if (fitCursor()) {
selection_possible = false;
}
(cursor.par()->getInset(cursor.pos() - 1)->editable())) {
Inset * tmpinset = cursor.par()->getInset(cursor.pos()-1);
LyXFont font = text->getFont(buffer_, cursor.par(),
- cursor.pos()-1);
+ cursor.pos() - 1);
int const width = tmpinset->width(bv_, font);
int const inset_x = font.isVisibleRightToLeft()
? cursor.x() : cursor.x() - width;
// fitCursor() ensures we don't jump back
// to the start of the document on vertical
// resize
- fitCursor(bv_->text);
+ fitCursor();
// The main window size has changed, repaint most stuff
redraw();
if (screen_.get() &&
(!bv_->theLockingInset() || !bv_->theLockingInset()->nodraw()))
{
+ LyXText::text_status st = bv_->text->status();
screen_->update(bv_->text, bv_);
+ bool fitc = false;
+ while(bv_->text->status() == LyXText::CHANGED_IN_DRAW) {
+ if (bv_->text->fullRebreak(bv_)) {
+ st = LyXText::NEED_MORE_REFRESH;
+ bv_->text->setCursor(bv_, bv_->text->cursor.par(),
+ bv_->text->cursor.pos());
+ fitc = true;
+ }
+ bv_->text->status(bv_, st);
+ screen_->update(bv_->text, bv_);
+ }
+ // do this here instead of in the screen::update because of
+ // the above loop!
+ bv_->text->status(bv_, LyXText::UNCHANGED);
+ if (fitc)
+ fitCursor();
}
}
}
if ((f & FITCUR)) {
- fitCursor(text);
+ fitCursor();
}
if ((f & CHANGE)) {
}
if (!bv_->theLockingInset()) {
- screen_->cursorToggle(bv_->text, bv_);
+ screen_->cursorToggle(bv_);
} else {
bv_->theLockingInset()->toggleInsetCursor(bv_);
}
void BufferView::Pimpl::beforeChange(LyXText * text)
{
toggleSelection();
- text->clearSelection(bv_);
+ text->clearSelection();
}
return;
LyXText * text = bv_->getLyXText();
- if (text->real_current_font.isRightToLeft()
-#ifndef NO_LATEX
- &&
- text->real_current_font.latex() != LyXFont::ON
-#endif
- ) {
+ if (text->real_current_font.isRightToLeft()) {
if (owner_->getIntl()->keymap == Intl::PRIMARY)
owner_->getIntl()->KeyMapSec();
} else {
if (available()) {
string const trypath = owner_->buffer()->filepath;
// If directory is writeable, use this as default.
- if (IsDirWriteable(trypath) == 1)
+ if (IsDirWriteable(trypath))
initpath = trypath;
}
owner_->getDialogs()->setUserFreeFont();
break;
-#ifndef NO_LATEX
- case LFUN_TEX:
- Tex(bv_);
- setState();
- owner_->showState();
- break;
-#endif
-
case LFUN_FILE_INSERT:
{
MenuInsertLyXFile(argument);
break;
case LFUN_LANGUAGE:
- Lang(bv_, argument);
+ lang(bv_, argument);
setState();
owner_->showState();
break;
case LFUN_EMPH:
- Emph(bv_);
+ emph(bv_);
owner_->showState();
break;
case LFUN_BOLD:
- Bold(bv_);
+ bold(bv_);
owner_->showState();
break;
case LFUN_NOUN:
- Noun(bv_);
+ noun(bv_);
owner_->showState();
break;
case LFUN_CODE:
- Code(bv_);
+ code(bv_);
owner_->showState();
break;
case LFUN_SANS:
- Sans(bv_);
+ sans(bv_);
owner_->showState();
break;
case LFUN_ROMAN:
- Roman(bv_);
+ roman(bv_);
owner_->showState();
break;
case LFUN_DEFAULT:
- StyleReset(bv_);
+ styleReset(bv_);
owner_->showState();
break;
case LFUN_UNDERLINE:
- Underline(bv_);
+ underline(bv_);
owner_->showState();
break;
case LFUN_FONT_SIZE:
- FontSize(bv_, argument);
+ fontSize(bv_, argument);
owner_->showState();
break;
case LFUN_FONT_STATE:
- owner_->getLyXFunc()->setMessage(CurrentState(bv_));
+ owner_->getLyXFunc()->setMessage(currentState(bv_));
break;
case LFUN_UPCASE_WORD:
// just comment out the line below...
showCursor();
} else {
- bv_->cut();
+ bv_->cut(false);
}
moveCursorUpdate(false);
owner_->showState();
| BufferView::CHANGE);
}
} else {
- bv_->cut();
+ bv_->cut(false);
}
}
break;
showCursor();
}
} else {
- bv_->cut();
+ bv_->cut(false);
}
owner_->showState();
setState();
| BufferView::CHANGE);
}
} else
- bv_->cut();
+ bv_->cut(false);
}
break;
}
break;
- case LFUN_GETLATEX:
- {
-#ifndef NO_LATEX
- LyXFont & font = bv_->getLyXText()->current_font;
- if (font.latex() == LyXFont::ON)
- owner_->getLyXFunc()->setMessage("L");
- else
-#endif
- owner_->getLyXFunc()->setMessage("0");
- }
- break;
-
// --- accented characters ---------------------------
case LFUN_UMLAUT:
case LFUN_INDEX_CREATE:
{
InsetCommandParams p("index");
- LyXText * lt = bv_->getLyXText();
-
if (argument.empty()) {
- // Get word or selection
- lt->selectWordWhenUnderCursor(bv_, LyXText::PREVIOUS_WORD);
-
- if (!lt->selection.set()) {
- owner_->message(_("Nothing to index!"));
- break;
- }
- if (lt->selection.start.par() != lt->selection.end.par()) {
- owner_->message(_("Cannot index more than one paragraph!"));
+ string const idxstring(bv_->getLyXText()->getStringToIndex(bv_));
+ if (!idxstring.empty()) {
+ p.setContents(idxstring);
+ } else {
break;
}
-
- p.setContents(lt->selectionAsString(buffer_));
} else {
p.setContents(argument);
}
case LFUN_INDEX_INSERT_LAST:
{
- LyXText * lt = bv_->getLyXText();
- // Get word or selection
- lt->selectWordWhenUnderCursor(bv_, LyXText::PREVIOUS_WORD);
-
- if (!lt->selection.set()) {
- owner_->message(_("Nothing to index!"));
- break;
- }
- if (lt->selection.start.par() != lt->selection.end.par()) {
- owner_->message(_("Cannot index more than one paragraph!"));
- break;
+ string const idxstring(bv_->getLyXText()->getStringToIndex(bv_));
+ if (!idxstring.empty()) {
+ owner_->message(_("Word `")
+ + idxstring + _(("' indexed.")));
+ InsetCommandParams p("index", idxstring);
+ InsetIndex * inset = new InsetIndex(p);
+
+ if (!insertInset(inset))
+ delete inset;
+ else
+ updateInset(inset, true);
}
-
- InsetCommandParams p("index", lt->selectionAsString(buffer_));
- InsetIndex * inset = new InsetIndex(p);
-
- if (!insertInset(inset))
- delete inset;
- else
- updateInset(inset, true);
}
break;
if (lyxrc.auto_region_delete) {
if (lt->selection.set()) {
- lt->cutSelection(bv_, false);
+ lt->cutSelection(bv_, false, false);
bv_->update(lt,
BufferView::SELECT
| BufferView::FITCUR
string::const_iterator cit = argument.begin();
string::const_iterator end = argument.end();
for (; cit != end; ++cit) {
- if (greek_kb_flag) {
- if (!math_insert_greek(bv_, *cit))
- owner_->getIntl()->getTrans().TranslateAndInsert(*cit, lt);
- } else
- owner_->getIntl()->getTrans().TranslateAndInsert(*cit, lt);
+ owner_->getIntl()->getTrans().TranslateAndInsert(*cit, lt);
}
bv_->update(lt,
c = ' ';
hideCursor();
- if (!insertInset(new InsetQuotes(c, bv_->buffer()->params)))
+
+ LyXLayout const & style = textclasslist.Style(
+ bv_->buffer()->params.textclass,
+ lt->cursor.par()->getLayout());
+
+ if (style.pass_thru ||
+ (!insertInset(new InsetQuotes(c, bv_->buffer()->params))))
Dispatch(LFUN_SELFINSERT, "\"");
}
string(),
0);
update(bv_->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-#ifndef NO_LATEX
- bv_->text->current_font.setLatex(LyXFont::OFF);
-#endif
}
bv_->text->insertInset(bv_, inset);
}
} else if (bv_->theLockingInset()->updateInsetInInset(bv_, inset)) {
if (bv_->text->updateInset(bv_,
- bv_->theLockingInset())) {
+ bv_->theLockingInset())) {
update();
if (mark_dirty){
buffer_->markDirty();