source/text/shared/01/06050600.xhp | 4 +- source/text/swriter/01/06060000.xhp | 10 ++--- source/text/swriter/01/06060100.xhp | 44 +++++++++++++----------- source/text/swriter/guide/chapter_numbering.xhp | 23 ++++++------ 4 files changed, 43 insertions(+), 38 deletions(-)
New commits: commit ac3932ba6679a519bdee68fc3b750a0faa85f6f2 Author: Seth Chaiklin <sdc.bla...@youmail.dk> AuthorDate: Wed Feb 24 10:09:12 2021 +0100 Commit: Seth Chaiklin <sdc.bla...@youmail.dk> CommitDate: Thu Mar 4 17:25:22 2021 +0100 tdf#139667 update chapter numbering help ( shared/01/06050600.xhp ) "Position" tab * add variable to <h1> heading ( swriter/01/06060000.xhp ) "Chapter Numbering" * corrections for "Load/Save", "Untitled 1-9" and "Save As" * add variable and link to <h1> ( swriter/01/06060100.xhp ) "Numbering" tab * "numbering style" -> "numbering scheme" * "format" -> "character style" * move 1,2,3 to top of numbering schemes to correspond to combobox in dialog. * add <relatedtopics> and embed links to "Position" and "Chapter Numbering" * update to <h1>,<h2>,<h3> ( swriter/guide/chapter_numbering.xhp ) * "Automatic Headings" section "numbering style" -> "numbering scheme" and update to <menuitem> and corrections in dialog box labels * "Remove Automatic Numbering" section + add keycode + add <note> about Shift+Backspace * update to <h1>,<h2>,<relatedtopics> Change-Id: I25e8f7d79b53db9ae8c53d04891a5e2b0f0465bb Reviewed-on: https://gerrit.libreoffice.org/c/help/+/111428 Tested-by: Jenkins Reviewed-by: Seth Chaiklin <sdc.bla...@youmail.dk> diff --git a/source/text/shared/01/06050600.xhp b/source/text/shared/01/06050600.xhp index 3567e183f..7d646f219 100644 --- a/source/text/shared/01/06050600.xhp +++ b/source/text/shared/01/06050600.xhp @@ -20,7 +20,7 @@ <meta> <topic id="textshared0106050600xml" indexer="include"> -<title id="tit" xml-lang="en-US">Position (List Styles)</title> +<title id="tit" xml-lang="en-US">Position (Lists)</title> <filename>/text/shared/01/06050600.xhp</filename> </topic> </meta> @@ -30,7 +30,7 @@ <bookmark branch="hid/modules/swriter/ui/outlinepositionpage/OutlinePositionPage" xml-lang="en-US" id="bm_id3150280" localize="false"/> <bookmark branch="hid/cui/ui/numberingpositionpage/@@nowidget@@" xml-lang="en-US" id="bm_id3150281" localize="false"/> <bookmark branch="hid/cui/ui/numberingpositionpage/NumberingPositionPage" xml-lang="en-US" id="bm_id3150281" localize="false"/> -<h1 id="hd_id3150467"><link href="text/shared/01/06050600.xhp" name="Position">Position</link></h1> +<h1 id="hd_id3150467"><variable id="positionh1"><link href="text/shared/01/06050600.xhp" name="Position">Position</link></variable></h1> <paragraph role="paragraph" id="par_id3158397" xml-lang="en-US"><variable id="positioninfo">Sets the indent, spacing, and alignment options for the ordered or unordered list.</variable></paragraph> </section> <comment>do we have a how-to for numbering/bullets/outlines with/without styles? seems we really need one</comment> diff --git a/source/text/swriter/01/06060000.xhp b/source/text/swriter/01/06060000.xhp index 88fc382a0..677c488e1 100644 --- a/source/text/swriter/01/06060000.xhp +++ b/source/text/swriter/01/06060000.xhp @@ -32,7 +32,7 @@ <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/numberingnamedialog/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/outlinenumbering/OutlineNumberingDialog" id="bm_id6154506" localize="false"/> -<h1 id="hd_id3154561" xml-lang="en-US">Chapter Numbering</h1> +<h1 id="hd_id3154561" xml-lang="en-US"><variable id="ChapNumh1"><link href="text/swriter/01/06060000.xhp">Chapter Numbering</link></variable></h1> <paragraph id="par_id3145246" role="paragraph" xml-lang="en-US"><variable id="kapnum"><ahelp hid=".uno:ChapterNumberingDialog">Specifies the numbering scheme and outline format for chapter numbering in the current document.</ahelp></variable></paragraph> <section id="howtoget"> @@ -45,16 +45,16 @@ <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/outlinenumbering/user" id="bm_id3147506" localize="false"/> <section id="loadsave"> <h3 id="hd_id3151168" xml-lang="en-US">Load/Save</h3> -<paragraph id="par_id3147512" role="paragraph" xml-lang="en-US"><ahelp hid="modules/swriter/ui/outlinenumbering/user">Saves or loads a chapter numbering format. A saved chapter numbering format is available to all text documents.</ahelp></paragraph> -<note id="par_id3150979" xml-lang="en-US">The <emph>Load/Save</emph> button is only available for chapter numbering. Use List styles to save formatting for ordered or unordered lists.</note> +<paragraph id="par_id3147512" role="paragraph" xml-lang="en-US"><ahelp hid="modules/swriter/ui/outlinenumbering/user">Saves or loads a chapter numbering format. A saved chapter numbering format is available to load into other text documents.</ahelp></paragraph> +<note id="par_id3150979" xml-lang="en-US">The <widget>Load/Save</widget> button is only available for chapter numbering. Use List styles to save formatting for ordered or unordered lists.</note> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/outlinenumbering/form1" id="bm_id3154474" localize="false"/> </section> <h3 id="hd_id3154572" xml-lang="en-US">Untitled 1 - 9</h3> -<paragraph id="par_id3150350" role="paragraph" xml-lang="en-US"><ahelp hid="modules/swriter/ui/outlinenumbering/form1">Select the predefined numbering style that you want to assign to the selected outline level.</ahelp></paragraph> +<paragraph id="par_id3150350" role="paragraph" xml-lang="en-US"><ahelp hid="modules/swriter/ui/outlinenumbering/form1">Select a predefined numbering format.</ahelp> Save your own predefined numbering formats using <emph>Save As</emph>.</paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/outlinenumbering/saveas" id="bm_id3152958" localize="false"/> <h3 id="hd_id3153675" xml-lang="en-US">Save As</h3> -<paragraph id="par_id3155892" role="paragraph" xml-lang="en-US"><ahelp hid="modules/swriter/ui/outlinenumbering/saveas">Opens a dialog where you can save the current settings for the selected chapter and outline level. You can then load these settings from another document.</ahelp></paragraph> +<paragraph id="par_id3155892" role="paragraph" xml-lang="en-US"><ahelp hid="modules/swriter/ui/outlinenumbering/saveas">Opens a dialog where you can save the current numbering and position settings for all levels. Saved settings are available to load into other documents.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/numberingnamedialog/entry" id="bm_id3154191" localize="false"/> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/numberingnamedialog/form" id="bm_id3154194" localize="false"/> diff --git a/source/text/swriter/01/06060100.xhp b/source/text/swriter/01/06060100.xhp index 553a51040..d03e4f487 100644 --- a/source/text/swriter/01/06060100.xhp +++ b/source/text/swriter/01/06060100.xhp @@ -30,7 +30,7 @@ <section id="numbering"> -<paragraph id="hd_id3151387" role="heading" level="1" xml-lang="en-US"><link href="text/swriter/01/06060100.xhp" name="Numbering">Numbering</link></paragraph> +<h1 id="hd_id3151387" xml-lang="en-US"><link href="text/swriter/01/06060100.xhp" name="Numbering">Numbering</link></h1> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/outlinenumberingpage/OutlineNumberingPage" id="bm_id3150280" localize="false"/> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/outlinenumberingpage/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/> <paragraph id="par_id3155620" role="paragraph" xml-lang="en-US">Specifies the number format and the hierarchy for chapter numbering in the current document.</paragraph> @@ -41,19 +41,19 @@ </section> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/outlinenumberingpage/level" id="bm_id3154508" localize="false"/> -<paragraph id="hd_id3153003" role="heading" level="2" xml-lang="en-US">Level</paragraph> +<h2 id="hd_id3153003" xml-lang="en-US">Level</h2> <paragraph id="par_id3150018" role="paragraph" xml-lang="en-US"><ahelp hid="modules/swriter/ui/outlinenumberingpage/level">Click the chapter and outline level that you want to modify, and then specify the numbering options for the level.</ahelp> To apply the numbering options, except for paragraph style, to all the levels, click "1-10".</paragraph> -<paragraph id="hd_id3145248" role="heading" level="2" xml-lang="en-US">Numbering</paragraph> +<h2 id="hd_id3145248" xml-lang="en-US">Numbering</h2> <paragraph id="par_id3150930" role="paragraph" xml-lang="en-US">Specify the formatting for the selected outline level.</paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/outlinenumberingpage/style" id="bm_id3153716" localize="false"/> -<paragraph id="hd_id3149030" role="heading" level="3" xml-lang="en-US">Paragraph Style</paragraph> +<h3 id="hd_id3149030" xml-lang="en-US">Paragraph Style</h3> <paragraph id="par_id3153722" role="paragraph" xml-lang="en-US"><ahelp hid="modules/swriter/ui/outlinenumberingpage/style">Select the paragraph style that you want to assign to the selected chapter and outline level.</ahelp> If you click "None", the selected outline level is not defined.</paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/outlinenumberingpage/numbering" id="bm_id3150766" localize="false"/> -<paragraph id="hd_id3151272" role="heading" level="3" xml-lang="en-US">Number</paragraph> -<paragraph id="par_id3156319" role="paragraph" xml-lang="en-US"><ahelp hid="modules/swriter/ui/outlinenumberingpage/numbering">Select the numbering style that you want to apply to the selected outline level.</ahelp></paragraph> +<h3 id="hd_id3151272" xml-lang="en-US">Number</h3> +<paragraph id="par_id3156319" role="paragraph" xml-lang="en-US"><ahelp hid="modules/swriter/ui/outlinenumberingpage/numbering">Select the numbering scheme that you want to apply to the selected outline level.</ahelp></paragraph> <table id="tbl_id3154642"> <tablerow> @@ -64,6 +64,14 @@ <paragraph id="par_id3149760" role="paragraph" xml-lang="en-US"> <emph>Description</emph> </paragraph> </tablecell> </tablerow> + <tablerow> + <tablecell> + <paragraph id="par_id3155899" role="paragraph" xml-lang="en-US">1, 2, 3, ...</paragraph> + </tablecell> + <tablecell> + <paragraph id="par_id3154191" role="paragraph" xml-lang="en-US">Arabic numerals</paragraph> + </tablecell> + </tablerow> <tablerow> <tablecell> <paragraph id="par_id3147513" role="paragraph" xml-lang="en-US">A, B, C, ...</paragraph> @@ -96,14 +104,6 @@ <paragraph id="par_id3152960" role="paragraph" xml-lang="en-US">Roman numerals (lower)</paragraph> </tablecell> </tablerow> - <tablerow> - <tablecell> - <paragraph id="par_id3155899" role="paragraph" xml-lang="en-US">1, 2, 3, ...</paragraph> - </tablecell> - <tablecell> - <paragraph id="par_id3154191" role="paragraph" xml-lang="en-US">Arabic numerals</paragraph> - </tablecell> - </tablerow> <tablerow> <tablecell> <paragraph id="par_id3149298" role="paragraph" xml-lang="en-US">A,... AA,... AAA,...</paragraph> @@ -132,26 +132,30 @@ <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/outlinenumberingpage/charstyle" id="bm_id3147218" localize="false"/> -<paragraph id="hd_id3147098" role="heading" level="3" xml-lang="en-US">Character Style</paragraph> -<paragraph id="par_id3147224" role="paragraph" xml-lang="en-US"><ahelp hid="modules/swriter/ui/outlinenumberingpage/charstyle">Select the format of the numbering character.</ahelp></paragraph> +<h3 id="hd_id3147098" xml-lang="en-US">Character Style</h3> +<paragraph id="par_id3147224" role="paragraph" xml-lang="en-US"><ahelp hid="modules/swriter/ui/outlinenumberingpage/charstyle">Select the character style of the numbering character.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/outlinenumberingpage/sublevelsnf" id="bm_id3149042" localize="false"/> -<paragraph id="hd_id3153643" role="heading" level="3" xml-lang="en-US">Show sublevels</paragraph> +<h3 id="hd_id3153643" xml-lang="en-US">Show sublevels</h3> <paragraph id="par_id3147575" role="paragraph" xml-lang="en-US"><ahelp hid="modules/swriter/ui/outlinenumberingpage/sublevelsnf">Select the number of outline levels to include in the chapter numbering. For example, select "3" to display three levels of chapter numbering: 1.1.1</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/outlinenumberingpage/prefix" id="bm_id3155136" localize="false"> </bookmark> -<paragraph id="hd_id3152772" role="heading" level="3" xml-lang="en-US">Separator Before</paragraph> +<h3 id="hd_id3152772" xml-lang="en-US">Separator Before</h3> <paragraph id="par_id3155142" role="paragraph" xml-lang="en-US"><ahelp hid="modules/swriter/ui/outlinenumberingpage/prefix">Enter the text that you want to display before the chapter number.</ahelp> For example, type "Chapter " to display "Chapter 1".</paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/outlinenumberingpage/suffix" id="bm_id3153352" localize="false"/> -<paragraph id="hd_id3154386" role="heading" level="3" xml-lang="en-US">Separator After</paragraph> +<h3 id="hd_id3154386" xml-lang="en-US">Separator After</h3> <paragraph id="par_id3153358" role="paragraph" xml-lang="en-US"><ahelp hid="modules/swriter/ui/outlinenumberingpage/suffix">Enter the text that you want to display after the chapter number.</ahelp> For example, type a period (.) to display "1."</paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/outlinenumberingpage/startat" id="bm_id3149175" localize="false"/> -<paragraph id="hd_id3150590" role="heading" level="3" xml-lang="en-US">Start at</paragraph> +<h3 id="hd_id3150590" xml-lang="en-US">Start at</h3> <paragraph id="par_id3151023" role="paragraph" xml-lang="en-US"><ahelp hid="modules/swriter/ui/outlinenumberingpage/startat">Enter the number that you want to restart the chapter numbering at.</ahelp></paragraph> +<section id="relatedtopics"> + <embed href="text/shared/01/06050600.xhp#positionh1"/> + <embed href="text/swriter/01/06060000.xhp#ChapNumh1"/> +</section> </body> </helpdocument> diff --git a/source/text/swriter/guide/chapter_numbering.xhp b/source/text/swriter/guide/chapter_numbering.xhp index 36c8ef4bb..6c13b460c 100644 --- a/source/text/swriter/guide/chapter_numbering.xhp +++ b/source/text/swriter/guide/chapter_numbering.xhp @@ -37,35 +37,35 @@ </bookmark> <comment>MW changed "removing;..." to "deleting;..." and made "outline numbering" a two level entry</comment><comment>mw reduced two "headings;" bookmarks to one entry</comment> -<paragraph id="hd_id3147682" role="heading" level="1" xml-lang="en-US"><variable id="chapter_numbering"><link href="text/swriter/guide/chapter_numbering.xhp" name="Chapter Numbering">Chapter Numbering</link></variable></paragraph> +<h1 id="hd_id3147682" xml-lang="en-US"><variable id="chapter_numbering"><link href="text/swriter/guide/chapter_numbering.xhp" name="Chapter Numbering">Chapter Numbering</link></variable></h1> <paragraph id="par_id3155605" role="paragraph" xml-lang="en-US">You can modify the heading hierarchy or assign a level in the hierarchy to a custom paragraph style. You can also add chapter and section numbering to heading paragraph styles. By default, the "Heading 1" paragraph style is at the top of the chapter hierarchy.</paragraph> -<paragraph id="hd_id3155626" role="heading" level="2" xml-lang="en-US">To Add Automatic Numbering to a Heading Style</paragraph> +<h2 id="hd_id3155626" xml-lang="en-US">To Add Automatic Numbering to a Heading Style</h2> <list type="ordered"> <listitem> - <paragraph id="par_id3154255" role="listitem" xml-lang="en-US">Choose <item type="menuitem">Tools - Chapter Numbering</item>, and then click the <item type="menuitem">Numbering</item> tab.</paragraph> + <paragraph id="par_id3154255" role="listitem" xml-lang="en-US">Choose <menuitem>Tools - Chapter Numbering</menuitem>, and then click the <menuitem>Numbering</menuitem> tab.</paragraph> </listitem> <listitem> - <paragraph id="par_id3155891" role="listitem" xml-lang="en-US">In the <item type="menuitem">Paragraph Style</item> box, select the heading style that you want to add chapter numbers to.</paragraph> + <paragraph id="par_id3155891" role="listitem" xml-lang="en-US">In the <menuitem>Paragraph style</menuitem> box, select the heading style that you want to add chapter numbers to.</paragraph> </listitem> <listitem> - <paragraph id="par_id3150513" role="listitem" xml-lang="en-US">In the <item type="menuitem">Numbers</item> box, select the numbering style that you want to use, and then click <item type="menuitem">OK</item>.</paragraph> + <paragraph id="par_id3150513" role="listitem" xml-lang="en-US">In the <menuitem>Number</menuitem> box, select the numbering scheme that you want to use, and then click <menuitem>OK</menuitem>.</paragraph> </listitem> </list> -<paragraph id="par_idN107CE" role="heading" level="2" xml-lang="en-US">To Remove Automatic Chapter Numbering From a Heading Paragraph</paragraph> +<h2 id="par_idN107CE" xml-lang="en-US">To Remove Automatic Chapter Numbering From a Heading Paragraph</h2> <list type="ordered"> <listitem> <paragraph id="par_idN107D5" role="listitem" xml-lang="en-US">Click at the beginning of the text in the heading paragraph, after the number.</paragraph> </listitem> <listitem> - <paragraph id="par_idN107D9" role="listitem" xml-lang="en-US">Press the Backspace key to delete the number.</paragraph> + <paragraph id="par_idN107D9" role="listitem" xml-lang="en-US">Press the <keycode>Backspace</keycode> key to delete the number.</paragraph> </listitem> </list> - -<paragraph id="hd_id3155552" role="heading" level="2" xml-lang="en-US">To Use a Custom Paragraph Style as a Heading</paragraph> +<note id="par_id441614161571912">Press <keycode>Shift+Backspace</keycode> with the cursor at the beginning of the heading to return the number.</note> +<h2 id="hd_id3155552" xml-lang="en-US">To Use a Custom Paragraph Style as a Heading</h2> <list type="ordered"> <listitem> @@ -81,9 +81,10 @@ <paragraph id="par_id3147808" role="listitem" xml-lang="en-US">Click <emph>OK</emph>.</paragraph> </listitem> </list> -<embed href="text/shared/00/00000004.xhp#related"/> +<section id="relatedtopics"> <embed href="text/swriter/guide/insert_tab_innumbering.xhp#insert_tab_innumbering"/> -<embed href="text/swriter/guide/arrange_chapters.xhp#arrange_chapters"/><comment>mw inserted new link under "Related topics" and deleted "To rearrange the headings in a text document"</comment> +<embed href="text/swriter/guide/arrange_chapters.xhp#arrange_chapters"/><comment>mw deleted "To rearrange the headings in a text document"</comment> +</section> </body> </helpdocument> _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits