[Libreoffice-commits] help.git: source/text
Seth Chaiklin (via logerrit)
logerrit at kemper.freedesktop.org
Fri Feb 19 15:43:46 UTC 2021
source/text/swriter/00/00000405.xhp | 4 -
source/text/swriter/01/05130000.xhp | 98 +++++++++++++++++-------------------
source/text/swriter/01/05130100.xhp | 24 ++++----
3 files changed, 61 insertions(+), 65 deletions(-)
New commits:
commit 07062a1f83cff429a389101a7781632827c8a7a0
Author: Seth Chaiklin <sdc.blanco at youmail.dk>
AuthorDate: Fri Feb 19 00:14:28 2021 +0100
Commit: Seth Chaiklin <sdc.blanco at youmail.dk>
CommitDate: Fri Feb 19 16:43:26 2021 +0100
tdf#139667 update to "ordered" and "unordered" on Writer list styles
( swriter/01/05130000.xhp ) "styles in writer"
* "numbered" -> "ordered" and "bulleted" -> "unordered"
* rename German id (not used elsewhere)
- remove all colspan="" rowspan=""
* update to <h1>,<h2>
( swriter/01/05130100.xhp ) "condition" tab
* "numbering/bullets" -> "list"
* rename German id (not used elsewhere)
* change German id that was changed in
swriter/00/00000405.xhp
* update to <h1>,<h2>
( swriter/00/00000405.xhp )
* rename German id to "conditional_style"
* correction to access command, and update command
to <literal>,<menuitem>
Change-Id: Ia7999d20c7a5d2f2c003a5834bb598e6b9106b37
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/111172
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin <sdc.blanco at youmail.dk>
diff --git a/source/text/swriter/00/00000405.xhp b/source/text/swriter/00/00000405.xhp
index bd6da99cd..ecebf2f48 100644
--- a/source/text/swriter/00/00000405.xhp
+++ b/source/text/swriter/00/00000405.xhp
@@ -35,8 +35,8 @@
<paragraph xml-lang="en-US" id="par_id3154260" role="paragraph">Choose <emph>View - Styles -</emph> open context menu <emph>Modify/New - Text Flow</emph> tab.</paragraph>
<paragraph xml-lang="en-US" id="par_id3154275" role="paragraph">Choose <emph>Edit - Find & Replace - Format - Text Flow</emph> tab.</paragraph>
</section>
- <section id="vorlagenbedingt">
- <paragraph xml-lang="en-US" id="par_idN10715" role="paragraph">Right-click a paragraph with style <item type="literal">Text body</item>. Choose <emph>Edit Paragraph Style - Condition</emph> tab.</paragraph>
+ <section id="conditional_style">
+ <paragraph xml-lang="en-US" id="par_idN10715" role="paragraph">Right-click a paragraph with style <literal>Text body</literal>. Choose <menuitem>Paragraph - Edit Style - Condition</menuitem> tab.</paragraph>
<paragraph role="paragraph" id="par_id651578069976376">Choose <menuitem>View - Styles</menuitem> (<switchinline select="sys"><caseinline select="MAC"><keycode>Command+T</keycode></caseinline><defaultinline><keycode>F11</keycode></defaultinline></switchinline>). Right-click any paragraph style. Choose <menuitem>New - Condition</menuitem> tab.</paragraph>
</section>
<section id="loadstyles">
diff --git a/source/text/swriter/01/05130000.xhp b/source/text/swriter/01/05130000.xhp
index f7c3f16c2..c29583155 100644
--- a/source/text/swriter/01/05130000.xhp
+++ b/source/text/swriter/01/05130000.xhp
@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
<!--
* This file is part of the LibreOffice project.
*
@@ -18,7 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textswriter0105130000xml" indexer="include" status="PUBLISH">
@@ -35,173 +33,173 @@
<bookmark_value>paragraph styles;style categories</bookmark_value>
<bookmark_value>frames; styles</bookmark_value>
<bookmark_value>page styles;style categories</bookmark_value>
-<bookmark_value>numbering;style categories</bookmark_value>
-</bookmark><comment>MW changed "numbering styles;" to "numbering;"</comment>
-<paragraph role="heading" id="hd_id3150344" xml-lang="en-US" level="1">Styles in Writer</paragraph>
-<section id="vorlagenkatalogtext">
+<bookmark_value>list styles;style categories</bookmark_value>
+</bookmark>
+<h1 id="hd_id3150344" xml-lang="en-US">Styles in Writer</h1>
+<section id="style_catalog">
<paragraph role="paragraph" id="par_idN10635" xml-lang="en-US" localize="false"><comment>UFI: this is no more "Style Catalog" dialog, but we need the links and tables</comment><comment>UFI: another comment: the Style Catalog can be customized to be visible again!!! Dont know it this is temporary bug, workaround, or feature</comment></paragraph>
<paragraph role="paragraph" id="par_id3149052" xml-lang="en-US">The following information concerns Writer styles that you can apply using the <link href="text/swriter/01/05140000.xhp">Styles</link> deck of the Sidebar.</paragraph>
</section>
<paragraph role="paragraph" id="par_id3150015" xml-lang="en-US">If you want, you can edit the styles of the current document, and then save the document as a template. To save the document as template, choose <emph>File - </emph><link href="text/shared/01/01110300.xhp" name="Templates - Save as Template"><emph>Templates - Save as Template</emph></link>.</paragraph>
-<paragraph role="heading" id="hd_id3150572" xml-lang="en-US" level="2">Style Category</paragraph>
+<h2 id="hd_id3150572" xml-lang="en-US">Style Category</h2>
<paragraph role="paragraph" id="par_id3153721" xml-lang="en-US">These are the different categories of formatting styles.</paragraph>
<table id="tbl_id3154642">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3151271" xml-lang="en-US">Name</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3153154" xml-lang="en-US">Description</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151172" xml-lang="en-US">Character Styles </paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147512" xml-lang="en-US">Use Character Styles to format single characters, or entire words and phrases. If you want, you can nest Character Styles.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150713" xml-lang="en-US">Paragraph Styles </paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149810" xml-lang="en-US">Use Paragraph Styles to format paragraphs, including the font type and size. You can also select the paragraph style to apply to the next paragraph.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151308" xml-lang="en-US">Frame Styles</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147527" xml-lang="en-US">Use Frame Styles to format text and graphic frames.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3152960" xml-lang="en-US">Page Styles </paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155897" xml-lang="en-US">Use Page Styles to organize the structure of the document, and to add page numbers. You can also specify the page style to apply to the first page that follows after a page break.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154196" xml-lang="en-US">List Styles</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3149298" xml-lang="en-US">Use List Styles to format numbered or bulleted lists.</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="par_id3149298" xml-lang="en-US">Use List Styles to format ordered or unordered lists.</paragraph>
</tablecell>
</tablerow>
</table>
-<section id="vorlagenbereich">
-<paragraph role="heading" id="hd_id3149821" xml-lang="en-US" level="2">Style Groups</paragraph>
+<section id="style_groups">
+<h2 id="hd_id3149821" xml-lang="en-US">Style Groups</h2>
<paragraph role="paragraph" id="par_id3154828" xml-lang="en-US">These are the style groups that you can display in the Styles window.</paragraph>
<table id="tbl_id3149101">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3148977" xml-lang="en-US">Name</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3149032" xml-lang="en-US">Meaning</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153642" xml-lang="en-US">Automatic</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3152769" xml-lang="en-US">Displays styles appropriate to the current context.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154374" xml-lang="en-US">All Styles</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153351" xml-lang="en-US">Displays all styles of the active style category.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150590" xml-lang="en-US">Applied Styles</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149168" xml-lang="en-US">Displays the styles (of selected category) applied in the current document. </paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156368" xml-lang="en-US">Custom Styles</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145780" xml-lang="en-US">Displays all user-defined styles in the selected style category.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155908" xml-lang="en-US">Character Styles</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150114" xml-lang="en-US">Displays formatting styles for text.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150700" xml-lang="en-US">Chapter Styles</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147412" xml-lang="en-US">Displays formatting styles for headings.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147500" xml-lang="en-US">List Styles</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3149568" xml-lang="en-US">Displays formatting styles for numbered or bulleted lists.</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="par_id3149568" xml-lang="en-US">Displays formatting styles for ordered or unordered lists.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145263" xml-lang="en-US">Index Styles</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155975" xml-lang="en-US">Displays formatting styles for indexes.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell >
<paragraph role="tablecontent" id="par_id3149213" xml-lang="en-US">Special Styles</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147736" xml-lang="en-US">Displays formatting styles for headers, footers, footnotes, endnotes, tables, and captions.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146339" xml-lang="en-US">HTML Styles</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149845" xml-lang="en-US">Displays a list of styles for HTML documents.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155560" xml-lang="en-US">Conditional Styles</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154774" xml-lang="en-US">Displays the user-defined conditional styles.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151090" xml-lang="en-US">Hierarchical</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148448" xml-lang="en-US">Displays the styles in the selected category in a hierarchical list. To view the styles in a sublevel, click on the plus sign (+) next to the sublevel name.</paragraph>
</tablecell>
</tablerow>
diff --git a/source/text/swriter/01/05130100.xhp b/source/text/swriter/01/05130100.xhp
index 639318be6..158011486 100644
--- a/source/text/swriter/01/05130100.xhp
+++ b/source/text/swriter/01/05130100.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 .
-->
-
<meta>
<topic id="textswriter0105130100xml" indexer="include">
<title id="tit" xml-lang="en-US">Condition</title>
@@ -27,17 +25,17 @@
</topic>
</meta>
<body>
-<section id="bedingung">
+<section id="conditional">
<bookmark xml-lang="en-US" branch="index" id="bm_id3154656"><bookmark_value>styles; conditional</bookmark_value>
<bookmark_value>conditional styles</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/conditionpage/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/conditionpage/ConditionPage" id="bm_id3152964" localize="false"/>
-<paragraph role="heading" id="hd_id3154656" xml-lang="en-US" level="1"><link href="text/swriter/01/05130100.xhp" name="Condition">Condition</link></paragraph>
+<h1 id="hd_id3154656" xml-lang="en-US"><link href="text/swriter/01/05130100.xhp" name="Condition">Condition</link></h1>
<paragraph role="paragraph" id="par_id3154766" xml-lang="en-US">Define conditions for conditional styles here.</paragraph>
</section>
<section id="howtoget">
-<embed href="text/swriter/00/00000405.xhp#vorlagenbedingt"/>
+<embed href="text/swriter/00/00000405.xhp#conditional_style"/>
</section>
<paragraph role="paragraph" id="par_id3151391" xml-lang="en-US">Conditional styles are paragraph styles that have different properties depending on the context. Once defined, you cannot change the conditional properties of a conditional style.</paragraph>
<paragraph role="paragraph" id="par_id3149349" xml-lang="en-US">$[officename] applies the paragraph properties of conditional styles as follows (the bold terms correspond to the titles of dialog fields): If a paragraph formatted with a conditional style is in a <emph>Context</emph> that has an <emph>Applied Style</emph> linked to it, then the <emph>Paragraph Style</emph> from that condition is used. If no style is linked to the <emph>Context</emph>, then the attributes defined in the conditional style apply. The following example illustrates this relationship:</paragraph>
@@ -65,22 +63,22 @@
<paragraph role="tip" id="par_id3154473" xml-lang="en-US">The "Text Body" Style was created as a conditional style. Therefore, any styles you derive from it can be used as conditional styles.</paragraph>
<paragraph role="paragraph" id="par_id3151321" xml-lang="en-US">The Paragraph Style applied to the context is used when exporting to other formats (RTF, HTML, and so on).</paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/conditionpage/condstyle" id="bm_id3152963" localize="false"/>
-<paragraph role="heading" id="hd_id3152952" xml-lang="en-US" level="2">Conditional style</paragraph>
+<h2 id="hd_id3152952" xml-lang="en-US">Conditional style</h2>
<paragraph role="paragraph" id="par_id3150974" xml-lang="en-US"><ahelp hid="modules/swriter/ui/conditionpage/condstyle">Check this box to define a new style as a conditional style.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/conditionpage/links" id="bm_id3147524" localize="false"/>
-<paragraph role="heading" id="hd_id3153672" xml-lang="en-US" level="2">Context</paragraph>
-<paragraph role="paragraph" id="par_id3147530" xml-lang="en-US"><ahelp hid="modules/swriter/ui/conditionpage/links">Here you can see the $[officename] predefined contexts, including outline levels 1 to 10, numbering/bullets levels 1 to 10, table header, table contents, section, border, footnote, header and footer.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3155896" xml-lang="en-US" level="2">Applied Styles</paragraph>
+<h2 id="hd_id3153672" xml-lang="en-US">Context</h2>
+<paragraph role="paragraph" id="par_id3147530" xml-lang="en-US"><ahelp hid="modules/swriter/ui/conditionpage/links">Here you can see the $[officename] predefined contexts, including outline levels 1 to 10, list levels 1 to 10, table header, table contents, section, border, footnote, header and footer.</ahelp></paragraph>
+<h2 id="hd_id3155896" xml-lang="en-US">Applied Styles</h2>
<paragraph role="paragraph" id="par_id3149689" xml-lang="en-US">Here you can see the list of all Paragraph Styles applied to a context.</paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/conditionpage/styles" id="bm_id3159190" localize="false"/>
-<paragraph role="heading" id="hd_id3154194" xml-lang="en-US" level="2">Paragraph Styles</paragraph>
+<h2 id="hd_id3154194" xml-lang="en-US">Paragraph Styles</h2>
<paragraph role="paragraph" id="par_id3159195" xml-lang="en-US"><ahelp hid="modules/swriter/ui/conditionpage/styles">A list of all Paragraph Styles which can be assigned to a context is contained in the list box.</ahelp></paragraph>
-<embed href="text/swriter/01/05130000.xhp#vorlagenbereich"/>
+<embed href="text/swriter/01/05130000.xhp#style_groups"/>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/conditionpage/remove" id="bm_id3151329" localize="false"/>
-<paragraph role="heading" id="hd_id3149306" xml-lang="en-US" level="2">Remove</paragraph>
+<h2 id="hd_id3149306" xml-lang="en-US">Remove</h2>
<paragraph role="paragraph" id="par_id3151335" xml-lang="en-US"><ahelp hid="modules/swriter/ui/conditionpage/remove">Click here to remove the current context assigned to the selected style.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/conditionpage/apply" id="bm_id3149494" localize="false"/>
-<paragraph role="heading" id="hd_id3149483" xml-lang="en-US" level="2">Assign</paragraph>
+<h2 id="hd_id3149483" xml-lang="en-US">Assign</h2>
<paragraph role="paragraph" id="par_id3154829" xml-lang="en-US"><ahelp hid="modules/swriter/ui/conditionpage/apply">Click <emph>Apply</emph> to apply the <emph>selected Paragraph Style</emph> to the defined <emph>context</emph>.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#reset"/>
</body>
More information about the Libreoffice-commits
mailing list