source/text/shared/01/formatting_mark.xhp | 18 +++++++++---------
source/text/swriter/guide/hyphen_prevent.xhp | 22 ++++++++++------------
2 files changed, 19 insertions(+), 21 deletions(-)
New commits:
commit ead459c15f4eb1095d0dff0cb76611bff31d12f8
Author: Seth Chaiklin <sdc.bla...@youmail.dk>
AuthorDate: Mon Mar 8 09:14:44 2021 +0100
Commit: Seth Chaiklin <sdc.bla...@youmail.dk>
CommitDate: Mon Mar 8 09:54:39 2021 +0100
Related to: tdf#140796 No-width no break -> Word Joiner
( shared/01/formatting_mark.xhp )
* No-width no break -> Word Joiner
* .uno:InsertZWNBSP" -> .uno:InsertWJ"
* update to <h1>,<h2>
( swriter/guide/hyphen_prevent.xhp )
* No-width no break -> Word Joiner, and change to <menuitem> in
that paragraph
* "paragraph" -> "listitem" for "role"
* update to <h1>,<h2>,<tip>,<relatedtopics>
Change-Id: I6b406e8baf6a34d96bacc896bd8fed39f87ffa85
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112082
Reviewed-by: Seth Chaiklin <sdc.bla...@youmail.dk>
Tested-by: Jenkins
diff --git a/source/text/shared/01/formatting_mark.xhp
b/source/text/shared/01/formatting_mark.xhp
index a358e5a9b..d8e62f95e 100644
--- a/source/text/shared/01/formatting_mark.xhp
+++ b/source/text/shared/01/formatting_mark.xhp
@@ -36,36 +36,36 @@
</bookmark>
<comment>MW added 2 index entries because of issue
86750</comment><comment>tried to fix i86464 by creating a new file, copy
everything over, then save & overwrite as
formatting_mark.xhp</comment><comment>but this did not help</comment>
-<paragraph id="hd_id030220091035120" role="heading" level="1"
xml-lang="en-US"><variable id="formattingmark"><link
href="text/shared/01/formatting_mark.xhp">Formatting Mark</link>
</variable></paragraph>
+<h1 id="hd_id030220091035120" xml-lang="en-US"><variable
id="formattingmark"><link href="text/shared/01/formatting_mark.xhp">Formatting
Mark</link> </variable></h1>
<paragraph id="par_id0302200910351248" role="paragraph"
xml-lang="en-US"><ahelp hid=".">Opens a submenu to insert special formatting
marks like non-breaking space, soft hyphen, and optional
break.</ahelp></paragraph>
</section>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertNonBreakingSpace"
id="bm_id2567217" localize="false"/>
-<paragraph id="hd_id9996948" role="heading" level="2"
xml-lang="en-US">Non-breaking space</paragraph>
+<h2 id="hd_id9996948" xml-lang="en-US">Non-breaking space</h2>
<paragraph id="par_id8326975" role="paragraph" xml-lang="en-US"><ahelp
hid=".">Inserts a space that will keep bordering characters together on line
breaks.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertHardHyphen"
id="bm_id6757713" localize="false"/>
-<paragraph id="hd_id6383556" role="heading" level="2"
xml-lang="en-US">Non-breaking hyphen</paragraph>
+<h2 id="hd_id6383556" xml-lang="en-US">Non-breaking hyphen</h2>
<paragraph id="par_id8469191" role="paragraph" xml-lang="en-US"><ahelp
hid=".">Inserts a hyphen that will keep bordering characters together on line
breaks.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertSoftHyphen"
id="bm_id8669698" localize="false"/>
-<paragraph id="hd_id3306680" role="heading" level="2" xml-lang="en-US">Soft
hyphen</paragraph>
+<h2 id="hd_id3306680" xml-lang="en-US">Soft hyphen</h2>
<paragraph id="par_id9407330" role="paragraph" xml-lang="en-US"><ahelp
hid=".">Inserts an invisible optional hyphen within a word that will appear and
create a line break once it becomes the last character in a
line.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertZWSP" id="bm_id1068758"
localize="false"/>
-<paragraph id="hd_id2295907" role="heading" level="2"
xml-lang="en-US">No-width optional break</paragraph>
+<h2 id="hd_id2295907" xml-lang="en-US">No-width optional break</h2>
<paragraph id="par_id1536301" role="paragraph" xml-lang="en-US"><ahelp
hid=".">Inserts an invisible space within a word that will insert a line break
once it becomes the last character in a line. Available when complex text
layout (CTL) is enabled.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertZWNBSP" id="bm_id8484450"
localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:InsertWJ" id="bm_id8484450"
localize="false"/>
-<paragraph id="hd_id3245643" role="heading" level="2"
xml-lang="en-US">No-width no break</paragraph>
+<h2 id="hd_id3245643" xml-lang="en-US">Word Joiner</h2>
<paragraph id="par_id1085238" role="paragraph" xml-lang="en-US"><ahelp
hid=".">Inserts an invisible space within a word that will keep the word
together at the end of a line. Available when complex text layout (CTL) is
enabled.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertLRM" id="bm_id714743"
localize="false"/>
-<paragraph id="hd_id4634540" role="heading" level="2"
xml-lang="en-US">Left-to-right mark</paragraph>
+<h2 id="hd_id4634540" xml-lang="en-US">Left-to-right mark</h2>
<paragraph id="par_id6690878" role="paragraph" xml-lang="en-US"><ahelp
hid=".">Inserts a text direction mark that affects the text direction of any
text following the mark. Available when complex text layout (CTL) is
enabled.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertRLM" id="bm_id3938413"
localize="false"/>
-<paragraph id="hd_id9420148" role="heading" level="2"
xml-lang="en-US">Right-to-left mark</paragraph>
+<h2 id="hd_id9420148" xml-lang="en-US">Right-to-left mark</h2>
<paragraph id="par_id923184" role="paragraph" xml-lang="en-US"><ahelp
hid=".">Inserts a text direction mark that affects the text direction of any
text following the mark. Available when complex text layout (CTL) is
enabled.</ahelp></paragraph>
</body>
diff --git a/source/text/swriter/guide/hyphen_prevent.xhp
b/source/text/swriter/guide/hyphen_prevent.xhp
index ff136b3c0..378c1b26a 100644
--- a/source/text/swriter/guide/hyphen_prevent.xhp
+++ b/source/text/swriter/guide/hyphen_prevent.xhp
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
<!--
* This file is part of the LibreOffice project.
*
@@ -18,8 +17,6 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
-
<meta>
<topic id="textswriterguidehyphen_preventxhp" indexer="include"
status="PUBLISH">
<title xml-lang="en-US" id="tit">Preventing Hyphenation of Specific
Words</title>
@@ -30,9 +27,9 @@
<bookmark xml-lang="en-US" branch="index"
id="bm_id3149695"><bookmark_value>hyphenation;preventing for specific
words</bookmark_value>
<bookmark_value>words;wrapping/not wrapping in text</bookmark_value>
<bookmark_value>switching off;hyphenation for specific
words</bookmark_value>
-</bookmark><comment>mw copied 2 entries from using_hyphen.xhp and added a new
entry</comment>
-<paragraph xml-lang="en-US" id="hd_id3149695" role="heading"
level="1"><variable id="hyphen_prevent"><link
href="text/swriter/guide/hyphen_prevent.xhp" name="Preventing Hyphenation of
Specific Words">Preventing Hyphenation of Specific Words</link>
-</variable></paragraph><comment>MW created this guide from splitting
using_hyphen.xhp</comment>
+</bookmark>
+<h1 xml-lang="en-US" id="hd_id3149695"><variable id="hyphen_prevent"><link
href="text/swriter/guide/hyphen_prevent.xhp" name="Preventing Hyphenation of
Specific Words">Preventing Hyphenation of Specific Words</link>
+</variable></h1><comment>MW created this guide from splitting
using_hyphen.xhp</comment>
<paragraph xml-lang="en-US" id="par_id5640125" role="paragraph">If your text
is <link href="text/swriter/guide/using_hyphen.xhp">automatically
hyphenated</link> and certain hyphenated words look ugly, or if you want
specific words never to be hyphenated you can switch off hyphenation for those
words:</paragraph>
<list type="ordered">
<listitem>
@@ -50,22 +47,23 @@
<paragraph xml-lang="en-US" id="par_id3150247"
role="listitem">Click <emph>New</emph>, and then click
<emph>Close</emph>.</paragraph>
</listitem>
</list>
- <paragraph xml-lang="en-US" id="par_id3147036" role="tip">To quickly
exclude a word from hyphenation, select the word, choose <emph>Format -
Character</emph>, click the <emph>Font </emph>tab, and select "None" in the
<emph>Language </emph>box.</paragraph>
+ <tip xml-lang="en-US" id="par_id3147036">To quickly exclude a word from
hyphenation, select the word, choose <emph>Format - Character</emph>, click the
<emph>Font </emph>tab, and select "None" in the <emph>Language </emph>box.</tip>
<paragraph xml-lang="en-US" id="par_id0302200910262761"
role="paragraph">Some words contain special characters that %PRODUCTNAME treats
as a hyphen. If you do not want such words to be hyphenated, you can insert a
special code that prevents hyphenation at the position where the special code
is inserted. Proceed as follows:</paragraph>
<list type="ordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id0302200910262850"
role="paragraph">Enable the special features of complex text layout (CTL)
languages: Choose <switchinline select="sys"><caseinline select="MAC"><item
type="menuitem">%PRODUCTNAME -
Preferences</item></caseinline><defaultinline><item type="menuitem">Tools -
Options</item></defaultinline></switchinline><item type="menuitem"> - Language
Settings - Languages</item> and check <emph>Enabled for complex text layout
(CTL)</emph>. Click OK.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0302200910262850"
role="listitem">Enable the special features of complex text layout (CTL)
languages: Choose <switchinline select="sys"><caseinline select="MAC"><item
type="menuitem">%PRODUCTNAME -
Preferences</item></caseinline><defaultinline><item type="menuitem">Tools -
Options</item></defaultinline></switchinline><item type="menuitem"> - Language
Settings - Languages</item> and check <emph>Enabled for complex text layout
(CTL)</emph>. Click OK.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id0302200910262837"
role="paragraph">Position the cursor at the place where no hyphenation should
occur.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0302200910262837"
role="listitem">Position the cursor at the place where no hyphenation should
occur.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id0302200910262867"
role="paragraph">Choose <item type="menuitem">Insert - Formatting Mark -
No-width no break</item>.</paragraph>
- <paragraph xml-lang="en-US" id="par_id0302200910572128"
role="paragraph">Once the special character is inserted, you might disable CTL
again. Support of CTL was only necessary to insert the special
character.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0302200910262867"
role="listitem">Choose <menuitem>Insert - Formatting Mark - Word
Joiner</menuitem>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0302200910572128"
role="listitem">Once the special character is inserted, you might disable CTL
again. Support of CTL was only necessary to insert the special
character.</paragraph>
</listitem>
</list>
- <embed href="text/shared/00/00000004.xhp#related"/>
+ <section id="relatedtopics">
<embed href="text/swriter/guide/using_hyphen.xhp#using_hyphen"/>
<paragraph xml-lang="en-US" id="par_id3154361" role="paragraph"><link
href="text/swriter/01/05030200.xhp" name="Text Flow">Text
Flow</link></paragraph>
+ </section>
</body>
</helpdocument>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
