2003-08-23 00:17:00 +00:00
|
|
|
|
/**
|
2003-10-08 11:31:51 +00:00
|
|
|
|
* \file src/text.C
|
2003-08-23 00:17:00 +00:00
|
|
|
|
* This file is part of LyX, the document processor.
|
|
|
|
|
* Licence details can be found in the file COPYING.
|
2002-03-21 17:27:08 +00:00
|
|
|
|
*
|
2003-08-23 00:17:00 +00:00
|
|
|
|
* \author Asger Alstrup
|
|
|
|
|
* \author Lars Gullik Bj<EFBFBD>nnes
|
|
|
|
|
* \author Jean-Marc Lasgouttes
|
|
|
|
|
* \author John Levon
|
|
|
|
|
* \author Andr<EFBFBD> P<EFBFBD>nitz
|
|
|
|
|
* \author Dekel Tsur
|
|
|
|
|
* \author J<EFBFBD>rgen Vigna
|
2002-03-21 17:27:08 +00:00
|
|
|
|
*
|
2003-08-23 00:17:00 +00:00
|
|
|
|
* Full author contact details are available in file CREDITS.
|
|
|
|
|
*/
|
1999-09-27 18:44:28 +00:00
|
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
|
2001-04-17 15:15:59 +00:00
|
|
|
|
#include "lyxtext.h"
|
2003-09-06 23:36:02 +00:00
|
|
|
|
|
2004-02-13 07:30:59 +00:00
|
|
|
|
#include "author.h"
|
1999-09-27 18:44:28 +00:00
|
|
|
|
#include "buffer.h"
|
2005-02-25 11:55:36 +00:00
|
|
|
|
#include "buffer_funcs.h"
|
2003-09-09 11:24:33 +00:00
|
|
|
|
#include "bufferparams.h"
|
2003-09-06 23:36:02 +00:00
|
|
|
|
#include "BufferView.h"
|
2006-12-29 23:54:48 +00:00
|
|
|
|
#include "bufferview_funcs.h"
|
2004-01-13 15:25:52 +00:00
|
|
|
|
#include "cursor.h"
|
2006-04-07 22:16:09 +00:00
|
|
|
|
#include "pariterator.h"
|
2004-11-30 01:59:49 +00:00
|
|
|
|
#include "coordcache.h"
|
2004-03-25 09:16:36 +00:00
|
|
|
|
#include "CutAndPaste.h"
|
1999-10-07 18:44:17 +00:00
|
|
|
|
#include "debug.h"
|
2003-10-29 10:47:21 +00:00
|
|
|
|
#include "dispatchresult.h"
|
2002-05-24 14:34:32 +00:00
|
|
|
|
#include "encoding.h"
|
2004-03-25 09:16:36 +00:00
|
|
|
|
#include "errorlist.h"
|
2003-09-04 03:54:04 +00:00
|
|
|
|
#include "funcrequest.h"
|
2004-03-25 09:16:36 +00:00
|
|
|
|
#include "factory.h"
|
2004-03-01 10:46:58 +00:00
|
|
|
|
#include "FontIterator.h"
|
2003-09-06 23:36:02 +00:00
|
|
|
|
#include "gettext.h"
|
2001-04-05 12:26:41 +00:00
|
|
|
|
#include "language.h"
|
2003-09-16 10:30:59 +00:00
|
|
|
|
#include "LColor.h"
|
2003-09-09 17:00:19 +00:00
|
|
|
|
#include "lyxlength.h"
|
2003-12-03 15:27:16 +00:00
|
|
|
|
#include "lyxlex.h"
|
2003-09-06 23:36:02 +00:00
|
|
|
|
#include "lyxrc.h"
|
|
|
|
|
#include "lyxrow.h"
|
2003-10-17 10:31:47 +00:00
|
|
|
|
#include "metricsinfo.h"
|
2003-09-16 12:12:33 +00:00
|
|
|
|
#include "paragraph.h"
|
2003-09-06 23:36:02 +00:00
|
|
|
|
#include "paragraph_funcs.h"
|
2001-06-25 00:06:33 +00:00
|
|
|
|
#include "ParagraphParameters.h"
|
2003-09-06 23:36:02 +00:00
|
|
|
|
#include "rowpainter.h"
|
2003-10-14 13:01:49 +00:00
|
|
|
|
#include "undo.h"
|
2003-09-09 17:00:19 +00:00
|
|
|
|
#include "vspace.h"
|
2002-08-13 14:40:38 +00:00
|
|
|
|
#include "WordLangTuple.h"
|
2003-09-06 23:36:02 +00:00
|
|
|
|
|
2006-10-07 16:15:06 +00:00
|
|
|
|
#include "frontends/FontMetrics.h"
|
2004-11-30 01:59:49 +00:00
|
|
|
|
#include "frontends/Painter.h"
|
1999-09-27 18:44:28 +00:00
|
|
|
|
|
2001-11-15 00:39:11 +00:00
|
|
|
|
#include "insets/insettext.h"
|
2004-03-25 09:16:36 +00:00
|
|
|
|
#include "insets/insetbibitem.h"
|
|
|
|
|
#include "insets/insethfill.h"
|
|
|
|
|
#include "insets/insetline.h"
|
|
|
|
|
#include "insets/insetnewline.h"
|
|
|
|
|
#include "insets/insetpagebreak.h"
|
|
|
|
|
#include "insets/insetoptarg.h"
|
|
|
|
|
#include "insets/insetspace.h"
|
|
|
|
|
#include "insets/insetspecialchar.h"
|
|
|
|
|
#include "insets/insettabular.h"
|
2001-11-15 00:39:11 +00:00
|
|
|
|
|
|
|
|
|
#include "support/lstrings.h"
|
2003-09-06 23:36:02 +00:00
|
|
|
|
#include "support/textutils.h"
|
2005-01-06 16:39:35 +00:00
|
|
|
|
#include "support/convert.h"
|
2004-07-24 10:55:30 +00:00
|
|
|
|
|
2005-09-26 09:20:15 +00:00
|
|
|
|
#include <boost/current_function.hpp>
|
|
|
|
|
|
2004-07-24 10:55:30 +00:00
|
|
|
|
#include <sstream>
|
2001-11-15 00:39:11 +00:00
|
|
|
|
|
2006-12-29 23:54:48 +00:00
|
|
|
|
using std::auto_ptr;
|
|
|
|
|
using std::advance;
|
|
|
|
|
using std::distance;
|
|
|
|
|
using std::max;
|
|
|
|
|
using std::min;
|
|
|
|
|
using std::endl;
|
|
|
|
|
using std::string;
|
2003-09-09 22:13:45 +00:00
|
|
|
|
|
2006-10-21 00:16:43 +00:00
|
|
|
|
namespace lyx {
|
2003-06-30 23:56:22 +00:00
|
|
|
|
|
2006-10-21 00:16:43 +00:00
|
|
|
|
using support::bformat;
|
|
|
|
|
using support::contains;
|
|
|
|
|
using support::lowercase;
|
|
|
|
|
using support::split;
|
|
|
|
|
using support::uppercase;
|
2004-03-25 09:16:36 +00:00
|
|
|
|
|
2006-10-21 00:16:43 +00:00
|
|
|
|
using cap::cutSelection;
|
|
|
|
|
using cap::pasteParagraphList;
|
|
|
|
|
|
|
|
|
|
using frontend::FontMetrics;
|
2006-10-07 16:15:06 +00:00
|
|
|
|
|
2003-10-23 09:06:18 +00:00
|
|
|
|
namespace {
|
|
|
|
|
|
2004-08-16 00:16:17 +00:00
|
|
|
|
void readParToken(Buffer const & buf, Paragraph & par, LyXLex & lex,
|
2006-08-13 16:16:43 +00:00
|
|
|
|
string const & token, LyXFont & font, Change & change, ErrorList & errorList)
|
2004-03-25 09:16:36 +00:00
|
|
|
|
{
|
|
|
|
|
BufferParams const & bp = buf.params();
|
|
|
|
|
|
|
|
|
|
if (token[0] != '\\') {
|
2006-08-13 22:54:59 +00:00
|
|
|
|
#if 0
|
2004-03-25 09:16:36 +00:00
|
|
|
|
string::const_iterator cit = token.begin();
|
2005-07-17 23:03:01 +00:00
|
|
|
|
for (; cit != token.end(); ++cit)
|
2004-03-25 09:16:36 +00:00
|
|
|
|
par.insertChar(par.size(), (*cit), font, change);
|
2006-08-13 22:54:59 +00:00
|
|
|
|
#else
|
2006-10-21 00:16:43 +00:00
|
|
|
|
docstring dstr = lex.getDocString();
|
|
|
|
|
docstring::const_iterator cit = dstr.begin();
|
|
|
|
|
docstring::const_iterator cend = dstr.end();
|
2006-08-13 22:54:59 +00:00
|
|
|
|
for (; cit != cend; ++cit)
|
|
|
|
|
par.insertChar(par.size(), *cit, font, change);
|
|
|
|
|
#endif
|
2004-03-25 09:16:36 +00:00
|
|
|
|
} else if (token == "\\begin_layout") {
|
|
|
|
|
lex.eatLine();
|
|
|
|
|
string layoutname = lex.getString();
|
|
|
|
|
|
|
|
|
|
font = LyXFont(LyXFont::ALL_INHERIT, bp.language);
|
2006-10-11 20:01:32 +00:00
|
|
|
|
change = Change(Change::UNCHANGED);
|
2004-03-25 09:16:36 +00:00
|
|
|
|
|
|
|
|
|
LyXTextClass const & tclass = bp.getLyXTextClass();
|
|
|
|
|
|
|
|
|
|
if (layoutname.empty()) {
|
|
|
|
|
layoutname = tclass.defaultLayoutName();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool hasLayout = tclass.hasLayout(layoutname);
|
|
|
|
|
|
|
|
|
|
if (!hasLayout) {
|
2006-09-11 08:54:10 +00:00
|
|
|
|
errorList.push_back(ErrorItem(_("Unknown layout"),
|
|
|
|
|
bformat(_("Layout '%1$s' does not exist in textclass '%2$s'\nTrying to use the default instead.\n"),
|
2006-10-21 00:16:43 +00:00
|
|
|
|
from_utf8(layoutname), from_utf8(tclass.name())), par.id(), 0, par.size()));
|
2004-03-25 09:16:36 +00:00
|
|
|
|
layoutname = tclass.defaultLayoutName();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
par.layout(bp.getLyXTextClass()[layoutname]);
|
|
|
|
|
|
|
|
|
|
// Test whether the layout is obsolete.
|
|
|
|
|
LyXLayout_ptr const & layout = par.layout();
|
|
|
|
|
if (!layout->obsoleted_by().empty())
|
|
|
|
|
par.layout(bp.getLyXTextClass()[layout->obsoleted_by()]);
|
|
|
|
|
|
|
|
|
|
par.params().read(lex);
|
|
|
|
|
|
|
|
|
|
} else if (token == "\\end_layout") {
|
2005-07-14 08:20:10 +00:00
|
|
|
|
lyxerr << BOOST_CURRENT_FUNCTION
|
2006-04-05 23:56:29 +00:00
|
|
|
|
<< ": Solitary \\end_layout in line "
|
|
|
|
|
<< lex.getLineNo() << "\n"
|
2004-03-25 09:16:36 +00:00
|
|
|
|
<< "Missing \\begin_layout?.\n";
|
|
|
|
|
} else if (token == "\\end_inset") {
|
2005-07-14 08:20:10 +00:00
|
|
|
|
lyxerr << BOOST_CURRENT_FUNCTION
|
2006-04-05 23:56:29 +00:00
|
|
|
|
<< ": Solitary \\end_inset in line "
|
|
|
|
|
<< lex.getLineNo() << "\n"
|
2004-03-25 09:16:36 +00:00
|
|
|
|
<< "Missing \\begin_inset?.\n";
|
|
|
|
|
} else if (token == "\\begin_inset") {
|
|
|
|
|
InsetBase * inset = readInset(lex, buf);
|
|
|
|
|
if (inset)
|
|
|
|
|
par.insertInset(par.size(), inset, font, change);
|
|
|
|
|
else {
|
|
|
|
|
lex.eatLine();
|
2006-11-22 09:15:38 +00:00
|
|
|
|
docstring line = lex.getDocString();
|
2006-09-11 08:54:10 +00:00
|
|
|
|
errorList.push_back(ErrorItem(_("Unknown Inset"), line,
|
2004-03-25 09:16:36 +00:00
|
|
|
|
par.id(), 0, par.size()));
|
|
|
|
|
}
|
|
|
|
|
} else if (token == "\\family") {
|
|
|
|
|
lex.next();
|
|
|
|
|
font.setLyXFamily(lex.getString());
|
|
|
|
|
} else if (token == "\\series") {
|
|
|
|
|
lex.next();
|
|
|
|
|
font.setLyXSeries(lex.getString());
|
|
|
|
|
} else if (token == "\\shape") {
|
|
|
|
|
lex.next();
|
|
|
|
|
font.setLyXShape(lex.getString());
|
|
|
|
|
} else if (token == "\\size") {
|
|
|
|
|
lex.next();
|
|
|
|
|
font.setLyXSize(lex.getString());
|
|
|
|
|
} else if (token == "\\lang") {
|
|
|
|
|
lex.next();
|
|
|
|
|
string const tok = lex.getString();
|
|
|
|
|
Language const * lang = languages.getLanguage(tok);
|
|
|
|
|
if (lang) {
|
|
|
|
|
font.setLanguage(lang);
|
|
|
|
|
} else {
|
|
|
|
|
font.setLanguage(bp.language);
|
|
|
|
|
lex.printError("Unknown language `$$Token'");
|
|
|
|
|
}
|
|
|
|
|
} else if (token == "\\numeric") {
|
|
|
|
|
lex.next();
|
|
|
|
|
font.setNumber(font.setLyXMisc(lex.getString()));
|
|
|
|
|
} else if (token == "\\emph") {
|
|
|
|
|
lex.next();
|
|
|
|
|
font.setEmph(font.setLyXMisc(lex.getString()));
|
|
|
|
|
} else if (token == "\\bar") {
|
|
|
|
|
lex.next();
|
|
|
|
|
string const tok = lex.getString();
|
|
|
|
|
|
|
|
|
|
if (tok == "under")
|
|
|
|
|
font.setUnderbar(LyXFont::ON);
|
|
|
|
|
else if (tok == "no")
|
|
|
|
|
font.setUnderbar(LyXFont::OFF);
|
|
|
|
|
else if (tok == "default")
|
|
|
|
|
font.setUnderbar(LyXFont::INHERIT);
|
|
|
|
|
else
|
|
|
|
|
lex.printError("Unknown bar font flag "
|
|
|
|
|
"`$$Token'");
|
|
|
|
|
} else if (token == "\\noun") {
|
|
|
|
|
lex.next();
|
|
|
|
|
font.setNoun(font.setLyXMisc(lex.getString()));
|
|
|
|
|
} else if (token == "\\color") {
|
|
|
|
|
lex.next();
|
|
|
|
|
font.setLyXColor(lex.getString());
|
|
|
|
|
} else if (token == "\\InsetSpace" || token == "\\SpecialChar") {
|
|
|
|
|
|
|
|
|
|
// Insets don't make sense in a free-spacing context! ---Kayvan
|
|
|
|
|
if (par.isFreeSpacing()) {
|
|
|
|
|
if (token == "\\InsetSpace")
|
|
|
|
|
par.insertChar(par.size(), ' ', font, change);
|
|
|
|
|
else if (lex.isOK()) {
|
|
|
|
|
lex.next();
|
|
|
|
|
string const next_token = lex.getString();
|
|
|
|
|
if (next_token == "\\-")
|
|
|
|
|
par.insertChar(par.size(), '-', font, change);
|
|
|
|
|
else {
|
|
|
|
|
lex.printError("Token `$$Token' "
|
|
|
|
|
"is in free space "
|
|
|
|
|
"paragraph layout!");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
auto_ptr<InsetBase> inset;
|
|
|
|
|
if (token == "\\SpecialChar" )
|
|
|
|
|
inset.reset(new InsetSpecialChar);
|
|
|
|
|
else
|
|
|
|
|
inset.reset(new InsetSpace);
|
|
|
|
|
inset->read(buf, lex);
|
|
|
|
|
par.insertInset(par.size(), inset.release(),
|
|
|
|
|
font, change);
|
|
|
|
|
}
|
|
|
|
|
} else if (token == "\\backslash") {
|
|
|
|
|
par.insertChar(par.size(), '\\', font, change);
|
|
|
|
|
} else if (token == "\\newline") {
|
|
|
|
|
auto_ptr<InsetBase> inset(new InsetNewline);
|
|
|
|
|
inset->read(buf, lex);
|
|
|
|
|
par.insertInset(par.size(), inset.release(), font, change);
|
|
|
|
|
} else if (token == "\\LyXTable") {
|
|
|
|
|
auto_ptr<InsetBase> inset(new InsetTabular(buf));
|
|
|
|
|
inset->read(buf, lex);
|
|
|
|
|
par.insertInset(par.size(), inset.release(), font, change);
|
|
|
|
|
} else if (token == "\\hfill") {
|
|
|
|
|
par.insertInset(par.size(), new InsetHFill, font, change);
|
|
|
|
|
} else if (token == "\\lyxline") {
|
|
|
|
|
par.insertInset(par.size(), new InsetLine, font, change);
|
|
|
|
|
} else if (token == "\\newpage") {
|
|
|
|
|
par.insertInset(par.size(), new InsetPagebreak, font, change);
|
2006-11-25 15:09:01 +00:00
|
|
|
|
} else if (token == "\\clearpage") {
|
|
|
|
|
par.insertInset(par.size(), new InsetClearPage, font, change);
|
|
|
|
|
} else if (token == "\\cleardoublepage") {
|
|
|
|
|
par.insertInset(par.size(), new InsetClearDoublePage, font, change);
|
2004-03-25 09:16:36 +00:00
|
|
|
|
} else if (token == "\\change_unchanged") {
|
|
|
|
|
change = Change(Change::UNCHANGED);
|
|
|
|
|
} else if (token == "\\change_inserted") {
|
2004-10-05 12:56:22 +00:00
|
|
|
|
lex.eatLine();
|
2004-03-25 09:16:36 +00:00
|
|
|
|
std::istringstream is(lex.getString());
|
2006-07-06 08:18:51 +00:00
|
|
|
|
unsigned int aid;
|
2006-10-21 00:16:43 +00:00
|
|
|
|
time_type ct;
|
2004-03-25 09:16:36 +00:00
|
|
|
|
is >> aid >> ct;
|
2006-06-07 17:05:25 +00:00
|
|
|
|
if (aid >= bp.author_map.size()) {
|
2006-09-11 08:54:10 +00:00
|
|
|
|
errorList.push_back(ErrorItem(_("Change tracking error"),
|
|
|
|
|
bformat(_("Unknown author index for insertion: %1$d\n"), aid),
|
2006-06-07 17:05:25 +00:00
|
|
|
|
par.id(), 0, par.size()));
|
|
|
|
|
change = Change(Change::UNCHANGED);
|
|
|
|
|
} else
|
|
|
|
|
change = Change(Change::INSERTED, bp.author_map[aid], ct);
|
2004-03-25 09:16:36 +00:00
|
|
|
|
} else if (token == "\\change_deleted") {
|
2004-10-05 12:56:22 +00:00
|
|
|
|
lex.eatLine();
|
2004-03-25 09:16:36 +00:00
|
|
|
|
std::istringstream is(lex.getString());
|
2006-07-06 08:18:51 +00:00
|
|
|
|
unsigned int aid;
|
2006-10-21 00:16:43 +00:00
|
|
|
|
time_type ct;
|
2004-03-25 09:16:36 +00:00
|
|
|
|
is >> aid >> ct;
|
2006-06-07 17:05:25 +00:00
|
|
|
|
if (aid >= bp.author_map.size()) {
|
2006-09-11 08:54:10 +00:00
|
|
|
|
errorList.push_back(ErrorItem(_("Change tracking error"),
|
|
|
|
|
bformat(_("Unknown author index for deletion: %1$d\n"), aid),
|
2006-06-07 17:05:25 +00:00
|
|
|
|
par.id(), 0, par.size()));
|
|
|
|
|
change = Change(Change::UNCHANGED);
|
|
|
|
|
} else
|
|
|
|
|
change = Change(Change::DELETED, bp.author_map[aid], ct);
|
2004-03-25 09:16:36 +00:00
|
|
|
|
} else {
|
|
|
|
|
lex.eatLine();
|
2006-09-11 08:54:10 +00:00
|
|
|
|
errorList.push_back(ErrorItem(_("Unknown token"),
|
2006-10-21 00:16:43 +00:00
|
|
|
|
bformat(_("Unknown token: %1$s %2$s\n"), from_utf8(token),
|
2006-11-22 09:15:38 +00:00
|
|
|
|
lex.getDocString()),
|
2004-03-25 09:16:36 +00:00
|
|
|
|
par.id(), 0, par.size()));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2006-10-21 00:16:43 +00:00
|
|
|
|
void readParagraph(Buffer const & buf, Paragraph & par, LyXLex & lex,
|
|
|
|
|
ErrorList & errorList)
|
2004-03-25 09:16:36 +00:00
|
|
|
|
{
|
|
|
|
|
lex.nextToken();
|
|
|
|
|
string token = lex.getString();
|
2004-08-15 21:12:21 +00:00
|
|
|
|
LyXFont font;
|
2006-10-11 20:01:32 +00:00
|
|
|
|
Change change(Change::UNCHANGED);
|
2004-03-25 09:16:36 +00:00
|
|
|
|
|
|
|
|
|
while (lex.isOK()) {
|
2006-08-13 16:16:43 +00:00
|
|
|
|
readParToken(buf, par, lex, token, font, change, errorList);
|
2004-03-25 09:16:36 +00:00
|
|
|
|
|
|
|
|
|
lex.nextToken();
|
|
|
|
|
token = lex.getString();
|
|
|
|
|
|
|
|
|
|
if (token.empty())
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
if (token == "\\end_layout") {
|
|
|
|
|
//Ok, paragraph finished
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
lyxerr[Debug::PARSER] << "Handling paragraph token: `"
|
|
|
|
|
<< token << '\'' << endl;
|
|
|
|
|
if (token == "\\begin_layout" || token == "\\end_document"
|
|
|
|
|
|| token == "\\end_inset" || token == "\\begin_deeper"
|
|
|
|
|
|| token == "\\end_deeper") {
|
|
|
|
|
lex.pushToken(token);
|
|
|
|
|
lyxerr << "Paragraph ended in line "
|
|
|
|
|
<< lex.getLineNo() << "\n"
|
|
|
|
|
<< "Missing \\end_layout.\n";
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
2006-03-11 13:31:41 +00:00
|
|
|
|
// Final change goes to paragraph break:
|
2006-05-08 20:30:52 +00:00
|
|
|
|
par.setChange(par.size(), change);
|
2006-04-05 23:56:29 +00:00
|
|
|
|
|
2005-06-16 15:15:33 +00:00
|
|
|
|
// Initialize begin_of_body_ on load; redoParagraph maintains
|
|
|
|
|
par.setBeginOfBody();
|
2004-03-25 09:16:36 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2003-10-23 09:06:18 +00:00
|
|
|
|
} // namespace anon
|
|
|
|
|
|
|
|
|
|
|
2003-03-17 16:25:00 +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
|
|
|
|
double LyXText::spacing(Buffer const & buffer,
|
|
|
|
|
Paragraph const & par) const
|
2003-03-17 16:25:00 +00:00
|
|
|
|
{
|
2004-04-08 15:03:33 +00:00
|
|
|
|
if (par.params().spacing().isDefault())
|
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
|
|
|
|
return buffer.params().spacing().getValue();
|
2004-04-08 15:03:33 +00:00
|
|
|
|
return par.params().spacing().getValue();
|
2003-03-17 16:25:00 +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
|
|
|
|
int LyXText::singleWidth(Buffer const & buffer, Paragraph const & par,
|
|
|
|
|
pos_type pos) const
|
1999-09-27 18:44:28 +00:00
|
|
|
|
{
|
2006-10-30 20:10:35 +00:00
|
|
|
|
return singleWidth(par, pos, par.getChar(pos),
|
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
|
|
|
|
getFont(buffer, par, pos));
|
1999-09-27 18:44:28 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2006-10-30 20:10:35 +00:00
|
|
|
|
int LyXText::singleWidth(Paragraph const & par,
|
2006-04-09 02:30:40 +00:00
|
|
|
|
pos_type pos, char_type c, LyXFont const & font) const
|
2000-02-10 17:53:36 +00:00
|
|
|
|
{
|
|
|
|
|
// The most common case is handled first (Asger)
|
2006-04-08 09:09:57 +00:00
|
|
|
|
if (isPrintable(c)) {
|
2005-07-16 12:02:31 +00:00
|
|
|
|
Language const * language = font.language();
|
2006-04-09 00:26:19 +00:00
|
|
|
|
if (language->rightToLeft()) {
|
2003-07-27 00:37:17 +00:00
|
|
|
|
if ((lyxrc.font_norm_type == LyXRC::ISO_8859_6_8 ||
|
|
|
|
|
lyxrc.font_norm_type == LyXRC::ISO_10646_1)
|
2005-07-16 12:02:31 +00:00
|
|
|
|
&& language->lang() == "arabic") {
|
2006-04-09 00:26:19 +00:00
|
|
|
|
if (Encodings::isComposeChar_arabic(c))
|
2000-07-04 20:32:37 +00:00
|
|
|
|
return 0;
|
2004-11-30 01:59:49 +00:00
|
|
|
|
c = par.transformChar(c, pos);
|
2005-07-16 12:02:31 +00:00
|
|
|
|
} else if (language->lang() == "hebrew" &&
|
2006-04-09 00:26:19 +00:00
|
|
|
|
Encodings::isComposeChar_hebrew(c))
|
2000-05-05 10:17:05 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
2006-10-11 17:24:46 +00:00
|
|
|
|
return theFontMetrics(font).width(c);
|
2003-03-11 15:01:29 +00:00
|
|
|
|
}
|
|
|
|
|
|
2003-10-29 10:47:21 +00:00
|
|
|
|
if (c == Paragraph::META_INSET)
|
2004-08-14 22:38:45 +00:00
|
|
|
|
return par.getInset(pos)->width();
|
2000-02-10 17:53:36 +00:00
|
|
|
|
|
2006-10-11 17:24:46 +00:00
|
|
|
|
return theFontMetrics(font).width(c);
|
2000-02-10 17:53:36 +00:00
|
|
|
|
}
|
1999-09-27 18:44:28 +00:00
|
|
|
|
|
|
|
|
|
|
2006-12-29 23:54:48 +00:00
|
|
|
|
int LyXText::leftMargin(Buffer const & buffer, int max_width, pit_type pit) const
|
2003-11-25 11:17:27 +00:00
|
|
|
|
{
|
2004-11-30 01:59:49 +00:00
|
|
|
|
BOOST_ASSERT(pit >= 0);
|
|
|
|
|
BOOST_ASSERT(pit < int(pars_.size()));
|
2006-12-29 23:54:48 +00:00
|
|
|
|
return leftMargin(buffer, max_width, pit, pars_[pit].size());
|
2003-11-25 11:17:27 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2006-12-29 23:54:48 +00:00
|
|
|
|
int LyXText::leftMargin(Buffer const & buffer, int max_width,
|
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
|
|
|
|
pit_type const pit, pos_type const pos) const
|
2003-08-26 10:33:59 +00:00
|
|
|
|
{
|
2004-11-30 01:59:49 +00:00
|
|
|
|
BOOST_ASSERT(pit >= 0);
|
|
|
|
|
BOOST_ASSERT(pit < int(pars_.size()));
|
2004-08-14 22:38:45 +00:00
|
|
|
|
Paragraph const & par = pars_[pit];
|
2004-11-30 01:59:49 +00:00
|
|
|
|
BOOST_ASSERT(pos >= 0);
|
|
|
|
|
BOOST_ASSERT(pos <= par.size());
|
|
|
|
|
//lyxerr << "LyXText::leftMargin: pit: " << pit << " pos: " << pos << endl;
|
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
|
|
|
|
LyXTextClass const & tclass = buffer.params().getLyXTextClass();
|
2004-08-14 22:38:45 +00:00
|
|
|
|
LyXLayout_ptr const & layout = par.layout();
|
2002-03-21 17:27:08 +00:00
|
|
|
|
|
2002-06-24 20:28:12 +00:00
|
|
|
|
string parindent = layout->parindent;
|
2000-06-08 23:16:16 +00:00
|
|
|
|
|
2004-08-14 15:55:22 +00:00
|
|
|
|
int l_margin = 0;
|
2002-06-24 20:28:12 +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
|
|
|
|
if (isMainText(buffer))
|
2004-08-14 15:55:22 +00:00
|
|
|
|
l_margin += changebarMargin();
|
2001-05-03 14:31:33 +00:00
|
|
|
|
|
2006-10-17 14:46:45 +00:00
|
|
|
|
// FIXME UNICODE
|
2006-10-21 00:16:43 +00:00
|
|
|
|
docstring leftm = from_utf8(tclass.leftmargin());
|
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
|
|
|
|
l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(leftm);
|
2004-08-14 15:55:22 +00:00
|
|
|
|
|
2004-08-14 22:38:45 +00:00
|
|
|
|
if (par.getDepth() != 0) {
|
2005-11-17 09:19:02 +00:00
|
|
|
|
// find the next level paragraph
|
|
|
|
|
pit_type newpar = outerHook(pit, pars_);
|
2004-11-24 21:53:46 +00:00
|
|
|
|
if (newpar != pit_type(pars_.size())) {
|
2004-08-14 15:55:22 +00:00
|
|
|
|
if (pars_[newpar].layout()->isEnvironment()) {
|
2006-12-29 23:54:48 +00:00
|
|
|
|
l_margin = leftMargin(buffer, max_width, newpar);
|
2004-08-14 15:55:22 +00:00
|
|
|
|
}
|
2004-08-14 22:38:45 +00:00
|
|
|
|
if (par.layout() == tclass.defaultLayout()) {
|
2004-08-14 15:55:22 +00:00
|
|
|
|
if (pars_[newpar].params().noindent())
|
2000-05-04 10:57:00 +00:00
|
|
|
|
parindent.erase();
|
2004-08-14 15:55:22 +00:00
|
|
|
|
else
|
|
|
|
|
parindent = pars_[newpar].layout()->parindent;
|
2000-01-13 16:28:54 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2002-03-21 17:27:08 +00:00
|
|
|
|
|
2005-11-17 09:19:02 +00:00
|
|
|
|
// This happens after sections in standard classes. The 1.3.x
|
|
|
|
|
// code compared depths too, but it does not seem necessary
|
|
|
|
|
// (JMarc)
|
|
|
|
|
if (par.layout() == tclass.defaultLayout()
|
|
|
|
|
&& pit > 0 && pars_[pit - 1].layout()->nextnoindent)
|
|
|
|
|
parindent.erase();
|
|
|
|
|
|
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
|
|
|
|
LyXFont const labelfont = getLabelFont(buffer, par);
|
2006-10-11 17:24:46 +00:00
|
|
|
|
FontMetrics const & labelfont_metrics = theFontMetrics(labelfont);
|
2006-10-07 16:15:06 +00:00
|
|
|
|
|
2002-06-24 20:28:12 +00:00
|
|
|
|
switch (layout->margintype) {
|
2000-01-13 16:28:54 +00:00
|
|
|
|
case MARGIN_DYNAMIC:
|
2006-09-09 15:27:44 +00:00
|
|
|
|
if (!layout->leftmargin.empty()) {
|
2006-10-17 14:46:45 +00:00
|
|
|
|
// FIXME UNICODE
|
2006-10-21 00:16:43 +00:00
|
|
|
|
docstring leftm = from_utf8(layout->leftmargin);
|
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
|
|
|
|
l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(leftm);
|
2006-09-09 15:27:44 +00:00
|
|
|
|
}
|
|
|
|
|
if (!par.getLabelstring().empty()) {
|
2006-10-17 14:46:45 +00:00
|
|
|
|
// FIXME UNICODE
|
2006-10-21 00:16:43 +00:00
|
|
|
|
docstring labin = from_utf8(layout->labelindent);
|
2006-10-17 14:46:45 +00:00
|
|
|
|
l_margin += labelfont_metrics.signedWidth(labin);
|
2006-10-20 19:26:23 +00:00
|
|
|
|
docstring labstr = par.getLabelstring();
|
2006-10-17 14:46:45 +00:00
|
|
|
|
l_margin += labelfont_metrics.width(labstr);
|
2006-10-21 00:16:43 +00:00
|
|
|
|
docstring labsep = from_utf8(layout->labelsep);
|
2006-10-17 14:46:45 +00:00
|
|
|
|
l_margin += labelfont_metrics.width(labsep);
|
2000-01-13 16:28:54 +00:00
|
|
|
|
}
|
|
|
|
|
break;
|
2003-10-28 11:18:40 +00:00
|
|
|
|
|
2006-08-13 22:54:59 +00:00
|
|
|
|
case MARGIN_MANUAL: {
|
2006-10-17 14:46:45 +00:00
|
|
|
|
// FIXME UNICODE
|
2006-10-21 00:16:43 +00:00
|
|
|
|
docstring labin = from_utf8(layout->labelindent);
|
2006-10-17 14:46:45 +00:00
|
|
|
|
l_margin += labelfont_metrics.signedWidth(labin);
|
2003-03-08 19:31:09 +00:00
|
|
|
|
// The width of an empty par, even with manual label, should be 0
|
2004-08-14 22:38:45 +00:00
|
|
|
|
if (!par.empty() && pos >= par.beginOfBody()) {
|
|
|
|
|
if (!par.getLabelWidthString().empty()) {
|
2006-10-20 19:26:23 +00:00
|
|
|
|
docstring labstr = par.getLabelWidthString();
|
2006-10-17 14:46:45 +00:00
|
|
|
|
l_margin += labelfont_metrics.width(labstr);
|
2006-10-21 00:16:43 +00:00
|
|
|
|
docstring labsep = from_utf8(layout->labelsep);
|
2006-10-17 14:46:45 +00:00
|
|
|
|
l_margin += labelfont_metrics.width(labsep);
|
2000-01-13 16:28:54 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
2006-09-09 15:27:44 +00:00
|
|
|
|
}
|
|
|
|
|
|
2006-08-13 22:54:59 +00:00
|
|
|
|
case MARGIN_STATIC: {
|
2006-10-17 14:46:45 +00:00
|
|
|
|
// FIXME UNICODE
|
2006-10-21 00:16:43 +00:00
|
|
|
|
docstring leftm = from_utf8(layout->leftmargin);
|
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
|
|
|
|
l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(leftm)
|
2006-10-07 16:15:06 +00:00
|
|
|
|
* 4 / (par.getDepth() + 4);
|
2000-01-13 16:28:54 +00:00
|
|
|
|
break;
|
2006-09-09 15:27:44 +00:00
|
|
|
|
}
|
2003-10-28 11:18:40 +00:00
|
|
|
|
|
2000-01-13 16:28:54 +00:00
|
|
|
|
case MARGIN_FIRST_DYNAMIC:
|
2002-06-24 20:28:12 +00:00
|
|
|
|
if (layout->labeltype == LABEL_MANUAL) {
|
2004-08-14 22:38:45 +00:00
|
|
|
|
if (pos >= par.beginOfBody()) {
|
2006-10-17 14:46:45 +00:00
|
|
|
|
// FIXME UNICODE
|
|
|
|
|
l_margin += labelfont_metrics.signedWidth(
|
2006-10-21 00:16:43 +00:00
|
|
|
|
from_utf8(layout->leftmargin));
|
2000-01-13 16:28:54 +00:00
|
|
|
|
} else {
|
2006-10-17 14:46:45 +00:00
|
|
|
|
// FIXME UNICODE
|
|
|
|
|
l_margin += labelfont_metrics.signedWidth(
|
2006-10-21 00:16:43 +00:00
|
|
|
|
from_utf8(layout->labelindent));
|
2000-01-13 16:28:54 +00:00
|
|
|
|
}
|
2003-11-25 11:17:27 +00:00
|
|
|
|
} else if (pos != 0
|
2000-01-13 16:28:54 +00:00
|
|
|
|
// Special case to fix problems with
|
|
|
|
|
// theorems (JMarc)
|
2002-06-24 20:28:12 +00:00
|
|
|
|
|| (layout->labeltype == LABEL_STATIC
|
|
|
|
|
&& layout->latextype == LATEX_ENVIRONMENT
|
2004-08-14 15:55:22 +00:00
|
|
|
|
&& !isFirstInSequence(pit, pars_))) {
|
2006-10-17 14:46:45 +00:00
|
|
|
|
// FIXME UNICODE
|
2006-10-21 00:16:43 +00:00
|
|
|
|
l_margin += labelfont_metrics.signedWidth(from_utf8(layout->leftmargin));
|
2002-06-24 20:28:12 +00:00
|
|
|
|
} else if (layout->labeltype != LABEL_TOP_ENVIRONMENT
|
|
|
|
|
&& layout->labeltype != LABEL_BIBLIO
|
|
|
|
|
&& layout->labeltype !=
|
2000-01-13 16:28:54 +00:00
|
|
|
|
LABEL_CENTERED_TOP_ENVIRONMENT) {
|
2006-10-21 00:16:43 +00:00
|
|
|
|
l_margin += labelfont_metrics.signedWidth(from_utf8(layout->labelindent));
|
|
|
|
|
l_margin += labelfont_metrics.width(from_utf8(layout->labelsep));
|
2006-10-20 19:26:23 +00:00
|
|
|
|
l_margin += labelfont_metrics.width(par.getLabelstring());
|
2002-03-21 17:27:08 +00:00
|
|
|
|
}
|
2000-01-13 16:28:54 +00:00
|
|
|
|
break;
|
2002-03-21 17:27:08 +00:00
|
|
|
|
|
2003-10-28 11:18:40 +00:00
|
|
|
|
case MARGIN_RIGHT_ADDRESS_BOX: {
|
2003-12-02 07:15:42 +00:00
|
|
|
|
#if 0
|
2000-01-13 16:28:54 +00:00
|
|
|
|
// ok, a terrible hack. The left margin depends on the widest
|
2003-10-17 10:31:47 +00:00
|
|
|
|
// row in this paragraph.
|
2004-11-30 01:59:49 +00:00
|
|
|
|
RowList::iterator rit = par.rows().begin();
|
|
|
|
|
RowList::iterator end = par.rows().end();
|
2004-04-05 09:36:28 +00:00
|
|
|
|
#ifdef WITH_WARNINGS
|
2003-10-24 08:33:52 +00:00
|
|
|
|
#warning This is wrong.
|
2004-04-05 09:36:28 +00:00
|
|
|
|
#endif
|
2006-12-29 23:54:48 +00:00
|
|
|
|
int minfill = max_width;
|
2003-08-14 09:59:05 +00:00
|
|
|
|
for ( ; rit != end; ++rit)
|
|
|
|
|
if (rit->fill() < minfill)
|
|
|
|
|
minfill = rit->fill();
|
2006-10-11 17:24:46 +00:00
|
|
|
|
l_margin += theFontMetrics(params.getFont()).signedWidth(layout->leftmargin);
|
2004-08-14 15:55:22 +00:00
|
|
|
|
l_margin += minfill;
|
2003-12-02 07:15:42 +00:00
|
|
|
|
#endif
|
|
|
|
|
// also wrong, but much shorter.
|
2006-12-29 23:54:48 +00:00
|
|
|
|
l_margin += max_width / 2;
|
2003-11-25 11:17:27 +00:00
|
|
|
|
break;
|
2000-01-13 16:28:54 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2004-04-03 08:37:12 +00:00
|
|
|
|
|
2004-08-14 22:38:45 +00:00
|
|
|
|
if (!par.params().leftIndent().zero())
|
2006-12-29 23:54:48 +00:00
|
|
|
|
l_margin += par.params().leftIndent().inPixels(max_width);
|
2002-05-08 12:58:16 +00:00
|
|
|
|
|
2003-04-13 01:04:04 +00:00
|
|
|
|
LyXAlignment align;
|
2001-05-03 14:31:33 +00:00
|
|
|
|
|
2004-08-14 22:38:45 +00:00
|
|
|
|
if (par.params().align() == LYX_ALIGN_LAYOUT)
|
2002-06-24 20:28:12 +00:00
|
|
|
|
align = layout->align;
|
2000-07-19 17:16:27 +00:00
|
|
|
|
else
|
2004-08-14 22:38:45 +00:00
|
|
|
|
align = par.params().align();
|
2001-05-03 14:31:33 +00:00
|
|
|
|
|
2000-01-13 16:28:54 +00:00
|
|
|
|
// set the correct parindent
|
2003-12-03 18:17:20 +00:00
|
|
|
|
if (pos == 0
|
|
|
|
|
&& (layout->labeltype == LABEL_NO_LABEL
|
|
|
|
|
|| layout->labeltype == LABEL_TOP_ENVIRONMENT
|
|
|
|
|
|| layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT
|
|
|
|
|
|| (layout->labeltype == LABEL_STATIC
|
2006-04-05 23:56:29 +00:00
|
|
|
|
&& layout->latextype == LATEX_ENVIRONMENT
|
|
|
|
|
&& !isFirstInSequence(pit, pars_)))
|
2003-12-03 18:17:20 +00:00
|
|
|
|
&& align == LYX_ALIGN_BLOCK
|
2004-08-14 22:38:45 +00:00
|
|
|
|
&& !par.params().noindent()
|
2005-09-10 06:51:58 +00:00
|
|
|
|
// in some insets, paragraphs are never indented
|
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
|
|
|
|
&& !(par.inInset() && par.inInset()->neverIndent(buffer))
|
2005-07-06 06:56:38 +00:00
|
|
|
|
// display style insets are always centered, omit indentation
|
|
|
|
|
&& !(!par.empty()
|
|
|
|
|
&& par.isInset(pos)
|
|
|
|
|
&& par.getInset(pos)->display())
|
2004-08-14 22:38:45 +00:00
|
|
|
|
&& (par.layout() != tclass.defaultLayout()
|
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
|
|
|
|
|| buffer.params().paragraph_separation ==
|
2006-04-05 23:56:29 +00:00
|
|
|
|
BufferParams::PARSEP_INDENT))
|
2003-12-03 18:17:20 +00:00
|
|
|
|
{
|
2006-10-21 00:16:43 +00:00
|
|
|
|
docstring din = from_utf8(parindent);
|
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
|
|
|
|
l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(din);
|
2000-01-13 16:28:54 +00:00
|
|
|
|
}
|
2002-03-21 17:27:08 +00:00
|
|
|
|
|
2004-08-14 15:55:22 +00:00
|
|
|
|
return l_margin;
|
1999-09-27 18:44:28 +00:00
|
|
|
|
}
|
2000-04-26 13:57:28 +00:00
|
|
|
|
|
|
|
|
|
|
2003-09-18 11:48:11 +00:00
|
|
|
|
LColor_color LyXText::backgroundColor() const
|
2001-07-24 10:13:19 +00:00
|
|
|
|
{
|
2003-12-01 13:35:49 +00:00
|
|
|
|
return LColor_color(LColor::color(background_color_));
|
2001-07-24 10:13:19 +00:00
|
|
|
|
}
|
|
|
|
|
|
2003-03-29 23:11:20 +00:00
|
|
|
|
|
2005-01-31 16:29:48 +00:00
|
|
|
|
void LyXText::breakParagraph(LCursor & cur, bool keep_layout)
|
2000-02-10 17:53:36 +00:00
|
|
|
|
{
|
2004-02-13 11:05:29 +00:00
|
|
|
|
BOOST_ASSERT(this == cur.text());
|
2006-03-11 13:31:41 +00:00
|
|
|
|
|
2004-02-12 16:36:01 +00:00
|
|
|
|
Paragraph & cpar = cur.paragraph();
|
2004-11-24 21:53:46 +00:00
|
|
|
|
pit_type cpit = cur.pit();
|
2004-02-12 16:36:01 +00:00
|
|
|
|
|
2004-04-08 15:03:33 +00:00
|
|
|
|
LyXTextClass const & tclass = cur.buffer().params().getLyXTextClass();
|
2004-02-12 16:36:01 +00:00
|
|
|
|
LyXLayout_ptr const & layout = cpar.layout();
|
2000-09-23 04:57:18 +00:00
|
|
|
|
|
2004-01-09 09:04:33 +00:00
|
|
|
|
// this is only allowed, if the current paragraph is not empty
|
|
|
|
|
// or caption and if it has not the keepempty flag active
|
2006-11-26 11:53:33 +00:00
|
|
|
|
if (cur.lastpos() == 0 && !cpar.allowEmpty() &&
|
|
|
|
|
layout->labeltype != LABEL_SENSITIVE)
|
2002-05-29 12:58:23 +00:00
|
|
|
|
return;
|
2002-03-21 17:27:08 +00:00
|
|
|
|
|
2004-01-09 09:04:33 +00:00
|
|
|
|
// a layout change may affect also the following paragraph
|
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
|
|
|
|
recUndo(cur, cur.pit(), undoSpan(cur.pit()) - 1);
|
2000-02-10 17:53:36 +00:00
|
|
|
|
|
2002-05-29 12:58:23 +00:00
|
|
|
|
// Always break behind a space
|
|
|
|
|
// It is better to erase the space (Dekel)
|
2004-02-12 16:36:01 +00:00
|
|
|
|
if (cur.pos() != cur.lastpos() && cpar.isLineSeparator(cur.pos()))
|
2006-10-21 17:05:20 +00:00
|
|
|
|
cpar.eraseChar(cur.pos(), cur.buffer().params().trackChanges);
|
2002-05-29 12:58:23 +00:00
|
|
|
|
|
2006-11-26 11:53:33 +00:00
|
|
|
|
// What should the layout for the new paragraph be?
|
2005-01-31 16:29:48 +00:00
|
|
|
|
int preserve_layout = 0;
|
2002-05-29 12:58:23 +00:00
|
|
|
|
if (keep_layout)
|
2005-01-31 16:29:48 +00:00
|
|
|
|
preserve_layout = 2;
|
2002-05-29 12:58:23 +00:00
|
|
|
|
else
|
2005-01-31 16:29:48 +00:00
|
|
|
|
preserve_layout = layout->isEnvironment();
|
|
|
|
|
|
|
|
|
|
// We need to remember this before we break the paragraph, because
|
|
|
|
|
// that invalidates the layout variable
|
|
|
|
|
bool sensitive = layout->labeltype == LABEL_SENSITIVE;
|
2002-05-29 12:58:23 +00:00
|
|
|
|
|
2005-01-31 16:29:48 +00:00
|
|
|
|
// we need to set this before we insert the paragraph.
|
2004-02-12 16:36:01 +00:00
|
|
|
|
bool const isempty = cpar.allowEmpty() && cpar.empty();
|
2005-01-31 16:29:48 +00:00
|
|
|
|
|
2006-10-21 00:16:43 +00:00
|
|
|
|
lyx::breakParagraph(cur.buffer().params(), paragraphs(), cpit,
|
2005-01-31 16:29:48 +00:00
|
|
|
|
cur.pos(), preserve_layout);
|
|
|
|
|
|
|
|
|
|
// After this, neither paragraph contains any rows!
|
2000-09-23 04:57:18 +00:00
|
|
|
|
|
2004-11-24 21:53:46 +00:00
|
|
|
|
cpit = cur.pit();
|
|
|
|
|
pit_type next_par = cpit + 1;
|
2003-08-15 08:03:54 +00:00
|
|
|
|
|
2002-05-29 12:58:23 +00:00
|
|
|
|
// well this is the caption hack since one caption is really enough
|
2005-01-31 16:29:48 +00:00
|
|
|
|
if (sensitive) {
|
2004-08-15 00:01:45 +00:00
|
|
|
|
if (cur.pos() == 0)
|
2002-05-29 12:58:23 +00:00
|
|
|
|
// set to standard-layout
|
2004-03-25 09:16:36 +00:00
|
|
|
|
pars_[cpit].applyLayout(tclass.defaultLayout());
|
2002-05-29 12:58:23 +00:00
|
|
|
|
else
|
|
|
|
|
// set to standard-layout
|
2004-03-25 09:16:36 +00:00
|
|
|
|
pars_[next_par].applyLayout(tclass.defaultLayout());
|
2002-05-29 12:58:23 +00:00
|
|
|
|
}
|
|
|
|
|
|
2007-01-07 12:01:26 +00:00
|
|
|
|
while (!pars_[next_par].empty() && pars_[next_par].isNewline(0)) {
|
|
|
|
|
if (!pars_[next_par].eraseChar(0, cur.buffer().params().trackChanges))
|
|
|
|
|
break; // the character couldn't be deleted physically due to change tracking
|
|
|
|
|
}
|
2003-04-13 02:23:30 +00:00
|
|
|
|
|
2006-04-07 22:16:09 +00:00
|
|
|
|
ParIterator current_it(cur);
|
2006-04-16 14:19:25 +00:00
|
|
|
|
ParIterator last_it(cur);
|
|
|
|
|
++last_it;
|
|
|
|
|
++last_it;
|
2006-04-07 22:16:09 +00:00
|
|
|
|
|
2006-04-16 14:19:25 +00:00
|
|
|
|
updateLabels(cur.buffer(), current_it, last_it);
|
2002-03-21 17:27:08 +00:00
|
|
|
|
|
2006-12-29 23:54:48 +00:00
|
|
|
|
// A singlePar update is not enough in this case.
|
|
|
|
|
cur.updateFlags(Update::Force);
|
2006-11-17 17:42:52 +00:00
|
|
|
|
|
2002-05-29 12:58:23 +00:00
|
|
|
|
// This check is necessary. Otherwise the new empty paragraph will
|
|
|
|
|
// be deleted automatically. And it is more friendly for the user!
|
2004-02-12 16:36:01 +00:00
|
|
|
|
if (cur.pos() != 0 || isempty)
|
2006-12-29 23:54:48 +00:00
|
|
|
|
setCursor(cur.top(), cur.pit() + 1, 0);
|
2002-05-29 12:58:23 +00:00
|
|
|
|
else
|
2006-12-29 23:54:48 +00:00
|
|
|
|
setCursor(cur.top(), cur.pit(), 0);
|
2000-02-10 17:53:36 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2002-05-29 12:58:23 +00:00
|
|
|
|
// insert a character, moves all the following breaks in the
|
2002-06-24 20:28:12 +00:00
|
|
|
|
// same Paragraph one to the right and make a rebreak
|
2006-04-09 02:30:40 +00:00
|
|
|
|
void LyXText::insertChar(LCursor & cur, char_type c)
|
1999-09-27 18:44:28 +00:00
|
|
|
|
{
|
2004-02-13 11:05:29 +00:00
|
|
|
|
BOOST_ASSERT(this == cur.text());
|
2004-03-08 21:14:45 +00:00
|
|
|
|
BOOST_ASSERT(c != Paragraph::META_INSET);
|
|
|
|
|
|
2004-02-13 07:30:59 +00:00
|
|
|
|
recordUndo(cur, Undo::INSERT);
|
1999-09-27 18:44:28 +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
|
|
|
|
Buffer const & buffer = cur.buffer();
|
2004-02-13 07:30:59 +00:00
|
|
|
|
Paragraph & par = cur.paragraph();
|
|
|
|
|
// try to remove this
|
2004-11-24 21:53:46 +00:00
|
|
|
|
pit_type const pit = cur.pit();
|
2000-03-09 03:36:48 +00:00
|
|
|
|
|
2004-02-13 07:30:59 +00:00
|
|
|
|
bool const freeSpacing = par.layout()->free_spacing ||
|
|
|
|
|
par.isFreeSpacing();
|
2000-02-29 02:19:17 +00:00
|
|
|
|
|
2000-10-09 12:30:52 +00:00
|
|
|
|
if (lyxrc.auto_number) {
|
2006-10-21 00:16:43 +00:00
|
|
|
|
static docstring const number_operators = from_ascii("+-/*");
|
|
|
|
|
static docstring const number_unary_operators = from_ascii("+-");
|
|
|
|
|
static docstring const number_seperators = from_ascii(".,:");
|
2001-01-15 14:05:45 +00:00
|
|
|
|
|
2000-10-09 12:30:52 +00:00
|
|
|
|
if (current_font.number() == LyXFont::ON) {
|
2006-04-08 09:09:57 +00:00
|
|
|
|
if (!isDigit(c) && !contains(number_operators, c) &&
|
2001-01-15 14:05:45 +00:00
|
|
|
|
!(contains(number_seperators, c) &&
|
2004-02-13 07:30:59 +00:00
|
|
|
|
cur.pos() != 0 &&
|
|
|
|
|
cur.pos() != cur.lastpos() &&
|
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
|
|
|
|
getFont(buffer, par, cur.pos()).number() == LyXFont::ON &&
|
|
|
|
|
getFont(buffer, par, cur.pos() - 1).number() == LyXFont::ON)
|
2002-02-16 15:59:55 +00:00
|
|
|
|
)
|
2004-02-13 11:05:29 +00:00
|
|
|
|
number(cur); // Set current_font.number to OFF
|
2006-04-08 09:09:57 +00:00
|
|
|
|
} else if (isDigit(c) &&
|
2000-10-09 12:30:52 +00:00
|
|
|
|
real_current_font.isVisibleRightToLeft()) {
|
2004-02-13 11:05:29 +00:00
|
|
|
|
number(cur); // Set current_font.number to ON
|
2000-10-09 12:30:52 +00:00
|
|
|
|
|
2004-02-13 07:30:59 +00:00
|
|
|
|
if (cur.pos() != 0) {
|
2006-04-09 02:30:40 +00:00
|
|
|
|
char_type const c = par.getChar(cur.pos() - 1);
|
2001-01-15 14:05:45 +00:00
|
|
|
|
if (contains(number_unary_operators, c) &&
|
2004-02-13 07:30:59 +00:00
|
|
|
|
(cur.pos() == 1
|
|
|
|
|
|| par.isSeparator(cur.pos() - 2)
|
|
|
|
|
|| par.isNewline(cur.pos() - 2))
|
2002-02-16 15:59:55 +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
|
|
|
|
setCharFont(buffer, pit, cur.pos() - 1, current_font);
|
2004-02-13 07:30:59 +00:00
|
|
|
|
} else if (contains(number_seperators, c)
|
|
|
|
|
&& cur.pos() >= 2
|
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
|
|
|
|
&& getFont(buffer, par, cur.pos() - 2).number() == LyXFont::ON) {
|
|
|
|
|
setCharFont(buffer, pit, cur.pos() - 1, current_font);
|
2000-10-09 12:30:52 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2002-05-29 12:58:23 +00:00
|
|
|
|
// First check, if there will be two blanks together or a blank at
|
|
|
|
|
// the beginning of a paragraph.
|
|
|
|
|
// I decided to handle blanks like normal characters, the main
|
|
|
|
|
// difference are the special checks when calculating the row.fill
|
|
|
|
|
// (blank does not count at the end of a row) and the check here
|
1999-09-27 18:44:28 +00:00
|
|
|
|
|
2004-02-13 07:30:59 +00:00
|
|
|
|
// When the free-spacing option is set for the current layout,
|
|
|
|
|
// disable the double-space checking
|
2006-04-08 09:09:57 +00:00
|
|
|
|
if (!freeSpacing && isLineSeparatorChar(c)) {
|
2004-02-13 07:30:59 +00:00
|
|
|
|
if (cur.pos() == 0) {
|
2001-05-09 15:20:58 +00:00
|
|
|
|
static bool sent_space_message = false;
|
|
|
|
|
if (!sent_space_message) {
|
2006-09-11 08:54:10 +00:00
|
|
|
|
cur.message(_("You cannot insert a space at the "
|
|
|
|
|
"beginning of a paragraph. Please read the Tutorial."));
|
2004-02-13 07:30:59 +00:00
|
|
|
|
sent_space_message = true;
|
|
|
|
|
}
|
2005-01-31 16:29:48 +00:00
|
|
|
|
return;
|
2004-02-13 07:30:59 +00:00
|
|
|
|
}
|
|
|
|
|
BOOST_ASSERT(cur.pos() > 0);
|
2006-10-23 16:22:05 +00:00
|
|
|
|
if ((par.isLineSeparator(cur.pos() - 1) || par.isNewline(cur.pos() - 1))
|
|
|
|
|
&& !par.isDeleted(cur.pos() - 1)) {
|
2004-02-13 07:30:59 +00:00
|
|
|
|
static bool sent_space_message = false;
|
|
|
|
|
if (!sent_space_message) {
|
2006-09-11 08:54:10 +00:00
|
|
|
|
cur.message(_("You cannot type two spaces this way. "
|
|
|
|
|
"Please read the Tutorial."));
|
2001-05-09 15:20:58 +00:00
|
|
|
|
sent_space_message = true;
|
|
|
|
|
}
|
1999-12-13 00:05:34 +00:00
|
|
|
|
return;
|
1999-09-27 18:44:28 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2003-03-13 10:30:28 +00:00
|
|
|
|
|
2006-10-22 10:48:09 +00:00
|
|
|
|
par.insertChar(cur.pos(), c, current_font, cur.buffer().params().trackChanges);
|
2007-03-12 11:23:41 +00:00
|
|
|
|
checkBufferStructure(cur.buffer(), cur);
|
2006-11-12 14:47:20 +00:00
|
|
|
|
|
2006-12-29 23:54:48 +00:00
|
|
|
|
// cur.updateFlags(Update::Force);
|
|
|
|
|
setCursor(cur.top(), cur.pit(), cur.pos() + 1);
|
1999-12-13 00:05:34 +00:00
|
|
|
|
charInserted();
|
|
|
|
|
}
|
2002-03-21 17:27:08 +00:00
|
|
|
|
|
1999-12-13 00:05:34 +00:00
|
|
|
|
|
|
|
|
|
void LyXText::charInserted()
|
|
|
|
|
{
|
2003-10-27 11:44:10 +00:00
|
|
|
|
// Here we call finishUndo for every 20 characters inserted.
|
2003-04-13 12:56:48 +00:00
|
|
|
|
// This is from my experience how emacs does it. (Lgb)
|
2001-06-04 23:57:32 +00:00
|
|
|
|
static unsigned int counter;
|
1999-09-27 18:44:28 +00:00
|
|
|
|
if (counter < 20) {
|
|
|
|
|
++counter;
|
|
|
|
|
} else {
|
2001-06-25 00:06:33 +00:00
|
|
|
|
finishUndo();
|
1999-09-27 18:44:28 +00:00
|
|
|
|
counter = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
1999-12-13 00:05:34 +00:00
|
|
|
|
|
2000-06-28 13:35:52 +00:00
|
|
|
|
|
2002-05-29 12:58:23 +00:00
|
|
|
|
// the cursor set functions have a special mechanism. When they
|
|
|
|
|
// realize, that you left an empty paragraph, they will delete it.
|
1999-09-27 18:44:28 +00:00
|
|
|
|
|
2005-02-08 02:06:39 +00:00
|
|
|
|
bool LyXText::cursorRightOneWord(LCursor & cur)
|
1999-09-27 18:44:28 +00:00
|
|
|
|
{
|
2004-02-13 11:05:29 +00:00
|
|
|
|
BOOST_ASSERT(this == cur.text());
|
2005-02-08 02:06:39 +00:00
|
|
|
|
|
|
|
|
|
LCursor old = cur;
|
|
|
|
|
|
|
|
|
|
if (old.pos() == old.lastpos() && old.pit() != old.lastpit()) {
|
|
|
|
|
++old.pit();
|
|
|
|
|
old.pos() = 0;
|
2004-02-12 16:36:01 +00:00
|
|
|
|
} else {
|
|
|
|
|
// Advance through word.
|
2005-02-08 02:06:39 +00:00
|
|
|
|
while (old.pos() != old.lastpos() && old.paragraph().isLetter(old.pos()))
|
|
|
|
|
++old.pos();
|
2006-02-24 12:58:31 +00:00
|
|
|
|
// Skip through trailing nonword stuff.
|
|
|
|
|
while (old.pos() != old.lastpos() && !old.paragraph().isLetter(old.pos()))
|
|
|
|
|
++old.pos();
|
2004-02-12 16:36:01 +00:00
|
|
|
|
}
|
2005-02-08 02:06:39 +00:00
|
|
|
|
return setCursor(cur, old.pit(), old.pos());
|
1999-09-27 18:44:28 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2005-02-08 02:06:39 +00:00
|
|
|
|
bool LyXText::cursorLeftOneWord(LCursor & cur)
|
1999-09-27 18:44:28 +00:00
|
|
|
|
{
|
2004-02-13 11:05:29 +00:00
|
|
|
|
BOOST_ASSERT(this == cur.text());
|
2005-02-08 02:06:39 +00:00
|
|
|
|
|
|
|
|
|
LCursor old = cur;
|
|
|
|
|
|
|
|
|
|
if (old.pos() == 0 && old.pit() != 0) {
|
|
|
|
|
--old.pit();
|
|
|
|
|
old.pos() = old.lastpos();
|
2004-04-03 08:37:12 +00:00
|
|
|
|
} else {
|
2004-02-12 16:36:01 +00:00
|
|
|
|
// Skip through initial nonword stuff.
|
2005-02-08 02:06:39 +00:00
|
|
|
|
while (old.pos() != 0 && !old.paragraph().isLetter(old.pos() - 1))
|
|
|
|
|
--old.pos();
|
2004-02-12 16:36:01 +00:00
|
|
|
|
// Advance through word.
|
2005-02-08 02:06:39 +00:00
|
|
|
|
while (old.pos() != 0 && old.paragraph().isLetter(old.pos() - 1))
|
|
|
|
|
--old.pos();
|
2004-02-12 16:36:01 +00:00
|
|
|
|
}
|
2005-02-08 02:06:39 +00:00
|
|
|
|
return setCursor(cur, old.pit(), old.pos());
|
1999-09-27 18:44:28 +00:00
|
|
|
|
}
|
|
|
|
|
|
2002-05-29 12:58:23 +00:00
|
|
|
|
|
2004-02-13 07:30:59 +00:00
|
|
|
|
void LyXText::selectWord(LCursor & cur, word_location loc)
|
2001-06-27 14:10:35 +00:00
|
|
|
|
{
|
2004-02-13 11:05:29 +00:00
|
|
|
|
BOOST_ASSERT(this == cur.text());
|
2004-03-01 17:12:09 +00:00
|
|
|
|
CursorSlice from = cur.top();
|
|
|
|
|
CursorSlice to = cur.top();
|
2003-11-11 10:08:35 +00:00
|
|
|
|
getWord(from, to, loc);
|
2004-03-01 17:12:09 +00:00
|
|
|
|
if (cur.top() != from)
|
2004-11-24 21:53:46 +00:00
|
|
|
|
setCursor(cur, from.pit(), from.pos());
|
2001-07-27 16:07:33 +00:00
|
|
|
|
if (to == from)
|
|
|
|
|
return;
|
2004-02-13 07:30:59 +00:00
|
|
|
|
cur.resetAnchor();
|
2004-11-24 21:53:46 +00:00
|
|
|
|
setCursor(cur, to.pit(), to.pos());
|
2004-02-13 07:30:59 +00:00
|
|
|
|
cur.setSelection();
|
2007-02-02 03:10:15 +00:00
|
|
|
|
cap::saveSelection(cur);
|
1999-09-27 18:44:28 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2002-05-29 12:58:23 +00:00
|
|
|
|
// Select the word currently under the cursor when no
|
2002-06-24 20:28:12 +00:00
|
|
|
|
// selection is currently set
|
2004-02-13 07:30:59 +00:00
|
|
|
|
bool LyXText::selectWordWhenUnderCursor(LCursor & cur, word_location loc)
|
1999-09-27 18:44:28 +00:00
|
|
|
|
{
|
2004-02-13 11:05:29 +00:00
|
|
|
|
BOOST_ASSERT(this == cur.text());
|
2004-02-13 07:30:59 +00:00
|
|
|
|
if (cur.selection())
|
2004-01-20 14:25:24 +00:00
|
|
|
|
return false;
|
2004-02-13 07:30:59 +00:00
|
|
|
|
selectWord(cur, loc);
|
|
|
|
|
return cur.selection();
|
1999-09-27 18:44:28 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2007-01-25 22:28:15 +00:00
|
|
|
|
void LyXText::acceptOrRejectChanges(LCursor & cur, ChangeOp op)
|
2003-02-08 19:18:01 +00:00
|
|
|
|
{
|
2004-02-13 11:05:29 +00:00
|
|
|
|
BOOST_ASSERT(this == cur.text());
|
2006-11-25 23:30:58 +00:00
|
|
|
|
|
2007-01-21 21:20:51 +00:00
|
|
|
|
if (!cur.selection())
|
2003-02-08 19:18:01 +00:00
|
|
|
|
return;
|
|
|
|
|
|
2007-01-21 21:20:51 +00:00
|
|
|
|
recordUndoSelection(cur, Undo::ATOMIC);
|
2006-11-25 23:30:58 +00:00
|
|
|
|
|
2007-01-23 21:53:16 +00:00
|
|
|
|
pit_type begPit = cur.selectionBegin().pit();
|
|
|
|
|
pit_type endPit = cur.selectionEnd().pit();
|
2006-04-05 23:56:29 +00:00
|
|
|
|
|
2007-01-23 21:53:16 +00:00
|
|
|
|
pos_type begPos = cur.selectionBegin().pos();
|
|
|
|
|
pos_type endPos = cur.selectionEnd().pos();
|
|
|
|
|
|
|
|
|
|
// keep selection info, because endPos becomes invalid after the first loop
|
|
|
|
|
bool endsBeforeEndOfPar = (endPos < pars_[endPit].size());
|
|
|
|
|
|
|
|
|
|
// first, accept/reject changes within each individual paragraph (do not consider end-of-par)
|
2007-01-21 21:20:51 +00:00
|
|
|
|
|
2007-01-23 21:53:16 +00:00
|
|
|
|
for (pit_type pit = begPit; pit <= endPit; ++pit) {
|
|
|
|
|
pos_type parSize = pars_[pit].size();
|
|
|
|
|
|
|
|
|
|
// ignore empty paragraphs; otherwise, an assertion will fail for
|
|
|
|
|
// acceptChanges(bparams, 0, 0) or rejectChanges(bparams, 0, 0)
|
|
|
|
|
if (parSize == 0)
|
2007-01-21 21:20:51 +00:00
|
|
|
|
continue;
|
2006-11-26 14:49:35 +00:00
|
|
|
|
|
2007-01-21 21:20:51 +00:00
|
|
|
|
// do not consider first paragraph if the cursor starts at pos size()
|
2007-01-23 21:53:16 +00:00
|
|
|
|
if (pit == begPit && begPos == parSize)
|
2007-01-21 21:20:51 +00:00
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
// do not consider last paragraph if the cursor ends at pos 0
|
2007-01-23 21:53:16 +00:00
|
|
|
|
if (pit == endPit && endPos == 0)
|
2007-01-21 21:20:51 +00:00
|
|
|
|
break; // last iteration anyway
|
|
|
|
|
|
2007-01-23 21:53:16 +00:00
|
|
|
|
pos_type left = (pit == begPit ? begPos : 0);
|
|
|
|
|
pos_type right = (pit == endPit ? endPos : parSize);
|
|
|
|
|
|
2007-01-25 21:18:36 +00:00
|
|
|
|
if (op == ACCEPT) {
|
2007-01-23 21:53:16 +00:00
|
|
|
|
pars_[pit].acceptChanges(cur.buffer().params(), left, right);
|
|
|
|
|
} else {
|
|
|
|
|
pars_[pit].rejectChanges(cur.buffer().params(), left, right);
|
|
|
|
|
}
|
2007-01-21 21:20:51 +00:00
|
|
|
|
}
|
|
|
|
|
|
2007-01-23 21:53:16 +00:00
|
|
|
|
// next, accept/reject imaginary end-of-par characters
|
2007-01-21 21:20:51 +00:00
|
|
|
|
|
2007-01-23 21:53:16 +00:00
|
|
|
|
for (pit_type pit = begPit; pit <= endPit; ++pit) {
|
2007-01-21 21:20:51 +00:00
|
|
|
|
pos_type pos = pars_[pit].size();
|
|
|
|
|
|
2007-01-23 21:53:16 +00:00
|
|
|
|
// skip if the selection ends before the end-of-par
|
|
|
|
|
if (pit == endPit && endsBeforeEndOfPar)
|
|
|
|
|
break; // last iteration anyway
|
2007-01-21 21:20:51 +00:00
|
|
|
|
|
2007-01-23 21:53:16 +00:00
|
|
|
|
// skip if this is not the last paragraph of the document
|
|
|
|
|
// note: the user should be able to accept/reject the par break of the last par!
|
|
|
|
|
if (pit == endPit && pit != pars_.size() - 1)
|
|
|
|
|
break; // last iteration anway
|
2007-01-21 21:20:51 +00:00
|
|
|
|
|
2007-01-25 21:18:36 +00:00
|
|
|
|
if (op == ACCEPT) {
|
2007-01-21 21:20:51 +00:00
|
|
|
|
if (pars_[pit].isInserted(pos)) {
|
|
|
|
|
pars_[pit].setChange(pos, Change(Change::UNCHANGED));
|
2007-01-23 21:53:16 +00:00
|
|
|
|
} else if (pars_[pit].isDeleted(pos)) {
|
|
|
|
|
if (pit == pars_.size() - 1) {
|
|
|
|
|
// we cannot remove a par break at the end of the last paragraph;
|
2007-01-21 21:20:51 +00:00
|
|
|
|
// instead, we mark it unchanged
|
|
|
|
|
pars_[pit].setChange(pos, Change(Change::UNCHANGED));
|
|
|
|
|
} else {
|
|
|
|
|
mergeParagraph(cur.buffer().params(), pars_, pit);
|
2007-01-23 21:53:16 +00:00
|
|
|
|
--endPit;
|
|
|
|
|
--pit;
|
2007-01-21 21:20:51 +00:00
|
|
|
|
}
|
2007-01-04 23:02:37 +00:00
|
|
|
|
}
|
2007-01-23 21:53:16 +00:00
|
|
|
|
} else {
|
2007-01-23 13:25:50 +00:00
|
|
|
|
if (pars_[pit].isDeleted(pos)) {
|
|
|
|
|
pars_[pit].setChange(pos, Change(Change::UNCHANGED));
|
2007-01-23 21:53:16 +00:00
|
|
|
|
} else if (pars_[pit].isInserted(pos)) {
|
|
|
|
|
if (pit == pars_.size() - 1) {
|
|
|
|
|
// we mark the par break at the end of the last paragraph unchanged
|
2007-01-23 13:25:50 +00:00
|
|
|
|
pars_[pit].setChange(pos, Change(Change::UNCHANGED));
|
|
|
|
|
} else {
|
|
|
|
|
mergeParagraph(cur.buffer().params(), pars_, pit);
|
2007-01-23 21:53:16 +00:00
|
|
|
|
--endPit;
|
|
|
|
|
--pit;
|
2007-01-23 13:25:50 +00:00
|
|
|
|
}
|
2007-01-04 23:02:37 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2006-03-11 13:31:41 +00:00
|
|
|
|
}
|
2007-01-23 13:25:50 +00:00
|
|
|
|
|
|
|
|
|
// finally, invoke the DEPM
|
2007-01-25 21:18:36 +00:00
|
|
|
|
|
|
|
|
|
deleteEmptyParagraphMechanism(begPit, endPit, cur.buffer().params().trackChanges);
|
|
|
|
|
|
|
|
|
|
//
|
2007-01-23 13:25:50 +00:00
|
|
|
|
|
2006-03-11 13:31:41 +00:00
|
|
|
|
finishUndo();
|
|
|
|
|
cur.clearSelection();
|
2007-01-23 21:53:16 +00:00
|
|
|
|
setCursorIntern(cur, begPit, begPos);
|
2007-01-04 23:02:37 +00:00
|
|
|
|
cur.updateFlags(Update::Force);
|
2007-01-23 13:25:50 +00:00
|
|
|
|
updateLabels(cur.buffer());
|
2003-02-08 19:18:01 +00:00
|
|
|
|
}
|
|
|
|
|
|
2003-03-03 23:19:01 +00:00
|
|
|
|
|
2007-01-25 22:28:15 +00:00
|
|
|
|
void LyXText::acceptChanges(BufferParams const & bparams)
|
|
|
|
|
{
|
2007-02-20 08:30:20 +00:00
|
|
|
|
pit_type pars_size = static_cast<pit_type>(pars_.size());
|
2007-01-25 22:28:15 +00:00
|
|
|
|
|
|
|
|
|
// first, accept changes within each individual paragraph
|
|
|
|
|
// (do not consider end-of-par)
|
|
|
|
|
for (pit_type pit = 0; pit < pars_size; ++pit) {
|
|
|
|
|
if (!pars_[pit].empty()) // prevent assertion failure
|
|
|
|
|
pars_[pit].acceptChanges(bparams, 0, pars_[pit].size());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// next, accept imaginary end-of-par characters
|
|
|
|
|
for (pit_type pit = 0; pit < pars_size; ++pit) {
|
|
|
|
|
pos_type pos = pars_[pit].size();
|
|
|
|
|
|
|
|
|
|
if (pars_[pit].isInserted(pos)) {
|
|
|
|
|
pars_[pit].setChange(pos, Change(Change::UNCHANGED));
|
|
|
|
|
} else if (pars_[pit].isDeleted(pos)) {
|
|
|
|
|
if (pit == pars_size - 1) {
|
|
|
|
|
// we cannot remove a par break at the end of the last
|
|
|
|
|
// paragraph; instead, we mark it unchanged
|
|
|
|
|
pars_[pit].setChange(pos, Change(Change::UNCHANGED));
|
|
|
|
|
} else {
|
|
|
|
|
mergeParagraph(bparams, pars_, pit);
|
|
|
|
|
--pit;
|
|
|
|
|
--pars_size;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// finally, invoke the DEPM
|
|
|
|
|
deleteEmptyParagraphMechanism(0, pars_size - 1, bparams.trackChanges);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void LyXText::rejectChanges(BufferParams const & bparams)
|
|
|
|
|
{
|
2007-02-20 17:27:06 +00:00
|
|
|
|
pit_type pars_size = static_cast<pit_type>(pars_.size());
|
2007-01-25 22:28:15 +00:00
|
|
|
|
|
|
|
|
|
// first, reject changes within each individual paragraph
|
|
|
|
|
// (do not consider end-of-par)
|
|
|
|
|
for (pit_type pit = 0; pit < pars_size; ++pit) {
|
|
|
|
|
if (!pars_[pit].empty()) // prevent assertion failure
|
|
|
|
|
pars_[pit].rejectChanges(bparams, 0, pars_[pit].size());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// next, reject imaginary end-of-par characters
|
|
|
|
|
for (pit_type pit = 0; pit < pars_size; ++pit) {
|
|
|
|
|
pos_type pos = pars_[pit].size();
|
|
|
|
|
|
|
|
|
|
if (pars_[pit].isDeleted(pos)) {
|
|
|
|
|
pars_[pit].setChange(pos, Change(Change::UNCHANGED));
|
|
|
|
|
} else if (pars_[pit].isInserted(pos)) {
|
|
|
|
|
if (pit == pars_size - 1) {
|
|
|
|
|
// we mark the par break at the end of the last
|
|
|
|
|
// paragraph unchanged
|
|
|
|
|
pars_[pit].setChange(pos, Change(Change::UNCHANGED));
|
|
|
|
|
} else {
|
|
|
|
|
mergeParagraph(bparams, pars_, pit);
|
|
|
|
|
--pit;
|
|
|
|
|
--pars_size;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// finally, invoke the DEPM
|
|
|
|
|
deleteEmptyParagraphMechanism(0, pars_size - 1, bparams.trackChanges);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2002-05-29 12:58:23 +00:00
|
|
|
|
// Delete from cursor up to the end of the current or next word.
|
2004-02-12 16:36:01 +00:00
|
|
|
|
void LyXText::deleteWordForward(LCursor & cur)
|
1999-09-27 18:44:28 +00:00
|
|
|
|
{
|
2004-02-13 11:05:29 +00:00
|
|
|
|
BOOST_ASSERT(this == cur.text());
|
2004-02-12 16:36:01 +00:00
|
|
|
|
if (cur.lastpos() == 0)
|
2004-02-20 17:19:53 +00:00
|
|
|
|
cursorRight(cur);
|
1999-09-27 18:44:28 +00:00
|
|
|
|
else {
|
2004-01-20 14:25:24 +00:00
|
|
|
|
cur.resetAnchor();
|
2004-02-12 16:36:01 +00:00
|
|
|
|
cur.selection() = true;
|
|
|
|
|
cursorRightOneWord(cur);
|
2004-01-20 14:25:24 +00:00
|
|
|
|
cur.setSelection();
|
2004-02-13 11:05:29 +00:00
|
|
|
|
cutSelection(cur, true, false);
|
2007-03-12 11:23:41 +00:00
|
|
|
|
checkBufferStructure(cur.buffer(), cur);
|
1999-09-27 18:44:28 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2002-05-29 12:58:23 +00:00
|
|
|
|
// Delete from cursor to start of current or prior word.
|
2004-02-12 16:36:01 +00:00
|
|
|
|
void LyXText::deleteWordBackward(LCursor & cur)
|
1999-09-27 18:44:28 +00:00
|
|
|
|
{
|
2004-02-13 11:05:29 +00:00
|
|
|
|
BOOST_ASSERT(this == cur.text());
|
2004-02-12 16:36:01 +00:00
|
|
|
|
if (cur.lastpos() == 0)
|
2004-02-20 17:19:53 +00:00
|
|
|
|
cursorLeft(cur);
|
2002-05-29 12:58:23 +00:00
|
|
|
|
else {
|
2004-01-20 14:25:24 +00:00
|
|
|
|
cur.resetAnchor();
|
2004-02-12 16:36:01 +00:00
|
|
|
|
cur.selection() = true;
|
|
|
|
|
cursorLeftOneWord(cur);
|
2004-01-20 14:25:24 +00:00
|
|
|
|
cur.setSelection();
|
2004-02-13 11:05:29 +00:00
|
|
|
|
cutSelection(cur, true, false);
|
2007-03-12 11:23:41 +00:00
|
|
|
|
checkBufferStructure(cur.buffer(), cur);
|
2002-05-29 12:58:23 +00:00
|
|
|
|
}
|
1999-09-27 18:44:28 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2002-06-24 20:28:12 +00:00
|
|
|
|
// Kill to end of line.
|
2004-02-12 16:36:01 +00:00
|
|
|
|
void LyXText::deleteLineForward(LCursor & cur)
|
1999-09-27 18:44:28 +00:00
|
|
|
|
{
|
2004-02-13 11:05:29 +00:00
|
|
|
|
BOOST_ASSERT(this == cur.text());
|
2004-02-12 16:36:01 +00:00
|
|
|
|
if (cur.lastpos() == 0) {
|
2000-05-26 16:13:01 +00:00
|
|
|
|
// Paragraph is empty, so we just go to the right
|
2004-02-20 17:19:53 +00:00
|
|
|
|
cursorRight(cur);
|
2003-10-27 11:44:10 +00:00
|
|
|
|
} else {
|
2004-01-20 14:25:24 +00:00
|
|
|
|
cur.resetAnchor();
|
2004-02-12 16:36:01 +00:00
|
|
|
|
cur.selection() = true; // to avoid deletion
|
|
|
|
|
cursorEnd(cur);
|
2004-01-20 14:25:24 +00:00
|
|
|
|
cur.setSelection();
|
2000-05-30 15:41:16 +00:00
|
|
|
|
// What is this test for ??? (JMarc)
|
2004-01-20 14:25:24 +00:00
|
|
|
|
if (!cur.selection())
|
2004-02-12 16:36:01 +00:00
|
|
|
|
deleteWordForward(cur);
|
2003-10-27 11:44:10 +00:00
|
|
|
|
else
|
2004-02-13 11:05:29 +00:00
|
|
|
|
cutSelection(cur, true, false);
|
2007-03-12 11:23:41 +00:00
|
|
|
|
checkBufferStructure(cur.buffer(), cur);
|
1999-09-27 18:44:28 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1999-11-04 01:40:20 +00:00
|
|
|
|
|
2004-02-13 07:30:59 +00:00
|
|
|
|
void LyXText::changeCase(LCursor & cur, LyXText::TextCase action)
|
2000-02-10 17:53:36 +00:00
|
|
|
|
{
|
2004-02-13 11:05:29 +00:00
|
|
|
|
BOOST_ASSERT(this == cur.text());
|
2004-01-13 14:13:51 +00:00
|
|
|
|
CursorSlice from;
|
|
|
|
|
CursorSlice to;
|
2001-03-09 00:56:42 +00:00
|
|
|
|
|
2004-01-20 14:25:24 +00:00
|
|
|
|
if (cur.selection()) {
|
2004-01-26 10:13:15 +00:00
|
|
|
|
from = cur.selBegin();
|
2004-01-20 14:25:24 +00:00
|
|
|
|
to = cur.selEnd();
|
2001-06-27 14:10:35 +00:00
|
|
|
|
} else {
|
2004-03-18 13:28:49 +00:00
|
|
|
|
from = cur.top();
|
2006-10-21 00:16:43 +00:00
|
|
|
|
getWord(from, to, PARTIAL_WORD);
|
2006-02-24 12:58:31 +00:00
|
|
|
|
cursorRightOneWord(cur);
|
2001-06-27 14:10:35 +00:00
|
|
|
|
}
|
2001-03-09 00:56:42 +00:00
|
|
|
|
|
2004-02-13 07:30:59 +00:00
|
|
|
|
recordUndoSelection(cur);
|
2001-06-27 15:33:55 +00:00
|
|
|
|
|
2001-11-26 16:42:04 +00:00
|
|
|
|
pos_type pos = from.pos();
|
2004-11-24 21:53:46 +00:00
|
|
|
|
int par = from.pit();
|
2001-06-27 18:29:18 +00:00
|
|
|
|
|
2004-11-24 21:53:46 +00:00
|
|
|
|
while (par != int(pars_.size()) && (pos != to.pos() || par != to.pit())) {
|
|
|
|
|
pit_type pit = par;
|
2004-03-25 09:16:36 +00:00
|
|
|
|
if (pos == pars_[pit].size()) {
|
2003-10-09 10:52:12 +00:00
|
|
|
|
++par;
|
2002-07-01 21:50:54 +00:00
|
|
|
|
pos = 0;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2006-04-09 02:30:40 +00:00
|
|
|
|
char_type c = pars_[pit].getChar(pos);
|
2003-09-16 12:12:33 +00:00
|
|
|
|
if (c != Paragraph::META_INSET) {
|
2001-06-27 15:33:55 +00:00
|
|
|
|
switch (action) {
|
|
|
|
|
case text_lowercase:
|
2001-10-16 14:47:10 +00:00
|
|
|
|
c = lowercase(c);
|
2001-06-27 15:33:55 +00:00
|
|
|
|
break;
|
|
|
|
|
case text_capitalization:
|
2001-10-16 14:47:10 +00:00
|
|
|
|
c = uppercase(c);
|
2001-06-27 15:33:55 +00:00
|
|
|
|
action = text_lowercase;
|
|
|
|
|
break;
|
|
|
|
|
case text_uppercase:
|
2001-10-16 14:47:10 +00:00
|
|
|
|
c = uppercase(c);
|
2001-06-27 15:33:55 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
2006-10-21 10:22:41 +00:00
|
|
|
|
|
|
|
|
|
// FIXME: change tracking (MG)
|
|
|
|
|
// sorry but we are no longer allowed to set a single character directly
|
|
|
|
|
// we have to rewrite this method in terms of erase&insert operations
|
|
|
|
|
//pars_[pit].setChar(pos, c);
|
2001-06-27 18:29:18 +00:00
|
|
|
|
++pos;
|
2001-06-27 15:33:55 +00:00
|
|
|
|
}
|
2007-03-12 11:23:41 +00:00
|
|
|
|
checkBufferStructure(cur.buffer(), cur);
|
2000-02-10 17:53:36 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2006-04-09 00:26:19 +00:00
|
|
|
|
bool LyXText::erase(LCursor & cur)
|
2000-02-10 17:53:36 +00:00
|
|
|
|
{
|
2004-02-13 11:05:29 +00:00
|
|
|
|
BOOST_ASSERT(this == cur.text());
|
2005-12-19 12:30:34 +00:00
|
|
|
|
bool needsUpdate = false;
|
2006-11-07 23:02:44 +00:00
|
|
|
|
Paragraph & par = cur.paragraph();
|
2005-07-17 16:12:48 +00:00
|
|
|
|
|
2004-04-13 06:27:29 +00:00
|
|
|
|
if (cur.pos() != cur.lastpos()) {
|
2006-11-07 23:02:44 +00:00
|
|
|
|
// this is the code for a normal delete, not pasting
|
|
|
|
|
// any paragraphs
|
|
|
|
|
recordUndo(cur, Undo::DELETE);
|
2007-01-20 16:59:13 +00:00
|
|
|
|
if(!par.eraseChar(cur.pos(), cur.buffer().params().trackChanges)) {
|
|
|
|
|
// the character has been logically deleted only => skip it
|
2006-11-20 18:47:27 +00:00
|
|
|
|
cur.forwardPosNoDescend();
|
2007-01-20 16:59:13 +00:00
|
|
|
|
}
|
2007-03-12 11:23:41 +00:00
|
|
|
|
checkBufferStructure(cur.buffer(), cur);
|
2006-11-07 23:02:44 +00:00
|
|
|
|
needsUpdate = true;
|
2006-11-26 00:04:25 +00:00
|
|
|
|
} else {
|
|
|
|
|
if (cur.pit() == cur.lastpit())
|
|
|
|
|
return dissolveInset(cur);
|
|
|
|
|
|
2006-11-24 22:12:04 +00:00
|
|
|
|
if (!par.isMergedOnEndOfParDeletion(cur.buffer().params().trackChanges)) {
|
2006-11-07 23:02:44 +00:00
|
|
|
|
par.setChange(cur.pos(), Change(Change::DELETED));
|
|
|
|
|
cur.forwardPos();
|
|
|
|
|
needsUpdate = true;
|
2005-07-17 16:12:48 +00:00
|
|
|
|
} else {
|
2006-11-07 23:02:44 +00:00
|
|
|
|
setCursorIntern(cur, cur.pit() + 1, 0);
|
|
|
|
|
needsUpdate = backspacePos0(cur);
|
2005-07-17 16:12:48 +00:00
|
|
|
|
}
|
2006-11-24 22:12:04 +00:00
|
|
|
|
}
|
2006-09-09 15:27:44 +00:00
|
|
|
|
|
2006-11-13 16:59:10 +00:00
|
|
|
|
if (needsUpdate) {
|
2006-11-17 17:42:52 +00:00
|
|
|
|
// Make sure the cursor is correct. Is this really needed?
|
|
|
|
|
// No, not really... at least not here!
|
2006-12-29 23:54:48 +00:00
|
|
|
|
cur.text()->setCursor(cur.top(), cur.pit(), cur.pos());
|
2007-03-12 11:23:41 +00:00
|
|
|
|
checkBufferStructure(cur.buffer(), cur);
|
2006-11-13 16:59:10 +00:00
|
|
|
|
}
|
2006-11-07 23:02:44 +00:00
|
|
|
|
|
2005-12-19 12:30:34 +00:00
|
|
|
|
return needsUpdate;
|
2000-02-10 17:53:36 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2006-03-11 13:31:41 +00:00
|
|
|
|
bool LyXText::backspacePos0(LCursor & cur)
|
2000-02-10 17:53:36 +00:00
|
|
|
|
{
|
2004-02-13 11:05:29 +00:00
|
|
|
|
BOOST_ASSERT(this == cur.text());
|
2006-11-07 23:02:44 +00:00
|
|
|
|
if (cur.pit() == 0)
|
|
|
|
|
return false;
|
|
|
|
|
|
2005-12-19 12:30:34 +00:00
|
|
|
|
bool needsUpdate = false;
|
2002-03-21 17:27:08 +00:00
|
|
|
|
|
2006-11-07 23:02:44 +00:00
|
|
|
|
BufferParams const & bufparams = cur.buffer().params();
|
|
|
|
|
LyXTextClass const & tclass = bufparams.getLyXTextClass();
|
|
|
|
|
ParagraphList & plist = cur.text()->paragraphs();
|
|
|
|
|
Paragraph const & par = cur.paragraph();
|
|
|
|
|
LCursor prevcur = cur;
|
|
|
|
|
--prevcur.pit();
|
|
|
|
|
prevcur.pos() = prevcur.lastpos();
|
|
|
|
|
Paragraph const & prevpar = prevcur.paragraph();
|
2006-04-05 23:56:29 +00:00
|
|
|
|
|
2006-11-07 23:02:44 +00:00
|
|
|
|
// is it an empty paragraph?
|
|
|
|
|
if (cur.lastpos() == 0
|
|
|
|
|
|| (cur.lastpos() == 1 && par.isSeparator(0))) {
|
|
|
|
|
recordUndo(cur, Undo::ATOMIC, prevcur.pit(), cur.pit());
|
|
|
|
|
plist.erase(boost::next(plist.begin(), cur.pit()));
|
|
|
|
|
needsUpdate = true;
|
2006-03-11 13:31:41 +00:00
|
|
|
|
}
|
2006-11-07 23:02:44 +00:00
|
|
|
|
// is previous par empty?
|
|
|
|
|
else if (prevcur.lastpos() == 0
|
|
|
|
|
|| (prevcur.lastpos() == 1 && prevpar.isSeparator(0))) {
|
|
|
|
|
recordUndo(cur, Undo::ATOMIC, prevcur.pit(), cur.pit());
|
|
|
|
|
plist.erase(boost::next(plist.begin(), prevcur.pit()));
|
|
|
|
|
needsUpdate = true;
|
2006-03-11 13:31:41 +00:00
|
|
|
|
}
|
|
|
|
|
// Pasting is not allowed, if the paragraphs have different
|
2006-11-24 22:12:04 +00:00
|
|
|
|
// layouts. I think it is a real bug of all other
|
2006-03-11 13:31:41 +00:00
|
|
|
|
// word processors to allow it. It confuses the user.
|
|
|
|
|
// Correction: Pasting is always allowed with standard-layout
|
2006-11-07 23:02:44 +00:00
|
|
|
|
else if (par.layout() == prevpar.layout()
|
|
|
|
|
|| par.layout() == tclass.defaultLayout()) {
|
|
|
|
|
recordUndo(cur, Undo::ATOMIC, prevcur.pit());
|
|
|
|
|
mergeParagraph(bufparams, plist, prevcur.pit());
|
2006-03-11 13:31:41 +00:00
|
|
|
|
needsUpdate = true;
|
2006-11-07 23:02:44 +00:00
|
|
|
|
}
|
2003-08-11 09:09:01 +00:00
|
|
|
|
|
2006-11-07 23:02:44 +00:00
|
|
|
|
if (needsUpdate) {
|
|
|
|
|
updateLabels(cur.buffer());
|
|
|
|
|
setCursorIntern(cur, prevcur.pit(), prevcur.pos());
|
2006-03-11 13:31:41 +00:00
|
|
|
|
}
|
2006-11-07 23:02:44 +00:00
|
|
|
|
|
2006-03-11 13:31:41 +00:00
|
|
|
|
return needsUpdate;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
bool LyXText::backspace(LCursor & cur)
|
|
|
|
|
{
|
|
|
|
|
BOOST_ASSERT(this == cur.text());
|
|
|
|
|
bool needsUpdate = false;
|
|
|
|
|
if (cur.pos() == 0) {
|
2006-09-08 14:08:26 +00:00
|
|
|
|
if (cur.pit() == 0)
|
|
|
|
|
return dissolveInset(cur);
|
|
|
|
|
|
2006-11-25 00:31:44 +00:00
|
|
|
|
Paragraph & prev_par = pars_[cur.pit() - 1];
|
2006-03-11 13:31:41 +00:00
|
|
|
|
|
2006-11-25 00:31:44 +00:00
|
|
|
|
if (!prev_par.isMergedOnEndOfParDeletion(cur.buffer().params().trackChanges)) {
|
|
|
|
|
prev_par.setChange(prev_par.size(), Change(Change::DELETED));
|
|
|
|
|
setCursorIntern(cur, cur.pit() - 1, prev_par.size());
|
|
|
|
|
return true;
|
|
|
|
|
}
|
2006-11-07 23:02:44 +00:00
|
|
|
|
// The cursor is at the beginning of a paragraph, so
|
|
|
|
|
// the backspace will collapse two paragraphs into one.
|
2006-03-11 13:31:41 +00:00
|
|
|
|
needsUpdate = backspacePos0(cur);
|
|
|
|
|
|
2000-02-10 17:53:36 +00:00
|
|
|
|
} else {
|
2002-05-29 12:58:23 +00:00
|
|
|
|
// this is the code for a normal backspace, not pasting
|
2002-06-24 20:28:12 +00:00
|
|
|
|
// any paragraphs
|
2004-02-12 16:36:01 +00:00
|
|
|
|
recordUndo(cur, Undo::DELETE);
|
2001-06-25 00:06:33 +00:00
|
|
|
|
// We used to do cursorLeftIntern() here, but it is
|
2000-03-28 16:18:02 +00:00
|
|
|
|
// not a good idea since it triggers the auto-delete
|
2001-06-25 00:06:33 +00:00
|
|
|
|
// mechanism. So we do a cursorLeftIntern()-lite,
|
2000-03-28 16:18:02 +00:00
|
|
|
|
// without the dreaded mechanism. (JMarc)
|
2004-11-24 21:53:46 +00:00
|
|
|
|
setCursorIntern(cur, cur.pit(), cur.pos() - 1,
|
2004-02-12 16:36:01 +00:00
|
|
|
|
false, cur.boundary());
|
2006-10-21 17:05:20 +00:00
|
|
|
|
cur.paragraph().eraseChar(cur.pos(), cur.buffer().params().trackChanges);
|
2007-03-12 11:23:41 +00:00
|
|
|
|
checkBufferStructure(cur.buffer(), cur);
|
2000-02-10 17:53:36 +00:00
|
|
|
|
}
|
2000-05-30 19:31:11 +00:00
|
|
|
|
|
2004-02-12 16:36:01 +00:00
|
|
|
|
if (cur.pos() == cur.lastpos())
|
2004-02-13 11:05:29 +00:00
|
|
|
|
setCurrentFont(cur);
|
2002-03-21 17:27:08 +00:00
|
|
|
|
|
2006-12-29 23:54:48 +00:00
|
|
|
|
// A singlePar update is not enough in this case.
|
|
|
|
|
// cur.updateFlags(Update::Force);
|
|
|
|
|
setCursor(cur.top(), cur.pit(), cur.pos());
|
2005-12-19 12:30:34 +00:00
|
|
|
|
|
|
|
|
|
return needsUpdate;
|
2000-02-10 17:53:36 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2006-09-08 14:08:26 +00:00
|
|
|
|
bool LyXText::dissolveInset(LCursor & cur) {
|
|
|
|
|
BOOST_ASSERT(this == cur.text());
|
|
|
|
|
|
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
|
|
|
|
if (isMainText(*cur.bv().buffer()) || cur.inset().nargs() != 1)
|
2006-09-08 14:08:26 +00:00
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
recordUndoInset(cur);
|
|
|
|
|
cur.selHandle(false);
|
|
|
|
|
// save position
|
2006-10-21 00:16:43 +00:00
|
|
|
|
pos_type spos = cur.pos();
|
|
|
|
|
pit_type spit = cur.pit();
|
2006-09-08 14:08:26 +00:00
|
|
|
|
ParagraphList plist;
|
2006-09-09 15:27:44 +00:00
|
|
|
|
if (cur.lastpit() != 0 || cur.lastpos() != 0)
|
2006-09-08 14:08:26 +00:00
|
|
|
|
plist = paragraphs();
|
|
|
|
|
cur.popLeft();
|
|
|
|
|
// store cursor offset
|
|
|
|
|
if (spit == 0)
|
|
|
|
|
spos += cur.pos();
|
|
|
|
|
spit += cur.pit();
|
2006-10-19 17:46:50 +00:00
|
|
|
|
Buffer & b = cur.buffer();
|
2006-10-21 17:05:20 +00:00
|
|
|
|
cur.paragraph().eraseChar(cur.pos(), b.params().trackChanges);
|
2006-09-08 14:08:26 +00:00
|
|
|
|
if (!plist.empty()) {
|
2006-12-28 10:24:45 +00:00
|
|
|
|
// ERT paragraphs have the Language latex_language.
|
|
|
|
|
// This is invalid outside of ERT, so we need to
|
|
|
|
|
// change it to the buffer language.
|
|
|
|
|
ParagraphList::iterator it = plist.begin();
|
|
|
|
|
ParagraphList::iterator it_end = plist.end();
|
|
|
|
|
for (; it != it_end; it++) {
|
|
|
|
|
it->changeLanguage(b.params(), latex_language,
|
|
|
|
|
b.getLanguage());
|
2006-11-12 16:11:51 +00:00
|
|
|
|
}
|
|
|
|
|
|
2006-09-09 15:27:44 +00:00
|
|
|
|
pasteParagraphList(cur, plist, b.params().textclass,
|
2006-09-08 14:08:26 +00:00
|
|
|
|
b.errorList("Paste"));
|
|
|
|
|
// restore position
|
|
|
|
|
cur.pit() = std::min(cur.lastpit(), spit);
|
|
|
|
|
cur.pos() = std::min(cur.lastpos(), spos);
|
|
|
|
|
}
|
|
|
|
|
cur.clearSelection();
|
|
|
|
|
cur.resetAnchor();
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2003-11-28 08:55:12 +00:00
|
|
|
|
// only used for inset right now. should also be used for main text
|
2003-12-15 11:36:19 +00:00
|
|
|
|
void LyXText::draw(PainterInfo & pi, int x, int y) const
|
2003-11-28 08:55:12 +00:00
|
|
|
|
{
|
2004-11-30 01:59:49 +00:00
|
|
|
|
paintTextInset(*this, pi, x, y);
|
2003-11-28 08:55:12 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2004-02-06 11:12:49 +00:00
|
|
|
|
// only used for inset right now. should also be used for main text
|
2004-11-30 01:59:49 +00:00
|
|
|
|
void LyXText::drawSelection(PainterInfo & pi, int x, int) const
|
|
|
|
|
{
|
|
|
|
|
LCursor & cur = pi.base.bv->cursor();
|
|
|
|
|
if (!cur.selection())
|
|
|
|
|
return;
|
|
|
|
|
if (!ptr_cmp(cur.text(), this))
|
|
|
|
|
return;
|
|
|
|
|
|
2006-11-07 21:31:33 +00:00
|
|
|
|
if (lyxerr.debugging(Debug::DEBUG)) {
|
|
|
|
|
lyxerr[Debug::DEBUG]
|
|
|
|
|
<< BOOST_CURRENT_FUNCTION
|
|
|
|
|
<< "draw selection at " << x
|
|
|
|
|
<< endl;
|
|
|
|
|
}
|
2004-11-30 01:59:49 +00:00
|
|
|
|
|
2005-11-07 15:02:08 +00:00
|
|
|
|
DocIterator beg = cur.selectionBegin();
|
|
|
|
|
DocIterator end = cur.selectionEnd();
|
2005-01-06 15:40:49 +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
|
|
|
|
BufferView & bv = *pi.base.bv;
|
|
|
|
|
Buffer const & buffer = *bv.buffer();
|
2006-10-13 16:44:44 +00:00
|
|
|
|
|
2004-11-30 01:59:49 +00:00
|
|
|
|
// the selection doesn't touch the visible screen
|
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
|
|
|
|
if (bv_funcs::status(&bv, beg) == bv_funcs::CUR_BELOW
|
|
|
|
|
|| bv_funcs::status(&bv, end) == bv_funcs::CUR_ABOVE)
|
2004-11-30 01:59:49 +00:00
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
Paragraph const & par1 = pars_[beg.pit()];
|
|
|
|
|
Paragraph const & par2 = pars_[end.pit()];
|
2006-12-29 23:54:48 +00:00
|
|
|
|
TextMetrics const & tm = bv.textMetrics(this);
|
|
|
|
|
ParagraphMetrics const & pm1 = tm.parMetrics(beg.pit());
|
|
|
|
|
ParagraphMetrics const & pm2 = tm.parMetrics(end.pit());
|
2005-01-06 15:40:49 +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
|
|
|
|
bool const above = (bv_funcs::status(&bv, beg)
|
2004-11-30 01:59:49 +00:00
|
|
|
|
== bv_funcs::CUR_ABOVE);
|
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
|
|
|
|
bool const below = (bv_funcs::status(&bv, end)
|
2004-11-30 01:59:49 +00:00
|
|
|
|
== bv_funcs::CUR_BELOW);
|
|
|
|
|
int y1,y2,x1,x2;
|
|
|
|
|
if (above) {
|
|
|
|
|
y1 = 0;
|
|
|
|
|
y2 = 0;
|
|
|
|
|
x1 = 0;
|
2006-12-29 23:54:48 +00:00
|
|
|
|
x2 = tm.width();
|
2004-11-30 01:59:49 +00:00
|
|
|
|
} else {
|
2006-12-29 23:54:48 +00:00
|
|
|
|
Row const & row1 = pm1.getRow(beg.pos(), beg.boundary());
|
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
|
|
|
|
y1 = bv_funcs::getPos(bv, beg, beg.boundary()).y_ - row1.ascent();
|
2004-11-30 01:59:49 +00:00
|
|
|
|
y2 = y1 + row1.height();
|
2006-12-29 23:54:48 +00:00
|
|
|
|
int const startx = cursorX(bv, beg.top(), beg.boundary());
|
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
|
|
|
|
if (!isRTL(buffer, par1)) {
|
|
|
|
|
x1 = startx;
|
2006-12-29 23:54:48 +00:00
|
|
|
|
x2 = 0 + tm.width();
|
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
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
x1 = 0;
|
|
|
|
|
x2 = startx;
|
|
|
|
|
}
|
2004-11-30 01:59:49 +00:00
|
|
|
|
}
|
2004-02-06 11:12:49 +00:00
|
|
|
|
|
2004-11-30 01:59:49 +00:00
|
|
|
|
int Y1,Y2,X1,X2;
|
|
|
|
|
if (below) {
|
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
|
|
|
|
Y1 = bv.workHeight();
|
|
|
|
|
Y2 = bv.workHeight();
|
2004-11-30 01:59:49 +00:00
|
|
|
|
X1 = 0;
|
2006-12-29 23:54:48 +00:00
|
|
|
|
X2 = tm.width();
|
2004-11-30 01:59:49 +00:00
|
|
|
|
} else {
|
2006-12-29 23:54:48 +00:00
|
|
|
|
Row const & row2 = pm2.getRow(end.pos(), end.boundary());
|
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
|
|
|
|
Y1 = bv_funcs::getPos(bv, end, end.boundary()).y_ - row2.ascent();
|
2004-11-30 01:59:49 +00:00
|
|
|
|
Y2 = Y1 + row2.height();
|
2006-12-29 23:54:48 +00:00
|
|
|
|
int const endx = cursorX(bv, end.top(), end.boundary());
|
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
|
|
|
|
if (!isRTL(buffer, par2)) {
|
|
|
|
|
X1 = 0;
|
|
|
|
|
X2 = endx;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
X1 = endx;
|
2006-12-29 23:54:48 +00:00
|
|
|
|
X2 = 0 + tm.width();
|
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
|
|
|
|
}
|
2004-11-30 01:59:49 +00:00
|
|
|
|
}
|
|
|
|
|
|
2006-12-29 23:54:48 +00:00
|
|
|
|
if (!above && !below && &pm1.getRow(beg.pos(), beg.boundary())
|
|
|
|
|
== &pm2.getRow(end.pos(), end.boundary()))
|
2004-11-30 01:59:49 +00:00
|
|
|
|
{
|
|
|
|
|
// paint only one rectangle
|
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
|
|
|
|
int const b( !isRTL(*bv.buffer(), par1) ? x + x1 : x + X1 );
|
|
|
|
|
int const w( !isRTL(*bv.buffer(), par1) ? X2 - x1 : x2 - X1 );
|
2005-08-15 08:26:53 +00:00
|
|
|
|
pi.pain.fillRectangle(b, y1, w, y2 - y1, LColor::selection);
|
2004-11-30 01:59:49 +00:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2006-11-07 21:31:33 +00:00
|
|
|
|
if (lyxerr.debugging(Debug::DEBUG)) {
|
|
|
|
|
lyxerr[Debug::DEBUG] << " y1: " << y1 << " y2: " << y2
|
2006-12-29 23:54:48 +00:00
|
|
|
|
<< "X1:" << X1 << " x2: " << X2 << " wid: " << tm.width()
|
2006-11-07 21:31:33 +00:00
|
|
|
|
<< endl;
|
|
|
|
|
}
|
2005-07-18 09:18:02 +00:00
|
|
|
|
|
2004-11-30 01:59:49 +00:00
|
|
|
|
// paint upper rectangle
|
|
|
|
|
pi.pain.fillRectangle(x + x1, y1, x2 - x1, y2 - y1,
|
|
|
|
|
LColor::selection);
|
|
|
|
|
// paint bottom rectangle
|
|
|
|
|
pi.pain.fillRectangle(x + X1, Y1, X2 - X1, Y2 - Y1,
|
|
|
|
|
LColor::selection);
|
|
|
|
|
// paint center rectangle
|
2006-12-29 23:54:48 +00:00
|
|
|
|
pi.pain.fillRectangle(x, y2, tm.width(),
|
2004-11-30 01:59:49 +00:00
|
|
|
|
Y1 - y2, LColor::selection);
|
|
|
|
|
}
|
2005-07-15 15:49:40 +00:00
|
|
|
|
|
2006-12-29 23:54:48 +00:00
|
|
|
|
|
2004-11-24 21:53:46 +00:00
|
|
|
|
bool LyXText::isLastRow(pit_type pit, Row const & row) const
|
2003-10-23 08:15:57 +00:00
|
|
|
|
{
|
2004-03-27 01:18:51 +00:00
|
|
|
|
return row.endpos() >= pars_[pit].size()
|
2004-11-24 21:53:46 +00:00
|
|
|
|
&& pit + 1 == pit_type(paragraphs().size());
|
2003-10-23 08:15:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2004-11-24 21:53:46 +00:00
|
|
|
|
bool LyXText::isFirstRow(pit_type pit, Row const & row) const
|
2003-10-23 08:15:57 +00:00
|
|
|
|
{
|
2004-03-25 09:16:36 +00:00
|
|
|
|
return row.pos() == 0 && pit == 0;
|
2003-10-23 08:15:57 +00:00
|
|
|
|
}
|
2003-11-11 10:08:35 +00:00
|
|
|
|
|
|
|
|
|
|
2004-02-12 16:36:01 +00:00
|
|
|
|
void LyXText::getWord(CursorSlice & from, CursorSlice & to,
|
|
|
|
|
word_location const loc)
|
2003-11-11 10:08:35 +00:00
|
|
|
|
{
|
2004-11-24 21:53:46 +00:00
|
|
|
|
Paragraph const & from_par = pars_[from.pit()];
|
2003-11-11 10:08:35 +00:00
|
|
|
|
switch (loc) {
|
2006-10-21 00:16:43 +00:00
|
|
|
|
case WHOLE_WORD_STRICT:
|
2004-02-12 16:36:01 +00:00
|
|
|
|
if (from.pos() == 0 || from.pos() == from_par.size()
|
2004-11-18 14:58:54 +00:00
|
|
|
|
|| !from_par.isLetter(from.pos())
|
|
|
|
|
|| !from_par.isLetter(from.pos() - 1)) {
|
2003-11-11 10:08:35 +00:00
|
|
|
|
to = from;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
// no break here, we go to the next
|
|
|
|
|
|
2006-10-21 00:16:43 +00:00
|
|
|
|
case WHOLE_WORD:
|
2004-06-29 15:43:25 +00:00
|
|
|
|
// If we are already at the beginning of a word, do nothing
|
2004-11-18 14:58:54 +00:00
|
|
|
|
if (!from.pos() || !from_par.isLetter(from.pos() - 1))
|
2004-06-29 15:43:25 +00:00
|
|
|
|
break;
|
|
|
|
|
// no break here, we go to the next
|
|
|
|
|
|
2006-10-21 00:16:43 +00:00
|
|
|
|
case PREVIOUS_WORD:
|
2003-11-11 10:08:35 +00:00
|
|
|
|
// always move the cursor to the beginning of previous word
|
2004-11-18 14:58:54 +00:00
|
|
|
|
while (from.pos() && from_par.isLetter(from.pos() - 1))
|
2004-06-29 15:43:25 +00:00
|
|
|
|
--from.pos();
|
2003-11-11 10:08:35 +00:00
|
|
|
|
break;
|
2006-10-21 00:16:43 +00:00
|
|
|
|
case NEXT_WORD:
|
2003-11-11 10:08:35 +00:00
|
|
|
|
lyxerr << "LyXText::getWord: NEXT_WORD not implemented yet"
|
|
|
|
|
<< endl;
|
|
|
|
|
break;
|
2006-10-21 00:16:43 +00:00
|
|
|
|
case PARTIAL_WORD:
|
2004-06-29 15:43:25 +00:00
|
|
|
|
// no need to move the 'from' cursor
|
2003-11-11 10:08:35 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
to = from;
|
2004-11-24 21:53:46 +00:00
|
|
|
|
Paragraph & to_par = pars_[to.pit()];
|
2004-11-18 14:58:54 +00:00
|
|
|
|
while (to.pos() < to_par.size() && to_par.isLetter(to.pos()))
|
2004-02-12 16:36:01 +00:00
|
|
|
|
++to.pos();
|
2003-11-11 10:08:35 +00:00
|
|
|
|
}
|
2003-12-02 12:39:14 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void LyXText::write(Buffer const & buf, std::ostream & os) const
|
|
|
|
|
{
|
|
|
|
|
ParagraphList::const_iterator pit = paragraphs().begin();
|
|
|
|
|
ParagraphList::const_iterator end = paragraphs().end();
|
2006-10-21 00:16:43 +00:00
|
|
|
|
depth_type dth = 0;
|
2003-12-02 12:39:14 +00:00
|
|
|
|
for (; pit != end; ++pit)
|
|
|
|
|
pit->write(buf, os, buf.params(), dth);
|
|
|
|
|
}
|
2003-12-03 15:27:16 +00:00
|
|
|
|
|
|
|
|
|
|
2006-08-13 16:16:43 +00:00
|
|
|
|
bool LyXText::read(Buffer const & buf, LyXLex & lex, ErrorList & errorList)
|
2004-01-28 16:21:29 +00:00
|
|
|
|
{
|
2006-10-21 00:16:43 +00:00
|
|
|
|
depth_type depth = 0;
|
2003-12-03 15:27:16 +00:00
|
|
|
|
|
|
|
|
|
while (lex.isOK()) {
|
|
|
|
|
lex.nextToken();
|
2004-07-25 00:04:42 +00:00
|
|
|
|
string const token = lex.getString();
|
2003-12-03 15:27:16 +00:00
|
|
|
|
|
|
|
|
|
if (token.empty())
|
|
|
|
|
continue;
|
|
|
|
|
|
2006-10-21 00:16:43 +00:00
|
|
|
|
if (token == "\\end_inset")
|
2004-03-18 12:53:43 +00:00
|
|
|
|
break;
|
2003-12-03 15:27:16 +00:00
|
|
|
|
|
2006-10-21 00:16:43 +00:00
|
|
|
|
if (token == "\\end_body")
|
2004-08-16 00:16:17 +00:00
|
|
|
|
continue;
|
|
|
|
|
|
2006-10-21 00:16:43 +00:00
|
|
|
|
if (token == "\\begin_body")
|
2004-08-16 00:16:17 +00:00
|
|
|
|
continue;
|
|
|
|
|
|
2006-10-21 00:16:43 +00:00
|
|
|
|
if (token == "\\end_document")
|
2004-03-18 12:53:43 +00:00
|
|
|
|
return false;
|
2003-12-03 15:27:16 +00:00
|
|
|
|
|
|
|
|
|
if (token == "\\begin_layout") {
|
|
|
|
|
lex.pushToken(token);
|
|
|
|
|
|
|
|
|
|
Paragraph par;
|
|
|
|
|
par.params().depth(depth);
|
2004-03-18 12:53:43 +00:00
|
|
|
|
par.setFont(0, LyXFont(LyXFont::ALL_INHERIT, buf.params().language));
|
2004-03-25 09:16:36 +00:00
|
|
|
|
pars_.push_back(par);
|
2003-12-03 15:27:16 +00:00
|
|
|
|
|
|
|
|
|
// FIXME: goddamn InsetTabular makes us pass a Buffer
|
|
|
|
|
// not BufferParams
|
2006-10-21 00:16:43 +00:00
|
|
|
|
lyx::readParagraph(buf, pars_.back(), lex, errorList);
|
2003-12-03 15:27:16 +00:00
|
|
|
|
|
|
|
|
|
} else if (token == "\\begin_deeper") {
|
|
|
|
|
++depth;
|
|
|
|
|
} else if (token == "\\end_deeper") {
|
|
|
|
|
if (!depth) {
|
|
|
|
|
lex.printError("\\end_deeper: " "depth is already null");
|
|
|
|
|
} else {
|
|
|
|
|
--depth;
|
|
|
|
|
}
|
|
|
|
|
} else {
|
2004-08-16 00:16:17 +00:00
|
|
|
|
lyxerr << "Handling unknown body token: `"
|
|
|
|
|
<< token << '\'' << endl;
|
2003-12-03 15:27:16 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2004-08-14 18:41:27 +00:00
|
|
|
|
return true;
|
2003-12-03 15:27:16 +00:00
|
|
|
|
}
|
2003-12-10 09:45:32 +00:00
|
|
|
|
|
2006-12-29 23:54:48 +00:00
|
|
|
|
int LyXText::cursorX(BufferView const & bv, CursorSlice const & sl,
|
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
|
|
|
|
bool boundary) const
|
2003-12-15 11:36:19 +00:00
|
|
|
|
{
|
2006-12-29 23:54:48 +00:00
|
|
|
|
TextMetrics const & tm = bv.textMetrics(sl.text());
|
2005-07-15 15:49:40 +00:00
|
|
|
|
pit_type const pit = sl.pit();
|
2004-08-15 00:01:45 +00:00
|
|
|
|
Paragraph const & par = pars_[pit];
|
2006-12-29 23:54:48 +00:00
|
|
|
|
ParagraphMetrics const & pm = tm.parMetrics(pit);
|
|
|
|
|
if (pm.rows().empty())
|
2004-11-30 01:59:49 +00:00
|
|
|
|
return 0;
|
2004-03-01 17:12:09 +00:00
|
|
|
|
|
2005-07-16 00:04:54 +00:00
|
|
|
|
pos_type ppos = sl.pos();
|
2005-07-16 12:02:31 +00:00
|
|
|
|
// Correct position in front of big insets
|
|
|
|
|
bool const boundary_correction = ppos != 0 && boundary;
|
|
|
|
|
if (boundary_correction)
|
2005-07-16 00:04:54 +00:00
|
|
|
|
--ppos;
|
2005-07-15 15:49:40 +00:00
|
|
|
|
|
2006-12-29 23:54:48 +00:00
|
|
|
|
Row const & row = pm.getRow(sl.pos(), boundary);
|
2004-04-03 08:37:12 +00:00
|
|
|
|
|
2004-03-01 12:23:17 +00:00
|
|
|
|
pos_type cursor_vpos = 0;
|
|
|
|
|
|
2006-12-29 23:54:48 +00:00
|
|
|
|
Buffer const & buffer = *bv.buffer();
|
|
|
|
|
RowMetrics const m = tm.computeRowMetrics(pit, row);
|
2004-03-01 12:23:17 +00:00
|
|
|
|
double x = m.x;
|
|
|
|
|
|
2003-12-15 11:36:19 +00:00
|
|
|
|
pos_type const row_pos = row.pos();
|
|
|
|
|
pos_type const end = row.endpos();
|
|
|
|
|
|
|
|
|
|
if (end <= row_pos)
|
|
|
|
|
cursor_vpos = row_pos;
|
2005-07-16 00:04:54 +00:00
|
|
|
|
else if (ppos >= end)
|
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
|
|
|
|
cursor_vpos = isRTL(buffer, par) ? row_pos : end;
|
2005-07-16 00:04:54 +00:00
|
|
|
|
else if (ppos > row_pos && ppos >= end)
|
2003-12-15 11:36:19 +00:00
|
|
|
|
// Place cursor after char at (logical) position pos - 1
|
2005-07-16 00:04:54 +00:00
|
|
|
|
cursor_vpos = (bidi.level(ppos - 1) % 2 == 0)
|
|
|
|
|
? bidi.log2vis(ppos - 1) + 1 : bidi.log2vis(ppos - 1);
|
2003-12-15 11:36:19 +00:00
|
|
|
|
else
|
2005-07-16 00:04:54 +00:00
|
|
|
|
// Place cursor before char at (logical) position ppos
|
|
|
|
|
cursor_vpos = (bidi.level(ppos) % 2 == 0)
|
|
|
|
|
? bidi.log2vis(ppos) : bidi.log2vis(ppos) + 1;
|
2003-12-15 11:36:19 +00:00
|
|
|
|
|
2004-08-15 00:01:45 +00:00
|
|
|
|
pos_type body_pos = par.beginOfBody();
|
2003-12-15 11:36:19 +00:00
|
|
|
|
if (body_pos > 0 &&
|
2004-08-15 00:01:45 +00:00
|
|
|
|
(body_pos > end || !par.isLineSeparator(body_pos - 1)))
|
2003-12-15 11:36:19 +00:00
|
|
|
|
body_pos = 0;
|
|
|
|
|
|
2005-07-18 12:13:32 +00:00
|
|
|
|
// Use font span to speed things up, see below
|
2005-07-18 17:12:28 +00:00
|
|
|
|
FontSpan font_span;
|
|
|
|
|
LyXFont font;
|
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
|
|
|
|
FontMetrics const & labelfm = theFontMetrics(
|
|
|
|
|
getLabelFont(buffer, par));
|
2005-07-18 12:13:32 +00:00
|
|
|
|
|
2003-12-15 11:36:19 +00:00
|
|
|
|
for (pos_type vpos = row_pos; vpos < cursor_vpos; ++vpos) {
|
|
|
|
|
pos_type pos = bidi.vis2log(vpos);
|
|
|
|
|
if (body_pos > 0 && pos == body_pos - 1) {
|
2006-10-17 14:46:45 +00:00
|
|
|
|
// FIXME UNICODE
|
2006-10-21 00:16:43 +00:00
|
|
|
|
docstring const lsep = from_utf8(par.layout()->labelsep);
|
2006-10-17 14:46:45 +00:00
|
|
|
|
x += m.label_hfill + labelfm.width(lsep);
|
2004-08-15 00:01:45 +00:00
|
|
|
|
if (par.isLineSeparator(body_pos - 1))
|
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
|
|
|
|
x -= singleWidth(buffer, par, body_pos - 1);
|
2003-12-15 11:36:19 +00:00
|
|
|
|
}
|
|
|
|
|
|
2005-07-18 12:13:32 +00:00
|
|
|
|
// Use font span to speed things up, see above
|
|
|
|
|
if (pos < font_span.first || pos > font_span.last) {
|
|
|
|
|
font_span = par.fontSpan(pos);
|
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
|
|
|
|
font = getFont(buffer, par, pos);
|
2005-07-18 12:13:32 +00:00
|
|
|
|
}
|
|
|
|
|
|
2006-10-30 20:10:35 +00:00
|
|
|
|
x += singleWidth(par, pos, par.getChar(pos), font);
|
2005-07-16 12:02:31 +00:00
|
|
|
|
|
2006-10-21 07:24:11 +00:00
|
|
|
|
if (par.hfillExpansion(row, pos))
|
2005-07-16 12:02:31 +00:00
|
|
|
|
x += (pos >= body_pos) ? m.hfill : m.label_hfill;
|
|
|
|
|
else if (par.isSeparator(pos) && pos >= body_pos)
|
|
|
|
|
x += m.separator;
|
2003-12-15 11:36:19 +00:00
|
|
|
|
}
|
2006-04-05 23:56:29 +00:00
|
|
|
|
|
2005-07-15 15:49:40 +00:00
|
|
|
|
// see correction above
|
2005-07-16 12:02:31 +00:00
|
|
|
|
if (boundary_correction)
|
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
|
|
|
|
if (getFont(buffer, par, ppos).isVisibleRightToLeft())
|
|
|
|
|
x -= singleWidth(buffer, par, ppos);
|
2005-08-15 08:26:53 +00:00
|
|
|
|
else
|
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
|
|
|
|
x += singleWidth(buffer, par, ppos);
|
2005-07-15 15:49:40 +00:00
|
|
|
|
|
2005-10-03 12:13:58 +00:00
|
|
|
|
// Make sure inside an inset we always count from the left
|
|
|
|
|
// edge (bidi!) -- MV
|
|
|
|
|
if (sl.pos() < par.size()) {
|
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
|
|
|
|
font = getFont(buffer, par, sl.pos());
|
2005-10-03 12:13:58 +00:00
|
|
|
|
if (!boundary && font.isVisibleRightToLeft()
|
|
|
|
|
&& par.isInset(sl.pos()))
|
|
|
|
|
x -= par.getInset(sl.pos())->width();
|
2006-04-05 23:56:29 +00:00
|
|
|
|
}
|
2004-11-30 01:59:49 +00:00
|
|
|
|
return int(x);
|
2003-12-15 11:36:19 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2006-12-29 23:54:48 +00:00
|
|
|
|
int LyXText::cursorY(BufferView const & bv, CursorSlice const & sl, bool boundary) const
|
2003-12-15 11:36:19 +00:00
|
|
|
|
{
|
2005-07-15 15:49:40 +00:00
|
|
|
|
//lyxerr << "LyXText::cursorY: boundary: " << boundary << std::endl;
|
2006-12-29 23:54:48 +00:00
|
|
|
|
ParagraphMetrics const & pm = bv.parMetrics(this, sl.pit());
|
|
|
|
|
if (pm.rows().empty())
|
2006-07-08 14:40:22 +00:00
|
|
|
|
return 0;
|
|
|
|
|
|
2004-11-30 01:59:49 +00:00
|
|
|
|
int h = 0;
|
2006-12-29 23:54:48 +00:00
|
|
|
|
h -= bv.parMetrics(this, 0).rows()[0].ascent();
|
|
|
|
|
for (pit_type pit = 0; pit < sl.pit(); ++pit) {
|
|
|
|
|
h += bv.parMetrics(this, pit).height();
|
|
|
|
|
}
|
2005-07-16 00:04:54 +00:00
|
|
|
|
int pos = sl.pos();
|
|
|
|
|
if (pos && boundary)
|
|
|
|
|
--pos;
|
2006-12-29 23:54:48 +00:00
|
|
|
|
size_t const rend = pm.pos2row(pos);
|
2005-07-15 15:49:40 +00:00
|
|
|
|
for (size_t rit = 0; rit != rend; ++rit)
|
2006-12-29 23:54:48 +00:00
|
|
|
|
h += pm.rows()[rit].height();
|
|
|
|
|
h += pm.rows()[rend].ascent();
|
2004-11-30 01:59:49 +00:00
|
|
|
|
return h;
|
2004-01-30 11:41:12 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2004-02-13 07:30:59 +00:00
|
|
|
|
// Returns the current font and depth as a message.
|
2006-12-21 13:58:28 +00:00
|
|
|
|
docstring LyXText::currentState(LCursor & cur)
|
2004-02-13 07:30:59 +00:00
|
|
|
|
{
|
2004-02-13 11:05:29 +00:00
|
|
|
|
BOOST_ASSERT(this == cur.text());
|
2004-04-08 15:03:33 +00:00
|
|
|
|
Buffer & buf = cur.buffer();
|
2004-02-13 07:30:59 +00:00
|
|
|
|
Paragraph const & par = cur.paragraph();
|
2006-12-21 13:58:28 +00:00
|
|
|
|
odocstringstream os;
|
2004-02-13 07:30:59 +00:00
|
|
|
|
|
2006-10-06 18:53:35 +00:00
|
|
|
|
if (buf.params().trackChanges)
|
2007-01-08 22:38:49 +00:00
|
|
|
|
os << _("[Change Tracking] ");
|
2006-03-11 13:31:41 +00:00
|
|
|
|
|
2006-10-22 16:47:42 +00:00
|
|
|
|
Change change = par.lookupChange(cur.pos());
|
|
|
|
|
|
|
|
|
|
if (change.type != Change::UNCHANGED) {
|
2004-04-08 15:03:33 +00:00
|
|
|
|
Author const & a = buf.params().authors().get(change.author);
|
2006-12-21 13:58:28 +00:00
|
|
|
|
os << _("Change: ") << a.name();
|
2004-02-13 07:30:59 +00:00
|
|
|
|
if (!a.email().empty())
|
|
|
|
|
os << " (" << a.email() << ")";
|
2006-12-21 13:58:28 +00:00
|
|
|
|
// FIXME ctime is english, we should translate that
|
|
|
|
|
os << _(" at ") << ctime(&change.changetime);
|
2004-02-13 07:30:59 +00:00
|
|
|
|
os << " : ";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// I think we should only show changes from the default
|
|
|
|
|
// font. (Asger)
|
2006-02-05 13:20:16 +00:00
|
|
|
|
// No, from the document font (MV)
|
2004-02-13 07:30:59 +00:00
|
|
|
|
LyXFont font = real_current_font;
|
2006-02-05 13:20:16 +00:00
|
|
|
|
font.reduce(buf.params().getFont());
|
2004-02-13 07:30:59 +00:00
|
|
|
|
|
2006-12-21 14:31:19 +00:00
|
|
|
|
os << bformat(_("Font: %1$s"), font.stateText(&buf.params()));
|
2004-02-13 07:30:59 +00:00
|
|
|
|
|
|
|
|
|
// The paragraph depth
|
2004-03-18 13:28:49 +00:00
|
|
|
|
int depth = cur.paragraph().getDepth();
|
2004-02-13 07:30:59 +00:00
|
|
|
|
if (depth > 0)
|
2006-12-21 13:58:28 +00:00
|
|
|
|
os << bformat(_(", Depth: %1$d"), depth);
|
2004-02-13 07:30:59 +00:00
|
|
|
|
|
|
|
|
|
// The paragraph spacing, but only if different from
|
|
|
|
|
// buffer spacing.
|
|
|
|
|
Spacing const & spacing = par.params().spacing();
|
|
|
|
|
if (!spacing.isDefault()) {
|
2006-12-21 13:58:28 +00:00
|
|
|
|
os << _(", Spacing: ");
|
2004-02-13 07:30:59 +00:00
|
|
|
|
switch (spacing.getSpace()) {
|
|
|
|
|
case Spacing::Single:
|
2006-12-21 13:58:28 +00:00
|
|
|
|
os << _("Single");
|
2004-02-13 07:30:59 +00:00
|
|
|
|
break;
|
|
|
|
|
case Spacing::Onehalf:
|
2006-12-21 13:58:28 +00:00
|
|
|
|
os << _("OneHalf");
|
2004-02-13 07:30:59 +00:00
|
|
|
|
break;
|
|
|
|
|
case Spacing::Double:
|
2006-12-21 13:58:28 +00:00
|
|
|
|
os << _("Double");
|
2004-02-13 07:30:59 +00:00
|
|
|
|
break;
|
|
|
|
|
case Spacing::Other:
|
2006-12-21 13:58:28 +00:00
|
|
|
|
os << _("Other (") << from_ascii(spacing.getValueAsString()) << ')';
|
2004-02-13 07:30:59 +00:00
|
|
|
|
break;
|
|
|
|
|
case Spacing::Default:
|
|
|
|
|
// should never happen, do nothing
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
2004-08-13 20:26:26 +00:00
|
|
|
|
|
2004-02-13 07:30:59 +00:00
|
|
|
|
#ifdef DEVEL_VERSION
|
2006-12-21 13:58:28 +00:00
|
|
|
|
os << _(", Inset: ") << &cur.inset();
|
|
|
|
|
os << _(", Paragraph: ") << cur.pit();
|
|
|
|
|
os << _(", Id: ") << par.id();
|
|
|
|
|
os << _(", Position: ") << cur.pos();
|
2007-01-29 18:08:13 +00:00
|
|
|
|
// FIXME: Why is the check for par.size() needed?
|
|
|
|
|
// We are called with cur.pos() == par.size() quite often.
|
|
|
|
|
if (!par.empty() && cur.pos() < par.size()) {
|
2007-01-29 09:40:04 +00:00
|
|
|
|
// Force output of code point, not character
|
|
|
|
|
size_t const c = par.getChar(cur.pos());
|
|
|
|
|
os << _(", Char: 0x") << std::hex << c;
|
|
|
|
|
}
|
2006-12-21 13:58:28 +00:00
|
|
|
|
os << _(", Boundary: ") << cur.boundary();
|
2004-11-30 01:59:49 +00:00
|
|
|
|
// Row & row = cur.textRow();
|
|
|
|
|
// os << bformat(_(", Row b:%1$d e:%2$d"), row.pos(), row.endpos());
|
2004-02-13 07:30:59 +00:00
|
|
|
|
#endif
|
|
|
|
|
return os.str();
|
|
|
|
|
}
|
2004-02-13 13:51:12 +00:00
|
|
|
|
|
|
|
|
|
|
2006-11-11 11:27:47 +00:00
|
|
|
|
docstring LyXText::getPossibleLabel(LCursor & cur) const
|
2004-02-13 13:51:12 +00:00
|
|
|
|
{
|
2004-11-24 21:53:46 +00:00
|
|
|
|
pit_type pit = cur.pit();
|
2004-02-13 13:51:12 +00:00
|
|
|
|
|
2004-03-25 09:16:36 +00:00
|
|
|
|
LyXLayout_ptr layout = pars_[pit].layout();
|
2004-02-13 13:51:12 +00:00
|
|
|
|
|
2004-03-25 09:16:36 +00:00
|
|
|
|
if (layout->latextype == LATEX_PARAGRAPH && pit != 0) {
|
|
|
|
|
LyXLayout_ptr const & layout2 = pars_[pit - 1].layout();
|
2004-02-13 13:51:12 +00:00
|
|
|
|
if (layout2->latextype != LATEX_PARAGRAPH) {
|
2004-03-25 09:16:36 +00:00
|
|
|
|
--pit;
|
2004-02-13 13:51:12 +00:00
|
|
|
|
layout = layout2;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2006-11-11 11:27:47 +00:00
|
|
|
|
docstring name = from_ascii(layout->latexname());
|
2006-03-16 13:35:53 +00:00
|
|
|
|
|
|
|
|
|
// for captions, we want the abbreviation of the float type
|
|
|
|
|
if (layout->labeltype == LABEL_SENSITIVE) {
|
|
|
|
|
// Search for the first float or wrap inset in the iterator
|
2006-10-22 10:15:23 +00:00
|
|
|
|
for (int i = cur.depth(); --i >= 0; ) {
|
2006-03-16 13:35:53 +00:00
|
|
|
|
InsetBase * const in = &cur[i].inset();
|
|
|
|
|
if (in->lyxCode() == InsetBase::FLOAT_CODE
|
|
|
|
|
|| in->lyxCode() == InsetBase::WRAP_CODE) {
|
2006-11-11 11:27:47 +00:00
|
|
|
|
name = in->getInsetName();
|
2006-03-16 13:35:53 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2006-11-11 11:27:47 +00:00
|
|
|
|
docstring text = name.substr(0, 3);
|
2006-03-16 13:35:53 +00:00
|
|
|
|
if (name == "theorem")
|
2006-11-11 11:27:47 +00:00
|
|
|
|
text = from_ascii("thm"); // Create a correct prefix for prettyref
|
2004-02-13 13:51:12 +00:00
|
|
|
|
|
|
|
|
|
text += ':';
|
2004-02-16 11:58:51 +00:00
|
|
|
|
if (layout->latextype == LATEX_PARAGRAPH || lyxrc.label_init_length < 0)
|
2004-02-13 13:51:12 +00:00
|
|
|
|
text.erase();
|
|
|
|
|
|
2006-11-11 11:27:47 +00:00
|
|
|
|
docstring par_text = pars_[pit].asString(cur.buffer(), false);
|
2004-02-13 13:51:12 +00:00
|
|
|
|
for (int i = 0; i < lyxrc.label_init_length; ++i) {
|
|
|
|
|
if (par_text.empty())
|
|
|
|
|
break;
|
2006-11-11 11:27:47 +00:00
|
|
|
|
docstring head;
|
2004-02-13 13:51:12 +00:00
|
|
|
|
par_text = split(par_text, head, ' ');
|
|
|
|
|
// Is it legal to use spaces in labels ?
|
|
|
|
|
if (i > 0)
|
|
|
|
|
text += '-';
|
|
|
|
|
text += head;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return text;
|
|
|
|
|
}
|
2004-02-16 11:58:51 +00:00
|
|
|
|
|
|
|
|
|
|
2006-12-30 15:53:19 +00:00
|
|
|
|
void LyXText::setCursorFromCoordinates(LCursor & cur, int const x, int const y)
|
2004-02-16 11:58:51 +00:00
|
|
|
|
{
|
2006-09-15 09:51:41 +00:00
|
|
|
|
BOOST_ASSERT(this == cur.text());
|
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
|
|
|
|
pit_type pit = getPitNearY(cur.bv(), y);
|
2006-12-29 23:54:48 +00:00
|
|
|
|
|
|
|
|
|
TextMetrics const & tm = cur.bv().textMetrics(this);
|
|
|
|
|
ParagraphMetrics const & pm = tm.parMetrics(pit);
|
|
|
|
|
|
|
|
|
|
int yy = cur.bv().coordCache().get(this, pit).y_ - pm.ascent();
|
2005-07-14 08:20:10 +00:00
|
|
|
|
lyxerr[Debug::DEBUG]
|
2006-04-05 23:56:29 +00:00
|
|
|
|
<< BOOST_CURRENT_FUNCTION
|
|
|
|
|
<< ": x: " << x
|
|
|
|
|
<< " y: " << y
|
2005-07-14 08:20:10 +00:00
|
|
|
|
<< " pit: " << pit
|
2006-04-05 23:56:29 +00:00
|
|
|
|
<< " yy: " << yy << endl;
|
2004-11-30 01:59:49 +00:00
|
|
|
|
|
|
|
|
|
int r = 0;
|
2006-12-29 23:54:48 +00:00
|
|
|
|
BOOST_ASSERT(pm.rows().size());
|
|
|
|
|
for (; r < int(pm.rows().size()) - 1; ++r) {
|
|
|
|
|
Row const & row = pm.rows()[r];
|
2004-11-30 01:59:49 +00:00
|
|
|
|
if (int(yy + row.height()) > y)
|
|
|
|
|
break;
|
|
|
|
|
yy += row.height();
|
|
|
|
|
}
|
|
|
|
|
|
2006-12-29 23:54:48 +00:00
|
|
|
|
Row const & row = pm.rows()[r];
|
2005-01-06 15:40:49 +00:00
|
|
|
|
|
2005-07-14 08:20:10 +00:00
|
|
|
|
lyxerr[Debug::DEBUG]
|
2006-04-05 23:56:29 +00:00
|
|
|
|
<< BOOST_CURRENT_FUNCTION
|
|
|
|
|
<< ": row " << r
|
|
|
|
|
<< " from pos: " << row.pos()
|
|
|
|
|
<< endl;
|
2005-01-06 15:40:49 +00:00
|
|
|
|
|
2004-11-30 01:59:49 +00:00
|
|
|
|
bool bound = false;
|
|
|
|
|
int xx = x;
|
2007-01-01 10:33:37 +00:00
|
|
|
|
pos_type const pos = row.pos()
|
|
|
|
|
+ tm.getColumnNearX(pit, row, xx, bound);
|
2005-07-15 12:56:23 +00:00
|
|
|
|
|
2006-04-05 23:56:29 +00:00
|
|
|
|
lyxerr[Debug::DEBUG]
|
|
|
|
|
<< BOOST_CURRENT_FUNCTION
|
|
|
|
|
<< ": setting cursor pit: " << pit
|
|
|
|
|
<< " pos: " << pos
|
|
|
|
|
<< endl;
|
|
|
|
|
|
2006-12-30 15:53:19 +00:00
|
|
|
|
setCursor(cur, pit, pos, true, bound);
|
2007-01-10 10:59:18 +00:00
|
|
|
|
// remember new position.
|
|
|
|
|
cur.setTargetX();
|
2004-02-16 11:58:51 +00:00
|
|
|
|
}
|
2006-10-21 00:16:43 +00:00
|
|
|
|
|
|
|
|
|
|
2006-11-17 09:03:30 +00:00
|
|
|
|
void LyXText::charsTranspose(LCursor & cur)
|
|
|
|
|
{
|
|
|
|
|
BOOST_ASSERT(this == cur.text());
|
|
|
|
|
|
|
|
|
|
pos_type pos = cur.pos();
|
|
|
|
|
|
|
|
|
|
// If cursor is at beginning or end of paragraph, do nothing.
|
|
|
|
|
if (pos == cur.lastpos() || pos == 0)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
Paragraph & par = cur.paragraph();
|
|
|
|
|
|
|
|
|
|
// Get the positions of the characters to be transposed.
|
|
|
|
|
pos_type pos1 = pos - 1;
|
|
|
|
|
pos_type pos2 = pos;
|
|
|
|
|
|
|
|
|
|
// In change tracking mode, ignore deleted characters.
|
|
|
|
|
while (pos2 < cur.lastpos() && par.isDeleted(pos2))
|
|
|
|
|
++pos2;
|
|
|
|
|
if (pos2 == cur.lastpos())
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
while (pos1 >= 0 && par.isDeleted(pos1))
|
|
|
|
|
--pos1;
|
|
|
|
|
if (pos1 < 0)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
// Don't do anything if one of the "characters" is not regular text.
|
|
|
|
|
if (par.isInset(pos1) || par.isInset(pos2))
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
// Store the characters to be transposed (including font information).
|
|
|
|
|
char_type char1 = par.getChar(pos1);
|
|
|
|
|
LyXFont const font1 =
|
|
|
|
|
par.getFontSettings(cur.buffer().params(), pos1);
|
|
|
|
|
|
|
|
|
|
char_type char2 = par.getChar(pos2);
|
|
|
|
|
LyXFont const font2 =
|
|
|
|
|
par.getFontSettings(cur.buffer().params(), pos2);
|
|
|
|
|
|
|
|
|
|
// And finally, we are ready to perform the transposition.
|
|
|
|
|
// Track the changes if Change Tracking is enabled.
|
|
|
|
|
bool const trackChanges = cur.buffer().params().trackChanges;
|
|
|
|
|
|
|
|
|
|
recordUndo(cur);
|
|
|
|
|
|
|
|
|
|
par.eraseChar(pos2, trackChanges);
|
|
|
|
|
par.eraseChar(pos1, trackChanges);
|
|
|
|
|
par.insertChar(pos1, char2, font2, trackChanges);
|
|
|
|
|
par.insertChar(pos2, char1, font1, trackChanges);
|
|
|
|
|
|
2007-03-12 11:23:41 +00:00
|
|
|
|
checkBufferStructure(cur.buffer(), cur);
|
|
|
|
|
|
2006-11-17 09:03:30 +00:00
|
|
|
|
// After the transposition, move cursor to after the transposition.
|
|
|
|
|
setCursor(cur, cur.pit(), pos2);
|
|
|
|
|
cur.forwardPos();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2006-10-21 00:16:43 +00:00
|
|
|
|
} // namespace lyx
|