[LyX/master] Make LABEL_MANUAL label breakable when larger than the screen.

Jean-Marc Lasgouttes lasgouttes at lyx.org
Mon Jan 17 16:57:48 UTC 2022


commit da3c3796ee96473fbcede4c33545dc16fe53580d
Author: Jean-Marc Lasgouttes <lasgouttes at lyx.org>
Date:   Mon Jan 17 17:33:21 2022 +0100

    Make LABEL_MANUAL label breakable when larger than the screen.
    
    This is what the situation was in 2.3.X.
---
 src/Row.cpp         |    4 ++--
 src/Row.h           |    2 +-
 src/TextMetrics.cpp |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Row.cpp b/src/Row.cpp
index ef1495f..d1921a6 100644
--- a/src/Row.cpp
+++ b/src/Row.cpp
@@ -460,12 +460,12 @@ void Row::add(pos_type const pos, Inset const * ins, Dimension const & dim,
 
 
 void Row::add(pos_type const pos, char_type const c,
-              Font const & f, Change const & ch, bool can_break)
+              Font const & f, Change const & ch)
 {
 	if (!sameString(f, ch)) {
 		finalizeLast();
 		Element e(STRING, pos, f, ch);
-		e.row_flags = can_break ? CanBreakInside : Inline;
+		e.row_flags = CanBreakInside;
 		elements_.push_back(e);
 	}
 	back().str += c;
diff --git a/src/Row.h b/src/Row.h
index 62ee6cf..4c4bfce 100644
--- a/src/Row.h
+++ b/src/Row.h
@@ -250,7 +250,7 @@ public:
 		 Font const & f, Change const & ch);
 	///
 	void add(pos_type pos, char_type const c,
-	         Font const & f, Change const & ch, bool can_break);
+	         Font const & f, Change const & ch);
 	///
 	void addVirtual(pos_type pos, docstring const & s,
 			Font const & f, Change const & ch);
diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index 19a5e8f..f68292a 100644
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -916,10 +916,10 @@ Row TextMetrics::tokenizeParagraph(pit_type const pit) const
 			// ⤶ U+2936 ARROW POINTING DOWNWARDS THEN CURVING LEFTWARDS
 			// ¶ U+00B6 PILCROW SIGN
 			char_type const screen_char = (c == 0x2028) ? 0x2936 : 0x00B6;
-			row.add(i, screen_char, *fi, par.lookupChange(i), i >= body_pos);
+			row.add(i, screen_char, *fi, par.lookupChange(i));
 		} else
 			// row elements before body are unbreakable
-			row.add(i, c, *fi, par.lookupChange(i), i >= body_pos);
+			row.add(i, c, *fi, par.lookupChange(i));
 
 		// add inline completion width
 		// draw logically behind the previous character


More information about the lyx-cvs mailing list