add additional TableProperties; implement TableAutoformatLookSpecifier

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

9 files changed, 2619 insertions, 163 deletions

diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/TAPAbstractType.java b/src/scratchpad/src/org/apache/poi/hwpf/model/types/TAPAbstractType.java
index 2230b4816b..595a0f22fd 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/TAPAbstractType.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/model/types/TAPAbstractType.java
@@ -17,68 +17,522 @@
 
 package org.apache.poi.hwpf.model.types;
 
-
 import org.apache.poi.hdf.model.hdftypes.HDFType;
 import org.apache.poi.hwpf.usermodel.BorderCode;
 import org.apache.poi.hwpf.usermodel.ShadingDescriptor;
+import org.apache.poi.hwpf.usermodel.TableAutoformatLookSpecifier;
 import org.apache.poi.hwpf.usermodel.TableCellDescriptor;
+import org.apache.poi.util.BitField;
 
 /**
- * Table Properties.
- * NOTE: This source is automatically generated please do not modify this file.  Either subclass or
- *       remove the record in src/records/definitions.
- *
+ * "Table Properties (TAP). This structure is never written out to disk but can
+ * be built from the appropriate property modifiers. For this reason no offsets
+ * into the structure are given."
+ * <p>
+ * Class and properties descriptions quoted from Microsoft Office Word 97-2007
+ * Binary File Format Specification [*.doc]
+ * <p>
+ * NOTE: This source is automatically generated please do not modify this file.
+ * Either subclass or remove the record in src/records/definitions.
+ * 
  * @author S. Ryan Ackley
+ * @author Sergey Vladimirov (vlsergey {at} gmail {dot} com)
  */
