tdf#106733 tdf#158885 add "Exclude from hyphenation, Compound characters...

Document new and updated hyphenation options of LO 24.8:

New options:

– "Exclude from hyphenation" (Character->Position);

– "Compound constituent characters at line end" (Paragraph->Text Flow).

Updated (moved and negated) options (Paragraph->Text Flow):

– "Hyphenate words in CAPS" and

– "Hyphenate last word".

Follow-up to core commit 3a332d9f1cacb3c6f81fcf6c08afa51d091ddff4
"tdf#158885 cui offapi sw xmloff: fix hyphenation at stem boundary",
core commit 03c5a31a0f374a90fbc821718c14dc5f8a385adf
"tdf#106733 sw cui: add CharNoHyphenation checkbox",
core commit b5e275f47a54bd7fee39dad516a433fde5be872d
"tdf#106733 sw: implement CharNoHyphenation"
and core commit 73bd04a71e741788a2f2f3b26cc46ddb6a361372
"tdf#106733 xmloff: keep fo:hyphenate in character formatting".

Change-Id: Ief37df057bec1ea286c7334a200fe6abcc8995d3
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/165565
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>

2 files changed, 15 insertions, 8 deletions

diff --git a/source/text/shared/01/05020500.xhp b/source/text/shared/01/05020500.xhp
index 903a8f9a33..bc091094a4 100644
--- a/source/text/shared/01/05020500.xhp
+++ b/source/text/shared/01/05020500.xhp
@@ -108,6 +108,11 @@
 <h3 id="hd_id3154127"><link href="text/shared/00/00000005.xhp#kerning">Pair kerning</link></h3>
 <paragraph role="paragraph" id="par_id3148616"><ahelp hid="cui/ui/positionpage/pairkerning">Automatically adjust the character spacing for specific letter combinations.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3150010">Kerning is only available for certain font types and requires that your printer support this option.</paragraph>
+<h2 id="hd_id3149822">Hyphenation</h2>
+<paragraph role="paragraph" id="par_id3150013" xml-lang="en-US">Skip <link href="text/swriter/guide/using_hyphen.xhp">hyphenation</link> for selected words.</paragraph>
+<bookmark branch="hid/cui/ui/positionpage/nohyphenation" id="bm_id3153096" localize="false"/>
+<h3 id="hd_id3149823">Exclude from hyphenation</h3>
+<paragraph role="paragraph" id="par_id3150025"><ahelp hid="cui/ui/positionpage/nohyphenation">It prevents hyphenation of the selected word or words in a paragraph hyphenated automatically.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#preview_field"/>
 <embed href="text/shared/00/00000001.xhp#reset"/>
 <embed href="text/shared/00/00000001.xhp#apply"/>
diff --git a/source/text/swriter/01/05030200.xhp b/source/text/swriter/01/05030200.xhp
index 8b7e3e0527..9f0c9735a0 100644
--- a/source/text/swriter/01/05030200.xhp
+++ b/source/text/swriter/01/05030200.xhp
@@ -48,18 +48,15 @@
 <bookmark xml-lang="en-US" branch="hid/cui/ui/textflowpage/checkAuto" id="bm_id3147171" localize="false"/>
 <h3 id="hd_id3153920">Automatically</h3>
 <paragraph role="paragraph" id="par_id3154640" xml-lang="en-US"><ahelp hid="cui/ui/textflowpage/checkAuto">Automatically inserts hyphens where they are needed in a paragraph.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/textflowpage/checkNoCaps" id="bm_id3147172" localize="false"/>
