Fix bug #10177.

The left margin given at class level should apply only to the main text.

(cherry picked from commit a007b65202cbc103e3e7868dcde3e754bfcd276d)

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index 20ff864ed8ad7f02f101cdaf7bc126d1c3ceabae..cacf2e7ea65326ff73312eebe12b97e01d4df631 100644 (file)
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -1618,10 +1618,10 @@ int TextMetrics::leftMargin(pit_type const pit, pos_type const pos) const
 
        int l_margin = 0;
 
-       if (text_->isMainText())
+       if (text_->isMainText()) {
                l_margin += bv_->leftMargin();
-
-       l_margin += bfm.signedWidth(tclass.leftmargin());
+               l_margin += bfm.signedWidth(tclass.leftmargin());
+       }
 
        int depth = par.getDepth();
        if (depth != 0) {

diff --git a/status.23x b/status.23x
index 812698f7df007db2f04e6e63f817b6748a96f341..295de4887b931163f75bc57b8a01f077e5c1aff3 100644 (file)
--- a/status.23x
+++ b/status.23x
@@ -159,6 +159,8 @@ What's new
 
 - Fix some missing screen updates (bug 11323, regression in 2.3.1).
 
+- Allow adjustment of margin settings in InsetLayout (bug 10177).
+
 
 * INTERNALS