-public abstract class TAPAbstractType implements HDFType {
-
-    protected  int field_1_jc;
-    protected  int field_2_dxaGapHalf;
-    protected  int field_3_dyaRowHeight;
-    protected  boolean field_4_fCantSplit;
-    protected  boolean field_5_fTableHeader;
-    protected  int field_6_tlp;
-    protected  short field_7_itcMac;
-    protected  short[] field_8_rgdxaCenter;
-    protected  TableCellDescriptor[] field_9_rgtc;
-    protected  ShadingDescriptor[] field_10_rgshd;
-    protected  BorderCode field_11_brcBottom;
-    protected  BorderCode field_12_brcTop;
-    protected  BorderCode field_13_brcLeft;
-    protected  BorderCode field_14_brcRight;
-    protected  BorderCode field_15_brcVertical;
-    protected  BorderCode field_16_brcHorizontal;
+public abstract class TAPAbstractType implements HDFType
+{
 
+    protected short field_1_istd;
+    protected short field_2_jc;
+    protected int field_3_dxaGapHalf;
+    protected int field_4_dyaRowHeight;
+    protected boolean field_5_fCantSplit;
+    protected boolean field_6_fCantSplit90;
+    protected boolean field_7_fTableHeader;
+    protected TableAutoformatLookSpecifier field_8_tlp;
+    protected short field_9_wWidth;
+    protected short field_10_wWidthIndent;
+    protected short field_11_wWidthBefore;
+    protected short field_12_wWidthAfter;
+    protected int field_13_widthAndFitsFlags;
+    private static BitField fAutofit = new BitField( 0x00000001 );
+    private static BitField fKeepFollow = new BitField( 0x00000002 );
+    private static BitField ftsWidth = new BitField( 0x0000001c );
+    private static BitField ftsWidthIndent = new BitField( 0x000000e0 );
+    private static BitField ftsWidthBefore = new BitField( 0x00000700 );
+    private static BitField ftsWidthAfter = new BitField( 0x00003800 );
+    private static BitField fNeverBeenAutofit = new BitField( 0x00004000 );
+    private static BitField fInvalAutofit = new BitField( 0x00008000 );
+    private static BitField widthAndFitsFlags_empty1 = new BitField( 0x00070000 );
+    private static BitField fVert = new BitField( 0x00080000 );
+    private static BitField pcVert = new BitField( 0x00300000 );
+    private static BitField pcHorz = new BitField( 0x00c00000 );
+    private static BitField widthAndFitsFlags_empty2 = new BitField( 0xff000000 );
+    protected int field_14_dxaAbs;
+    protected int field_15_dyaAbs;
+    protected int field_16_dxaFromText;
+    protected int field_17_dyaFromText;
+    protected int field_18_dxaFromTextRight;
+    protected int field_19_dyaFromTextBottom;
+    protected byte field_20_fBiDi;
+    protected byte field_21_fRTL;
+    protected byte field_22_fNoAllowOverlap;
+    protected byte field_23_fSpare;
+    protected int field_24_grpfTap;
+    protected int field_25_internalFlags;
+    private static BitField fFirstRow = new BitField( 0x0001 );
+    private static BitField fLastRow = new BitField( 0x0002 );
+    private static BitField fOutline = new BitField( 0x0004 );
+    private static BitField fOrigWordTableRules = new BitField( 0x0008 );
+    private static BitField fCellSpacing = new BitField( 0x0010 );
+    private static BitField grpfTap_unused = new BitField( 0xffe0 );
+    protected short field_26_itcMac;
+    protected int field_27_dxaAdjust;
+    protected int field_28_dxaWebView;
+    protected int field_29_dxaRTEWrapWidth;
+    protected int field_30_dxaColWidthWwd;
+    protected short field_31_pctWwd;
+    protected int field_32_viewFlags;
+    private static BitField fWrapToWwd = new BitField( 0x0001 );
+    private static BitField fNotPageView = new BitField( 0x0002 );
+    private static BitField viewFlags_unused1 = new BitField( 0x0004 );
+    private static BitField fWebView = new BitField( 0x0008 );
+    private static BitField fAdjusted = new BitField( 0x0010 );
+    private static BitField viewFlags_unused2 = new BitField( 0xffe0 );
+    protected short[] field_33_rgdxaCenter;
+    protected short[] field_34_rgdxaCenterPrint;
+    protected ShadingDescriptor field_35_shdTable;
+    protected BorderCode field_36_brcBottom;
+    protected BorderCode field_37_brcTop;
+    protected BorderCode field_38_brcLeft;
+    protected BorderCode field_39_brcRight;
+    protected BorderCode field_40_brcVertical;
+    protected BorderCode field_41_brcHorizontal;
+    protected short field_42_wCellPaddingDefaultTop;
+    protected short field_43_wCellPaddingDefaultLeft;
+    protected short field_44_wCellPaddingDefaultBottom;
+    protected short field_45_wCellPaddingDefaultRight;
+    protected byte field_46_ftsCellPaddingDefaultTop;
+    protected byte field_47_ftsCellPaddingDefaultLeft;
+    protected byte field_48_ftsCellPaddingDefaultBottom;
+    protected byte field_49_ftsCellPaddingDefaultRight;
+    protected short field_50_wCellSpacingDefaultTop;
+    protected short field_51_wCellSpacingDefaultLeft;
+    protected short field_52_wCellSpacingDefaultBottom;
+    protected short field_53_wCellSpacingDefaultRight;
+    protected byte field_54_ftsCellSpacingDefaultTop;
+    protected byte field_55_ftsCellSpacingDefaultLeft;
+    protected byte field_56_ftsCellSpacingDefaultBottom;
+    protected byte field_57_ftsCellSpacingDefaultRight;
+    protected short field_58_wCellPaddingOuterTop;
+    protected short field_59_wCellPaddingOuterLeft;
+    protected short field_60_wCellPaddingOuterBottom;
+    protected short field_61_wCellPaddingOuterRight;
+    protected byte field_62_ftsCellPaddingOuterTop;
+    protected byte field_63_ftsCellPaddingOuterLeft;
+    protected byte field_64_ftsCellPaddingOuterBottom;
+    protected byte field_65_ftsCellPaddingOuterRight;
+    protected short field_66_wCellSpacingOuterTop;
+    protected short field_67_wCellSpacingOuterLeft;
+    protected short field_68_wCellSpacingOuterBottom;
+    protected short field_69_wCellSpacingOuterRight;
+    protected byte field_70_ftsCellSpacingOuterTop;
+    protected byte field_71_ftsCellSpacingOuterLeft;
+    protected byte field_72_ftsCellSpacingOuterBottom;
+    protected byte field_73_ftsCellSpacingOuterRight;
+    protected TableCellDescriptor[] field_74_rgtc;
+    protected ShadingDescriptor[] field_75_rgshd;
+    protected byte field_76_fPropRMark;
+    protected byte field_77_fHasOldProps;
+    protected short field_78_cHorzBands;
+    protected short field_79_cVertBands;
+    protected BorderCode field_80_rgbrcInsideDefault_0;
+    protected BorderCode field_81_rgbrcInsideDefault_1;
 
     public TAPAbstractType()
     {
 
     }
 
+    public String toString()
+    {
+        StringBuffer buffer = new StringBuffer();
+
+        buffer.append( "[TAP]\n" );
+
+        buffer.append( "    .istd                 = " );
+        buffer.append( " (" ).append( getIstd() ).append( " )\n" );
+
+        buffer.append( "    .jc                   = " );
+        buffer.append( " (" ).append( getJc() ).append( " )\n" );
+
+        buffer.append( "    .dxaGapHalf           = " );
+        buffer.append( " (" ).append( getDxaGapHalf() ).append( " )\n" );
+
+        buffer.append( "    .dyaRowHeight         = " );
+        buffer.append( " (" ).append( getDyaRowHeight() ).append( " )\n" );
+
+        buffer.append( "    .fCantSplit           = " );
+        buffer.append( " (" ).append( getFCantSplit() ).append( " )\n" );
+
+        buffer.append( "    .fCantSplit90         = " );
+        buffer.append( " (" ).append( getFCantSplit90() ).append( " )\n" );
+
+        buffer.append( "    .fTableHeader         = " );
+        buffer.append( " (" ).append( getFTableHeader() ).append( " )\n" );
+
+        buffer.append( "    .tlp                  = " );
+        buffer.append( " (" ).append( getTlp() ).append( " )\n" );
+
+        buffer.append( "    .wWidth               = " );
+        buffer.append( " (" ).append( getWWidth() ).append( " )\n" );
+
+        buffer.append( "    .wWidthIndent         = " );
+        buffer.append( " (" ).append( getWWidthIndent() ).append( " )\n" );
+
+        buffer.append( "    .wWidthBefore         = " );
+        buffer.append( " (" ).append( getWWidthBefore() ).append( " )\n" );
+
+        buffer.append( "    .wWidthAfter          = " );
+        buffer.append( " (" ).append( getWWidthAfter() ).append( " )\n" );
+
+        buffer.append( "    .widthAndFitsFlags    = " );
+        buffer.append( " (" ).append( getWidthAndFitsFlags() ).append( " )\n" );
+        buffer.append( "         .fAutofit                 = " )
+                .append( isFAutofit() ).append( '\n' );
+        buffer.append( "         .fKeepFollow              = " )
+                .append( isFKeepFollow() ).append( '\n' );
+        buffer.append( "         .ftsWidth                 = " )
+                .append( getFtsWidth() ).append( '\n' );
+        buffer.append( "         .ftsWidthIndent           = " )
+                .append( getFtsWidthIndent() ).append( '\n' );
+        buffer.append( "         .ftsWidthBefore           = " )
+                .append( getFtsWidthBefore() ).append( '\n' );
+        buffer.append( "         .ftsWidthAfter            = " )
+                .append( getFtsWidthAfter() ).append( '\n' );
+        buffer.append( "         .fNeverBeenAutofit        = " )
+                .append( isFNeverBeenAutofit() ).append( '\n' );
+        buffer.append( "         .fInvalAutofit            = " )
+                .append( isFInvalAutofit() ).append( '\n' );
+        buffer.append( "         .widthAndFitsFlags_empty1     = " )
+                .append( getWidthAndFitsFlags_empty1() ).append( '\n' );
+        buffer.append( "         .fVert                    = " )
+                .append( isFVert() ).append( '\n' );
+        buffer.append( "         .pcVert                   = " )
+                .append( getPcVert() ).append( '\n' );
+        buffer.append( "         .pcHorz                   = " )
+                .append( getPcHorz() ).append( '\n' );
+        buffer.append( "         .widthAndFitsFlags_empty2     = " )
+                .append( getWidthAndFitsFlags_empty2() ).append( '\n' );
+
+        buffer.append( "    .dxaAbs               = " );
+        buffer.append( " (" ).append( getDxaAbs() ).append( " )\n" );
+
+        buffer.append( "    .dyaAbs               = " );
+        buffer.append( " (" ).append( getDyaAbs() ).append( " )\n" );
+
+        buffer.append( "    .dxaFromText          = " );
+        buffer.append( " (" ).append( getDxaFromText() ).append( " )\n" );
+
+        buffer.append( "    .dyaFromText          = " );
+        buffer.append( " (" ).append( getDyaFromText() ).append( " )\n" );
+
+        buffer.append( "    .dxaFromTextRight     = " );
+        buffer.append( " (" ).append( getDxaFromTextRight() ).append( " )\n" );
+
+        buffer.append( "    .dyaFromTextBottom    = " );
+        buffer.append( " (" ).append( getDyaFromTextBottom() ).append( " )\n" );
+
+        buffer.append( "    .fBiDi                = " );
+        buffer.append( " (" ).append( getFBiDi() ).append( " )\n" );
+
+        buffer.append( "    .fRTL                 = " );
+        buffer.append( " (" ).append( getFRTL() ).append( " )\n" );
+
+        buffer.append( "    .fNoAllowOverlap      = " );
+        buffer.append( " (" ).append( getFNoAllowOverlap() ).append( " )\n" );
+
+        buffer.append( "    .fSpare               = " );
+        buffer.append( " (" ).append( getFSpare() ).append( " )\n" );
+
+        buffer.append( "    .grpfTap              = " );
+        buffer.append( " (" ).append( getGrpfTap() ).append( " )\n" );
+
+        buffer.append( "    .internalFlags        = " );
+        buffer.append( " (" ).append( getInternalFlags() ).append( " )\n" );
+        buffer.append( "         .fFirstRow                = " )
+                .append( isFFirstRow() ).append( '\n' );
+        buffer.append( "         .fLastRow                 = " )
+                .append( isFLastRow() ).append( '\n' );
+        buffer.append( "         .fOutline                 = " )
+                .append( isFOutline() ).append( '\n' );
+        buffer.append( "         .fOrigWordTableRules      = " )
+                .append( isFOrigWordTableRules() ).append( '\n' );
+        buffer.append( "         .fCellSpacing             = " )
+                .append( isFCellSpacing() ).append( '\n' );
+        buffer.append( "         .grpfTap_unused           = " )
+                .append( getGrpfTap_unused() ).append( '\n' );
+
+        buffer.append( "    .itcMac               = " );
+        buffer.append( " (" ).append( getItcMac() ).append( " )\n" );
+
+        buffer.append( "    .dxaAdjust            = " );
+        buffer.append( " (" ).append( getDxaAdjust() ).append( " )\n" );
+
+        buffer.append( "    .dxaWebView           = " );
+        buffer.append( " (" ).append( getDxaWebView() ).append( " )\n" );
+
+        buffer.append( "    .dxaRTEWrapWidth      = " );
+        buffer.append( " (" ).append( getDxaRTEWrapWidth() ).append( " )\n" );
+
+        buffer.append( "    .dxaColWidthWwd       = " );
+        buffer.append( " (" ).append( getDxaColWidthWwd() ).append( " )\n" );
+
+        buffer.append( "    .pctWwd               = " );
+        buffer.append( " (" ).append( getPctWwd() ).append( " )\n" );
+
+        buffer.append( "    .viewFlags            = " );
+        buffer.append( " (" ).append( getViewFlags() ).append( " )\n" );
+        buffer.append( "         .fWrapToWwd               = " )
+                .append( isFWrapToWwd() ).append( '\n' );
+        buffer.append( "         .fNotPageView             = " )
+                .append( isFNotPageView() ).append( '\n' );
+        buffer.append( "         .viewFlags_unused1        = " )
+                .append( isViewFlags_unused1() ).append( '\n' );
+        buffer.append( "         .fWebView                 = " )
+                .append( isFWebView() ).append( '\n' );
+        buffer.append( "         .fAdjusted                = " )
+                .append( isFAdjusted() ).append( '\n' );
+        buffer.append( "         .viewFlags_unused2        = " )
+                .append( getViewFlags_unused2() ).append( '\n' );
+
+        buffer.append( "    .rgdxaCenter          = " );
+        buffer.append( " (" ).append( getRgdxaCenter() ).append( " )\n" );
+
+        buffer.append( "    .rgdxaCenterPrint     = " );
+        buffer.append( " (" ).append( getRgdxaCenterPrint() ).append( " )\n" );
+
+        buffer.append( "    .shdTable             = " );
+        buffer.append( " (" ).append( getShdTable() ).append( " )\n" );
+
+        buffer.append( "    .brcBottom            = " );
+        buffer.append( " (" ).append( getBrcBottom() ).append( " )\n" );
+
+        buffer.append( "    .brcTop               = " );
+        buffer.append( " (" ).append( getBrcTop() ).append( " )\n" );
+
+        buffer.append( "    .brcLeft              = " );
+        buffer.append( " (" ).append( getBrcLeft() ).append( " )\n" );
+
+        buffer.append( "    .brcRight             = " );
+        buffer.append( " (" ).append( getBrcRight() ).append( " )\n" );
+
+        buffer.append( "    .brcVertical          = " );
+        buffer.append( " (" ).append( getBrcVertical() ).append( " )\n" );
+
+        buffer.append( "    .brcHorizontal        = " );
+        buffer.append( " (" ).append( getBrcHorizontal() ).append( " )\n" );
+
+        buffer.append( "    .wCellPaddingDefaultTop = " );
+        buffer.append( " (" ).append( getWCellPaddingDefaultTop() )
+                .append( " )\n" );
+
+        buffer.append( "    .wCellPaddingDefaultLeft = " );
+        buffer.append( " (" ).append( getWCellPaddingDefaultLeft() )
+                .append( " )\n" );
+
+        buffer.append( "    .wCellPaddingDefaultBottom = " );
+        buffer.append( " (" ).append( getWCellPaddingDefaultBottom() )
+                .append( " )\n" );
+
+        buffer.append( "    .wCellPaddingDefaultRight = " );
+        buffer.append( " (" ).append( getWCellPaddingDefaultRight() )
+                .append( " )\n" );
+
+        buffer.append( "    .ftsCellPaddingDefaultTop = " );
+        buffer.append( " (" ).append( getFtsCellPaddingDefaultTop() )
+                .append( " )\n" );
+
+        buffer.append( "    .ftsCellPaddingDefaultLeft = " );
+        buffer.append( " (" ).append( getFtsCellPaddingDefaultLeft() )
+                .append( " )\n" );
+
+        buffer.append( "    .ftsCellPaddingDefaultBottom = " );
+        buffer.append( " (" ).append( getFtsCellPaddingDefaultBottom() )
+                .append( " )\n" );
+
+        buffer.append( "    .ftsCellPaddingDefaultRight = " );
+        buffer.append( " (" ).append( getFtsCellPaddingDefaultRight() )
+                .append( " )\n" );
+
+        buffer.append( "    .wCellSpacingDefaultTop = " );
+        buffer.append( " (" ).append( getWCellSpacingDefaultTop() )
+                .append( " )\n" );
+
+        buffer.append( "    .wCellSpacingDefaultLeft = " );
+        buffer.append( " (" ).append( getWCellSpacingDefaultLeft() )
+                .append( " )\n" );
+
+        buffer.append( "    .wCellSpacingDefaultBottom = " );
+        buffer.append( " (" ).append( getWCellSpacingDefaultBottom() )
+                .append( " )\n" );
+
+        buffer.append( "    .wCellSpacingDefaultRight = " );
+        buffer.append( " (" ).append( getWCellSpacingDefaultRight() )
+                .append( " )\n" );
+
+        buffer.append( "    .ftsCellSpacingDefaultTop = " );
+        buffer.append( " (" ).append( getFtsCellSpacingDefaultTop() )
+                .append( " )\n" );
+
+        buffer.append( "    .ftsCellSpacingDefaultLeft = " );
+        buffer.append( " (" ).append( getFtsCellSpacingDefaultLeft() )
+                .append( " )\n" );
+
+        buffer.append( "    .ftsCellSpacingDefaultBottom = " );
+        buffer.append( " (" ).append( getFtsCellSpacingDefaultBottom() )
+                .append( " )\n" );
+
+        buffer.append( "    .ftsCellSpacingDefaultRight = " );
+        buffer.append( " (" ).append( getFtsCellSpacingDefaultRight() )
+                .append( " )\n" );
+
+        buffer.append( "    .wCellPaddingOuterTop = " );
+        buffer.append( " (" ).append( getWCellPaddingOuterTop() )
+                .append( " )\n" );
+
+        buffer.append( "    .wCellPaddingOuterLeft = " );
+        buffer.append( " (" ).append( getWCellPaddingOuterLeft() )
+                .append( " )\n" );
+
+        buffer.append( "    .wCellPaddingOuterBottom = " );
+        buffer.append( " (" ).append( getWCellPaddingOuterBottom() )
+                .append( " )\n" );
+
+        buffer.append( "    .wCellPaddingOuterRight = " );
+        buffer.append( " (" ).append( getWCellPaddingOuterRight() )
+                .append( " )\n" );
+
+        buffer.append( "    .ftsCellPaddingOuterTop = " );
+        buffer.append( " (" ).append( getFtsCellPaddingOuterTop() )
+                .append( " )\n" );
+
+        buffer.append( "    .ftsCellPaddingOuterLeft = " );
+        buffer.append( " (" ).append( getFtsCellPaddingOuterLeft() )
+                .append( " )\n" );
+
+        buffer.append( "    .ftsCellPaddingOuterBottom = " );
+        buffer.append( " (" ).append( getFtsCellPaddingOuterBottom() )
+                .append( " )\n" );
+
+        buffer.append( "    .ftsCellPaddingOuterRight = " );
+        buffer.append( " (" ).append( getFtsCellPaddingOuterRight() )
+                .append( " )\n" );
+
+        buffer.append( "    .wCellSpacingOuterTop = " );
+        buffer.append( " (" ).append( getWCellSpacingOuterTop() )
+                .append( " )\n" );
+
+        buffer.append( "    .wCellSpacingOuterLeft = " );
+        buffer.append( " (" ).append( getWCellSpacingOuterLeft() )
+                .append( " )\n" );
+
+        buffer.append( "    .wCellSpacingOuterBottom = " );
+        buffer.append( " (" ).append( getWCellSpacingOuterBottom() )
+                .append( " )\n" );
+
+        buffer.append( "    .wCellSpacingOuterRight = " );
+        buffer.append( " (" ).append( getWCellSpacingOuterRight() )
+                .append( " )\n" );
+
+        buffer.append( "    .ftsCellSpacingOuterTop = " );
+        buffer.append( " (" ).append( getFtsCellSpacingOuterTop() )
+                .append( " )\n" );
+
+        buffer.append( "    .ftsCellSpacingOuterLeft = " );
+        buffer.append( " (" ).append( getFtsCellSpacingOuterLeft() )
+                .append( " )\n" );
+
+        buffer.append( "    .ftsCellSpacingOuterBottom = " );
+        buffer.append( " (" ).append( getFtsCellSpacingOuterBottom() )
+                .append( " )\n" );
+
+        buffer.append( "    .ftsCellSpacingOuterRight = " );
+        buffer.append( " (" ).append( getFtsCellSpacingOuterRight() )
+                .append( " )\n" );
+
+        buffer.append( "    .rgtc                 = " );
+        buffer.append( " (" ).append( getRgtc() ).append( " )\n" );
+
+        buffer.append( "    .rgshd                = " );
+        buffer.append( " (" ).append( getRgshd() ).append( " )\n" );
+
+        buffer.append( "    .fPropRMark           = " );
+        buffer.append( " (" ).append( getFPropRMark() ).append( " )\n" );
+
+        buffer.append( "    .fHasOldProps         = " );
+        buffer.append( " (" ).append( getFHasOldProps() ).append( " )\n" );
+
+        buffer.append( "    .cHorzBands           = " );
+        buffer.append( " (" ).append( getCHorzBands() ).append( " )\n" );
+
+        buffer.append( "    .cVertBands           = " );
+        buffer.append( " (" ).append( getCVertBands() ).append( " )\n" );
+
+        buffer.append( "    .rgbrcInsideDefault_0 = " );
+        buffer.append( " (" ).append( getRgbrcInsideDefault_0() )
+                .append( " )\n" );
+
+        buffer.append( "    .rgbrcInsideDefault_1 = " );
+        buffer.append( " (" ).append( getRgbrcInsideDefault_1() )
+                .append( " )\n" );
+
+        buffer.append( "[/TAP]\n" );
+        return buffer.toString();
+    }
+
     /**
      * Size of record (exluding 4 byte header)
      */
     public int getSize()
     {
-        return 4 +  + 2 + 4 + 4 + 0 + 0 + 4 + 2 + 130 + 0 + 0 + 4 + 4 + 4 + 4 + 4 + 4;
+        return 4 + +2 + 2 + 4 + 4 + 0 + 0 + 0 + 4 + 2 + 2 + 2 + 2 + 4 + 4 + 4
+                + 4 + 4 + 4 + 4 + 1 + 1 + 1 + 1 + 2 + 2 + 2 + 4 + 4 + 4 + 4 + 2
+                + 2 + 130 + 130 + 10 + 4 + 4 + 4 + 4 + 4 + 4 + 2 + 2 + 2 + 2
+                + 1 + 1 + 1 + 1 + 2 + 2 + 2 + 2 + 1 + 1 + 1 + 1 + 2 + 2 + 2 + 2
+                + 1 + 1 + 1 + 1 + 2 + 2 + 2 + 2 + 1 + 1 + 1 + 1 + 0 + 0 + 1 + 1
+                + 1 + 1 + 8 + 8;
     }
 
+    /**
+     * Get the istd field for the TAP record.
+     */
+    public short getIstd()
+    {
+        return field_1_istd;
+    }
 
+    /**
+     * Set the istd field for the TAP record.
+     */
+    public void setIstd( short field_1_istd )
+    {
+        this.field_1_istd = field_1_istd;
+    }
 
     /**
      * Get the jc field for the TAP record.
      */
-    public int getJc()
+    public short getJc()
     {
-        return field_1_jc;
+        return field_2_jc;
     }
 
     /**
      * Set the jc field for the TAP record.
      */
-    public void setJc(int field_1_jc)
+    public void setJc( short field_2_jc )
     {
-        this.field_1_jc = field_1_jc;
+        this.field_2_jc = field_2_jc;
     }
 
     /**
@@ -86,15 +540,15 @@ public abstract class TAPAbstractType implements HDFType {
      */
     public int getDxaGapHalf()
     {
-        return field_2_dxaGapHalf;
+        return field_3_dxaGapHalf;
     }
 
     /**
      * Set the dxaGapHalf field for the TAP record.
      */
-    public void setDxaGapHalf(int field_2_dxaGapHalf)
+    public void setDxaGapHalf( int field_3_dxaGapHalf )
     {
-        this.field_2_dxaGapHalf = field_2_dxaGapHalf;
+        this.field_3_dxaGapHalf = field_3_dxaGapHalf;
     }
 
     /**
@@ -102,15 +556,15 @@ public abstract class TAPAbstractType implements HDFType {
      */
     public int getDyaRowHeight()
     {
-        return field_3_dyaRowHeight;
+        return field_4_dyaRowHeight;
     }
 
     /**
      * Set the dyaRowHeight field for the TAP record.
      */
-    public void setDyaRowHeight(int field_3_dyaRowHeight)
+    public void setDyaRowHeight( int field_4_dyaRowHeight )
     {
-        this.field_3_dyaRowHeight = field_3_dyaRowHeight;
+        this.field_4_dyaRowHeight = field_4_dyaRowHeight;
     }
 
     /**
@@ -118,15 +572,31 @@ public abstract class TAPAbstractType implements HDFType {
      */
     public boolean getFCantSplit()
     {
-        return field_4_fCantSplit;
+        return field_5_fCantSplit;
     }
 
     /**
      * Set the fCantSplit field for the TAP record.
      */
-    public void setFCantSplit(boolean field_4_fCantSplit)
+    public void setFCantSplit( boolean field_5_fCantSplit )
     {
-        this.field_4_fCantSplit = field_4_fCantSplit;
+        this.field_5_fCantSplit = field_5_fCantSplit;
+    }
+
+    /**
+     * Get the fCantSplit90 field for the TAP record.
+     */
+    public boolean getFCantSplit90()
+    {
+        return field_6_fCantSplit90;
+    }
+
+    /**
+     * Set the fCantSplit90 field for the TAP record.
+     */
+    public void setFCantSplit90( boolean field_6_fCantSplit90 )
+    {
+        this.field_6_fCantSplit90 = field_6_fCantSplit90;
     }
 
     /**
@@ -134,31 +604,303 @@ public abstract class TAPAbstractType implements HDFType {
      */
     public boolean getFTableHeader()
     {
-        return field_5_fTableHeader;
+        return field_7_fTableHeader;
     }
 
     /**
      * Set the fTableHeader field for the TAP record.
      */
-    public void setFTableHeader(boolean field_5_fTableHeader)
+    public void setFTableHeader( boolean field_7_fTableHeader )
     {
-        this.field_5_fTableHeader = field_5_fTableHeader;
+        this.field_7_fTableHeader = field_7_fTableHeader;
     }
 
     /**
      * Get the tlp field for the TAP record.
      */
-    public int getTlp()
+    public TableAutoformatLookSpecifier getTlp()
     {
-        return field_6_tlp;
+        return field_8_tlp;
     }
 
     /**
      * Set the tlp field for the TAP record.
      */
-    public void setTlp(int field_6_tlp)
+    public void setTlp( TableAutoformatLookSpecifier field_8_tlp )
+    {
+        this.field_8_tlp = field_8_tlp;
+    }
+
+    /**
+     * Get the wWidth field for the TAP record.
+     */
+    public short getWWidth()
+    {
+        return field_9_wWidth;
+    }
+
+    /**
+     * Set the wWidth field for the TAP record.
+     */
+    public void setWWidth( short field_9_wWidth )
     {
-        this.field_6_tlp = field_6_tlp;
+        this.field_9_wWidth = field_9_wWidth;
+    }
+
+    /**
+     * Get the wWidthIndent field for the TAP record.
+     */
+    public short getWWidthIndent()
+    {
+        return field_10_wWidthIndent;
+    }
+
+    /**
+     * Set the wWidthIndent field for the TAP record.
+     */
+    public void setWWidthIndent( short field_10_wWidthIndent )
+    {
+        this.field_10_wWidthIndent = field_10_wWidthIndent;
+    }
+
+    /**
+     * Get the wWidthBefore field for the TAP record.
+     */
+    public short getWWidthBefore()
+    {
+        return field_11_wWidthBefore;
+    }
+
+    /**
+     * Set the wWidthBefore field for the TAP record.
+     */
+    public void setWWidthBefore( short field_11_wWidthBefore )
+    {
+        this.field_11_wWidthBefore = field_11_wWidthBefore;
+    }
+
+    /**
+     * Get the wWidthAfter field for the TAP record.
+     */
+    public short getWWidthAfter()
+    {
+        return field_12_wWidthAfter;
+    }
+
+    /**
+     * Set the wWidthAfter field for the TAP record.
+     */
+    public void setWWidthAfter( short field_12_wWidthAfter )
+    {
+        this.field_12_wWidthAfter = field_12_wWidthAfter;
+    }
+
+    /**
+     * Get the widthAndFitsFlags field for the TAP record.
+     */
+    public int getWidthAndFitsFlags()
+    {
+        return field_13_widthAndFitsFlags;
+    }
+
+    /**
+     * Set the widthAndFitsFlags field for the TAP record.
+     */
+    public void setWidthAndFitsFlags( int field_13_widthAndFitsFlags )
+    {
+        this.field_13_widthAndFitsFlags = field_13_widthAndFitsFlags;
+    }
+
+    /**
+     * Get the dxaAbs field for the TAP record.
+     */
+    public int getDxaAbs()
+    {
+        return field_14_dxaAbs;
+    }
+
+    /**
+     * Set the dxaAbs field for the TAP record.
+     */
+    public void setDxaAbs( int field_14_dxaAbs )
+    {
+        this.field_14_dxaAbs = field_14_dxaAbs;
+    }
+
+    /**
+     * Get the dyaAbs field for the TAP record.
+     */
+    public int getDyaAbs()
+    {
+        return field_15_dyaAbs;
+    }
+
+    /**
+     * Set the dyaAbs field for the TAP record.
+     */
+    public void setDyaAbs( int field_15_dyaAbs )
+    {
+        this.field_15_dyaAbs = field_15_dyaAbs;
+    }
+
+    /**
+     * Get the dxaFromText field for the TAP record.
+     */
+    public int getDxaFromText()
+    {
+        return field_16_dxaFromText;
+    }
+
+    /**
+     * Set the dxaFromText field for the TAP record.
+     */
+    public void setDxaFromText( int field_16_dxaFromText )
+    {
+        this.field_16_dxaFromText = field_16_dxaFromText;
+    }
+
+    /**
+     * Get the dyaFromText field for the TAP record.
+     */
+    public int getDyaFromText()
+    {
+        return field_17_dyaFromText;
+    }
+
+    /**
+     * Set the dyaFromText field for the TAP record.
+     */
+    public void setDyaFromText( int field_17_dyaFromText )
+    {
+        this.field_17_dyaFromText = field_17_dyaFromText;
+    }
+
+    /**
+     * Get the dxaFromTextRight field for the TAP record.
+     */
+    public int getDxaFromTextRight()
+    {
+        return field_18_dxaFromTextRight;
+    }
+
+    /**
+     * Set the dxaFromTextRight field for the TAP record.
+     */
+    public void setDxaFromTextRight( int field_18_dxaFromTextRight )
+    {
+        this.field_18_dxaFromTextRight = field_18_dxaFromTextRight;
+    }
+
+    /**
+     * Get the dyaFromTextBottom field for the TAP record.
+     */
+    public int getDyaFromTextBottom()
+    {
+        return field_19_dyaFromTextBottom;
+    }
+
+    /**
+     * Set the dyaFromTextBottom field for the TAP record.
+     */
+    public void setDyaFromTextBottom( int field_19_dyaFromTextBottom )
+    {
+        this.field_19_dyaFromTextBottom = field_19_dyaFromTextBottom;
+    }
+
+    /**
+     * Get the fBiDi field for the TAP record.
+     */
+    public byte getFBiDi()
+    {
+        return field_20_fBiDi;
+    }
+
+    /**
+     * Set the fBiDi field for the TAP record.
+     */
+    public void setFBiDi( byte field_20_fBiDi )
+    {
+        this.field_20_fBiDi = field_20_fBiDi;
+    }
+
+    /**
+     * Get the fRTL field for the TAP record.
+     */
+    public byte getFRTL()
+    {
+        return field_21_fRTL;
+    }
+
+    /**
+     * Set the fRTL field for the TAP record.
+     */
+    public void setFRTL( byte field_21_fRTL )
+    {
+        this.field_21_fRTL = field_21_fRTL;
+    }
+
+    /**
+     * Get the fNoAllowOverlap field for the TAP record.
+     */
+    public byte getFNoAllowOverlap()
+    {
+        return field_22_fNoAllowOverlap;
+    }
+
+    /**
+     * Set the fNoAllowOverlap field for the TAP record.
+     */
+    public void setFNoAllowOverlap( byte field_22_fNoAllowOverlap )
+    {
+        this.field_22_fNoAllowOverlap = field_22_fNoAllowOverlap;
+    }
+
+    /**
+     * Get the fSpare field for the TAP record.
+     */
+    public byte getFSpare()
+    {
+        return field_23_fSpare;
+    }
+
+    /**
+     * Set the fSpare field for the TAP record.
+     */
+    public void setFSpare( byte field_23_fSpare )
+    {
+        this.field_23_fSpare = field_23_fSpare;
+    }
+
+    /**
+     * Get the grpfTap field for the TAP record.
+     */
+    public int getGrpfTap()
+    {
+        return field_24_grpfTap;
+    }
+
+    /**
+     * Set the grpfTap field for the TAP record.
+     */
+    public void setGrpfTap( int field_24_grpfTap )
+    {
+        this.field_24_grpfTap = field_24_grpfTap;
+    }
+
+    /**
+     * Get the internalFlags field for the TAP record.
+     */
+    public int getInternalFlags()
+    {
+        return field_25_internalFlags;
+    }
+
+    /**
+     * Set the internalFlags field for the TAP record.
+     */
+    public void setInternalFlags( int field_25_internalFlags )
+    {
+        this.field_25_internalFlags = field_25_internalFlags;
     }
 
     /**
@@ -166,15 +908,111 @@ public abstract class TAPAbstractType implements HDFType {
      */
     public short getItcMac()
     {
-        return field_7_itcMac;
+        return field_26_itcMac;
     }
 
     /**
      * Set the itcMac field for the TAP record.
      */
-    public void setItcMac(short field_7_itcMac)
+    public void setItcMac( short field_26_itcMac )
+    {
+        this.field_26_itcMac = field_26_itcMac;
+    }
+
+    /**
+     * Get the dxaAdjust field for the TAP record.
+     */
+    public int getDxaAdjust()
+    {
+        return field_27_dxaAdjust;
+    }
+
+    /**
+     * Set the dxaAdjust field for the TAP record.
+     */
+    public void setDxaAdjust( int field_27_dxaAdjust )
+    {
+        this.field_27_dxaAdjust = field_27_dxaAdjust;
+    }
+
+    /**
+     * Get the dxaWebView field for the TAP record.
+     */
+    public int getDxaWebView()
+    {
+        return field_28_dxaWebView;
+    }
+
+    /**
+     * Set the dxaWebView field for the TAP record.
+     */
+    public void setDxaWebView( int field_28_dxaWebView )
+    {
+        this.field_28_dxaWebView = field_28_dxaWebView;
+    }
+
+    /**
+     * Get the dxaRTEWrapWidth field for the TAP record.
+     */
+    public int getDxaRTEWrapWidth()
+    {
+        return field_29_dxaRTEWrapWidth;
+    }
+
+    /**
+     * Set the dxaRTEWrapWidth field for the TAP record.
+     */
+    public void setDxaRTEWrapWidth( int field_29_dxaRTEWrapWidth )
+    {
+        this.field_29_dxaRTEWrapWidth = field_29_dxaRTEWrapWidth;
+    }
+
+    /**
+     * Get the dxaColWidthWwd field for the TAP record.
+     */
+    public int getDxaColWidthWwd()
+    {
+        return field_30_dxaColWidthWwd;
+    }
+
+    /**
+     * Set the dxaColWidthWwd field for the TAP record.
+     */
+    public void setDxaColWidthWwd( int field_30_dxaColWidthWwd )
+    {
+        this.field_30_dxaColWidthWwd = field_30_dxaColWidthWwd;
+    }
+
+    /**
+     * Get the pctWwd field for the TAP record.
+     */
+    public short getPctWwd()
+    {
+        return field_31_pctWwd;
+    }
+
+    /**
+     * Set the pctWwd field for the TAP record.
+     */
+    public void setPctWwd( short field_31_pctWwd )
+    {
+        this.field_31_pctWwd = field_31_pctWwd;
+    }
+
+    /**
+     * Get the viewFlags field for the TAP record.
+     */
+    public int getViewFlags()
+    {
+        return field_32_viewFlags;
+    }
+
+    /**
+     * Set the viewFlags field for the TAP record.
+     */
+    public void setViewFlags( int field_32_viewFlags )
     {
-        this.field_7_itcMac = field_7_itcMac;
+        this.field_32_viewFlags = field_32_viewFlags;
     }
 
     /**
@@ -182,47 +1020,47 @@ public abstract class TAPAbstractType implements HDFType {
      */
     public short[] getRgdxaCenter()
     {
-        return field_8_rgdxaCenter;
+        return field_33_rgdxaCenter;
     }
 
     /**
      * Set the rgdxaCenter field for the TAP record.
      */
-    public void setRgdxaCenter(short[] field_8_rgdxaCenter)
+    public void setRgdxaCenter( short[] field_33_rgdxaCenter )
     {
-        this.field_8_rgdxaCenter = field_8_rgdxaCenter;
+        this.field_33_rgdxaCenter = field_33_rgdxaCenter;
     }
 
     /**
-     * Get the rgtc field for the TAP record.
+     * Get the rgdxaCenterPrint field for the TAP record.
      */
-    public TableCellDescriptor[] getRgtc()
+    public short[] getRgdxaCenterPrint()
     {
-        return field_9_rgtc;
+        return field_34_rgdxaCenterPrint;
     }
 
     /**
-     * Set the rgtc field for the TAP record.
+     * Set the rgdxaCenterPrint field for the TAP record.
      */
-    public void setRgtc(TableCellDescriptor[] field_9_rgtc)
+    public void setRgdxaCenterPrint( short[] field_34_rgdxaCenterPrint )
     {
-        this.field_9_rgtc = field_9_rgtc;
+        this.field_34_rgdxaCenterPrint = field_34_rgdxaCenterPrint;
     }
 
     /**
-     * Get the rgshd field for the TAP record.
+     * Get the shdTable field for the TAP record.
      */
-    public ShadingDescriptor[] getRgshd()
+    public ShadingDescriptor getShdTable()
     {
-        return field_10_rgshd;
+        return field_35_shdTable;
     }
 
     /**
-     * Set the rgshd field for the TAP record.
+     * Set the shdTable field for the TAP record.
      */
-    public void setRgshd(ShadingDescriptor[] field_10_rgshd)
+    public void setShdTable( ShadingDescriptor field_35_shdTable )
     {
-        this.field_10_rgshd = field_10_rgshd;
+        this.field_35_shdTable = field_35_shdTable;
     }
 
     /**
@@ -230,15 +1068,15 @@ public abstract class TAPAbstractType implements HDFType {
      */
     public BorderCode getBrcBottom()
     {
-        return field_11_brcBottom;
+        return field_36_brcBottom;
     }
 
     /**
      * Set the brcBottom field for the TAP record.
      */
-    public void setBrcBottom(BorderCode field_11_brcBottom)
+    public void setBrcBottom( BorderCode field_36_brcBottom )
     {
-        this.field_11_brcBottom = field_11_brcBottom;
+        this.field_36_brcBottom = field_36_brcBottom;
     }
 
     /**
@@ -246,15 +1084,15 @@ public abstract class TAPAbstractType implements HDFType {
      */
     public BorderCode getBrcTop()
     {
-        return field_12_brcTop;
+        return field_37_brcTop;
     }
 
     /**
      * Set the brcTop field for the TAP record.
      */
-    public void setBrcTop(BorderCode field_12_brcTop)
+    public void setBrcTop( BorderCode field_37_brcTop )
     {
-        this.field_12_brcTop = field_12_brcTop;
+        this.field_37_brcTop = field_37_brcTop;
     }
 
     /**
@@ -262,15 +1100,15 @@ public abstract class TAPAbstractType implements HDFType {
      */
     public BorderCode getBrcLeft()
     {
-        return field_13_brcLeft;
+        return field_38_brcLeft;
     }
 
     /**
      * Set the brcLeft field for the TAP record.
      */
-    public void setBrcLeft(BorderCode field_13_brcLeft)
+    public void setBrcLeft( BorderCode field_38_brcLeft )
     {
-        this.field_13_brcLeft = field_13_brcLeft;
+        this.field_38_brcLeft = field_38_brcLeft;
     }
 
     /**
@@ -278,15 +1116,15 @@ public abstract class TAPAbstractType implements HDFType {
      */
     public BorderCode getBrcRight()
     {
-        return field_14_brcRight;
+        return field_39_brcRight;
     }
 
     /**
      * Set the brcRight field for the TAP record.
      */
-    public void setBrcRight(BorderCode field_14_brcRight)
+    public void setBrcRight( BorderCode field_39_brcRight )
     {
-        this.field_14_brcRight = field_14_brcRight;
+        this.field_39_brcRight = field_39_brcRight;
     }
 
     /**
@@ -294,15 +1132,15 @@ public abstract class TAPAbstractType implements HDFType {
      */
     public BorderCode getBrcVertical()
     {
-        return field_15_brcVertical;
+        return field_40_brcVertical;
     }
 
     /**
      * Set the brcVertical field for the TAP record.
      */
-    public void setBrcVertical(BorderCode field_15_brcVertical)
+    public void setBrcVertical( BorderCode field_40_brcVertical )
     {
-        this.field_15_brcVertical = field_15_brcVertical;
+        this.field_40_brcVertical = field_40_brcVertical;
     }
 
     /**
@@ -310,20 +1148,1239 @@ public abstract class TAPAbstractType implements HDFType {
      */
     public BorderCode getBrcHorizontal()
     {
-        return field_16_brcHorizontal;
+        return field_41_brcHorizontal;
     }
 
     /**
      * Set the brcHorizontal field for the TAP record.
      */
-    public void setBrcHorizontal(BorderCode field_16_brcHorizontal)
+    public void setBrcHorizontal( BorderCode field_41_brcHorizontal )
+    {
+        this.field_41_brcHorizontal = field_41_brcHorizontal;
+    }
+
+    /**
+     * Get the wCellPaddingDefaultTop field for the TAP record.
+     */
+    public short getWCellPaddingDefaultTop()
+    {
+        return field_42_wCellPaddingDefaultTop;
+    }
+
+    /**
+     * Set the wCellPaddingDefaultTop field for the TAP record.
+     */
+    public void setWCellPaddingDefaultTop( short field_42_wCellPaddingDefaultTop )
+    {
+        this.field_42_wCellPaddingDefaultTop = field_42_wCellPaddingDefaultTop;
+    }
+
+    /**
+     * Get the wCellPaddingDefaultLeft field for the TAP record.
+     */
+    public short getWCellPaddingDefaultLeft()
+    {
+        return field_43_wCellPaddingDefaultLeft;
+    }
+
+    /**
+     * Set the wCellPaddingDefaultLeft field for the TAP record.
+     */
+    public void setWCellPaddingDefaultLeft(
+            short field_43_wCellPaddingDefaultLeft )
+    {
+        this.field_43_wCellPaddingDefaultLeft = field_43_wCellPaddingDefaultLeft;
+    }
+
+    /**
+     * Get the wCellPaddingDefaultBottom field for the TAP record.
+     */
+    public short getWCellPaddingDefaultBottom()
+    {
+        return field_44_wCellPaddingDefaultBottom;
+    }
+
+    /**
+     * Set the wCellPaddingDefaultBottom field for the TAP record.
+     */
+    public void setWCellPaddingDefaultBottom(
+            short field_44_wCellPaddingDefaultBottom )
+    {
+        this.field_44_wCellPaddingDefaultBottom = field_44_wCellPaddingDefaultBottom;
+    }
+
+    /**
+     * Get the wCellPaddingDefaultRight field for the TAP record.
+     */
+    public short getWCellPaddingDefaultRight()
+    {
+        return field_45_wCellPaddingDefaultRight;
+    }
+
+    /**
+     * Set the wCellPaddingDefaultRight field for the TAP record.
+     */
+    public void setWCellPaddingDefaultRight(
+            short field_45_wCellPaddingDefaultRight )
+    {
+        this.field_45_wCellPaddingDefaultRight = field_45_wCellPaddingDefaultRight;
+    }
+
+    /**
+     * Get the ftsCellPaddingDefaultTop field for the TAP record.
+     */
+    public byte getFtsCellPaddingDefaultTop()
+    {
+        return field_46_ftsCellPaddingDefaultTop;
+    }
+
+    /**
+     * Set the ftsCellPaddingDefaultTop field for the TAP record.
+     */
+    public void setFtsCellPaddingDefaultTop(
+            byte field_46_ftsCellPaddingDefaultTop )
+    {
+        this.field_46_ftsCellPaddingDefaultTop = field_46_ftsCellPaddingDefaultTop;
+    }
+
+    /**
+     * Get the ftsCellPaddingDefaultLeft field for the TAP record.
+     */
+    public byte getFtsCellPaddingDefaultLeft()
+    {
+        return field_47_ftsCellPaddingDefaultLeft;
+    }
+
+    /**
+     * Set the ftsCellPaddingDefaultLeft field for the TAP record.
+     */
+    public void setFtsCellPaddingDefaultLeft(
+            byte field_47_ftsCellPaddingDefaultLeft )
+    {
+        this.field_47_ftsCellPaddingDefaultLeft = field_47_ftsCellPaddingDefaultLeft;
+    }
+
+    /**
+     * Get the ftsCellPaddingDefaultBottom field for the TAP record.
+     */
+    public byte getFtsCellPaddingDefaultBottom()
+    {
+        return field_48_ftsCellPaddingDefaultBottom;
+    }
+
+    /**
+     * Set the ftsCellPaddingDefaultBottom field for the TAP record.
+     */
+    public void setFtsCellPaddingDefaultBottom(
+            byte field_48_ftsCellPaddingDefaultBottom )
+    {
+        this.field_48_ftsCellPaddingDefaultBottom = field_48_ftsCellPaddingDefaultBottom;
+    }
+
+    /**
+     * Get the ftsCellPaddingDefaultRight field for the TAP record.
+     */
+    public byte getFtsCellPaddingDefaultRight()
+    {
+        return field_49_ftsCellPaddingDefaultRight;
+    }
+
+    /**
+     * Set the ftsCellPaddingDefaultRight field for the TAP record.
+     */
+    public void setFtsCellPaddingDefaultRight(
+            byte field_49_ftsCellPaddingDefaultRight )
+    {
+        this.field_49_ftsCellPaddingDefaultRight = field_49_ftsCellPaddingDefaultRight;
+    }
+
+    /**
+     * Get the wCellSpacingDefaultTop field for the TAP record.
+     */
+    public short getWCellSpacingDefaultTop()
+    {
+        return field_50_wCellSpacingDefaultTop;
+    }
+
+    /**
+     * Set the wCellSpacingDefaultTop field for the TAP record.
+     */
+    public void setWCellSpacingDefaultTop( short field_50_wCellSpacingDefaultTop )
+    {
+        this.field_50_wCellSpacingDefaultTop = field_50_wCellSpacingDefaultTop;
+    }
+
+    /**
+     * Get the wCellSpacingDefaultLeft field for the TAP record.
+     */
+    public short getWCellSpacingDefaultLeft()
+    {
+        return field_51_wCellSpacingDefaultLeft;
+    }
+
+    /**
+     * Set the wCellSpacingDefaultLeft field for the TAP record.
+     */
+    public void setWCellSpacingDefaultLeft(
+            short field_51_wCellSpacingDefaultLeft )
+    {
+        this.field_51_wCellSpacingDefaultLeft = field_51_wCellSpacingDefaultLeft;
+    }
+
+    /**
+     * Get the wCellSpacingDefaultBottom field for the TAP record.
+     */
+    public short getWCellSpacingDefaultBottom()
+    {
+        return field_52_wCellSpacingDefaultBottom;
+    }
+
+    /**
+     * Set the wCellSpacingDefaultBottom field for the TAP record.
+     */
+    public void setWCellSpacingDefaultBottom(
+            short field_52_wCellSpacingDefaultBottom )
+    {
+        this.field_52_wCellSpacingDefaultBottom = field_52_wCellSpacingDefaultBottom;
+    }
+
+    /**
+     * Get the wCellSpacingDefaultRight field for the TAP record.
+     */
+    public short getWCellSpacingDefaultRight()
+    {
+        return field_53_wCellSpacingDefaultRight;
+    }
+
+    /**
+     * Set the wCellSpacingDefaultRight field for the TAP record.
+     */
+    public void setWCellSpacingDefaultRight(
+            short field_53_wCellSpacingDefaultRight )
+    {
+        this.field_53_wCellSpacingDefaultRight = field_53_wCellSpacingDefaultRight;
+    }
+
+    /**
+     * Get the ftsCellSpacingDefaultTop field for the TAP record.
+     */
+    public byte getFtsCellSpacingDefaultTop()
+    {
+        return field_54_ftsCellSpacingDefaultTop;
+    }
+
+    /**
+     * Set the ftsCellSpacingDefaultTop field for the TAP record.
+     */
+    public void setFtsCellSpacingDefaultTop(
+            byte field_54_ftsCellSpacingDefaultTop )
+    {
+        this.field_54_ftsCellSpacingDefaultTop = field_54_ftsCellSpacingDefaultTop;
+    }
+
+    /**
+     * Get the ftsCellSpacingDefaultLeft field for the TAP record.
+     */
+    public byte getFtsCellSpacingDefaultLeft()
+    {
+        return field_55_ftsCellSpacingDefaultLeft;
+    }
+
+    /**
+     * Set the ftsCellSpacingDefaultLeft field for the TAP record.
+     */
+    public void setFtsCellSpacingDefaultLeft(
+            byte field_55_ftsCellSpacingDefaultLeft )
+    {
+        this.field_55_ftsCellSpacingDefaultLeft = field_55_ftsCellSpacingDefaultLeft;
+    }
+
+    /**
+     * Get the ftsCellSpacingDefaultBottom field for the TAP record.
+     */
+    public byte getFtsCellSpacingDefaultBottom()
+    {
+        return field_56_ftsCellSpacingDefaultBottom;
+    }
+
+    /**
+     * Set the ftsCellSpacingDefaultBottom field for the TAP record.
+     */
+    public void setFtsCellSpacingDefaultBottom(
+            byte field_56_ftsCellSpacingDefaultBottom )
+    {
+        this.field_56_ftsCellSpacingDefaultBottom = field_56_ftsCellSpacingDefaultBottom;
+    }
+
+    /**
+     * Get the ftsCellSpacingDefaultRight field for the TAP record.
+     */
+    public byte getFtsCellSpacingDefaultRight()
+    {
+        return field_57_ftsCellSpacingDefaultRight;
+    }
+
+    /**
+     * Set the ftsCellSpacingDefaultRight field for the TAP record.
+     */
+    public void setFtsCellSpacingDefaultRight(
+            byte field_57_ftsCellSpacingDefaultRight )
+    {
+        this.field_57_ftsCellSpacingDefaultRight = field_57_ftsCellSpacingDefaultRight;
+    }
+
+    /**
+     * Get the wCellPaddingOuterTop field for the TAP record.
+     */
+    public short getWCellPaddingOuterTop()
+    {
+        return field_58_wCellPaddingOuterTop;
+    }
+
+    /**
+     * Set the wCellPaddingOuterTop field for the TAP record.
+     */
+    public void setWCellPaddingOuterTop( short field_58_wCellPaddingOuterTop )
+    {
+        this.field_58_wCellPaddingOuterTop = field_58_wCellPaddingOuterTop;
+    }
+
+    /**
+     * Get the wCellPaddingOuterLeft field for the TAP record.
+     */
+    public short getWCellPaddingOuterLeft()
+    {
+        return field_59_wCellPaddingOuterLeft;
+    }
+
+    /**
+     * Set the wCellPaddingOuterLeft field for the TAP record.
+     */
+    public void setWCellPaddingOuterLeft( short field_59_wCellPaddingOuterLeft )
     {
-        this.field_16_brcHorizontal = field_16_brcHorizontal;
+        this.field_59_wCellPaddingOuterLeft = field_59_wCellPaddingOuterLeft;
     }
 
+    /**
+     * Get the wCellPaddingOuterBottom field for the TAP record.
+     */
+    public short getWCellPaddingOuterBottom()
+    {
+        return field_60_wCellPaddingOuterBottom;
+    }
+
+    /**
+     * Set the wCellPaddingOuterBottom field for the TAP record.
+     */
+    public void setWCellPaddingOuterBottom(
+            short field_60_wCellPaddingOuterBottom )
+    {
+        this.field_60_wCellPaddingOuterBottom = field_60_wCellPaddingOuterBottom;
+    }
+
+    /**
+     * Get the wCellPaddingOuterRight field for the TAP record.
+     */
+    public short getWCellPaddingOuterRight()
+    {
+        return field_61_wCellPaddingOuterRight;
+    }
+
+    /**
+     * Set the wCellPaddingOuterRight field for the TAP record.
+     */
+    public void setWCellPaddingOuterRight( short field_61_wCellPaddingOuterRight )
+    {
+        this.field_61_wCellPaddingOuterRight = field_61_wCellPaddingOuterRight;
+    }
+
+    /**
+     * Get the ftsCellPaddingOuterTop field for the TAP record.
+     */
+    public byte getFtsCellPaddingOuterTop()
+    {
+        return field_62_ftsCellPaddingOuterTop;
+    }
+
+    /**
+     * Set the ftsCellPaddingOuterTop field for the TAP record.
+     */
+    public void setFtsCellPaddingOuterTop( byte field_62_ftsCellPaddingOuterTop )
+    {
+        this.field_62_ftsCellPaddingOuterTop = field_62_ftsCellPaddingOuterTop;
+    }
+
+    /**
+     * Get the ftsCellPaddingOuterLeft field for the TAP record.
+     */
+    public byte getFtsCellPaddingOuterLeft()
+    {
+        return field_63_ftsCellPaddingOuterLeft;
+    }
 
-}  // END OF CLASS
+    /**
+     * Set the ftsCellPaddingOuterLeft field for the TAP record.
+     */
+    public void setFtsCellPaddingOuterLeft(
+            byte field_63_ftsCellPaddingOuterLeft )
+    {
+        this.field_63_ftsCellPaddingOuterLeft = field_63_ftsCellPaddingOuterLeft;
+    }
 
+    /**
+     * Get the ftsCellPaddingOuterBottom field for the TAP record.
+     */
+    public byte getFtsCellPaddingOuterBottom()
+    {
+        return field_64_ftsCellPaddingOuterBottom;
+    }
 
+    /**
+     * Set the ftsCellPaddingOuterBottom field for the TAP record.
+     */
+    public void setFtsCellPaddingOuterBottom(
+            byte field_64_ftsCellPaddingOuterBottom )
+    {
+        this.field_64_ftsCellPaddingOuterBottom = field_64_ftsCellPaddingOuterBottom;
+    }
+
+    /**
+     * Get the ftsCellPaddingOuterRight field for the TAP record.
+     */
+    public byte getFtsCellPaddingOuterRight()
+    {
+        return field_65_ftsCellPaddingOuterRight;
+    }
+
+    /**
+     * Set the ftsCellPaddingOuterRight field for the TAP record.
+     */
+    public void setFtsCellPaddingOuterRight(
+            byte field_65_ftsCellPaddingOuterRight )
+    {
+        this.field_65_ftsCellPaddingOuterRight = field_65_ftsCellPaddingOuterRight;
+    }
+
+    /**
+     * Get the wCellSpacingOuterTop field for the TAP record.
+     */
+    public short getWCellSpacingOuterTop()
+    {
+        return field_66_wCellSpacingOuterTop;
+    }
+
+    /**
+     * Set the wCellSpacingOuterTop field for the TAP record.
+     */
+    public void setWCellSpacingOuterTop( short field_66_wCellSpacingOuterTop )
+    {
+        this.field_66_wCellSpacingOuterTop = field_66_wCellSpacingOuterTop;
+    }
+
+    /**
+     * Get the wCellSpacingOuterLeft field for the TAP record.
+     */
+    public short getWCellSpacingOuterLeft()
+    {
+        return field_67_wCellSpacingOuterLeft;
+    }
+
+    /**
+     * Set the wCellSpacingOuterLeft field for the TAP record.
+     */
+    public void setWCellSpacingOuterLeft( short field_67_wCellSpacingOuterLeft )
+    {
+        this.field_67_wCellSpacingOuterLeft = field_67_wCellSpacingOuterLeft;
+    }
+
+    /**
+     * Get the wCellSpacingOuterBottom field for the TAP record.
+     */
+    public short getWCellSpacingOuterBottom()
+    {
+        return field_68_wCellSpacingOuterBottom;
+    }
+
+    /**
+     * Set the wCellSpacingOuterBottom field for the TAP record.
+     */
+    public void setWCellSpacingOuterBottom(
+            short field_68_wCellSpacingOuterBottom )
+    {
+        this.field_68_wCellSpacingOuterBottom = field_68_wCellSpacingOuterBottom;
+    }
+
+    /**
+     * Get the wCellSpacingOuterRight field for the TAP record.
+     */
+    public short getWCellSpacingOuterRight()
+    {
+        return field_69_wCellSpacingOuterRight;
+    }
+
+    /**
+     * Set the wCellSpacingOuterRight field for the TAP record.
+     */
+    public void setWCellSpacingOuterRight( short field_69_wCellSpacingOuterRight )
+    {
+        this.field_69_wCellSpacingOuterRight = field_69_wCellSpacingOuterRight;
+    }
+
+    /**
+     * Get the ftsCellSpacingOuterTop field for the TAP record.
+     */
+    public byte getFtsCellSpacingOuterTop()
+    {
+        return field_70_ftsCellSpacingOuterTop;
+    }
+
+    /**
+     * Set the ftsCellSpacingOuterTop field for the TAP record.
+     */
+    public void setFtsCellSpacingOuterTop( byte field_70_ftsCellSpacingOuterTop )
+    {
+        this.field_70_ftsCellSpacingOuterTop = field_70_ftsCellSpacingOuterTop;
+    }
+
+    /**
+     * Get the ftsCellSpacingOuterLeft field for the TAP record.
+     */
+    public byte getFtsCellSpacingOuterLeft()
+    {
+        return field_71_ftsCellSpacingOuterLeft;
+    }
+
+    /**
+     * Set the ftsCellSpacingOuterLeft field for the TAP record.
+     */
+    public void setFtsCellSpacingOuterLeft(
+            byte field_71_ftsCellSpacingOuterLeft )
+    {
+        this.field_71_ftsCellSpacingOuterLeft = field_71_ftsCellSpacingOuterLeft;
+    }
+
+    /**
+     * Get the ftsCellSpacingOuterBottom field for the TAP record.
+     */
+    public byte getFtsCellSpacingOuterBottom()
+    {
+        return field_72_ftsCellSpacingOuterBottom;
+    }
+
+    /**
+     * Set the ftsCellSpacingOuterBottom field for the TAP record.
+     */
+    public void setFtsCellSpacingOuterBottom(
+            byte field_72_ftsCellSpacingOuterBottom )
+    {
+        this.field_72_ftsCellSpacingOuterBottom = field_72_ftsCellSpacingOuterBottom;
+    }
+
+    /**
+     * Get the ftsCellSpacingOuterRight field for the TAP record.
+     */
+    public byte getFtsCellSpacingOuterRight()
+    {
+        return field_73_ftsCellSpacingOuterRight;
+    }
 
+    /**
+     * Set the ftsCellSpacingOuterRight field for the TAP record.
+     */
+    public void setFtsCellSpacingOuterRight(
+            byte field_73_ftsCellSpacingOuterRight )
+    {
+        this.field_73_ftsCellSpacingOuterRight = field_73_ftsCellSpacingOuterRight;
+    }
+
+    /**
+     * Get the rgtc field for the TAP record.
+     */
+    public TableCellDescriptor[] getRgtc()
+    {
+        return field_74_rgtc;
+    }
+
+    /**
+     * Set the rgtc field for the TAP record.
+     */
+    public void setRgtc( TableCellDescriptor[] field_74_rgtc )
+    {
+        this.field_74_rgtc = field_74_rgtc;
+    }
+
+    /**
+     * Get the rgshd field for the TAP record.
+     */
+    public ShadingDescriptor[] getRgshd()
+    {
+        return field_75_rgshd;
+    }
+
+    /**
+     * Set the rgshd field for the TAP record.
+     */
+    public void setRgshd( ShadingDescriptor[] field_75_rgshd )
+    {
+        this.field_75_rgshd = field_75_rgshd;
+    }
+
+    /**
+     * Get the fPropRMark field for the TAP record.
+     */
+    public byte getFPropRMark()
+    {
+        return field_76_fPropRMark;
+    }
+
+    /**
+     * Set the fPropRMark field for the TAP record.
+     */
+    public void setFPropRMark( byte field_76_fPropRMark )
+    {
+        this.field_76_fPropRMark = field_76_fPropRMark;
+    }
+
+    /**
+     * Get the fHasOldProps field for the TAP record.
+     */
+    public byte getFHasOldProps()
+    {
+        return field_77_fHasOldProps;
+    }
+
+    /**
+     * Set the fHasOldProps field for the TAP record.
+     */
+    public void setFHasOldProps( byte field_77_fHasOldProps )
+    {
+        this.field_77_fHasOldProps = field_77_fHasOldProps;
+    }
+
+    /**
+     * Get the cHorzBands field for the TAP record.
+     */
+    public short getCHorzBands()
+    {
+        return field_78_cHorzBands;
+    }
+
+    /**
+     * Set the cHorzBands field for the TAP record.
+     */
+    public void setCHorzBands( short field_78_cHorzBands )
+    {
+        this.field_78_cHorzBands = field_78_cHorzBands;
+    }
+
+    /**
+     * Get the cVertBands field for the TAP record.
+     */
+    public short getCVertBands()
+    {
+        return field_79_cVertBands;
+    }
+
+    /**
+     * Set the cVertBands field for the TAP record.
+     */
+    public void setCVertBands( short field_79_cVertBands )
+    {
+        this.field_79_cVertBands = field_79_cVertBands;
+    }
+
+    /**
+     * Get the rgbrcInsideDefault_0 field for the TAP record.
+     */
+    public BorderCode getRgbrcInsideDefault_0()
+    {
+        return field_80_rgbrcInsideDefault_0;
+    }
+
+    /**
+     * Set the rgbrcInsideDefault_0 field for the TAP record.
+     */
+    public void setRgbrcInsideDefault_0(
+            BorderCode field_80_rgbrcInsideDefault_0 )
+    {
+        this.field_80_rgbrcInsideDefault_0 = field_80_rgbrcInsideDefault_0;
+    }
+
+    /**
+     * Get the rgbrcInsideDefault_1 field for the TAP record.
+     */
+    public BorderCode getRgbrcInsideDefault_1()
+    {
+        return field_81_rgbrcInsideDefault_1;
+    }
+
+    /**
+     * Set the rgbrcInsideDefault_1 field for the TAP record.
+     */
+    public void setRgbrcInsideDefault_1(
+            BorderCode field_81_rgbrcInsideDefault_1 )
+    {
+        this.field_81_rgbrcInsideDefault_1 = field_81_rgbrcInsideDefault_1;
+    }
+
+    /**
+     * Sets the fAutofit field value. When set to 1, AutoFit this table
+     */
+    public void setFAutofit( boolean value )
+    {
+        field_13_widthAndFitsFlags = fAutofit.setBoolean(
+                field_13_widthAndFitsFlags, value );
+
+    }
+
+    /**
+     * When set to 1, AutoFit this table
+     * 
+     * @return the fAutofit field value.
+     */
+    public boolean isFAutofit()
+    {
+        return fAutofit.isSet( field_13_widthAndFitsFlags );
+
+    }
+
+    /**
+     * Sets the fKeepFollow field value. When set to 1, keep this row with the
+     * following row
+     */
+    public void setFKeepFollow( boolean value )
+    {
+        field_13_widthAndFitsFlags = fKeepFollow.setBoolean(
+                field_13_widthAndFitsFlags, value );
+
+    }
+
+    /**
+     * When set to 1, keep this row with the following row
+     * 
+     * @return the fKeepFollow field value.
+     */
+    public boolean isFKeepFollow()
+    {
+        return fKeepFollow.isSet( field_13_widthAndFitsFlags );
+
+    }
+
+    /**
+     * Sets the ftsWidth field value. Units for wWidth: 0 -- null; 1 -- auto,
+     * ignores wWidth, 2 -- percentage (in 50ths of a percent), 3 -- twips
+     */
+    public void setFtsWidth( byte value )
+    {
+        field_13_widthAndFitsFlags = ftsWidth.setValue(
+                field_13_widthAndFitsFlags, value );
+
+    }
+
+    /**
+     * Units for wWidth: 0 -- null; 1 -- auto, ignores wWidth, 2 -- percentage
+     * (in 50ths of a percent), 3 -- twips
+     * 
+     * @return the ftsWidth field value.
+     */
+    public byte getFtsWidth()
+    {
+        return (byte) ftsWidth.getValue( field_13_widthAndFitsFlags );
+
+    }
+
+    /**
+     * Sets the ftsWidthIndent field value. Units for wWidthIndent: 0 -- null; 1
+     * -- auto, ignores wWidthIndent, 2 -- percentage (in 50ths of a percent), 3
+     * -- twips
+     */
+    public void setFtsWidthIndent( byte value )
+    {
+        field_13_widthAndFitsFlags = ftsWidthIndent.setValue(
+                field_13_widthAndFitsFlags, value );
+
+    }
+
+    /**
+     * Units for wWidthIndent: 0 -- null; 1 -- auto, ignores wWidthIndent, 2 --
+     * percentage (in 50ths of a percent), 3 -- twips
+     * 
+     * @return the ftsWidthIndent field value.
+     */
+    public byte getFtsWidthIndent()
+    {
+        return (byte) ftsWidthIndent.getValue( field_13_widthAndFitsFlags );
+
+    }
+
+    /**
+     * Sets the ftsWidthBefore field value. Units for wWidthBefore: 0 -- null; 1
+     * -- auto, ignores wWidthBefore, 2 -- percentage (in 50ths of a percent), 3
+     * -- twips
+     */
+    public void setFtsWidthBefore( byte value )
+    {
+        field_13_widthAndFitsFlags = ftsWidthBefore.setValue(
+                field_13_widthAndFitsFlags, value );
+
+    }
+
+    /**
+     * Units for wWidthBefore: 0 -- null; 1 -- auto, ignores wWidthBefore, 2 --
+     * percentage (in 50ths of a percent), 3 -- twips
+     * 
+     * @return the ftsWidthBefore field value.
+     */
+    public byte getFtsWidthBefore()
+    {
+        return (byte) ftsWidthBefore.getValue( field_13_widthAndFitsFlags );
+
+    }
+
+    /**
+     * Sets the ftsWidthAfter field value. Units for wWidthAfter: 0 -- null; 1
+     * -- auto, ignores wWidthAfter, 2 -- percentage (in 50ths of a percent), 3
+     * -- twips
+     */
+    public void setFtsWidthAfter( byte value )
+    {
+        field_13_widthAndFitsFlags = ftsWidthAfter.setValue(
+                field_13_widthAndFitsFlags, value );
+
+    }
+
+    /**
+     * Units for wWidthAfter: 0 -- null; 1 -- auto, ignores wWidthAfter, 2 --
+     * percentage (in 50ths of a percent), 3 -- twips
+     * 
+     * @return the ftsWidthAfter field value.
+     */
+    public byte getFtsWidthAfter()
+    {
+        return (byte) ftsWidthAfter.getValue( field_13_widthAndFitsFlags );
+
+    }
+
+    /**
+     * Sets the fNeverBeenAutofit field value. When 1, table has never been
+     * autofit
+     */
+    public void setFNeverBeenAutofit( boolean value )
+    {
+        field_13_widthAndFitsFlags = fNeverBeenAutofit.setBoolean(
+                field_13_widthAndFitsFlags, value );
+
+    }
+
+    /**
+     * When 1, table has never been autofit
+     * 
+     * @return the fNeverBeenAutofit field value.
+     */
+    public boolean isFNeverBeenAutofit()
+    {
+        return fNeverBeenAutofit.isSet( field_13_widthAndFitsFlags );
+
+    }
+
+    /**
+     * Sets the fInvalAutofit field value. When 1, TAP is still valid, but
+     * autofit properties aren't
+     */
+    public void setFInvalAutofit( boolean value )
+    {
+        field_13_widthAndFitsFlags = fInvalAutofit.setBoolean(
+                field_13_widthAndFitsFlags, value );
+
+    }
+
+    /**
+     * When 1, TAP is still valid, but autofit properties aren't
+     * 
+     * @return the fInvalAutofit field value.
+     */
+    public boolean isFInvalAutofit()
+    {
+        return fInvalAutofit.isSet( field_13_widthAndFitsFlags );
+
+    }
+
+    /**
+     * Sets the widthAndFitsFlags_empty1 field value. Not used
+     */
+    public void setWidthAndFitsFlags_empty1( byte value )
+    {
+        field_13_widthAndFitsFlags = widthAndFitsFlags_empty1.setValue(
+                field_13_widthAndFitsFlags, value );
+
+    }
+
+    /**
+     * Not used
+     * 
+     * @return the widthAndFitsFlags_empty1 field value.
+     */
+    public byte getWidthAndFitsFlags_empty1()
+    {
+        return (byte) widthAndFitsFlags_empty1
+                .getValue( field_13_widthAndFitsFlags );
+
+    }
+
+    /**
+     * Sets the fVert field value. When 1, positioned in vertical text flow
+     */
+    public void setFVert( boolean value )
+    {
+        field_13_widthAndFitsFlags = fVert.setBoolean(
+                field_13_widthAndFitsFlags, value );
+
+    }
+
+    /**
+     * When 1, positioned in vertical text flow
+     * 
+     * @return the fVert field value.
+     */
+    public boolean isFVert()
+    {
+        return fVert.isSet( field_13_widthAndFitsFlags );
+
+    }
+
+    /**
+     * Sets the pcVert field value. Vertical position code. Specifies coordinate
+     * frame to use when paragraphs are absolutely positioned. 0 -- vertical
+     * position coordinates are relative to margin; 1 -- coordinates are
+     * relative to page; 2 -- coordinates are relative to text. This means:
+     * relative to where the next non-APO text would have been placed if this
+     * APO did not exist.
+     */
+    public void setPcVert( byte value )
+    {
+        field_13_widthAndFitsFlags = pcVert.setValue(
+                field_13_widthAndFitsFlags, value );
+
+    }
+
+    /**
+     * Vertical position code. Specifies coordinate frame to use when paragraphs
+     * are absolutely positioned. 0 -- vertical position coordinates are
+     * relative to margin; 1 -- coordinates are relative to page; 2 --
+     * coordinates are relative to text. This means: relative to where the next
+     * non-APO text would have been placed if this APO did not exist.
+     * 
+     * @return the pcVert field value.
+     */
+    public byte getPcVert()
+    {
+        return (byte) pcVert.getValue( field_13_widthAndFitsFlags );
+
+    }
+
+    /**
+     * Sets the pcHorz field value. Horizontal position code. Specifies
+     * coordinate frame to use when paragraphs are absolutely positioned. 0 --
+     * horizontal position coordinates are relative to column; 1 -- coordinates
+     * are relative to margin; 2 -- coordinates are relative to page
+     */
+    public void setPcHorz( byte value )
+    {
+        field_13_widthAndFitsFlags = pcHorz.setValue(
+                field_13_widthAndFitsFlags, value );
+
+    }
+
+    /**
+     * Horizontal position code. Specifies coordinate frame to use when
+     * paragraphs are absolutely positioned. 0 -- horizontal position
+     * coordinates are relative to column; 1 -- coordinates are relative to
+     * margin; 2 -- coordinates are relative to page
+     * 
+     * @return the pcHorz field value.
+     */
+    public byte getPcHorz()
+    {
+        return (byte) pcHorz.getValue( field_13_widthAndFitsFlags );
+
+    }
+
+    /**
+     * Sets the widthAndFitsFlags_empty2 field value. Not used
+     */
+    public void setWidthAndFitsFlags_empty2( short value )
+    {
+        field_13_widthAndFitsFlags = widthAndFitsFlags_empty2.setValue(
+                field_13_widthAndFitsFlags, value );
+
+    }
+
+    /**
+     * Not used
+     * 
+     * @return the widthAndFitsFlags_empty2 field value.
+     */
+    public short getWidthAndFitsFlags_empty2()
+    {
+        return (short) widthAndFitsFlags_empty2
+                .getValue( field_13_widthAndFitsFlags );
+
+    }
+
+    /**
+     * Sets the fFirstRow field value. Used internally by Word: first row
+     */
+    public void setFFirstRow( boolean value )
+    {
+        field_25_internalFlags = fFirstRow.setBoolean( field_25_internalFlags,
+                value );
+
+    }
+
+    /**
+     * Used internally by Word: first row
+     * 
+     * @return the fFirstRow field value.
+     */
+    public boolean isFFirstRow()
+    {
+        return fFirstRow.isSet( field_25_internalFlags );
+
+    }
+
+    /**
+     * Sets the fLastRow field value. Used internally by Word: last row
+     */
+    public void setFLastRow( boolean value )
+    {
+        field_25_internalFlags = fLastRow.setBoolean( field_25_internalFlags,
+                value );
+
+    }
+
+    /**
+     * Used internally by Word: last row
+     * 
+     * @return the fLastRow field value.
+     */
+    public boolean isFLastRow()
+    {
+        return fLastRow.isSet( field_25_internalFlags );
+
+    }
+
+    /**
+     * Sets the fOutline field value. Used internally by Word: row was cached
+     * for outline mode
+     */
+    public void setFOutline( boolean value )
+    {
+        field_25_internalFlags = fOutline.setBoolean( field_25_internalFlags,
+                value );
+
+    }
+
+    /**
+     * Used internally by Word: row was cached for outline mode
+     * 
+     * @return the fOutline field value.
+     */
+    public boolean isFOutline()
+    {
+        return fOutline.isSet( field_25_internalFlags );
+
+    }
+
+    /**
+     * Sets the fOrigWordTableRules field value. Used internally by Word: table
+     * combining like Word 5.x for the Macintosh and WinWord 1.x
+     */
+    public void setFOrigWordTableRules( boolean value )
+    {
+        field_25_internalFlags = fOrigWordTableRules.setBoolean(
+                field_25_internalFlags, value );
+
+    }
+
+    /**
+     * Used internally by Word: table combining like Word 5.x for the Macintosh
+     * and WinWord 1.x
+     * 
+     * @return the fOrigWordTableRules field value.
+     */
+    public boolean isFOrigWordTableRules()
+    {
+        return fOrigWordTableRules.isSet( field_25_internalFlags );
+
+    }
+
+    /**
+     * Sets the fCellSpacing field value. Used internally by Word: When set to 1
+     * cell spacing is allowed
+     */
+    public void setFCellSpacing( boolean value )
+    {
+        field_25_internalFlags = fCellSpacing.setBoolean(
+                field_25_internalFlags, value );
+
+    }
+
+    /**
+     * Used internally by Word: When set to 1 cell spacing is allowed
+     * 
+     * @return the fCellSpacing field value.
+     */
+    public boolean isFCellSpacing()
+    {
+        return fCellSpacing.isSet( field_25_internalFlags );
+
+    }
+
+    /**
+     * Sets the grpfTap_unused field value. Not used
+     */
+    public void setGrpfTap_unused( short value )
+    {
+        field_25_internalFlags = grpfTap_unused.setValue(
+                field_25_internalFlags, value );
+
+    }
+
+    /**
+     * Not used
+     * 
+     * @return the grpfTap_unused field value.
+     */
+    public short getGrpfTap_unused()
+    {
+        return (short) grpfTap_unused.getValue( field_25_internalFlags );
+
+    }
+
+    /**
+     * Sets the fWrapToWwd field value. Used internally by Word: Wrap to window
+     * is on when set to 1
+     */
+    public void setFWrapToWwd( boolean value )
+    {
+        field_32_viewFlags = fWrapToWwd.setBoolean( field_32_viewFlags, value );
+
+    }
+
+    /**
+     * Used internally by Word: Wrap to window is on when set to 1
+     * 
+     * @return the fWrapToWwd field value.
+     */
+    public boolean isFWrapToWwd()
+    {
+        return fWrapToWwd.isSet( field_32_viewFlags );
+
+    }
+
+    /**
+     * Sets the fNotPageView field value. Used internally by Word: when set to 1
+     * we are not in Page View
+     */
+    public void setFNotPageView( boolean value )
+    {
+        field_32_viewFlags = fNotPageView
+                .setBoolean( field_32_viewFlags, value );
+
+    }
+
+    /**
+     * Used internally by Word: when set to 1 we are not in Page View
+     * 
+     * @return the fNotPageView field value.
+     */
+    public boolean isFNotPageView()
+    {
+        return fNotPageView.isSet( field_32_viewFlags );
+
+    }
+
+    /**
+     * Sets the viewFlags_unused1 field value. Not used
+     */
+    public void setViewFlags_unused1( boolean value )
+    {
+        field_32_viewFlags = viewFlags_unused1.setBoolean( field_32_viewFlags,
+                value );
+
+    }
+
+    /**
+     * Not used
+     * 
+     * @return the viewFlags_unused1 field value.
+     */
+    public boolean isViewFlags_unused1()
+    {
+        return viewFlags_unused1.isSet( field_32_viewFlags );
+
+    }
+
+    /**
+     * Sets the fWebView field value. Used internally by Word: Web View is on
+     * when set to 1
+     */
+    public void setFWebView( boolean value )
+    {
+        field_32_viewFlags = fWebView.setBoolean( field_32_viewFlags, value );
+
+    }
+
+    /**
+     * Used internally by Word: Web View is on when set to 1
+     * 
+     * @return the fWebView field value.
+     */
+    public boolean isFWebView()
+    {
+        return fWebView.isSet( field_32_viewFlags );
+
+    }
+
+    /**
+     * Sets the fAdjusted field value. Used internally by Word
+     */
+    public void setFAdjusted( boolean value )
+    {
+        field_32_viewFlags = fAdjusted.setBoolean( field_32_viewFlags, value );
+
+    }
+
+    /**
+     * Used internally by Word
+     * 
+     * @return the fAdjusted field value.
+     */
+    public boolean isFAdjusted()
+    {
+        return fAdjusted.isSet( field_32_viewFlags );
+
+    }
+
+    /**
+     * Sets the viewFlags_unused2 field value. Not used
+     */
+    public void setViewFlags_unused2( short value )
+    {
+        field_32_viewFlags = viewFlags_unused2.setValue( field_32_viewFlags,
+                value );
+
+    }
+
+    /**
+     * Not used
+     * 
+     * @return the viewFlags_unused2 field value.
+     */
+    public short getViewFlags_unused2()
+    {
+        return (short) viewFlags_unused2.getValue( field_32_viewFlags );
+
+    }
 
+} // END OF CLASS
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/TLPAbstractType.java b/src/scratchpad/src/org/apache/poi/hwpf/model/types/TLPAbstractType.java
new file mode 100644
index 0000000000..c99e52ac39
--- /dev/null
+++ b/src/scratchpad/src/org/apache/poi/hwpf/model/types/TLPAbstractType.java
@@ -0,0 +1,291 @@
+/* ====================================================================

+   Licensed to the Apache Software Foundation (ASF) under one or more

+   contributor license agreements.  See the NOTICE file distributed with

+   this work for additional information regarding copyright ownership.

+   The ASF licenses this file to You under the Apache License, Version 2.0

+   (the "License"); you may not use this file except in compliance with

+   the License.  You may obtain a copy of the License at

+

+       http://www.apache.org/licenses/LICENSE-2.0

+

+   Unless required by applicable law or agreed to in writing, software

+   distributed under the License is distributed on an "AS IS" BASIS,

+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+   See the License for the specific language governing permissions and

+   limitations under the License.

+==================================================================== */

+

+package org.apache.poi.hwpf.model.types;

+

+import org.apache.poi.hdf.model.hdftypes.HDFType;

+import org.apache.poi.util.BitField;

+import org.apache.poi.util.LittleEndian;

+

+/**

+ * Table Autoformat Look sPecifier (TLP).

+ * <p>

+ * Class and fields descriptions are quoted from Microsoft Office Word 97-2007

+ * Binary File Format

+ * 

+ * NOTE: This source is automatically generated please do not modify this file.

+ * Either subclass or remove the record in src/records/definitions.

+ * 

+ * @author Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary

+ *         File Format Specification [*.doc]

+ */

+public abstract class TLPAbstractType implements HDFType

+{

+

+    protected short field_1_itl;

+    protected byte field_2_tlp_flags;

+    private static BitField fBorders = new BitField( 0x0001 );

+    private static BitField fShading = new BitField( 0x0002 );

+    private static BitField fFont = new BitField( 0x0004 );

+    private static BitField fColor = new BitField( 0x0008 );

+    private static BitField fBestFit = new BitField( 0x0010 );

+    private static BitField fHdrRows = new BitField( 0x0020 );

+    private static BitField fLastRow = new BitField( 0x0040 );

+

+    public TLPAbstractType()

+    {

+

+    }

+

+    protected void fillFields( byte[] data, int offset )

+    {

+        field_1_itl = LittleEndian.getShort( data, 0x0 + offset );

+        field_2_tlp_flags = data[0x2 + offset];

+    }

+

+    public void serialize( byte[] data, int offset )

+    {

+        LittleEndian.putShort( data, 0x0 + offset, field_1_itl );

+        data[0x2 + offset] = field_2_tlp_flags;

+    }

+

+    public String toString()

+    {

+        StringBuffer buffer = new StringBuffer();

+

+        buffer.append( "[TLP]\n" );

+

+        buffer.append( "    .itl                  = " );

+        buffer.append( " (" ).append( getItl() ).append( " )\n" );

+

+        buffer.append( "    .tlp_flags            = " );

+        buffer.append( " (" ).append( getTlp_flags() ).append( " )\n" );

+        buffer.append( "         .fBorders                 = " )

+                .append( isFBorders() ).append( '\n' );

+        buffer.append( "         .fShading                 = " )

+                .append( isFShading() ).append( '\n' );

+        buffer.append( "         .fFont                    = " )

+                .append( isFFont() ).append( '\n' );

+        buffer.append( "         .fColor                   = " )

+                .append( isFColor() ).append( '\n' );

+        buffer.append( "         .fBestFit                 = " )

+                .append( isFBestFit() ).append( '\n' );

+        buffer.append( "         .fHdrRows                 = " )

+                .append( isFHdrRows() ).append( '\n' );

+        buffer.append( "         .fLastRow                 = " )

+                .append( isFLastRow() ).append( '\n' );

+

+        buffer.append( "[/TLP]\n" );

+        return buffer.toString();

+    }

+

+    /**

+     * Size of record (exluding 4 byte header)

+     */

+    public int getSize()

+    {

+        return 4 + +2 + 1;

+    }

+

+    /**

+     * Get the itl field for the TLP record.

+     */

+    public short getItl()

+    {

+        return field_1_itl;

+    }

+

+    /**

+     * Set the itl field for the TLP record.

+     */

+    public void setItl( short field_1_itl )

+    {

+        this.field_1_itl = field_1_itl;

+    }

+

+    /**

+     * Get the tlp_flags field for the TLP record.

+     */

+    public byte getTlp_flags()

+    {

+        return field_2_tlp_flags;

+    }

+

+    /**

+     * Set the tlp_flags field for the TLP record.

+     */

+    public void setTlp_flags( byte field_2_tlp_flags )

+    {

+        this.field_2_tlp_flags = field_2_tlp_flags;

+    }

+

+    /**

+     * Sets the fBorders field value. When == 1, use the border properties from

+     * the selected table look

+     */

+    public void setFBorders( boolean value )

+    {

+        field_2_tlp_flags = (byte) fBorders.setBoolean( field_2_tlp_flags,

+                value );

+

+    }

+

+    /**

+     * When == 1, use the border properties from the selected table look

+     * 

+     * @return the fBorders field value.

+     */

+    public boolean isFBorders()

+    {

+        return fBorders.isSet( field_2_tlp_flags );

+

+    }

+

+    /**

+     * Sets the fShading field value. When == 1, use the shading properties from

+     * the selected table look

+     */

+    public void setFShading( boolean value )

+    {

+        field_2_tlp_flags = (byte) fShading.setBoolean( field_2_tlp_flags,

+                value );

+

+    }

+

+    /**

+     * When == 1, use the shading properties from the selected table look

+     * 

+     * @return the fShading field value.

+     */

+    public boolean isFShading()

+    {

+        return fShading.isSet( field_2_tlp_flags );

+

+    }

+

+    /**

+     * Sets the fFont field value. When == 1, use the font from the selected

+     * table look

+     */

+    public void setFFont( boolean value )

+    {

+        field_2_tlp_flags = (byte) fFont.setBoolean( field_2_tlp_flags, value );

+

+    }

+

+    /**

+     * When == 1, use the font from the selected table look

+     * 

+     * @return the fFont field value.

+     */

+    public boolean isFFont()

+    {

+        return fFont.isSet( field_2_tlp_flags );

+

+    }

+

+    /**

+     * Sets the fColor field value. When == 1, use the color from the selected

+     * table look

+     */

+    public void setFColor( boolean value )

+    {

+        field_2_tlp_flags = (byte) fColor.setBoolean( field_2_tlp_flags, value );

+

+    }

+

+    /**

+     * When == 1, use the color from the selected table look

+     * 

+     * @return the fColor field value.

+     */

+    public boolean isFColor()

+    {

+        return fColor.isSet( field_2_tlp_flags );

+

+    }

+

+    /**

+     * Sets the fBestFit field value. When == 1, do best fit from the selected

+     * table look

+     */

+    public void setFBestFit( boolean value )

+    {

+        field_2_tlp_flags = (byte) fBestFit.setBoolean( field_2_tlp_flags,

+                value );

+

+    }

+

+    /**

+     * When == 1, do best fit from the selected table look

+     * 

+     * @return the fBestFit field value.

+     */

+    public boolean isFBestFit()

+    {

+        return fBestFit.isSet( field_2_tlp_flags );

+

+    }

+

+    /**

+     * Sets the fHdrRows field value. When == 1, apply properties from the

+     * selected table look to the header rows in the table

+     */

+    public void setFHdrRows( boolean value )

+    {

+        field_2_tlp_flags = (byte) fHdrRows.setBoolean( field_2_tlp_flags,

+                value );

+

+    }

+

+    /**

+     * When == 1, apply properties from the selected table look to the header

+     * rows in the table

+     * 

+     * @return the fHdrRows field value.

+     */

+    public boolean isFHdrRows()

+    {

+        return fHdrRows.isSet( field_2_tlp_flags );

+

+    }

+

+    /**

+     * Sets the fLastRow field value. When == 1, apply properties from the

+     * selected table look to the last row in the table

+     */

+    public void setFLastRow( boolean value )

+    {

+        field_2_tlp_flags = (byte) fLastRow.setBoolean( field_2_tlp_flags,

+                value );

+

+    }

+

+    /**

+     * When == 1, apply properties from the selected table look to the last row

+     * in the table

+     * 

+     * @return the fLastRow field value.

+     */

+    public boolean isFLastRow()

+    {

+        return fLastRow.isSet( field_2_tlp_flags );

+

+    }

+

+} // END OF CLASS

+

diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/TableSprmCompressor.java b/src/scratchpad/src/org/apache/poi/hwpf/sprm/TableSprmCompressor.java
index 65af98fae4..31888f2e28 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/sprm/TableSprmCompressor.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/sprm/TableSprmCompressor.java
@@ -17,14 +17,15 @@
 
 package org.apache.poi.hwpf.sprm;
 
-import org.apache.poi.hwpf.usermodel.TableProperties;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.hwpf.usermodel.TableCellDescriptor;
-import org.apache.poi.hwpf.usermodel.BorderCode;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 
+import org.apache.poi.hwpf.usermodel.BorderCode;
+import org.apache.poi.hwpf.usermodel.TableAutoformatLookSpecifier;
+import org.apache.poi.hwpf.usermodel.TableCellDescriptor;
+import org.apache.poi.hwpf.usermodel.TableProperties;
+import org.apache.poi.util.LittleEndian;
+
 public final class TableSprmCompressor
 {
   public TableSprmCompressor()
@@ -99,10 +100,13 @@ public final class TableSprmCompressor
 //      }
 //      size += SprmUtils.addSpecialSprm((short)0xD609, buf, sprmList);
     }
-    if (newTAP.getTlp() != 0)
-    {
-      size += SprmUtils.addSprm((short)0x740a, newTAP.getTlp(), null, sprmList);
-    }
+
+        if ( newTAP.getTlp() != null )
+        {
+            byte[] buf = new byte[TableAutoformatLookSpecifier.SIZE];
+            newTAP.getTlp().serialize( buf, 0 );
+            size += SprmUtils.addSprm( (short) 0x740a, 0, buf, sprmList );
+        }
 
     return SprmUtils.getGrpprl(sprmList, size);
   }
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableAutoformatLookSpecifier.java b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableAutoformatLookSpecifier.java
new file mode 100644
index 0000000000..affa476693
--- /dev/null
+++ b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableAutoformatLookSpecifier.java
@@ -0,0 +1,26 @@
+package org.apache.poi.hwpf.usermodel;
+
+import org.apache.poi.hwpf.model.types.TLPAbstractType;
+
+public class TableAutoformatLookSpecifier extends TLPAbstractType
+{
+    public static final int SIZE = 4;
+
+    public TableAutoformatLookSpecifier()
+    {
+        super();
+    }
+
+    public TableAutoformatLookSpecifier( byte[] data, int offset )
+    {
+        super();
+        fillFields( data, offset );
+    }
+
+    @Override
+    public TableAutoformatLookSpecifier clone()
+            throws CloneNotSupportedException
+    {
+        return (TableAutoformatLookSpecifier) super.clone();
+    }
+}
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableProperties.java b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableProperties.java
index 9d136f77f1..f18a29328a 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableProperties.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableProperties.java
@@ -19,59 +19,80 @@ package org.apache.poi.hwpf.usermodel;
 
 import org.apache.poi.hwpf.model.types.TAPAbstractType;
 
-public final class TableProperties
-  extends TAPAbstractType
-    implements Cloneable
+public final class TableProperties extends TAPAbstractType implements Cloneable
 {
 
-  public TableProperties()
-  {
-
-  }
-  public TableProperties(int columns)
-  {
-    field_7_itcMac = (short)columns;
-    field_10_rgshd = new ShadingDescriptor[columns];
-    for (int x = 0; x < columns; x++)
-    {
-      field_10_rgshd[x] = new ShadingDescriptor();
-    }
-    field_11_brcBottom =  new BorderCode();
-    field_12_brcTop = new BorderCode();
-    field_13_brcLeft = new BorderCode();
-    field_14_brcRight = new BorderCode();
-    field_15_brcVertical = new BorderCode();
-    field_16_brcHorizontal = new BorderCode();
-    field_8_rgdxaCenter = new short[columns];
-    field_9_rgtc = new TableCellDescriptor[columns];
-    for (int x = 0; x < columns; x++)
+    public TableProperties()
     {
-      field_9_rgtc[x] = new TableCellDescriptor();
+
     }
-  }
-
-  public Object clone()
-    throws CloneNotSupportedException
-  {
-    TableProperties tap = (TableProperties)super.clone();
-    tap.field_10_rgshd = new ShadingDescriptor[field_10_rgshd.length];
-    for (int x = 0; x < field_10_rgshd.length; x++)
+
+    public TableProperties( short columns )
     {
-      tap.field_10_rgshd[x] = (ShadingDescriptor)field_10_rgshd[x].clone();
+        setTlp( new TableAutoformatLookSpecifier() );
+        setItcMac( columns );
+        setRgshd( new ShadingDescriptor[columns] );
+
+        for ( int x = 0; x < columns; x++ )
+        {
+            getRgshd()[x] = new ShadingDescriptor();
+        }
+
+        setBrcBottom( new BorderCode() );
+        setBrcHorizontal( new BorderCode() );
+        setBrcLeft( new BorderCode() );
+        setBrcRight( new BorderCode() );
+        setBrcTop( new BorderCode() );
+        setBrcVertical( new BorderCode() );
+
+        setRgbrcInsideDefault_0( new BorderCode() );
+        setRgbrcInsideDefault_1( new BorderCode() );
+
+        TableCellDescriptor[] tableCellDescriptors = new TableCellDescriptor[columns];
+        for ( int x = 0; x < columns; x++ )
+        {
+            tableCellDescriptors[x] = new TableCellDescriptor();
+        }
+        setRgtc( tableCellDescriptors );
+
+        setRgdxaCenter( new short[columns] );
+        setRgdxaCenterPrint( new short[columns] );
     }
-    tap.field_11_brcBottom = (BorderCode)field_11_brcBottom.clone();
-    tap.field_12_brcTop = (BorderCode)field_12_brcTop.clone();
-    tap.field_13_brcLeft = (BorderCode)field_13_brcLeft.clone();
-    tap.field_14_brcRight = (BorderCode)field_14_brcRight.clone();
-    tap.field_15_brcVertical = (BorderCode)field_15_brcVertical.clone();
-    tap.field_16_brcHorizontal = (BorderCode)field_16_brcHorizontal.clone();
-    tap.field_8_rgdxaCenter = field_8_rgdxaCenter.clone();
-    tap.field_9_rgtc = new TableCellDescriptor[field_9_rgtc.length];
-    for (int x = 0; x < field_9_rgtc.length; x++)
+
+    public Object clone() throws CloneNotSupportedException
     {
-      tap.field_9_rgtc[x] = (TableCellDescriptor)field_9_rgtc[x].clone();
+        TableProperties tap = (TableProperties) super.clone();
+
+        tap.setTlp( getTlp().clone() );
+        tap.setRgshd( new ShadingDescriptor[getRgshd().length] );
+        for ( int x = 0; x < getRgshd().length; x++ )
+        {
+            tap.getRgshd()[x] = (ShadingDescriptor) getRgshd()[x].clone();
+        }
+
+        tap.setBrcBottom( (BorderCode) getBrcBottom().clone() );
+        tap.setBrcHorizontal( (BorderCode) getBrcHorizontal().clone() );
+        tap.setBrcLeft( (BorderCode) getBrcLeft().clone() );
+        tap.setBrcRight( (BorderCode) getBrcRight().clone() );
+        tap.setBrcTop( (BorderCode) getBrcTop().clone() );
+        tap.setBrcVertical( (BorderCode) getBrcVertical().clone() );
+
+        tap.setShdTable( (ShadingDescriptor) getShdTable().clone() );
+
+        tap.setRgbrcInsideDefault_0( (BorderCode) getRgbrcInsideDefault_0()
+                .clone() );
+        tap.setRgbrcInsideDefault_1( (BorderCode) getRgbrcInsideDefault_1()
+                .clone() );
+
+        tap.setRgdxaCenter( getRgdxaCenter().clone() );
+        tap.setRgdxaCenterPrint( getRgdxaCenterPrint().clone() );
+
+        tap.setRgtc( new TableCellDescriptor[getRgtc().length] );
+        for ( int x = 0; x < getRgtc().length; x++ )
+        {
+            tap.getRgtc()[x] = (TableCellDescriptor) getRgtc()[x].clone();
+        }
+        return tap;
     }
-    return tap;
-  }
 
 }
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableRow.java b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableRow.java
index 97698ef6f9..dd522de683 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableRow.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableRow.java
@@ -82,7 +82,7 @@ public final class TableRow
 
   public void setRowJustification(int jc)
   {
-    _tprops.setJc(jc);
+    _tprops.setJc((short) jc);
     _papx.updateSprm(SPRM_TJC, (short)jc);
   }
 
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestProblems.java b/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestProblems.java
index 3db9e8d7f0..3f56eaf7c9 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestProblems.java
+++ b/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestProblems.java
@@ -17,6 +17,9 @@
 
 package org.apache.poi.hwpf.usermodel;
 
