X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextMetrics.cpp;h=0b3bfc1d16a79ce057eb979d2231dda30cfd9974;hb=b08a653f3549e08fffc5318c87da305651ecc197;hp=c31247842e054e50eef2efba11cf36764daeda46;hpb=3f093dd10397de42b6a8ae74cc52147776debb73;p=lyx.git

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index c31247842e..0b3bfc1d16 100644
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -913,14 +913,15 @@ bool TextMetrics::breakRow(Row & row, int const right_margin) const
 	// The real stopping condition is a few lines below.
 	while (true) {
 		// Firstly, check whether there is a bookmark here.
-		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());
-			}
+		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.
@@ -1876,6 +1877,9 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type const pit, int const
 	if (text_->isRTL(pit))
 		swap(pi.leftx, pi.rightx);
 
+	BookmarksSection::BookmarkPosList bpl =
+		theSession().bookmarks().bookmarksInPar(bv_->buffer().fileName(), pm.par().id());
+
 	for (size_t i = 0; i != nrows; ++i) {
 
 		Row const & row = pm.rows()[i];
@@ -1920,6 +1924,9 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type const pit, int const
 			// Paint only the insets if the text itself is
 			// unchanged.
 			rp.paintOnlyInsets();
+			rp.paintTooLargeMarks(
+				row_x + row.left_x() < bv_->leftMargin(),
+				row_x + row.right_x() > bv_->workWidth() - bv_->rightMargin());
 			row.changed(false);
 			y += row.descent();
 			continue;
@@ -1962,8 +1969,15 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type const pit, int const
 		if (i == nrows - 1)
 			rp.paintLast();
 		rp.paintText();
-		rp.paintTooLargeMarks(row_x + row.left_x() < 0,
-				      row_x + row.right_x() > bv_->workWidth());
+		rp.paintTooLargeMarks(
+			row_x + row.left_x() < bv_->leftMargin(),
+			row_x + row.right_x() > bv_->workWidth() - bv_->rightMargin());
+		// indicate bookmarks presence in margin
+		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();
 
 #if 0