update control and command labels in Font effects help page

- "Effects" -> "Case" heading
-  update "case" labels in Writer
-  add "Text Decoration" heading
-  correct heading levels of controls
-  align order of control presentation with dialog box
-  adjust module-conditional display of controls
-  corrected menuitem name for showing Hidden characters

Change-Id: I3d8a0bdcb1b6c8442ba662a751116ee3f2c2252b
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/87807
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin <sdc.blanco@youmail.dk>
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>

1 files changed, 60 insertions, 61 deletions

diff --git a/source/text/shared/01/05020200.xhp b/source/text/shared/01/05020200.xhp
index 367d2c44a6..30b0e0f8eb 100644
--- a/source/text/shared/01/05020200.xhp
+++ b/source/text/shared/01/05020200.xhp
@@ -85,47 +85,84 @@
 <bookmark xml-lang="en-US" branch="hid/.uno:FontColor" id="bm_id3145801" localize="false"/>
 <paragraph xml-lang="en-US" id="par_id3144766" role="paragraph"><ahelp hid="." visibility="hidden"><variable id="textfarbe">Click to apply the current font color to the selected characters. You can also click here, and then drag a selection to change the text color. Click the arrow next to the icon to open the <emph>Font color</emph> toolbar.
 </variable></ahelp></paragraph>
-
+<bookmark xml-lang="en-US" branch="hid/cui/ui/effectspage/fonttransparencymtr" id="bm_id0123200902144734" localize="false"/>
+<h3 id="hd_id0123200902243377">Transparency</h3>
+<paragraph xml-lang="en-US" id="par_id3146925" role="paragraph">Sets the transparency of the character text. The value 100% means entirely transparent, while 0% means not transparent at all.</paragraph>
 <switch select="appl">
-    <case select="WRITER"></case>
-    <case select="CALC"></case>
-    <case select="BASE"></case>
-    <case select="MATH"></case>
-    <default>
-        <bookmark xml-lang="en-US" branch="hid/cui/ui/effectspage/fonttransparencymtr" id="bm_id0123200902144734" localize="false"/>
-        <h2 id="hd_id0123200902243377">Transparency</h2>
-        <paragraph xml-lang="en-US" id="par_id3146925" role="paragraph">Sets the transparency of the character text. The value 100% means entirely transparent, while 0% means not transparent at all.</paragraph>
-        <bookmark xml-lang="en-US" branch="hid/cui/ui/effectspage/effectslb" id="bm_id0123200902144733" localize="false"/>
-    </default>
+  <case select="WRITER">
+    <note xml-lang="en-US" id="par_id941582477457694">Transparency cannot be set for Paragraph Style and Character Style.</note>
+  </case>
 </switch>
-
-<switch select="appl">
-<case select="WRITER">
+<h2 id="hd_id91580568371950">Text Decoration</h2>
+<bookmark xml-lang="en-US" branch="hid/.uno:Overline" id="bm_id0123200902261777" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0123200902291084" role="paragraph"><ahelp hid="." visibility="hidden"><emph>Overlines or removes overlining from the selected text. If the cursor is not in a word, the new text that you enter is overlined.</emph></ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/effectspage/overlinelb" id="bm_id0123200902014986" localize="false"/>
+<h3 id="hd_id0123200902243376">Overlining</h3>
+      <paragraph xml-lang="en-US" id="par_id0123200902243343" role="paragraph"><ahelp hid="cui/ui/effectspage/overlinelb">Select the overlining style that you want to apply. To apply the overlining to words only, select the <emph>Individual Words</emph> box.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/effectspage/overlinecolorlb" id="bm_id0123200902032228" localize="false"/>
+<h3 id="hd_id0123200902243470">Overline color</h3>
+      <paragraph xml-lang="en-US" id="par_id0123200902243466" role="paragraph"><ahelp hid="cui/ui/effectspage/overlinecolorlb">Select the color for the overlining.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/effectspage/strikeoutlb" id="bm_id0123200902074215" localize="false"/>
+<h3 id="hd_id3150400">Strikethrough</h3>
+      <paragraph xml-lang="en-US" id="par_id3145203" role="paragraph"><ahelp hid="cui/ui/effectspage/strikeoutlb">Select a strikethrough style for the selected text.</ahelp></paragraph>
+      <note id="par_id3150496">If you save your document in Microsoft Word format, all of the strikethrough styles are converted to the single line style.</note>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/effectspage/underlinelb" id="bm_id0123200902053711" localize="false"/>
+<h3 id="hd_id3151226">Underlining</h3>
+      <paragraph xml-lang="en-US" id="par_id3147576" role="paragraph"><ahelp hid="cui/ui/effectspage/underlinelb">Select the underlining style that you want to apply. To apply the underlining to words only, select the <emph>Individual Words</emph> box.</ahelp></paragraph>
+      <note id="par_id3153147">If you apply underlining to a superscript text, the underlining is raised to the level of the superscript. If the superscript is contained in a word with normal text, the underlining is not raised.</note>
+      <embed href="text/shared/00/00000007.xhp#objektleiste"/>
+      <embed href="text/shared/00/00040502.xhp#syunterstreichen"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/effectspage/underlinecolorlb" id="bm_id0123200902050229" localize="false"/>
+<h3 id="hd_id3148642">Underline color</h3>
+      <paragraph xml-lang="en-US" id="par_id3150254" role="paragraph"><ahelp hid="cui/ui/effectspage/underlinecolorlb">Select the color for the underlining.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/effectspage/individualwordscb" id="bm_id0123200902090860" localize="false"/>
+<h3 id="hd_id3153104">Individual words</h3>
+      <paragraph xml-lang="en-US" id="par_id3152935" role="paragraph"><ahelp hid="cui/ui/effectspage/individualwordscb">Applies the selected effect only to words and ignores spaces.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/effectspage/effectslb" id="bm_id0123200902144733" localize="false"/>
 <h2 id="hd_id3146137">Effects</h2>
-      <paragraph xml-lang="en-US" id="par_id3150084" role="paragraph"><ahelp hid="cui/ui/effectspage/effectslb">Select the font effects that you want to apply.</ahelp></paragraph>
-      <h3 id="hd_id3149575">Effects</h3>
+<paragraph xml-lang="en-US" id="par_id3150084" role="paragraph"><ahelp hid="cui/ui/effectspage/effectslb">Select the font effects that you want to apply.</ahelp></paragraph>
+<switch select="appl">
+  <case select="CALC"></case><comment>Calc has no case control</comment>
+   <case select="WRITER">
+   <section id="CaseDefs">
+      <h3 id="hd_id3149575">Case</h3>
       <paragraph xml-lang="en-US" id="par_id3148944" role="paragraph">The following capitalization effects are available:</paragraph>
       <list type="unordered">
          <listitem>
            <paragraph xml-lang="en-US" id="par_id3155922" role="listitem"><emph>Without</emph> - no effect is applied,</paragraph>
          </listitem>
          <listitem>
-           <paragraph xml-lang="en-US" id="par_id3154280" role="listitem"><emph>Capitals</emph> - changes the selected lowercase characters to uppercase characters,</paragraph>
+           <paragraph xml-lang="en-US" id="par_id3154280" role="listitem"><emph>UPPERCASE</emph> - changes the selected lowercase characters to uppercase characters,</paragraph>
          </listitem>
          <listitem>
-           <paragraph xml-lang="en-US" id="par_id3148947" role="listitem"><emph>Lowercase</emph> - changes the selected uppercase characters to lower characters,</paragraph>
+           <paragraph xml-lang="en-US" id="par_id3148947" role="listitem"><emph>lowercase</emph> - changes the selected uppercase characters to lower characters,</paragraph>
          </listitem>
          <listitem>
-           <paragraph xml-lang="en-US" id="par_id3149456" role="listitem"><emph>Title font</emph> - changes the first character of each selected word to an uppercase character,</paragraph>
+           <paragraph xml-lang="en-US" id="par_id3149456" role="listitem"><emph>Capitalize Every Word</emph> - changes the first character of each selected word to an uppercase character,</paragraph>
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id3154937" role="listitem"><emph>Small capitals</emph> - changes the selected lowercase characters to uppercase characters, and then reduces their size.</paragraph>
          </listitem>
       </list>
