]> source.dussan.org Git - poi.git/commitdiff
update CHP type
authorSergey Vladimirov <sergey@apache.org>
Thu, 7 Jul 2011 14:15:03 +0000 (14:15 +0000)
committerSergey Vladimirov <sergey@apache.org>
Thu, 7 Jul 2011 14:15:03 +0000 (14:15 +0000)
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1143838 13f79535-47bb-0310-9956-ffa450edef68

src/scratchpad/src/org/apache/poi/hwpf/model/types/CHPAbstractType.java
src/scratchpad/src/org/apache/poi/hwpf/usermodel/CharacterProperties.java
src/types/definitions/chp_type.xml

index d0a8341ff9d3f77fb0e6e8063679ac30fc5a490b..58a5e6f420bcba8b2f17f5e3c17569e3f8cfe25f 100644 (file)
@@ -24,7 +24,6 @@ import org.apache.poi.hwpf.usermodel.BorderCode;
 import org.apache.poi.hwpf.usermodel.DateAndTime;
 import org.apache.poi.hwpf.usermodel.ShadingDescriptor;
 import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
 
 /**
  * Character Properties.
@@ -37,76 +36,86 @@ public abstract class CHPAbstractType
     implements HDFType
 {
 
-    protected  short field_1_chse;
-    protected  int field_2_format_flags;
-        private static BitField  fBold = BitFieldFactory.getInstance(0x0001);
-        private static BitField  fItalic = BitFieldFactory.getInstance(0x0002);
-        private static BitField  fRMarkDel = BitFieldFactory.getInstance(0x0004);
-        private static BitField  fOutline = BitFieldFactory.getInstance(0x0008);
-        private static BitField  fFldVanish = BitFieldFactory.getInstance(0x0010);
-        private static BitField  fSmallCaps = BitFieldFactory.getInstance(0x0020);
-        private static BitField  fCaps = BitFieldFactory.getInstance(0x0040);
-        private static BitField  fVanish = BitFieldFactory.getInstance(0x0080);
-        private static BitField  fRMark = BitFieldFactory.getInstance(0x0100);
-        private static BitField  fSpec = BitFieldFactory.getInstance(0x0200);
-        private static BitField  fStrike = BitFieldFactory.getInstance(0x0400);
-        private static BitField  fObj = BitFieldFactory.getInstance(0x0800);
-        private static BitField  fShadow = BitFieldFactory.getInstance(0x1000);
-        private static BitField  fLowerCase = BitFieldFactory.getInstance(0x2000);
-        private static BitField  fData = BitFieldFactory.getInstance(0x4000);
-        private static BitField  fOle2 = BitFieldFactory.getInstance(0x8000);
-    protected  int field_3_format_flags1;
-        private static BitField  fEmboss = BitFieldFactory.getInstance(0x0001);
-        private static BitField  fImprint = BitFieldFactory.getInstance(0x0002);
-        private static BitField  fDStrike = BitFieldFactory.getInstance(0x0004);
-        private static BitField  fUsePgsuSettings = BitFieldFactory.getInstance(0x0008);
-    protected  int field_4_ftcAscii;
-    protected  int field_5_ftcFE;
-    protected  int field_6_ftcOther;
-    protected  int field_7_hps;
-    protected  int field_8_dxaSpace;
-    protected  byte field_9_iss;
-    protected  byte field_10_kul;
-    protected  byte field_11_ico;
-    protected  int field_12_hpsPos;
-    protected  int field_13_lidDefault;
-    protected  int field_14_lidFE;
-    protected  byte field_15_idctHint;
-    protected  int field_16_wCharScale;
-    protected  int field_17_fcPic;
-    protected  int field_18_fcObj;
-    protected  int field_19_lTagObj;
-    protected  int field_20_ibstRMark;
-    protected  int field_21_ibstRMarkDel;
-    protected  DateAndTime field_22_dttmRMark;
-    protected  DateAndTime field_23_dttmRMarkDel;
-    protected  int field_24_istd;
-    protected  int field_25_baseIstd;
-    protected  int field_26_ftcSym;
-    protected  int field_27_xchSym;
-    protected  int field_28_idslRMReason;
-    protected  int field_29_idslReasonDel;
-    protected  byte field_30_ysr;
-    protected  byte field_31_chYsr;
-    protected  int field_32_hpsKern;
-    protected  short field_33_Highlight;
-        private static BitField  icoHighlight = BitFieldFactory.getInstance(0x001f);
-        private static BitField  fHighlight = BitFieldFactory.getInstance(0x0020);
-        private static BitField  kcd = BitFieldFactory.getInstance(0x01c0);
-        private static BitField  fNavHighlight = BitFieldFactory.getInstance(0x0200);
-        private static BitField  fChsDiff = BitFieldFactory.getInstance(0x0400);
-        private static BitField  fMacChs = BitFieldFactory.getInstance(0x0800);
-        private static BitField  fFtcAsciSym = BitFieldFactory.getInstance(0x1000);
-    protected  short field_34_fPropMark;
-    protected  int field_35_ibstPropRMark;
-    protected  DateAndTime field_36_dttmPropRMark;
-    protected  byte field_37_sfxtText;
-    protected  byte field_38_fDispFldRMark;
-    protected  int field_39_ibstDispFldRMark;
-    protected  DateAndTime field_40_dttmDispFldRMark;
-    protected  byte[] field_41_xstDispFldRMark;
-    protected  ShadingDescriptor field_42_shd;
-    protected  BorderCode field_43_brc;
+    protected  int field_1_format_flags;
+        private static BitField  fBold = new BitField(0x0001);
+        private static BitField  fItalic = new BitField(0x0002);
+        private static BitField  fRMarkDel = new BitField(0x0004);
+        private static BitField  fOutline = new BitField(0x0008);
+        private static BitField  fFldVanish = new BitField(0x0010);
+        private static BitField  fSmallCaps = new BitField(0x0020);
+        private static BitField  fCaps = new BitField(0x0040);
+        private static BitField  fVanish = new BitField(0x0080);
+        private static BitField  fRMark = new BitField(0x0100);
+        private static BitField  fSpec = new BitField(0x0200);
+        private static BitField  fStrike = new BitField(0x0400);
+        private static BitField  fObj = new BitField(0x0800);
+        private static BitField  fShadow = new BitField(0x1000);
+        private static BitField  fLowerCase = new BitField(0x2000);
+        private static BitField  fData = new BitField(0x4000);
+        private static BitField  fOle2 = new BitField(0x8000);
+    protected  int field_2_format_flags1;
+        private static BitField  fEmboss = new BitField(0x0001);
+        private static BitField  fImprint = new BitField(0x0002);
+        private static BitField  fDStrike = new BitField(0x0004);
+        private static BitField  fUsePgsuSettings = new BitField(0x0008);
+    protected  int field_3_ftcAscii;
+    protected  int field_4_ftcFE;
+    protected  int field_5_ftcOther;
+    protected  int field_6_hps;
+    protected  int field_7_dxaSpace;
+    protected  byte field_8_iss;
+    protected  byte field_9_kul;
+    protected  byte field_10_ico;
+    protected  int field_11_hpsPos;
+    protected  int field_12_lidDefault;
+    protected  int field_13_lidFE;
+    protected  byte field_14_idctHint;
+    protected  int field_15_wCharScale;
+    protected  int field_16_fcPic;
+    protected  int field_17_fcObj;
+    protected  int field_18_lTagObj;
+    protected  int field_19_ibstRMark;
+    protected  int field_20_ibstRMarkDel;
+    protected  DateAndTime field_21_dttmRMark;
+    protected  DateAndTime field_22_dttmRMarkDel;
+    protected  int field_23_istd;
+    protected  int field_24_baseIstd;
+    protected  int field_25_ftcSym;
+    protected  int field_26_xchSym;
+    protected  int field_27_idslRMReason;
+    protected  int field_28_idslReasonDel;
+    protected  byte field_29_ysr;
+    protected  byte field_30_chYsr;
+    protected  int field_31_hpsKern;
+    protected  short field_32_Highlight;
+        private static BitField  icoHighlight = new BitField(0x001f);
+        private static BitField  fHighlight = new BitField(0x0020);
+        private static BitField  fNavHighlight = new BitField(0x0040);
+    protected  short field_33_InternalFlags;
+        private static BitField  iatrUndetType = new BitField(0x000f);
+        private static BitField  fUlGap = new BitField(0x0010);
+        private static BitField  fScriptAnchor = new BitField(0x0800);
+        private static BitField  fFixedObj = new BitField(0x1000);
+        private static BitField  spare2 = new BitField(0x2000);
+    protected  short field_34_EncodingFlags;
+        private static BitField  fChsDiff = new BitField(0x0001);
+        private static BitField  fMacChs = new BitField(0x0002);
+        private static BitField  fFtcAsciSym = new BitField(0x0004);
+        private static BitField  fFtcReq = new BitField(0x0008);
+        private static BitField  fLangApplied = new BitField(0x0010);
+        private static BitField  fSpareLangApplied = new BitField(0x0020);
+        private static BitField  fForcedCvAuto = new BitField(0x0040);
+    protected  short field_35_chse;
+    protected  short field_36_fPropMark;
+    protected  int field_37_ibstPropRMark;
+    protected  DateAndTime field_38_dttmPropRMark;
+    protected  byte field_39_sfxtText;
+    protected  byte field_40_fDispFldRMark;
+    protected  int field_41_ibstDispFldRMark;
+    protected  DateAndTime field_42_dttmDispFldRMark;
+    protected  byte[] field_43_xstDispFldRMark;
+    protected  ShadingDescriptor field_44_shd;
+    protected  BorderCode field_45_brc;
 
 
     public CHPAbstractType()
@@ -114,46 +123,211 @@ public abstract class CHPAbstractType
 
     }
 
-    /**
-     * Size of record (exluding 4 byte header)
-     */
-    public int getSize()
+
+    public String toString()
     {
-        return 4 +  + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 4 + 1 + 1 + 1 + 2 + 2 + 2 + 1 + 2 + 4 + 4 + 4 + 2 + 2 + 4 + 4 + 2 + 2 + 2 + 2 + 2 + 2 + 1 + 1 + 2 + 2 + 2 + 2 + 4 + 1 + 1 + 2 + 4 + 32 + 2 + 4;
-    }
+        StringBuffer buffer = new StringBuffer();
 
+        buffer.append("[CHP]\n");
 
+        buffer.append("    .format_flags         = ");
+        buffer.append(" (").append(getFormat_flags()).append(" )\n");
+        buffer.append("         .fBold                    = ").append(isFBold()).append('\n');
+        buffer.append("         .fItalic                  = ").append(isFItalic()).append('\n');
+        buffer.append("         .fRMarkDel                = ").append(isFRMarkDel()).append('\n');
+        buffer.append("         .fOutline                 = ").append(isFOutline()).append('\n');
+        buffer.append("         .fFldVanish               = ").append(isFFldVanish()).append('\n');
+        buffer.append("         .fSmallCaps               = ").append(isFSmallCaps()).append('\n');
+        buffer.append("         .fCaps                    = ").append(isFCaps()).append('\n');
+        buffer.append("         .fVanish                  = ").append(isFVanish()).append('\n');
+        buffer.append("         .fRMark                   = ").append(isFRMark()).append('\n');
+        buffer.append("         .fSpec                    = ").append(isFSpec()).append('\n');
+        buffer.append("         .fStrike                  = ").append(isFStrike()).append('\n');
+        buffer.append("         .fObj                     = ").append(isFObj()).append('\n');
+        buffer.append("         .fShadow                  = ").append(isFShadow()).append('\n');
+        buffer.append("         .fLowerCase               = ").append(isFLowerCase()).append('\n');
+        buffer.append("         .fData                    = ").append(isFData()).append('\n');
+        buffer.append("         .fOle2                    = ").append(isFOle2()).append('\n');
 
-    /**
-     * Get the chse field for the CHP record.
-     */
-    public short getChse()
-    {
-        return field_1_chse;
+        buffer.append("    .format_flags1        = ");
+        buffer.append(" (").append(getFormat_flags1()).append(" )\n");
+        buffer.append("         .fEmboss                  = ").append(isFEmboss()).append('\n');
+        buffer.append("         .fImprint                 = ").append(isFImprint()).append('\n');
+        buffer.append("         .fDStrike                 = ").append(isFDStrike()).append('\n');
+        buffer.append("         .fUsePgsuSettings         = ").append(isFUsePgsuSettings()).append('\n');
+
+        buffer.append("    .ftcAscii             = ");
+        buffer.append(" (").append(getFtcAscii()).append(" )\n");
+
+        buffer.append("    .ftcFE                = ");
+        buffer.append(" (").append(getFtcFE()).append(" )\n");
+
+        buffer.append("    .ftcOther             = ");
+        buffer.append(" (").append(getFtcOther()).append(" )\n");
+
+        buffer.append("    .hps                  = ");
+        buffer.append(" (").append(getHps()).append(" )\n");
+
+        buffer.append("    .dxaSpace             = ");
+        buffer.append(" (").append(getDxaSpace()).append(" )\n");
+
+        buffer.append("    .iss                  = ");
+        buffer.append(" (").append(getIss()).append(" )\n");
+
+        buffer.append("    .kul                  = ");
+        buffer.append(" (").append(getKul()).append(" )\n");
+
+        buffer.append("    .ico                  = ");
+        buffer.append(" (").append(getIco()).append(" )\n");
+
+        buffer.append("    .hpsPos               = ");
+        buffer.append(" (").append(getHpsPos()).append(" )\n");
+
+        buffer.append("    .lidDefault           = ");
+        buffer.append(" (").append(getLidDefault()).append(" )\n");
+
+        buffer.append("    .lidFE                = ");
+        buffer.append(" (").append(getLidFE()).append(" )\n");
+
+        buffer.append("    .idctHint             = ");
+        buffer.append(" (").append(getIdctHint()).append(" )\n");
+
+        buffer.append("    .wCharScale           = ");
+        buffer.append(" (").append(getWCharScale()).append(" )\n");
+
+        buffer.append("    .fcPic                = ");
+        buffer.append(" (").append(getFcPic()).append(" )\n");
+
+        buffer.append("    .fcObj                = ");
+        buffer.append(" (").append(getFcObj()).append(" )\n");
+
+        buffer.append("    .lTagObj              = ");
+        buffer.append(" (").append(getLTagObj()).append(" )\n");
+
+        buffer.append("    .ibstRMark            = ");
+        buffer.append(" (").append(getIbstRMark()).append(" )\n");
+
+        buffer.append("    .ibstRMarkDel         = ");
+        buffer.append(" (").append(getIbstRMarkDel()).append(" )\n");
+
+        buffer.append("    .dttmRMark            = ");
+        buffer.append(" (").append(getDttmRMark()).append(" )\n");
+
+        buffer.append("    .dttmRMarkDel         = ");
+        buffer.append(" (").append(getDttmRMarkDel()).append(" )\n");
+
+        buffer.append("    .istd                 = ");
+        buffer.append(" (").append(getIstd()).append(" )\n");
+
+        buffer.append("    .baseIstd             = ");
+        buffer.append(" (").append(getBaseIstd()).append(" )\n");
+
+        buffer.append("    .ftcSym               = ");
+        buffer.append(" (").append(getFtcSym()).append(" )\n");
+
+        buffer.append("    .xchSym               = ");
+        buffer.append(" (").append(getXchSym()).append(" )\n");
+
+        buffer.append("    .idslRMReason         = ");
+        buffer.append(" (").append(getIdslRMReason()).append(" )\n");
+
+        buffer.append("    .idslReasonDel        = ");
+        buffer.append(" (").append(getIdslReasonDel()).append(" )\n");
+
+        buffer.append("    .ysr                  = ");
+        buffer.append(" (").append(getYsr()).append(" )\n");
+
+        buffer.append("    .chYsr                = ");
+        buffer.append(" (").append(getChYsr()).append(" )\n");
+
+        buffer.append("    .hpsKern              = ");
+        buffer.append(" (").append(getHpsKern()).append(" )\n");
+
+        buffer.append("    .Highlight            = ");
+        buffer.append(" (").append(getHighlight()).append(" )\n");
+        buffer.append("         .icoHighlight             = ").append(getIcoHighlight()).append('\n');
+        buffer.append("         .fHighlight               = ").append(isFHighlight()).append('\n');
+        buffer.append("         .fNavHighlight            = ").append(isFNavHighlight()).append('\n');
+
+        buffer.append("    .InternalFlags        = ");
+        buffer.append(" (").append(getInternalFlags()).append(" )\n");
+        buffer.append("         .iatrUndetType            = ").append(getIatrUndetType()).append('\n');
+        buffer.append("         .fUlGap                   = ").append(isFUlGap()).append('\n');
+        buffer.append("         .fScriptAnchor            = ").append(isFScriptAnchor()).append('\n');
+        buffer.append("         .fFixedObj                = ").append(isFFixedObj()).append('\n');
+        buffer.append("         .spare2                   = ").append(isSpare2()).append('\n');
+
+        buffer.append("    .EncodingFlags        = ");
+        buffer.append(" (").append(getEncodingFlags()).append(" )\n");
+        buffer.append("         .fChsDiff                 = ").append(isFChsDiff()).append('\n');
+        buffer.append("         .fMacChs                  = ").append(isFMacChs()).append('\n');
+        buffer.append("         .fFtcAsciSym              = ").append(isFFtcAsciSym()).append('\n');
+        buffer.append("         .fFtcReq                  = ").append(isFFtcReq()).append('\n');
+        buffer.append("         .fLangApplied             = ").append(isFLangApplied()).append('\n');
+        buffer.append("         .fSpareLangApplied        = ").append(isFSpareLangApplied()).append('\n');
+        buffer.append("         .fForcedCvAuto            = ").append(isFForcedCvAuto()).append('\n');
+
+        buffer.append("    .chse                 = ");
+        buffer.append(" (").append(getChse()).append(" )\n");
+
+        buffer.append("    .fPropMark            = ");
+        buffer.append(" (").append(getFPropMark()).append(" )\n");
+
+        buffer.append("    .ibstPropRMark        = ");
+        buffer.append(" (").append(getIbstPropRMark()).append(" )\n");
+
+        buffer.append("    .dttmPropRMark        = ");
+        buffer.append(" (").append(getDttmPropRMark()).append(" )\n");
+
+        buffer.append("    .sfxtText             = ");
+        buffer.append(" (").append(getSfxtText()).append(" )\n");
+
+        buffer.append("    .fDispFldRMark        = ");
+        buffer.append(" (").append(getFDispFldRMark()).append(" )\n");
+
+        buffer.append("    .ibstDispFldRMark     = ");
+        buffer.append(" (").append(getIbstDispFldRMark()).append(" )\n");
+
+        buffer.append("    .dttmDispFldRMark     = ");
+        buffer.append(" (").append(getDttmDispFldRMark()).append(" )\n");
+
+        buffer.append("    .xstDispFldRMark      = ");
+        buffer.append(" (").append(getXstDispFldRMark()).append(" )\n");
+
+        buffer.append("    .shd                  = ");
+        buffer.append(" (").append(getShd()).append(" )\n");
+
+        buffer.append("    .brc                  = ");
+        buffer.append(" (").append(getBrc()).append(" )\n");
+
+        buffer.append("[/CHP]\n");
+        return buffer.toString();
     }
 
     /**
-     * Set the chse field for the CHP record.
+     * Size of record (exluding 4 byte header)
      */
-    public void setChse(short field_1_chse)
+    public int getSize()
     {
-        this.field_1_chse = field_1_chse;
+        return 4 +  + 2 + 2 + 2 + 2 + 2 + 2 + 4 + 1 + 1 + 1 + 2 + 2 + 2 + 1 + 2 + 4 + 4 + 4 + 2 + 2 + 4 + 4 + 2 + 2 + 2 + 2 + 2 + 2 + 1 + 1 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 4 + 1 + 1 + 2 + 4 + 32 + 2 + 4;
     }
 
+
+
     /**
      * Get the format_flags field for the CHP record.
      */
     public int getFormat_flags()
     {
-        return field_2_format_flags;
+        return field_1_format_flags;
     }
 
     /**
      * Set the format_flags field for the CHP record.
      */
-    public void setFormat_flags(int field_2_format_flags)
+    public void setFormat_flags(int field_1_format_flags)
     {
-        this.field_2_format_flags = field_2_format_flags;
+        this.field_1_format_flags = field_1_format_flags;
     }
 
     /**
@@ -161,15 +335,15 @@ public abstract class CHPAbstractType
      */
     public int getFormat_flags1()
     {
-        return field_3_format_flags1;
+        return field_2_format_flags1;
     }
 
     /**
      * Set the format_flags1 field for the CHP record.
      */
-    public void setFormat_flags1(int field_3_format_flags1)
+    public void setFormat_flags1(int field_2_format_flags1)
     {
-        this.field_3_format_flags1 = field_3_format_flags1;
+        this.field_2_format_flags1 = field_2_format_flags1;
     }
 
     /**
@@ -177,15 +351,15 @@ public abstract class CHPAbstractType
      */
     public int getFtcAscii()
     {
-        return field_4_ftcAscii;
+        return field_3_ftcAscii;
     }
 
     /**
      * Set the ftcAscii field for the CHP record.
      */
-    public void setFtcAscii(int field_4_ftcAscii)
+    public void setFtcAscii(int field_3_ftcAscii)
     {
-        this.field_4_ftcAscii = field_4_ftcAscii;
+        this.field_3_ftcAscii = field_3_ftcAscii;
     }
 
     /**
@@ -193,15 +367,15 @@ public abstract class CHPAbstractType
      */
     public int getFtcFE()
     {
-        return field_5_ftcFE;
+        return field_4_ftcFE;
     }
 
     /**
      * Set the ftcFE field for the CHP record.
      */
-    public void setFtcFE(int field_5_ftcFE)
+    public void setFtcFE(int field_4_ftcFE)
     {
-        this.field_5_ftcFE = field_5_ftcFE;
+        this.field_4_ftcFE = field_4_ftcFE;
     }
 
     /**
@@ -209,15 +383,15 @@ public abstract class CHPAbstractType
      */
     public int getFtcOther()
     {
-        return field_6_ftcOther;
+        return field_5_ftcOther;
     }
 
     /**
      * Set the ftcOther field for the CHP record.
      */
-    public void setFtcOther(int field_6_ftcOther)
+    public void setFtcOther(int field_5_ftcOther)
     {
-        this.field_6_ftcOther = field_6_ftcOther;
+        this.field_5_ftcOther = field_5_ftcOther;
     }
 
     /**
@@ -225,15 +399,15 @@ public abstract class CHPAbstractType
      */
     public int getHps()
     {
-        return field_7_hps;
+        return field_6_hps;
     }
 
     /**
      * Set the hps field for the CHP record.
      */
-    public void setHps(int field_7_hps)
+    public void setHps(int field_6_hps)
     {
-        this.field_7_hps = field_7_hps;
+        this.field_6_hps = field_6_hps;
     }
 
     /**
@@ -241,15 +415,15 @@ public abstract class CHPAbstractType
      */
     public int getDxaSpace()
     {
-        return field_8_dxaSpace;
+        return field_7_dxaSpace;
     }
 
     /**
      * Set the dxaSpace field for the CHP record.
      */
-    public void setDxaSpace(int field_8_dxaSpace)
+    public void setDxaSpace(int field_7_dxaSpace)
     {
-        this.field_8_dxaSpace = field_8_dxaSpace;
+        this.field_7_dxaSpace = field_7_dxaSpace;
     }
 
     /**
@@ -257,15 +431,15 @@ public abstract class CHPAbstractType
      */
     public byte getIss()
     {
-        return field_9_iss;
+        return field_8_iss;
     }
 
     /**
      * Set the iss field for the CHP record.
      */
-    public void setIss(byte field_9_iss)
+    public void setIss(byte field_8_iss)
     {
-        this.field_9_iss = field_9_iss;
+        this.field_8_iss = field_8_iss;
     }
 
     /**
@@ -273,15 +447,15 @@ public abstract class CHPAbstractType
      */
     public byte getKul()
     {
-        return field_10_kul;
+        return field_9_kul;
     }
 
     /**
      * Set the kul field for the CHP record.
      */
-    public void setKul(byte field_10_kul)
+    public void setKul(byte field_9_kul)
     {
-        this.field_10_kul = field_10_kul;
+        this.field_9_kul = field_9_kul;
     }
 
     /**
@@ -289,15 +463,15 @@ public abstract class CHPAbstractType
      */
     public byte getIco()
     {
-        return field_11_ico;
+        return field_10_ico;
     }
 
     /**
      * Set the ico field for the CHP record.
      */
-    public void setIco(byte field_11_ico)
+    public void setIco(byte field_10_ico)
     {
-        this.field_11_ico = field_11_ico;
+        this.field_10_ico = field_10_ico;
     }
 
     /**
@@ -305,15 +479,15 @@ public abstract class CHPAbstractType
      */
     public int getHpsPos()
     {
-        return field_12_hpsPos;
+        return field_11_hpsPos;
     }
 
     /**
      * Set the hpsPos field for the CHP record.
      */
-    public void setHpsPos(int field_12_hpsPos)
+    public void setHpsPos(int field_11_hpsPos)
     {
-        this.field_12_hpsPos = field_12_hpsPos;
+        this.field_11_hpsPos = field_11_hpsPos;
     }
 
     /**
@@ -321,15 +495,15 @@ public abstract class CHPAbstractType
      */
     public int getLidDefault()
     {
-        return field_13_lidDefault;
+        return field_12_lidDefault;
     }
 
     /**
      * Set the lidDefault field for the CHP record.
      */
-    public void setLidDefault(int field_13_lidDefault)
+    public void setLidDefault(int field_12_lidDefault)
     {
-        this.field_13_lidDefault = field_13_lidDefault;
+        this.field_12_lidDefault = field_12_lidDefault;
     }
 
     /**
@@ -337,15 +511,15 @@ public abstract class CHPAbstractType
      */
     public int getLidFE()
     {
-        return field_14_lidFE;
+        return field_13_lidFE;
     }
 
     /**
      * Set the lidFE field for the CHP record.
      */
-    public void setLidFE(int field_14_lidFE)
+    public void setLidFE(int field_13_lidFE)
     {
-        this.field_14_lidFE = field_14_lidFE;
+        this.field_13_lidFE = field_13_lidFE;
     }
 
     /**
@@ -353,15 +527,15 @@ public abstract class CHPAbstractType
      */
     public byte getIdctHint()
     {
-        return field_15_idctHint;
+        return field_14_idctHint;
     }
 
     /**
      * Set the idctHint field for the CHP record.
      */
-    public void setIdctHint(byte field_15_idctHint)
+    public void setIdctHint(byte field_14_idctHint)
     {
-        this.field_15_idctHint = field_15_idctHint;
+        this.field_14_idctHint = field_14_idctHint;
     }
 
     /**
@@ -369,15 +543,15 @@ public abstract class CHPAbstractType
      */
     public int getWCharScale()
     {
-        return field_16_wCharScale;
+        return field_15_wCharScale;
     }
 
     /**
      * Set the wCharScale field for the CHP record.
      */
-    public void setWCharScale(int field_16_wCharScale)
+    public void setWCharScale(int field_15_wCharScale)
     {
-        this.field_16_wCharScale = field_16_wCharScale;
+        this.field_15_wCharScale = field_15_wCharScale;
     }
 
     /**
@@ -385,15 +559,15 @@ public abstract class CHPAbstractType
      */
     public int getFcPic()
     {
-        return field_17_fcPic;
+        return field_16_fcPic;
     }
 
     /**
      * Set the fcPic field for the CHP record.
      */
-    public void setFcPic(int field_17_fcPic)
+    public void setFcPic(int field_16_fcPic)
     {
-        this.field_17_fcPic = field_17_fcPic;
+        this.field_16_fcPic = field_16_fcPic;
     }
 
     /**
@@ -401,15 +575,15 @@ public abstract class CHPAbstractType
      */
     public int getFcObj()
     {
-        return field_18_fcObj;
+        return field_17_fcObj;
     }
 
     /**
      * Set the fcObj field for the CHP record.
      */
-    public void setFcObj(int field_18_fcObj)
+    public void setFcObj(int field_17_fcObj)
     {
-        this.field_18_fcObj = field_18_fcObj;
+        this.field_17_fcObj = field_17_fcObj;
     }
 
     /**
@@ -417,15 +591,15 @@ public abstract class CHPAbstractType
      */
     public int getLTagObj()
     {
-        return field_19_lTagObj;
+        return field_18_lTagObj;
     }
 
     /**
      * Set the lTagObj field for the CHP record.
      */
-    public void setLTagObj(int field_19_lTagObj)
+    public void setLTagObj(int field_18_lTagObj)
     {
-        this.field_19_lTagObj = field_19_lTagObj;
+        this.field_18_lTagObj = field_18_lTagObj;
     }
 
     /**
@@ -433,15 +607,15 @@ public abstract class CHPAbstractType
      */
     public int getIbstRMark()
     {
-        return field_20_ibstRMark;
+        return field_19_ibstRMark;
     }
 
     /**
      * Set the ibstRMark field for the CHP record.
      */
-    public void setIbstRMark(int field_20_ibstRMark)
+    public void setIbstRMark(int field_19_ibstRMark)
     {
-        this.field_20_ibstRMark = field_20_ibstRMark;
+        this.field_19_ibstRMark = field_19_ibstRMark;
     }
 
     /**
@@ -449,15 +623,15 @@ public abstract class CHPAbstractType
      */
     public int getIbstRMarkDel()
     {
-        return field_21_ibstRMarkDel;
+        return field_20_ibstRMarkDel;
     }
 
     /**
      * Set the ibstRMarkDel field for the CHP record.
      */
-    public void setIbstRMarkDel(int field_21_ibstRMarkDel)
+    public void setIbstRMarkDel(int field_20_ibstRMarkDel)
     {
-        this.field_21_ibstRMarkDel = field_21_ibstRMarkDel;
+        this.field_20_ibstRMarkDel = field_20_ibstRMarkDel;
     }
 
     /**
@@ -465,15 +639,15 @@ public abstract class CHPAbstractType
      */
     public DateAndTime getDttmRMark()
     {
-        return field_22_dttmRMark;
+        return field_21_dttmRMark;
     }
 
     /**
      * Set the dttmRMark field for the CHP record.
      */
-    public void setDttmRMark(DateAndTime field_22_dttmRMark)
+    public void setDttmRMark(DateAndTime field_21_dttmRMark)
     {
-        this.field_22_dttmRMark = field_22_dttmRMark;
+        this.field_21_dttmRMark = field_21_dttmRMark;
     }
 
     /**
@@ -481,15 +655,15 @@ public abstract class CHPAbstractType
      */
     public DateAndTime getDttmRMarkDel()
     {
-        return field_23_dttmRMarkDel;
+        return field_22_dttmRMarkDel;
     }
 
     /**
      * Set the dttmRMarkDel field for the CHP record.
      */
-    public void setDttmRMarkDel(DateAndTime field_23_dttmRMarkDel)
+    public void setDttmRMarkDel(DateAndTime field_22_dttmRMarkDel)
     {
-        this.field_23_dttmRMarkDel = field_23_dttmRMarkDel;
+        this.field_22_dttmRMarkDel = field_22_dttmRMarkDel;
     }
 
     /**
@@ -497,15 +671,15 @@ public abstract class CHPAbstractType
      */
     public int getIstd()
     {
-        return field_24_istd;
+        return field_23_istd;
     }
 
     /**
      * Set the istd field for the CHP record.
      */
-    public void setIstd(int field_24_istd)
+    public void setIstd(int field_23_istd)
     {
-        this.field_24_istd = field_24_istd;
+        this.field_23_istd = field_23_istd;
     }
 
     /**
@@ -513,15 +687,15 @@ public abstract class CHPAbstractType
      */
     public int getBaseIstd()
     {
-        return field_25_baseIstd;
+        return field_24_baseIstd;
     }
 
     /**
      * Set the baseIstd field for the CHP record.
      */
-    public void setBaseIstd(int field_25_baseIstd)
+    public void setBaseIstd(int field_24_baseIstd)
     {
-        this.field_25_baseIstd = field_25_baseIstd;
+        this.field_24_baseIstd = field_24_baseIstd;
     }
 
     /**
@@ -529,15 +703,15 @@ public abstract class CHPAbstractType
      */
     public int getFtcSym()
     {
-        return field_26_ftcSym;
+        return field_25_ftcSym;
     }
 
     /**
      * Set the ftcSym field for the CHP record.
      */
-    public void setFtcSym(int field_26_ftcSym)
+    public void setFtcSym(int field_25_ftcSym)
     {
-        this.field_26_ftcSym = field_26_ftcSym;
+        this.field_25_ftcSym = field_25_ftcSym;
     }
 
     /**
@@ -545,15 +719,15 @@ public abstract class CHPAbstractType
      */
     public int getXchSym()
     {
-        return field_27_xchSym;
+        return field_26_xchSym;
     }
 
     /**
      * Set the xchSym field for the CHP record.
      */
-    public void setXchSym(int field_27_xchSym)
+    public void setXchSym(int field_26_xchSym)
     {
-        this.field_27_xchSym = field_27_xchSym;
+        this.field_26_xchSym = field_26_xchSym;
     }
 
     /**
@@ -561,15 +735,15 @@ public abstract class CHPAbstractType
      */
     public int getIdslRMReason()
     {
-        return field_28_idslRMReason;
+        return field_27_idslRMReason;
     }
 
     /**
      * Set the idslRMReason field for the CHP record.
      */
-    public void setIdslRMReason(int field_28_idslRMReason)
+    public void setIdslRMReason(int field_27_idslRMReason)
     {
-        this.field_28_idslRMReason = field_28_idslRMReason;
+        this.field_27_idslRMReason = field_27_idslRMReason;
     }
 
     /**
@@ -577,15 +751,15 @@ public abstract class CHPAbstractType
      */
     public int getIdslReasonDel()
     {
-        return field_29_idslReasonDel;
+        return field_28_idslReasonDel;
     }
 
     /**
      * Set the idslReasonDel field for the CHP record.
      */
-    public void setIdslReasonDel(int field_29_idslReasonDel)
+    public void setIdslReasonDel(int field_28_idslReasonDel)
     {
-        this.field_29_idslReasonDel = field_29_idslReasonDel;
+        this.field_28_idslReasonDel = field_28_idslReasonDel;
     }
 
     /**
@@ -593,15 +767,15 @@ public abstract class CHPAbstractType
      */
     public byte getYsr()
     {
-        return field_30_ysr;
+        return field_29_ysr;
     }
 
     /**
      * Set the ysr field for the CHP record.
      */
-    public void setYsr(byte field_30_ysr)
+    public void setYsr(byte field_29_ysr)
     {
-        this.field_30_ysr = field_30_ysr;
+        this.field_29_ysr = field_29_ysr;
     }
 
     /**
@@ -609,15 +783,15 @@ public abstract class CHPAbstractType
      */
     public byte getChYsr()
     {
-        return field_31_chYsr;
+        return field_30_chYsr;
     }
 
     /**
      * Set the chYsr field for the CHP record.
      */
