[Libreoffice-commits] help.git: source/text
Stanislav Horacek
stanislav.horacek at gmail.com
Sun Jan 4 12:52:35 PST 2015
source/text/shared/01/formatting_mark.xhp | 2 +-
source/text/shared/guide/space_hyphen.xhp | 23 ++++++++++++-----------
source/text/shared/optionen/01040600.xhp | 7 ++++---
source/text/simpress/04/01020000.xhp | 4 ++--
source/text/swriter/01/03080000.xhp | 2 +-
source/text/swriter/01/06030000.xhp | 2 +-
source/text/swriter/04/01020000.xhp | 4 ++--
7 files changed, 23 insertions(+), 21 deletions(-)
New commits:
commit b4bbd1151bdec146daa64f7e30e23531e52d2569
Author: Stanislav Horacek <stanislav.horacek at gmail.com>
Date: Tue Dec 23 13:22:31 2014 +0100
use consistent terms soft/non-breaking hyphen
Change-Id: If05edfdf51f07593615e60f94e65b59ec1aab5be
Reviewed-on: https://gerrit.libreoffice.org/13625
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/source/text/shared/01/formatting_mark.xhp b/source/text/shared/01/formatting_mark.xhp
index 1afc47f..78aae75 100644
--- a/source/text/shared/01/formatting_mark.xhp
+++ b/source/text/shared/01/formatting_mark.xhp
@@ -43,7 +43,7 @@
<paragraph xml-lang="en-US" id="hd_id6383556" role="heading" level="2" l10n="NEW">Non-breaking hyphen</paragraph>
<paragraph xml-lang="en-US" id="par_id8469191" role="paragraph" l10n="NEW"><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 xml-lang="en-US" id="hd_id3306680" role="heading" level="2" l10n="NEW">Optional hyphen</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3306680" role="heading" level="2" l10n="NEW">Soft hyphen</paragraph>
<paragraph xml-lang="en-US" id="par_id9407330" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts an invisible 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 xml-lang="en-US" id="hd_id2295907" role="heading" level="2" l10n="NEW">No-width optional break</paragraph>
diff --git a/source/text/shared/guide/space_hyphen.xhp b/source/text/shared/guide/space_hyphen.xhp
index ba071ed..0eb8615 100644
--- a/source/text/shared/guide/space_hyphen.xhp
+++ b/source/text/shared/guide/space_hyphen.xhp
@@ -22,37 +22,38 @@
<meta>
<topic id="textsharedguidespace_hyphenxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Inserting Protected Spaces, Hyphens and Conditional Separators</title>
+<title id="tit" xml-lang="en-US">Inserting Non-breaking Spaces, Hyphens and Soft Hyphens</title>
<filename>/text/shared/guide/space_hyphen.xhp</filename>
</topic>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3155364"><bookmark_value>protected spaces;inserting</bookmark_value>
+<bookmark_value>non-breaking spaces;inserting</bookmark_value>
<bookmark_value>spaces; inserting protected spaces</bookmark_value>
+<bookmark_value>soft hyphens;inserting</bookmark_value>
<bookmark_value>hyphens;inserting custom</bookmark_value>
<bookmark_value>conditional separators</bookmark_value>
<bookmark_value>separators; conditional</bookmark_value>
<bookmark_value>dashes</bookmark_value>
-<bookmark_value>non-breaking dashes</bookmark_value>
+<bookmark_value>non-breaking hyphens</bookmark_value>
<bookmark_value>replacing;dashes</bookmark_value>
-<bookmark_value>protected dashes</bookmark_value>
+<bookmark_value>protected hyphens</bookmark_value>
<bookmark_value>exchanging, see also replacing</bookmark_value>
</bookmark>
-<paragraph role="heading" id="hd_id3155364" xml-lang="en-US" level="1" l10n="U" oldref="30"><variable id="space_hyphen"><link href="text/shared/guide/space_hyphen.xhp" name="Inserting Protected Spaces, Hyphens and Conditional Separators">Inserting Protected Spaces, Hyphens and Conditional Separators</link>
+<paragraph role="heading" id="hd_id3155364" xml-lang="en-US" level="1" l10n="U" oldref="30"><variable id="space_hyphen"><link href="text/shared/guide/space_hyphen.xhp" name="Inserting Non-breaking Spaces, Hyphens and Soft Hyphens">Inserting Non-breaking Spaces, Hyphens and Soft Hyphens</link>
</variable></paragraph>
<paragraph role="heading" id="hd_id3156136" xml-lang="en-US" level="2" l10n="U" oldref="61">Non-breaking spaces</paragraph>
<paragraph role="paragraph" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="31">To prevent two words from being separated at the end of a line, hold down the <switchinline select="sys"><caseinline select="MAC">Command key
</caseinline><defaultinline>Ctrl key</defaultinline></switchinline> and the Shift key when you type a space between the words.</paragraph>
<paragraph role="note" id="par_id5749687" xml-lang="en-US" l10n="NEW">In Calc, you cannot insert non-breaking spaces.</paragraph>
-<paragraph role="heading" id="hd_id3146957" xml-lang="en-US" level="2" l10n="U" oldref="62">Non-breaking dash</paragraph>
-<paragraph role="paragraph" id="par_id3148538" xml-lang="en-US" l10n="U" oldref="32">An example of a non-breaking dash is a company name such as A-Z. Obviously you would not want A- to appear at the end of a line and Z at the beginning of the next line. To solve this problem, press Shift+Ctrl+ minus sign. In other words, hold down the Shift and Ctrl keys and press the minus key.</paragraph>
-<paragraph role="heading" id="hd_id3163802" xml-lang="en-US" level="2" l10n="U" oldref="65">Hyphen, dash</paragraph>
-<paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="CHG" oldref="66">In order to enter longer dashes, you can find under <emph>Tools - AutoCorrect Options</emph>
-<emph>- Options</emph> the <emph>Replace dashes</emph> option. This option replaces one or two minus signs under certain conditions with an en-dash or an em-dash (see <link href="text/shared/01/06040100.xhp" name="$[officename] Help">$[officename] Help</link>).</paragraph>
+<paragraph role="heading" id="hd_id3146957" xml-lang="en-US" level="2" l10n="U" oldref="62">Non-breaking hyphen</paragraph>
+<paragraph role="paragraph" id="par_id3148538" xml-lang="en-US" l10n="U" oldref="32">An example of a non-breaking hyphen is a company name such as A-Z. Obviously you would not want A- to appear at the end of a line and Z at the beginning of the next line. To solve this problem, press Shift+Ctrl+ minus sign. In other words, hold down the Shift and Ctrl keys and press the minus key.</paragraph>
+<paragraph role="heading" id="hd_id3163802" xml-lang="en-US" level="2" l10n="U" oldref="65">Replacing hyphens by dashes</paragraph>
+<paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="CHG" oldref="66">In order to enter dashes, you can find under <emph>Tools - AutoCorrect Options - Options</emph> the <emph>Replace dashes</emph> option. This option replaces one or two hyphens under certain conditions with an en-dash or an em-dash (see <link href="text/shared/01/06040100.xhp" name="AutoCorrect Options">AutoCorrect Options</link>).</paragraph>
<paragraph role="paragraph" id="par_id3153561" xml-lang="en-US" l10n="U" oldref="67">For additional replacements see the replacements table under <emph>Tools - AutoCorrect Options</emph>
<emph>- </emph><link href="text/shared/01/06040200.xhp" name="Replace"><emph>Replace</emph></link>. Here you can, among other things, replace a shortcut automatically by a dash, even in another font.</paragraph>
-<paragraph role="heading" id="hd_id3153825" xml-lang="en-US" level="2" l10n="U" oldref="63">Definite separator</paragraph>
-<paragraph role="paragraph" id="par_id3154306" xml-lang="en-US" l10n="U" oldref="60">To support automatic hyphenation by entering a separator inside a word yourself, use the keys <switchinline select="sys"><caseinline select="MAC">Command
+<paragraph role="heading" id="hd_id3153825" xml-lang="en-US" level="2" l10n="U" oldref="63">Soft hyphen</paragraph>
+<paragraph role="paragraph" id="par_id3154306" xml-lang="en-US" l10n="U" oldref="60">To support automatic hyphenation by entering a soft hyphen inside a word yourself, use the keys <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+minus sign. The word is separated at this position when it is at the end of the line, even if automatic hyphenation for this paragraph is switched off.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<paragraph role="paragraph" id="par_id3151245" xml-lang="en-US" l10n="U" oldref="64"><link href="text/shared/01/04100000.xhp" name="Special characters">Special characters</link></paragraph>
diff --git a/source/text/shared/optionen/01040600.xhp b/source/text/shared/optionen/01040600.xhp
index 79d56a4..96d3ae9 100644
--- a/source/text/shared/optionen/01040600.xhp
+++ b/source/text/shared/optionen/01040600.xhp
@@ -37,6 +37,7 @@
<bookmark_value>paragraph marks; displaying (Writer)</bookmark_value>
<bookmark_value>characters; displaying only on screen (Writer)</bookmark_value>
<bookmark_value>optional hyphens (Writer)</bookmark_value>
+<bookmark_value>soft hyphens (Writer)</bookmark_value>
<bookmark_value>hyphens; displaying custom (Writer)</bookmark_value>
<bookmark_value>custom hyphens (Writer)</bookmark_value>
<bookmark_value>spaces; displaying (Writer)</bookmark_value>
@@ -63,9 +64,9 @@
<paragraph role="heading" id="hd_id3154140" xml-lang="en-US" level="3" l10n="U" oldref="29">Paragraph end</paragraph>
<paragraph role="paragraph" id="par_id3154123" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="modules/swriter/ui/optformataidspage/paragraph">Specifies whether paragraph delimiters are displayed. The paragraph delimiters also contain paragraph format information.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/optformataidspage/hyphens" id="bm_id3148453" localize="false"/>
-<paragraph role="heading" id="hd_id3153193" xml-lang="en-US" level="3" l10n="U" oldref="31">Custom hyphens</paragraph>
-<paragraph role="paragraph" id="par_id3147230" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="modules/swriter/ui/optformataidspage/hyphens">Specifies whether user-defined delimiters are displayed. These are hidden delimiters that you enter within a word by pressing <switchinline select="sys"><caseinline select="MAC">Command+Hyphen(-)
-</caseinline><defaultinline>Ctrl+Hyphen(-).</defaultinline></switchinline> Words with user-defined delimiters are only separated at the end of a line at the point where a user-defined delimiter has been inserted, irrespective of whether the automatic hyphenation is activated or deactivated.</ahelp></paragraph>
+<paragraph role="heading" id="hd_id3153193" xml-lang="en-US" level="3" l10n="U" oldref="31">Soft hyphens</paragraph>
+<paragraph role="paragraph" id="par_id3147230" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="modules/swriter/ui/optformataidspage/hyphens">Specifies whether soft hyphens (called also as optional or discretionary hyphens) are displayed. These are hidden user-defined delimiters that you enter within a word by pressing <switchinline select="sys"><caseinline select="MAC">Command+Hyphen(-)
+</caseinline><defaultinline>Ctrl+Hyphen(-).</defaultinline></switchinline> Words with soft hyphens are only separated at the end of a line at the point where a soft hyphen has been inserted, irrespective of whether the automatic hyphenation is activated or deactivated.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/optformataidspage/spaces" id="bm_id3149562" localize="false"/>
<paragraph role="heading" id="hd_id3147287" xml-lang="en-US" level="3" l10n="U" oldref="33">Spaces</paragraph>
<paragraph role="paragraph" id="par_id3147427" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="modules/swriter/ui/optformataidspage/spaces">Specifies whether to represent every space in the text with a dot.</ahelp></paragraph>
diff --git a/source/text/simpress/04/01020000.xhp b/source/text/simpress/04/01020000.xhp
index f4c4b06..18bc6a5 100644
--- a/source/text/simpress/04/01020000.xhp
+++ b/source/text/simpress/04/01020000.xhp
@@ -406,7 +406,7 @@
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Hyphen(-)</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph xml-lang="en-US" id="par_ii3150712" role="tablecontent" l10n="U" oldref="104">Custom hyphens; hyphenation set by you.</paragraph>
+<paragraph xml-lang="en-US" id="par_ii3150712" role="tablecontent" l10n="U" oldref="104">Soft hyphens; hyphenation set by you.</paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -415,7 +415,7 @@
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+minus sign (-)</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph xml-lang="en-US" id="par_ii3148394" role="tablecontent" l10n="U" oldref="302">Non-breaking dash (is not used for hyphenation)</paragraph>
+<paragraph xml-lang="en-US" id="par_ii3148394" role="tablecontent" l10n="U" oldref="302">Non-breaking hyphen (is not used for hyphenation)</paragraph>
</tablecell>
</tablerow>
<tablerow>
diff --git a/source/text/swriter/01/03080000.xhp b/source/text/swriter/01/03080000.xhp
index 92a7ebd..28f98df 100644
--- a/source/text/swriter/01/03080000.xhp
+++ b/source/text/swriter/01/03080000.xhp
@@ -36,7 +36,7 @@
<bookmark xml-lang="en-US" branch="hid/.uno:Marks" id="bm_id9217820" localize="false"/><!-- HID added by script -->
<bookmark xml-lang="en-US" branch="hid/.uno:Marks" id="bm_id3145419" localize="false"/>
<paragraph role="heading" id="hd_id3151177" xml-lang="en-US" level="1" l10n="U" oldref="18"><link href="text/swriter/01/03080000.xhp" name="Field Shadings">Field Shadings</link></paragraph>
-<paragraph role="paragraph" id="par_id3147513" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:Marks">Shows or hides field shadings in your document, including non-breaking spaces, custom hyphens, indexes, and footnotes.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3147513" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:Marks">Shows or hides field shadings in your document, including non-breaking spaces, soft hyphens, indexes, and footnotes.</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/swriter/00/00000403.xhp#markierungen"/>
diff --git a/source/text/swriter/01/06030000.xhp b/source/text/swriter/01/06030000.xhp
index cdc7696..3f3bea7 100644
--- a/source/text/swriter/01/06030000.xhp
+++ b/source/text/swriter/01/06030000.xhp
@@ -65,7 +65,7 @@
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Minus sign (-).</paragraph>
<paragraph role="paragraph" id="par_id3147523" xml-lang="en-US" l10n="U" oldref="32">To insert a non-breaking (protected) hyphen directly in the document, click in the word that you want to hyphenate, and then press Shift+<switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>+Ctrl </defaultinline></switchinline>+Minus sign(-).</paragraph>
-<paragraph role="paragraph" id="par_id3154573" xml-lang="en-US" l10n="U" oldref="33">To hide custom hyphens, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040600.xhp" name="Text Document - Formatting Aids">%PRODUCTNAME Writer - Formatting Aids</link></emph>, and then clear the <emph>Custom hyphens</emph> check box.</paragraph>
+<paragraph role="paragraph" id="par_id3154573" xml-lang="en-US" l10n="U" oldref="33">To hide soft hyphens, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040600.xhp" name="Text Document - Formatting Aids">%PRODUCTNAME Writer - Formatting Aids</link></emph>, and then clear the <emph>Custom hyphens</emph> check box.</paragraph>
<paragraph role="heading" id="hd_id3150360" xml-lang="en-US" level="2" l10n="U" oldref="20">Word</paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/hyphenate/worded" id="bm_id3155903" localize="false"/>
<paragraph role="heading" id="hd_id3153676" xml-lang="en-US" level="3" l10n="U" oldref="21">Word</paragraph>
diff --git a/source/text/swriter/04/01020000.xhp b/source/text/swriter/04/01020000.xhp
index 263e0c8..1d4bd75 100644
--- a/source/text/swriter/04/01020000.xhp
+++ b/source/text/swriter/04/01020000.xhp
@@ -449,7 +449,7 @@
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Hyphen(-)</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3150712" role="tablecontent" l10n="U" oldref="104">Custom hyphens; hyphenation set by you.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150712" role="tablecontent" l10n="U" oldref="104">Soft hyphens; hyphenation set by you.</paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -458,7 +458,7 @@
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+minus sign (-)</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3148394" role="tablecontent" l10n="U" oldref="302">Non-breaking dash (is not used for hyphenation)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148394" role="tablecontent" l10n="U" oldref="302">Non-breaking hyphen (is not used for hyphenation)</paragraph>
</tablecell>
</tablerow>
<tablerow>
More information about the Libreoffice-commits
mailing list