From: Manuel Mall Date: Mon, 24 Oct 2005 13:30:37 +0000 (+0000) Subject: Removed property values as discussed: http://marc.theaimsgroup.com/?t=112985465700004... X-Git-Tag: fop-0_90-alpha1~118 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=79e11e6891f88e772ea63ffb143babf0d4316cd2;p=xmlgraphics-fop.git Removed property values as discussed: http://marc.theaimsgroup.com/?t=112985465700004&r=1&w=2 git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@328060 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/src/documentation/content/xdocs/compliance.ihtml b/src/documentation/content/xdocs/compliance.ihtml index a17400701..4b30ca026 100644 --- a/src/documentation/content/xdocs/compliance.ihtml +++ b/src/documentation/content/xdocs/compliance.ihtml @@ -3903,7 +3903,7 @@ diff --git a/src/java/org/apache/fop/fo/FOPropertyMapping.java b/src/java/org/apache/fop/fo/FOPropertyMapping.java index a41672bb0..a47aaa4ad 100644 --- a/src/java/org/apache/fop/fo/FOPropertyMapping.java +++ b/src/java/org/apache/fop/fo/FOPropertyMapping.java @@ -1345,10 +1345,6 @@ public class FOPropertyMapping implements Constants { m.addEnum("alphabetic", getEnumProperty(EN_ALPHABETIC, "ALPHABETIC")); m.addEnum("hanging", getEnumProperty(EN_HANGING, "HANGING")); m.addEnum("mathematical", getEnumProperty(EN_MATHEMATICAL, "MATHEMATICAL")); - m.addEnum("top", getEnumProperty(EN_TOP, "TOP")); - m.addEnum("bottom", getEnumProperty(EN_BOTTOM, "BOTTOM")); - m.addEnum("text-top", getEnumProperty(EN_TEXT_TOP, "TEXT_TOP")); - m.addEnum("text-bottom", getEnumProperty(EN_TEXT_BOTTOM, "TEXT_BOTTOM")); m.setDefault("auto"); m.setPercentBase(LengthBase.ALIGNMENT_ADJUST); m.addShorthand(s_generics[PR_VERTICAL_ALIGN]); @@ -1369,10 +1365,6 @@ public class FOPropertyMapping implements Constants { m.addEnum("alphabetic", getEnumProperty(EN_ALPHABETIC, "ALPHABETIC")); m.addEnum("hanging", getEnumProperty(EN_HANGING, "HANGING")); m.addEnum("mathematical", getEnumProperty(EN_MATHEMATICAL, "MATHEMATICAL")); - m.addEnum("top", getEnumProperty(EN_TOP, "TOP")); - m.addEnum("bottom", getEnumProperty(EN_BOTTOM, "BOTTOM")); - m.addEnum("text-top", getEnumProperty(EN_TEXT_TOP, "TEXT_TOP")); - m.addEnum("text-bottom", getEnumProperty(EN_TEXT_BOTTOM, "TEXT_BOTTOM")); m.setDefault("auto"); m.addShorthand(s_generics[PR_VERTICAL_ALIGN]); addPropertyMaker("alignment-baseline", m); diff --git a/src/java/org/apache/fop/layoutmgr/inline/AlignmentContext.java b/src/java/org/apache/fop/layoutmgr/inline/AlignmentContext.java index ae294c44f..1c081392f 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/AlignmentContext.java +++ b/src/java/org/apache/fop/layoutmgr/inline/AlignmentContext.java @@ -236,34 +236,6 @@ public class AlignmentContext implements Constants { case EN_MATHEMATICAL: this.alignmentBaselineIdentifier = alignmentBaseline; break; - case EN_TOP: - if (isHorizontalWritingMode()) { - this.alignmentBaselineIdentifier = EN_BEFORE_EDGE; - } else { - this.alignmentBaselineIdentifier = getDominantBaselineIdentifier(); - } - break; - case EN_BOTTOM: - if (isHorizontalWritingMode()) { - this.alignmentBaselineIdentifier = EN_AFTER_EDGE; - } else { - this.alignmentBaselineIdentifier = getDominantBaselineIdentifier(); - } - break; - case EN_TEXT_TOP: - if (isHorizontalWritingMode()) { - this.alignmentBaselineIdentifier = EN_TEXT_BEFORE_EDGE; - } else { - this.alignmentBaselineIdentifier = getDominantBaselineIdentifier(); - } - break; - case EN_TEXT_BOTTOM: - if (isHorizontalWritingMode()) { - this.alignmentBaselineIdentifier = EN_TEXT_AFTER_EDGE; - } else { - this.alignmentBaselineIdentifier = getDominantBaselineIdentifier(); - } - break; } } @@ -297,36 +269,6 @@ public class AlignmentContext implements Constants { alignmentPoint = beforeEdge - actualBaselineTable.getBaseline(alignmentAdjust.getEnum()); break; - case EN_TOP: // fall through - if (isHorizontalWritingMode()) { - alignmentPoint = 0; - } else { - alignmentPoint = beforeEdge; - } - break; - case EN_BOTTOM: - if (isHorizontalWritingMode()) { - alignmentPoint = beforeEdge - actualBaselineTable.getBaseline(EN_AFTER_EDGE); - } else { - alignmentPoint = beforeEdge; - } - break; - case EN_TEXT_TOP: - if (isHorizontalWritingMode()) { - alignmentPoint = beforeEdge - - actualBaselineTable.getBaseline(EN_TEXT_BEFORE_EDGE); - } else { - alignmentPoint = beforeEdge; - } - break; - case EN_TEXT_BOTTOM: - if (isHorizontalWritingMode()) { - alignmentPoint = beforeEdge - - actualBaselineTable.getBaseline(EN_TEXT_AFTER_EDGE); - } else { - alignmentPoint = beforeEdge; - } - break; default: alignmentPoint = beforeEdge + alignmentAdjust.getValue(new SimplePercentBaseContext(null diff --git a/test/layoutengine/testcases/block_line-stacking-strategy_1.xml b/test/layoutengine/testcases/block_line-stacking-strategy_1.xml new file mode 100755 index 000000000..8de776c30 --- /dev/null +++ b/test/layoutengine/testcases/block_line-stacking-strategy_1.xml @@ -0,0 +1,164 @@ + + + + + +

