# HG changeset patch
# User Michael Stahl <mst@openoffice.org>
# Date 1284990827 -7200
# Node ID bf836e2a057f3438ea026e25b1c4f6db03712b36
# Parent  feb1a30e3e7d6f7f932909360cab340db0a426a2
rtftok01: commandextract: strip N,0,1 on controls; spectobnf: strip N on destinations

diff --git a/writerfilter/source/rtftok/commandextract.xsl b/writerfilter/source/rtftok/commandextract.xsl
--- a/writerfilter/source/rtftok/commandextract.xsl
+++ b/writerfilter/source/rtftok/commandextract.xsl
@@ -100,7 +100,7 @@
           <xsl:attribute name="name">name</xsl:attribute>
           <xsl:element name="xsl:value-of">
             <xsl:attribute name="select">
-              <xsl:text>$token</xsl:text>
+              <xsl:text>$tokenwithoutN</xsl:text>
             </xsl:attribute>
           </xsl:element>
         </xsl:element>
@@ -111,31 +111,44 @@
 
 <xsl:template name="maketokentoelement">
   <xsl:element name="xsl:template">
+    <xsl:attribute name="name">striptrailingN</xsl:attribute>
+    <xsl:element name="xsl:param">
+      <xsl:attribute name="name">token</xsl:attribute>
+    </xsl:element>
+    <xsl:element name="xsl:choose">
+      <xsl:element name="xsl:when">
+        <xsl:attribute name="test">
+          <xsl:text>translate(substring($token, string-length($token)), "N01", "NNN") = 'N'</xsl:text>
+        </xsl:attribute>
+        <xsl:element name="xsl:value-of">
+          <xsl:attribute name="select">
+            <xsl:text>substring($token, 1, string-length($token) - 1)</xsl:text>
+          </xsl:attribute>
+        </xsl:element>
+      </xsl:element>
+      <xsl:element name="xsl:otherwise">
+        <xsl:element name="xsl:value-of">
+          <xsl:attribute name="select">
+            <xsl:text>$token</xsl:text>
+          </xsl:attribute>
+        </xsl:element>
+      </xsl:element>
+    </xsl:element>
+  </xsl:element>
+  <xsl:element name="xsl:template">
     <xsl:attribute name="name">tokentoelement</xsl:attribute>
     <xsl:element name="xsl:param">
       <xsl:attribute name="name">token</xsl:attribute>
     </xsl:element>
     <xsl:element name="xsl:variable">
       <xsl:attribute name="name">tokenwithoutN</xsl:attribute>
-      <xsl:element name="xsl:choose">
-        <xsl:element name="xsl:when">
-          <xsl:attribute name="test">
-            <xsl:text>substring($token, string-length($token)) = 'N'</xsl:text>
-          </xsl:attribute>
-          <xsl:element name="xsl:value-of">
-            <xsl:attribute name="select">
-              <xsl:text>substring($token, 1, string-length($token) - 1)</xsl:text>
-            </xsl:attribute>
+      <xsl:element name="xsl:call-template">
+          <xsl:attribute name="name">striptrailingN</xsl:attribute>
+          <xsl:element name="xsl:with-param">
+              <xsl:attribute name="name">token</xsl:attribute>
+              <xsl:attribute name="select">$token</xsl:attribute>
           </xsl:element>
         </xsl:element>
-        <xsl:element name="xsl:otherwise">
-          <xsl:element name="xsl:value-of">
-            <xsl:attribute name="select">
-              <xsl:text>$token</xsl:text>
-            </xsl:attribute>
-          </xsl:element>
-        </xsl:element>
-      </xsl:element>
     </xsl:element>
     <xsl:call-template name="extract"/>
   </xsl:element>
@@ -143,6 +156,9 @@
 
 <xsl:template match="/">
   <xsl:element name="xsl:stylesheet">
+    <xsl:attribute name="version">
+      <xsl:text>1.0</xsl:text>
+    </xsl:attribute>
     <xsl:for-each select="key('texts', 'Appendix B: Index of RTF Control Words')">
       <xsl:for-each select="following::w:tbl[2]">
         <xsl:call-template name="maketokentoelement"/>
@@ -154,4 +170,4 @@
 <xsl:template match="*">  
 </xsl:template>
 
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
diff --git a/writerfilter/source/rtftok/spectobnf.xsl b/writerfilter/source/rtftok/spectobnf.xsl
--- a/writerfilter/source/rtftok/spectobnf.xsl
+++ b/writerfilter/source/rtftok/spectobnf.xsl
@@ -339,7 +339,9 @@
             <xsl:with-param name="prev">
               <destination>
                 <xsl:attribute name="name">
-                  <xsl:value-of select="substring($token, 4)"/>
+                  <xsl:call-template name="striptrailingN">
+                    <xsl:with-param name="token" select="substring($token, 4)"/>
+                  </xsl:call-template>
                 </xsl:attribute>
               </destination>
             </xsl:with-param>
@@ -644,4 +646,4 @@
 <xsl:template match="*">
 </xsl:template>
 
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
diff --git a/writerfilter/source/rtftok/tokentoelement.xsl b/writerfilter/source/rtftok/tokentoelement.xsl
--- a/writerfilter/source/rtftok/tokentoelement.xsl
+++ b/writerfilter/source/rtftok/tokentoelement.xsl
@@ -1,16 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <xsl:template name="striptrailingN">
+    <xsl:param name="token"/>
+    <xsl:choose>
+      <xsl:when test="translate(substring($token, string-length($token)), &quot;N01&quot;, &quot;NNN&quot;) = 'N'">
+        <xsl:value-of select="substring($token, 1, string-length($token) - 1)"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$token"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
   <xsl:template name="tokentoelement">
     <xsl:param name="token"/>
     <xsl:variable name="tokenwithoutN">
