PR:

Obtained from:
Submitted by:	Rainer Garus <rainer.garus@nexgo.de>

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 b8ac46615feb100e0ee94c13d1e95a161b57a61e..bf8f265b80310e37d3a2ba682d2862ce9c87b1ff 100644 (file)
--- 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 <rainer.garus@nexgo.de>
+- Fix problem with computing remaining with i LineArea where start-indent <> 0
+  (bug 4839)
+  Submitted by: Rainer Garus <rainer.garus@nexgo.de>
 - 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 465753a7edbda3880025cbe4091d090cbe0d07ff..186927b8612b78c1911d379c464366e64ef4b9e0 100644 (file)
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 53c0a6f20aa4c8f2c559313c8ebaf59e31914661..1ae0fbe51e50b39f57084f8aff0b26224cff92e0 100644 (file)
--- a/src/codegen/Courier-Bold.xml
+++ b/src/codegen/Courier-Bold.xml
@@ -28,6 +28,7 @@
       <char name="Edieresis" width="600"/>
       <char name="Egrave" width="600"/>
       <char name="Eth" width="600"/>
+      <char name="Euro" width="600"/>
       <char name="F" width="600"/>
       <char name="G" width="600"/>
       <char name="Gcaron" width="600"/>

diff --git a/src/codegen/Courier-BoldOblique.xml b/src/codegen/Courier-BoldOblique.xml
index 5dac9ae2fd48a9a9cdd3b3ee0f03c0a95d32f0a6..bb84b7aa094316321c85a14c1cca2bb6ffc45153 100644 (file)
--- a/src/codegen/Courier-BoldOblique.xml
+++ b/src/codegen/Courier-BoldOblique.xml
@@ -28,6 +28,7 @@
       <char name="Edieresis" width="600"/>
       <char name="Egrave" width="600"/>
       <char name="Eth" width="600"/>
+      <char name="Euro" width="600"/>
       <char name="F" width="600"/>
       <char name="G" width="600"/>
       <char name="Gcaron" width="600"/>

diff --git a/src/codegen/Courier-Oblique.xml b/src/codegen/Courier-Oblique.xml
index 701ec85340990349869fc5be83cef5b75e4c8505..afea38dde2fc6d08164ccf000683a5cbfae65ad4 100644 (file)
--- a/src/codegen/Courier-Oblique.xml
+++ b/src/codegen/Courier-Oblique.xml
@@ -28,6 +28,7 @@
       <char name="Edieresis" width="600"/>
       <char name="Egrave" width="600"/>
       <char name="Eth" width="600"/>
+      <char name="Euro" width="600"/>
       <char name="F" width="600"/>
       <char name="G" width="600"/>
       <char name="Gcaron" width="600"/>

diff --git a/src/codegen/Courier.xml b/src/codegen/Courier.xml
index 8ec2e8492bb8eb2ed087db3bac4b15df4359207a..32e8413e91331cdb182c95b1c57513209c847133 100644 (file)
--- a/src/codegen/Courier.xml
+++ b/src/codegen/Courier.xml
@@ -28,6 +28,7 @@
       <char name="Edieresis" width="600"/>
       <char name="Egrave" width="600"/>
       <char name="Eth" width="600"/>
+      <char name="Euro" width="600"/>
       <char name="F" width="600"/>
       <char name="G" width="600"/>
       <char name="Gcaron" width="600"/>

diff --git a/src/codegen/Helvetica-Bold.xml b/src/codegen/Helvetica-Bold.xml
index 8e46115db20c526753a47bd0031d31c5fbe27a61..4ef3a432ae22861302819cbcb0779841bffc355d 100644 (file)
--- a/src/codegen/Helvetica-Bold.xml
+++ b/src/codegen/Helvetica-Bold.xml
@@ -28,6 +28,7 @@
       <char name="Edieresis" width="667"/>
       <char name="Egrave" width="667"/>
       <char name="Eth" width="722"/>
+      <char name="Euro" width="556"/>
       <char name="F" width="611"/>
       <char name="G" width="778"/>
       <char name="H" width="722"/>

diff --git a/src/codegen/Helvetica-BoldOblique.xml b/src/codegen/Helvetica-BoldOblique.xml
index 777d3564a239501dfcdcdd114f9d11ce6a96878d..6686b84fd038d1b4a52c64dc634c4701def2a339 100644 (file)
--- a/src/codegen/Helvetica-BoldOblique.xml
+++ b/src/codegen/Helvetica-BoldOblique.xml
@@ -28,6 +28,7 @@
       <char name="Edieresis" width="667"/>
       <char name="Egrave" width="667"/>
       <char name="Eth" width="722"/>