-    public void setChYsr(byte field_31_chYsr)
+    public void setChYsr(byte field_30_chYsr)
     {
-        this.field_31_chYsr = field_31_chYsr;
+        this.field_30_chYsr = field_30_chYsr;
     }
 
     /**
@@ -625,15 +799,15 @@ public abstract class CHPAbstractType
      */
     public int getHpsKern()
     {
-        return field_32_hpsKern;
+        return field_31_hpsKern;
     }
 
     /**
      * Set the hpsKern field for the CHP record.
      */
-    public void setHpsKern(int field_32_hpsKern)
+    public void setHpsKern(int field_31_hpsKern)
     {
-        this.field_32_hpsKern = field_32_hpsKern;
+        this.field_31_hpsKern = field_31_hpsKern;
     }
 
     /**
@@ -641,15 +815,63 @@ public abstract class CHPAbstractType
      */
     public short getHighlight()
     {
-        return field_33_Highlight;
+        return field_32_Highlight;
     }
 
     /**
      * Set the Highlight field for the CHP record.
      */
-    public void setHighlight(short field_33_Highlight)
+    public void setHighlight(short field_32_Highlight)
+    {
+        this.field_32_Highlight = field_32_Highlight;
+    }
+
+    /**
+     * Get the InternalFlags field for the CHP record.
+     */
+    public short getInternalFlags()
+    {
+        return field_33_InternalFlags;
+    }
+
+    /**
+     * Set the InternalFlags field for the CHP record.
+     */
+    public void setInternalFlags(short field_33_InternalFlags)
+    {
+        this.field_33_InternalFlags = field_33_InternalFlags;
+    }
+
+    /**
+     * Get the EncodingFlags field for the CHP record.
+     */
+    public short getEncodingFlags()
+    {
+        return field_34_EncodingFlags;
+    }
+
+    /**
+     * Set the EncodingFlags field for the CHP record.
+     */
+    public void setEncodingFlags(short field_34_EncodingFlags)
+    {
+        this.field_34_EncodingFlags = field_34_EncodingFlags;
+    }
+
+    /**
+     * used to record a character set id for text that was pasted into the Word document that used a character set different than Word‘s default character set.
+     */
+    public short getChse()
+    {
+        return field_35_chse;
+    }
+
+    /**
+     * used to record a character set id for text that was pasted into the Word document that used a character set different than Word‘s default character set.
+     */
+    public void setChse(short field_35_chse)
     {
-        this.field_33_Highlight = field_33_Highlight;
+        this.field_35_chse = field_35_chse;
     }
 
     /**
@@ -657,15 +879,15 @@ public abstract class CHPAbstractType
      */
     public short getFPropMark()
     {
-        return field_34_fPropMark;
+        return field_36_fPropMark;
     }
 
     /**
      * Set the fPropMark field for the CHP record.
      */
-    public void setFPropMark(short field_34_fPropMark)
+    public void setFPropMark(short field_36_fPropMark)
     {
-        this.field_34_fPropMark = field_34_fPropMark;
+        this.field_36_fPropMark = field_36_fPropMark;
     }
 
     /**
@@ -673,15 +895,15 @@ public abstract class CHPAbstractType
      */
     public int getIbstPropRMark()
     {
-        return field_35_ibstPropRMark;
+        return field_37_ibstPropRMark;
     }
 
     /**
      * Set the ibstPropRMark field for the CHP record.
      */
-    public void setIbstPropRMark(int field_35_ibstPropRMark)
+    public void setIbstPropRMark(int field_37_ibstPropRMark)
     {
-        this.field_35_ibstPropRMark = field_35_ibstPropRMark;
+        this.field_37_ibstPropRMark = field_37_ibstPropRMark;
     }
 
     /**
@@ -689,15 +911,15 @@ public abstract class CHPAbstractType
      */
     public DateAndTime getDttmPropRMark()
     {
-        return field_36_dttmPropRMark;
+        return field_38_dttmPropRMark;
     }
 
     /**
      * Set the dttmPropRMark field for the CHP record.
      */
-    public void setDttmPropRMark(DateAndTime field_36_dttmPropRMark)
+    public void setDttmPropRMark(DateAndTime field_38_dttmPropRMark)
     {
-        this.field_36_dttmPropRMark = field_36_dttmPropRMark;
+        this.field_38_dttmPropRMark = field_38_dttmPropRMark;
     }
 
     /**
@@ -705,15 +927,15 @@ public abstract class CHPAbstractType
      */
     public byte getSfxtText()
     {
-        return field_37_sfxtText;
+        return field_39_sfxtText;
     }
 
     /**
      * Set the sfxtText field for the CHP record.
      */
-    public void setSfxtText(byte field_37_sfxtText)
+    public void setSfxtText(byte field_39_sfxtText)
     {
-        this.field_37_sfxtText = field_37_sfxtText;
+        this.field_39_sfxtText = field_39_sfxtText;
     }
 
     /**
@@ -721,15 +943,15 @@ public abstract class CHPAbstractType
      */
     public byte getFDispFldRMark()
     {
-        return field_38_fDispFldRMark;
+        return field_40_fDispFldRMark;
     }
 
     /**
      * Set the fDispFldRMark field for the CHP record.
      */
-    public void setFDispFldRMark(byte field_38_fDispFldRMark)
+    public void setFDispFldRMark(byte field_40_fDispFldRMark)
     {
-        this.field_38_fDispFldRMark = field_38_fDispFldRMark;
+        this.field_40_fDispFldRMark = field_40_fDispFldRMark;
     }
 
     /**
@@ -737,15 +959,15 @@ public abstract class CHPAbstractType
      */
     public int getIbstDispFldRMark()
     {
-        return field_39_ibstDispFldRMark;
+        return field_41_ibstDispFldRMark;
     }
 
     /**
      * Set the ibstDispFldRMark field for the CHP record.
      */
-    public void setIbstDispFldRMark(int field_39_ibstDispFldRMark)
+    public void setIbstDispFldRMark(int field_41_ibstDispFldRMark)
     {
-        this.field_39_ibstDispFldRMark = field_39_ibstDispFldRMark;
+        this.field_41_ibstDispFldRMark = field_41_ibstDispFldRMark;
     }
 
     /**
@@ -753,15 +975,15 @@ public abstract class CHPAbstractType
      */
     public DateAndTime getDttmDispFldRMark()
     {
-        return field_40_dttmDispFldRMark;
+        return field_42_dttmDispFldRMark;
     }
 
     /**
      * Set the dttmDispFldRMark field for the CHP record.
      */
-    public void setDttmDispFldRMark(DateAndTime field_40_dttmDispFldRMark)
+    public void setDttmDispFldRMark(DateAndTime field_42_dttmDispFldRMark)
     {
-        this.field_40_dttmDispFldRMark = field_40_dttmDispFldRMark;
+        this.field_42_dttmDispFldRMark = field_42_dttmDispFldRMark;
     }
 
     /**
@@ -769,15 +991,15 @@ public abstract class CHPAbstractType
      */
     public byte[] getXstDispFldRMark()
     {
-        return field_41_xstDispFldRMark;
+        return field_43_xstDispFldRMark;
     }
 
     /**
      * Set the xstDispFldRMark field for the CHP record.
      */
-    public void setXstDispFldRMark(byte[] field_41_xstDispFldRMark)
+    public void setXstDispFldRMark(byte[] field_43_xstDispFldRMark)
     {
-        this.field_41_xstDispFldRMark = field_41_xstDispFldRMark;
+        this.field_43_xstDispFldRMark = field_43_xstDispFldRMark;
     }
 
     /**
@@ -785,15 +1007,15 @@ public abstract class CHPAbstractType
      */
     public ShadingDescriptor getShd()
     {
-        return field_42_shd;
+        return field_44_shd;
     }
 
     /**
      * Set the shd field for the CHP record.
      */
-    public void setShd(ShadingDescriptor field_42_shd)
+    public void setShd(ShadingDescriptor field_44_shd)
     {
-        this.field_42_shd = field_42_shd;
+        this.field_44_shd = field_44_shd;
     }
 
     /**
@@ -801,500 +1023,752 @@ public abstract class CHPAbstractType
      */
     public BorderCode getBrc()
     {
-        return field_43_brc;
+        return field_45_brc;
     }
 
     /**
      * Set the brc field for the CHP record.
      */
-    public void setBrc(BorderCode field_43_brc)
+    public void setBrc(BorderCode field_45_brc)
     {
-        this.field_43_brc = field_43_brc;
+        this.field_45_brc = field_45_brc;
     }
 
     /**
      * Sets the fBold field value.
-     *
+     * 
      */
     public void setFBold(boolean value)
     {
-        field_2_format_flags = fBold.setBoolean(field_2_format_flags, value);
+        field_1_format_flags = (int)fBold.setBoolean(field_1_format_flags, value);
+
+        
     }
 
     /**
-     *
+     * 
      * @return  the fBold field value.
      */
     public boolean isFBold()
     {
-        return fBold.isSet(field_2_format_flags);
+        return fBold.isSet(field_1_format_flags);
+        
     }
 
     /**
      * Sets the fItalic field value.
-     *
+     * 
      */
     public void setFItalic(boolean value)
     {
-        field_2_format_flags = fItalic.setBoolean(field_2_format_flags, value);
+        field_1_format_flags = (int)fItalic.setBoolean(field_1_format_flags, value);
+
+        
     }
 
     /**
-     *
+     * 
      * @return  the fItalic field value.
      */
     public boolean isFItalic()
     {
-        return fItalic.isSet(field_2_format_flags);
+        return fItalic.isSet(field_1_format_flags);
+        
     }
 
     /**
      * Sets the fRMarkDel field value.
-     *
+     * 
      */
     public void setFRMarkDel(boolean value)
     {
-        field_2_format_flags = fRMarkDel.setBoolean(field_2_format_flags, value);
+        field_1_format_flags = (int)fRMarkDel.setBoolean(field_1_format_flags, value);
+
+        
     }
 
     /**
-     *
+     * 
      * @return  the fRMarkDel field value.
      */
     public boolean isFRMarkDel()
     {
-        return fRMarkDel.isSet(field_2_format_flags);
+        return fRMarkDel.isSet(field_1_format_flags);
+        
     }
 
     /**
      * Sets the fOutline field value.
-     *
+     * 
      */
     public void setFOutline(boolean value)
     {
-        field_2_format_flags = fOutline.setBoolean(field_2_format_flags, value);
+        field_1_format_flags = (int)fOutline.setBoolean(field_1_format_flags, value);
+
+        
     }
 
     /**
-     *
+     * 
      * @return  the fOutline field value.
      */
     public boolean isFOutline()
     {
-        return fOutline.isSet(field_2_format_flags);
+        return fOutline.isSet(field_1_format_flags);
+        
     }
 
     /**
      * Sets the fFldVanish field value.
-     *
+     * 
      */
     public void setFFldVanish(boolean value)
     {
-        field_2_format_flags = fFldVanish.setBoolean(field_2_format_flags, value);
+        field_1_format_flags = (int)fFldVanish.setBoolean(field_1_format_flags, value);
+
+        
     }
 
     /**
-     *
+     * 
      * @return  the fFldVanish field value.
      */
     public boolean isFFldVanish()
     {
-        return fFldVanish.isSet(field_2_format_flags);
+        return fFldVanish.isSet(field_1_format_flags);
+        
     }
 
     /**
      * Sets the fSmallCaps field value.
-     *
+     * 
      */
     public void setFSmallCaps(boolean value)
     {
-        field_2_format_flags = fSmallCaps.setBoolean(field_2_format_flags, value);
+        field_1_format_flags = (int)fSmallCaps.setBoolean(field_1_format_flags, value);
+
+        
     }
 
     /**
-     *
+     * 
      * @return  the fSmallCaps field value.
      */
     public boolean isFSmallCaps()
     {
-        return fSmallCaps.isSet(field_2_format_flags);
+        return fSmallCaps.isSet(field_1_format_flags);
+        
     }
 
     /**
      * Sets the fCaps field value.
-     *
+     * 
      */
     public void setFCaps(boolean value)
     {
-        field_2_format_flags = fCaps.setBoolean(field_2_format_flags, value);
+        field_1_format_flags = (int)fCaps.setBoolean(field_1_format_flags, value);
+
+        
     }
 
     /**
-     *
+     * 
      * @return  the fCaps field value.
      */
     public boolean isFCaps()
     {
-        return fCaps.isSet(field_2_format_flags);
+        return fCaps.isSet(field_1_format_flags);
+        
     }
 
     /**
      * Sets the fVanish field value.
-     *
+     * 
      */
     public void setFVanish(boolean value)
     {
-        field_2_format_flags = fVanish.setBoolean(field_2_format_flags, value);
+        field_1_format_flags = (int)fVanish.setBoolean(field_1_format_flags, value);
+
+        
     }
 
     /**
-     *
+     * 
      * @return  the fVanish field value.
      */
     public boolean isFVanish()
     {
-        return fVanish.isSet(field_2_format_flags);
+        return fVanish.isSet(field_1_format_flags);
+        
     }
 
     /**
      * Sets the fRMark field value.
-     *
+     * 
      */
     public void setFRMark(boolean value)
     {
-        field_2_format_flags = fRMark.setBoolean(field_2_format_flags, value);
+        field_1_format_flags = (int)fRMark.setBoolean(field_1_format_flags, value);
+
+        
     }
 
     /**
-     *
+     * 
      * @return  the fRMark field value.
      */
     public boolean isFRMark()
     {
-        return fRMark.isSet(field_2_format_flags);
+        return fRMark.isSet(field_1_format_flags);
+        
     }
 
     /**
      * Sets the fSpec field value.
-     *
+     * 
      */
     public void setFSpec(boolean value)
     {
-        field_2_format_flags = fSpec.setBoolean(field_2_format_flags, value);
+        field_1_format_flags = (int)fSpec.setBoolean(field_1_format_flags, value);
+
+        
     }
 
     /**
-     *
-     * @return is the fSpec field value set? (Also known as sprmCFSpec)
+     * 
+     * @return  the fSpec field value.
      */
     public boolean isFSpec()
     {
-        return fSpec.isSet(field_2_format_flags);
+        return fSpec.isSet(field_1_format_flags);
+        
     }
 
     /**
      * Sets the fStrike field value.
-     *
+     * 
      */
     public void setFStrike(boolean value)
     {
-        field_2_format_flags = fStrike.setBoolean(field_2_format_flags, value);
+        field_1_format_flags = (int)fStrike.setBoolean(field_1_format_flags, value);
+
+        
     }
 
     /**
-     *
+     * 
      * @return  the fStrike field value.
      */
     public boolean isFStrike()
     {
-        return fStrike.isSet(field_2_format_flags);
+        return fStrike.isSet(field_1_format_flags);
+        
     }
 
     /**
      * Sets the fObj field value.
-     *
+     * 
      */
     public void setFObj(boolean value)
     {
-        field_2_format_flags = fObj.setBoolean(field_2_format_flags, value);
+        field_1_format_flags = (int)fObj.setBoolean(field_1_format_flags, value);
+
+        
     }
 
     /**
-     *
+     * 
      * @return  the fObj field value.
      */
     public boolean isFObj()
     {
-        return fObj.isSet(field_2_format_flags);
+        return fObj.isSet(field_1_format_flags);
+        
     }
 
     /**
      * Sets the fShadow field value.
-     *
+     * 
      */
     public void setFShadow(boolean value)
     {
-        field_2_format_flags = fShadow.setBoolean(field_2_format_flags, value);
+        field_1_format_flags = (int)fShadow.setBoolean(field_1_format_flags, value);
+
+        
     }
 
     /**
-     *
+     * 
      * @return  the fShadow field value.
      */
     public boolean isFShadow()
     {
-        return fShadow.isSet(field_2_format_flags);
+        return fShadow.isSet(field_1_format_flags);
+        
     }
 
     /**
      * Sets the fLowerCase field value.
-     *
+     * 
      */
     public void setFLowerCase(boolean value)
     {
-        field_2_format_flags = fLowerCase.setBoolean(field_2_format_flags, value);
+        field_1_format_flags = (int)fLowerCase.setBoolean(field_1_format_flags, value);
+
+        
     }
 
     /**
-     *
+     * 
      * @return  the fLowerCase field value.
      */
     public boolean isFLowerCase()
     {
-        return fLowerCase.isSet(field_2_format_flags);
+        return fLowerCase.isSet(field_1_format_flags);
+        
     }
 
     /**
      * Sets the fData field value.
-     *
+     * 
      */
     public void setFData(boolean value)
     {
-        field_2_format_flags = fData.setBoolean(field_2_format_flags, value);
+        field_1_format_flags = (int)fData.setBoolean(field_1_format_flags, value);
+
+        
     }
 
     /**
-     *
+     * 
      * @return  the fData field value.
      */
     public boolean isFData()
     {
-        return fData.isSet(field_2_format_flags);
+        return fData.isSet(field_1_format_flags);
+        
     }
 
     /**
      * Sets the fOle2 field value.
-     *
+     * 
      */
     public void setFOle2(boolean value)
     {
-        field_2_format_flags = fOle2.setBoolean(field_2_format_flags, value);
+        field_1_format_flags = (int)fOle2.setBoolean(field_1_format_flags, value);
+
+        
     }
 
     /**
-     *
+     * 
      * @return  the fOle2 field value.
      */
     public boolean isFOle2()
     {
-        return fOle2.isSet(field_2_format_flags);
+        return fOle2.isSet(field_1_format_flags);
+        
     }
 
     /**
      * Sets the fEmboss field value.
-     *
+     * 
      */
     public void setFEmboss(boolean value)
     {
-        field_3_format_flags1 = fEmboss.setBoolean(field_3_format_flags1, value);
+        field_2_format_flags1 = (int)fEmboss.setBoolean(field_2_format_flags1, value);
+
+        
     }
 
     /**
-     *
+     * 
      * @return  the fEmboss field value.
      */
     public boolean isFEmboss()
     {
-        return fEmboss.isSet(field_3_format_flags1);
+        return fEmboss.isSet(field_2_format_flags1);
+        
     }
 
     /**
      * Sets the fImprint field value.
-     *
+     * 
      */
     public void setFImprint(boolean value)
     {
-        field_3_format_flags1 = fImprint.setBoolean(field_3_format_flags1, value);
+        field_2_format_flags1 = (int)fImprint.setBoolean(field_2_format_flags1, value);
+
+        
     }
 
     /**
-     *
+     * 
      * @return  the fImprint field value.
      */
     public boolean isFImprint()
     {
-        return fImprint.isSet(field_3_format_flags1);
+        return fImprint.isSet(field_2_format_flags1);
+        
     }
 
     /**
      * Sets the fDStrike field value.
-     *
+     * 
      */
     public void setFDStrike(boolean value)
     {
-        field_3_format_flags1 = fDStrike.setBoolean(field_3_format_flags1, value);
+        field_2_format_flags1 = (int)fDStrike.setBoolean(field_2_format_flags1, value);
+
+        
     }
 
     /**
-     *
+     * 
      * @return  the fDStrike field value.
      */
     public boolean isFDStrike()
     {
-        return fDStrike.isSet(field_3_format_flags1);
+        return fDStrike.isSet(field_2_format_flags1);
+        
     }
 
     /**
      * Sets the fUsePgsuSettings field value.
-     *
+     * 
      */
     public void setFUsePgsuSettings(boolean value)
     {
-        field_3_format_flags1 = fUsePgsuSettings.setBoolean(field_3_format_flags1, value);
+        field_2_format_flags1 = (int)fUsePgsuSettings.setBoolean(field_2_format_flags1, value);
+
+        
     }
 
     /**
-     *
+     * 
      * @return  the fUsePgsuSettings field value.
      */
     public boolean isFUsePgsuSettings()
     {
-        return fUsePgsuSettings.isSet(field_3_format_flags1);
+        return fUsePgsuSettings.isSet(field_2_format_flags1);
+        
     }
 
     /**
      * Sets the icoHighlight field value.
-     *
+     * Highlight color (see chp.ico)
      */
     public void setIcoHighlight(byte value)
     {
-        field_33_Highlight = (short)icoHighlight.setValue(field_33_Highlight, value);
+        field_32_Highlight = (short)icoHighlight.setValue(field_32_Highlight, value);
+
+        
     }
 
     /**
-     *
+     * Highlight color (see chp.ico)
      * @return  the icoHighlight field value.
      */
     public byte getIcoHighlight()
     {
-        return ( byte )icoHighlight.getValue(field_33_Highlight);
+        return ( byte )icoHighlight.getValue(field_32_Highlight);
+        
     }
 
     /**
      * Sets the fHighlight field value.
-     *
+     * When 1, characters are highlighted with color specified by chp.icoHighlight
      */
     public void setFHighlight(boolean value)
     {
-        field_33_Highlight = (short)fHighlight.setBoolean(field_33_Highlight, value);
+        field_32_Highlight = (short)fHighlight.setBoolean(field_32_Highlight, value);
+
+        
     }
 
     /**
-     *
+     * When 1, characters are highlighted with color specified by chp.icoHighlight
      * @return  the fHighlight field value.
      */
     public boolean isFHighlight()
     {
-        return fHighlight.isSet(field_33_Highlight);
+        return fHighlight.isSet(field_32_Highlight);
+        
     }
 
     /**
-     * Sets the kcd field value.
-     *
+     * Sets the fNavHighlight field value.
+     * Used internally by Word
      */
