source/text/swriter/01/04090002.xhp | 4 +--
source/text/swriter/guide/captions_numbers.xhp | 29 ++++++++++++----------
source/text/swriter/guide/chapter_numbering.xhp | 2 -
source/text/swriter/guide/header_with_chapter.xhp | 23 +++++++++--------
source/text/swriter/guide/indices_toc.xhp | 17 ++++++------
source/text/swriter/guide/using_numbering.xhp | 2 -
6 files changed, 42 insertions(+), 35 deletions(-)
New commits:
commit 4bf58601f847370be00b3e600a7a3fdac9e6b315
Author: Seth Chaiklin <sdc.bla...@youmail.dk>
AuthorDate: Thu Mar 9 16:52:29 2023 +0000
Commit: Seth Chaiklin <sdc.bla...@youmail.dk>
CommitDate: Fri Mar 10 02:02:29 2023 +0000
tdf#153549 more "chapter" to "heading" adjustments
Possibly this is the final patch needed to change
"Tools - Chapter Numbering" to "Tools - Heading Numbering".
Also, "chapter" is changed to "heading" where appropriate.
Where appropriate or necessary, corrections or command
updates were made.
Change-Id: I00a72a3c09909f2cf0a0ebe1320f5744c4ae4b68
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/148506
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin <sdc.bla...@youmail.dk>
diff --git a/source/text/swriter/01/04090002.xhp
b/source/text/swriter/01/04090002.xhp
index bac3255c0b..794295d366 100644
--- a/source/text/swriter/01/04090002.xhp
+++ b/source/text/swriter/01/04090002.xhp
@@ -88,7 +88,7 @@
<paragraph role="tablecontent" id="par_id5841242" xml-lang="en-US">The
Selection box shows a list of all ordered paragraphs in the order of their
appearance in the document. The list includes:</paragraph>
<list type="unordered">
<listitem>
- <paragraph id="par_id971618826026891" role="listitem">paragraphs with a
paragraph style assigned a numbering scheme in the Tools > Chapter Numbering
dialog
+ <paragraph id="par_id971618826026891" role="listitem">paragraphs with a
paragraph style assigned a numbering scheme in the Tools > Heading Numbering
dialog
</paragraph>
</listitem>
<listitem>
@@ -211,7 +211,7 @@
<paragraph role="tablecontent" id="par_id3154635"
xml-lang="en-US">Chapter</paragraph>
</tablecell>
<tablecell>
-<paragraph role="tablecontent" id="par_id3149646" xml-lang="en-US">Inserts the
number of the chapter containing the reference target.</paragraph>
+<paragraph role="tablecontent" id="par_id3149646" xml-lang="en-US">Inserts the
heading number or list number of the reference target.</paragraph>
</tablecell>
</tablerow>
<tablerow>
diff --git a/source/text/swriter/guide/captions_numbers.xhp
b/source/text/swriter/guide/captions_numbers.xhp
index 5100afd329..bed9602e84 100644
--- a/source/text/swriter/guide/captions_numbers.xhp
+++ b/source/text/swriter/guide/captions_numbers.xhp
@@ -20,50 +20,53 @@
<meta>
<topic id="textswriterguidecaptions_numbersxml" indexer="include"
status="PUBLISH">
- <title xml-lang="en-US" id="tit">Adding Chapter Numbers to
Captions</title>
+ <title xml-lang="en-US" id="tit">Adding Heading Numbers to
Captions</title>
<filename>/text/swriter/guide/captions_numbers.xhp</filename>
</topic>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="index"
id="bm_id3147684"><bookmark_value>captions; adding chapter
numbers</bookmark_value>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3147684">
+ <bookmark_value>captions; adding chapter numbers</bookmark_value>
+ <bookmark_value>captions; adding heading numbers</bookmark_value>
<bookmark_value>objects; captioning automatically</bookmark_value>
<bookmark_value>numbering; captions</bookmark_value>
<bookmark_value>automatic numbering;of objects</bookmark_value>
<bookmark_value>chapter numbers in captions</bookmark_value>
<bookmark_value>inserting;chapter numbers in captions</bookmark_value>
</bookmark>
-<h1 xml-lang="en-US" id="hd_id3147684"><variable id="captions_numbers"><link
href="text/swriter/guide/captions_numbers.xhp">Adding Chapter Numbers to
Captions</link>
+<h1 id="hd_id3147684"><variable id="captions_numbers"><link
href="text/swriter/guide/captions_numbers.xhp">Adding Heading Numbers to
Captions</link>
</variable></h1>
- <paragraph xml-lang="en-US" id="par_id3147395" role="paragraph">You can
include chapter numbers in captions.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3147408" role="paragraph">Ensure
that the text in your document is organized by chapters, and that the chapter
titles and, if you want, the section titles, use one of the predefined heading
paragraph styles. You must also assign a numbering option to the heading
paragraph styles.</paragraph>
+ <paragraph id="par_id3147395" role="paragraph">You can include heading
numbers in captions.</paragraph>
+ <paragraph id="par_id3147408" role="paragraph">Ensure that your document
has <link href="text/shared/00/00000005.xhp#heading">headings</link>. You can
use the predefined “Heading [1–10]” paragraph styles. You must also assign a
numbering scheme to the heading paragraph styles. Use <menuitem>Tools - Heading
Numbering</menuitem>.</paragraph>
<list type="ordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id3154249"
role="listitem">Select the item that you want to add a caption to.</paragraph>
+ <paragraph id="par_id3154249" role="listitem">Select the object to
get a caption.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3150503"
role="listitem">Choose <emph>Insert - Caption</emph>.</paragraph>
+ <paragraph id="par_id3150503" role="listitem">Choose <emph>Insert
- Caption</emph>.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3150527"
role="listitem">Select a caption title from the <menuitem>Category</menuitem>
box, and select a numbering scheme in the <menuitem>Numbering</menuitem> box.
<br/>You also can enter a caption text in this dialog. If you want, enter text
in the <menuitem>Caption</menuitem> box.</paragraph>
+ <paragraph id="par_id3150527" role="listitem">Select a caption
type from the <menuitem>Category</menuitem> box, and select a numbering scheme
in the <menuitem>Numbering</menuitem> box. You can enter an optional caption
text in the <menuitem>Caption</menuitem> box.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id3153166"
role="listitem">Click <emph>Options</emph>.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3153190" role="listitem">In
the <item type="menuitem">Level</item> box, select the number of heading levels
to include in the chapter number.</paragraph>
+ <paragraph id="par_id3153190" role="listitem">In the <menuitem>Up
to level</menuitem> box, select the outline level of the heading number to
display before the caption number.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3155553"
role="listitem">Type the character that you want to separate the chapter
number(s) from the caption number in the <item type="menuitem">Separator</item>
box, and then click <item type="menuitem">OK</item>.</paragraph>
+ <paragraph id="par_id3155553" role="listitem">Type the character
to appear between the heading number(s) and the caption number in the
<menuitem>Separator</menuitem> box, then click <widget>OK</widget>.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3155586" role="listitem">In
the <emph>Caption</emph> dialog, click <emph>OK</emph>.</paragraph>
+ <paragraph id="par_id3155586" role="listitem">In the
<emph>Caption</emph> dialog, click <widget>OK</widget>.</paragraph>
</listitem>
</list>
- <paragraph xml-lang="en-US" id="par_id3147226" role="tip">$[officename]
can automatically add a caption when you insert an object, graphic, or table.
Choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME -
Preferences</emph></caseinline><defaultinline><emph>Tools -
Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Writer -
AutoCaption</emph>.</paragraph>
+ <paragraph role="paragraph" id="par_id601678410274542">If the caption is
already inserted in the document, then right-click on the caption number,
choose <menuitem>Edit Fields</menuitem>, then enter values for <menuitem>Up to
level</menuitem> and <menuitem>Separator</menuitem>.</paragraph>
+ <tip id="par_id3147226">$[officename] can automatically add a caption
when you insert an object, graphic, or table. Choose <switchinline
select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME -
Preferences</emph></caseinline><defaultinline><emph>Tools -
Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Writer -
AutoCaption</emph>.</tip>
<section id="relatedtopics">
<embed href="text/swriter/guide/captions.xhp#captions"/>
<paragraph xml-lang="en-US" id="par_id3145567" role="paragraph"><link
href="text/shared/optionen/01041100.xhp">AutoCaption dialog</link></paragraph>
- <paragraph xml-lang="en-US" id="par_id3145574" role="paragraph"><link
href="text/swriter/guide/chapter_numbering.xhp">Chapter
numbering</link></paragraph>
+ <embed
href="text/swriter/guide/chapter_numbering.xhp#chapter_numbering"/>
</section>
</body>
</helpdocument>
\ No newline at end of file
diff --git a/source/text/swriter/guide/chapter_numbering.xhp
b/source/text/swriter/guide/chapter_numbering.xhp
index ac662698df..dd5a2598b5 100644
--- a/source/text/swriter/guide/chapter_numbering.xhp
+++ b/source/text/swriter/guide/chapter_numbering.xhp
@@ -57,7 +57,7 @@
</listitem>
</list>
-<h2 id="par_idN107CE" xml-lang="en-US">To Remove Automatic Chapter Numbering
From a Heading</h2>
+<h2 id="par_idN107CE" xml-lang="en-US">To Remove Automatic Numbering From a
Heading</h2>
<list type="ordered">
<listitem>
diff --git a/source/text/swriter/guide/header_with_chapter.xhp
b/source/text/swriter/guide/header_with_chapter.xhp
index 184e79ae03..b2c2f6f96f 100644
--- a/source/text/swriter/guide/header_with_chapter.xhp
+++ b/source/text/swriter/guide/header_with_chapter.xhp
@@ -38,26 +38,29 @@
<h1 id="hd_id3155919" xml-lang="en-US"><variable
id="header_with_chapter"><link
href="text/swriter/guide/header_with_chapter.xhp">Inserting a Chapter Name and
Number in a Header or a Footer</link></variable></h1>
<paragraph id="par_id3153414" role="paragraph" xml-lang="en-US">Before you can
insert chapter information into a header or footer, you must first set the
chapter numbering options for the paragraph style that you want to use for
chapter titles.</paragraph>
-<h2 id="hd_id3154244" xml-lang="en-US">To Create a Paragraph Style for Chapter
Titles</h2>
+<h2 id="hd_id3154244" xml-lang="en-US">To Prepare a Paragraph Style for
Chapter Titles</h2>
<list type="ordered">
<listitem>
- <paragraph id="par_id3155874" role="listitem" xml-lang="en-US">Choose
<menuitem>Tools - Chapter Numbering.</menuitem></paragraph>
+ <paragraph id="par_id3155874" role="listitem">Choose <menuitem>Tools -
Heading Numbering - Numbering</menuitem> tab.</paragraph>
</listitem>
<listitem>
- <paragraph id="par_id3155898" role="listitem" xml-lang="en-US">In the
<item type="menuitem">Style</item> box, select the paragraph style that you
want to use for chapter titles, for example, "Heading 1".</paragraph>
+ <paragraph id="par_id4555573" role="listitem">In the
<menuitem>Level</menuitem> box, select <literal>1</literal>.</paragraph>
</listitem>
<listitem>
- <paragraph id="par_id3147124" role="listitem" xml-lang="en-US">Select the
numbering scheme for the chapter titles in the <menuitem>Number</menuitem> box,
for example, "1,2,3...".</paragraph>
+ <paragraph id="par_id3155898" role="listitem">In the <menuitem>Paragraph
style</menuitem> box, select the paragraph style that you want to use for
chapter titles, for example, <literal>Heading 1</literal>.</paragraph>
</listitem>
<listitem>
- <paragraph id="par_id3150219" role="listitem" xml-lang="en-US">Type
"Chapter" followed by a space in the <item type="menuitem">Before</item>
box.</paragraph>
+ <paragraph id="par_id3147124" role="listitem">Select the numbering scheme
for the chapter titles in the <menuitem>Number</menuitem> box, for example,
<literal>1,2,3...</literal>.</paragraph>
</listitem>
<listitem>
- <paragraph id="par_id3150245" role="listitem" xml-lang="en-US">Enter a
space in the <item type="menuitem">After</item> box.</paragraph>
+ <paragraph id="par_id3150219" role="listitem">Type <input>Chapter</input>
followed by a space in the <menuitem>Before</menuitem> box.</paragraph>
</listitem>
<listitem>
- <paragraph id="par_id3150949" role="listitem" xml-lang="en-US">Click
<emph>OK</emph>.</paragraph>
+ <paragraph id="par_id3150245" role="listitem">Enter a space in the
<menuitem>After</menuitem> box.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id3150949" role="listitem">Click
<emph>OK</emph>.</paragraph>
</listitem>
</list>
@@ -80,13 +83,13 @@
<list type="ordered" startwith="5">
<listitem>
- <paragraph id="par_id3153175" role="listitem" xml-lang="en-US">Click
"Chapter" in the <item type="menuitem">Type</item> list and "Chapter number and
name" in the <item type="menuitem">Format</item> list.</paragraph>
+ <paragraph id="par_id3153175" role="listitem">Click
<literal>Heading</literal> in the <menuitem>Type</menuitem> list,
<literal>Heading number and contents</literal> in the
<menuitem>Format</menuitem> list, and <literal>1</literal> in <menuitem>Up to
level</menuitem>.</paragraph>
</listitem>
<listitem>
- <paragraph id="par_id3147065" role="listitem" xml-lang="en-US">Click
<emph>Insert</emph> and then click <emph>Close</emph>.</paragraph>
+ <paragraph id="par_id3147065" role="listitem">Click <emph>Insert</emph>
and then click <emph>Close</emph>.</paragraph>
</listitem>
</list>
-<paragraph id="par_id3147095" role="paragraph" xml-lang="en-US">The header on
every page that uses the current page style automatically displays the chapter
name and number.</paragraph>
+<paragraph id="par_id3147095" role="paragraph">The header on every page that
uses the current page style automatically displays the chapter name and
number.</paragraph>
<section id="relatedtopics">
<embed href="text/swriter/guide/header_footer.xhp#header_footer"/>
<embed href="text/swriter/guide/change_header.xhp#change_header"/>
diff --git a/source/text/swriter/guide/indices_toc.xhp
b/source/text/swriter/guide/indices_toc.xhp
index 5f2d4a2f89..1ff06a2394 100644
--- a/source/text/swriter/guide/indices_toc.xhp
+++ b/source/text/swriter/guide/indices_toc.xhp
@@ -44,25 +44,25 @@
<list type="ordered">
<listitem>
- <paragraph id="par_id3150510" role="listitem" xml-lang="en-US">Click in
your document where you want to create the table of contents.</paragraph>
+ <paragraph id="par_id3150510" role="listitem">Click in your document where
you want to create the table of contents.</paragraph>
</listitem>
<listitem>
- <paragraph id="par_id3150528" role="listitem" xml-lang="en-US">Choose
<emph>Insert - Table of Contents and Index - Table of Contents, Index or
Bibliography</emph>, and then click the <link
href="text/swriter/01/04120211.xhp"><emph>Type</emph></link> tab.</paragraph>
+ <paragraph id="par_id3150528" role="listitem">Choose <emph>Insert - Table
of Contents and Index - Table of Contents, Index or Bibliography</emph>, and
then click the <link
href="text/swriter/01/04120211.xhp"><emph>Type</emph></link> tab.</paragraph>
</listitem>
<listitem>
- <paragraph id="par_id3153746" role="listitem" xml-lang="en-US">Select
"Table of Contents" in the <emph>Type</emph> box.</paragraph>
+ <paragraph id="par_id3153746" role="listitem">Select "Table of Contents"
in the <emph>Type</emph> box.</paragraph>
</listitem>
<listitem>
- <paragraph id="par_id3146856" role="listitem" xml-lang="en-US">Select any
options that you want.</paragraph>
+ <paragraph id="par_id3146856" role="listitem">Select any options that you
want.</paragraph>
</listitem>
<listitem>
- <paragraph id="par_id3146872" role="listitem" xml-lang="en-US">Click
<emph>OK</emph>.</paragraph>
+ <paragraph id="par_id3146872" role="listitem">Click
<emph>OK</emph>.</paragraph>
</listitem>
</list>
-<paragraph id="par_id3146896" role="paragraph" xml-lang="en-US">If you want to
use a different paragraph style as a table of contents entry, select the
<menuitem>Additional Styles</menuitem> check box in the <menuitem>Create
from</menuitem> area, and then click the <menuitem>Assign styles</menuitem>
button next to the check box. In the <menuitem>Assign Styles</menuitem> dialog,
click the style in the list, and then click the <menuitem>>></menuitem>
or the <menuitem><<</menuitem> button to define the outline level for the
paragraph style.</paragraph>
+<paragraph id="par_id3146896" role="paragraph">If you want to use a different
paragraph style as a table of contents entry, select the <menuitem>Additional
Styles</menuitem> check box in the <menuitem>Create from</menuitem> area, and
then click the <menuitem>Assign styles</menuitem> button next to the check box.
In the <menuitem>Assign Styles</menuitem> dialog, click the style in the
<menuitem>Style</menuitem> list, and then click the index level for the
selected style.</paragraph>
</section>
<section id="emptyentry">
-<tip id="par_id1001574720273772">%PRODUCTNAME creates the table of contents
entries based on the outline level of the paragraph style and the paragraph
contents. If the paragraph is empty, it will not be included in the table of
contents. To force the empty paragraph to be listed in the table of contents,
manually add a space or a non breaking space to the paragraph. Spaces added in
the <emph>After</emph> text box of the Numbering tab in the Chapter Numbering
dialog will not work for this purpose, since they are part of the paragraph
numbering, not the paragraph contents.</tip>
+<tip id="par_id1001574720273772">%PRODUCTNAME creates the table of contents
entries based on the outline level of the paragraph style and the paragraph
contents. If the paragraph is empty, it will not be included in the table of
contents. To force the empty paragraph to be listed in the table of contents,
manually add a space or a non breaking space to the paragraph. Spaces added in
the <emph>After</emph> text box of the Numbering tab in the Heading Numbering
dialog will not work for this purpose, since they are part of the paragraph
numbering, not the paragraph contents.</tip>
</section>
<h2 id="hd_id3153148">To Update a Table of Contents</h2>
<paragraph id="par_id3153161" role="paragraph" xml-lang="en-US">Do one of the
following:</paragraph>
@@ -74,7 +74,7 @@
<listitem>
<paragraph id="par_id3147066" role="listitem" xml-lang="en-US">Choose
<emph>Tools - Update - All Indexes and Tables</emph>.</paragraph>
</listitem></list>
-<embed href="text/shared/00/00000004.xhp#related"/>
+<section id="relatedtopics">
<embed href="text/swriter/guide/indices_enter.xhp#indices_enter"/>
<embed href="text/swriter/guide/indices_edit.xhp#indices_edit"/>
<embed href="text/swriter/guide/indices_form.xhp#indices_form"/>
@@ -83,6 +83,7 @@
<embed href="text/swriter/guide/indices_userdef.xhp#indices_userdef"/>
<embed href="text/swriter/guide/indices_literature.xhp#indices_literature"/>
<embed href="text/swriter/guide/indices_multidoc.xhp#indices_multidoc"/>
+</section>
</body>
</helpdocument>
diff --git a/source/text/swriter/guide/using_numbering.xhp
b/source/text/swriter/guide/using_numbering.xhp
index 5c39a38cdb..63df272ad7 100644
--- a/source/text/swriter/guide/using_numbering.xhp
+++ b/source/text/swriter/guide/using_numbering.xhp
@@ -35,7 +35,7 @@
<h1 id="hd_id3155174"><variable id="using_numbering"><link
href="text/swriter/guide/using_numbering.xhp">Numbering and Paragraph
Styles</link>
</variable></h1>
<paragraph id="par_id3149818" role="paragraph">You can apply numbering to a
paragraph manually or with a paragraph style.</paragraph>
- <note id="par_id31616154131555">If you want numbered headings, use
<menuitem>Tools - </menuitem><link href="text/swriter/01/06060000.xhp">Chapter
Numbering</link>, instead of numbering manually.</note>
+ <note id="par_id31616154131555">If you want numbered headings, use
<menuitem>Tools - </menuitem><link href="text/swriter/01/06060000.xhp">Heading
Numbering</link>, instead of numbering manually.</note>
<h2 id="hd_id6140629">To Apply Numbering Manually</h2>
<paragraph id="par_id3155866" role="listitem">To apply numbering manually,
click in the paragraph, and then click the <menuitem>Toggle Ordered
List</menuitem> icon on the <menuitem>Formatting</menuitem> bar, or use the
dropdown box on the icon to select a numbering format.</paragraph>
<note id="par_id3153405">You cannot apply manual numbering to paragraphs
that are listed under "Special Styles" in the Styles window.</note>
