anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-11 03:03:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

73 lines moved, 15 killed... spoils the average ;-}

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5118 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2002-08-27 13:17:22 +00:00
parent 45b2220180
commit 2a0909f47b
5 changed files with 68 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/BufferView.C
View File

@ -134,12 +134,6 @@ void BufferView::beforeChange(LyXText * text)
} }
void BufferView::finishChange(bool fitcur)
{
pimpl_->finishChange(fitcur);
}
void BufferView::savePosition(unsigned int i) void BufferView::savePosition(unsigned int i)
{ {
pimpl_->savePosition(i); pimpl_->savePosition(i);

2
src/BufferView.h
View File

@ -88,8 +88,6 @@ public:
/// ///
void beforeChange(LyXText *); void beforeChange(LyXText *);
/// ///
void finishChange(bool fitcur = false);
///
void savePosition(unsigned int i); void savePosition(unsigned int i);
/// ///
void restorePosition(unsigned int i); void restorePosition(unsigned int i);

39
src/BufferView_pimpl.C
View File

@ -40,7 +40,6 @@
#include "ParagraphParameters.h" #include "ParagraphParameters.h"
#include "undo_funcs.h" #include "undo_funcs.h"
#include "funcrequest.h" #include "funcrequest.h"
#include "language.h"
#include "factory.h" #include "factory.h"
#include "insets/insetbib.h" #include "insets/insetbib.h"
@ -1089,14 +1088,6 @@ void BufferView::Pimpl::beforeChange(LyXText * text)
} }
void BufferView::Pimpl::finishChange(bool fitcur)
{
finishUndo();
moveCursorUpdate(fitcur);
bv_->owner()->view_state_changed();
}
void BufferView::Pimpl::savePosition(unsigned int i) void BufferView::Pimpl::savePosition(unsigned int i)
{ {
if (i >= saved_positions_num) if (i >= saved_positions_num)
@ -1570,10 +1561,6 @@ bool BufferView::Pimpl::dispatch(FuncRequest const & ev)
} }
break; break;
case LFUN_QUOTE:
smartQuote();
break;
case LFUN_HTMLURL: case LFUN_HTMLURL:
case LFUN_URL: case LFUN_URL:
{ {
@ -1915,32 +1902,6 @@ bool BufferView::Pimpl::dispatch(FuncRequest const & ev)
} }
void BufferView::Pimpl::smartQuote()
{
LyXText const * lt = bv_->getLyXText();
Paragraph const * par = lt->cursor.par();
pos_type pos = lt->cursor.pos();
char c;
if (!pos
|| (par->isInset(pos - 1)
&& par->getInset(pos - 1)->isSpace()))
c = ' ';
else
c = par->getChar(pos - 1);
hideCursor();
LyXLayout_ptr const & style = par->layout();
if (style->pass_thru ||
par->getFontSettings(buffer_->params,
pos).language()->lang() == "hebrew" ||
(!insertInset(new InsetQuotes(c, buffer_->params))))
bv_->owner()->dispatch(FuncRequest(LFUN_SELFINSERT, "\""));
}
// Open and lock an updatable inset // Open and lock an updatable inset
bool BufferView::Pimpl::open_new_inset(UpdatableInset * new_inset, bool behind) bool BufferView::Pimpl::open_new_inset(UpdatableInset * new_inset, bool behind)
{ {

4
src/BufferView_pimpl.h
View File

@ -96,8 +96,6 @@ struct BufferView::Pimpl : public boost::signals::trackable {
/// ///
void beforeChange(LyXText *); void beforeChange(LyXText *);
/// ///
void finishChange(bool fitcur);
///
void savePosition(unsigned int i); void savePosition(unsigned int i);
/// ///
void restorePosition(unsigned int i); void restorePosition(unsigned int i);
@ -142,8 +140,6 @@ private:
bool open_new_inset(UpdatableInset * new_inset, bool behind = false); bool open_new_inset(UpdatableInset * new_inset, bool behind = false);
/// ///
void hfill(); void hfill();
///
void smartQuote();
/// ///
BufferView * bv_; BufferView * bv_;

100
src/text3.C
View File

@ -22,12 +22,14 @@
#include "ParagraphParameters.h" #include "ParagraphParameters.h"
#include "gettext.h" #include "gettext.h"
#include "intl.h" #include "intl.h"
#include "language.h"
#include "support/lstrings.h" #include "support/lstrings.h"
#include "frontends/LyXView.h" #include "frontends/LyXView.h"
#include "frontends/screen.h" #include "frontends/screen.h"
#include "frontends/WorkArea.h" #include "frontends/WorkArea.h"
#include "insets/insetspecialchar.h" #include "insets/insetspecialchar.h"
#include "insets/insettext.h" #include "insets/insettext.h"
#include "insets/insetquotes.h"
#include "insets/insetcommand.h" #include "insets/insetcommand.h"
#include "undo_funcs.h" #include "undo_funcs.h"
@ -35,6 +37,17 @@ using std::endl;
extern string current_layout; extern string current_layout;
namespace {
void finishChange(BufferView * bv, bool fitcur = false)
{
finishUndo();
bv->moveCursorUpdate(fitcur);
bv->owner()->view_state_changed();
}
}
bool LyXText::gotoNextInset(BufferView * bv, bool LyXText::gotoNextInset(BufferView * bv,
vector<Inset::Code> const & codes, string const & contents) const vector<Inset::Code> const & codes, string const & contents) const
@ -271,7 +284,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
update(bv, false); update(bv, false);
deleteWordForward(bv); deleteWordForward(bv);
update(bv); update(bv);
bv->finishChange(); finishChange(bv);
break; break;
case LFUN_DELETE_WORD_BACKWARD: case LFUN_DELETE_WORD_BACKWARD:
@ -279,7 +292,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
update(bv, false); update(bv, false);
deleteWordBackward(bv); deleteWordBackward(bv);
update(bv, true); update(bv, true);
bv->finishChange(); finishChange(bv);
break; break;
case LFUN_DELETE_LINE_FORWARD: case LFUN_DELETE_LINE_FORWARD:
@ -287,7 +300,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
update(bv, false); update(bv, false);
deleteLineForward(bv); deleteLineForward(bv);
update(bv); update(bv);
bv->finishChange(); finishChange(bv);
break; break;
case LFUN_SHIFT_TAB: case LFUN_SHIFT_TAB:
@ -296,7 +309,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
bv->beforeChange(this); bv->beforeChange(this);
update(bv, false); update(bv, false);
cursorTab(bv); cursorTab(bv);
bv->finishChange(); finishChange(bv);
break; break;
case LFUN_WORDRIGHT: case LFUN_WORDRIGHT:
@ -307,7 +320,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
cursorLeftOneWord(bv); cursorLeftOneWord(bv);
else else
cursorRightOneWord(bv); cursorRightOneWord(bv);
bv->finishChange(); finishChange(bv);
break; break;
case LFUN_WORDLEFT: case LFUN_WORDLEFT:
@ -318,7 +331,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
cursorRightOneWord(bv); cursorRightOneWord(bv);
else else
cursorLeftOneWord(bv); cursorLeftOneWord(bv);
bv->finishChange(); finishChange(bv);
break; break;
case LFUN_BEGINNINGBUF: case LFUN_BEGINNINGBUF:
@ -326,7 +339,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
bv->beforeChange(this); bv->beforeChange(this);
update(bv, false); update(bv, false);
cursorTop(bv); cursorTop(bv);
bv->finishChange(); finishChange(bv);
break; break;
case LFUN_ENDBUF: case LFUN_ENDBUF:
@ -334,7 +347,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
bv->beforeChange(this); bv->beforeChange(this);
update(bv, false); update(bv, false);
cursorBottom(bv); cursorBottom(bv);
bv->finishChange(); finishChange(bv);
break; break;
case LFUN_RIGHTSEL: case LFUN_RIGHTSEL:
@ -343,7 +356,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
cursorLeft(bv); cursorLeft(bv);
else else
cursorRight(bv); cursorRight(bv);
bv->finishChange(true); finishChange(bv, true);
break; break;
case LFUN_LEFTSEL: case LFUN_LEFTSEL:
@ -352,55 +365,55 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
cursorRight(bv); cursorRight(bv);
else else
cursorLeft(bv); cursorLeft(bv);
bv->finishChange(true); finishChange(bv, true);
break; break;
case LFUN_UPSEL: case LFUN_UPSEL:
update(bv, false); update(bv, false);
cursorUp(bv, true); cursorUp(bv, true);
bv->finishChange(true); finishChange(bv, true);
break; break;
case LFUN_DOWNSEL: case LFUN_DOWNSEL:
update(bv, false); update(bv, false);
cursorDown(bv, true); cursorDown(bv, true);
bv->finishChange(true); finishChange(bv, true);
break; break;
case LFUN_UP_PARAGRAPHSEL: case LFUN_UP_PARAGRAPHSEL:
update(bv, false); update(bv, false);
cursorUpParagraph(bv); cursorUpParagraph(bv);
bv->finishChange(true); finishChange(bv, true);
break; break;
case LFUN_DOWN_PARAGRAPHSEL: case LFUN_DOWN_PARAGRAPHSEL:
update(bv, false); update(bv, false);
cursorDownParagraph(bv); cursorDownParagraph(bv);
bv->finishChange(true); finishChange(bv, true);
break; break;
case LFUN_PRIORSEL: case LFUN_PRIORSEL:
update(bv, false); update(bv, false);
cursorPrevious(bv); cursorPrevious(bv);
bv->finishChange(true); finishChange(bv, true);
break; break;
case LFUN_NEXTSEL: case LFUN_NEXTSEL:
update(bv, false); update(bv, false);
cursorNext(bv); cursorNext(bv);
bv->finishChange(); finishChange(bv, true);
break; break;
case LFUN_HOMESEL: case LFUN_HOMESEL:
update(bv, false); update(bv, false);
cursorHome(bv); cursorHome(bv);
bv->finishChange(true); finishChange(bv, true);
break; break;
case LFUN_ENDSEL: case LFUN_ENDSEL:
update(bv, false); update(bv, false);
cursorEnd(bv); cursorEnd(bv);
bv->finishChange(true); finishChange(bv, true);
break; break;
case LFUN_WORDRIGHTSEL: case LFUN_WORDRIGHTSEL:
@ -409,7 +422,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
cursorLeftOneWord(bv); cursorLeftOneWord(bv);
else else
cursorRightOneWord(bv); cursorRightOneWord(bv);
bv->finishChange(true); finishChange(bv, true);
break; break;
case LFUN_WORDLEFTSEL: case LFUN_WORDLEFTSEL:
@ -418,7 +431,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
cursorRightOneWord(bv); cursorRightOneWord(bv);
else else
cursorLeftOneWord(bv); cursorLeftOneWord(bv);
bv->finishChange(true); finishChange(bv, true);
break; break;
case LFUN_RIGHT: { case LFUN_RIGHT: {
@ -438,7 +451,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
} }
if (!is_rtl) if (!is_rtl)
cursorRight(bv, false); cursorRight(bv, false);
bv->finishChange(false); finishChange(bv);
break; break;
} }
@ -463,7 +476,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
} }
if (is_rtl) if (is_rtl)
cursorRight(bv, false); cursorRight(bv, false);
bv->finishChange(false); finishChange(bv);
break; break;
} }
@ -472,7 +485,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
bv->beforeChange(this); bv->beforeChange(this);
bv->update(this, BufferView::UPDATE); bv->update(this, BufferView::UPDATE);
cursorUp(bv); cursorUp(bv);
bv->finishChange(false); finishChange(bv);
break; break;
case LFUN_DOWN: case LFUN_DOWN:
@ -480,7 +493,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
bv->beforeChange(this); bv->beforeChange(this);
bv->update(this, BufferView::UPDATE); bv->update(this, BufferView::UPDATE);
cursorDown(bv); cursorDown(bv);
bv->finishChange(); finishChange(bv);
break; break;
case LFUN_UP_PARAGRAPH: case LFUN_UP_PARAGRAPH:
@ -488,7 +501,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
bv->beforeChange(this); bv->beforeChange(this);
bv->update(this, BufferView::UPDATE); bv->update(this, BufferView::UPDATE);
cursorUpParagraph(bv); cursorUpParagraph(bv);
bv->finishChange(); finishChange(bv);
break; break;
case LFUN_DOWN_PARAGRAPH: case LFUN_DOWN_PARAGRAPH:
@ -496,7 +509,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
bv->beforeChange(this); bv->beforeChange(this);
bv->update(this, BufferView::UPDATE); bv->update(this, BufferView::UPDATE);
cursorDownParagraph(bv); cursorDownParagraph(bv);
bv->finishChange(false); finishChange(bv, false);
break; break;
case LFUN_PRIOR: case LFUN_PRIOR:
@ -504,7 +517,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
bv->beforeChange(this); bv->beforeChange(this);
bv->update(this, BufferView::UPDATE); bv->update(this, BufferView::UPDATE);
cursorPrevious(bv); cursorPrevious(bv);
bv->finishChange(false); finishChange(bv, false);
// was: // was:
// finishUndo(); // finishUndo();
// moveCursorUpdate(false, false); // moveCursorUpdate(false, false);
@ -516,7 +529,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
bv->beforeChange(this); bv->beforeChange(this);
bv->update(this, BufferView::UPDATE); bv->update(this, BufferView::UPDATE);
cursorNext(bv); cursorNext(bv);
bv->finishChange(false); finishChange(bv, false);
break; break;
case LFUN_HOME: case LFUN_HOME:
@ -524,7 +537,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
bv->beforeChange(this); bv->beforeChange(this);
update(bv); update(bv);
cursorHome(bv); cursorHome(bv);
bv->finishChange(false); finishChange(bv, false);
break; break;
case LFUN_END: case LFUN_END:
@ -532,7 +545,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
bv->beforeChange(this); bv->beforeChange(this);
update(bv); update(bv);
cursorEnd(bv); cursorEnd(bv);
bv->finishChange(false); finishChange(bv, false);
break; break;
case LFUN_BREAKLINE: case LFUN_BREAKLINE:
@ -875,7 +888,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
return Inset::UNDISPATCHED; return Inset::UNDISPATCHED;
update(bv, false); update(bv, false);
cursorTop(bv); cursorTop(bv);
bv->finishChange(true); finishChange(bv, true);
break; break;
case LFUN_ENDBUFSEL: case LFUN_ENDBUFSEL:
@ -883,7 +896,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
return Inset::UNDISPATCHED; return Inset::UNDISPATCHED;
update(bv, false); update(bv, false);
cursorBottom(bv); cursorBottom(bv);
bv->finishChange(true); finishChange(bv, true);
break; break;
case LFUN_GETXY: case LFUN_GETXY:
@ -1010,6 +1023,29 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
break; break;
} }
case LFUN_QUOTE: {
Paragraph const * par = cursor.par();
lyx::pos_type pos = cursor.pos();
char c;
if (!pos)
c = ' ';
else if (par->isInset(pos - 1) && par->getInset(pos - 1)->isSpace())
c = ' ';
else
c = par->getChar(pos - 1);
bv->hideCursor();
LyXLayout_ptr const & style = par->layout();
if (style->pass_thru ||
par->getFontSettings(bv->buffer()->params,
pos).language()->lang() == "hebrew" ||
(!bv->insertInset(new InsetQuotes(c, bv->buffer()->params))))
bv->owner()->dispatch(FuncRequest(LFUN_SELFINSERT, "\""));
break;
}
case LFUN_SELFINSERT: { case LFUN_SELFINSERT: {
if (cmd.argument.empty()) if (cmd.argument.empty())
break; break;