tore 01/12/09 09:17:10
Modified: lib Tag: fop-0_20_2-maintain batik.jar
. Tag: fop-0_20_2-maintain CHANGES
src/codegen Tag: fop-0_20_2-maintain Courier-Bold.xml
Courier-BoldOblique.xml Courier-Oblique.xml
Courier.xml Helvetica-Bold.xml
Helvetica-BoldOblique.xml Helvetica-Oblique.xml
Helvetica.xml Times-Bold.xml Times-BoldItalic.xml
Times-Italic.xml Times-Roman.xml
src/org/apache/fop/layout Tag: fop-0_20_2-maintain
LineArea.java
Log:
Submitted by: Rainer Garus <[EMAIL PROTECTED]>
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
Revision Changes Path
No revision
No revision
1.5.2.2 +6759 -8935xml-fop/lib/batik.jar
<<Binary file>>
No revision
No revision
1.10.2.4 +6 -0 xml-fop/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/xml-fop/CHANGES,v
retrieving revision 1.10.2.3
retrieving revision 1.10.2.4
diff -u -r1.10.2.3 -r1.10.2.4
--- CHANGES 2001/12/06 21:28:18 1.10.2.3
+++ CHANGES 2001/12/09 17:17:09 1.10.2.4
@@ -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 <[EMAIL PROTECTED]>
+- Fix problem with computing remaining with i LineArea where start-indent <> 0
+ (bug 4839)
+ Submitted by: Rainer Garus <[EMAIL PROTECTED]>
- 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
No revision
No revision
1.3.4.1 +1 -0 xml-fop/src/codegen/Courier-Bold.xml
Index: Courier-Bold.xml
===================================================================
RCS file: /home/cvs/xml-fop/src/codegen/Courier-Bold.xml,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- Courier-Bold.xml 2000/11/02 12:48:07 1.3
+++ Courier-Bold.xml 2001/12/09 17:17:09 1.3.4.1
@@ -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"/>
1.3.4.1 +1 -0 xml-fop/src/codegen/Courier-BoldOblique.xml
Index: Courier-BoldOblique.xml
===================================================================
RCS file: /home/cvs/xml-fop/src/codegen/Courier-BoldOblique.xml,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- Courier-BoldOblique.xml 2000/11/02 12:48:07 1.3
+++ Courier-BoldOblique.xml 2001/12/09 17:17:09 1.3.4.1
@@ -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"/>
1.3.4.1 +1 -0 xml-fop/src/codegen/Courier-Oblique.xml
Index: Courier-Oblique.xml
===================================================================
RCS file: /home/cvs/xml-fop/src/codegen/Courier-Oblique.xml,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- Courier-Oblique.xml 2000/11/02 12:48:08 1.3
+++ Courier-Oblique.xml 2001/12/09 17:17:09 1.3.4.1
@@ -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"/>
1.3.4.1 +1 -0 xml-fop/src/codegen/Courier.xml
Index: Courier.xml
===================================================================
RCS file: /home/cvs/xml-fop/src/codegen/Courier.xml,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- Courier.xml 2000/11/02 12:48:08 1.3
+++ Courier.xml 2001/12/09 17:17:09 1.3.4.1
@@ -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"/>
1.4.4.1 +1 -0 xml-fop/src/codegen/Helvetica-Bold.xml
Index: Helvetica-Bold.xml
===================================================================
RCS file: /home/cvs/xml-fop/src/codegen/Helvetica-Bold.xml,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -r1.4 -r1.4.4.1
--- Helvetica-Bold.xml 2000/11/28 06:51:14 1.4
+++ Helvetica-Bold.xml 2001/12/09 17:17:09 1.4.4.1
@@ -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"/>
1.4.4.1 +1 -0 xml-fop/src/codegen/Helvetica-BoldOblique.xml
Index: Helvetica-BoldOblique.xml
===================================================================
RCS file: /home/cvs/xml-fop/src/codegen/Helvetica-BoldOblique.xml,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -r1.4 -r1.4.4.1
--- Helvetica-BoldOblique.xml 2000/11/28 06:51:14 1.4
+++ Helvetica-BoldOblique.xml 2001/12/09 17:17:09 1.4.4.1
@@ -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"/>
1.3.4.1 +1 -0 xml-fop/src/codegen/Helvetica-Oblique.xml
Index: Helvetica-Oblique.xml
===================================================================
RCS file: /home/cvs/xml-fop/src/codegen/Helvetica-Oblique.xml,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- Helvetica-Oblique.xml 2000/11/02 12:48:10 1.3
+++ Helvetica-Oblique.xml 2001/12/09 17:17:09 1.3.4.1
@@ -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"/>
1.4.4.1 +1 -0 xml-fop/src/codegen/Helvetica.xml
Index: Helvetica.xml
===================================================================
RCS file: /home/cvs/xml-fop/src/codegen/Helvetica.xml,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -r1.4 -r1.4.4.1
--- Helvetica.xml 2000/11/27 05:32:40 1.4
+++ Helvetica.xml 2001/12/09 17:17:09 1.4.4.1
@@ -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"/>
1.4.4.1 +1 -0 xml-fop/src/codegen/Times-Bold.xml
Index: Times-Bold.xml
===================================================================
RCS file: /home/cvs/xml-fop/src/codegen/Times-Bold.xml,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -r1.4 -r1.4.4.1
--- Times-Bold.xml 2000/11/28 06:51:14 1.4
+++ Times-Bold.xml 2001/12/09 17:17:09 1.4.4.1
@@ -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"/>
1.4.4.1 +1 -0 xml-fop/src/codegen/Times-BoldItalic.xml
Index: Times-BoldItalic.xml
===================================================================
RCS file: /home/cvs/xml-fop/src/codegen/Times-BoldItalic.xml,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -r1.4 -r1.4.4.1
--- Times-BoldItalic.xml 2000/11/28 06:51:14 1.4
+++ Times-BoldItalic.xml 2001/12/09 17:17:09 1.4.4.1
@@ -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"/>
1.3.4.1 +1 -0 xml-fop/src/codegen/Times-Italic.xml
Index: Times-Italic.xml
===================================================================
RCS file: /home/cvs/xml-fop/src/codegen/Times-Italic.xml,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- Times-Italic.xml 2000/11/02 12:48:12 1.3
+++ Times-Italic.xml 2001/12/09 17:17:09 1.3.4.1
@@ -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"/>
1.4.4.1 +1 -0 xml-fop/src/codegen/Times-Roman.xml
Index: Times-Roman.xml
===================================================================
RCS file: /home/cvs/xml-fop/src/codegen/Times-Roman.xml,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -r1.4 -r1.4.4.1
--- Times-Roman.xml 2000/11/27 05:32:40 1.4
+++ Times-Roman.xml 2001/12/09 17:17:09 1.4.4.1
@@ -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"/>
No revision
No revision
1.53.2.2 +4 -6 xml-fop/src/org/apache/fop/layout/LineArea.java
Index: LineArea.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layout/LineArea.java,v
retrieving revision 1.53.2.1
retrieving revision 1.53.2.2
diff -u -r1.53.2.1 -r1.53.2.2
--- LineArea.java 2001/12/06 21:28:22 1.53.2.1
+++ LineArea.java 2001/12/09 17:17:09 1.53.2.2
@@ -1,5 +1,5 @@
/*
- * $Id: LineArea.java,v 1.53.2.1 2001/12/06 21:28:22 tore Exp $
+ * $Id: LineArea.java,v 1.53.2.2 2001/12/09 17:17:09 tore Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -529,8 +529,7 @@
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 int getRemainingWidth() {
- return this.getContentWidth() - this.getCurrentXPosition();
+ return this.getContentWidth() + startIndent - this.getCurrentXPosition();
}
public void setLinkSet(LinkSet ls) {}
@@ -1053,8 +1052,7 @@
*/
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
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
