source/text/shared/01/05020000.xhp  |    7 +++++++
 source/text/swriter/00/00000405.xhp |   28 +++++++++++++++++++++++++---
 source/text/swriter/01/05130002.xhp |    8 ++++++--
 source/text/swriter/01/05140000.xhp |    4 ++--
 4 files changed, 40 insertions(+), 7 deletions(-)

New commits:
commit e642d444e695b75d6f05d95829bd648c89b67971
Author:     Seth Chaiklin <sdc.bla...@youmail.dk>
AuthorDate: Wed Jan 13 13:18:57 2021 +0100
Commit:     Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Sat Jan 16 13:54:27 2021 +0100

    improve explanation about character style
    
      ( swriter/01/05130002.xhp ) (Character Style)
        * improve/expand explanation of character style
        + add <note> about how to use character style
        + add <note> about how to remove direct formatting
        + add <note> about how to find out what properties are applied
          by a character style
        * replace German id
    
      ( swriter/01/05130002.xhp ) (Character formatting)
        + add appl-switch for WRITER, with a <relatedtopics>
          and link to "Character Style"
    
      ( swriter/00/00000405.xhp )
        * update access command to editing Character Styles
        + add icon for Character Styles
        * add sys-switch for F11 for List Styles
        * replace German id
    
       ( swriter/01/05140000.xhp ) ( Styles sidebar )
         * repair path to Paragraph Style and Character Style icons
    
    Change-Id: Idafef996a833bda317d45ff90c23fb7d84813e57
    Reviewed-on: https://gerrit.libreoffice.org/c/help/+/109125
    Tested-by: Jenkins
    Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>

diff --git a/source/text/shared/01/05020000.xhp 
b/source/text/shared/01/05020000.xhp
index 6d0aec10b..6e6e45378 100644
--- a/source/text/shared/01/05020000.xhp
+++ b/source/text/shared/01/05020000.xhp
@@ -57,5 +57,12 @@
 </case>
 </switch>
 <embed href="text/shared/00/00000001.xhp#reset"/>
+<switch select="appl">
+<case select="WRITER">
+<section id="relatedtopics">
+<paragraph role="paragraph" id="par_id831610541188010"><link 
href="text/swriter/01/05130002.xhp" name="Character_Style">Character 
Style</link></paragraph>
+</section>
+</case>
+</switch>
 </body>
 </helpdocument>
diff --git a/source/text/swriter/00/00000405.xhp 
b/source/text/swriter/00/00000405.xhp
index dad235691..04a20c930 100644
--- a/source/text/swriter/00/00000405.xhp
+++ b/source/text/swriter/00/00000405.xhp
@@ -78,14 +78,36 @@
       <section id="absatzvorlage">
          <paragraph xml-lang="en-US" id="par_id3155140" 
role="paragraph">Choose <emph>View - Styles</emph> - open context menu 
<emph>Modify/New</emph> (for Paragraph Styles).</paragraph>
       </section>
-      <section id="zeichenvorlage">
-         <paragraph xml-lang="en-US" id="par_id3153356" 
role="paragraph">Choose <emph>View - Styles</emph> - open context menu 
<emph>Modify/New</emph> (for Character Styles).</paragraph>
+      <section id="characterstyle">
+        <list type="ordered">
+        <listitem>
+          <paragraph xml-lang="en-US" id="par_id3153356" 
role="listitem">Choose <menuitem>View - Styles</menuitem> or <menuitem>Styles - 
Manage Styles</menuitem> (<switchinline select="sys"><caseinline 
select="MAC"><keycode>Command+T</keycode></caseinline><defaultinline><keycode>F11</keycode></defaultinline></switchinline>)
 to open Styles deck.</paragraph>
+        </listitem>
+        <listitem>
+          <paragraph id="par_id61610557667046" role="listitem">Select 
Character Style icon at top of deck, then select a character style.</paragraph>
+        </listitem>
+        <listitem>
+          <paragraph id="par_id501610557723109" 
role="listitem"><literal>Right-click</literal> to open context menu and choose 
<menuitem>Modify/New</menuitem>.</paragraph>
+        </listitem>
+        </list>
+        <table id="tab_id831610556682785">
+          <tablerow>
+          <tablecell>
+            <paragraph role="paragraph" id="par_id61610556682785">
+<image src="sw/res/sf01.png" id="img_id301610556682785" width="1cm" 
height="1cm"><alt id="alt_id881610556682785">Character Style Icon</alt></image>
+            </paragraph>
+          </tablecell>
+          <tablecell>
+            <paragraph id="par_id451610556682785" role="paragraph">Character 
Style icon</paragraph>
+          </tablecell>
+          </tablerow>
+        </table>
       </section>
       <section id="rahmenvorlage">
          <paragraph xml-lang="en-US" id="par_id3149179" 
role="paragraph">Choose <emph>View - Styles</emph> - open context menu 
<emph>Modify/New</emph> (for Frame Styles).</paragraph>
       </section>
       <section id="numerierungsvorlage">