+     </section>
+     <comment>Draw and Impress do not have the Blinking and Hidden controls</comment>
+     <bookmark xml-lang="en-US" branch="index" id="bm_id410168"><bookmark_value>blinking fonts</bookmark_value>
+      <bookmark_value>flashing fonts</bookmark_value>
+</bookmark>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/effectspage/blinkingcb" id="bm_id012320090217277" localize="false"/>
+<h3 id="hd_id3152941">Blinking</h3>
+      <paragraph xml-lang="en-US" id="par_id3145662" role="paragraph"><ahelp hid="cui/ui/effectspage/blinkingcb">Makes the selected characters blink. You cannot change the blink frequency.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/effectspage/hiddencb" id="bm_id0123200902180465" localize="false"/>
+<h3 id="par_idN10B81">Hidden</h3>
+      <paragraph xml-lang="en-US" id="par_idN10B85" role="paragraph"><ahelp hid="cui/ui/effectspage/hiddencb">Hides the selected characters.</ahelp> To display the hidden text, ensure that <menuitem>Formatting Marks</menuitem> is selected in the <emph>View</emph> menu. You can also choose <switchinline select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - Preferences</menuitem>
+</caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline><emph> - %PRODUCTNAME Writer - Formatting Aids</emph> and select <emph>Hidden characters</emph>.</paragraph>
 </case>
+  <default>
+  <embed href="text/shared/01/05020200.xhp#CaseDefs"/><comment>copies the definitions from previous section</comment>
+  </default>
 </switch>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/effectspage/relieflb" id="bm_id0123200902202314" localize="false"/>
-<h2 id="hd_id3154129">Relief</h2>
+<h3 id="hd_id3154129">Relief</h3>
       <paragraph xml-lang="en-US" id="par_id3146974" role="paragraph"><ahelp hid="cui/ui/effectspage/relieflb">Select a <emph>relief</emph> effect to apply to the selected text. The <emph>embossed</emph> relief makes the characters appear as if they are raised above the page. The <emph>engraved</emph> relief makes the characters appear as if they are pressed into the page.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/effectspage/outlinecb" id="bm_id0123200902155356" localize="false"/>
 <h3 id="hd_id3147287">Outline</h3>
@@ -133,50 +170,12 @@
 <bookmark xml-lang="en-US" branch="hid/cui/ui/effectspage/shadowcb" id="bm_id0123200902163281" localize="false"/>
 <h3 id="hd_id3163714">Shadow</h3>
       <paragraph xml-lang="en-US" id="par_id3150962" role="paragraph"><ahelp hid="cui/ui/effectspage/shadowcb">Adds a shadow that casts below and to the right of the selected characters.</ahelp></paragraph>
