From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Tue, 11 Apr 2023 12:19:20 +0000 (+0200)
Subject: Revert "Automatically adjust tab stop width"
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=d828728cc95405498613cea5ef521a6c3737db01;p=features.git

Revert "Automatically adjust tab stop width"

The fix is more complicated than that

This reverts commit bb16efc07ef76246616aacea7bb40ac260b26beb.
---

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index 068eb31200..f4241181c2 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