#include "bufferview_funcs.h"
-#include "Author.h"
#include "Buffer.h"
#include "BufferParams.h"
#include "BufferView.h"
-#include "LCursor.h"
+#include "Cursor.h"
#include "CoordCache.h"
#include "gettext.h"
#include "Language.h"
-#include "LColor.h"
-#include "LyXLex.h"
-#include "Row.h"
-#include "Paragraph.h"
-#include "ParagraphParameters.h"
-#include "ParIterator.h"
+#include "Color.h"
+#include "Lexer.h"
-#include "frontends/Alert.h"
+#include "frontends/alert.h"
#include "insets/InsetCommand.h"
#include "insets/InsetText.h"
#include <sstream>
-
-namespace lyx {
-
-using support::bformat;
-
using std::istringstream;
using std::ostringstream;
using std::string;
using std::find;
+namespace lyx {
+
+using support::bformat;
+
namespace bv_funcs {
// Set data using font and toggle
// If successful, returns true
-bool font2string(LyXFont const & font, bool const toggle, string & data)
+bool font2string(Font const & font, bool const toggle, string & data)
{
string lang = "ignore";
if (font.language())
// Set font and toggle using data
// If successful, returns true
-bool string2font(string const & data, LyXFont & font, bool & toggle)
+bool string2font(string const & data, Font & font, bool & toggle)
{
istringstream is(data);
- LyXLex lex(0,0);
+ Lexer lex(0,0);
lex.setStream(is);
int nset = 0;
if (token == "family") {
int const next = lex.getInteger();
- font.setFamily(LyXFont::FONT_FAMILY(next));
+ font.setFamily(Font::FONT_FAMILY(next));
} else if (token == "series") {
int const next = lex.getInteger();
- font.setSeries(LyXFont::FONT_SERIES(next));
+ font.setSeries(Font::FONT_SERIES(next));
} else if (token == "shape") {
int const next = lex.getInteger();
- font.setShape(LyXFont::FONT_SHAPE(next));
+ font.setShape(Font::FONT_SHAPE(next));
} else if (token == "size") {
int const next = lex.getInteger();
- font.setSize(LyXFont::FONT_SIZE(next));
+ font.setSize(Font::FONT_SIZE(next));
} else if (token == "emph" || token == "underbar" ||
token == "noun" || token == "number") {
int const next = lex.getInteger();
- LyXFont::FONT_MISC_STATE const misc =
- LyXFont::FONT_MISC_STATE(next);
+ Font::FONT_MISC_STATE const misc =
+ Font::FONT_MISC_STATE(next);
if (token == "emph")
font.setEmph(misc);
} else if (token == "color") {
int const next = lex.getInteger();
- font.setColor(LColor::color(next));
+ font.setColor(Color::color(next));
} else if (token == "language") {
string const next = lex.getString();
{
int x = 0;
int y = 0;
+ int lastw = 0;
- // Contribution of nested insets
- for (size_t i = 1; i != dit.depth(); ++i) {
+ // Addup ontribution of nested insets, from inside to outside,
+ // keeping the outer paragraph for a special handling below
+ for (size_t i = dit.depth() - 1; i >= 1; --i) {
CursorSlice const & sl = dit[i];
int xx = 0;
int yy = 0;
+
+ // get relative position inside sl.inset()
sl.inset().cursorPos(bv, sl, boundary && ((i+1) == dit.depth()), xx, yy);
+
+ // Make relative position inside of the edited inset relative to sl.inset()
x += xx;
y += yy;
- //lyxerr << "LCursor::getPos, i: "
+
+ // In case of an RTL inset, the edited inset will be positioned to the left
+ // of xx:yy
+ if (sl.text()) {
+ bool boundary_i = boundary && i + 1 == dit.depth();
+ bool rtl = sl.text()->isRTL(*bv.buffer(), sl, boundary_i);
+ if (rtl)
+ x -= lastw;
+ }
+
+ // remember width for the case that sl.inset() is positioned in an RTL inset
+ lastw = sl.inset().width();
+
+ //lyxerr << "Cursor::getPos, i: "
// << i << " x: " << xx << " y: " << y << endl;
}
BOOST_ASSERT(!pm.rows().empty());
y -= pm.rows()[0].ascent();
#if 1
+ // FIXME: document this mess
size_t rend;
if (sl.pos() > 0 && dit.depth() == 1) {
int pos = sl.pos();
for (size_t rit = 0; rit != rend; ++rit)
y += pm.rows()[rit].height();
y += pm.rows()[rend].ascent();
- x += dit.bottom().text()->cursorX(bv, dit.bottom(), boundary && dit.depth() == 1);
-
+
+ // Make relative position from the nested inset now bufferview absolute.
+ int xx = dit.bottom().text()->cursorX(bv, dit.bottom(), boundary && dit.depth() == 1);
+ x += xx;
+
+ // In the RTL case place the nested inset at the left of the cursor in
+ // the outer paragraph
+ bool boundary_1 = boundary && 1 == dit.depth();
+ bool rtl = dit.bottom().text()->isRTL(*bv.buffer(), dit.bottom(), boundary_1);
+ if (rtl)
+ x -= lastw;
+
return Point(x, y);
}
Point getPos(BufferView const & bv, DocIterator const & dit, bool boundary)
{
CursorSlice const & bot = dit.bottom();
- CoordCache::ParPosCache::const_iterator cache_it =
+ CoordCache::ParPosCache::const_iterator cache_it =
bv.coordCache().getParPos().find(bot.text());
if (cache_it == bv.coordCache().getParPos().end())
return Point(-1, -1);
namespace {
bool findNextInset(DocIterator & dit,
- vector<InsetBase_code> const & codes,
+ vector<Inset_code> const & codes,
string const & contents)
{
DocIterator tmpdit = dit;
while (tmpdit) {
- InsetBase const * inset = tmpdit.nextInset();
+ Inset const * inset = tmpdit.nextInset();
if (inset
&& find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end()
&& (contents.empty() ||
} // namespace anon
-bool findInset(DocIterator & dit, vector<InsetBase_code> const & codes,
+bool findInset(DocIterator & dit, vector<Inset_code> const & codes,
bool same_content)
{
string contents;
return false;
if (same_content) {
- InsetBase const * inset = tmpdit.nextInset();
+ Inset const * inset = tmpdit.nextInset();
if (inset
&& find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end()) {
contents = static_cast<InsetCommand const *>(inset)->getContents();
}
-void findInset(DocIterator & dit, InsetBase_code code, bool same_content)
+void findInset(DocIterator & dit, Inset_code code, bool same_content)
{
- findInset(dit, vector<InsetBase_code>(1, code), same_content);
+ findInset(dit, vector<Inset_code>(1, code), same_content);
}
-void gotoInset(BufferView * bv, vector<InsetBase_code> const & codes,
+void gotoInset(BufferView * bv, vector<Inset_code> const & codes,
bool same_content)
{
- LCursor tmpcur = bv->cursor();
+ Cursor tmpcur = bv->cursor();
if (!findInset(tmpcur, codes, same_content)) {
bv->cursor().message(_("No more insets"));
return;
}
-void gotoInset(BufferView * bv, InsetBase_code code, bool same_content)
+void gotoInset(BufferView * bv, Inset_code code, bool same_content)
{
- gotoInset(bv, vector<InsetBase_code>(1, code), same_content);
+ gotoInset(bv, vector<Inset_code>(1, code), same_content);
}
projects / lyx.git / blobdiff