pietsch 2003/02/03 15:43:26 Modified: . Tag: fop-0_20_2-maintain CHANGES src/org/apache/fop/layout Tag: fop-0_20_2-maintain LineArea.java src/org/apache/fop/layout/inline Tag: fop-0_20_2-maintain WordArea.java Log: Fixed leader expansion and leader alignment to reference area to some extent. Deleted superfluous text decoration data and assiciated (incomplete) methods from WordArea. PR: 7490, 15936 Revision Changes Path No revision No revision 1.10.2.45 +2 -0 xml-fop/CHANGES Index: CHANGES =================================================================== RCS file: /home/cvs/xml-fop/CHANGES,v retrieving revision 1.10.2.44 retrieving revision 1.10.2.45 diff -u -r1.10.2.44 -r1.10.2.45 --- CHANGES 23 Jan 2003 08:39:38 -0000 1.10.2.44 +++ CHANGES 3 Feb 2003 23:43:25 -0000 1.10.2.45 @@ -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 <[EMAIL PROTECTED]> No revision No revision 1.53.2.14 +3 -9 xml-fop/src/org/apache/fop/layout/Attic/LineArea.java Index: LineArea.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/layout/Attic/LineArea.java,v retrieving revision 1.53.2.13 retrieving revision 1.53.2.14 diff -u -r1.53.2.13 -r1.53.2.14 --- LineArea.java 2 Feb 2003 21:17:41 -0000 1.53.2.13 +++ LineArea.java 3 Feb 2003 23:43:25 -0000 1.53.2.14 @@ -184,7 +184,6 @@ // 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 @@ // 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 @@ 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 @@ } } } + break; default: MessageHandler.errorln("bad align: "+type); + break; } } No revision No revision 1.3.2.1 +1 -15 xml-fop/src/org/apache/fop/layout/inline/Attic/WordArea.java Index: WordArea.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/layout/inline/Attic/WordArea.java,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -r1.3 -r1.3.2.1 --- WordArea.java 30 Jul 2001 20:29:29 -0000 1.3 +++ WordArea.java 3 Feb 2003 23:43:26 -0000 1.3.2.1 @@ -14,12 +14,6 @@ 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); @@ -33,14 +27,6 @@ public String getText() { return this.text; - } - - public void setUnderlined(boolean ul) { - this.underlined = ul; - } - - public boolean getUnderlined() { - return this.underlined; } }
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]