diff options
| author | Karen Lease <klease@apache.org> | 2001-10-14 20:27:56 +0000 |
|---|---|---|
| committer | Karen Lease <klease@apache.org> | 2001-10-14 20:27:56 +0000 |
| commit | bc23e6dbba6f61f56288be97ff95000557304d80 (patch) | |
| tree | a3d0622117cc86cd6b521324dfb4de51816f1bd7 | |
| parent | c79d0ec1f43465021f0b822e1af740290ad86db0 (diff) | |
| download | xmlgraphics-fop-bc23e6dbba6f61f56288be97ff95000557304d80.tar.gz xmlgraphics-fop-bc23e6dbba6f61f56288be97ff95000557304d80.zip | |
Add table-layout and inline-progression-dimension
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@194502 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | src/codegen/foproperties.xml | 65 |
1 files changed, 49 insertions, 16 deletions
diff --git a/src/codegen/foproperties.xml b/src/codegen/foproperties.xml index a916e3ea4..ce2a7503c 100644 --- a/src/codegen/foproperties.xml +++ b/src/codegen/foproperties.xml @@ -965,9 +965,9 @@ <subproperty set-by-shorthand="true"> <name>minimum</name> <datatype>Length</datatype> - <default>auto</default> - <auto-ok/> - <percent-ok base="CONTAINING_BOX"/> + <default>auto</default> + <auto-ok/> + <percent-ok base="CONTAINING_BOX"/> <corresponding> <propval>min-<wmrel2abs dir="BLOCKPROGDIM"/></propval> </corresponding>> @@ -975,16 +975,16 @@ <subproperty set-by-shorthand="true"> <name>optimum</name> <datatype>Length</datatype> - <default>auto</default> - <auto-ok/> - <percent-ok base="CONTAINING_BOX"/> + <default>auto</default> + <auto-ok/> + <percent-ok base="CONTAINING_BOX"/> </subproperty> <subproperty set-by-shorthand="true"> <name>maximum</name> <datatype>Length</datatype> - <auto-ok/> - <default>auto</default> - <percent-ok base="CONTAINING_BOX"/> + <auto-ok/> + <default>auto</default> + <percent-ok base="CONTAINING_BOX"/> <corresponding> <propval>max-<wmrel2abs dir="BLOCKPROGDIM"/></propval> </corresponding>> @@ -1015,10 +1015,40 @@ <property> <name>inline-progression-dimension</name> <inherited>false</inherited> - <datatype>ToBeImplemented</datatype> - <default>auto</default> - </property> - <property> + <datatype>LengthRange</datatype> + <corresponding use-if-specified="true"> + <propval><wmrel2abs dir="INLINEPROGDIM"/></propval> + </corresponding> + <compound> + <subproperty set-by-shorthand="true"> + <name>minimum</name> + <datatype>Length</datatype> + <default>auto</default> + <auto-ok/> + <percent-ok base="CONTAINING_BOX"/> + <corresponding> + <propval>min-<wmrel2abs dir="INLINEPROGDIM"/></propval> + </corresponding>> + </subproperty> + <subproperty set-by-shorthand="true"> + <name>optimum</name> + <datatype>Length</datatype> + <default>auto</default> + <auto-ok/> + <percent-ok base="CONTAINING_BOX"/> + </subproperty> + <subproperty set-by-shorthand="true"> + <name>maximum</name> + <datatype>Length</datatype> + <auto-ok/> + <default>auto</default> + <percent-ok base="CONTAINING_BOX"/> + <corresponding> + <propval>max-<wmrel2abs dir="INLINEPROGDIM"/></propval> + </corresponding>> + </subproperty> + </compound> + </property> <property> <name>max-height</name> <inherited>false</inherited> <datatype>ToBeImplemented</datatype> @@ -1797,7 +1827,7 @@ <name>column-width</name> <inherited>false</inherited> <datatype>Length</datatype> - <default>proportional-column-width(1)</default> + <default contextdep="true">proportional-column-width(1)</default> </property> <property> <name>empty-cells</name> @@ -1838,9 +1868,12 @@ <property> <name>table-layout</name> <inherited>false</inherited> - <datatype>ToBeImplemented</datatype> + <datatype>Enum</datatype> <default>auto</default> - </property> + <enumeration> + <value const="AUTO">auto</value> + <value const="FIXED">fixed</value> + </enumeration> </property> <property> <name>table-omit-footer-at-break</name> <inherited>false</inherited> |