source/text/shared/02/06120000.xhp | 12 +--
source/text/shared/guide/numbering_stop.xhp | 93 ++++++++++++++--------------
source/text/swriter/02/06040000.xhp | 20 +++---
source/text/swriter/main0206.xhp | 2
4 files changed, 68 insertions(+), 59 deletions(-)
New commits:
commit 5e9ca1b304afe987a99cecc298dac6c43a0e17cb
Author: Seth Chaiklin <sdc.bla...@youmail.dk>
AuthorDate: Thu Feb 25 17:11:56 2021 +0100
Commit: Seth Chaiklin <sdc.bla...@youmail.dk>
CommitDate: Tue Mar 2 15:58:07 2021 +0100
tdf#140669 (related: tdf#92622) update help pages for "No List"
https://gerrit.libreoffice.org/c/core/+/108841 changed
the "Numbering Off" command to "No List"
The present patch make relevant adjustments in help pages.
( swriter/02/06040000.xhp ) "No List" command
* "Numbering Off" -> "No List"
+ clarify that list indenting is also lost
+ add <tip> about how to preserve indenting, but remove number
+ add <relatedtopics> section and embed a related topic
* rename two German IDs
( shared/02/06120000.xhp ) "Toggle Unordered List"
* "Bullets On/Off" -> "Toggle Unordered List"
* rename two German IDs
- remove colspan="" rowspan=""
* update icons size to 1cm
* update to <h1>
( swriter/main0206.xhp ) "Bullets and Numbering" toolbar
- remove embeds to "No List" and its icon table
( shared/guide/numbering_stop.xhp )
* "Numbering Off" -> "No List"
* "Bullets On/Off" -> "Toggle Unordered List"
* correction about location of "No List" icon
* clarify that indenting is also lost
* make descriptions be relevant for both bullets and numbers
* clarify when indenting is lost or not
+ move icons to separate icon tables
+ add labels to icons
* update icons size to 1cm
+ add <note> about how to put number or bullet back
+ add <keycode>
+ add appl-switch to Related topics
* update to <h1>,<note>
Change-Id: I8880f0aa46b2e036926497bf185092c2c5ae6d52
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/111575
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin <sdc.bla...@youmail.dk>
diff --git a/source/text/shared/02/06120000.xhp
b/source/text/shared/02/06120000.xhp
index 2bc1773aa..5318c8c88 100644
--- a/source/text/shared/02/06120000.xhp
+++ b/source/text/shared/02/06120000.xhp
@@ -20,7 +20,7 @@
<meta>
<topic id="textshared0206120000xml" indexer="include" status="PUBLISH">
- <title id="tit" xml-lang="en-US">Bullets On/Off</title>
+ <title id="tit" xml-lang="en-US">Toggle Unordered List</title>
<filename>/text/shared/02/06120000.xhp</filename>
</topic>
<history>
@@ -28,20 +28,20 @@
</history>
</meta>
<body>
-<section id="aufzaehlung">
+<section id="toggle_bullets">
<bookmark xml-lang="en-US" branch="hid/.uno:DefaultBullet" id="bm_id5921827"
localize="false"/>
-<paragraph role="heading" id="hd_id3154228" xml-lang="en-US" level="1"><link
href="text/shared/02/06120000.xhp" name="Bullets On/Off">Bullets
On/Off</link></paragraph>
+<h1 id="hd_id3154228" xml-lang="en-US"><link
href="text/shared/02/06120000.xhp" name="Bullets On/Off">Toggle Unordered
List</link></h1>
<paragraph role="paragraph" id="par_id3148520" xml-lang="en-US"><ahelp
hid=".uno:DefaultBullet">Assigns bullet points to the selected paragraphs, or
removes them from bulleted paragraphs.</ahelp></paragraph>
</section>
<paragraph role="paragraph" id="par_id3155150" xml-lang="en-US"><switchinline
select="appl"><caseinline select="WRITER">Bullet options such as type and
position are defined in the <link href="text/shared/01/06050000.xhp"
name="Bullets and Numbering"><emph>Bullets and Numbering</emph></link> dialog.
To open this dialog, click the <emph>Bullets and Numbering</emph> icon on the
<link href="text/swriter/main0206.xhp" name="Bullets and Numbering
Bar"><emph>Bullets and Numbering</emph>
bar</link>.</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3145669" xml-lang="en-US"><switchinline
select="appl"><caseinline select="IMPRESS">Bullet options such as type and
position are defined in the <link href="text/shared/01/06050000.xhp"
name="Bullets and Numbering"><emph>Bullets and Numbering</emph></link> dialog.
To open this dialog, click the <emph>Bullets and Numbering</emph> icon on the
<emph>Text Formatting</emph> bar.</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3147576" xml-lang="en-US"><switchinline
select="appl"><caseinline select="WRITER">In the <link
href="text/swriter/01/03120000.xhp" name="Web Layout"><emph>Web
Layout</emph></link>, some numbering/bullet options are not
available.</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3154317" xml-lang="en-US"><switchinline
select="appl"><caseinline select="IMPRESS">The distance between the text and
the left text box and the position of the bullets can be determined in the
dialog under <link href="text/shared/01/05030100.xhp" name="Format -
Paragraph"><emph>Format - Paragraph</emph></link> by entering the left indent
and the first-line indent.</caseinline></switchinline></paragraph>
-<section id="syaufzaehlung">
+<section id="sytoggle_bullets">
<table id="tbl_id3146798">
<tablerow>
- <tablecell colspan="" rowspan="">
- <paragraph role="paragraph" id="par_id3150355" xml-lang="en-US"><image
id="img_id3157909" src="cmd/sc_defaultbullet.png" width="0.222inch"
height="0.222inch"><alt id="alt_id3157909"
xml-lang="en-US">Icon</alt></image></paragraph>
+ <tablecell>
+ <paragraph role="paragraph" id="par_id3150355" xml-lang="en-US"><image
id="img_id3157909" src="cmd/lc_defaultbullet.png" width="1cm" height="1cm"><alt
id="alt_id3157909" xml-lang="en-US">Icon</alt></image></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id3149233" xml-lang="en-US">Bullets
On/Off</paragraph>
diff --git a/source/text/shared/guide/numbering_stop.xhp
b/source/text/shared/guide/numbering_stop.xhp
index 196666204..a17e870d5 100644
--- a/source/text/shared/guide/numbering_stop.xhp
+++ b/source/text/shared/guide/numbering_stop.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,7 @@
* 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="textsharedguidenumbering_stopxml" indexer="include"
status="PUBLISH">
<title xml-lang="en-US" id="tit">Turning off Bullets and Numbering
for Individual Paragraphs</title>
@@ -32,54 +30,52 @@
<bookmark_value>removing, see also deleting</bookmark_value>
<bookmark_value>removing;bullets and numbering</bookmark_value>
<bookmark_value>keyboard;removing numbering</bookmark_value>
-</bookmark><comment>MW added "removing, see also deleting"</comment>
-<paragraph xml-lang="en-US" id="hd_id3154186" role="heading"
level="1"><variable id="numbering_stop"><link
href="text/shared/guide/numbering_stop.xhp" name="Turning off Bullets and
Numbering for Individual Paragraphs">Turning off Bullets and Numbering for
Individual Paragraphs</link>
-</variable></paragraph>
+</bookmark>
+<h1 xml-lang="en-US" id="hd_id3154186"><variable id="numbering_stop"><link
href="text/shared/guide/numbering_stop.xhp" name="Turning off Bullets and
Numbering for Individual Paragraphs">Turning off Bullets and Numbering for
Individual Paragraphs</link>
+</variable></h1>
<switch select="appl">
<case select="CALC"><comment>no bullets for Calc</comment>
-<paragraph xml-lang="en-US" id="par_id0202200910470118" role="note">Bullets
and Numbering of paragraphs is supported only in Writer, Impress and
Draw.</paragraph>
+<note xml-lang="en-US" id="par_id0202200910470118">Bullets and Numbering of
paragraphs is supported only in Writer, Impress and Draw.</note>
</case>
<case select="MATH"><comment>no bullets for Math</comment><comment>don't care
for Math by now. Issue 98726</comment>
</case>
<case select="WRITER">
+<paragraph xml-lang="en-US" id="par_id3147618" role="paragraph">For the
current paragraph or selected paragraphs you can switch off the automatic
numbering or listing. Click the <emph>No List</emph> icon in the
<emph>Formatting</emph> bar. The list indenting is also removed.</paragraph>
<table id="tbl_id3155338">
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3154288" role="paragraph">
-<image id="img_id3153527" src="cmd/sc_removebullets.png" width="0.222in"
height="0.222in"><alt xml-lang="en-US" id="alt_id3153527">Icon</alt>
- </image></paragraph>
- <paragraph xml-lang="en-US" id="par_id3150443" role="paragraph">
-<image id="img_id3163802" src="cmd/sc_defaultbullet.png" width="0.222in"
height="0.222in"><alt xml-lang="en-US" id="alt_id3163802">Icon</alt>
- </image></paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3147618"
role="paragraph">For the current paragraph or selected paragraphs you can
switch off the automatic numbering or listing. Click the <emph>Numbering
Off</emph> icon in the <emph>Bullets and Numbering</emph> bar.</paragraph>
- </tablecell>
- </tablerow>
- </table>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154288" role="paragraph">
+<image id="img_id3153527" src="cmd/lc_removebullets.png" width="1cm"
height="1cm"><alt xml-lang="en-US" id="alt_id3153527">No List
icon</alt></image></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id151614326512513" role="tablecontent">No List
icon</paragraph>
+ </tablecell>
+ </tablerow>
+</table>
</case>
<default><comment>Impress, Draw</comment>
+<paragraph xml-lang="en-US" id="par_id3144511" role="paragraph">If the cursor
is located within a numbered or bulleted list, you can turn off automatic
numbers or bullets for the current paragraph or selected paragraphs by clicking
the <emph>Toggle Unordered List</emph> icon on the <emph>Text Formatting</emph>
bar.</paragraph>
<table id="tbl_id3159157">
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3155449" role="paragraph">
-<image id="img_id3158432" src="cmd/sc_defaultbullet.png" width="0.222in"
height="0.222in"><alt xml-lang="en-US" id="alt_id3158432">Icon</alt>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155449" role="paragraph">
+<image id="img_id3158432" src="cmd/lc_defaultbullet.png" width="1cm"
height="1cm"><alt xml-lang="en-US" id="alt_id3158432">Icon</alt>
</image></paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3144511"
role="paragraph">If the cursor is located within a numbered or bulleted list,
you can turn off automatic numbers or bullets for the current paragraph or
selected paragraphs by clicking the <emph>Bullets On/Off </emph>icon on the
<emph>Text Formatting</emph> bar.</paragraph>
- </tablecell>
- </tablerow>
- </table>
-
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id781614327726646" role="tablecontent">Toggle
Unordered List icon</paragraph>
+ </tablecell>
+ </tablerow>
+</table>
</default>
</switch>
-<paragraph xml-lang="en-US" id="par_id3148946" role="paragraph"><switchinline
select="appl"><caseinline select="WRITER">To remove numbering from a paragraph
using the keyboard:
+<paragraph xml-lang="en-US" id="par_id3148946" role="paragraph"><switchinline
select="appl"><caseinline select="WRITER">
+ To remove a number or bullet from a paragraph while preserving the list
indenting:
</caseinline></switchinline></paragraph>
<list type="unordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id3148663"
role="listitem"><switchinline select="appl"><caseinline select="WRITER">Place
the cursor at the beginning of a numbered paragraph and press the Backspace
key.
+ <paragraph xml-lang="en-US" id="par_id3148663"
role="listitem"><switchinline select="appl"><caseinline select="WRITER">Place
the cursor at the beginning of a paragraph in a list and press the
<keycode>Backspace</keycode> key.
</caseinline></switchinline></paragraph>
</listitem>
<listitem>
@@ -87,16 +83,25 @@
</caseinline></switchinline></paragraph>
</listitem>
</list>
+ <switch select="appl">
+ <case select="WRITER">
+ <note id="par_id911614326873271">Press
<keycode>Shift+Backspace</keycode> at the beginning of a list paragraph to
return the number or bullet.</note>
+ </case>
+ </switch>
<paragraph xml-lang="en-US" id="par_id3154123"
role="paragraph"><switchinline select="appl"><caseinline select="WRITER">If you
press the Enter key in an empty numbered paragraph, the numbering stops.
</caseinline></switchinline></paragraph>
- <section id="relatedtopics">
- <paragraph xml-lang="en-US" id="par_id3151043" role="paragraph"><link
href="text/shared/01/06050000.xhp" name="Format - Bullets/Numbering">Format -
Bullets and Numbering</link></paragraph>
- <embed href="text/swriter/guide/using_numbering.xhp#using_numbering"/>
- <embed
href="text/swriter/guide/using_numbered_lists.xhp#using_numbered_lists"/>
- <embed
href="text/swriter/guide/using_numbered_lists2.xhp#using_numbered_lists2"/>
- <embed
href="text/swriter/guide/join_numbered_lists.xhp#join_numbered_lists"/>
- <embed href="text/swriter/guide/captions.xhp#captions"/>
- <embed href="text/swriter/guide/number_sequence.xhp#number_sequence"/>
- </section>
- </body>
+<switch select="appl">
+ <case select="WRITER">
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_id3151043" role="paragraph"><link
href="text/shared/01/06050000.xhp" name="Format - Bullets/Numbering">Format -
Bullets and Numbering</link></paragraph>
+ <embed href="text/swriter/guide/using_numbering.xhp#using_numbering"/>
+ <embed
href="text/swriter/guide/using_numbered_lists.xhp#using_numbered_lists"/>
+ <embed
href="text/swriter/guide/using_numbered_lists2.xhp#using_numbered_lists2"/>
+ <embed
href="text/swriter/guide/join_numbered_lists.xhp#join_numbered_lists"/>
+ <embed href="text/swriter/guide/captions.xhp#captions"/>
+ <embed href="text/swriter/guide/number_sequence.xhp#number_sequence"/>
+ </section>
+ </case>
+</switch>
+</body>
</helpdocument>
\ No newline at end of file
diff --git a/source/text/swriter/02/06040000.xhp
b/source/text/swriter/02/06040000.xhp
index 75ab1b756..e451628b3 100644
--- a/source/text/swriter/02/06040000.xhp
+++ b/source/text/swriter/02/06040000.xhp
@@ -19,7 +19,7 @@
<helpdocument version="1.0">
<meta>
<topic id="textswriter0206040000xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Numbering Off</title>
+<title xml-lang="en-US" id="tit">No List</title>
<filename>/text/swriter/02/06040000.xhp</filename>
</topic>
<history>
@@ -29,10 +29,10 @@
<body>
- <section id="numerierungausschalten">
+ <section id="nolist">
<bookmark branch="hid/.uno:RemoveBullets" xml-lang="en-US" id="bm_id3147170"
localize="false"/>
-<h1 id="hd_id3145822"><link href="text/swriter/02/06040000.xhp"
name="Numbering Off">Numbering Off</link></h1>
- <paragraph role="paragraph" id="par_id3154505" xml-lang="en-US"><ahelp
hid=".uno:RemoveBullets" visibility="visible">Turns off numbering or bullets in
the current paragraph or selected paragraphs.</ahelp></paragraph>
+<h1 id="hd_id3145822"><link href="text/swriter/02/06040000.xhp"
name="Numbering Off">No List</link></h1>
+ <paragraph role="paragraph" id="par_id3154505" xml-lang="en-US"><ahelp
hid=".uno:RemoveBullets" visibility="visible">Removes numbering or bullets and
list indenting for the current paragraph or selected
paragraphs.</ahelp></paragraph>
</section>
<section id="synumerierungausschalten">
<table id="tbl_id3152892">
@@ -41,15 +41,21 @@
<tablerow>
<tablecell>
- <paragraph role="paragraph" id="par_id3151177" xml-lang="en-US"><image
src="cmd/sc_removebullets.png" id="img_id3145083" width="1cm" height="1cm"><alt
xml-lang="en-US" id="alt_id3145083">Icon Numbering Off</alt></image></paragraph>
+ <paragraph role="paragraph" id="par_id3151177" xml-lang="en-US"><image
src="cmd/lc_removebullets.png" id="img_id3145083" width="1cm" height="1cm"><alt
xml-lang="en-US" id="alt_id3145083">Icon No List</alt></image></paragraph>
</tablecell>
<tablecell>
- <paragraph role="paragraph" id="par_id3150749"
xml-lang="en-US">Numbering Off</paragraph>
+ <paragraph role="paragraph" id="par_id3150749" xml-lang="en-US">No List
icon</paragraph>
</tablecell>
</tablerow>
</table>
</section>
-
+
+ <tip id="par_id811614270889392">To preserve indenting, but remove bullet or
number, place cursor at the beginning of the paragraph and press
<keycode>Backspace</keycode>.</tip>
+
+ <section id="relatedtopics">
+ <embed href="text/shared/guide/numbering_stop.xhp#numbering_stop"/>
+ </section>
+
</body>
</helpdocument>
diff --git a/source/text/swriter/main0206.xhp b/source/text/swriter/main0206.xhp
index ee6c48e77..6c5d11968 100644
--- a/source/text/swriter/main0206.xhp
+++ b/source/text/swriter/main0206.xhp
@@ -30,8 +30,6 @@
<h1 id="hd_id3154256" xml-lang="en-US"><link href="text/swriter/main0206.xhp"
name="Bullets and Numbering Bar">Bullets and Numbering Bar</link></h1>
<paragraph role="paragraph" id="par_id3154277" xml-lang="en-US"><ahelp
hid="HID_NUM_TOOLBOX">The <emph>Bullets and Numbering</emph> bar contains
functions to modify the structure of numbered paragraphs, including changing
the order of paragraphs and defining different paragraph
levels.</ahelp></paragraph>
</section>
-<embed href="text/swriter/02/06040000.xhp#numerierungausschalten"/>
-<embed href="text/swriter/02/06040000.xhp#synumerierungausschalten"/>
<embed href="text/shared/02/06060000.xhp#hochstufen"/>
<embed href="text/shared/02/06060000.xhp#syhochstufen"/>
<embed href="text/shared/02/06050000.xhp#hinunterstufen"/>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
