Made minor tweaks.

git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/trunk@352590 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/types/definitions/chp_type.xml b/src/types/definitions/chp_type.xml
index 65f3d12a69da462ddaba0e41390d936bfd4a1eed..45cbc657a6e5f4c1e0efa981f901cafb67e21e15 100644 (file)
--- a/src/types/definitions/chp_type.xml
+++ b/src/types/definitions/chp_type.xml
@@ -4,6 +4,7 @@
     <description>Character Properties.</description>
     <author>S. Ryan Ackley</author>
     <fields>
+      <field type="short" size="2" name="chse"/>
       <field type="int" size="2" name="format_flags">
         <bit number="0" mask="0x0001" name="fBold"/>
         <bit number="1" mask="0x0002" name="fItalic"/>
@@ -33,35 +34,48 @@
       <field type="int" size="2" name="ftcOther"/>
       <field type="int" size="2" name="hps"/>
       <field type="int" size="4" name="dxaSpace"/>
-      <field type="int" size="1" name="iss"/>
-      <field type="int" size="1" name="kul"/>
-      <field type="int" size="1" name="ico"/>
+      <field type="byte" size="1" name="iss"/>
+      <field type="byte" size="1" name="kul"/>
+      <field type="byte" size="1" name="ico"/>
       <field type="int" size="2" name="hpsPos"/>
       <field type="int" size="2" name="lidDefault"/>
       <field type="int" size="2" name="lidFE"/>
-      <field type="int" size="1" name="idctHint"/>
+      <field type="byte" size="1" name="idctHint"/>
       <field type="int" size="2" name="wCharScale"/>
-      <field type="int" size="4" name="FC"/>
+      <field type="int" size="4" name="fcPic"/>
+      <field type="int" size="4" name="fcObj"/>
+      <field type="int" size="4" name="lTagObj"/>
       <field type="int" size="2" name="ibstRMark"/>
       <field type="int" size="2" name="ibstRMarkDel"/>
+      <field type="short[]" size="4" name="dttmRMark"/>
+      <field type="short[]" size="4" name="dttmRMarkDel"/>
       <field type="int" size="2" name="istd"/>
+      <field type="int" size="2" name="baseIstd"/>
       <field type="int" size="2" name="ftcSym"/>
       <field type="int" size="2" name="xchSym"/>
       <field type="int" size="2" name="idslRMReason"/>
       <field type="int" size="2" name="idslReasonDel"/>
-      <field type="int" size="1" name="ysr"/>
-      <field type="int" size="1" name="chYsr"/>
+      <field type="byte" size="1" name="ysr"/>
+      <field type="byte" size="1" name="chYsr"/>
       <field type="int" size="2" name="hpsKern"/>
-      <field type="int" size="1" name="icoHighlight"/>
-      <field type="int" size="1" name="fHighlight"/>
-      <field type="int" size="2" name="fPropMark"/>
+      <field type="short" size="2" name="Highlight">
+        <bit number="0" mask="0x001f" name="icoHighlight"/>
+        <bit number="1" mask="0x0020" name="fHighlight"/>
+        <bit number="2" mask="0x01c0" name="kcd"/>
+        <bit number="3" mask="0x0200" name="fNavHighlight"/>
+        <bit number="4" mask="0x0400" name="fChsDiff"/>
+        <bit number="5" mask="0x0800" name="fMacChs"/>
+        <bit number="6" mask="0x1000" name="fFtcAsciSym"/>
+      </field>
+      <field type="short" size="2" name="fPropMark"/>
       <field type="int" size="2" name="ibstPropRMark"/>
       <field type="int" size="4" name="dttmPropRMark"/>
-      <field type="int" size="1" name="sfxtText"/>
-      <field type="int" size="1" name="fDispFldRMark"/>
+      <field type="byte" size="1" name="sfxtText"/>
+      <field type="byte" size="1" name="fDispFldRMark"/>
       <field type="int" size="2" name="ibstDispFldRMark"/>
       <field type="int" size="4" name="dttmDispFldRMark"/>
+      <field type="byte[]" size="32" name="xstDispFldRMark"/>
       <field type="int" size="2" name="shd"/>
-      <field type="int" size="2" name="brc"/>
+      <field type="short[]" size="4" name="brc"/>
     </fields>
 </record>

diff --git a/src/types/definitions/pap_type.xml b/src/types/definitions/pap_type.xml
index 0ad7d47f3f338919424a2154ef6a43556b9d92b1..c2699fa0dfbb1decab01ed7ffda2c5021d91c55f 100644 (file)
--- a/src/types/definitions/pap_type.xml
+++ b/src/types/definitions/pap_type.xml
@@ -18,7 +18,7 @@
         <field type="byte" size="1" name="ilvl"/>
         <field type="byte" size="1" name="fNoLnn"/>
         <field type="int" size="2" name="ilfo"/>
