From e1322d63fc41b169f6eb2d4b8dbe858145883818 Mon Sep 17 00:00:00 2001 From: Glenn Adams Date: Sat, 7 Apr 2012 09:24:11 +0000 Subject: [PATCH] Bugzilla #47380: Specified rule-thickness applies only when leader-pattern is rule, otherwise should use default thickness. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1310717 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/fop/fo/flow/Leader.java | 5 ++++- status.xml | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/java/org/apache/fop/fo/flow/Leader.java b/src/java/org/apache/fop/fo/flow/Leader.java index ce166b114..4062d6562 100644 --- a/src/java/org/apache/fop/fo/flow/Leader.java +++ b/src/java/org/apache/fop/fo/flow/Leader.java @@ -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; diff --git a/status.xml b/status.xml index 27a82c2a0..a00e11f59 100644 --- a/status.xml +++ b/status.xml @@ -62,6 +62,9 @@ documents. Example: the fix of marks layering will be such a case when it's done. --> + + Specified rule-thickness applies only when leader-pattern is rule, otherwise should use default thickness. + Eliminate duplicate code. -- 2.39.5