X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText2.cpp;h=3ba4f84d558cde1e9bd2459d975260ca88e6ce9c;hb=b7406da7f0326fbd895c700ad5ded4cc5112094f;hp=a4f78271a4d834ed5ff2d20e37dbb4331e666b30;hpb=b09542af9d61286c3404ee9550e5f7322938128d;p=lyx.git

diff --git a/src/Text2.cpp b/src/Text2.cpp
index a4f78271a4..3ba4f84d55 100644
--- a/src/Text2.cpp
+++ b/src/Text2.cpp
@@ -73,19 +73,19 @@ bool Text::isMainText(Buffer const & buffer) const
 }
 
 
-FontInfo Text::getLayoutFont(Buffer const & buffer, pit_type const pit) const
+FontInfo Text::layoutFont(Buffer const & buffer, pit_type const pit) const
 {
-	LayoutPtr const & layout = pars_[pit].layout();
+	Layout const & layout = pars_[pit].layout();
 
 	if (!pars_[pit].getDepth())  {
-		FontInfo lf = layout->resfont;
+		FontInfo lf = layout.resfont;
 		// In case the default family has been customized
-		if (layout->font.family() == INHERIT_FAMILY)
+		if (layout.font.family() == INHERIT_FAMILY)
 			lf.setFamily(buffer.params().getFont().fontInfo().family());
 		return lf;
 	}
 
-	FontInfo font = layout->font;
+	FontInfo font = layout.font;
 	// Realize with the fonts of lesser depth.
 	//font.realize(outerFont(pit, paragraphs()));
 	font.realize(buffer.params().getFont().fontInfo());
@@ -94,19 +94,19 @@ FontInfo Text::getLayoutFont(Buffer const & buffer, pit_type const pit) const
 }
 
 
-FontInfo Text::getLabelFont(Buffer const & buffer, Paragraph const & par) const
+FontInfo Text::labelFont(Buffer const & buffer, Paragraph const & par) const
 {
-	LayoutPtr const & layout = par.layout();
+	Layout const & layout = par.layout();
 
 	if (!par.getDepth()) {
-		FontInfo lf = layout->reslabelfont;
+		FontInfo lf = layout.reslabelfont;
 		// In case the default family has been customized
-		if (layout->labelfont.family() == INHERIT_FAMILY)
+		if (layout.labelfont.family() == INHERIT_FAMILY)
 			lf.setFamily(buffer.params().getFont().fontInfo().family());
 		return lf;
 	}
 
-	FontInfo font = layout->labelfont;
+	FontInfo font = layout.labelfont;
 	// Realize with the fonts of lesser depth.
 	font.realize(buffer.params().getFont().fontInfo());
 
@@ -118,15 +118,15 @@ void Text::setCharFont(Buffer const & buffer, pit_type pit,
 		pos_type pos, Font const & fnt, Font const & display_font)
 {
 	Font font = fnt;
-	LayoutPtr const & layout = pars_[pit].layout();
+	Layout const & layout = pars_[pit].layout();
 
 	// Get concrete layout font to reduce against
 	FontInfo layoutfont;
 
 	if (pos < pars_[pit].beginOfBody())
-		layoutfont = layout->labelfont;
+		layoutfont = layout.labelfont;
 	else
-		layoutfont = layout->font;
+		layoutfont = layout.font;
 
 	// Realize against environment font information
 	if (pars_[pit].getDepth()) {
@@ -136,7 +136,7 @@ void Text::setCharFont(Buffer const & buffer, pit_type pit,
 		       pars_[tp].getDepth()) {
 			tp = outerHook(tp, paragraphs());
 			if (tp != pit_type(paragraphs().size()))
-				layoutfont.realize(pars_[tp].layout()->font);
+				layoutfont.realize(pars_[tp].layout().font);
 		}
 	}
 
@@ -199,14 +199,14 @@ void Text::setLayout(Buffer const & buffer, pit_type start, pit_type end,
 	BOOST_ASSERT(start != end);
 
 	BufferParams const & bufparams = buffer.params();
-	LayoutPtr const & lyxlayout = bufparams.getTextClass()[layout];
+	Layout const & lyxlayout = bufparams.documentClass()[layout];
 
 	for (pit_type pit = start; pit != end; ++pit) {
 		Paragraph & par = pars_[pit];
 		par.applyLayout(lyxlayout);
-		if (lyxlayout->margintype == MARGIN_MANUAL)
+		if (lyxlayout.margintype == MARGIN_MANUAL)
 			par.setLabelWidthString(par.translateIfPossible(
-				lyxlayout->labelstring(), buffer.params()));
+				lyxlayout.labelstring(), buffer.params()));
 	}
 }
 
@@ -218,14 +218,14 @@ void Text::setLayout(Cursor & cur, docstring const & layout)
 	// special handling of new environment insets
 	BufferView & bv = cur.bv();
 	BufferParams const & params = bv.buffer().params();
