[LyX/master] Revert "Automatically adjust tab stop width"

Jean-Marc Lasgouttes lasgouttes at lyx.org
Tue Apr 11 11:14:21 UTC 2023


commit d828728cc95405498613cea5ef521a6c3737db01
Author: Jean-Marc Lasgouttes <lasgouttes at lyx.org>
Date:   Tue Apr 11 14:19:20 2023 +0200

    Revert "Automatically adjust tab stop width"
    
    The fix is more complicated than that
    
    This reverts commit bb16efc07ef76246616aacea7bb40ac260b26beb.
---
 src/TextMetrics.cpp |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index 068eb31..f424118 100644
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -899,13 +899,10 @@ Row TextMetrics::tokenizeParagraph(pit_type const pit) const
 			FontMetrics const & fm = theFontMetrics(text_->labelFont(par));
 			int const wid = fm.width(par.layout().labelsep);
 			row.addMarginSpace(i, wid, *fi, par.lookupChange(i));
-		} else if (c == '\t') {
-			// Make tab stop size adjust automatically depending on char number
-			int tabStopWidth = 4;
-			std::string s = std::string(tabStopWidth - i % tabStopWidth, ' ');
-			row.addSpace(i, theFontMetrics(*fi).width(from_ascii(s)),
+		} else if (c == '\t')
+			row.addSpace(i, theFontMetrics(*fi).width(from_ascii("    ")),
 			             *fi, par.lookupChange(i));
-		} else if (c == 0x2028 || c == 0x2029) {
+		else if (c == 0x2028 || c == 0x2029) {
 			/**
 			 * U+2028 LINE SEPARATOR
 			 * U+2029 PARAGRAPH SEPARATOR


More information about the lyx-cvs mailing list