X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextMetrics.cpp;h=0b3bfc1d16a79ce057eb979d2231dda30cfd9974;hb=dd1a85a2baf0aeb867a634ade47275b952d38354;hp=1ee6a51b38bec5bd832579320ff74e6c7b520f3d;hpb=b2912339d06b403b95351f1d00366da13fbdc4f6;p=lyx.git

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index 1ee6a51b38..0b3bfc1d16 100644
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -880,6 +880,10 @@ bool TextMetrics::breakRow(Row & row, int const right_margin) const
 {
 	LATTEST(row.empty());
 	Paragraph const & par = text_->getPar(row.pit());
+	Buffer const & buf = text_->inset().buffer();
+	BookmarksSection::BookmarkPosList bpl =
+		theSession().bookmarks().bookmarksInPar(buf.fileName(), par.id());
+
 	pos_type const end = par.size();
 	pos_type const pos = row.pos();
 	pos_type const body_pos = par.beginOfBody();
@@ -906,7 +910,24 @@ bool TextMetrics::breakRow(Row & row, int const right_margin) const
 	// or the end of the par, then build a representation of the row.
 	pos_type i = pos;
 	FontIterator fi = FontIterator(*this, par, row.pit(), pos);
-	while (i < end && (i == pos || row.width() <= width)) {
+	// The real stopping condition is a few lines below.
+	while (true) {
+		// Firstly, check whether there is a bookmark here.
+		if (lyxrc.bookmarks_visibility == LyXRC::BMK_INLINE)
+			for (auto const & bp_p : bpl)
+				if (bp_p.second == i) {
+					Font f = *fi;
+					f.fontInfo().setColor(Color_bookmark);
+					// ❶ U+2776 DINGBAT NEGATIVE CIRCLED DIGIT ONE
+					char_type const ch = 0x2775 + bp_p.first;
+					row.addVirtual(i, docstring(1, ch), f, Change());
+				}
+
+		// The stopping condition is here so that the display of a
+		// bookmark can take place at paragraph start too.
+		if (i >= end || (i != pos && row.width() > width))
+			break;
+
 		char_type c = par.getChar(i);
 		// The most special cases are handled first.
 		if (par.isInset(i)) {
@@ -1000,9 +1021,7 @@ bool TextMetrics::breakRow(Row & row, int const right_margin) const
 		// in the paragraph.
 		Font f(text_->layoutFont(row.pit()));
 		f.fontInfo().setColor(Color_paragraphmarker);
-		BufferParams const & bparams
-			= text_->inset().buffer().params();
-		f.setLanguage(par.getParLanguage(bparams));
+		f.setLanguage(par.getParLanguage(buf.params()));
 		// ¶ U+00B6 PILCROW SIGN
 		row.addVirtual(end, docstring(1, char_type(0x00B6)), f, change);
 	}
@@ -1954,9 +1973,10 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type const pit, int const
 			row_x + row.left_x() < bv_->leftMargin(),
 			row_x + row.right_x() > bv_->workWidth() - bv_->rightMargin());
 		// indicate bookmarks presence in margin
-		for (auto const & bp_p : bpl)
-			if (bp_p.second >= row.pos() && bp_p.second < row.endpos())
-				rp.paintBookmark(bp_p.first);
+		if (lyxrc.bookmarks_visibility == LyXRC::BMK_MARGIN)
+			for (auto const & bp_p : bpl)
+				if (bp_p.second >= row.pos() && bp_p.second < row.endpos())
+					rp.paintBookmark(bp_p.first);
 
 		y += row.descent();