+import java.io.InputStream;
+import java.util.List;
+
 import junit.framework.AssertionFailedError;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.poi.EncryptedDocumentException;
@@ -30,9 +33,6 @@ import org.apache.poi.hwpf.extractor.WordExtractor;
 import org.apache.poi.hwpf.model.StyleSheet;
 import org.apache.poi.util.IOUtils;
 
-import java.io.InputStream;
-import java.util.List;
-
 /**
  * Test various problem documents
  *
@@ -605,7 +605,7 @@ public final class TestProblems extends HWPFTestCase {
         HWPFDocument doc = HWPFTestDataSamples.openSampleFile("empty.doc");
 
         Range range = doc.getRange();
-        Table table = range.insertBefore(new TableProperties(columns), rows);
+        Table table = range.insertBefore(new TableProperties((short) columns), rows);
 
         for (int rowIdx = 0; rowIdx < table.numRows(); rowIdx++) {
             TableRow row = table.getRow(rowIdx);
diff --git a/src/types/definitions/tap_type.xml b/src/types/definitions/tap_type.xml
index b8d97ec1bb..2a56ddc5e6 100644
--- a/src/types/definitions/tap_type.xml
+++ b/src/types/definitions/tap_type.xml
@@ -26,8 +26,8 @@
     <author>S. Ryan Ackley</author>
     <fields>
         <!-- page 198 -->
-        <field type="int" size="4" name="istd" description="Table style for the Table"/>
-        <field type="int" size="2" name="jc"
+        <field type="short" size="2" name="istd" description="Table style for the Table"/>
+        <field type="short" size="2" name="jc"
             description="Justification code. specifies how table row should be justified within its column. 0 -- left justify, 1 -- center, 2 -- right justify"/>
         <field type="int" size="4" name="dxaGapHalf"
             description="Measures half of the white space that will be maintained between text in adjacent columns of a table row. A dxaGapHalf width of white space will be maintained on both sides of a column boundary."/>
@@ -39,7 +39,8 @@
             description="When 1, table row may not be split across page bounds. Used for Word 2000 and Word 97."/>
         <field type="boolean" size="0" name="fTableHeader"
             description="When 1, table row is to be used as the header of the table"/>
-        <field type="int" size="4" name="tlp" description="Table look specifier (see TLP definition)"/>
+
+        <field type="TableAutoformatLookSpecifier" size="4" name="tlp" description="Table look specifier"/>
 
         <field type="short" size="2" name="wWidth" description="Preferred table width"/>
         <field type="short" size="2" name="wWidthIndent" description="Left Indent"/>
@@ -116,7 +117,7 @@
         <field type="int" size="4" name="dxaRTEWrapWidth" description="Used internally by Word"/>
         <field type="int" size="4" name="dxaColWidthWwd" description="Used internally by Word"/>
 
-        <field type="int" size="2" name="pctWwd"
+        <field type="short" size="2" name="pctWwd"
             description="Used internally by Word: percent of Window size for AutoFit in WebView"/>
 
         <field type="int" size="2" name="viewFlags" description="Used internally by Word">
@@ -131,6 +132,12 @@
             <bit number="6" mask="0xffe0" name="viewFlags_unused2" description="Not used"/>
         </field>
 
+        <field type="short[]" size="130" name="rgdxaCenter"
+            description="rgdxaCenter[0] is the left boundary of cell 0 measured relative to margin rgdxaCenter[tap.itcMac - 1] is left boundary of last cell rgdxaCenter[tap.itcMac] is right boundary of last cell."/>
+        <field type="short[]" size="130" name="rgdxaCenterPrint" description="Used internally by Word"/>
+
+        <field type="ShadingDescriptor" size="10" name="shdTable" description="Table shading"/>
+
         <!-- rgbrcTable[ibrcTableMax]; Array of borders; ibrcTableMax==6 -->
         <field type="BorderCode" size="4" name="brcBottom"/>
         <field type="BorderCode" size="4" name="brcTop"/>
@@ -141,10 +148,10 @@
 
         <!-- mpibrcwCellPaddingDefault[cbrcTc]; Array of default cell margins. Index into the next four
             properties. -->
-        <field type="int" size="2" name="wCellPaddingDefaultTop" description="Default top cell margin/padding"/>
-        <field type="int" size="2" name="wCellPaddingDefaultLeft" description="Default left cell margin/padding"/>
-        <field type="int" size="2" name="wCellPaddingDefaultBottom" description="Default bottom cell margin/padding"/>
-        <field type="int" size="2" name="wCellPaddingDefaultRight" description="Default right cell margin/padding"/>
+        <field type="short" size="2" name="wCellPaddingDefaultTop" description="Default top cell margin/padding"/>
+        <field type="short" size="2" name="wCellPaddingDefaultLeft" description="Default left cell margin/padding"/>
+        <field type="short" size="2" name="wCellPaddingDefaultBottom" description="Default bottom cell margin/padding"/>
+        <field type="short" size="2" name="wCellPaddingDefaultRight" description="Default right cell margin/padding"/>
 
         <!-- mpibrcftsCellPaddingDefault[cbrcTc]; Array of default cell margin units. Index into the
             next four properties -->
@@ -159,10 +166,10 @@
 
         <!-- mpibrcwCellSpacingDefault[cbrcTc]; Array of default cell spacing. Index into the next four
             properties -->
-        <field type="int" size="2" name="wCellSpacingDefaultTop" description="Default top cell spacings"/>
-        <field type="int" size="2" name="wCellSpacingDefaultLeft" description="Default left cell spacings"/>
-        <field type="int" size="2" name="wCellSpacingDefaultBottom" description="Default bottom cell spacings"/>
-        <field type="int" size="2" name="wCellSpacingDefaultRight" description="Default right cell spacings"/>
+        <field type="short" size="2" name="wCellSpacingDefaultTop" description="Default top cell spacings"/>
+        <field type="short" size="2" name="wCellSpacingDefaultLeft" description="Default left cell spacings"/>
+        <field type="short" size="2" name="wCellSpacingDefaultBottom" description="Default bottom cell spacings"/>
+        <field type="short" size="2" name="wCellSpacingDefaultRight" description="Default right cell spacings"/>
 
         <!-- mpibrcftsCellSpacingDefault[cbrcTc]; Array of default cell spacing units. Index into the
             next four properties -->
@@ -177,10 +184,10 @@
 
         <!-- mpibrcwCellPaddingOuter[cbrcTc]; Array of default outer cell margins. Index into the next
             four properties. -->
-        <field type="int" size="2" name="wCellPaddingOuterTop" description="Default outer top cell margin/padding"/>
-        <field type="int" size="2" name="wCellPaddingOuterLeft" description="Default outer left cell margin/padding"/>
-        <field type="int" size="2" name="wCellPaddingOuterBottom" description="Default outer bottom cell margin/padding"/>
-        <field type="int" size="2" name="wCellPaddingOuterRight" description="Default outer right cell margin/padding"/>
+        <field type="short" size="2" name="wCellPaddingOuterTop" description="Default outer top cell margin/padding"/>
+        <field type="short" size="2" name="wCellPaddingOuterLeft" description="Default outer left cell margin/padding"/>
+        <field type="short" size="2" name="wCellPaddingOuterBottom" description="Default outer bottom cell margin/padding"/>
+        <field type="short" size="2" name="wCellPaddingOuterRight" description="Default outer right cell margin/padding"/>
 
         <!-- mpibrcftsCellPaddingOuter[cbrcTc]; Array of default outer cell margin units. Index into
             the next four properties -->
@@ -195,10 +202,10 @@
 
         <!-- mpibrcwCellSpacingOuter[cbrcTc]; Array of default outer cell spacing. Index into the next
             four properties. -->
-        <field type="int" size="2" name="wCellSpacingOuterTop" description="Default outer top cell spacing"/>
-        <field type="int" size="2" name="wCellSpacingOuterLeft" description="Default outer left cell spacing"/>
-        <field type="int" size="2" name="wCellSpacingOuterBottom" description="Default outer bottom cell spacing"/>
-        <field type="int" size="2" name="wCellSpacingOuterRight" description="Default outer right cell spacing"/>
+        <field type="short" size="2" name="wCellSpacingOuterTop" description="Default outer top cell spacing"/>
+        <field type="short" size="2" name="wCellSpacingOuterLeft" description="Default outer left cell spacing"/>
+        <field type="short" size="2" name="wCellSpacingOuterBottom" description="Default outer bottom cell spacing"/>
+        <field type="short" size="2" name="wCellSpacingOuterRight" description="Default outer right cell spacing"/>
 
         <!-- mpibrcftsCellSpacingOuter[cbrcTc]; Array of default outer cell spacing units. Index into
             the next four properties. -->
@@ -224,9 +231,10 @@
         <!-- TODO: rsid -->
         <!-- TODO: tcDefault -->
 
-        <field type="int" size="1" name="cHorzBands"
+        <field type="short" size="1" name="cHorzBands"
             description="Size of each horizontal style band, in number of rows"/>
-        <field type="int" size="1" name="cVertBands" description="Size of a vertical style band, in number of columns"/>
+        <field type="short" size="1" name="cVertBands"
+            description="Size of a vertical style band, in number of columns"/>
 
         <field type="BorderCode" size="8" name="rgbrcInsideDefault_0"
             description="Border definition for inside horizontal borders"/>
diff --git a/src/types/definitions/tlp_type.xml b/src/types/definitions/tlp_type.xml
new file mode 100644
index 0000000000..b915e6e9b4
--- /dev/null
+++ b/src/types/definitions/tlp_type.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<!--
+    ====================================================================
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements. See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License. You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+    ====================================================================
+-->
+<record fromfile="true" name="TLP" package="org.apache.poi.hwpf.model.types">
+    <suffix>AbstractType</suffix>
+    <extends>HDFType</extends>
+    <description>Table Autoformat Look sPecifier (TLP). &lt;p&gt;Class and fields descriptions are
+        quoted from Microsoft Office Word 97-2007 Binary File Format
+    </description>
+    <author>Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format
+        Specification [*.doc]
+    </author>
+    <fields>
+        <field type="short" size="2" name="itl"
+            description="Index to Word‘s table of table looks (see itl table below)"/>
+        <field type="byte" size="1" name="tlp_flags">
+            <bit number="0" mask="0x0001" name="fBorders"
+                description="When == 1, use the border properties from the selected table look"/>
+            <bit number="1" mask="0x0002" name="fShading"
+                description="When == 1, use the shading properties from the selected table look"/>
+            <bit number="2" mask="0x0004" name="fFont"
+                description="When == 1, use the font from the selected table look"/>
+            <bit number="3" mask="0x0008" name="fColor"
+                description="When == 1, use the color from the selected table look"/>
+            <bit number="4" mask="0x0010" name="fBestFit"
+                description="When == 1, do best fit from the selected table look"/>
+            <bit number="5" mask="0x0020" name="fHdrRows"
+                description="When == 1, apply properties from the selected table look to the header rows in the table"/>
+            <bit number="6" mask="0x0040" name="fLastRow"
+                description="When == 1, apply properties from the selected table look to the last row in the table"/>
+        </field>
+    </fields>
+</record>