-        <field type="byte" size="1" name="fSideBiSide"/>
+        <field type="byte" size="1" name="fSideBySide"/>
         <field type="byte" size="1" name="fNoAutoHyph"/>
         <field type="byte" size="1" name="fWidowControl"/>
         <field type="int" size="4" name="dxaRight"/>
@@ -26,6 +26,7 @@
         <field type="int" size="4" name="dxaLeft1"/>
         <field type="short[]" size="4" name="lspd"/>
         <field type="int" size="4" name="dyaBefore"/>
+        <field type="int" size="4" name="dyaAfter"/>
         <field type="byte[]" size="12" name="phe"/>
         <field type="byte" size="1" name="fCrLf"/>
         <field type="byte" size="1" name="fUsePgsuSettings"/>
@@ -35,9 +36,13 @@
         <field type="byte" size="1" name="fOverflowPunct"/>
         <field type="byte" size="1" name="fTopLinePunct"/>
         <field type="byte" size="1" name="fAutoSpaceDE"/>
-        <field type="byte" size="1" name="fAtuoSpaceDN"/>
+        <field type="byte" size="1" name="fAutoSpaceDN"/>
         <field type="int" size="2" name="wAlignFont"/>
-        <field type="byte" size="1" name="fVertical"/>
+        <field type="short" size="2" name="fontAlign">
+          <bit number="0" mask="0x0001" name="fVertical"/>
+          <bit number="1" mask="0x0002" name="fBackward"/>
+          <bit number="2" mask="0x0004" name="fRotateFont"/>
+        </field>
         <field type="byte" size="1" name="fBackward"/>
         <field type="byte" size="1" name="fRotateFont"/>
         <field type="byte" size="1" name="fInTable"/>
@@ -58,8 +63,8 @@
         <field type="int" size="4" name="dyaFromText"/>
         <field type="int" size="2" name="dyaHeight"/>
         <field type="byte" size="1" name="fMinHeight"/>
-        <field type="byte[]" size="2" name="shd"/>
-        <field type="byte[]" size="2" name="dcs"/>
+        <field type="short" size="2" name="shd"/>
+        <field type="short" size="2" name="dcs"/>
         <field type="byte" size="1" name="lvl"/>
         <field type="byte" size="1" name="fNumRMIns"/>
         <field type="byte[]" size="84" name="anld"/>

diff --git a/src/types/definitions/sep_type.xml b/src/types/definitions/sep_type.xml
index dab6d5a6982e4646d2bfc97db06a243db780b963..0bbbb3389f39a0aa24b6decf3b552ecd6ae362b0 100644 (file)
--- a/src/types/definitions/sep_type.xml
+++ b/src/types/definitions/sep_type.xml
@@ -5,29 +5,29 @@
     <author>S. Ryan Ackley</author>
     <fields>
       <field type="byte" size="1" name="bkc"/>
-      <field type="byte" size="1" name="fTitlePage"/>
-      <field type="byte" size="1" name="fAutoPgn"/>
+      <field type="boolean" size="0" name="fTitlePage"/>
+      <field type="boolean" size="0" name="fAutoPgn"/>
       <field type="byte" size="1" name="nfcPgn"/>
-      <field type="byte" size="1" name="fUnlocked"/>
+      <field type="boolean" size="0" name="fUnlocked"/>
       <field type="byte" size="1" name="cnsPgn"/>
-      <field type="byte" size="1" name="fPgnRestart"/>
-      <field type="byte" size="1" name="fEndNote"/>
+      <field type="boolean" size="0" name="fPgnRestart"/>
+      <field type="boolean" size="0" name="fEndNote"/>
       <field type="byte" size="1" name="lnc"/>
-      <field type="byte" size="1" name="unused1"/>
+      <field type="byte" size="1" name="grpfIhdt"/>
       <field type="int" size="2" name="nLnnMod"/>
       <field type="int" size="4" name="dxaLnn"/>
       <field type="int" size="2" name="dxaPgn"/>
       <field type="int" size="2" name="dyaPgn"/>
-      <field type="byte" size="1" name="fLBetween"/>
+      <field type="boolean" size="0" name="fLBetween"/>
       <field type="byte" size="1" name="vjc"/>
       <field type="int" size="2" name="dmBinFirst"/>
       <field type="int" size="2" name="dmBinOther"/>
       <field type="int" size="2" name="dmPaperReq"/>
