add superscript and subscript support and remove odd 1^st construct

so we can get rid of the confusing 1^st help text suggestion

Change-Id: If6ce1b7a347c89f6209cfc09b67d939088efa6fc

3 files changed, 25 insertions, 9 deletions

diff --git a/helpcontent2/helpers/xmlhelp.dtd b/helpcontent2/helpers/xmlhelp.dtd
index bd0c39fbf3..96dcefac6d 100644
--- a/helpcontent2/helpers/xmlhelp.dtd
+++ b/helpcontent2/helpers/xmlhelp.dtd
@@ -3,7 +3,7 @@ Version 03-Feb-2006
   added optional localize attribute to images
 -->
 
-<!ELEMENT ahelp (#PCDATA | embedvar | br | comment | emph | item | link | switchinline | variable)*>
+<!ELEMENT ahelp (#PCDATA | embedvar | br | comment | emph | sub | sup | item | link | switchinline | variable)*>
 <!ATTLIST ahelp
   hid CDATA #REQUIRED
   visibility (hidden | visible) #IMPLIED
@@ -30,7 +30,7 @@ Version 03-Feb-2006
 
 <!ELEMENT br EMPTY>
 
-<!ELEMENT caption (#PCDATA | embedvar | br | emph | item | link | switchinline | variable)*>
+<!ELEMENT caption (#PCDATA | embedvar | br | emph | sub | sup | item | link | switchinline | variable)*>
 <!ATTLIST caption
   xml-lang CDATA #REQUIRED
   id CDATA #REQUIRED
@@ -42,7 +42,7 @@ Version 03-Feb-2006
   select CDATA #REQUIRED
 >
 
-<!ELEMENT caseinline (#PCDATA | image | embedvar | br | emph | item | link | switchinline | variable | ahelp | object)*>
+<!ELEMENT caseinline (#PCDATA | image | embedvar | br | emph | sub | sup | item | link | switchinline | variable | ahelp | object)*>
 <!ATTLIST caseinline
   select CDATA #REQUIRED
 >
@@ -56,7 +56,7 @@ Version 03-Feb-2006
 
 <!ELEMENT default (paragraph | table | comment | bookmark | embed | link | list | switch | section | sort)*>
 
-<!ELEMENT defaultinline (#PCDATA | image | embedvar | br | emph | item | link | switchinline | variable | ahelp | object)*>
+<!ELEMENT defaultinline (#PCDATA | image | embedvar | br | emph | sub | sup | item | link | switchinline | variable | ahelp | object)*>
 
 <!ELEMENT embed EMPTY>
 <!ATTLIST embed
@@ -73,6 +73,10 @@ Version 03-Feb-2006
 
 <!ELEMENT emph (#PCDATA | item | comment | help-id-missing)*>
 
+<!ELEMENT sub (#PCDATA | item | comment | help-id-missing)*>
+
+<!ELEMENT sup (#PCDATA | item | comment | help-id-missing)*>
+
 <!ELEMENT filename (#PCDATA)>
 
 <!ELEMENT helpdocument (meta, body)>
@@ -101,7 +105,7 @@ Version 03-Feb-2006
   date CDATA #REQUIRED
 >
 
-<!ELEMENT link (#PCDATA | embedvar | emph | item | variable | switchinline)*>
+<!ELEMENT link (#PCDATA | embedvar | emph | sub | sup | item | variable | switchinline)*>
 <!ATTLIST link
   href CDATA #REQUIRED
   name CDATA #IMPLIED
@@ -136,7 +140,7 @@ Version 03-Feb-2006
   width CDATA #IMPLIED
 >
 
-<!ELEMENT paragraph (#PCDATA | image | comment | embedvar | br | emph | item | link | switchinline | variable | ahelp | object | bookmark | help-id-missing)*>
+<!ELEMENT paragraph (#PCDATA | image | comment | embedvar | br | emph | sub | sup | item | link | switchinline | variable | ahelp | object | bookmark | help-id-missing)*>
 <!ATTLIST paragraph
   role CDATA #REQUIRED
   level CDATA #IMPLIED
@@ -207,7 +211,7 @@ Version 03-Feb-2006
 	status (DRAFT | FINAL | PUBLISH | STALLED | DEPRECATED) #IMPLIED
 >
 
-<!ELEMENT variable (#PCDATA | ahelp | embedvar | br | emph | item | link | variable | image | object | switchinline)*>
+<!ELEMENT variable (#PCDATA | ahelp | embedvar | br | emph | sub | sup | item | link | variable | image | object | switchinline)*>
 <!ATTLIST variable
   id CDATA #REQUIRED
   visibility (hidden | visible) #IMPLIED
diff --git a/helpcontent2/source/auxiliary/index.xsl b/helpcontent2/source/auxiliary/index.xsl
index f8a2a1d6fa..1d3b11910c 100644
--- a/helpcontent2/source/auxiliary/index.xsl
+++ b/helpcontent2/source/auxiliary/index.xsl
@@ -74,6 +74,18 @@
   </index:element>
 </xsl:template>
 
+<xsl:template match="sub">
+  <index:element index:tokenizer="com.sun.xmlsearch.util.SimpleTokenizer">
+      <xsl:apply-templates/>
+  </index:element>
+</xsl:template>
+
+<xsl:template match="sup">
+  <index:element index:tokenizer="com.sun.xmlsearch.util.SimpleTokenizer">
+      <xsl:apply-templates/>
+  </index:element>
+</xsl:template>
+
 <xsl:template match="paragraph">
   <index:element index:tokenizer="com.sun.xmlsearch.util.SimpleTokenizer">
       <xsl:apply-templates/>
diff --git a/helpcontent2/source/text/shared/01/06040400.xhp b/helpcontent2/source/text/shared/01/06040400.xhp
index c0c246b052..2a911f43cb 100644
--- a/helpcontent2/source/text/shared/01/06040400.xhp
+++ b/helpcontent2/source/text/shared/01/06040400.xhp
@@ -60,8 +60,8 @@
 <paragraph xml-lang="en-US" id="par_id3153173" role="paragraph" l10n="U" oldref="27">Inserts a non breaking space before ";", "!", "?" and ":" when the character language is set to French (France, Belgium, Luxembourg, Monaco, or Switzerland) and before ":" only when the character language is set to French (Canada).</paragraph>
 
 <comment>moved two paras from 06040100.xhp, cws cbosdo01</comment>
-<paragraph xml-lang="en-US" id="hd_id3159400" role="heading" level="2" l10n="U" oldref="25">Format ordinal number suffixes (1st ... 1^st)</paragraph>
-<paragraph xml-lang="en-US" id="par_id3154173" role="paragraph" l10n="U" oldref="27">Formats the text characters of ordinals, such as 1st, 2nd, or 3rd, as superscripts. For example, in English text, 1st will be converted to 1^st.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3159400" role="heading" level="2" l10n="U" oldref="25">Format ordinal number suffixes (1st ... 1<sup>st</sup>)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3154173" role="paragraph" l10n="U" oldref="27">Formats the text characters of ordinals, such as 1st, 2nd, or 3rd, as superscripts. For example, in English text, 1st will be converted to 1<sup>st</sup>.</paragraph>
 
 
 <paragraph role="heading" id="hd_id3154682" xml-lang="en-US" level="2" l10n="U" oldref="17">Single quotes / Double quotes</paragraph>