-    public void setKcd(byte value)
+    public void setFNavHighlight(boolean value)
     {
-        field_33_Highlight = (short)kcd.setValue(field_33_Highlight, value);
+        field_32_Highlight = (short)fNavHighlight.setBoolean(field_32_Highlight, value);
+
+        
     }
 
     /**
-     *
-     * @return  the kcd field value.
+     * Used internally by Word
+     * @return  the fNavHighlight field value.
      */
-    public byte getKcd()
+    public boolean isFNavHighlight()
     {
-        return ( byte )kcd.getValue(field_33_Highlight);
+        return fNavHighlight.isSet(field_32_Highlight);
+        
     }
 
     /**
-     * Sets the fNavHighlight field value.
-     *
+     * Sets the iatrUndetType field value.
+     * Used internally by Word
      */
-    public void setFNavHighlight(boolean value)
+    public void setIatrUndetType(byte value)
     {
-        field_33_Highlight = (short)fNavHighlight.setBoolean(field_33_Highlight, value);
+        field_33_InternalFlags = (short)iatrUndetType.setValue(field_33_InternalFlags, value);
+
+        
     }
 
     /**
-     *
-     * @return  the fNavHighlight field value.
+     * Used internally by Word
+     * @return  the iatrUndetType field value.
      */
-    public boolean isFNavHighlight()
+    public byte getIatrUndetType()
+    {
+        return ( byte )iatrUndetType.getValue(field_33_InternalFlags);
+        
+    }
+
+    /**
+     * Sets the fUlGap field value.
+     * Used internally by Word 8
+     */
+    public void setFUlGap(boolean value)
+    {
+        field_33_InternalFlags = (short)fUlGap.setBoolean(field_33_InternalFlags, value);
+
+        
+    }
+
+    /**
+     * Used internally by Word 8
+     * @return  the fUlGap field value.
+     */
+    public boolean isFUlGap()
+    {
+        return fUlGap.isSet(field_33_InternalFlags);
+        
+    }
+
+    /**
+     * Sets the fScriptAnchor field value.
+     * Used internally by Word
+     */
+    public void setFScriptAnchor(boolean value)
+    {
+        field_33_InternalFlags = (short)fScriptAnchor.setBoolean(field_33_InternalFlags, value);
+
+        
+    }
+
+    /**
+     * Used internally by Word
+     * @return  the fScriptAnchor field value.
+     */
+    public boolean isFScriptAnchor()
     {
-        return fNavHighlight.isSet(field_33_Highlight);
+        return fScriptAnchor.isSet(field_33_InternalFlags);
+        
+    }
+
+    /**
+     * Sets the fFixedObj field value.
+     * Used internally by Word
+     */
+    public void setFFixedObj(boolean value)
+    {
+        field_33_InternalFlags = (short)fFixedObj.setBoolean(field_33_InternalFlags, value);
+
+        
+    }
+
+    /**
+     * Used internally by Word
+     * @return  the fFixedObj field value.
+     */
+    public boolean isFFixedObj()
+    {
+        return fFixedObj.isSet(field_33_InternalFlags);
+        
+    }
+
+    /**
+     * Sets the spare2 field value.
+     * Not used
+     */
+    public void setSpare2(boolean value)
+    {
+        field_33_InternalFlags = (short)spare2.setBoolean(field_33_InternalFlags, value);
+
+        
+    }
+
+    /**
+     * Not used
+     * @return  the spare2 field value.
+     */
+    public boolean isSpare2()
+    {
+        return spare2.isSet(field_33_InternalFlags);
+        
     }
 
     /**
      * Sets the fChsDiff field value.
-     *
+     * Pre-Unicode files, char's char set different from FIB char set
      */
     public void setFChsDiff(boolean value)
     {
-        field_33_Highlight = (short)fChsDiff.setBoolean(field_33_Highlight, value);
+        field_34_EncodingFlags = (short)fChsDiff.setBoolean(field_34_EncodingFlags, value);
+
+        
     }
 
     /**
-     *
+     * Pre-Unicode files, char's char set different from FIB char set
      * @return  the fChsDiff field value.
      */
     public boolean isFChsDiff()
     {
-        return fChsDiff.isSet(field_33_Highlight);
+        return fChsDiff.isSet(field_34_EncodingFlags);
+        
     }
 
     /**
      * Sets the fMacChs field value.
-     *
+     * fTrue if char's are Macintosh char set
      */
     public void setFMacChs(boolean value)
     {
-        field_33_Highlight = (short)fMacChs.setBoolean(field_33_Highlight, value);
+        field_34_EncodingFlags = (short)fMacChs.setBoolean(field_34_EncodingFlags, value);
+
+        
     }
 
     /**
-     *
+     * fTrue if char's are Macintosh char set
      * @return  the fMacChs field value.
      */
     public boolean isFMacChs()
     {
-        return fMacChs.isSet(field_33_Highlight);
+        return fMacChs.isSet(field_34_EncodingFlags);
+        
     }
 
     /**
      * Sets the fFtcAsciSym field value.
-     *
+     * Used internally by Word
      */
     public void setFFtcAsciSym(boolean value)
     {
-        field_33_Highlight = (short)fFtcAsciSym.setBoolean(field_33_Highlight, value);
+        field_34_EncodingFlags = (short)fFtcAsciSym.setBoolean(field_34_EncodingFlags, value);
+
+        
     }
 
     /**
-     *
+     * Used internally by Word
      * @return  the fFtcAsciSym field value.
      */
     public boolean isFFtcAsciSym()
     {
-        return fFtcAsciSym.isSet(field_33_Highlight);
+        return fFtcAsciSym.isSet(field_34_EncodingFlags);
+        
+    }
+
+    /**
+     * Sets the fFtcReq field value.
+     * Used internally by Word
+     */
+    public void setFFtcReq(boolean value)
+    {
+        field_34_EncodingFlags = (short)fFtcReq.setBoolean(field_34_EncodingFlags, value);
+
+        
     }