-<switch select="appl">
-<case select="WRITER">
-<bookmark xml-lang="en-US" branch="index" id="bm_id410168"><bookmark_value>blinking fonts</bookmark_value>
-      <bookmark_value>flashing fonts</bookmark_value>
-</bookmark>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/effectspage/blinkingcb" id="bm_id012320090217277" localize="false"/>
-<h3 id="hd_id3152941">Blinking</h3>
-      <paragraph xml-lang="en-US" id="par_id3145662" role="paragraph"><ahelp hid="cui/ui/effectspage/blinkingcb">Makes the selected characters blink. You cannot change the blink frequency.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/effectspage/hiddencb" id="bm_id0123200902180465" localize="false"/>
-<h3 id="par_idN10B81">Hidden</h3>
-      <paragraph xml-lang="en-US" id="par_idN10B85" role="paragraph"><ahelp hid="cui/ui/effectspage/hiddencb">Hides the selected characters.</ahelp> To display the hidden text, ensure that <emph>Formatting Marks</emph> is selected in the <emph>View</emph> menu. You can also 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 select <emph>Hidden text</emph>.</paragraph>
-</case>
-</switch>
-<bookmark xml-lang="en-US" branch="hid/.uno:Overline" id="bm_id0123200902261777" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id0123200902291084" role="paragraph"><ahelp hid="." visibility="hidden"><emph>Overlines or removes overlining from the selected text. If the cursor is not in a word, the new text that you enter is overlined.</emph></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/effectspage/overlinelb" id="bm_id0123200902014986" localize="false"/>
-<h2 id="hd_id0123200902243376">Overlining</h2>
-      <paragraph xml-lang="en-US" id="par_id0123200902243343" role="paragraph"><ahelp hid="cui/ui/effectspage/overlinelb">Select the overlining style that you want to apply. To apply the overlining to words only, select the <emph>Individual Words</emph> box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/effectspage/overlinecolorlb" id="bm_id0123200902032228" localize="false"/>
-<h2 id="hd_id0123200902243470">Overline color</h2>
-      <paragraph xml-lang="en-US" id="par_id0123200902243466" role="paragraph"><ahelp hid="cui/ui/effectspage/overlinecolorlb">Select the color for the overlining.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/effectspage/strikeoutlb" id="bm_id0123200902074215" localize="false"/>
-<h2 id="hd_id3150400">Strikethrough</h2>
-      <paragraph xml-lang="en-US" id="par_id3145203" role="paragraph"><ahelp hid="cui/ui/effectspage/strikeoutlb">Select a strikethrough style for the selected text.</ahelp></paragraph>
-      <note id="par_id3150496">If you save your document in Microsoft Word format, all of the strikethrough styles are converted to the single line style.</note>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/effectspage/underlinelb" id="bm_id0123200902053711" localize="false"/>
-<h2 id="hd_id3151226">Underlining</h2>
-      <paragraph xml-lang="en-US" id="par_id3147576" role="paragraph"><ahelp hid="cui/ui/effectspage/underlinelb">Select the underlining style that you want to apply. To apply the underlining to words only, select the <emph>Individual Words</emph> box.</ahelp></paragraph>
-      <note id="par_id3153147">If you apply underlining to a superscript text, the underlining is raised to the level of the superscript. If the superscript is contained in a word with normal text, the underlining is not raised.</note>
-      <embed href="text/shared/00/00000007.xhp#objektleiste"/>
-      <embed href="text/shared/00/00040502.xhp#syunterstreichen"/>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/effectspage/underlinecolorlb" id="bm_id0123200902050229" localize="false"/>
-<h2 id="hd_id3148642">Underline color</h2>
-      <paragraph xml-lang="en-US" id="par_id3150254" role="paragraph"><ahelp hid="cui/ui/effectspage/underlinecolorlb">Select the color for the underlining.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/effectspage/individualwordscb" id="bm_id0123200902090860" localize="false"/>
-<h2 id="hd_id3153104">Individual words</h2>
-      <paragraph xml-lang="en-US" id="par_id3152935" role="paragraph"><ahelp hid="cui/ui/effectspage/individualwordscb">Applies the selected effect only to words and ignores spaces.</ahelp></paragraph>
       <embed href="text/shared/00/00000007.xhp#asia"/>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/effectspage/emphasislb" id="bm_id0123200902235399" localize="false"/>
-<h2 id="hd_id3150332">Emphasis mark</h2>
+<h3 id="hd_id3150332">Emphasis mark</h3>
       <paragraph xml-lang="en-US" id="par_id3152576" role="paragraph"><ahelp hid="cui/ui/effectspage/emphasislb">Select a character to display over or below the entire length of the selected text.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/effectspage/positionlb" id="bm_id0123200902241815" localize="false"/>
-<h2 id="hd_id3152460">Position</h2>
+<h3 id="hd_id3152460">Position</h3>
       <paragraph xml-lang="en-US" id="par_id3147436" role="paragraph"><ahelp hid="cui/ui/effectspage/positionlb">Specify where to display the emphasis marks.</ahelp></paragraph>
       <embed href="text/shared/00/00000001.xhp#vorschau"/>
       <embed href="text/shared/00/00000001.xhp#zurueck"/>
@@ -186,4 +185,4 @@
          <embed href="text/shared/guide/text_color.xhp#text_color"/>
       </section>
 </body>
-</helpdocument>
+</helpdocument>
\ No newline at end of file