+ This test checks line-stacking-strategy font-height against inlines of different sizes. +

+ + + + + + + + + + + + Before + bigger + + After + + + Before + bigger with b & p + + After + + + Before + sub + sub + sub + + After + + + Before + super + super + super + + After + + + Before + super + sub + super + sub + super + + After + + + Before + sub + super + sub + super + sub + + After + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/layoutengine/testcases/inline_alignment-adjust_1.xml b/test/layoutengine/testcases/inline_alignment-adjust_1.xml index 1ad390a53..ca2cfde50 100755 --- a/test/layoutengine/testcases/inline_alignment-adjust_1.xml +++ b/test/layoutengine/testcases/inline_alignment-adjust_1.xml @@ -69,18 +69,6 @@ Before alignment-adjust="mathematical" After - - Before alignment-adjust="top" After - - - Before alignment-adjust="bottom" After - - - Before alignment-adjust="text-top" After - - - Before alignment-adjust="text-bottom" After - @@ -99,9 +87,5 @@ - - - - diff --git a/test/layoutengine/testcases/inline_alignment-baseline_1.xml b/test/layoutengine/testcases/inline_alignment-baseline_1.xml index 9b514c7f4..0e1ae430d 100755 --- a/test/layoutengine/testcases/inline_alignment-baseline_1.xml +++ b/test/layoutengine/testcases/inline_alignment-baseline_1.xml @@ -69,18 +69,6 @@ Before alignment-baseline="mathematical" After - - Before alignment-baseline="top" After - - - Before alignment-baseline="bottom" After - - - Before alignment-baseline="text-top" After - - - Before alignment-baseline="text-bottom" After - @@ -99,9 +87,5 @@ - - - - diff --git a/test/layoutengine/testcases/inline_alignment-baseline_2.xml b/test/layoutengine/testcases/inline_alignment-baseline_2.xml index 591ee2c9b..2fc852a76 100755 --- a/test/layoutengine/testcases/inline_alignment-baseline_2.xml +++ b/test/layoutengine/testcases/inline_alignment-baseline_2.xml @@ -69,18 +69,6 @@ Before alignment-baseline="mathematical" After - - Before alignment-baseline="top" After - - - Before alignment-baseline="bottom" After - - - Before alignment-baseline="text-top" After - - - Before alignment-baseline="text-bottom" After - @@ -124,17 +112,5 @@ - - - - - - - - - - - - diff --git a/test/layoutengine/testcases/inline_alignment-baseline_3.xml b/test/layoutengine/testcases/inline_alignment-baseline_3.xml index 3d32b3595..3359f862d 100755 --- a/test/layoutengine/testcases/inline_alignment-baseline_3.xml +++ b/test/layoutengine/testcases/inline_alignment-baseline_3.xml @@ -69,18 +69,6 @@ Before alignment-baseline="mathematical" After - - Before alignment-baseline="top" After - - - Before alignment-baseline="bottom" After - - - Before alignment-baseline="text-top" After - - - Before alignment-baseline="text-bottom" After - @@ -99,9 +87,5 @@ - - - -