tdf#153561 Untangle the "Format" options

"Format" appears both as a section title and a label with a buddy
control for the "Heading Info" element. This distinction does not
appear in the different "entries" help pages.  This patch untangles
the different embeddings that are used, so that the help pages
for Entries for each index type will correspond to the dialog for
that type.  This patch only changes the entries page for
"Table of Contents" and "Alphabetical Index", where some new sections
are created. The sections in these two pages are embedded in the
Entries pages for the other index types. These other pages will be
updated after the sections in this patch are available for embedding.

Change-Id: I5ed12506666af2ac04009e833b8bef37fff9485e
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/148754
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin <sdc.blanco@youmail.dk>

2 files changed, 19 insertions, 12 deletions

diff --git a/source/text/swriter/01/04120221.xhp b/source/text/swriter/01/04120221.xhp
index f32def1954..fff370e423 100644
--- a/source/text/swriter/01/04120221.xhp
+++ b/source/text/swriter/01/04120221.xhp
@@ -94,20 +94,22 @@
 <paragraph id="par_id3153631" role="paragraph"><ahelp hid="modules/swriter/ui/tocentriespage/hyperlink">Creates a hyperlink for the part of the entry that you enclose by the opening (LS) and the closing (LE) hyperlink tags. On the <emph>Structure </emph>line, click in the empty box in front of the part that you want to create a hyperlink for, and then click this button. Click in the empty box after the part that you want to hyperlink, and then click this button again. All hyperlinks must be unique. Available only for a table of contents.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tocentriespage/all" id="bm_id3152778" localize="false"/>
 
+<section id="structure2">
 <h3 id="hd_id3152766">All</h3>
 <paragraph id="par_id3155137" role="paragraph"><ahelp hid="modules/swriter/ui/tocentriespage/all">Applies the current settings to all levels without closing the dialog.</ahelp></paragraph>
 
-<section id="structure2">
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tocentriespage/charstyle" id="bm_id3156270" localize="false"/>
 
 <h3 id="hd_id3153355">Character Style</h3>
-<paragraph id="par_id3156277" role="paragraph"><ahelp hid="modules/swriter/ui/tocentriespage/charstyle">Specify the formatting style for the selected part on the <emph>Structure line</emph>.</ahelp></paragraph>
+<paragraph id="par_id3156277" role="paragraph"><ahelp hid="modules/swriter/ui/tocentriespage/charstyle">Specify a character style for the selected icon in the <menuitem>Structure</menuitem>.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tocentriespage/edit" id="bm_id3145784" localize="false"/>
 
 <h3 id="hd_id3145772">Edit</h3>
 <paragraph id="par_id3151372" role="paragraph"><ahelp hid="modules/swriter/ui/tocentriespage/edit">Opens a dialog where you can edit the selected character style.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tocentriespage/fillchar" id="bm_id3155921" localize="false"/>
-
+</section>
+<section id="tab_options">
+<note id="par_id771678639495231">The next three options are available when the <widget>T</widget> icon is selected.</note>
 <h3 id="hd_id3155909">Fill character</h3>
 <paragraph id="par_id3150112" role="paragraph"><ahelp hid="modules/swriter/ui/tocentriespage/fillchar">Select the tab leader that you want use.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tocentriespage/tabstoppos" id="bm_id3155871" localize="false"/>
@@ -119,18 +121,19 @@
 <h3 id="hd_id3147415">Align right</h3>
 <paragraph id="par_id3147495" role="paragraph"><ahelp hid="modules/swriter/ui/tocentriespage/alignright">Aligns the tab stop to the right page margin.</ahelp></paragraph>
 </section>
-
-<section id="format">
+<note id="par_id811678639732439">The next two options are available when the <widget>N# </widget> icon is selected.</note>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tocentriespage/numberformat" id="bm_id9986877" localize="false"/>
 
 <h3 id="hd_id3145269">Format</h3>
 <paragraph id="par_id6499221" role="paragraph"><ahelp hid=".">Only visible when you click the <widget>N#</widget> button in the Structure line. Select to show the heading number with or without separator.</ahelp></paragraph>
 <embed href="text/swriter/01/04120222.xhp#eval"/>
+<section id="format">
+<h2 id="hd_id841678636482726">Format</h2>
+</section>
+<section id="tab_relative">
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tocentriespage/reltostyle" id="bm_id3150547" localize="false"/>
-
 <h3 id="hd_id3149559">Tab position relative to Paragraph Style indent</h3>
 <paragraph id="par_id3150554" role="paragraph"><ahelp hid="modules/swriter/ui/tocentriespage/reltostyle">Positions the tab stop relative to the "indent from left" value defined in the paragraph style selected on the <emph>Styles</emph> tab. Otherwise the tab stop is positioned relative to the left text margin.</ahelp></paragraph>
 </section>
 </body>
-
 </helpdocument>
diff --git a/source/text/swriter/01/04120222.xhp b/source/text/swriter/01/04120222.xhp
index 7d075020c2..eb1cc350f4 100644
--- a/source/text/swriter/01/04120222.xhp
+++ b/source/text/swriter/01/04120222.xhp
@@ -40,17 +40,20 @@
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tocentriespage/chapterinfo" id="bm_id3154566" localize="false"/>
 <h3 id="hd_id3152957">Heading info (HI)</h3>
 <paragraph role="paragraph" id="par_id3154573"><ahelp hid="modules/swriter/ui/tocentriespage/chapterinfo">Inserts heading information such as heading number or heading contents. Click on the <widget>HI</widget> icon to select what information to display.</ahelp></paragraph>
+</section>
+<embed href="text/swriter/01/04120221.xhp#page_number"/>
+<embed href="text/swriter/01/04120221.xhp#structure2"/>
+<embed href="text/swriter/01/04120221.xhp#tab_options"/>
+<section id="headinginfo">
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tocentriespage/chapterentry" id="bm_id3154196" localize="false"/>
-<h4 id="hd_id3149692">Heading info</h4>
+<h3 id="hd_id3149692">Heading info</h3>
 <paragraph role="paragraph" id="par_id3155174"><ahelp hid="modules/swriter/ui/tocentriespage/chapterentry">Select the heading information to include in the index entry.</ahelp></paragraph>
+</section>
 <section id="eval">
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tocentriespage/entryoutlinelevel" id="bm_id354930" localize="false"/>
-<h4 id="hd_id7605517">Show up to level</h4>
+<h3 id="hd_id7605517">Show up to level</h3>
 <paragraph role="paragraph" id="par_id6739402"><ahelp hid=".">Enter the maximum number of levels to show of the heading number. For example, select “3” to show up to three levels. If the heading number has fewer than three levels, then the actual number is shown.</ahelp></paragraph>
 </section>
-</section>
-<embed href="text/swriter/01/04120221.xhp#page_number"/>
-<embed href="text/swriter/01/04120221.xhp#structure2"/>
 <embed href="text/swriter/01/04120221.xhp#format"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tocentriespage/mainstyle" id="bm_id3149102" localize="false"/>
 <h3 id="hd_id3149493">Character Style for main entries</h3>
@@ -61,5 +64,6 @@
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tocentriespage/commasep" id="bm_id3149043" localize="false"/>
 <h3 id="hd_id3147226">Key separated by commas</h3>
 <paragraph role="paragraph" id="par_id3153631"><ahelp hid="modules/swriter/ui/tocentriespage/commasep">Arranges the index entries on the same line, separated by commas.</ahelp></paragraph>
+<embed href="text/swriter/01/04120221.xhp#tab_relative"/>
 </body>
 </helpdocument>