Author: gadams
Date: Sat Apr 7 09:24:11 2012
New Revision: 1310717
URL: http://svn.apache.org/viewvc?rev=1310717&view=rev
Log:
Bugzilla #47380: Specified rule-thickness applies only when leader-pattern is
rule, otherwise should use default thickness.
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Leader.java
xmlgraphics/fop/trunk/status.xml
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Leader.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Leader.java?rev=1310717&r1=1310716&r2=1310717&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Leader.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Leader.java Sat Apr
7 09:24:11 2012
@@ -79,7 +79,8 @@ public class Leader extends InlineLevel
leaderLength = pList.get(PR_LEADER_LENGTH).getLengthRange();
leaderPattern = pList.get(PR_LEADER_PATTERN).getEnum();
leaderPatternWidth = pList.get(PR_LEADER_PATTERN_WIDTH).getLength();
- ruleThickness = pList.get(PR_RULE_THICKNESS).getLength();
+ // use default rule thickness as a default
+ ruleThickness =
getPropertyMakerFor(PR_RULE_THICKNESS).make(pList).getLength();
switch(leaderPattern) {
case EN_SPACE:
// use Space
@@ -88,6 +89,8 @@ public class Leader extends InlineLevel
// the following properties only apply
// for leader-pattern = "rule"
ruleStyle = pList.get(PR_RULE_STYLE).getEnum();
+ // use specified rule thickness to override default (established
above)
+ ruleThickness = pList.get(PR_RULE_THICKNESS).getLength();
break;
case EN_DOTS:
break;
Modified: xmlgraphics/fop/trunk/status.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/status.xml?rev=1310717&r1=1310716&r2=1310717&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Sat Apr 7 09:24:11 2012
@@ -62,6 +62,9 @@
documents. Example: the fix of marks layering will be such a case when
it's done.
-->
<release version="FOP Trunk" date="TBD">
+ <action context="Code" dev="GA" type="fix" fixes-bug="47380"
due-to="Georg Datterl">
+ Specified rule-thickness applies only when leader-pattern is rule,
otherwise should use default thickness.
+ </action>
<action context="Code" dev="GA" type="fix" fixes-bug="49302"
due-to="Julien Aymé">
Eliminate duplicate code.
</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
