2003-08-23 00:17:00 +00:00
|
|
|
|
/**
|
|
|
|
|
* \file trans_mgr.C
|
|
|
|
|
* This file is part of LyX, the document processor.
|
|
|
|
|
* Licence details can be found in the file COPYING.
|
|
|
|
|
*
|
|
|
|
|
* \author Lars Gullik Bj<EFBFBD>nnes
|
|
|
|
|
* \author Matthias Ettrich
|
|
|
|
|
*
|
|
|
|
|
* Full author contact details are available in file CREDITS.
|
|
|
|
|
*/
|
|
|
|
|
|
1999-10-02 16:21:10 +00:00
|
|
|
|
#include <config.h>
|
1999-09-27 18:44:28 +00:00
|
|
|
|
|
|
|
|
|
#include "trans_mgr.h"
|
2004-02-13 07:30:59 +00:00
|
|
|
|
|
Move BufferView cached pointer out of LyXText:
* LyXText
- bv(), bv_owner, : deleted.
- These methods now need a (Buffer const &) argument: getFont(), applyOuterFont(), getLayoutFont(), getLabelFont(), setCharFont(), setLayout(), singleWidth(), leftMargin(), rightMargin(), computeRowMetrics(), isMainText(), spacing(), isRTL(), cursorX(), rowBreakPoint(), setRowWidth(), labelFill(), labelEnd().
- These methods now need a (BufferView const &) argument and are propably candidates for future removal when 1.6 is opened for development: redoParagraph(), x2pos(), getRowNearY(), getColumnNearX(), checkInsetHit(), setHeightOfRow().
- recUndo(): now need a LCursor argument.
* CoordCache::get(LyXText const *, pit_type):
- now const.
- use const_iterator instead of iterator.
* FontIterator:
- add (Buffer const &) argument to ctor
- buffer_: new const reference to applicable BufferView.
* InsetBase
- xo(), yo(), covers() and neverIndent() are now const.
* InsetText::setViewCache(): deleted
All other changes are due to the LyXText and InsetBase API changes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15618 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-30 12:45:33 +00:00
|
|
|
|
#include "buffer.h"
|
2004-02-13 07:30:59 +00:00
|
|
|
|
#include "BufferView.h"
|
2005-07-14 13:05:03 +00:00
|
|
|
|
#include "CutAndPaste.h"
|
2004-02-13 07:30:59 +00:00
|
|
|
|
#include "cursor.h"
|
1999-10-07 18:44:17 +00:00
|
|
|
|
#include "debug.h"
|
1999-09-27 18:44:28 +00:00
|
|
|
|
#include "lyxrc.h"
|
2004-02-13 07:30:59 +00:00
|
|
|
|
#include "lyxtext.h"
|
|
|
|
|
#include "trans.h"
|
|
|
|
|
|
1999-10-02 16:21:10 +00:00
|
|
|
|
#include "support/lstrings.h"
|
1999-09-27 18:44:28 +00:00
|
|
|
|
|
2006-10-21 00:16:43 +00:00
|
|
|
|
|
|
|
|
|
namespace lyx {
|
|
|
|
|
|
|
|
|
|
using support::split;
|
2003-06-30 23:56:22 +00:00
|
|
|
|
|
2000-03-28 02:18:55 +00:00
|
|
|
|
using std::endl;
|
2003-10-06 15:43:21 +00:00
|
|
|
|
using std::string;
|
2000-04-04 00:19:15 +00:00
|
|
|
|
using std::pair;
|
2000-03-28 02:18:55 +00:00
|
|
|
|
|
2003-09-09 22:13:45 +00:00
|
|
|
|
|
1999-09-27 18:44:28 +00:00
|
|
|
|
// TransFSMData
|
|
|
|
|
TransFSMData::TransFSMData()
|
|
|
|
|
{
|
1999-12-21 06:10:21 +00:00
|
|
|
|
deadkey_ = deadkey2_ = 0;
|
|
|
|
|
deadkey_info_.accent = deadkey2_info_.accent = TEX_NOACCENT;
|
1999-09-27 18:44:28 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// TransState
|
2007-03-31 08:12:08 +00:00
|
|
|
|
char_type const TransState::TOKEN_SEP = 4;
|
1999-09-27 18:44:28 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// TransInitState
|
|
|
|
|
TransInitState::TransInitState()
|
|
|
|
|
{
|
1999-12-21 06:10:21 +00:00
|
|
|
|
init_state_ = this;
|
1999-09-27 18:44:28 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2007-03-31 08:12:08 +00:00
|
|
|
|
docstring const TransInitState::normalkey(char_type c)
|
2001-07-07 17:52:03 +00:00
|
|
|
|
{
|
2007-03-31 08:12:08 +00:00
|
|
|
|
docstring res;
|
2001-07-07 17:52:03 +00:00
|
|
|
|
res = c;
|
|
|
|
|
return res;
|
|
|
|
|
}
|
1999-09-27 18:44:28 +00:00
|
|
|
|
|
|
|
|
|
|
2007-03-31 08:12:08 +00:00
|
|
|
|
docstring const TransInitState::deadkey(char_type c, KmodInfo d)
|
1999-09-27 18:44:28 +00:00
|
|
|
|
{
|
1999-12-21 06:10:21 +00:00
|
|
|
|
deadkey_ = c;
|
|
|
|
|
deadkey_info_ = d;
|
|
|
|
|
currentState = deadkey_state_;
|
2007-03-31 08:12:08 +00:00
|
|
|
|
return docstring();
|
1999-09-27 18:44:28 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// TransDeadkeyState
|
|
|
|
|
TransDeadkeyState::TransDeadkeyState()
|
|
|
|
|
{
|
1999-12-21 06:10:21 +00:00
|
|
|
|
deadkey_state_ = this;
|
1999-09-27 18:44:28 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2007-03-31 08:12:08 +00:00
|
|
|
|
docstring const TransDeadkeyState::normalkey(char_type c)
|
2001-07-07 17:52:03 +00:00
|
|
|
|
{
|
2007-03-31 08:12:08 +00:00
|
|
|
|
docstring res;
|
2002-03-21 17:27:08 +00:00
|
|
|
|
|
2001-07-16 15:42:57 +00:00
|
|
|
|
KmodException::iterator it = deadkey_info_.exception_list.begin();
|
|
|
|
|
KmodException::iterator end = deadkey_info_.exception_list.end();
|
|
|
|
|
|
|
|
|
|
for (; it != end; ++it) {
|
|
|
|
|
if (it->c == c) {
|
|
|
|
|
res = it->data;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (it == end) {
|
|
|
|
|
res = DoAccent(c, deadkey_info_.accent);
|
|
|
|
|
}
|
|
|
|
|
currentState = init_state_;
|
|
|
|
|
return res;
|
2001-07-07 17:52:03 +00:00
|
|
|
|
}
|
1999-09-27 18:44:28 +00:00
|
|
|
|
|
|
|
|
|
|
2007-03-31 08:12:08 +00:00
|
|
|
|
docstring const TransDeadkeyState::deadkey(char_type c, KmodInfo d)
|
1999-09-27 18:44:28 +00:00
|
|
|
|
{
|
2007-03-31 08:12:08 +00:00
|
|
|
|
docstring res;
|
2002-03-21 17:27:08 +00:00
|
|
|
|
|
1999-12-21 06:10:21 +00:00
|
|
|
|
// Check if the same deadkey was typed twice
|
|
|
|
|
if (deadkey_ == c) {
|
|
|
|
|
res = deadkey_;
|
|
|
|
|
deadkey_ = 0;
|
|
|
|
|
deadkey_info_.accent = TEX_NOACCENT;
|
|
|
|
|
currentState = init_state_;
|
|
|
|
|
return res;
|
1999-09-27 18:44:28 +00:00
|
|
|
|
}
|
2002-03-21 17:27:08 +00:00
|
|
|
|
|
1999-12-21 06:10:21 +00:00
|
|
|
|
// Check if it is a combination or an exception
|
2001-07-16 15:42:57 +00:00
|
|
|
|
KmodException::const_iterator cit = deadkey_info_.exception_list.begin();
|
|
|
|
|
KmodException::const_iterator end = deadkey_info_.exception_list.end();
|
|
|
|
|
for (; cit != end; ++cit) {
|
|
|
|
|
if (cit->combined == true && cit->accent == d.accent) {
|
|
|
|
|
deadkey2_ = c;
|
|
|
|
|
deadkey2_info_ = d;
|
|
|
|
|
comb_info_ = (*cit);
|
|
|
|
|
currentState = combined_state_;
|
2007-03-31 08:12:08 +00:00
|
|
|
|
return docstring();
|
2001-07-16 15:42:57 +00:00
|
|
|
|
}
|
|
|
|
|
if (cit->c == c) {
|
|
|
|
|
res = cit->data;
|
|
|
|
|
deadkey_ = 0;
|
|
|
|
|
deadkey_info_.accent = TEX_NOACCENT;
|
|
|
|
|
currentState = init_state_;
|
|
|
|
|
return res;
|
|
|
|
|
}
|
|
|
|
|
}
|
2001-12-05 08:50:13 +00:00
|
|
|
|
|
2002-03-21 17:27:08 +00:00
|
|
|
|
// Not a combination or an exception.
|
1999-12-21 06:10:21 +00:00
|
|
|
|
// Output deadkey1 and keep deadkey2
|
2002-03-21 17:27:08 +00:00
|
|
|
|
|
1999-12-21 06:10:21 +00:00
|
|
|
|
if (deadkey_!= 0)
|
|
|
|
|
res = deadkey_;
|
|
|
|
|
deadkey_ = c;
|
|
|
|
|
deadkey_info_ = d;
|
|
|
|
|
currentState = deadkey_state_;
|
|
|
|
|
return res;
|
1999-09-27 18:44:28 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
TransCombinedState::TransCombinedState()
|
|
|
|
|
{
|
1999-12-21 06:10:21 +00:00
|
|
|
|
combined_state_ = this;
|
1999-09-27 18:44:28 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2007-03-31 08:12:08 +00:00
|
|
|
|
docstring const TransCombinedState::normalkey(char_type c)
|
2001-07-07 17:52:03 +00:00
|
|
|
|
{
|
2007-03-31 08:12:08 +00:00
|
|
|
|
docstring const temp = DoAccent(c, deadkey2_info_.accent);
|
|
|
|
|
docstring const res = DoAccent(temp, deadkey_info_.accent);
|
2001-07-07 17:52:03 +00:00
|
|
|
|
currentState = init_state_;
|
|
|
|
|
return res;
|
|
|
|
|
}
|
1999-09-27 18:44:28 +00:00
|
|
|
|
|
|
|
|
|
|
2007-03-31 08:12:08 +00:00
|
|
|
|
docstring const TransCombinedState::deadkey(char_type c, KmodInfo d)
|
1999-09-27 18:44:28 +00:00
|
|
|
|
{
|
1999-12-21 06:10:21 +00:00
|
|
|
|
// Third key in a row. Output the first one and
|
|
|
|
|
// reenter with shifted deadkeys
|
2007-03-31 08:12:08 +00:00
|
|
|
|
docstring res;
|
1999-12-21 06:10:21 +00:00
|
|
|
|
if (deadkey_ != 0)
|
|
|
|
|
res = deadkey_;
|
|
|
|
|
res += TOKEN_SEP;
|
|
|
|
|
deadkey_ = deadkey2_;
|
|
|
|
|
deadkey_info_ = deadkey2_info_;
|
|
|
|
|
res += deadkey_state_->deadkey(c, d);
|
|
|
|
|
return res;
|
1999-09-27 18:44:28 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// TransFSM
|
|
|
|
|
TransFSM::TransFSM():
|
1999-12-21 06:10:21 +00:00
|
|
|
|
TransFSMData(),
|
|
|
|
|
TransInitState(),
|
|
|
|
|
TransDeadkeyState(),
|
|
|
|
|
TransCombinedState()
|
1999-09-27 18:44:28 +00:00
|
|
|
|
{
|
1999-12-21 06:10:21 +00:00
|
|
|
|
currentState = init_state_;
|
1999-09-27 18:44:28 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// TransManager
|
1999-12-21 06:10:21 +00:00
|
|
|
|
|
2001-03-06 19:29:58 +00:00
|
|
|
|
// Initialize static member.
|
|
|
|
|
Trans TransManager::default_;
|
|
|
|
|
|
|
|
|
|
|
1999-09-27 18:44:28 +00:00
|
|
|
|
TransManager::TransManager()
|
1999-11-15 12:01:38 +00:00
|
|
|
|
: active_(0), t1_(new Trans), t2_(new Trans)
|
1999-09-27 18:44:28 +00:00
|
|
|
|
{}
|
|
|
|
|
|
|
|
|
|
|
2003-11-03 17:47:28 +00:00
|
|
|
|
// For the sake of boost::scoped_ptr.
|
2002-03-21 17:27:08 +00:00
|
|
|
|
TransManager::~TransManager()
|
2003-11-03 17:47:28 +00:00
|
|
|
|
{}
|
1999-09-27 18:44:28 +00:00
|
|
|
|
|
|
|
|
|
|
2006-04-09 00:26:19 +00:00
|
|
|
|
int TransManager::setPrimary(string const & language)
|
1999-09-27 18:44:28 +00:00
|
|
|
|
{
|
2006-04-09 00:26:19 +00:00
|
|
|
|
if (t1_->getName() == language)
|
1999-12-21 06:10:21 +00:00
|
|
|
|
return 0;
|
2002-03-21 17:27:08 +00:00
|
|
|
|
|
2006-04-09 00:26:19 +00:00
|
|
|
|
return t1_->load(language);
|
1999-09-27 18:44:28 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2006-04-09 00:26:19 +00:00
|
|
|
|
int TransManager::setSecondary(string const & language)
|
1999-09-27 18:44:28 +00:00
|
|
|
|
{
|
2006-04-09 00:26:19 +00:00
|
|
|
|
if (t2_->getName() == language)
|
1999-12-21 06:10:21 +00:00
|
|
|
|
return 0;
|
2002-03-21 17:27:08 +00:00
|
|
|
|
|
2006-04-09 00:26:19 +00:00
|
|
|
|
return t2_->load(language);
|
1999-09-27 18:44:28 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2006-04-09 00:26:19 +00:00
|
|
|
|
void TransManager::enablePrimary()
|
1999-09-27 18:44:28 +00:00
|
|
|
|
{
|
2006-04-09 00:26:19 +00:00
|
|
|
|
if (t1_->isDefined())
|
2003-11-03 17:47:28 +00:00
|
|
|
|
active_ = t1_.get();
|
2002-03-21 17:27:08 +00:00
|
|
|
|
|
2007-04-01 10:09:49 +00:00
|
|
|
|
LYXERR(Debug::KBMAP) << "Enabling primary keymap" << endl;
|
1999-09-27 18:44:28 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2006-04-09 00:26:19 +00:00
|
|
|
|
void TransManager::enableSecondary()
|
1999-09-27 18:44:28 +00:00
|
|
|
|
{
|
2006-04-09 00:26:19 +00:00
|
|
|
|
if (t2_->isDefined())
|
2003-11-03 17:47:28 +00:00
|
|
|
|
active_ = t2_.get();
|
2007-04-01 10:09:49 +00:00
|
|
|
|
LYXERR(Debug::KBMAP) << "Enabling secondary keymap" << endl;
|
1999-09-27 18:44:28 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2006-04-09 00:26:19 +00:00
|
|
|
|
void TransManager::disableKeymap()
|
1999-09-27 18:44:28 +00:00
|
|
|
|
{
|
2001-03-06 19:29:58 +00:00
|
|
|
|
active_ = &default_;
|
2007-04-01 10:09:49 +00:00
|
|
|
|
LYXERR(Debug::KBMAP) << "Disabling keymap" << endl;
|
1999-09-27 18:44:28 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2007-03-31 08:12:08 +00:00
|
|
|
|
void TransManager::translateAndInsert(char_type c, LyXText * text, LCursor & cur)
|
1999-09-27 18:44:28 +00:00
|
|
|
|
{
|
2007-03-31 08:12:08 +00:00
|
|
|
|
docstring res = active_->process(c, *this);
|
2002-03-21 17:27:08 +00:00
|
|
|
|
|
1999-12-21 06:10:21 +00:00
|
|
|
|
// Process with tokens
|
2007-03-31 08:12:08 +00:00
|
|
|
|
docstring temp;
|
2002-03-21 17:27:08 +00:00
|
|
|
|
|
2001-12-05 08:04:20 +00:00
|
|
|
|
while (res.length() > 0) {
|
1999-12-21 06:10:21 +00:00
|
|
|
|
res = split(res, temp, TransState::TOKEN_SEP);
|
Move BufferView cached pointer out of LyXText:
* LyXText
- bv(), bv_owner, : deleted.
- These methods now need a (Buffer const &) argument: getFont(), applyOuterFont(), getLayoutFont(), getLabelFont(), setCharFont(), setLayout(), singleWidth(), leftMargin(), rightMargin(), computeRowMetrics(), isMainText(), spacing(), isRTL(), cursorX(), rowBreakPoint(), setRowWidth(), labelFill(), labelEnd().
- These methods now need a (BufferView const &) argument and are propably candidates for future removal when 1.6 is opened for development: redoParagraph(), x2pos(), getRowNearY(), getColumnNearX(), checkInsetHit(), setHeightOfRow().
- recUndo(): now need a LCursor argument.
* CoordCache::get(LyXText const *, pit_type):
- now const.
- use const_iterator instead of iterator.
* FontIterator:
- add (Buffer const &) argument to ctor
- buffer_: new const reference to applicable BufferView.
* InsetBase
- xo(), yo(), covers() and neverIndent() are now const.
* InsetText::setViewCache(): deleted
All other changes are due to the LyXText and InsetBase API changes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15618 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-30 12:45:33 +00:00
|
|
|
|
insert(temp, text, cur);
|
1999-12-21 06:10:21 +00:00
|
|
|
|
}
|
1999-09-27 18:44:28 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2007-03-31 16:41:02 +00:00
|
|
|
|
void TransManager::insert(docstring const & str, LyXText * text, LCursor & cur)
|
2002-03-21 17:27:08 +00:00
|
|
|
|
{
|
2004-02-13 07:30:59 +00:00
|
|
|
|
for (string::size_type i = 0, n = str.size(); i < n; ++i)
|
Move BufferView cached pointer out of LyXText:
* LyXText
- bv(), bv_owner, : deleted.
- These methods now need a (Buffer const &) argument: getFont(), applyOuterFont(), getLayoutFont(), getLabelFont(), setCharFont(), setLayout(), singleWidth(), leftMargin(), rightMargin(), computeRowMetrics(), isMainText(), spacing(), isRTL(), cursorX(), rowBreakPoint(), setRowWidth(), labelFill(), labelEnd().
- These methods now need a (BufferView const &) argument and are propably candidates for future removal when 1.6 is opened for development: redoParagraph(), x2pos(), getRowNearY(), getColumnNearX(), checkInsetHit(), setHeightOfRow().
- recUndo(): now need a LCursor argument.
* CoordCache::get(LyXText const *, pit_type):
- now const.
- use const_iterator instead of iterator.
* FontIterator:
- add (Buffer const &) argument to ctor
- buffer_: new const reference to applicable BufferView.
* InsetBase
- xo(), yo(), covers() and neverIndent() are now const.
* InsetText::setViewCache(): deleted
All other changes are due to the LyXText and InsetBase API changes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15618 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-30 12:45:33 +00:00
|
|
|
|
text->insertChar(cur, str[i]);
|
1999-09-27 18:44:28 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2007-03-31 08:12:08 +00:00
|
|
|
|
void TransManager::deadkey(char_type c, tex_accent accent, LyXText * t, LCursor & cur)
|
1999-09-27 18:44:28 +00:00
|
|
|
|
{
|
2001-03-06 19:29:58 +00:00
|
|
|
|
if (c == 0 && active_ != &default_) {
|
1999-12-21 06:10:21 +00:00
|
|
|
|
// A deadkey was pressed that cannot be printed
|
|
|
|
|
// or a accent command was typed in the minibuffer
|
|
|
|
|
KmodInfo i;
|
|
|
|
|
if (active_->isAccentDefined(accent, i) == true) {
|
2007-03-31 08:12:08 +00:00
|
|
|
|
docstring const res = trans_fsm_
|
2001-05-16 07:53:23 +00:00
|
|
|
|
.currentState->deadkey(c, i);
|
Move BufferView cached pointer out of LyXText:
* LyXText
- bv(), bv_owner, : deleted.
- These methods now need a (Buffer const &) argument: getFont(), applyOuterFont(), getLayoutFont(), getLabelFont(), setCharFont(), setLayout(), singleWidth(), leftMargin(), rightMargin(), computeRowMetrics(), isMainText(), spacing(), isRTL(), cursorX(), rowBreakPoint(), setRowWidth(), labelFill(), labelEnd().
- These methods now need a (BufferView const &) argument and are propably candidates for future removal when 1.6 is opened for development: redoParagraph(), x2pos(), getRowNearY(), getColumnNearX(), checkInsetHit(), setHeightOfRow().
- recUndo(): now need a LCursor argument.
* CoordCache::get(LyXText const *, pit_type):
- now const.
- use const_iterator instead of iterator.
* FontIterator:
- add (Buffer const &) argument to ctor
- buffer_: new const reference to applicable BufferView.
* InsetBase
- xo(), yo(), covers() and neverIndent() are now const.
* InsetText::setViewCache(): deleted
All other changes are due to the LyXText and InsetBase API changes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15618 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-30 12:45:33 +00:00
|
|
|
|
insert(res, t, cur);
|
1999-12-21 06:10:21 +00:00
|
|
|
|
return;
|
|
|
|
|
}
|
1999-09-27 18:44:28 +00:00
|
|
|
|
}
|
2002-03-21 17:27:08 +00:00
|
|
|
|
|
2001-03-06 19:29:58 +00:00
|
|
|
|
if (active_ == &default_ || c == 0) {
|
1999-12-21 06:10:21 +00:00
|
|
|
|
KmodInfo i;
|
|
|
|
|
i.accent = accent;
|
2000-05-04 10:57:00 +00:00
|
|
|
|
i.data.erase();
|
2007-03-31 08:12:08 +00:00
|
|
|
|
docstring res = trans_fsm_.currentState->deadkey(c, i);
|
Move BufferView cached pointer out of LyXText:
* LyXText
- bv(), bv_owner, : deleted.
- These methods now need a (Buffer const &) argument: getFont(), applyOuterFont(), getLayoutFont(), getLabelFont(), setCharFont(), setLayout(), singleWidth(), leftMargin(), rightMargin(), computeRowMetrics(), isMainText(), spacing(), isRTL(), cursorX(), rowBreakPoint(), setRowWidth(), labelFill(), labelEnd().
- These methods now need a (BufferView const &) argument and are propably candidates for future removal when 1.6 is opened for development: redoParagraph(), x2pos(), getRowNearY(), getColumnNearX(), checkInsetHit(), setHeightOfRow().
- recUndo(): now need a LCursor argument.
* CoordCache::get(LyXText const *, pit_type):
- now const.
- use const_iterator instead of iterator.
* FontIterator:
- add (Buffer const &) argument to ctor
- buffer_: new const reference to applicable BufferView.
* InsetBase
- xo(), yo(), covers() and neverIndent() are now const.
* InsetText::setViewCache(): deleted
All other changes are due to the LyXText and InsetBase API changes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15618 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-30 12:45:33 +00:00
|
|
|
|
insert(res, t, cur);
|
1999-12-21 06:10:21 +00:00
|
|
|
|
} else {
|
|
|
|
|
// Go through the translation
|
Move BufferView cached pointer out of LyXText:
* LyXText
- bv(), bv_owner, : deleted.
- These methods now need a (Buffer const &) argument: getFont(), applyOuterFont(), getLayoutFont(), getLabelFont(), setCharFont(), setLayout(), singleWidth(), leftMargin(), rightMargin(), computeRowMetrics(), isMainText(), spacing(), isRTL(), cursorX(), rowBreakPoint(), setRowWidth(), labelFill(), labelEnd().
- These methods now need a (BufferView const &) argument and are propably candidates for future removal when 1.6 is opened for development: redoParagraph(), x2pos(), getRowNearY(), getColumnNearX(), checkInsetHit(), setHeightOfRow().
- recUndo(): now need a LCursor argument.
* CoordCache::get(LyXText const *, pit_type):
- now const.
- use const_iterator instead of iterator.
* FontIterator:
- add (Buffer const &) argument to ctor
- buffer_: new const reference to applicable BufferView.
* InsetBase
- xo(), yo(), covers() and neverIndent() are now const.
* InsetText::setViewCache(): deleted
All other changes are due to the LyXText and InsetBase API changes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15618 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-30 12:45:33 +00:00
|
|
|
|
translateAndInsert(c, t, cur);
|
1999-12-21 06:10:21 +00:00
|
|
|
|
}
|
1999-09-27 18:44:28 +00:00
|
|
|
|
}
|
2006-10-21 00:16:43 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} // namespace lyx
|