From: Tore Engvig Date: Sun, 9 Dec 2001 17:17:09 +0000 (+0000) Subject: PR: X-Git-Tag: fop-0_20_5rc~239 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=da79f0973c6a11103a8a627af58f3739a3cd7814;p=xmlgraphics-fop.git PR: Obtained from: Submitted by: Rainer Garus Added correct metrics for euro sign in standard fonts Fix problem with computing remaining with in LineArea where start-indent <> 0 Upgraded batik.jar to batik1.1 git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_20_2-maintain@194590 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index b8ac46615..bf8f265b8 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,12 @@ ============================================================================== Done since 0.20.2 release *** General +- Added correct metrics for euro sign i standard fonts + (bug 2105 and bug 4654) + Submitted by: Rainer Garus +- Fix problem with computing remaining with i LineArea where start-indent <> 0 + (bug 4839) + Submitted by: Rainer Garus - Support for CMYK and embedded ICC profiles in jpeg images (Tore Engvig) - Support for jpeg images in PS Renderer (Tore Engvig) - Add support for EPS images in PostScript renderer and limited EPS support in diff --git a/lib/batik.jar b/lib/batik.jar index 465753a7e..186927b86 100644 Binary files a/lib/batik.jar and b/lib/batik.jar differ diff --git a/src/codegen/Courier-Bold.xml b/src/codegen/Courier-Bold.xml index 53c0a6f20..1ae0fbe51 100644 --- a/src/codegen/Courier-Bold.xml +++ b/src/codegen/Courier-Bold.xml @@ -28,6 +28,7 @@ + diff --git a/src/codegen/Courier-BoldOblique.xml b/src/codegen/Courier-BoldOblique.xml index 5dac9ae2f..bb84b7aa0 100644 --- a/src/codegen/Courier-BoldOblique.xml +++ b/src/codegen/Courier-BoldOblique.xml @@ -28,6 +28,7 @@ + diff --git a/src/codegen/Courier-Oblique.xml b/src/codegen/Courier-Oblique.xml index 701ec8534..afea38dde 100644 --- a/src/codegen/Courier-Oblique.xml +++ b/src/codegen/Courier-Oblique.xml @@ -28,6 +28,7 @@ + diff --git a/src/codegen/Courier.xml b/src/codegen/Courier.xml index 8ec2e8492..32e8413e9 100644 --- a/src/codegen/Courier.xml +++ b/src/codegen/Courier.xml @@ -28,6 +28,7 @@ + diff --git a/src/codegen/Helvetica-Bold.xml b/src/codegen/Helvetica-Bold.xml index 8e46115db..4ef3a432a 100644 --- a/src/codegen/Helvetica-Bold.xml +++ b/src/codegen/Helvetica-Bold.xml @@ -28,6 +28,7 @@ + diff --git a/src/codegen/Helvetica-BoldOblique.xml b/src/codegen/Helvetica-BoldOblique.xml index 777d3564a..6686b84fd 100644 --- a/src/codegen/Helvetica-BoldOblique.xml +++ b/src/codegen/Helvetica-BoldOblique.xml @@ -28,6 +28,7 @@ + diff --git a/src/codegen/Helvetica-Oblique.xml b/src/codegen/Helvetica-Oblique.xml index f002086e6..bea4e4010 100644 --- a/src/codegen/Helvetica-Oblique.xml +++ b/src/codegen/Helvetica-Oblique.xml @@ -28,6 +28,7 @@ + diff --git a/src/codegen/Helvetica.xml b/src/codegen/Helvetica.xml index a188996f1..28a35f066 100644 --- a/src/codegen/Helvetica.xml +++ b/src/codegen/Helvetica.xml @@ -28,6 +28,7 @@ + diff --git a/src/codegen/Times-Bold.xml b/src/codegen/Times-Bold.xml index fdb7dccfa..ec6c68548 100644 --- a/src/codegen/Times-Bold.xml +++ b/src/codegen/Times-Bold.xml @@ -28,6 +28,7 @@ + diff --git a/src/codegen/Times-BoldItalic.xml b/src/codegen/Times-BoldItalic.xml index 4bf4e579b..2ed674618 100644 --- a/src/codegen/Times-BoldItalic.xml +++ b/src/codegen/Times-BoldItalic.xml @@ -28,6 +28,7 @@ + diff --git a/src/codegen/Times-Italic.xml b/src/codegen/Times-Italic.xml index 83ab11330..0251f4012 100644 --- a/src/codegen/Times-Italic.xml +++ b/src/codegen/Times-Italic.xml @@ -28,6 +28,7 @@ + diff --git a/src/codegen/Times-Roman.xml b/src/codegen/Times-Roman.xml index d22f89e5f..2e895d48e 100644 --- a/src/codegen/Times-Roman.xml +++ b/src/codegen/Times-Roman.xml @@ -28,6 +28,7 @@ + diff --git a/src/org/apache/fop/layout/LineArea.java b/src/org/apache/fop/layout/LineArea.java index 45d39a456..a6e533d79 100644 --- a/src/org/apache/fop/layout/LineArea.java +++ b/src/org/apache/fop/layout/LineArea.java @@ -529,8 +529,7 @@ public class LineArea extends Area { int whitespaceWidth = currentFontState.width(currentFontState.mapChar(whitespaceIndex)); - int remainingWidth = this.getContentWidth() - - this.getCurrentXPosition(); + int remainingWidth = this.getRemainingWidth(); /** * checks whether leaderLenghtOptimum fits into rest of line; @@ -1030,7 +1029,7 @@ public class LineArea extends Area { } public int getRemainingWidth() { - return this.getContentWidth() - this.getCurrentXPosition(); + return this.getContentWidth() + startIndent - this.getCurrentXPosition(); } public void setLinkSet(LinkSet ls) {} @@ -1053,8 +1052,7 @@ public class LineArea extends Area { */ public int addCharacter(char data, LinkSet ls, boolean ul) { WordArea ia = null; - int remainingWidth = this.getContentWidth() - - this.getCurrentXPosition(); + int remainingWidth = this.getRemainingWidth(); int width = this.currentFontState.width(currentFontState.mapChar(data)); // if it doesn't fit, return