diff options
| author | Olivier Hallot <olivier.hallot@libreoffice.org> | 2019-11-25 20:38:07 -0300 |
|---|---|---|
| committer | Olivier Hallot <olivier.hallot@libreoffice.org> | 2019-11-26 12:50:48 +0100 |
| commit | 4565470d0002acfa81f346cbb86144abc5399f0f (patch) | |
| tree | 1b116f6984d1fd1494aa97026fcc39e82631a98d | |
| parent | 57c5e2761675d20ec5df1b55300a60e3aa0d7a47 (diff) | |
Clarify handling of empty paragraph in TOC
Empty heading or paragraph will not display in TOC.
Change-Id: Ia7549d8f22ccf63148150140cd1ccd0bf3b3aba0
Reviewed-on: https://gerrit.libreoffice.org/83720
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
(cherry picked from commit 48eee4cf96c555a986ec6b8836373eb15445ff9f)
Reviewed-on: https://gerrit.libreoffice.org/83751
| -rw-r--r-- | source/text/swriter/01/04120211.xhp | 25 | ||||
| -rw-r--r-- | source/text/swriter/guide/indices_enter.xhp | 12 | ||||
| -rw-r--r-- | source/text/swriter/guide/indices_toc.xhp | 10 |
3 files changed, 26 insertions, 21 deletions
diff --git a/source/text/swriter/01/04120211.xhp b/source/text/swriter/01/04120211.xhp index ff99ad8d3b..0e3ed0decf 100644 --- a/source/text/swriter/01/04120211.xhp +++ b/source/text/swriter/01/04120211.xhp @@ -29,52 +29,53 @@ <body> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tocindexpage/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tocindexpage/TocIndexPage" id="bm_id3145247" localize="false"/> -<paragraph xml-lang="en-US" id="hd_id3150018" role="heading" level="1"><link href="text/swriter/01/04120211.xhp" name="Index">Index</link></paragraph> +<h1 id="hd_id3150018"><link href="text/swriter/01/04120211.xhp" name="Index">Index</link></h1> <paragraph xml-lang="en-US" id="par_id3150570" role="paragraph"><variable id="verzeichnis">The following options are available when you select <emph>Table of Contents </emph>as the <link href="text/swriter/01/04120210.xhp" name="index">index</link> type. </variable></paragraph> <section id="howtoget"> <embed href="text/swriter/00/00000404.xhp#verz21"/> </section> <section id="typtitel"> - <paragraph xml-lang="en-US" id="hd_id3150763" role="heading" level="2">Type and Title</paragraph> + <h2 id="hd_id3150763">Type and Title</h2> <paragraph xml-lang="en-US" id="par_id3149286" role="paragraph">Specify the type and title of the index.</paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tocindexpage/type" id="bm_id3145412" localize="false"/> -<paragraph xml-lang="en-US" id="hd_id3151171" role="heading" level="3">Type</paragraph> +<h3 id="hd_id3151171">Type</h3> <paragraph xml-lang="en-US" id="par_id3145418" role="paragraph"><ahelp hid="modules/swriter/ui/tocindexpage/type">Select the type of index that you want to insert.</ahelp> The options available on this tab depend on the index type that you select. If the cursor is in an index when you choose the <emph>Insert - Table of Contents and Index - Table of Contents, Index or Bibliography</emph>, you can then edit that index.</paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tocindexpage/title" id="bm_id3149812" localize="false"/> -<paragraph xml-lang="en-US" id="hd_id3149801" role="heading" level="3">Title</paragraph> +<h3 id="hd_id3149801">Title</h3> <paragraph xml-lang="en-US" id="par_id3153532" role="paragraph"><ahelp hid="modules/swriter/ui/tocindexpage/title">Enter a title for the selected index.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tocindexpage/readonly" id="bm_id3154477" localize="false"/> -<paragraph xml-lang="en-US" id="hd_id3151317" role="heading" level="3">Protected against manual changes</paragraph> +<h3 id="hd_id3151317">Protected against manual changes</h3> <paragraph xml-lang="en-US" id="par_id3153665" role="paragraph"><ahelp hid="modules/swriter/ui/tocindexpage/readonly">Prevents the contents of the index from being changed.</ahelp> Manual changes that you make to an index are lost when the index is refreshed. If you want the cursor to scroll through a protected area, choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Writer - Formatting Aids</emph>, and then select the <emph>Enable cursor</emph> check box in the <emph>Protected Areas</emph> section.</paragraph> </section> <section id="verzfuer"> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tocindexpage/scope" id="bm_id3155904" localize="false"/> -<paragraph xml-lang="en-US" id="hd_id3155893" role="heading" level="2">Create index for</paragraph> +<h2 id="hd_id3155893">Create index for</h2> <paragraph xml-lang="en-US" id="par_id3149688" role="paragraph"><ahelp hid="modules/swriter/ui/tocindexpage/scope">Select whether to create the index for the document or for the current chapter.</ahelp></paragraph> </section> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tocindexpage/level" id="bm_id3155181" localize="false"/> -<paragraph xml-lang="en-US" id="hd_id3154199" role="heading" level="3">Evaluation level</paragraph> +<h3 id="hd_id3154199">Evaluation level</h3> <paragraph xml-lang="en-US" id="par_id3143270" role="paragraph"><ahelp hid="modules/swriter/ui/tocindexpage/level">Enter the number of heading levels to include in the index.</ahelp></paragraph> - <paragraph xml-lang="en-US" id="hd_id3149484" role="heading" level="2">Create from</paragraph> + <h2 id="hd_id3149484">Create from</h2> <paragraph xml-lang="en-US" id="par_id3149096" role="paragraph">Use this area to specify which information to include in an index.</paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tocindexpage/fromheadings" id="bm_id3149826" localize="false"/> -<paragraph xml-lang="en-US" id="hd_id3149815" role="heading" level="3">Outline</paragraph> +<h3 id="hd_id3149815">Outline</h3> <paragraph xml-lang="en-US" id="par_id3151253" role="paragraph"><ahelp hid="modules/swriter/ui/tocindexpage/fromheadings">Creates the index using outline levels, that is, paragraphs formatted with one of the predefined heading styles (Heading 1-10) are added to the index.</ahelp></paragraph> <paragraph xml-lang="en-US" id="par_id1209200804373840" role="paragraph">You can also assign the outline levels in the <link href="text/swriter/01/05030800.xhp">Outline & Numbering</link> tab page of the Format - Paragraph dialog.</paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tocindexpage/addstylescb" id="bm_id3152766" localize="false"/> -<paragraph xml-lang="en-US" id="hd_id3153633" role="heading" level="3">Additional Styles</paragraph> +<h3 id="hd_id3153633">Additional Styles</h3> <paragraph xml-lang="en-US" id="par_id3152772" role="paragraph"><variable id="vorlg"><ahelp hid="modules/swriter/ui/tocindexpage/addstylescb">Includes the paragraph styles that you specify in the <emph>Assign Styles</emph> dialog as index entries. To select the paragraph styles that you want to include in the index, click the <emph>Assign Styles (...)</emph> button to the right of this box.</ahelp> </variable></paragraph> <tip id="par_id41550528154857">You can include the Figure Index Heading or Bibliography Heading styles, as well as any other relevant heading style, to the Table of Contents.</tip> <section id="buttonvor"> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tocindexpage/styles" id="bm_id3149180" localize="false"/> -<paragraph xml-lang="en-US" id="hd_id3149168" role="heading" level="3">Assign styles</paragraph> +<h3 id="hd_id3149168">Assign styles</h3> <paragraph xml-lang="en-US" id="par_id3145776" role="paragraph"><ahelp hid="modules/swriter/ui/tocindexpage/styles">Opens the <emph>Assign Styles</emph> dialog, where you can select the paragraph styles to include in the index. Choose the proper heading level on which the style will be included in the index.</ahelp></paragraph> </section> + <embed href="text/swriter/guide/indices_toc.xhp#emptyentry"/> <section id="verzmark"> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tocindexpage/indexmarks" id="bm_id3155854" localize="false"/> -<paragraph xml-lang="en-US" id="hd_id3151374" role="heading" level="3">Index marks</paragraph> +<h3 id="hd_id3151374">Index marks</h3> <paragraph xml-lang="en-US" id="par_id3155861" role="paragraph"><ahelp hid="modules/swriter/ui/tocindexpage/indexmarks">Includes the index entries that you inserted by choosing <emph>Insert - Table of Contents and Index - Index Entry</emph> in the index.</ahelp></paragraph> </section> </body> diff --git a/source/text/swriter/guide/indices_enter.xhp b/source/text/swriter/guide/indices_enter.xhp index 3fd81468fc..7841d0a72f 100644 --- a/source/text/swriter/guide/indices_enter.xhp +++ b/source/text/swriter/guide/indices_enter.xhp @@ -34,9 +34,9 @@ </bookmark> -<paragraph id="hd_id3149689" role="heading" level="1" xml-lang="en-US"><variable id="indices_enter"><link href="text/swriter/guide/indices_enter.xhp" name="Defining Index or Table of Contents Entries">Defining Index or Table of Contents Entries</link></variable></paragraph> +<h1 id="hd_id3149689"><variable id="indices_enter"><link href="text/swriter/guide/indices_enter.xhp" name="Defining Index or Table of Contents Entries">Defining Index or Table of Contents Entries</link></variable></h1> -<paragraph id="hd_id3155862" role="heading" level="2" xml-lang="en-US">To Define Index Entries</paragraph> +<h2 id="hd_id3155862">To Define Index Entries</h2> <list type="ordered"> <listitem> @@ -58,10 +58,10 @@ <paragraph id="par_id3155889" role="listitem" xml-lang="en-US">To add the entries to a custom index, click the <emph>New User-defined Index</emph> icon, enter the name of the index, and then click <emph>OK</emph>.</paragraph> </listitem></list> -<paragraph id="hd_id3147119" role="heading" level="2" xml-lang="en-US">To Define Table of Contents Entries</paragraph> +<h2 id="hd_id3147119">To Define Table of Contents Entries</h2> <paragraph id="par_id3147132" role="paragraph" xml-lang="en-US">The best way to generate a table of contents is to apply the predefined heading paragraph styles, such as "Heading 1", to the paragraphs that you want to include in your table of contents.</paragraph> -<paragraph id="hd_id3150230" role="heading" level="3" xml-lang="en-US">To Use a Custom Paragraph Style as a Table of Contents Entry</paragraph> +<h3 id="hd_id3150230">To Use a Custom Paragraph Style as a Table of Contents Entry</h3> <list type="ordered"> <listitem> @@ -77,7 +77,8 @@ <paragraph id="par_id3153730" role="listitem" xml-lang="en-US">Click <emph>OK</emph>. You can now apply the style to headings in your document and include them in your table of contents. </paragraph> </listitem> </list> -<embed href="text/shared/00/00000004.xhp#related"/> +<embed href="text/swriter/guide/indices_toc.xhp#emptyentry"/> +<section id="relatedtopics"> <embed href="text/swriter/guide/indices_toc.xhp#indices_toc"/> <embed href="text/swriter/guide/indices_edit.xhp#indices_edit"/> <embed href="text/swriter/guide/indices_form.xhp#indices_form"/> @@ -86,6 +87,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/indices_toc.xhp b/source/text/swriter/guide/indices_toc.xhp index 7689e12b48..e81e93091a 100644 --- a/source/text/swriter/guide/indices_toc.xhp +++ b/source/text/swriter/guide/indices_toc.xhp @@ -35,12 +35,12 @@ <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tocdialog/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tocdialog/TocDialog" id="bm_id3154749" localize="false"/> -<paragraph id="hd_id3147104" role="heading" level="1" xml-lang="en-US"><variable id="indices_toc"><link href="text/swriter/guide/indices_toc.xhp" name="Creating a Table of Contents">Creating a Table of Contents</link></variable></paragraph> +<h1 id="hd_id3147104"><variable id="indices_toc"><link href="text/swriter/guide/indices_toc.xhp" name="Creating a Table of Contents">Creating a Table of Contents</link></variable></h1> <section id="tomanual"> <paragraph id="par_id3150942" role="paragraph" xml-lang="en-US">The best way to generate a table of contents is to apply the predefined heading paragraph styles, such as "Heading 1", to the paragraphs that you want to include in your table of contents. After you apply these styles, you can then create a table of contents.</paragraph> -<paragraph id="hd_id5876949" role="heading" level="2" xml-lang="en-US">To Insert a Table of Contents</paragraph> +<h2 id="hd_id5876949">To Insert a Table of Contents</h2> <list type="ordered"> <listitem> @@ -61,8 +61,10 @@ </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 <item type="menuitem">Additional Styles</item> check box in the <item type="menuitem">Create from</item> area, and then click the <item type="menuitem">Assign styles</item> button next to the check box. In the <item type="menuitem">Assign Styles</item> dialog, click the style in the list, and then click the <item type="menuitem">>></item> or the <item type="menuitem"><<</item> button to define the chapter level for the paragraph style.</paragraph> </section> - -<paragraph id="hd_id3153148" role="heading" level="2" xml-lang="en-US">To Update a Table of Contents</paragraph> +<section id="emptyentry"> +<tip id="par_id1001574720273772">%PRODUCTNAME creates the table of contents entries based on the chapter 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> +</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> <list type="unordered"> |