-      <field type="int" size="4" name="brcTop"/>
-      <field type="int" size="4" name="brcLeft"/>
-      <field type="int" size="4" name="brcBottom"/>
-      <field type="int" size="4" name="brcRight"/>
-      <field type="int" size="2" name="fPropMark"/>
+      <field type="short[]" size="4" name="brcTop"/>
+      <field type="short[]" size="4" name="brcLeft"/>
+      <field type="short[]" size="4" name="brcBottom"/>
+      <field type="short[]" size="4" name="brcRight"/>
+      <field type="boolean" size="0" name="fPropMark"/>
       <field type="int" size="2" name="ibstPropRMark"/>
       <field type="int" size="4" name="dttmPropRMark"/>
       <field type="int" size="4" name="dxtCharSpace"/>
@@ -40,7 +40,7 @@
       <field type="int" size="2" name="lnnMin"/>
       <field type="int" size="2" name="wTextFlow"/>
       <field type="short" size="2" name="unused3"/>
-      <field type="int" size="2" name="pgbProb"/>
+      <field type="int" size="2" name="pgbProp"/>
       <field type="short" size="2" name="unused4"/>
       <field type="int" size="4" name="xaPage"/>
       <field type="int" size="4" name="yaPage"/>
@@ -54,7 +54,7 @@
       <field type="int" size="4" name="dyaHdrTop"/>
       <field type="int" size="4" name="dyaHdrBottom"/>
       <field type="int" size="2" name="ccolM1"/>
-      <field type="byte" size="1" name="fEvenlySpaced"/>
+      <field type="boolean" size="0" name="fEvenlySpaced"/>
       <field type="byte" size="1" name="unused5"/>
       <field type="int" size="4" name="dxaColumns"/>
       <field type="int[]" size="356" name="rgdxaColumn"/>
@@ -62,6 +62,6 @@
       <field type="byte" size="1" name="dmOrientFirst"/>
       <field type="byte" size="1" name="fLayout"/>
       <field type="short" size="2" name="unused6"/>
-      <field type="byte[]" size="212" name="olst"/>
+      <field type="byte[]" size="212" name="olstAnm"/>
     </fields>
 </record>
\ No newline at end of file

diff --git a/src/types/definitions/tap_type.xml b/src/types/definitions/tap_type.xml
index 292b8d0b079e96d817f8b593a9da26962f92cc9e..5b338b34540304bcdfe2d8d9703340829fc72804 100644 (file)
--- a/src/types/definitions/tap_type.xml
+++ b/src/types/definitions/tap_type.xml
@@ -7,13 +7,18 @@
       <field type="int" size="2" name="jc"/>
       <field type="int" size="4" name="dxaGapHalf"/>
       <field type="int" size="4" name="dyaRowHeight"/>
-      <field type="byte" size="1" name="fCantSplit"/>
-      <field type="byte" size="1" name="fTableHeader"/>
+      <field type="boolean" size="0" name="fCantSplit"/>
+      <field type="boolean" size="0" name="fTableHeader"/>
       <field type="int" size="4" name="tlp"/>
-      <field type="int" size="2" name="itcMac"/>
+      <field type="short" size="2" name="itcMac"/>
       <field type="short[]" size="130" name="rgdxaCenter"/>
-      <field type="byte[]" size="0" name="rgtc"/>
+      <field type="TCAbstractType[]" size="0" name="rgtc"/>
       <field type="byte[]" size="0" name="rgshd"/>
-      <field type="byte[]" size="0" name="rgbrcTable"/>
+      <field type="short[]" size="4" name="brcBottom"/>
+      <field type="short[]" size="4" name="brcTop"/>
+      <field type="short[]" size="4" name="brcLeft"/>
+      <field type="short[]" size="4" name="brcRight"/>
+      <field type="short[]" size="4" name="brcVertical"/>
+      <field type="short[]" size="4" name="brcHorizontal"/>
     </fields>
 </record>
\ No newline at end of file

diff --git a/src/types/definitions/tc_type.xml b/src/types/definitions/tc_type.xml
index 9d71abee6dd3d029a997a53335a8cae5264b0b5d..7644f3782a019bb7fd80f612ad3dc29918f5be7e 100644 (file)
--- a/src/types/definitions/tc_type.xml
+++ b/src/types/definitions/tc_type.xml
@@ -15,9 +15,9 @@
         <bit number="7" mask="0x0180" name="vertAlign"/>
       </field>
       <field type="short" size="2" name="unused"/>
-      <field type="byte[]" size="4" name="brcTop"/>
-      <field type="byte[]" size="4" name="brcLeft"/>
-      <field type="byte[]" size="4" name="brcBottom"/>
-      <field type="byte[]" size="4" name="brcRight"/>
+      <field type="short[]" size="4" name="brcTop"/>
+      <field type="short[]" size="4" name="brcLeft"/>
+      <field type="short[]" size="4" name="brcBottom"/>
+      <field type="short[]" size="4" name="brcRight"/>
     </fields>
 </record>
\ No newline at end of file