-      <xsl:choose>
-        <xsl:when test="substring($token, string-length($token)) = 'N'">
-          <xsl:value-of select="substring($token, 1, string-length($token) - 1)"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$token"/>
-        </xsl:otherwise>
-      </xsl:choose>
+      <xsl:call-template name="striptrailingN">
+        <xsl:with-param name="token" select="$token"/>
+      </xsl:call-template>
     </xsl:variable>
     <xsl:choose>
       <xsl:when test="$token= &quot;abslock&quot; or $token= &quot;additive&quot; or $token= &quot;adjustright&quot; or $token= &quot;aenddoc&quot; or $token= &quot;aendnotes&quot; or $token= &quot;afelev&quot; or $token= &quot;aftnbj&quot; or $token= &quot;aftnnalc&quot; or $token= &quot;aftnnar&quot; or $token= &quot;aftnnauc&quot; or $token= &quot;aftnnchi&quot; or $token= &quot;aftnnchosung&quot; or $token= &quot;aftnncnum&quot; or $token= &quot;aftnndbar&quot; or $token= &quot;aftnndbnum&quot; or $token= &quot;aftnndbnumd&quot; or $token= &quot;aftnndbnumk&quot; or $token= &quot;aftnndbnumt&quot; or $token= &quot;aftnnganada&quot; or $token= &quot;aftnngbnum&quot; or $token= &quot;aftnngbnumd&quot; or $token= &quot;aftnngbnumk&quot; or $token= &quot;aftnngbnuml&quot; or $token= &quot;aftnnrlc&quot; or $token= &quot;aftnnruc&quot; or $token= &quot;aftnnzodiac&quot; or $token= &quot;aftnnzodiacd&quot; or $token= &quot;aftnnzodiacl&quot; or $token= &quot;aftnrestart&quot; or $token= &quot;aftnrstcont&quot; or $token= &quot;aftntj&quot; or $token= &quot;allowfieldendsel&quot; or $token= &quot;allprot&quot; or $token= &quot;alntblind&quot; or $token= &quot;alt&quot; or $token= &quot;annotprot&quot; or $token= &quot;ansi&quot; or $token= &quot;ApplyBrkRules&quot; or $token= &quot;asianbrkrule&quot; or $token= &quot;autofmtoverride&quot; or $token= &quot;bdbfhdr&quot; or $token= &quot;bdrrlswsix&quot; or $token= &quot;bgbdiag&quot; or $token= &quot;bgcross&quot; or $token= &quot;bgdcross&quot; or $token= &quot;bgdkbdiag&quot; or $token= &quot;bgdkcross&quot; or $token= &quot;bgdkdcross&quot; or $token= &quot;bgdkfdiag&quot; or $token= &quot;bgdkhoriz&quot; or $token= &quot;bgdkvert&quot; or $token= &quot;bgfdiag&quot; or $token= &quot;bghoriz&quot; or $token= &quot;bgvert&quot; or $token= &quot;bkmkpub&quot; or $token= &quot;bookfold&quot; or $token= &quot;bookfoldrev&quot; or $token= &quot;box&quot; or $token= &quot;brdrb&quot; or $token= &quot;brdrbar&quot; or $token= &quot;brdrbtw&quot; or $token= &quot;brdrdash&quot; or $token= &quot;brdrdashd&quot; or $token= &quot;brdrdashdd&quot; or $token= &quot;brdrdashdot&quot; or $token= &quot;brdrdashdotdot&quot; or $token= &quot;brdrdashdotstr&quot; or $token= &quot;brdrdashsm&quot; or $token= &quot;brdrdb&quot; or $token= &quot;brdrdot&quot; or $token= &quot;brdremboss&quot; or $token= &quot;brdrengrave&quot; or $token= &quot;brdrframe&quot; or $token= &quot;brdrhair&quot; or $token= &quot;brdrinset&quot; or $token= &quot;brdrl&quot; or $token= &quot;brdrnil&quot; or $token= &quot;brdrnone&quot; or $token= &quot;brdroutset&quot; or $token= &quot;brdrr&quot; or $token= &quot;brdrs&quot; or $token= &quot;brdrsh&quot; or $token= &quot;brdrt&quot; or $token= &quot;brdrtbl&quot; or $token= &quot;brdrth&quot; or $token= &quot;brdrthtnlg&quot; or $token= &quot;brdrthtnmg&quot; or $token= &quot;brdrthtnsg&quot; or $token= &quot;brdrtnthlg&quot; or $token= &quot;brdrtnthmg&quot; or $token= &quot;brdrtnthsg&quot; or $token= &quot;brdrtnthtnlg&quot; or $token= &quot;brdrtnthtnmg&quot; or $token= &quot;brdrtnthtnsg&quot; or $token= &quot;brdrtriple&quot; or $token= &quot;brdrwavy&quot; or $token= &quot;brdrwavydb&quot; or $token= &quot;brkfrm&quot; or $token= &quot;bxe&quot; or $token= &quot;caccentfive&quot; or $token= &quot;caccentfour&quot; or $token= &quot;caccentone&quot; or $token= &quot;caccentsix&quot; or $token= &quot;caccentthree&quot; or $token= &quot;caccenttwo&quot; or $token= &quot;cachedcolbal&quot; or $token= &quot;cbackgroundone&quot; or $token= &quot;cbackgroundtwo&quot; or $token= &quot;cfollowedhyperlink&quot; or $token= &quot;chbgbdiag&quot; or $token= &quot;chbgcross&quot; or $token= &quot;chbgdcross&quot; or $token= &quot;chbgdkbdiag&quot; or $token= &quot;chbgdkcross&quot; or $token= &quot;chbgdkdcross&quot; or $token= &quot;chbgdkfdiag&quot; or $token= &quot;chbgdkhoriz&quot; or $token= &quot;chbgdkvert&quot; or $token= &quot;chbgfdiag&quot; or $token= &quot;chbghoriz&quot; or $token= &quot;chbgvert&quot; or $token= &quot;chbrdr&quot; or $token= &quot;chyperlink&quot; or $token= &quot;clbgbdiag&quot; or $token= &quot;clbgcross&quot; or $token= &quot;clbgdcross&quot; or $token= &quot;clbgdkbdiag&quot; or $token= &quot;clbgdkcross&quot; or $token= &quot;clbgdkdcross&quot; or $token= &quot;clbgdkfdiag&quot; or $token= &quot;clbgdkhor&quot; or $token= &quot;clbgdkvert&quot; or $token= &quot;clbgfdiag&quot; or $token= &quot;clbghoriz&quot; or $token= &quot;clbgvert&quot; or $token= &quot;clbrdrb&quot; or $token= &quot;clbrdrl&quot; or $token= &quot;clbrdrr&quot; or $token= &quot;clbrdrt&quot; or $token= &quot;cldel2007&quot; or $token= &quot;cldgll&quot; or $token= &quot;cldglu&quot; or $token= &quot;clFitText&quot; or $token= &quot;clhidemark2007&quot; or $token= &quot;clins&quot; or $token= &quot;clmgf&quot; or $token= &quot;clmrg&quot; or $token= &quot;clmrgd&quot; or $token= &quot;clmrgdr&quot; or $token= &quot;clNoWrap&quot; or $token= &quot;clshdrawnil&quot; or $token= &quot;clsplit&quot; or $token= &quot;clsplitr&quot; or $token= &quot;cltxbtlr&quot; or $token= &quot;cltxlrtb&quot; or $token= &quot;cltxlrtbv&quot; or $token= &quot;cltxtbrl&quot; or $token= &quot;cltxtbrlv&quot; or $token= &quot;clvertalb&quot; or $token= &quot;clvertalc&quot; or $token= &quot;clvertalt&quot; or $token= &quot;clvmgf&quot; or $token= &quot;clvmrg&quot; or $token= &quot;cmaindarkone&quot; or $token= &quot;cmaindarktwo&quot; or $token= &quot;cmainlightone&quot; or $token= &quot;cmainlighttwo&quot; or $token= &quot;collapsed&quot; or $token= &quot;contextualspace&quot; or $token= &quot;ctextone&quot; or $token= &quot;ctexttwo&quot; or $token= &quot;ctrl&quot; or $token= &quot;cvmme&quot; or $token= &quot;dbch&quot; or $token= &quot;defformat&quot; or $token= &quot;defshp&quot; or $token= &quot;dgmargin&quot; or $token= &quot;dgsnap&quot; or $token= &quot;dntblnsbdb&quot; or $token= &quot;dobxcolumn&quot; or $token= &quot;dobxmargin&quot; or $token= &quot;dobxpage&quot; or $token= &quot;dobymargin&quot; or $token= &quot;dobypage&quot; or $token= &quot;dobypara&quot; or $token= &quot;doctemp&quot; or $token= &quot;dolock&quot; or $token= &quot;donotshowcomments&quot; or $token= &quot;donotshowinsdel&quot; or $token= &quot;donotshowmarkup&quot; or $token= &quot;donotshowprops&quot; or $token= &quot;dpaendhol&quot; or $token= &quot;dpaendsol&quot; or $token= &quot;dparc&quot; or $token= &quot;dparcflipx&quot; or $token= &quot;dparcflipy&quot; or $token= &quot;dpastarthol&quot; or $token= &quot;dpastartsol&quot; or $token= &quot;dpcallout&quot; or $token= &quot;dpcoaccent&quot; or $token= &quot;dpcobestfit&quot; or $token= &quot;dpcoborder&quot; or $token= &quot;dpcodabs&quot; or $token= &quot;dpcodbottom&quot; or $token= &quot;dpcodcenter&quot; or $token= &quot;dpcodtop&quot; or $token= &quot;dpcominusx&quot; or $token= &quot;dpcominusy&quot; or $token= &quot;dpcosmarta&quot; or $token= &quot;dpcotdouble&quot; or $token= &quot;dpcotright&quot; or $token= &quot;dpcotsingle&quot; or $token= &quot;dpcottriple&quot; or $token= &quot;dpellipse&quot; or $token= &quot;dpendgroup&quot; or $token= &quot;dpfillbgpal&quot; or $token= &quot;dpfillfgpal&quot; or $token= &quot;dpgroup&quot; or $token= &quot;dpline&quot; or $token= &quot;dplinedado&quot; or $token= &quot;dplinedadodo&quot; or $token= &quot;dplinedash&quot; or $token= &quot;dplinedot&quot; or $token= &quot;dplinehollow&quot; or $token= &quot;dplinepal&quot; or $token= &quot;dplinesolid&quot; or $token= &quot;dppolygon&quot; or $token= &quot;dppolyline&quot; or $token= &quot;dprect&quot; or $token= &quot;dproundr&quot; or $token= &quot;dpshadow&quot; or $token= &quot;dptxbtlr&quot; or $token= &quot;dptxbx&quot; or $token= &quot;dptxlrtb&quot; or $token= &quot;dptxlrtbv&quot; or $token= &quot;dptxtbrl&quot; or $token= &quot;dptxtbrlv&quot; or $token= &quot;emfblip&quot; or $token= &quot;enddoc&quot; or $token= &quot;endnhere&quot; or $token= &quot;endnotes&quot; or $token= &quot;expshrtn&quot; or $token= &quot;faauto&quot; or $token= &quot;facenter&quot; or $token= &quot;facingp&quot; or $token= &quot;fafixed&quot; or $token= &quot;fahang&quot; or $token= &quot;faroman&quot; or $token= &quot;favar&quot; or $token= &quot;fbidi&quot; or $token= &quot;fbidis&quot; or $token= &quot;fbimajor&quot; or $token= &quot;fbiminor&quot; or $token= &quot;fdbmajor&quot; or $token= &quot;fdbminor&quot; or $token= &quot;fdecor&quot; or $token= &quot;felnbrelev&quot; or $token= &quot;fetch&quot; or $token= &quot;fhimajor&quot; or $token= &quot;fhiminor&quot; or $token= &quot;fjgothic&quot; or $token= &quot;fjminchou&quot; or $token= &quot;fldalt&quot; or $token= &quot;flddirty&quot; or $token= &quot;fldedit&quot; or $token= &quot;fldlock&quot; or $token= &quot;fldpriv&quot; or $token= &quot;flomajor&quot; or $token= &quot;flominor&quot; or $token= &quot;fmodern&quot; or $token= &quot;fnetwork&quot; or $token= &quot;fnil&quot; or $token= &quot;fnonfilesys&quot; or $token= &quot;forceupgrade&quot; or $token= &quot;formdisp&quot; or $token= &quot;formprot&quot; or $token= &quot;formshade&quot; or $token= &quot;fracwidth&quot; or $token= &quot;frmtxbtlr&quot; or $token= &quot;frmtxlrtb&quot; or $token= &quot;frmtxlrtbv&quot; or $token= &quot;frmtxtbrl&quot; or $token= &quot;frmtxtbrlv&quot; or $token= &quot;froman&quot; or $token= &quot;fromtext&quot; or $token= &quot;fscript&quot; or $token= &quot;fswiss&quot; or $token= &quot;ftech&quot; or $token= &quot;ftnalt&quot; or $token= &quot;ftnbj&quot; or $token= &quot;ftnil&quot; or $token= &quot;ftnlytwnine&quot; or $token= &quot;ftnnalc&quot; or $token= &quot;ftnnar&quot; or $token= &quot;ftnnauc&quot; or $token= &quot;ftnnchi&quot; or $token= &quot;ftnnchosung&quot; or $token= &quot;ftnncnum&quot; or $token= &quot;ftnndbar&quot; or $token= &quot;ftnndbnum&quot; or $token= &quot;ftnndbnumd&quot; or $token= &quot;ftnndbnumk&quot; or $token= &quot;ftnndbnumt&quot; or $token= &quot;ftnnganada&quot; or $token= &quot;ftnngbnum&quot; or $token= &quot;ftnngbnumd&quot; or $token= &quot;ftnngbnumk&quot; or $token= &quot;ftnngbnuml&quot; or $token= &quot;ftnnrlc&quot; or $token= &quot;ftnnruc&quot; or $token= &quot;ftnnzodiac&quot; or $token= &quot;ftnnzodiacd&quot; or $token= &quot;ftnnzodiacl&quot; or $token= &quot;ftnrestart&quot; or $token= &quot;ftnrstcont&quot; or $token= &quot;ftnrstpg&quot; or $token= &quot;ftntj&quot; or $token= &quot;fttruetype&quot; or $token= &quot;fvaliddos&quot; or $token= &quot;fvalidhpfs&quot; or $token= &quot;fvalidmac&quot; or $token= &quot;fvalidntfs&quot; or $token= &quot;gutterprl&quot; or $token= &quot;hich&quot; or $token= &quot;horzdoc&quot; or $token= &quot;horzsect&quot; or $token= &quot;hrule&quot; or $token= &quot;htmautsp&quot; or $token= &quot;htmlbase&quot; or $token= &quot;hwelev2007&quot; or $token= &quot;indmirror&quot; or $token= &quot;indrlsweleven&quot; or $token= &quot;intbl&quot; or $token= &quot;ixe&quot; or $token= &quot;jcompress&quot; or $token= &quot;jexpand&quot; or $token= &quot;jis&quot; or $token= &quot;jpegblip&quot; or $token= &quot;jsksu&quot; or $token= &quot;keep&quot; or $token= &quot;keepn&quot; or $token= &quot;krnprsnet&quot; or $token= &quot;jclisttab&quot; or $token= &quot;landscape&quot; or $token= &quot;lastrow&quot; or $token= &quot;levelpicturenosize&quot; or $token= &quot;linebetcol&quot; or $token= &quot;linecont&quot; or $token= &quot;lineppage&quot; or $token= &quot;linerestart&quot; or $token= &quot;linkself&quot; or $token= &quot;linkstyles&quot; or $token= &quot;listhybrid&quot; or $token= &quot;listoverridestartat&quot; or $token= &quot;lnbrkrule&quot; or $token= &quot;lndscpsxn&quot; or $token= &quot;lnongrid&quot; or $token= &quot;loch&quot; or $token= &quot;ltrch&quot; or $token= &quot;ltrdoc&quot; or $token= &quot;ltrpar&quot; or $token= &quot;ltrrow&quot; or $token= &quot;ltrsect&quot; or $token= &quot;lvltentative&quot; or $token= &quot;lytcalctblwd&quot; or $token= &quot;lytexcttp&quot; or $token= &quot;lytprtmet&quot; or $token= &quot;lyttblrtgr&quot; or $token= &quot;mac&quot; or $token= &quot;macpict&quot; or $token= &quot;makebackup&quot; or $token= &quot;margmirror&quot; or $token= &quot;margmirsxn&quot; or $token= &quot;mmattach&quot; or $token= &quot;mmblanklines&quot; or $token= &quot;mmdatatypeaccess&quot; or $token= &quot;mmdatatypeexcel&quot; or $token= &quot;mmdatatypefile&quot; or $token= &quot;mmdatatypeodbc&quot; or $token= &quot;mmdatatypeodso&quot; or $token= &quot;mmdatatypeqt&quot; or $token= &quot;mmdefaultsql&quot; or $token= &quot;mmdestemail&quot; or $token= &quot;mmdestfax&quot; or $token= &quot;mmdestnewdoc&quot; or $token= &quot;mmdestprinter&quot; or $token= &quot;mmlinktoquery&quot; or $token= &quot;mmmaintypecatalog&quot; or $token= &quot;mmmaintypeemail&quot; or $token= &quot;mmmaintypeenvelopes&quot; or $token= &quot;mmmaintypefax&quot; or $token= &quot;mmmaintypelabels&quot; or $token= &quot;mmmaintypeletters&quot; or $token= &quot;mmshowdata&quot; or $token= &quot;msmcap&quot; or $token= &quot;muser&quot; or $token= &quot;mvf&quot; or $token= &quot;mvt&quot; or $token= &quot;newtblstyruls&quot; or $token= &quot;noafcnsttbl&quot; or $token= &quot;nobrkwrptbl&quot; or $token= &quot;nocolbal&quot; or $token= &quot;nocompatoptions&quot; or $token= &quot;nocwrap&quot; or $token= &quot;nocxsptable&quot; or $token= &quot;noextrasprl&quot; or $token= &quot;nofeaturethrottle&quot; or $token= &quot;nogrowautofit&quot; or $token= &quot;noindnmbrts&quot; or $token= &quot;nojkernpunct&quot; or $token= &quot;nolead&quot; or $token= &quot;noline&quot; or $token= &quot;nolnhtadjtbl&quot; or $token= &quot;nonshppict&quot; or $token= &quot;nooverflow&quot; or $token= &quot;noproof&quot; or $token= &quot;noqfpromote&quot; or $token= &quot;nosectexpand&quot; or $token= &quot;nosnaplinegrid&quot; or $token= &quot;nospaceforul&quot; or $token= &quot;nosupersub&quot; or $token= &quot;notabind&quot; or $token= &quot;notbrkcnstfrctbl&quot; or $token= &quot;notcvasp&quot; or $token= &quot;notvatxbx&quot; or $token= &quot;nouicompat&quot; or $token= &quot;noultrlspc&quot; or $token= &quot;nowidctlpar&quot; or $token= &quot;nowrap&quot; or $token= &quot;nowwrap&quot; or $token= &quot;noxlattoyen&quot; or $token= &quot;objattph&quot; or $token= &quot;objautlink&quot; or $token= &quot;objemb&quot; or $token= &quot;objhtml&quot; or $token= &quot;objicemb&quot; or $token= &quot;objlink&quot; or $token= &quot;objlock&quot; or $token= &quot;objocx&quot; or $token= &quot;objpub&quot; or $token= &quot;objsetsize&quot; or $token= &quot;objsub&quot; or $token= &quot;objupdate&quot; or $token= &quot;oldas&quot; or $token= &quot;oldlinewrap&quot; or $token= &quot;otblrul&quot; or $token= &quot;overlay&quot; or $token= &quot;pagebb&quot; or $token= &quot;pard&quot; or $token= &quot;pc&quot; or $token= &quot;pca&quot; or $token= &quot;pgbrdrb&quot; or $token= &quot;pgbrdrfoot&quot; or $token= &quot;pgbrdrhead&quot; or $token= &quot;pgbrdrl&quot; or $token= &quot;pgbrdrr&quot; or $token= &quot;pgbrdrsnap&quot; or $token= &quot;pgbrdrt&quot; or $token= &quot;pgnbidia&quot; or $token= &quot;pgnbidib&quot; or $token= &quot;pgnchosung&quot; or $token= &quot;pgncnum&quot; or $token= &quot;pgncont&quot; or $token= &quot;pgndbnum&quot; or $token= &quot;pgndbnumd&quot; or $token= &quot;pgndbnumk&quot; or $token= &quot;pgndbnumt&quot; or $token= &quot;pgndec&quot; or $token= &quot;pgndecd&quot; or $token= &quot;pgnganada&quot; or $token= &quot;pgngbnum&quot; or $token= &quot;pgngbnumd&quot; or $token= &quot;pgngbnumk&quot; or $token= &quot;pgngbnuml&quot; or $token= &quot;pgnhindia&quot; or $token= &quot;pgnhindib&quot; or $token= &quot;pgnhindic&quot; or $token= &quot;pgnhindid&quot; or $token= &quot;pgnhnsc&quot; or $token= &quot;pgnhnsh&quot; or $token= &quot;pgnhnsm&quot; or $token= &quot;pgnhnsn&quot; or $token= &quot;pgnhnsp&quot; or $token= &quot;pgnid&quot; or $token= &quot;pgnlcltr&quot; or $token= &quot;pgnlcrm&quot; or $token= &quot;pgnrestart&quot; or $token= &quot;pgnthaia&quot; or $token= &quot;pgnthaib&quot; or $token= &quot;pgnthaic&quot; or $token= &quot;pgnucltr&quot; or $token= &quot;pgnucrm&quot; or $token= &quot;pgnvieta&quot; or $token= &quot;pgnzodiac&quot; or $token= &quot;pgnzodiacd&quot; or $token= &quot;pgnzodiacl&quot; or $token= &quot;phcol&quot; or $token= &quot;phmrg&quot; or $token= &quot;phpg&quot; or $token= &quot;picbmp&quot; or $token= &quot;picscaled&quot; or $token= &quot;pindtabqc&quot; or $token= &quot;pindtabql&quot; or $token= &quot;pindtabqr&quot; or $token= &quot;plain&quot; or $token= &quot;pmartabqc&quot; or $token= &quot;pmartabql&quot; or $token= &quot;pmartabqr&quot; or $token= &quot;pnacross&quot; or $token= &quot;pnaiu&quot; or $token= &quot;pnaiud&quot; or $token= &quot;pnaiueo&quot; or $token= &quot;pnaiueod&quot; or $token= &quot;pnbidia&quot; or $token= &quot;pnbidib&quot; or $token= &quot;pncard&quot; or $token= &quot;pnchosung&quot; or $token= &quot;pncnum&quot; or $token= &quot;pndbnum&quot; or $token= &quot;pndbnumd&quot; or $token= &quot;pndbnumk&quot; or $token= &quot;pndbnuml&quot; or $token= &quot;pndbnumt&quot; or $token= &quot;pndec&quot; or $token= &quot;pndecd&quot; or $token= &quot;pnganada&quot; or $token= &quot;pngblip&quot; or $token= &quot;pngbnum&quot; or $token= &quot;pngbnumd&quot; or $token= &quot;pngbnumk&quot; or $token= &quot;pngbnuml&quot; or $token= &quot;pnhang&quot; or $token= &quot;pniroha&quot; or $token= &quot;pnirohad&quot; or $token= &quot;pnlcltr&quot; or $token= &quot;pnlcrm&quot; or $token= &quot;pnlvlblt&quot; or $token= &quot;pnlvlbody&quot; or $token= &quot;pnlvlcont&quot; or $token= &quot;pnnumonce&quot; or $token= &quot;pnord&quot; or $token= &quot;pnordt&quot; or $token= &quot;pnprev&quot; or $token= &quot;pnqc&quot; or $token= &quot;pnql&quot; or $token= &quot;pnqr&quot; or $token= &quot;pnrestart&quot; or $token= &quot;pnrnot&quot; or $token= &quot;pnucltr&quot; or $token= &quot;pnucrm&quot; or $token= &quot;pnuld&quot; or $token= &quot;pnuldash&quot; or $token= &quot;pnuldashd&quot; or $token= &quot;pnuldashdd&quot; or $token= &quot;pnuldb&quot; or $token= &quot;pnulhair&quot; or $token= &quot;pnulnone&quot; or $token= &quot;pnulth&quot; or $token= &quot;pnulw&quot; or $token= &quot;pnulwave&quot; or $token= &quot;pnzodiac&quot; or $token= &quot;pnzodiacd&quot; or $token= &quot;pnzodiacl&quot; or $token= &quot;posxc&quot; or $token= &quot;posxi&quot; or $token= &quot;posxl&quot; or $token= &quot;posxo&quot; or $token= &quot;posxr&quot; or $token= &quot;posyb&quot; or $token= &quot;posyc&quot; or $token= &quot;posyil&quot; or $token= &quot;posyin&quot; or $token= &quot;posyout&quot; or $token= &quot;posyt&quot; or $token= &quot;prcolbl&quot; or $token= &quot;printdata&quot; or $token= &quot;psover&quot; or $token= &quot;ptabldot&quot; or $token= &quot;ptablmdot&quot; or $token= &quot;ptablminus&quot; or $token= &quot;ptablnone&quot; or $token= &quot;ptabluscore&quot; or $token= &quot;pubauto&quot; or $token= &quot;pvmrg&quot; or $token= &quot;pvpara&quot; or $token= &quot;pvpg&quot; or $token= &quot;qc&quot; or $token= &quot;qd&quot; or $token= &quot;qj&quot; or $token= &quot;ql&quot; or $token= &quot;qr&quot; or $token= &quot;qt&quot; or $token= &quot;rawclbgdkbdiag&quot; or $token= &quot;rawclbgbdiag&quot; or $token= &quot;rawclbgcross&quot; or $token= &quot;rawclbgdcross&quot; or $token= &quot;rawclbgdkcross&quot; or $token= &quot;rawclbgdkdcross&quot; or $token= &quot;rawclbgdkfdiag&quot; or $token= &quot;rawclbgdkhor&quot; or $token= &quot;rawclbgdkvert&quot; or $token= &quot;rawclbgfdiag&quot; or $token= &quot;rawclbghoriz&quot; or $token= &quot;rawclbgvert&quot; or $token= &quot;readonlyrecommended&quot; or $token= &quot;readprot&quot; or $token= &quot;remdttm&quot; or $token= &quot;rempersonalinfo&quot; or $token= &quot;revisions&quot; or $token= &quot;revprot&quot; or $token= &quot;rsltbmp&quot; or $token= &quot;rslthtml&quot; or $token= &quot;rsltmerge&quot; or $token= &quot;rsltpict&quot; or $token= &quot;rsltrtf&quot; or $token= &quot;rslttxt&quot; or $token= &quot;rtlch&quot; or $token= &quot;rtldoc&quot; or $token= &quot;rtlgutter&quot; or $token= &quot;rtlpar&quot; or $token= &quot;rtlrow&quot; or $token= &quot;rtlsect&quot; or $token= &quot;saftnnalc&quot; or $token= &quot;saftnnar&quot; or $token= &quot;saftnnauc&quot; or $token= &quot;saftnnchi&quot; or $token= &quot;saftnnchosung&quot; or $token= &quot;saftnncnum&quot; or $token= &quot;saftnndbar&quot; or $token= &quot;saftnndbnum&quot; or $token= &quot;saftnndbnumd&quot; or $token= &quot;saftnndbnumk&quot; or $token= &quot;saftnndbnumt&quot; or $token= &quot;saftnnganada&quot; or $token= &quot;saftnngbnum&quot; or $token= &quot;saftnngbnumd&quot; or $token= &quot;saftnngbnumk&quot; or $token= &quot;saftnngbnuml&quot; or $token= &quot;saftnnrlc&quot; or $token= &quot;saftnnruc&quot; or $token= &quot;saftnnzodiac&quot; or $token= &quot;saftnnzodiacd&quot; or $token= &quot;saftnnzodiacl&quot; or $token= &quot;saftnrestart&quot; or $token= &quot;saftnrstcont&quot; or $token= &quot;sautoupd&quot; or $token= &quot;saveinvalidxml&quot; or $token= &quot;saveprevpict&quot; or $token= &quot;sbkcol&quot; or $token= &quot;sbkeven&quot; or $token= &quot;sbknone&quot; or $token= &quot;sbkodd&quot; or $token= &quot;sbkpage&quot; or $token= &quot;sbys&quot; or $token= &quot;scompose&quot; or $token= &quot;sectd&quot; or $token= &quot;sectdefaultcl&quot; or $token= &quot;sectspecifycl&quot; or $token= &quot;sectspecifygenN&quot; or $token= &quot;sectspecifyl&quot; or $token= &quot;sectunlocked&quot; or $token= &quot;sftnbj&quot; or $token= &quot;sftnnalc&quot; or $token= &quot;sftnnar&quot; or $token= &quot;sftnnauc&quot; or $token= &quot;sftnnchi&quot; or $token= &quot;sftnnchosung&quot; or $token= &quot;sftnncnum&quot; or $token= &quot;sftnndbar&quot; or $token= &quot;sftnndbnum&quot; or $token= &quot;sftnndbnumd&quot; or $token= &quot;sftnndbnumk&quot; or $token= &quot;sftnndbnumt&quot; or $token= &quot;sftnnganada&quot; or $token= &quot;sftnngbnum&quot; or $token= &quot;sftnngbnumd&quot; or $token= &quot;sftnngbnumk&quot; or $token= &quot;sftnngbnuml&quot; or $token= &quot;sftnnrlc&quot; or $token= &quot;sftnnruc&quot; or $token= &quot;sftnnzodiac&quot; or $token= &quot;sftnnzodiacd&quot; or $token= &quot;sftnnzodiacl&quot; or $token= &quot;sftnrestart&quot; or $token= &quot;sftnrstcont&quot; or $token= &quot;sftnrstpg&quot; or $token= &quot;sftntj&quot; or $token= &quot;shidden&quot; or $token= &quot;shift&quot; or $token= &quot;shpbxcolumn&quot; or $token= &quot;shpbxignore&quot; or $token= &quot;shpbxmargin&quot; or $token= &quot;shpbxpage&quot; or $token= &quot;shpbyignore&quot; or $token= &quot;shpbymargin&quot; or $token= &quot;shpbypage&quot; or $token= &quot;shpbypara&quot; or $token= &quot;shplockanchor&quot; or $token= &quot;slocked&quot; or $token= &quot;snaptogridincell&quot; or $token= &quot;softcol&quot; or $token= &quot;softline&quot; or $token= &quot;softpage&quot; or $token= &quot;spersonal&quot; or $token= &quot;spltpgpar&quot; or $token= &quot;splytwnine&quot; or $token= &quot;sprsbsp&quot; or $token= &quot;sprslnsp&quot; or $token= &quot;sprsspbf&quot; or $token= &quot;sprstsm&quot; or $token= &quot;sprstsp&quot; or $token= &quot;spv&quot; or $token= &quot;sqformat&quot; or $token= &quot;sreply&quot; or $token= &quot;stylelock&quot; or $token= &quot;stylelockbackcomp&quot; or $token= &quot;stylelockenforced&quot; or $token= &quot;stylelockqfset&quot; or $token= &quot;stylelocktheme&quot; or $token= &quot;sub&quot; or $token= &quot;subfontbysize&quot; or $token= &quot;super&quot; or $token= &quot;swpbdr&quot; or $token= &quot;tabsnoovrlp&quot; or $token= &quot;taprtl&quot; or $token= &quot;tbllkbestfit&quot; or $token= &quot;tbllkborder&quot; or $token= &quot;tbllkcolor&quot; or $token= &quot;tbllkfont&quot; or $token= &quot;tbllkhdrcols&quot; or $token= &quot;tbllkhdrrows&quot; or $token= &quot;tbllklastcol&quot; or $token= &quot;tbllklastrow&quot; or $token= &quot;tbllknocolband&quot; or $token= &quot;tbllknorowband&quot; or $token= &quot;tbllkshading&quot; or $token= &quot;tcelld&quot; or $token= &quot;tcn&quot; or $token= &quot;titlepg&quot; or $token= &quot;tldot&quot; or $token= &quot;tleq&quot; or $token= &quot;tlhyph&quot; or $token= &quot;tlmdot&quot; or $token= &quot;tlth&quot; or $token= &quot;tlul&quot; or $token= &quot;toplinepunct&quot; or $token= &quot;tphcol&quot; or $token= &quot;tphmrg&quot; or $token= &quot;tphpg&quot; or $token= &quot;tposxc&quot; or $token= &quot;tposxi&quot; or $token= &quot;tposxl&quot; or $token= &quot;tposxo&quot; or $token= &quot;tposxr&quot; or $token= &quot;tposyb&quot; or $token= &quot;tposyc&quot; or $token= &quot;tposyil&quot; or $token= &quot;tposyin&quot; or $token= &quot;tposyout&quot; or $token= &quot;tposyt&quot; or $token= &quot;tpvmrg&quot; or $token= &quot;tpvpara&quot; or $token= &quot;tpvpg&quot; or $token= &quot;tqc&quot; or $token= &quot;tqdec&quot; or $token= &quot;tqr&quot; or $token= &quot;transmf&quot; or $token= &quot;trbgbdiag&quot; or $token= &quot;trbgcross&quot; or $token= &quot;trbgdcross&quot; or $token= &quot;trbgdkbdiag&quot; or $token= &quot;trbgdkcross&quot; or $token= &quot;trbgdkdcross&quot; or $token= &quot;trbgdkfdiag&quot; or $token= &quot;trbgdkhor&quot; or $token= &quot;trbgdkvert&quot; or $token= &quot;trbgfdiag&quot; or $token= &quot;trbghoriz&quot; or $token= &quot;trbgvert&quot; or $token= &quot;trbrdrb&quot; or $token= &quot;trbrdrh&quot; or $token= &quot;trbrdrl&quot; or $token= &quot;trbrdrr&quot; or $token= &quot;trbrdrt&quot; or $token= &quot;trbrdrv&quot; or $token= &quot;trhdr&quot; or $token= &quot;trkeep&quot; or $token= &quot;trkeepfollow&quot; or $token= &quot;trowd&quot; or $token= &quot;trqc&quot; or $token= &quot;trql&quot; or $token= &quot;trqr&quot; or $token= &quot;truncatefontheight&quot; or $token= &quot;truncex&quot; or $token= &quot;tsbgbdiag&quot; or $token= &quot;tsbgcross&quot; or $token= &quot;tsbgdcross&quot; or $token= &quot;tsbgdkbdiag&quot; or $token= &quot;tsbgdkcross&quot; or $token= &quot;tsbgdkdcross&quot; or $token= &quot;tsbgdkfdiag&quot; or $token= &quot;tsbgdkhor&quot; or $token= &quot;tsbgdkvert&quot; or $token= &quot;tsbgfdiag&quot; or $token= &quot;tsbghoriz&quot; or $token= &quot;tsbgvert&quot; or $token= &quot;tsbrdrb&quot; or $token= &quot;tsbrdrdgl&quot; or $token= &quot;tsbrdrdgr&quot; or $token= &quot;tsbrdrh&quot; or $token= &quot;tsbrdrl&quot; or $token= &quot;tsbrdrr&quot; or $token= &quot;tsbrdrr&quot; or $token= &quot;tsbrdrt&quot; or $token= &quot;tsbrdrv&quot; or $token= &quot;tscbandhorzeven&quot; or $token= &quot;tscbandhorzodd&quot; or $token= &quot;tscbandverteven&quot; or $token= &quot;tscbandvertodd&quot; or $token= &quot;tscfirstcol&quot; or $token= &quot;tscfirstrow&quot; or $token= &quot;tsclastcol&quot; or $token= &quot;tsclastrow&quot; or $token= &quot;tscnecell&quot; or $token= &quot;tscnwcell&quot; or $token= &quot;tscsecell&quot; or $token= &quot;tscswcell&quot; or $token= &quot;tsd&quot; or $token= &quot;tsnowrap&quot; or $token= &quot;tsrowd&quot; or $token= &quot;tsvertalb&quot; or $token= &quot;tsvertalc&quot; or $token= &quot;tsvertalt&quot; or $token= &quot;twoonone&quot; or $token= &quot;txbxtwalways&quot; or $token= &quot;txbxtwfirst&quot; or $token= &quot;txbxtwfirstlast&quot; or $token= &quot;txbxtwlast&quot; or $token= &quot;txbxtwno&quot; or $token= &quot;uld&quot; or $token= &quot;ulnone&quot; or $token= &quot;ulw&quot; or $token= &quot;useltbaln&quot; or $token= &quot;usenormstyforlist&quot; or $token= &quot;usexform&quot; or $token= &quot;utinl&quot; or $token= &quot;vertal&quot; or $token= &quot;vertalb&quot; or $token= &quot;vertalc&quot; or $token= &quot;vertalj&quot; or $token= &quot;vertalt&quot; or $token= &quot;vertdoc&quot; or $token= &quot;vertsect&quot; or $token= &quot;viewnobound&quot; or $token= &quot;webhidden&quot; or $token= &quot;widctlpar&quot; or $token= &quot;widowctrl&quot; or $token= &quot;wpjst&quot; or $token= &quot;wpsp&quot; or $token= &quot;wraparound&quot; or $token= &quot;wrapdefault&quot; or $token= &quot;wrapthrough&quot; or $token= &quot;wraptight&quot; or $token= &quot;wraptrsp&quot; or $token= &quot;wrppunct&quot; or $token= &quot;xmlattr&quot; or $token= &quot;xmlsdttcell&quot; or $token= &quot;xmlsdttpara&quot; or $token= &quot;xmlsdttregular&quot; or $token= &quot;xmlsdttrow&quot; or $token= &quot;xmlsdttunknown&quot; or $token= &quot;yxe&quot;">
@@ -51,7 +57,7 @@
       <xsl:otherwise>
         <control>
           <xsl:attribute name="name">
-            <xsl:value-of select="$token"/>
+            <xsl:value-of select="$tokenwithoutN"/>
           </xsl:attribute>
         </control>
       </xsl:otherwise>