+      <char name="Euro" width="556"/>
       <char name="F" width="611"/>
       <char name="G" width="778"/>
       <char name="H" width="722"/>

diff --git a/src/codegen/Helvetica-Oblique.xml b/src/codegen/Helvetica-Oblique.xml
index f002086e61f36ebd73e2cc23d4590dec47870e1a..bea4e40108a1c34fe5891842f953177c75ad4c03 100644 (file)
--- a/src/codegen/Helvetica-Oblique.xml
+++ b/src/codegen/Helvetica-Oblique.xml
@@ -28,6 +28,7 @@
       <char name="Edieresis" width="667"/>
       <char name="Egrave" width="667"/>
       <char name="Eth" width="722"/>
+      <char name="Euro" width="556"/>
       <char name="F" width="611"/>
       <char name="G" width="778"/>
       <char name="H" width="722"/>

diff --git a/src/codegen/Helvetica.xml b/src/codegen/Helvetica.xml
index a188996f1d6de0859f3b357894f3493fe623c7ec..28a35f066895e8dc0a309dcacaa41bb5af238965 100644 (file)
--- a/src/codegen/Helvetica.xml
+++ b/src/codegen/Helvetica.xml
@@ -28,6 +28,7 @@
       <char name="Edieresis" width="667"/>
       <char name="Egrave" width="667"/>
       <char name="Eth" width="722"/>
+      <char name="Euro" width="556"/>
       <char name="F" width="611"/>
       <char name="G" width="778"/>
       <char name="H" width="722"/>

diff --git a/src/codegen/Times-Bold.xml b/src/codegen/Times-Bold.xml
index fdb7dccfa634f6576ac96f8cb31abe812598e158..ec6c68548ca7093b642bd1532d8f0aad8da72a23 100644 (file)
--- a/src/codegen/Times-Bold.xml
+++ b/src/codegen/Times-Bold.xml
@@ -28,6 +28,7 @@
       <char name="Edieresis" width="667"/>
       <char name="Egrave" width="667"/>
       <char name="Eth" width="722"/>
+      <char name="Euro" width="500"/>
       <char name="F" width="611"/>
       <char name="G" width="778"/>
       <char name="H" width="778"/>

diff --git a/src/codegen/Times-BoldItalic.xml b/src/codegen/Times-BoldItalic.xml
index 4bf4e579b21be33361ab8dc463a52bed54223b9d..2ed67461893d98e17648e4def793e6b1b1fe9b56 100644 (file)
--- a/src/codegen/Times-BoldItalic.xml
+++ b/src/codegen/Times-BoldItalic.xml
@@ -28,6 +28,7 @@
       <char name="Edieresis" width="667"/>
       <char name="Egrave" width="667"/>
       <char name="Eth" width="722"/>
+      <char name="Euro" width="500"/>
       <char name="F" width="667"/>
       <char name="G" width="722"/>
       <char name="H" width="778"/>

diff --git a/src/codegen/Times-Italic.xml b/src/codegen/Times-Italic.xml
index 83ab113300adb959b2727e4c184cccbc9024461b..0251f4012fbc958248346845286c62ef55fb8c4c 100644 (file)
--- a/src/codegen/Times-Italic.xml
+++ b/src/codegen/Times-Italic.xml
@@ -28,6 +28,7 @@
       <char name="Edieresis" width="611"/>
       <char name="Egrave" width="611"/>
       <char name="Eth" width="722"/>
+      <char name="Euro" width="500"/>
       <char name="F" width="611"/>
       <char name="G" width="722"/>
       <char name="H" width="722"/>

diff --git a/src/codegen/Times-Roman.xml b/src/codegen/Times-Roman.xml
index d22f89e5f00c4e1e4c6e2363dbe7473a86f1abdd..2e895d48e55ac65528c2d72a12f8bdcbb170da6d 100644 (file)
--- a/src/codegen/Times-Roman.xml
+++ b/src/codegen/Times-Roman.xml
@@ -28,6 +28,7 @@
       <char name="Edieresis" width="611"/>
       <char name="Egrave" width="611"/>
       <char name="Eth" width="722"/>
+      <char name="Euro" width="500"/>
       <char name="F" width="556"/>
       <char name="G" width="722"/>
       <char name="H" width="722"/>

diff --git a/src/org/apache/fop/layout/LineArea.java b/src/org/apache/fop/layout/LineArea.java
index 45d39a456da901dadf0e6857f67b428a1c82a08b..a6e533d7950492004a3c691b98c18e769d93041d 100644 (file)
--- 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