source/text/shared/01/06050600.xhp | 38 ++++++++------------------
source/text/swriter/01/legacynumbering.xhp | 42 ++++++++++++++++++++++-------
2 files changed, 45 insertions(+), 35 deletions(-)
New commits:
commit 6300598d59d7832dee0b85b0615dee83efb0610f
Author: Seth Chaiklin <sdc.bla...@youmail.dk>
AuthorDate: Thu Jan 23 09:51:50 2020 +0100
Commit: Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Fri Jan 24 14:13:32 2020 +0100
tdf#130064 Help page for legacy list style numbering in Writer
ODF has two different methods for positioning lists. LibreOffice Writer
has always used one method ('label-alignment'), and the relevant controls
are described in /text/shared/01/06050600.xhp for the Numbering Style
Position tab dialog.
If LibreOffice opens a document produced with the other method
('label-width-and-position'), then different controls will be shown in
the Position tab of the Numbering Style dialog. This help page provides
information about these controls. The controls are called "legacy" to
have a simple, meaningful label (where there is no standard or
familiar label). These controls are only "legacy" in relation to
LibreOffice Writer, but they remain legitimate controls, and this help
page describes how the controls appear in the Position tab
when documents are opened that use this other method.
-based on embedding or moving content from /text/shared/01/06050600.xhp
(WIP) - bookmarks and <ahelp> need to be checked.
Change-Id: I2942f2daa9ffbab92dffd8f333e7d855e17f6fda
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/87242
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
diff --git a/source/text/shared/01/06050600.xhp
b/source/text/shared/01/06050600.xhp
index d64b2a03f..8cbb5e2d3 100644
--- a/source/text/shared/01/06050600.xhp
+++ b/source/text/shared/01/06050600.xhp
@@ -27,7 +27,7 @@
</meta>
<body>
<section id="position_s">
- <bookmark branch="hid/modules/swriter/ui/outlinepositionpage/@@nowidget@@"
xml-lang="en-US" id="bm_@@nowidget@@" localize="false"/>
+<bookmark branch="hid/modules/swriter/ui/outlinepositionpage/@@nowidget@@"
xml-lang="en-US" id="bm_@@nowidget@@" localize="false"/>
<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"/>
@@ -37,22 +37,28 @@
<section id="howtoget">
<embed href="text/shared/00/00040500.xhp#numposition"/>
</section>
-<paragraph role="note" id="par_id5004119" xml-lang="en-US">The Position tab
page looks different for documents using the new position and spacing
attributes introduced with OpenOffice.org 3.0 (and used in all versions of
%PRODUCTNAME), or documents using the old attributes from versions before 3.0.
The new version of this tab page shows the controls "Aligned at", "Numbering
alignment", "Numbering followed by", "Tab stop at", and "Indent at". The old
version of this tab page that can be seen in an old numbered or bulleted list
shows the controls "Indent", "Width of numbering", "Minimum space between
numbering and text", and "Numbering alignment".<comment>see
http://specs.openoffice.org/writer/numbering/NewListLevelAttrs.odt</comment></paragraph>
+<section id="positionlevels">
<bookmark xml-lang="en-US" branch="hid/cui/ui/numberingpositionpage/levellb"
id="bm_id3149119" localize="false"/>
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/outlinepositionpage/levellb" id="bm_id3153323"
localize="false"/>
<paragraph role="heading" id="hd_id3149031" xml-lang="en-US"
level="2">Level</paragraph>
<paragraph role="paragraph" id="par_id3155755" xml-lang="en-US"><ahelp
hid="modules/swriter/ui/outlinepositionpage/levellb">Select the level(s) that
you want to modify.</ahelp> To apply the options to all the levels, select
"1-10". In Chapter Numbering, only one level can be selected, or use "1-10" to
apply the options, except Paragraph style, to all the levels.</paragraph>
<bookmark xml-lang="en-US"
branch="hid/cui/ui/numberingpositionpage/numfollowedbylb" id="bm_id7650990"
localize="false"/>
-<paragraph role="heading" id="hd_id3149261" xml-lang="en-US"
level="2">Position and Spacing (%PRODUCTNAME)</paragraph>
+</section>
+<section id="positionspacingheading">
+<paragraph role="heading" id="hd_id3149261" xml-lang="en-US"
level="2">Position and Spacing</paragraph>
+</section>
+<note id="par_id5004119" xml-lang="en-US">This page shows the position
controls used in all versions of %PRODUCTNAME Writer. Some documents (produced
by other applications) use another method for positioning and spacing. Opening
such documents will show the position controls documented in <link
href="text/swriter/01/legacynumbering.xhp" name="Legacy numbering
alignment">Position for List styles (legacy)</link>.<comment>see
http://specs.openoffice.org/writer/numbering/NewListLevelAttrs.odt</comment></note>
<bookmark xml-lang="en-US"
branch="hid/cui/ui/numberingpositionpage/alignedatmf" id="bm_id8847621"
localize="false"/>
<paragraph role="heading" id="hd_id1619617" xml-lang="en-US" level="3">Aligned
at</paragraph>
<paragraph role="paragraph" id="par_id1015655" xml-lang="en-US"><ahelp
hid=".">Enter the distance from the left page margin at which the numbering
symbol will be aligned.</ahelp></paragraph>
+<section id="numberingalignment">
<bookmark xml-lang="en-US"
branch="hid/cui/ui/numberingpositionpage/numalignlb" id="bm_id3151246"
localize="false"/>
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/outlinepositionpage/numalignlb"
id="bm_id3151245" localize="false"/>
<bookmark xml-lang="en-US"
branch="hid/cui/ui/numberingpositionpage/num2alignlb" id="bm_id5262611"
localize="false"/>
<paragraph role="heading" id="hd_id3155583" xml-lang="en-US"
level="3">Numbering alignment</paragraph>
<paragraph role="paragraph" id="par_id3153063" xml-lang="en-US"><ahelp
hid="modules/swriter/ui/outlinepositionpage/numalignlb">Set the alignment of
the numbering symbols. Select "Left" to align the numbering symbol to start
directly at the "Aligned at" position. Select "Right" to align the symbol to
end directly before the "Aligned at" position. Select "Centered" to center the
symbol around the "Aligned at" position.</ahelp></paragraph>
<paragraph role="note" id="par_id3147422" xml-lang="en-US">The <emph>Numbering
alignment</emph> option does not set the alignment of the paragraph.</paragraph>
+</section>
<paragraph role="heading" id="hd_id6561784" xml-lang="en-US"
level="3">Numbering followed by</paragraph>
<paragraph role="paragraph" id="par_id423291" xml-lang="en-US"><ahelp
hid=".">Select the element that will follow the numbering: a tab stop, a space,
a line break, or nothing.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/numberingpositionpage/atmf"
id="bm_id3496810" localize="false"/>
@@ -61,36 +67,16 @@
<bookmark xml-lang="en-US"
branch="hid/cui/ui/numberingpositionpage/indentatmf" id="bm_id1841792"
localize="false"/>
<paragraph role="heading" id="hd_id2336191" xml-lang="en-US" level="3">Indent
at</paragraph>
<paragraph role="paragraph" id="par_id6081728" xml-lang="en-US"><ahelp
hid=".">Enter the distance from the left page margin to the start of all lines
in the numbered paragraph that follow the first line.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3124261" xml-lang="en-US"
level="2">Position and Spacing (legacy format)</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/numberingpositionpage/indentmf"
id="bm_id3153032" localize="false"/>
-<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/outlinepositionpage/numdistmf" id="bm_id3155830"
localize="false"/>
-<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/outlinepositionpage/indentmf" id="bm_id1336405"
localize="false"/>
-<paragraph role="heading" id="hd_id3154422" xml-lang="en-US"
level="2">Indent</paragraph>
-<paragraph role="paragraph" id="par_id3144438" xml-lang="en-US"><ahelp
hid="modules/swriter/ui/outlinepositionpage/numdistmf">Enter the amount of
space to leave between the left page margin (or the left edge of the text
object) and the left edge of the numbering symbol. If the current paragraph
style uses an indent, the amount you enter here is added to the
indent.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/numberingpositionpage/relative"
id="bm_id3149166" localize="false"/>
-<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/outlinepositionpage/relative" id="bm_id3149164"
localize="false"/>
-<paragraph role="heading" id="hd_id3155179" xml-lang="en-US"
level="3">Relative</paragraph>
-<paragraph role="paragraph" id="par_id3146137" xml-lang="en-US"><ahelp
hid="modules/swriter/ui/outlinepositionpage/relative">Indents the current level
relative to the previous level in the list hierarchy.</ahelp></paragraph>
-<bookmark xml-lang="en-US"
branch="hid/cui/ui/numberingpositionpage/numberingwidthmf" id="bm_id3153349"
localize="false"/>
-<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/outlinepositionpage/indentatmf"
id="bm_id3153348" localize="false"/>
-<paragraph role="heading" id="hd_id3150245" xml-lang="en-US" level="3">Width
of numbering<comment>i85347</comment></paragraph>
-<paragraph role="paragraph" id="par_id3150129" xml-lang="en-US"><ahelp
hid="modules/swriter/ui/outlinepositionpage/indentatmf">Enter the amount of
space to leave between the left edge of the numbering symbol and the left edge
of the text.</ahelp><comment>UFI: fixed #i31282#</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/numberingpositionpage/numdistmf"
id="bm_id3149237" localize="false"/>
-<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/outlinepositionpage/numdistmf" id="bm_id3149235"
localize="false"/>
-<switch select="appl">
- <case select="WRITER">
- <paragraph role="heading" id="hd_id3156194" xml-lang="en-US"
level="3">Minimum space between numbering and text.</paragraph>
- <paragraph role="paragraph" id="par_id3147574" xml-lang="en-US"><ahelp
hid="modules/swriter/ui/outlinepositionpage/numdistmf">Enter the minimum amount
of space to leave between the right edge of the numbering symbol and the left
edge of the text.</ahelp></paragraph>
- </case>
-</switch>
+<section id="defaultnumbering">
<bookmark xml-lang="en-US" branch="hid/cui/ui/numberingpositionpage/standard"
id="bm_id3154138" localize="false"/>
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/outlinepositionpage/standard" id="bm_id3151211"
localize="false"/>
<paragraph role="heading" id="hd_id3154367" xml-lang="en-US"
level="3">Default</paragraph>
<paragraph role="paragraph" id="par_id3156082" xml-lang="en-US"><ahelp
hid="modules/swriter/ui/outlinepositionpage/standard">Resets the indent and the
spacing values to the default values.</ahelp></paragraph>
+</section>
<embed href="text/shared/00/00000001.xhp#vorschau2"/>
<embed href="text/shared/00/00000001.xhp#zurueck"/>
-<embed href="text/shared/00/00000001.xhp#uebernehmen"/>
<section id="relatedtopics">
+<paragraph role="paragraph" id="par_id3116228" xml-lang="en-US"><link
href="text/swriter/01/legacynumbering.xhp" name="Legacy numbering
alignment">Position for List styles (legacy)</link></paragraph>
<paragraph role="paragraph" id="par_id3147228" xml-lang="en-US"><link
href="text/shared/01/05030700.xhp" name="Paragraph alignment">Paragraph
alignment</link></paragraph>
</section>
</body>
diff --git a/source/text/swriter/01/legacynumbering.xhp
b/source/text/swriter/01/legacynumbering.xhp
index eb72d89eb..e891f1c9f 100644
--- a/source/text/swriter/01/legacynumbering.xhp
+++ b/source/text/swriter/01/legacynumbering.xhp
@@ -11,28 +11,52 @@
<meta>
<topic id="legacynumberingxml" indexer="include" status="PUBLISH">
- <title id="tit" xml-lang="en-US">Legacy Numbering in Writer</title>
+ <title id="tit" xml-lang="en-US">Position (List Styles - Legacy)</title>
<filename>/text/swriter/01/legacynumbering.xhp</filename>
</topic>
</meta>
<body>
-
<bookmark xml-lang="en-US" branch="index" id="bm_id601579742532876">
<bookmark_value>numbering;OpenOffice.org</bookmark_value>
<bookmark_value>OpenOffice.org legacy numbering</bookmark_value>
</bookmark>
-
<section id="legacynumberinghead">
<bookmark id="bm_id221579742307751" xml-lang="en-US" branch="hid/CHANGE
ME" localize="false"/>
- <h1 id="hd_id761579742307751"><variable id="legacynumberingh1"><link
href="text/swriter/01/legacynumbering.xhp" name="legacy numbering ">Legacy
Numbering in Writer</link></variable></h1>
+ <h1 id="hd_id761579742307751"><variable id="legacynumberingh1"><link
href="text/swriter/01/legacynumbering.xhp" name="legacy numbering ">Position
(List Styles - Legacy)</link></variable></h1>
<paragraph id="par_id751579742307751" role="paragraph"></paragraph>
</section>
-
-<section id="howtoget">
-
-</section>
+<embed href="text/shared/01/06050600.xhp#position_s"/><comment>Includes
‟howtoget” from text/shared/00/00040500.xhp#numposition</comment>
+<embed href="text/shared/01/06050600.xhp#positionlevels"/>
+<embed href="text/shared/01/06050600.xhp#positionspacingheading"/>
+<note id="par_id5004119" xml-lang="en-US">%PRODUCTNAME Writer uses the
position controls shown here when opening documents that use a different method
for positioning and spacing. (For default controls see <link
href="text/shared/01/06050600.xhp" name="LO-numbering-alignment">Position (List
Styles)</link>.<comment>see
http://specs.openoffice.org/writer/numbering/NewListLevelAttrs.odt</comment></note>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/numberingpositionpage/indentmf"
id="bm_id3153032" localize="false"/>
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/outlinepositionpage/numdistmf" id="bm_id3155830"
localize="false"/>
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/outlinepositionpage/indentmf" id="bm_id1336405"
localize="false"/>
+<paragraph role="heading" id="hd_id3154422" xml-lang="en-US"
level="2">Indent</paragraph>
+<paragraph role="paragraph" id="par_id3144438" xml-lang="en-US"><ahelp
hid="modules/swriter/ui/outlinepositionpage/numdistmf">Enter the amount of
space to leave between the left page margin (or the left edge of the text
object) and the left edge of the numbering symbol. If the current paragraph
style uses an indent, the amount you enter here is added to the
indent.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/numberingpositionpage/relative"
id="bm_id3149166" localize="false"/>
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/outlinepositionpage/relative" id="bm_id3149164"
localize="false"/>
+<paragraph role="heading" id="hd_id3155179" xml-lang="en-US"
level="3">Relative</paragraph>
+<paragraph role="paragraph" id="par_id3146137" xml-lang="en-US"><ahelp
hid="modules/swriter/ui/outlinepositionpage/relative">Indents the current level
relative to the previous level in the list hierarchy.</ahelp></paragraph>
+<bookmark xml-lang="en-US"
branch="hid/cui/ui/numberingpositionpage/numberingwidthmf" id="bm_id3153349"
localize="false"/>
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/outlinepositionpage/indentatmf"
id="bm_id3153348" localize="false"/>
+<paragraph role="heading" id="hd_id3150245" xml-lang="en-US" level="3">Width
of numbering<comment>i85347</comment></paragraph>
+<paragraph role="paragraph" id="par_id3150129" xml-lang="en-US"><ahelp
hid="modules/swriter/ui/outlinepositionpage/indentatmf">Enter the amount of
space to leave between the left edge of the numbering symbol and the left edge
of the text.</ahelp><comment>UFI: fixed #i31282#</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/numberingpositionpage/numdistmf"
id="bm_id3149237" localize="false"/>
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/outlinepositionpage/numdistmf" id="bm_id3149235"
localize="false"/>
+<switch select="appl">
+ <case select="WRITER">
+ <paragraph role="heading" id="hd_id3156194" xml-lang="en-US"
level="3">Minimum space between numbering and text.</paragraph>
+ <paragraph role="paragraph" id="par_id3147574" xml-lang="en-US"><ahelp
hid="modules/swriter/ui/outlinepositionpage/numdistmf">Enter the minimum amount
of space to leave between the right edge of the numbering symbol and the left
edge of the text.</ahelp></paragraph>
+ </case>
+</switch>
+<embed href="text/shared/01/06050600.xhp#numberingalignment"/>
+<embed href="text/shared/01/06050600.xhp#defaultnumbering"/>
+ <embed href="text/shared/00/00000001.xhp#vorschau2"/>
+<embed href="text/shared/00/00000001.xhp#zurueck"/>
<section id="relatedtopics">
-
+<paragraph role="paragraph" id="par_id3116235" xml-lang="en-US"><link
href="text/shared/01/06050600.xhp" name="LO numbering alignment">Position (List
Styles)</link></paragraph>
+<paragraph role="paragraph" id="par_id3199228" xml-lang="en-US"><link
href="text/shared/01/05030700.xhp" name="Paragraph alignment">Paragraph
alignment</link></paragraph>
</section>
</body>
</helpdocument>
\ No newline at end of file
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