-<h3 id="hd_id3153921">Don't hyphenate words in CAPS</h3>
-<paragraph role="paragraph" id="par_id3154648" xml-lang="en-US"><ahelp hid="cui/ui/textflowpage/checkNoCaps">Avoids hyphenating words written entirely in capital letters, such as initialisms.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/textflowpage/checkNoLastWord" id="bm_id3147176" localize="false"/>
-<h3 id="hd_id3153926">Don't hyphenate the last word</h3>
-<paragraph role="paragraph" id="par_id3154655" xml-lang="en-US"><ahelp hid="cui/ui/textflowpage/checkNoLastWord">Avoids hyphenating the last word of paragraphs. This feature can help prevent these words from being split up across pages, affecting readability.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/textflowpage/spinLineEnd" id="bm_id3149286" localize="false"/>
 <h3 id="hd_id3150766">Characters at line end</h3>
 <paragraph role="paragraph" id="par_id3149291" xml-lang="en-US"><ahelp hid="cui/ui/textflowpage/spinLineEnd">Enter the minimum number of characters to leave at the end of the line before a hyphen is inserted.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/textflowpage/spinLineBegin" id="bm_id3147508" localize="false"/>
 <h3 id="hd_id3145413">Characters at line begin</h3>
 <paragraph role="paragraph" id="par_id3147515" xml-lang="en-US"><ahelp hid="cui/ui/textflowpage/spinLineBegin">Enter the minimum number of characters that must appear at the beginning of the line after the hyphen.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/textflowpage/spinCompoundLineEnd" id="bm_id3147510" localize="false"/>
+<h3 id="hd_id3145415">Compound constituent characters at line end</h3>
+<paragraph role="paragraph" id="par_id3147518" xml-lang="en-US"><ahelp hid="cui/ui/textflowpage/spinCompoundLineEnd">Set 3 (or more) characters to improve the hyphenation in Danish, Dutch, German, Hungarian, Norwegian and Swedish by preferring the hyphenation between constituents of a compound word instead of breaking the second (third etc.) constituent right after its first 2 characters.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/textflowpage/spinMaxNum" id="bm_id3153530" localize="false"/>
 <h3 id="hd_id3149804">Maximum consecutive hyphenated lines</h3>
 <paragraph role="paragraph" id="par_id3153536" xml-lang="en-US"><ahelp hid="cui/ui/textflowpage/spinMaxNum">Enter the maximum number of consecutive lines that can be hyphenated.</ahelp></paragraph>
@@ -68,8 +65,13 @@
 <paragraph role="paragraph" id="par_id3153548" xml-lang="en-US"><ahelp hid="cui/ui/textflowpage/spinMinLen">Enter the minimum word length in characters that can be hyphenated.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/textflowpage/spinHyphenZone" id="bm_id3153537" localize="false"/>
 <h3 id="hd_id3149818">Hyphenation zone</h3>
-<paragraph role="paragraph" id="par_id3153549" xml-lang="en-US"><ahelp hid="cui/ui/textflowpage/spinHyphenZone">To reduce hyphenation, enter the length of the hyphenation zone. Instead of the possible hyphenation, the line will break between words, if the remaining horizontal space does not exceed the hyphenation zone. Hyphenation zone results in enlarged spaces between words in justified text, and greater distance from paragraph margins in non-justified text.
-</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3153549" xml-lang="en-US"><ahelp hid="cui/ui/textflowpage/spinHyphenZone">To reduce hyphenation, enter the length of the hyphenation zone. Instead of the possible hyphenation, the line will break between words, if the remaining horizontal space does not exceed the hyphenation zone. Hyphenation zone results in enlarged spaces between words in justified text, and greater distance from paragraph margins in non-justified text.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/textflowpage/checkNoCaps" id="bm_id3147172" localize="false"/>
+<h3 id="hd_id3153921">Hyphenate words in CAPS</h3>
+<paragraph role="paragraph" id="par_id3154648" xml-lang="en-US"><ahelp hid="cui/ui/textflowpage/checkNoCaps">Hyphenate words written entirely in capital letters, such as initialisms.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/textflowpage/checkNoLastWord" id="bm_id3147176" localize="false"/>
+<h3 id="hd_id3153926">Hyphenate last word</h3>
+<paragraph role="paragraph" id="par_id3154655" xml-lang="en-US"><ahelp hid="cui/ui/textflowpage/checkNoLastWord">Hyphenate the last word of paragraphs. Disabling this feature prevents the creation of almost empty lines containing only half a word.</ahelp></paragraph>
 <h2 id="hd_id3153665">Breaks</h2>
 <paragraph role="paragraph" id="par_id3154470" xml-lang="en-US">Specify the page or column <link href="text/swriter/guide/page_break.xhp">break</link> options.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/textflowpage/checkInsert" id="bm_id3154567" localize="false"/>