sw/qa/extras/layout/data/tdf146081-prop-spacing.fodt | 112 +++++++++++++++++++
sw/qa/extras/layout/layout3.cxx | 32 +++++
sw/source/core/text/itrform2.cxx | 15 ++
3 files changed, 159 insertions(+)
New commits:
commit c012c74e69360dd78890c1d935b802c0baf79da2
Author: Jonathan Clark <jonat...@libreoffice.org>
AuthorDate: Wed Jul 10 04:03:26 2024 -0600
Commit: Jonathan Clark <jonat...@libreoffice.org>
CommitDate: Wed Jul 10 21:12:49 2024 +0200
tdf#146081 sw: Fix inconsistent prop line spacing
Previously, when using proportional line spacing <100%, Writer applied
inconsistent height and ascent adjustments to the first and non-first
lines of paragraphs. This caused Writer to render text at inconsistent
vertical offsets.
Height and ascent adjustments are now consistent.
Change-Id: I303d6aa379007f3fa3e8c1ebb981ef205864708a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170307
Reviewed-by: Jonathan Clark <jonat...@libreoffice.org>
Tested-by: Jenkins
diff --git a/sw/qa/extras/layout/data/tdf146081-prop-spacing.fodt
b/sw/qa/extras/layout/data/tdf146081-prop-spacing.fodt
new file mode 100644
index 000000000000..78da839f1974
--- /dev/null
+++ b/sw/qa/extras/layout/data/tdf146081-prop-spacing.fodt
@@ -0,0 +1,112 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<office:document xmlns:css3t="http://www.w3.org/TR/css3-text/";
xmlns:grddl="http://www.w3.org/2003/g/data-view#";
xmlns:xhtml="http://www.w3.org/1999/xhtml";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:xforms="http://www.w3.org/2002/xforms";
xmlns:dom="http://www.w3.org/2001/xml-events";
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
xmlns:math="http://www.w3.org/1998/Math/MathML";
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
xmlns:ooo="http://openoffice.org/2004/office";
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
xmlns:ooow="http://openoffice.org/2004/writer";
xmlns:xlink="http://www.w3.org/1999/xlink";
xmlns:drawooo="http://openoffice.org/2010/draw";
xmlns:oooc="http://openoffice.org/2004/calc";
xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:c
alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2"
xmlns:tableooo="http://openoffice.org/2009/table";
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
xmlns:rpt="http://openoffice.org/2005/report";
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
xmlns:officeooo="http://openoffice.org/2009/office";
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0"
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:
meta:1.0"
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
+
<office:meta><meta:creation-date>2024-07-10T03:37:36.946853251</meta:creation-date><dc:date>2024-07-10T03:41:48.895381288</dc:date><meta:editing-duration>PT4M13S</meta:editing-duration><meta:editing-cycles>1</meta:editing-cycles><meta:document-statistic
meta:table-count="0" meta:image-count="0" meta:object-count="0"
meta:page-count="1" meta:paragraph-count="1" meta:word-count="1"
meta:character-count="39"
meta:non-whitespace-character-count="39"/><meta:generator>LibreOfficeDev/25.2.0.0.alpha0$Linux_X86_64
LibreOffice_project/c11c5f9b87dfb7a7620341c2bffbd73b4d8eca58</meta:generator></office:meta>
+ <office:font-face-decls>
+ <style:font-face style:name="Liberation Serif" svg:font-family="'Liberation
Serif'" style:font-family-generic="roman" style:font-pitch="variable"/>
+ <style:font-face style:name="Noto Serif CJK SC" svg:font-family="'Noto Serif
CJK SC'" style:font-family-generic="system" style:font-pitch="variable"/>
+ <style:font-face style:name="Tahoma1" svg:font-family="Tahoma"
style:font-family-generic="system" style:font-pitch="variable"/>
+ </office:font-face-decls>
+ <office:styles>
+ <style:default-style style:family="graphic">
+ <style:graphic-properties svg:stroke-color="#3465a4"
draw:fill-color="#729fcf" fo:wrap-option="no-wrap" draw:shadow-offset-x="8.5pt"
draw:shadow-offset-y="8.5pt" draw:start-line-spacing-horizontal="8.02pt"
draw:start-line-spacing-vertical="8.02pt"
draw:end-line-spacing-horizontal="8.02pt"
draw:end-line-spacing-vertical="8.02pt" style:flow-with-text="false"/>
+ <style:paragraph-properties style:text-autospace="ideograph-alpha"
style:line-break="strict" loext:tab-stop-distance="0pt"
style:writing-mode="lr-tb" style:font-independent-line-spacing="false">
+ <style:tab-stops/>
+ </style:paragraph-properties>
+ <style:text-properties style:use-window-font-color="true"
loext:opacity="0%" style:font-name="Liberation Serif" fo:font-size="12pt"
fo:language="en" fo:country="US" style:letter-kerning="true"
style:font-name-asian="Noto Serif CJK SC" style:font-size-asian="10.5pt"
style:language-asian="zh" style:country-asian="CN"
style:font-name-complex="Tahoma1" style:font-size-complex="12pt"
style:language-complex="ar" style:country-complex="SA"/>
+ </style:default-style>
+ <style:default-style style:family="paragraph">
+ <style:paragraph-properties fo:orphans="2" fo:widows="2"
fo:hyphenation-ladder-count="no-limit" fo:hyphenation-keep="auto"
loext:hyphenation-keep-type="column" style:text-autospace="ideograph-alpha"
style:punctuation-wrap="hanging" style:line-break="strict"
style:tab-stop-distance="35.46pt" style:writing-mode="page"/>
+ <style:text-properties style:use-window-font-color="true"
loext:opacity="0%" style:font-name="Liberation Serif" fo:font-size="12pt"
fo:language="en" fo:country="US" style:letter-kerning="true"
style:font-name-asian="Noto Serif CJK SC" style:font-size-asian="10.5pt"
style:language-asian="zh" style:country-asian="CN"
style:font-name-complex="Tahoma1" style:font-size-complex="12pt"
style:language-complex="ar" style:country-complex="SA" fo:hyphenate="false"
fo:hyphenation-remain-char-count="2" fo:hyphenation-push-char-count="2"
loext:hyphenation-no-caps="false" loext:hyphenation-no-last-word="false"
loext:hyphenation-word-char-count="5" loext:hyphenation-zone="no-limit"/>
+ </style:default-style>
+ <style:default-style style:family="table">
+ <style:table-properties table:border-model="collapsing"/>
+ </style:default-style>
+ <style:default-style style:family="table-row">
+ <style:table-row-properties fo:keep-together="auto"/>
+ </style:default-style>
+ <style:style style:name="Standard" style:family="paragraph"
style:class="text"/>
+ <text:outline-style style:name="Outline">
+ <text:outline-level-style text:level="1" style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="2" style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="3" style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="4" style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="5" style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="6" style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="7" style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="8" style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="9" style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="10" style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ </text:outline-style>
+ <text:notes-configuration text:note-class="footnote" style:num-format="1"
text:start-value="0" text:footnotes-position="page"
text:start-numbering-at="document"/>
+ <text:notes-configuration text:note-class="endnote" style:num-format="i"
text:start-value="0"/>
+ <text:linenumbering-configuration text:number-lines="false"
text:offset="14.14pt" style:num-format="1" text:number-position="left"
text:increment="5"/>
+ </office:styles>
+ <office:automatic-styles>
+ <style:style style:name="P1" style:family="paragraph"
style:parent-style-name="Standard">
+ <style:paragraph-properties fo:line-height="60%"/>
+ <style:text-properties fo:font-size="60pt" style:font-size-asian="60pt"
style:font-size-complex="60pt"/>
+ </style:style>
+ <style:page-layout style:name="pm1">
+ <style:page-layout-properties fo:page-width="595.3pt"
fo:page-height="841.89pt" style:num-format="1"
style:print-orientation="portrait" fo:margin-top="56.69pt"
fo:margin-bottom="56.69pt" fo:margin-left="56.69pt" fo:margin-right="56.69pt"
style:writing-mode="lr-tb" style:footnote-max-height="0pt"
loext:margin-gutter="0pt">
+ <style:footnote-sep style:width="0.51pt"
style:distance-before-sep="2.86pt" style:distance-after-sep="2.86pt"
style:line-style="solid" style:adjustment="left" style:rel-width="25%"
style:color="#000000"/>
+ </style:page-layout-properties>
+ <style:header-style/>
+ <style:footer-style/>
+ </style:page-layout>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page style:name="Standard" style:page-layout-name="pm1"/>
+ </office:master-styles>
+ <office:body>
+ <office:text>
+ <text:sequence-decls>
+ <text:sequence-decl text:display-outline-level="0"
text:name="Illustration"/>
+ <text:sequence-decl text:display-outline-level="0" text:name="Table"/>
+ <text:sequence-decl text:display-outline-level="0" text:name="Text"/>
+ <text:sequence-decl text:display-outline-level="0" text:name="Drawing"/>
+ <text:sequence-decl text:display-outline-level="0" text:name="Figure"/>
+ </text:sequence-decls>
+ <text:p
text:style-name="P1">AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA</text:p>
+ </office:text>
+ </office:body>
+</office:document>
\ No newline at end of file
diff --git a/sw/qa/extras/layout/layout3.cxx b/sw/qa/extras/layout/layout3.cxx
index d10e0c78a2f7..d532c1dffec8 100644
--- a/sw/qa/extras/layout/layout3.cxx
+++ b/sw/qa/extras/layout/layout3.cxx
@@ -3081,6 +3081,38 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3,
TestTdf56408NoUnderflow)
u"עברית English"_ustr);
}
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf146081)
+{
+ // Verifies that proportional line spacing is consistent with the
+ // PropLineSpacingShrinksFirstLine compatibility flag set
+ createSwDoc("tdf146081-prop-spacing.fodt");
+ auto pXmlDoc = parseLayoutDump();
+
+ SwTwips nTotalHeight
+ = getXPath(pXmlDoc, "/root/page/body/txt/infos/bounds"_ostr,
"height"_ostr).toInt32();
+
+ SwTwips nHeight1
+ = getXPath(pXmlDoc,
"/root/page/body/txt/SwParaPortion/SwLineLayout[1]"_ostr, "height"_ostr)
+ .toInt32();
+ SwTwips nHeight2
+ = getXPath(pXmlDoc,
"/root/page/body/txt/SwParaPortion/SwLineLayout[2]"_ostr, "height"_ostr)
+ .toInt32();
+ SwTwips nHeight3
+ = getXPath(pXmlDoc,
"/root/page/body/txt/SwParaPortion/SwLineLayout[3]"_ostr, "height"_ostr)
+ .toInt32();
+ SwTwips nHeight4
+ = getXPath(pXmlDoc,
"/root/page/body/txt/SwParaPortion/SwLineLayout[4]"_ostr, "height"_ostr)
+ .toInt32();
+
+ // All of the lines must have the same height
+ CPPUNIT_ASSERT_EQUAL(nHeight1, nHeight2);
+ CPPUNIT_ASSERT_EQUAL(nHeight1, nHeight3);
+ CPPUNIT_ASSERT_EQUAL(nHeight1, nHeight4);
+
+ // The total height of the paragraph must be equal to the sum of all lines
+ CPPUNIT_ASSERT_EQUAL(nTotalHeight, nHeight1 * 4);
+}
+
} // end of anonymous namespace
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 2f0811364665..b4256d85888f 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -2333,6 +2333,8 @@ void SwTextFormatter::CalcRealHeight( bool bNewLine )
if( nTmp < 50 )
nTmp = nTmp ? 50 : 100;
+ bool bPropLineShrinks = (nTmp < 100);
+
// extend line height by (nPropLineSpace - 100)
percent of the font height
nTmp -= 100;
nTmp *= m_pCurr->GetTextHeight();
@@ -2341,6 +2343,19 @@ void SwTextFormatter::CalcRealHeight( bool bNewLine )
if (nTmp < 1)
nTmp = 1;
nLineHeight = nTmp;
+
+ // tdf#146081: The height and ascent of the first line
may have been
+ // adjusted above. In order to have consistent line
spacing when rendering,
+ // the same adjustments must be made to the following
lines.
+ if (bPropLineShrinks
+ &&
GetTextFrame()->GetDoc().getIDocumentSettingAccess().get(
+
DocumentSettingId::PROP_LINE_SPACING_SHRINKS_FIRST_LINE))
+ {
+ SwTwips nAsc = (4 * nLineHeight) / 5; // 80%
+ m_pCurr->SetAscent(nAsc);
+ m_pCurr->Height(nLineHeight, false);
+ m_pInf->GetParaPortion()->SetFixLineHeight();
+ }
break;
}
case SvxInterLineSpaceRule::Fix:
