Support for sprmPJc paragraph SPRM and handling of additional properties in ParagraphSprmCompressor, see Bugzilla 51389 and 51390

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

1 files changed, 76 insertions, 34 deletions

diff --git a/src/types/definitions/pap_type.xml b/src/types/definitions/pap_type.xml
index 0f26352f94..e83ccf6706 100644
--- a/src/types/definitions/pap_type.xml
+++ b/src/types/definitions/pap_type.xml
@@ -23,33 +23,56 @@
     <description>Paragraph Properties.</description>
     <author>S. Ryan Ackley</author>
     <fields>
-        <field type="int" size="2" name="istd"/>
-        <field type="byte" size="1" name="jc"/>
+        <field type="int" size="2" name="istd" description="Index to style descriptor"/>
+        <field type="byte" size="1" name="fSideBySide"/>
         <field type="byte" size="1" name="fKeep"/>
         <field type="byte" size="1" name="fKeepFollow"/>
         <field type="byte" size="1" name="fPageBreakBefore"/>
+
+        <field type="byte" size="1" name="brcl" description="Border line style"/>
+        <field type="byte" size="1" name="brcp" description="Rectangle border codes"/>
+
+        <field type="byte" size="1" name="ilvl" description="List level if non-zero"/>
+        <!-- According to PAPX doc pointer is byte, but according to sprmPIlfo documentation pointer is short, 
+            we will use int -->
+        <field type="int" size="2" name="ilfo" description="1-based index into the pllfo (lists structure), if non-zero"/>
+        <field type="byte" size="1" name="fNoLnn" description="No line numbering"/>
+
+        <field type="LineSpacingDescriptor" size="4" name="lspd" description="Line spacing descriptor"/>
+
+        <field type="int" size="4" name="dyaBefore" description="Space before paragraph"/>
+        <field type="int" size="4" name="dyaAfter" description="Space after paragraph"/>
+
+        <!-- Not documented in PAP, but referenced by SPRM doc -->
+        <field type="byte" size="1" name="fInTable" description="Paragraph is in table flag"/>
+        <field type="byte" size="1" name="finTableW97" description="Archaic paragraph is in table flag"/>
+        <field type="byte" size="1" name="fTtp" description="Table trailer paragraph (last in table row)"/>
+
+        <field type="int" size="4" name="dxaAbs"/>
+        <field type="int" size="4" name="dyaAbs"/>
+        <field type="int" size="4" name="dxaWidth"/>
+
         <field type="byte" size="1" name="fBrLnAbove"/>
         <field type="byte" size="1" name="fBrLnBelow"/>
+
         <field type="byte" size="1" name="pcVert"/>
         <field type="byte" size="1" name="pcHorz"/>
-        <field type="byte" size="1" name="brcp"/>
-        <field type="byte" size="1" name="brcl"/>
-        <field type="byte" size="1" name="ilvl"/>
-        <field type="byte" size="1" name="fNoLnn"/>
-        <field type="int" size="2" name="ilfo"/>
-        <field type="byte" size="1" name="fSideBySide"/>
+
+        <field type="byte" size="1" name="wr"/>
+
         <field type="byte" size="1" name="fNoAutoHyph"/>
+        
+        <!-- wHeightAbs? -->
+        <field type="int" size="2" name="dyaHeight"/>
+        <field type="byte" size="1" name="fMinHeight"/>
+
+        <field type="DropCapSpecifier" size="2" name="dcs"/>
+
+        <field type="int" size="4" name="dyaFromText" description="Vertical distance between text and absolutely positioned object"/>
+        <field type="int" size="4" name="dxaFromText" description="Horizontal distance between text and absolutely positioned object"/>
+
+        <field type="byte" size="1" name="fLocked"/>
         <field type="byte" size="1" name="fWidowControl"/>
-        <field type="int" size="4" name="dxaRight"/>
-        <field type="int" size="4" name="dxaLeft"/>
-        <field type="int" size="4" name="dxaLeft1"/>
-        <field type="LineSpacingDescriptor" size="4" name="lspd"/>
-        <field type="int" size="4" name="dyaBefore"/>
-        <field type="int" size="4" name="dyaAfter"/>
-        <field type="byte[]" size="12" name="phe"/>
-        <field type="byte" size="1" name="fCrLf"/>
-        <field type="byte" size="1" name="fUsePgsuSettings"/>
-        <field type="byte" size="1" name="fAdjustRight"/>
         <field type="byte" size="1" name="fKinsoku"/>
         <field type="byte" size="1" name="fWordWrap"/>
         <field type="byte" size="1" name="fOverflowPunct"/>
@@ -62,38 +85,57 @@
           <bit number="1" mask="0x0002" name="fBackward"/>
           <bit number="2" mask="0x0004" name="fRotateFont"/>
         </field>
+        <field type="byte" size="1" name="fVertical"/>
         <field type="byte" size="1" name="fBackward"/>
         <field type="byte" size="1" name="fRotateFont"/>
-        <field type="byte" size="1" name="fInTable"/>
-        <field type="byte" size="1" name="fTtp"/>
-        <field type="byte" size="1" name="wr"/>
-        <field type="byte" size="1" name="fLocked"/>
-        <field type="byte[]" size="4" name="ptap"/>
-        <field type="int" size="4" name="dxaAbs"/>
-        <field type="int" size="4" name="dyaAbs"/>
-        <field type="int" size="4" name="dxaWidth"/>
+
+        <field type="byte" size="1" name="lvl"/>
+        <field type="byte" size="1" name="fBiDi"/>
+        <field type="byte" size="1" name="fNumRMIns"/>
+        <field type="byte" size="1" name="fCrLf"/>
+        <field type="byte" size="1" name="fUsePgsuSettings"/>
+        <field type="byte" size="1" name="fAdjustRight"/>
+
+        <!-- itap? -->
+        <!-- fInnerTableCell? -->
+        <!-- fOpenTch? -->
+        
+        <field type="short" size="2" name="dxcRight" description="Right indent in character units"/>
+        <field type="short" size="2" name="dxcLeft" description="Left indent in character units"/>
+        <field type="short" size="2" name="dxcLeft1" description="First line indent in character units"/>
+
+        <field type="byte" size="1" name="fDyaBeforeAuto" description="Vertical spacing before is automatic"/>
+        <field type="byte" size="1" name="fDyaAfterAuto" description="Vertical spacing after is automatic"/>
+
+        <field type="int" size="4" name="dxaRight"/>
+        <field type="int" size="4" name="dxaLeft"/>
+        <field type="int" size="4" name="dxaLeft1"/>
+
+        <field type="byte" size="1" name="jc"/>
+
+        <field type="byte" 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"/>
         <field type="BorderCode" size="4" name="brcRight"/>
         <field type="BorderCode" size="4" name="brcBetween"/>
         <field type="BorderCode" size="4" name="brcBar"/>
-        <field type="int" size="4" name="dxaFromText"/>
-        <field type="int" size="4" name="dyaFromText"/>
-        <field type="int" size="2" name="dyaHeight"/>
-        <field type="byte" size="1" name="fMinHeight"/>
+
         <field type="ShadingDescriptor" size="2" name="shd"/>
-        <field type="DropCapSpecifier" size="2" name="dcs"/>
-        <field type="byte" size="1" name="lvl"/>
-        <field type="byte" size="1" name="fNumRMIns"/>
         <field type="byte[]" size="84" name="anld"/>
+        <field type="byte[]" size="12" name="phe"/>
         <field type="int" size="1" name="fPropRMark"/>
         <field type="int" size="2" name="ibstPropRMark"/>
         <field type="DateAndTime" size="4" name="dttmPropRMark"/>
-        <field type="byte[]" size="128" name="numrm"/>
+
         <field type="int" size="2" name="itbdMac"/>
         <field type="int[]" size="128" name="rgdxaTab"/>
         <field type="byte[]" size="128" name="rgtbd"/>
+        <field type="byte[]" size="128" name="numrm"/>
+        <field type="byte[]" size="4" name="ptap"/>
+
+        <!-- Unknown old fields -->
         <field type="byte" size="1" name="tableLevel"/>
         <field type="byte" size="1" name="fTtpEmbedded"/>
         <field type="byte" size="1" name="embeddedCellMark"/>