+
+    /**
+     * Used internally by Word
+     * @return  the fFtcReq field value.
+     */
+    public boolean isFFtcReq()
+    {
+        return fFtcReq.isSet(field_34_EncodingFlags);
+        
+    }
+
+    /**
+     * Sets the fLangApplied field value.
+     * Used internally by Word
+     */
+    public void setFLangApplied(boolean value)
+    {
+        field_34_EncodingFlags = (short)fLangApplied.setBoolean(field_34_EncodingFlags, value);
+
+        
+    }
+
+    /**
+     * Used internally by Word
+     * @return  the fLangApplied field value.
+     */
+    public boolean isFLangApplied()
+    {
+        return fLangApplied.isSet(field_34_EncodingFlags);
+        
+    }
+
+    /**
+     * Sets the fSpareLangApplied field value.
+     * Used internally by Word
+     */
+    public void setFSpareLangApplied(boolean value)
+    {
+        field_34_EncodingFlags = (short)fSpareLangApplied.setBoolean(field_34_EncodingFlags, value);
+
+        
+    }
+
+    /**
+     * Used internally by Word
+     * @return  the fSpareLangApplied field value.
+     */
+    public boolean isFSpareLangApplied()
+    {
+        return fSpareLangApplied.isSet(field_34_EncodingFlags);
+        
+    }
+
+    /**
+     * Sets the fForcedCvAuto field value.
+     * Used internally by Word
+     */
+    public void setFForcedCvAuto(boolean value)
+    {
+        field_34_EncodingFlags = (short)fForcedCvAuto.setBoolean(field_34_EncodingFlags, value);
+
+        
+    }
+
+    /**
+     * Used internally by Word
+     * @return  the fForcedCvAuto field value.
+     */
+    public boolean isFForcedCvAuto()
+    {
+        return fForcedCvAuto.isSet(field_34_EncodingFlags);
+        
+    }
+
+
+
 }
index 8f3e4f19375d2a7d0f1c2a7a11c67452f9e121f5..4a88b19f64e3ec4d7cddfb954742b3061c547626 100644 (file)
@@ -78,22 +78,23 @@ public final class CharacterProperties
 
   int _ico24 = -1; // default to -1 so we can ignore it for word 97 files
 
-  public CharacterProperties()
-  {
-    field_17_fcPic = -1;
-    field_22_dttmRMark = new DateAndTime();
-    field_23_dttmRMarkDel = new DateAndTime();
-    field_36_dttmPropRMark = new DateAndTime();
-    field_40_dttmDispFldRMark = new DateAndTime();
-    field_41_xstDispFldRMark = new byte[36];
-    field_42_shd = new ShadingDescriptor();
-    field_43_brc = new BorderCode();
-    field_7_hps = 20;
-    field_24_istd = 10;
-    field_16_wCharScale = 100;
-    field_13_lidDefault = 0x0400;
-    field_14_lidFE = 0x0400;
-  }
+    public CharacterProperties()
+    {
+        setDttmRMark( new DateAndTime() );
+        setDttmRMarkDel( new DateAndTime() );
+        setDttmPropRMark( new DateAndTime() );
+        setDttmDispFldRMark( new DateAndTime() );
+        setXstDispFldRMark( new byte[36] );
+        setShd( new ShadingDescriptor() );
+        setBrc( new BorderCode() );
+
+        setFcPic( -1 );
+        setHps( 20 );
+        setIstd( 10 );
+        setWCharScale( 100 );
+        setLidDefault( 0x0400 );
+        setLidFE( 0x0400 );
+    }
 
   public boolean isMarkedDeleted()
   {
@@ -323,7 +324,7 @@ public final class CharacterProperties
   {
     if ( _ico24 == -1 )
     {
-      switch(field_11_ico) // convert word 97 colour numbers to 0xBBGGRR value
+      switch(getIco()) // convert word 97 colour numbers to 0xBBGGRR value
       {
         case 0: // auto
           return -1;
@@ -372,19 +373,20 @@ public final class CharacterProperties
     _ico24 = colour24 & 0xFFFFFF; // only keep the 24bit 0xBBGGRR colour
   }
 
-  public Object clone()
-    throws CloneNotSupportedException
-  {
-    CharacterProperties cp = (CharacterProperties)super.clone();
-    cp.field_22_dttmRMark = (DateAndTime)field_22_dttmRMark.clone();
-    cp.field_23_dttmRMarkDel = (DateAndTime)field_23_dttmRMarkDel.clone();
-    cp.field_36_dttmPropRMark = (DateAndTime)field_36_dttmPropRMark.clone();
-    cp.field_40_dttmDispFldRMark = (DateAndTime)field_40_dttmDispFldRMark.clone();
-    cp.field_41_xstDispFldRMark = field_41_xstDispFldRMark.clone();
-    cp.field_42_shd = (ShadingDescriptor)field_42_shd.clone();
+    public Object clone() throws CloneNotSupportedException
+    {
+        CharacterProperties cp = (CharacterProperties) super.clone();
 
-    cp._ico24 = _ico24;
+        cp.setDttmRMark( (DateAndTime) getDttmRMark().clone() );
+        cp.setDttmRMarkDel( (DateAndTime) getDttmRMarkDel().clone() );
+        cp.setDttmPropRMark( (DateAndTime) getDttmPropRMark().clone() );
+        cp.setDttmDispFldRMark( (DateAndTime) getDttmDispFldRMark().clone() );
+        cp.setXstDispFldRMark( getXstDispFldRMark().clone() );
+        cp.setShd( (ShadingDescriptor) getShd().clone() );
+        cp.setBrc( (BorderCode) getBrc().clone() );
 
-    return cp;
-  }
+        cp._ico24 = _ico24;
+
+        return cp;
+    }
 }
index 51ef9d88cb468934e8c615945eee9e58dd72d7f5..9f7c0623bf9fb6ad8db0f6b59ff9cfecf154e144 100644 (file)
@@ -23,7 +23,6 @@
     <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"/>
       <field type="byte" size="1" name="chYsr"/>
       <field type="int" size="2" name="hpsKern"/>
       <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"/>
+        <bit number="0" mask="0x001f" name="icoHighlight" description="Highlight color (see chp.ico)"/>
+        <bit number="1" mask="0x0020" name="fHighlight" description="When 1, characters are highlighted with color specified by chp.icoHighlight"/>
+        <bit number="2" mask="0x0040" name="fNavHighlight" description="Used internally by Word"/>
       </field>
+      <field type="short" size="2" name="InternalFlags">
+        <bit number="0" mask="0x000f" name="iatrUndetType" description="Used internally by Word"/>
+        <bit number="1" mask="0x0010" name="fUlGap" description="Used internally by Word 8"/>
+        <bit number="2" mask="0x0800" name="fScriptAnchor" description="Used internally by Word"/>
+        <bit number="3" mask="0x1000" name="fFixedObj" description="Used internally by Word"/>
+        <bit number="4" mask="0x2000" name="spare2" description="Not used"/>
+      </field>
+      <field type="short" size="2" name="EncodingFlags">
+        <bit number="0" mask="0x0001" name="fChsDiff" description="Pre-Unicode files, char's char set different from FIB char set"/>
+        <bit number="1" mask="0x0002" name="fMacChs" description="fTrue if char's are Macintosh char set"/>
+        <bit number="2" mask="0x0004" name="fFtcAsciSym" description="Used internally by Word"/>
+        <bit number="3" mask="0x0008" name="fFtcReq" description="Used internally by Word"/>
+        <bit number="4" mask="0x0010" name="fLangApplied" description="Used internally by Word"/>
+        <bit number="5" mask="0x0020" name="fSpareLangApplied" description="Used internally by Word"/>
+        <bit number="6" mask="0x0040" name="fForcedCvAuto" description="Used internally by Word"/>
+      </field>
+      <!-- Not documented, but referenced by sprmCChs -->
+      <field type="short" size="2" name="chse" description="used to record a character set id for text that was pasted into the Word document that used a character set different than Word‘s default character set"/>
       <field type="short" size="2" name="fPropMark"/>
       <field type="int" size="2" name="ibstPropRMark"/>
       <field type="DateAndTime" size="4" name="dttmPropRMark"/>