add tabs handling and additional SPRMs; update ShadingDescription definition (in fact, replace)

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

4 files changed, 127 insertions, 6 deletions

diff --git a/src/types/definitions/pap_type.xml b/src/types/definitions/pap_type.xml
index e65bca8bc8..710425a4ed 100644
--- a/src/types/definitions/pap_type.xml
+++ b/src/types/definitions/pap_type.xml
@@ -132,8 +132,6 @@
 
         <field type="byte" size="1" name="jc"/>
 
-        <field type="boolean" size="1" name="fNoAllowOverlap"/>
-
         <field type="BorderCode" size="4" name="brcTop"/>
         <field type="BorderCode" size="4" name="brcLeft"/>
         <field type="BorderCode" size="4" name="brcBottom"/>
@@ -141,17 +139,22 @@
         <field type="BorderCode" size="4" name="brcBetween"/>
         <field type="BorderCode" size="4" name="brcBar"/>
 
-        <field type="ShadingDescriptor" size="2" name="shd"/>
+        <field type="ShadingDescriptor" size="10" name="shd"/>
         <field type="byte[]" size="84" name="anld"/>
         <field type="byte[]" size="12" name="phe"/>
         <field type="boolean" size="1" name="fPropRMark"/>
         <field type="int" size="2" name="ibstPropRMark"/>
         <field type="DateAndTime" size="4" name="dttmPropRMark"/>
 
-        <field type="int" size="2" name="itbdMac"/>
-        <field type="int[]" size="128" name="rgdxaTab"/>
-        <field type="byte[]" size="128" name="rgtbd"/>
+        <field type="int" size="2" name="itbdMac" description="Number of tabs stops defined for paragraph. Must be &gt;= 0 and &lt;= 64."/>
+        <field type="int[]" size="128" name="rgdxaTab" description="Array of positions of itbdMac tab stops. itbdMax==64"/>
+        <field type="TabDescriptor[]" size="64" name="rgtbd" description="Array of itbdMac tab descriptors"/>
+
         <field type="byte[]" size="128" name="numrm"/>
         <field type="byte[]" size="4" name="ptap"/>
+
+        <field type="boolean" size="1" name="fNoAllowOverlap" description="When 1, absolutely positioned paragraph cannot overlap with another paragraph"/>
+        <field type="long" size="4" name="ipgp" description="HTML DIV ID for this paragraph"/>
+        <field type="long" size="4" name="rsid" description="Save ID for last time this PAP was revised"/>
     </fields>
 </record>
diff --git a/src/types/definitions/shd80_type.xml b/src/types/definitions/shd80_type.xml
new file mode 100644
index 0000000000..ab3b45e4f4
--- /dev/null
+++ b/src/types/definitions/shd80_type.xml
@@ -0,0 +1,36 @@
+<?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="SHD80" package="org.apache.poi.hwpf.model.types">
+    <suffix>AbstractType</suffix>
+    <description>The SHD80 is a substructure of the CHP and PAP, and TC for Word 97. &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="value">
+            <bit number="1" mask="0x001F" name="icoFore" description="Foreground color" />
+            <bit number="2" mask="0x03E0" name="icoBack" description="Background color" />
+            <bit number="3" mask="0xFC00" name="ipat" description="Shading pattern"/>
+        </field>
+    </fields>
+</record>
diff --git a/src/types/definitions/shd_type.xml b/src/types/definitions/shd_type.xml
new file mode 100644
index 0000000000..940eaa99ab
--- /dev/null
+++ b/src/types/definitions/shd_type.xml
@@ -0,0 +1,34 @@
+<?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="SHD" package="org.apache.poi.hwpf.model.types">
+    <suffix>AbstractType</suffix>
+    <description>The SHD is a substructure of the CHP, PAP, and TC for Word 2000. &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="Colorref" size="4" name="cvFore" description="24-bit foreground color"/>
+        <field type="Colorref" size="4" name="cvBack" description="24-bit background color"/>
+        <field type="int" size="2" name="ipat" description="Shading pattern"/>
+    </fields>
+</record>
diff --git a/src/types/definitions/tbd_type.xml b/src/types/definitions/tbd_type.xml
new file mode 100644
index 0000000000..7faeb01bf7
--- /dev/null
+++ b/src/types/definitions/tbd_type.xml
@@ -0,0 +1,48 @@
+<?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="TBD" package="org.apache.poi.hwpf.model.types">
+    <suffix>AbstractType</suffix>
+    <description>The TBD is a substructure of the PAP. &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="byte" size="1" name="value" >
+            <bit number="0" mask="0x07" name="jc" description="Justification code">
+                <const type="byte" value="0" name="LEFT"/>
+                <const type="byte" value="1" name="CENTERED"/>
+                <const type="byte" value="2" name="RIGHT"/>
+                <const type="byte" value="3" name="DECIMAL"/>
+                <const type="byte" value="4" name="BAR"/>
+            </bit>
+            <bit number="0" mask="0x38" name="tlc" description="Tab leader code">
+                <const type="byte" value="0" name="NONE"/>
+                <const type="byte" value="1" name="DOTTED"/>
+                <const type="byte" value="2" name="HYPENATED"/>
+                <const type="byte" value="3" name="SINGLELINE"/>
+                <const type="byte" value="4" name="HEAVYLINE"/>
+                <const type="byte" value="5" name="MIDDLEDOT"/>
+            </bit>
+            <bit number="3" mask="0xc0" name="reserved" />
+        </field>
+    </fields>
+</record>