source/text/swriter/01/04060000.xhp | 26 ++++++++++++++------------
source/text/swriter/01/04060100.xhp | 24 +++++++++++++-----------
2 files changed, 27 insertions(+), 23 deletions(-)
New commits:
commit 7266a58cba3c89fdf9cd7100c00ef360e8d45e08
Author: Seth Chaiklin <sdc.bla...@youmail.dk>
AuthorDate: Fri Jan 27 23:40:46 2023 +0000
Commit: Seth Chaiklin <sdc.bla...@youmail.dk>
CommitDate: Sat Feb 11 17:53:38 2023 +0000
tdf#153122: Add missing controls to Caption and Caption Options help
swriter/01/04060000.xhp
+ add Numbering Separator control and description
* move position of "Caption" to correspond to order in dialog
* refactor <h1>,<h2>,<h3>,<relatedtopics>
swriter/01/04060100.xhp
+ add Caption section title
+ add Caption Ordering control and description
* refactor <h1>,<h2>,<h3>,<relatedtopics>
Change-Id: I0d97dfcc0ca9083e5eec20f679d5634764764872
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/146208
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin <sdc.bla...@youmail.dk>
diff --git a/source/text/swriter/01/04060000.xhp
b/source/text/swriter/01/04060000.xhp
index c5eb94e0d1..9131fb75ef 100644
--- a/source/text/swriter/01/04060000.xhp
+++ b/source/text/swriter/01/04060000.xhp
@@ -33,46 +33,48 @@
<section id="caption">
-<paragraph id="hd_id3147173" role="heading" level="1" xml-lang="en-US"><link
href="text/swriter/01/04060000.xhp">Caption</link></paragraph>
+<h1 id="hd_id3147173" xml-lang="en-US"><link
href="text/swriter/01/04060000.xhp">Caption</link></h1>
<paragraph id="par_id3149288" role="paragraph" xml-lang="en-US"><variable
id="beschrifttext"><ahelp hid=".">Adds a numbered caption to a selected image,
table, chart, frame, or shape.</ahelp> You can also access this command by
right-clicking the item that you want to add the caption to.
</variable></paragraph>
</section>
<section id="howtoget">
<embed href="text/swriter/00/00000404.xhp#insert_caption"/>
</section>
+<h2 id="hd_id3155893" xml-lang="en-US">Caption</h2>
+<paragraph id="par_id3149688" role="paragraph" xml-lang="en-US">Type the text
that you want to appear after the caption number.</paragraph>
-<paragraph id="hd_id3154098" role="heading" level="2"
xml-lang="en-US">Properties</paragraph>
+<h2 id="hd_id3154098" xml-lang="en-US">Properties</h2>
<paragraph id="par_id3149804" role="paragraph" xml-lang="en-US">Set the
caption options for the current selection.</paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/insertcaption/category" id="bm_id3154567"
localize="false"/>
-<paragraph id="hd_id3153533" role="heading" level="3"
xml-lang="en-US">Category</paragraph>
+<h3 id="hd_id3153533" xml-lang="en-US">Category</h3>
<paragraph id="par_id3154574" role="paragraph" xml-lang="en-US"><ahelp
hid="modules/swriter/ui/insertcaption/category">Select the caption category, or
type a name to create a new category. The category text appears before the
caption number in the caption label. Each predefined caption category is
formatted with a paragraph style of the same name. </ahelp> For example, the
"Illustration" caption category is formatted with the "Illustration" paragraph
style.</paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/insertcaption/numbering" id="bm_id3152956"
localize="false"/>
-<paragraph id="hd_id3153675" role="heading" level="3"
xml-lang="en-US">Numbering</paragraph>
+<h3 id="hd_id3153675" xml-lang="en-US">Numbering</h3>
<paragraph id="par_id3152962" role="paragraph" xml-lang="en-US"><ahelp
hid="modules/swriter/ui/insertcaption/numbering">Select the type of numbering
that you want to use in the caption.</ahelp></paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/insertcaption/num_separator_edit"
id="bm_id3155905" localize="false"/>
-<paragraph id="hd_id3155893" role="heading" level="3"
xml-lang="en-US">Caption</paragraph>
-<paragraph id="par_id3149688" role="paragraph" xml-lang="en-US"><ahelp
hid="modules/swriter/ui/insertcaption/num_separator_edit">Type the text that
you want to appear after the caption number.</ahelp></paragraph>
+<h3 id="hd_id661675732010450">Numbering separator</h3>
+<paragraph role="paragraph" id="par_id871675733307406"><ahelp
hid="modules/swriter/ui/insertcaption/num_separator_edit">Enter optional text
characters to appear between numbering and category.</ahelp> Only active when
<menuitem>Numbering first</menuitem> is selected for <menuitem>Caption
order</menuitem> in <link
href="text/swriter/01/04060100.xhp">Options</link>.</paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/insertcaption/separator_edit" id="bm_id7607959"
localize="false"/>
-<paragraph id="par_idN1068A" role="heading" level="3"
xml-lang="en-US">Separator</paragraph>
+<h3 id="par_idN1068A" xml-lang="en-US">Separator</h3>
<paragraph id="par_idN10690" role="paragraph" xml-lang="en-US"><ahelp
hid=".">Enter optional text characters to appear between the number and the
caption text.</ahelp></paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/insertcaption/position" id="bm_id4664754"
localize="false"/><comment>moved help id to here</comment>
-<paragraph id="hd_id3154199" role="heading" level="3"
xml-lang="en-US">Position</paragraph>
+<h3 id="hd_id3154199" xml-lang="en-US">Position</h3>
<paragraph id="par_id3149486" role="paragraph" xml-lang="en-US"><ahelp
hid="modules/swriter/ui/insertcaption/position">Adds the caption above or below
the selected item. This option is only available for some
objects.</ahelp></paragraph>
-<paragraph id="hd_id3149043" role="heading" level="2" xml-lang="en-US"><link
href="text/swriter/01/04060100.xhp">Options</link></paragraph>
+<h2 id="hd_id3149043" xml-lang="en-US"><link
href="text/swriter/01/04060100.xhp">Options</link></h2>
<embed href="text/swriter/01/04060100.xhp#optionentext"/>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/insertcaption/auto"
id="bm_id72939" localize="false"/>
-<paragraph id="par_idN10744" role="heading" level="2"
xml-lang="en-US">AutoCaption</paragraph>
+<h2 id="par_idN10744" xml-lang="en-US">AutoCaption</h2>
<paragraph id="par_idN1074A" role="paragraph" xml-lang="en-US"><ahelp
hid=".">Opens the Caption dialog. It has the same information as the dialog you
get by menu %PRODUCTNAME Writer - AutoCaption in the Options dialog
box.</ahelp></paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
+<section id="relatedtopics">
<embed href="text/swriter/guide/captions.xhp#captions"/>
<embed href="text/swriter/guide/captions_numbers.xhp#captions_numbers"/>
+</section>
</body>
-
</helpdocument>
diff --git a/source/text/swriter/01/04060100.xhp
b/source/text/swriter/01/04060100.xhp
index f3cf33a603..7c6cc2d19b 100644
--- a/source/text/swriter/01/04060100.xhp
+++ b/source/text/swriter/01/04060100.xhp
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
<!--
* This file is part of the LibreOffice project.
*
@@ -19,7 +18,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-<helpdocument version="1.0">
<meta>
<topic id="textswriter0104060100xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Options</title>
@@ -31,7 +29,7 @@
</meta>
<body>
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/insertcaption/options" id="bm_id3151170"
localize="false"/>
-<paragraph role="heading" id="hd_id3149287" xml-lang="en-US"
level="1">Options</paragraph>
+<h1 id="hd_id3149287" xml-lang="en-US">Options</h1>
<paragraph role="paragraph" id="par_id3151177" xml-lang="en-US"><variable
id="optionentext"><ahelp hid="modules/swriter/ui/insertcaption/options">Adds
the chapter number to the caption label. To use this feature, you must first
assign an <link href="text/swriter/guide/chapter_numbering.xhp">outline
level</link> to a paragraph style, and then apply the style to the chapter
headings in your document.</ahelp>
</variable></paragraph>
<section id="howtoget">
@@ -39,24 +37,28 @@
</section>
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/captionoptions/@@nowidget@@"
id="bm_@@nowidget@@" localize="false"/>
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/captionoptions/CaptionOptionsDialog"
id="bm_id3151174" localize="false"/>
-<paragraph role="heading" id="hd_id3149805" xml-lang="en-US"
level="2">Numbering by chapter</paragraph>
+<h2 id="hd_id3149805" xml-lang="en-US">Numbering by chapter</h2>
<paragraph role="paragraph" id="par_id3153532" xml-lang="en-US">When you add
chapter numbers to caption labels, the caption numbering is reset when a
chapter heading is encountered. For example, if the last figure in chapter 1 is
"Figure 1.12", the first figure in the next chapter would be "Figure
2.1".</paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/captionoptions/level" id="bm_id3154479"
localize="false"/>
-<paragraph role="heading" id="hd_id3154574" xml-lang="en-US"
level="3">Level</paragraph>
+<h3 id="hd_id3154574" xml-lang="en-US">Level</h3>
<paragraph role="paragraph" id="par_id3152954" xml-lang="en-US"><ahelp
hid="modules/swriter/ui/captionoptions/level">Select the number of outline
levels from the top of the chapter hierarchy down to include in the caption
label.</ahelp></paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/captionoptions/separator" id="bm_id3153672"
localize="false"/>
-<paragraph role="heading" id="hd_id3151316" xml-lang="en-US"
level="3">Separator</paragraph>
+<h3 id="hd_id3151316" xml-lang="en-US">Separator</h3>
<paragraph role="paragraph" id="par_id3155892" xml-lang="en-US"><ahelp
hid="modules/swriter/ui/captionoptions/separator">Enter the character that you
want to insert between the chapter number and the caption
number.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN10633" xml-lang="en-US"
level="2">Category and frame format</paragraph>
+<h2 id="par_idN10633" xml-lang="en-US">Category and frame format</h2>
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/captionoptions/style" id="bm_id8001037"
localize="false"/>
-<paragraph role="heading" id="par_idN10639" xml-lang="en-US"
level="3">Character style</paragraph>
+<h3 id="par_idN10639" xml-lang="en-US">Character style</h3>
<paragraph role="paragraph" id="par_idN1063F" xml-lang="en-US"><ahelp
hid=".">Specifies the character style.</ahelp></paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/captionoptions/border_and_shadow"
id="bm_id2826013" localize="false"/>
-<paragraph role="heading" id="hd_id3143280" xml-lang="en-US" level="3">Apply
border and shadow</paragraph>
+<h3 id="hd_id3143280" xml-lang="en-US">Apply border and shadow</h3>
<paragraph role="paragraph" id="par_id3149826" xml-lang="en-US"><ahelp
hid="modules/swriter/ui/captionoptions/border_and_shadow">Applies the border
and shadow of the object to the caption frame.</ahelp></paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
+<h2 id="hd_id151675734641196">Caption</h2>
+<h3 id="hd_id751675734666407">Caption order</h3>
+<paragraph role="paragraph" id="par_id241675734682855">Select ordering of
category label and numbering.</paragraph>
+<section id="relatedtopics">
<embed href="text/swriter/guide/captions_numbers.xhp#captions_numbers"/>
<embed href="text/swriter/guide/captions.xhp#captions"/>
<embed href="text/swriter/guide/chapter_numbering.xhp#chapter_numbering"/>
+</section>
</body>
</helpdocument>