-         <paragraph xml-lang="en-US" id="par_id3156364" 
role="paragraph">Choose <menuitem>View - Styles</menuitem> 
(<keycode>F11</keycode>) - open context menu <menuitem>Modify/New</menuitem> 
(for List Styles).</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156364" 
role="paragraph">Choose <menuitem>View - Styles</menuitem> (<switchinline 
select="sys"><caseinline 
select="MAC"><keycode>Command+T</keycode></caseinline><defaultinline><keycode>F11</keycode></defaultinline></switchinline>)
 - open context menu <menuitem>Modify/New</menuitem> (for List 
Styles).</paragraph>
       </section>
       <paragraph xml-lang="en-US" id="par_id3151370" 
role="paragraph"><variable id="eingabe">Choose <emph>Tools - AutoCorrect - 
While Typing</emph>.</variable></paragraph>
       <paragraph xml-lang="en-US" id="par_id3149538" 
role="paragraph"><variable id="autoformat1">Choose <emph>Tools - 
AutoCorrect</emph>.</variable></paragraph>
diff --git a/source/text/swriter/01/05130002.xhp 
b/source/text/swriter/01/05130002.xhp
index a9558a96a..36ea42ba4 100644
--- a/source/text/swriter/01/05130002.xhp
+++ b/source/text/swriter/01/05130002.xhp
@@ -28,11 +28,15 @@
 </meta>
 <body>
 <h1 id="hd_id3148489"><link href="text/swriter/01/05130002.xhp" 
name="Character Style">Character Style</link></h1>
-<paragraph role="paragraph" id="par_id3154650" xml-lang="en-US">Here, you can 
create a font style.</paragraph>
+<paragraph role="paragraph" id="par_id3154650" xml-lang="en-US">Character 
styles provide a way to customize the formatting for individual characters. Use 
character styles when you want to change the appearance or attributes of a 
character, word or selected part of a paragraph. When you apply a character 
style to a text selection, the properties defined in the character style 
override the corresponding paragraph properties, changing the appearance and 
other attributes of the selection, depending on the definitions in the 
character style.</paragraph>
+<paragraph role="paragraph" id="par_id541610673006306">For example, if you 
apply a character style with 15pt font size  to a selected part of a paragraph 
that is formatted with 12pt font size, either directly or with a paragraph 
style, then the selection appears with 15pt font size, while the rest of the 
paragraph remains with 12pt font size. If you remove the applied character 
style, by applying the Default Character Style, then the paragraph properties 
of the selection are applicable again.</paragraph>
+<note id="par_id391610540540289">It can be useful to define character styles 
for particular kinds of content, such as page numbers, footnote numbers, 
hyperlinks, dates, words in different languages.</note>
 <section id="howtoget">
-  <embed href="text/swriter/00/00000405.xhp#zeichenvorlage"/>
+  <embed href="text/swriter/00/00000405.xhp#characterstyle"/>
 </section>
+<note id="par_id901610542787798">Direct formatting overrides any formatting 
provided by a character style. To remove direct formatting from a selection, 
use <menuitem>Format - Clear Direct Formatting</menuitem> (<switchinline 
select="sys"><caseinline 
select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+M</keycode>).</note>
 <embed href="text/shared/01/05040100.xhp#organizer"/>
+<note id="par_id701610668103877">Use the <emph>Contains</emph> section in the 
Organizer to see what properties are applied by a character style.</note>
 <embed href="text/shared/01/05020100.xhp#characters"/>
 <embed href="text/shared/01/05020200.xhp#schrifteffekt"/>
 <embed href="text/shared/02/02160000.xhp#zeichenhintergrund"/>
diff --git a/source/text/swriter/01/05140000.xhp 
b/source/text/swriter/01/05140000.xhp
index 165edad20..0285ab4dd 100644
--- a/source/text/swriter/01/05140000.xhp
+++ b/source/text/swriter/01/05140000.xhp
@@ -56,7 +56,7 @@
 <table id="tbl_id3149753">
   <tablerow>
     <tablecell>
-      <paragraph id="par_id3147506" role="paragraph" xml-lang="en-US"> <image 
id="img_id3147512" src="sfx2/res/styfam2.png" width="1cm" height="1cm"><alt 
xml-lang="en-US" id="alt_id3147512">Icon Paragraph 
Styles</alt></image></paragraph>
+      <paragraph id="par_id3147506" role="paragraph" xml-lang="en-US"> <image 
id="img_id3147512" src="sw/res/sf01.png" width="1cm" height="1cm"><alt 
xml-lang="en-US" id="alt_id3147512">Icon Paragraph 
Styles</alt></image></paragraph>
     </tablecell>
     <tablecell>
       <paragraph id="par_id3154106" role="tablehead" 
xml-lang="en-US">Paragraph Styles</paragraph>
@@ -70,7 +70,7 @@
 <table id="tbl_id3153673">
   <tablerow>
     <tablecell>
-      <paragraph id="par_id3151319" role="paragraph" xml-lang="en-US"> <image 
id="img_id3152955" src="sfx2/res/styfam1.png" width="1cm" height="1cm"><alt 
xml-lang="en-US" id="alt_id3152955">Icon Character 
Styles</alt></image></paragraph>
+      <paragraph id="par_id3151319" role="paragraph" xml-lang="en-US"> <image 
id="img_id3152955" src="sw/res/sf02.png" width="1cm" height="1cm"><alt 
xml-lang="en-US" id="alt_id3152955">Icon Character 
Styles</alt></image></paragraph>
     </tablecell>
     <tablecell>
       <paragraph id="par_id3150351" role="tablehead" 
xml-lang="en-US">Character Styles</paragraph>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to