-	LayoutPtr const & lyxlayout = params.getTextClass()[layout];
-	if (lyxlayout->is_environment) {
+	Layout const & lyxlayout = params.documentClass()[layout];
+	if (lyxlayout.is_environment) {
 		// move everything in a new environment inset
 		LYXERR(Debug::DEBUG, "setting layout " << to_utf8(layout));
 		lyx::dispatch(FuncRequest(LFUN_LINE_BEGIN));
 		lyx::dispatch(FuncRequest(LFUN_LINE_END_SELECT));
 		lyx::dispatch(FuncRequest(LFUN_CUT));
-		Inset * inset = new InsetEnvironment(params, layout);
+		Inset * inset = new InsetEnvironment(bv.buffer(), layout);
 		insertInset(cur, inset);
 		//inset->edit(cur, true);
 		//lyx::dispatch(FuncRequest(LFUN_PASTE));
@@ -244,7 +244,7 @@ void Text::setLayout(Cursor & cur, docstring const & layout)
 static bool changeDepthAllowed(Text::DEPTH_CHANGE type,
 			Paragraph const & par, int max_depth)
 {
-	if (par.layout()->labeltype == LABEL_BIBLIO)
+	if (par.layout().labeltype == LABEL_BIBLIO)
 		return false;
 	int const depth = par.params().depth();
 	if (type == Text::INC_DEPTH && depth < max_depth)
@@ -308,9 +308,9 @@ void Text::setFont(Cursor & cur, Font const & font, bool toggleall)
 	FontInfo layoutfont;
 	pit_type pit = cur.pit();
 	if (cur.pos() < pars_[pit].beginOfBody())
-		layoutfont = getLabelFont(cur.buffer(), pars_[pit]);
+		layoutfont = labelFont(cur.buffer(), pars_[pit]);
 	else
-		layoutfont = getLayoutFont(cur.buffer(), pit);
+		layoutfont = layoutFont(cur.buffer(), pit);
 
 	// Update current font
 	cur.real_current_font.update(font,
@@ -360,7 +360,7 @@ void Text::setFont(BufferView const & bv, CursorSlice const & begin,
 			setInsetFont(bv, pit, pos, font, toggleall);
 		}
 		TextMetrics const & tm = bv.textMetrics(this);
-		Font f = tm.getDisplayFont(pit, pos);
+		Font f = tm.displayFont(pit, pos);
 		f.update(font, language, toggleall);
 		setCharFont(buffer, pit, pos, f, tm.font_);
 	}
@@ -452,7 +452,7 @@ void Text::setParagraphs(Cursor & cur, docstring arg, bool merge)
 		Paragraph & par = pars_[pit];
 		ParagraphParameters params = par.params();
 		params.read(argument, merge);
-		par.params().apply(params, *par.layout());
+		par.params().apply(params, par.layout());
 	}
 }
 
@@ -470,8 +470,7 @@ void Text::setParagraphs(Cursor & cur, ParagraphParameters const & p)
 	for (pit_type pit = cur.selBegin().pit(), end = cur.selEnd().pit();
 	     pit <= end; ++pit) {
 		Paragraph & par = pars_[pit];
-		Layout const & layout = *(par.layout());
-		par.params().apply(p, layout);
+		par.params().apply(p, par.layout());
 	}	
 }
 
@@ -525,9 +524,11 @@ void Text::insertStringAsParagraphs(Cursor & cur, docstring const & str)
 bool Text::setCursor(Cursor & cur, pit_type par, pos_type pos,
 			bool setfont, bool boundary)
 {
+	TextMetrics const & tm = cur.bv().textMetrics(this);
+	bool const update_needed = !tm.contains(par);
 	Cursor old = cur;
 	setCursorIntern(cur, par, pos, setfont, boundary);
-	return cur.bv().checkDepm(cur, old);
+	return cur.bv().checkDepm(cur, old) || update_needed;
 }
 
 
@@ -709,10 +710,20 @@ bool Text::cursorVisLeft(Cursor & cur, bool skip_inset)
 		// position 'left_pos' + 1.
 		if (new_pos_is_RTL) {
 			new_pos = left_pos + 1;
-			// if the position *after* left_pos is not RTL, set boundary to 
-			// true (we want to be *after* left_pos, not before left_pos + 1!)
-			new_boundary = !cur.paragraph().getFontSettings(
-				cur.bv().buffer().params(), new_pos).isVisibleRightToLeft();
+			// set the boundary to true in two situations:
+			if (
+			// 1. if new_pos is now lastpos (which means that we're moving left
+			// to the end of an RTL chunk which is at the end of an LTR 
+			// paragraph);
+				new_pos == cur.lastpos()
+			// 2. if the position *after* left_pos is not RTL (we want to be 
+			// *after* left_pos, not before left_pos + 1!)
+				|| !cur.paragraph().getFontSettings(cur.bv().buffer().params(),
+						new_pos).isVisibleRightToLeft()
+			)
+				new_boundary = true;
+			else // set the boundary to false
+				new_boundary = false;
 		}
 		// Otherwise (if the character at position 'left_pos' is LTR), then
 		// moving to the left of it is as easy as setting the new position
@@ -789,10 +800,20 @@ bool Text::cursorVisRight(Cursor & cur, bool skip_inset)
 		// position 'right_pos' + 1.
 		if (!new_pos_is_RTL) {
 			new_pos = right_pos + 1;
-			// if the position *after* right_pos is RTL, set boundary to 
-			// true (we want to be *after* right_pos, not before right_pos + 1!)
-			new_boundary = cur.paragraph().getFontSettings(
-				cur.bv().buffer().params(), new_pos).isVisibleRightToLeft();
+			// set the boundary to true in two situations:
+			if (
+			// 1. if new_pos is now lastpos (which means that we're moving 
+			// right to the end of an LTR chunk which is at the end of an
+			// RTL paragraph);
+				new_pos == cur.lastpos()
+			// 2. if the position *after* right_pos is RTL (we want to be 
+			// *after* right_pos, not before right_pos + 1!)
+				|| cur.paragraph().getFontSettings(cur.bv().buffer().params(),
+						new_pos).isVisibleRightToLeft()
+			)
+				new_boundary = true;
+			else // set the boundary to false
+				new_boundary = false;
 		}
 		// Otherwise (if the character at position 'right_pos' is RTL), then
 		// moving to the right of it is as easy as setting the new position