extent. Deleted superfluous text decoration data and assiciated (incomplete) methods from WordArea. PR: 7490, 15936 git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_20_2-maintain@195926 13f79535-47bb-0310-9956-ffa450edef68tags/fop-0_20_5rc2
@@ -1,5 +1,7 @@ | |||
============================================================================== | |||
Done since 0.20.4 release | |||
- Fixed leader expansion and leader alignment to reference area to some | |||
extent(#7490 and #15936). | |||
- Temporary fix for wrong mapping of the hyphen character in the PostScript | |||
renderer. Needs to be done in a clean way later. | |||
Submitted by: Arnd Beissner <arnd.beissner@cappelino.de> |
@@ -184,7 +184,6 @@ public class LineArea extends Area { | |||
// appending indent space leader-alignment setting | |||
// InlineSpace to false, so it is not used in line | |||
// justification | |||
System.out.println("align, space="+spaceBeforeLeader); | |||
if (spaceBeforeLeader > 0) { | |||
children.add(idx, new InlineSpace(spaceBeforeLeader, | |||
false)); | |||
@@ -219,7 +218,6 @@ public class LineArea extends Area { | |||
// appending indent space leader-alignment setting | |||
// InlineSpace to false, so it is not used in line | |||
// justification | |||
System.out.println("align, space="+spaceBeforeLeader); | |||
if (spaceBeforeLeader > 0) { | |||
children.add(idx, new InlineSpace(spaceBeforeLeader, | |||
false)); | |||
@@ -742,12 +740,6 @@ public class LineArea extends Area { | |||
int leaderLengthOptimum, int leaderLengthMaximum, | |||
int ruleStyle, int ruleThickness, | |||
int leaderPatternWidth, int leaderAlignment) { | |||
System.out.println( | |||
"min="+leaderLengthMinimum+ | |||
" opt="+leaderLengthOptimum+ | |||
" max="+leaderLengthMaximum+ | |||
" th="+ruleThickness+ | |||
" al="+leaderAlignment); | |||
if (leaderLengthMinimum>leaderLengthOptimum | |||
|| leaderLengthOptimum>leaderLengthMaximum) { | |||
MessageHandler.errorln("leader sizes wrong"); | |||
@@ -892,8 +884,10 @@ public class LineArea extends Area { | |||
} | |||
} | |||
} | |||
break; | |||
default: | |||
MessageHandler.errorln("bad align: "+type); | |||
break; | |||
} | |||
} | |||
@@ -14,12 +14,6 @@ public class WordArea extends InlineArea { | |||
private String text; | |||
// Textdecoration | |||
protected boolean underlined = false; | |||
protected boolean overlined = false; | |||
protected boolean lineThrough = false; | |||
public WordArea(FontState fontState, float red, float green, float blue, | |||
String text, int width) { | |||
super(fontState, width, red, green, blue); | |||
@@ -35,12 +29,4 @@ public class WordArea extends InlineArea { | |||
return this.text; | |||
} | |||
public void setUnderlined(boolean ul) { | |||
this.underlined = ul; | |||
} | |||
public boolean getUnderlined() { | |||
return this.underlined; | |||
} | |||
} |