sw/qa/extras/layout/data/tdf132599_frames_on_right_pages_no_hyphenation.fodt |
6 +++---
sw/qa/extras/layout/data/tdf132599_frames_on_same_page_hyphenation.fodt |
6 +++---
sw/qa/extras/layout/data/tdf132599_frames_on_same_page_no_hyphenation.fodt |
6 +++---
sw/qa/extras/layout/data/tdf132599_frames_on_spread_hyphenation.fodt |
6 +++---
4 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 016d61f529f9d9ec2520fb7a808da41cf17d7295
Author: László Németh <nem...@numbertext.org>
AuthorDate: Sat May 11 14:26:09 2024 +0200
Commit: René Engelhard <r...@debian.org>
CommitDate: Sat May 11 16:29:15 2024 +0200
tdf#132599 sw: fix unit tests for hyphenation-keep with frames
Fix en_US language of the test documents to be consistent with the
hyphenator condition in the related unit tests of
commit d4304cd0a4fedd0117fea3625dff1fca2945a0e6
"tdf132599 sw: fix hyphenation-keep for linked frames, also for spreads".
The problem was reported by René Engelhard.
Change-Id: Iee7fd83aea294fb32c5f358cd25a1d1cb9a76d27
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167512
Reviewed-by: René Engelhard <r...@debian.org>
Tested-by: Jenkins
Tested-by: René Engelhard <r...@debian.org>
diff --git
a/sw/qa/extras/layout/data/tdf132599_frames_on_right_pages_no_hyphenation.fodt
b/sw/qa/extras/layout/data/tdf132599_frames_on_right_pages_no_hyphenation.fodt
index 5d8f21a81c26..c3df7b605f3a 100644
---
a/sw/qa/extras/layout/data/tdf132599_frames_on_right_pages_no_hyphenation.fodt
+++
b/sw/qa/extras/layout/data/tdf132599_frames_on_right_pages_no_hyphenation.fodt
@@ -129,11 +129,11 @@
<style:paragraph-properties style:text-autospace="ideograph-alpha"
style:line-break="strict" loext:tab-stop-distance="0cm"
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="hu" fo:country="HU" 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="Lohit Devanagari1" style:font-size-complex="12pt"
style:language-complex="hi" style:country-complex="IN"/>
+ <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="Lohit Devanagari1" style:font-size-complex="12pt"
style:language-complex="hi" style:country-complex="IN"/>
</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="1.251cm" 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="hu" fo:country="HU" 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="Lohit Devanagari1" style:font-size-complex="12pt"
style:language-complex="hi" style:country-complex="IN" 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: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="Lohit Devanagari1" style:font-size-complex="12pt"
style:language-complex="hi" style:country-complex="IN" 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"/>
@@ -210,7 +210,7 @@
<office:text text:use-soft-page-breaks="true">
<text:p text:style-name="P1"><draw:frame draw:style-name="fr1"
draw:name="Frame1" text:anchor-type="paragraph" svg:x="-0.554cm"
svg:y="-0.67cm" svg:width="8.486cm" svg:height="25.553cm" draw:z-index="1">
<draw:text-box draw:chain-next-name="Frame2">
- <text:p text:style-name="P2">out there in space. It merely moves along
in space inertially. Even just one inch above the surface of the Earth is
space, except that it has an atmosphere. <text:s/>Earth is. The Earth is no
different to any other celestial body</text:p>
+ <text:p text:style-name="P2">Space. It merely moves along in space
inertially. Even just one inch above the surface of the Earth is space, except
that it has an atmosphere. <text:s/>Earth is. The Earth is no different to any
other celestial body</text:p>
</draw:text-box>
</draw:frame></text:p>
<text:p text:style-name="P3"/>
diff --git
a/sw/qa/extras/layout/data/tdf132599_frames_on_same_page_hyphenation.fodt
b/sw/qa/extras/layout/data/tdf132599_frames_on_same_page_hyphenation.fodt
index 34933cba9007..f92358ad0ea3 100644
--- a/sw/qa/extras/layout/data/tdf132599_frames_on_same_page_hyphenation.fodt
+++ b/sw/qa/extras/layout/data/tdf132599_frames_on_same_page_hyphenation.fodt
@@ -124,11 +124,11 @@
<style:paragraph-properties style:text-autospace="ideograph-alpha"
style:line-break="strict" loext:tab-stop-distance="0cm"
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="hu" fo:country="HU" 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="Lohit Devanagari1" style:font-size-complex="12pt"
style:language-complex="hi" style:country-complex="IN"/>
+ <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="Lohit Devanagari1" style:font-size-complex="12pt"
style:language-complex="hi" style:country-complex="IN"/>
</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="1.251cm" 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="hu" fo:country="HU" 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="Lohit Devanagari1" style:font-size-complex="12pt"
style:language-complex="hi" style:country-complex="IN" 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: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="Lohit Devanagari1" style:font-size-complex="12pt"
style:language-complex="hi" style:country-complex="IN" 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"/>
@@ -198,7 +198,7 @@
<office:text>
<text:p text:style-name="Standard"><draw:frame draw:style-name="fr1"
draw:name="Frame1" text:anchor-type="paragraph" svg:x="-0.554cm"
svg:y="-0.67cm" svg:width="8.486cm" svg:height="25.553cm" draw:z-index="0">
<draw:text-box draw:chain-next-name="Frame2">
- <text:p text:style-name="P1">out there in space. It merely moves along
in space inertially. Even just one inch above the surface of the Earth is
space, except that it has an atmosphere. <text:s/>Earth is. The Earth is no
different to any other celestial body</text:p>
+ <text:p text:style-name="P1">Space. It merely moves along in space
inertially. Even just one inch above the surface of the Earth is space, except
that it has an atmosphere. <text:s/>Earth is. The Earth is no different to any
other celestial body</text:p>
</draw:text-box>
</draw:frame><draw:frame draw:style-name="fr2" draw:name="Frame2"
text:anchor-type="paragraph" svg:x="8.999cm" svg:y="-0.61cm"
svg:width="8.486cm" draw:z-index="1">
<draw:text-box fo:min-height="17.699cm">
diff --git
a/sw/qa/extras/layout/data/tdf132599_frames_on_same_page_no_hyphenation.fodt
b/sw/qa/extras/layout/data/tdf132599_frames_on_same_page_no_hyphenation.fodt
index 75a0dc00ce6e..64bd33b5aada 100644
--- a/sw/qa/extras/layout/data/tdf132599_frames_on_same_page_no_hyphenation.fodt
+++ b/sw/qa/extras/layout/data/tdf132599_frames_on_same_page_no_hyphenation.fodt
@@ -124,11 +124,11 @@
<style:paragraph-properties style:text-autospace="ideograph-alpha"
style:line-break="strict" loext:tab-stop-distance="0cm"
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="hu" fo:country="HU" 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="Lohit Devanagari1" style:font-size-complex="12pt"
style:language-complex="hi" style:country-complex="IN"/>
+ <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="Lohit Devanagari1" style:font-size-complex="12pt"
style:language-complex="hi" style:country-complex="IN"/>
</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="1.251cm" 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="hu" fo:country="HU" 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="Lohit Devanagari1" style:font-size-complex="12pt"
style:language-complex="hi" style:country-complex="IN" 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: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="Lohit Devanagari1" style:font-size-complex="12pt"
style:language-complex="hi" style:country-complex="IN" 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"/>
@@ -198,7 +198,7 @@
<office:text>
<text:p text:style-name="Standard"><draw:frame draw:style-name="fr1"
draw:name="Frame1" text:anchor-type="paragraph" svg:x="-0.554cm"
svg:y="-0.67cm" svg:width="8.486cm" svg:height="25.553cm" draw:z-index="0">
<draw:text-box draw:chain-next-name="Frame2">
- <text:p text:style-name="P1">out there in space. It merely moves along
in space inertially. Even just one inch above the surface of the Earth is
space, except that it has an atmosphere. <text:s/>Earth is. The Earth is no
different to any other celestial body</text:p>
+ <text:p text:style-name="P1">Space. It merely moves along in space
inertially. Even just one inch above the surface of the Earth is space, except
that it has an atmosphere. <text:s/>Earth is. The Earth is no different to any
other celestial body</text:p>
</draw:text-box>
</draw:frame><draw:frame draw:style-name="fr2" draw:name="Frame2"
text:anchor-type="paragraph" svg:x="8.999cm" svg:y="-0.61cm"
svg:width="8.486cm" draw:z-index="1">
<draw:text-box fo:min-height="17.699cm">
diff --git
a/sw/qa/extras/layout/data/tdf132599_frames_on_spread_hyphenation.fodt
b/sw/qa/extras/layout/data/tdf132599_frames_on_spread_hyphenation.fodt
index 92cf5ef4773b..b1c16ad6db59 100644
--- a/sw/qa/extras/layout/data/tdf132599_frames_on_spread_hyphenation.fodt
+++ b/sw/qa/extras/layout/data/tdf132599_frames_on_spread_hyphenation.fodt
@@ -129,11 +129,11 @@
<style:paragraph-properties style:text-autospace="ideograph-alpha"
style:line-break="strict" loext:tab-stop-distance="0cm"
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="hu" fo:country="HU" 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="Lohit Devanagari1" style:font-size-complex="12pt"
style:language-complex="hi" style:country-complex="IN"/>
+ <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="Lohit Devanagari1" style:font-size-complex="12pt"
style:language-complex="hi" style:country-complex="IN"/>
</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="1.251cm" 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="hu" fo:country="HU" 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="Lohit Devanagari1" style:font-size-complex="12pt"
style:language-complex="hi" style:country-complex="IN" 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: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="Lohit Devanagari1" style:font-size-complex="12pt"
style:language-complex="hi" style:country-complex="IN" 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"/>
@@ -213,7 +213,7 @@
<office:text text:use-soft-page-breaks="true">
<text:p text:style-name="P1"><draw:frame draw:style-name="fr1"
draw:name="Frame1" text:anchor-type="paragraph" svg:x="-0.554cm"
svg:y="-0.67cm" svg:width="8.486cm" svg:height="13.681cm" draw:z-index="0">
<draw:text-box draw:chain-next-name="Frame2">
- <text:p text:style-name="P2">out there in space. It merely moves along
in space inertially. Even just one inch above the surface of the Earth is
space, except that it has an atmosphere. <text:s/>Earth is. The Earth is no
different to any other celestial body</text:p>
+ <text:p text:style-name="P2">Space. It merely moves along in space
inertially. Even just one inch above the surface of the Earth is space, except
that it has an atmosphere. <text:s/>Earth is. The Earth is no different to any
other celestial body</text:p>
</draw:text-box>
</draw:frame></text:p>
<text:p text:style-name="P3"><draw:frame draw:style-name="fr2"
draw:name="Frame2" text:anchor-type="paragraph" svg:x="8.999cm" svg:y="-0.61cm"
svg:width="8.486cm" svg:height="13.085cm" draw:z-index="1">
