cvs commit: xml-fop/src/org/apache/fop/layout LineArea.java
jeremias2003/06/06 00:28:00
Modified:src/org/apache/fop/layout Tag: fop-0_20_2-maintain
LineArea.java
Log:
Fix NoSuchMethodError when FOP is compiled under JDK1.4 but run under JDK1.3.
Reason: StringBuffer.append(StringBuffer) has been added with JDK1.4.
Revision ChangesPath
No revision
No revision
1.53.2.19 +4 -4 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.18
retrieving revision 1.53.2.19
diff -u -r1.53.2.18 -r1.53.2.19
--- LineArea.java 20 May 2003 20:50:52 - 1.53.2.18
+++ LineArea.java 6 Jun 2003 07:27:59 - 1.53.2.19
@@ -1214,7 +1214,7 @@
return wordStart;
} else if (hyph == null preString != null) {
// no hyphenation points, but a inword non-letter character
-remainingString.append(preString);
+remainingString.append(preString.toString());
this.addWord(remainingString, startw, ls, textState);
return wordStart + remainingString.length();
} else if (hyph != null preString == null) {
@@ -1230,12 +1230,12 @@
// hyphenation points and a inword non letter character
int index = getFinalHyphenationPoint(hyph, remainingWidth);
if (index != -1) {
-
remainingString.append(preString.append(hyph.getPreHyphenText(index)));
+
remainingString.append(preString.append(hyph.getPreHyphenText(index)).toString());
remainingString.append(this.hyphProps.hyphenationChar);
this.addWord(remainingString, startw, ls, textState);
return wordStart + remainingString.length() - 1;
} else {
-remainingString.append(preString);
+remainingString.append(preString.toString());
this.addWord(remainingString, startw, ls, textState);
return wordStart + remainingString.length();
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/layout LineArea.java
pietsch 2003/03/09 03:49:56
Modified:src/org/apache/fop/layout Tag: fop-0_20_2-maintain
LineArea.java
Log:
Corrected word area length for leader-pattern=dots and insert inline
space for adjustment if necessary.
Revision ChangesPath
No revision
No revision
1.53.2.17 +13 -6 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.16
retrieving revision 1.53.2.17
diff -u -r1.53.2.16 -r1.53.2.17
--- LineArea.java 2 Mar 2003 16:55:15 - 1.53.2.16
+++ LineArea.java 9 Mar 2003 11:49:56 - 1.53.2.17
@@ -181,9 +181,9 @@
}
void expand() {
char dot = '.';
-int dotWidth = currentFontState.getCharWidth(dot);
+int dotWidth = fontState.getCharWidth(dot);
char space = ' ';
-int spaceWidth = currentFontState.getCharWidth(space);
+int spaceWidth = fontState.getCharWidth(space);
int idx=children.indexOf(this);
children.remove(this);
switch (leaderPattern) {
@@ -242,12 +242,19 @@
for (int i = 0; i factor; i++) {
leaderChars[i] = dot;
}
+String leaderWord = new String(leaderChars);
+int leaderWordWidth = fontState.getWordWidth(leaderWord);
WordArea leaderPatternArea =
-new WordArea(currentFontState, red, green, blue,
- new String(leaderChars),
- leaderLengthOptimum);
+new WordArea(fontState, red, green, blue,
+ leaderWord,leaderWordWidth);
leaderPatternArea.setYOffset(placementOffset);
children.add(idx, leaderPatternArea);
+int spaceAfterLeader = leaderLengthOptimum
+- leaderWordWidth;
+if (spaceAfterLeader!=0) {
+children.add(idx+1, new InlineSpace(spaceAfterLeader,
+false));
+}
} else {
// if leader-alignment is used, calculate space to
// insert before leader so that all dots will be
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/layout LineArea.java
pietsch 2002/07/06 13:17:32
Modified:src/org/apache/fop/layout Tag: fop-0_20_2-maintain
LineArea.java
Log:
Flush pending areas and space before adding first part of
hyphenated word. Pass text decoration and link set and
use it at the point the word area is created.
Delete wrong return value in case the word could not be
hyphenated in doHyphenate
PR: 2106, 6042, 10374, 4511
Revision ChangesPath
No revision
No revision
1.53.2.6 +100 -101 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.5
retrieving revision 1.53.2.6
diff -u -r1.53.2.5 -r1.53.2.6
--- LineArea.java 11 Feb 2002 00:43:45 - 1.53.2.5
+++ LineArea.java 6 Jul 2002 20:17:31 - 1.53.2.6
@@ -155,7 +155,9 @@
else
b = null;
}
-pendingWidth = prevLineArea.getPendingWidth() - eatenWidth;
+pendingWidth = prevLineArea.pendingWidth - eatenWidth;
+prevLineArea.pendingWidth=0;
+prevLineArea.pendingAreas=null;
}
}
@@ -166,12 +168,14 @@
public int addPageNumberCitation(String refid, LinkSet ls) {
/*
- * We should add code here to handle the case where the page number doesn't
fit on the current line
+ * We should add code here to handle the case where the page
+ * number doesn't fit on the current line
*/
-// Space must be alloted to the page number, so currently we give it 3
spaces
+// Space must be allocated for the page number, so currently we
+// give it 3 spaces
-int width = currentFontState.width(currentFontState.mapChar(' '));
+int width = 3*getCharWidth(' ');
PageNumberInlineArea pia = new PageNumberInlineArea(currentFontState,
@@ -191,7 +195,7 @@
*
* @return int character position
*/
-public int addText(char odata[], int start, int end, LinkSet ls,
+public int addText(char data[], int start, int end, LinkSet ls,
TextState textState) {
// this prevents an array index out of bounds
// which occurs when some text is laid out again.
@@ -205,11 +209,6 @@
// With CID fonts, space isn't neccesary currentFontState.width(32)
int whitespaceWidth = getCharWidth(' ');
-char[] data = new char[odata.length];
-char[] dataCopy = new char[odata.length];
-System.arraycopy(odata, 0, data, 0, odata.length);
-System.arraycopy(odata, 0, dataCopy, 0, odata.length);
-
boolean isText = false;
boolean isMultiByteChar = false;
@@ -498,11 +497,14 @@
if (hyphProps.hyphenate == Hyphenate.TRUE) {
int ret = wordStart;
-ret = this.doHyphenation(dataCopy, i, wordStart,
+ret = this.doHyphenation(data, i, wordStart,
this.getContentWidth()
- (finalWidth
+ spaceWidth
-+ pendingWidth));
++ pendingWidth),
+ finalWidth + spaceWidth
+ + embeddedLinkStart,
+ ls, textState);
// current word couldn't be hypenated
// couldn't fit first word
@@ -514,8 +516,7 @@
MessageHandler.log(area contents overflows area);
addSpacedWord(new String(data, wordStart,
wordLength - 1),
ls,
- finalWidth + spaceWidth
- + embeddedLinkStart,
+ embeddedLinkStart,
spaceWidth, textState, false);
finalWidth += wordWidth;
@@ -586,12 +587,10 @@
int leaderPatternWidth, int leaderAlignment) {
WordArea leaderPatternArea;
int leaderLength = 0;
-char dotIndex = '.'; // currentFontState.mapChar('.');
-int dotWidth =
-
cvs commit: xml-fop/src/org/apache/fop/layout LineArea.java
tore01/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 ChangesPath 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
cvs commit: xml-fop/src/org/apache/fop/layout LineArea.java
tore01/12/06 13:28:22 Modified:.Tag: fop-0_20_2-maintain CHANGES docs/examples/advanced Tag: fop-0_20_2-maintain cid-fonts.fo giro.fo docs/examples/fo Tag: fop-0_20_2-maintain border.fo bordershorthand.fo character.fo corresprop.fo extensive.fo fonts.fo hyphen.fo images.fo inhprop.fo instream.fo leader.fo link.fo list.fo newlinktest.fo normal.fo normalex.fo pdfoutline.fo readme.fo simple.fo table.fo tableunits.fo textdeko.fo docs/examples/footnotes Tag: fop-0_20_2-maintain columns.fo simple.fo docs/examples/keeps_and_breaks Tag: fop-0_20_2-maintain columnlevel1.fo pagelevel1.fo pagelevel2.fo pagelevel3.fo pagelevel4.fo docs/examples/markers Tag: fop-0_20_2-maintain glossary.xsl hide.fo docs/examples/pagination Tag: fop-0_20_2-maintain allregions.fo basic1.fo basic2.fo franklin_2pageseqs.fo franklin_alt.fo franklin_rep.fo franklin_rep_max_repeats.fo franklin_rep_max_repeats_expl.fo franklin_rep_max_repeats_nl.fo docs/examples/region_body Tag: fop-0_20_2-maintain simplecol.fo simplecol2.fo simplecol3.fo simplecol4.fo docs/examples/svg Tag: fop-0_20_2-maintain embedding.fo external.fo docs/examples/tables Tag: fop-0_20_2-maintain background.fo borders.fo break.fo headfoot.fo keep.fo omit.fo space.fo widowsorphans.fo src/codegen Tag: fop-0_20_2-maintain foproperties.xml src/org/apache/fop/fo/expr Tag: fop-0_20_2-maintain PropertyParser.java src/org/apache/fop/fo/flow Tag: fop-0_20_2-maintain Block.java src/org/apache/fop/fo/pagination Tag: fop-0_20_2-maintain ConditionalPageMasterReference.java PageMasterReference.java PageSequence.java src/org/apache/fop/layout Tag: fop-0_20_2-maintain LineArea.java Log: Submitted by: Christian Geisert [[EMAIL PROTECTED]] Changed master-name to master-reference on fo:page-sequence, fo:single-page-master-reference, fo:repeatable-page-master-reference and fo:conditional-page-master-reference to comply with the latest XSL recommendation. Also changed the unimplemented property space-treatment to white-space-treatment and updated examples to use the new syntax. Revision ChangesPath No revision No revision 1.10.2.3 +6 -0 xml-fop/CHANGES Index: CHANGES === RCS file: /home/cvs/xml-fop/CHANGES,v retrieving revision 1.10.2.2 retrieving revision 1.10.2.3 diff -u -r1.10.2.2 -r1.10.2.3 --- CHANGES 2001/12/04 06:49:32 1.10.2.2 +++ CHANGES 2001/12/06 21:28:18 1.10.2.3 @@ -27,6 +27,12 @@ remaining for content. (Karen Lease) *** Properties +- Changed master-name to master-reference on fo:page-sequence, + fo:single-page-master-reference, fo:repeatable-page-master-reference and + fo:conditional-page-master-reference to comply with the latest XSL recommendation. + Also changed the unimplemented property space-treatment to white-space-treatment and + updated examples to use the new syntax. + Submitted by: Christian Geisert [[EMAIL PROTECTED]] - Add support for inline-progression-dimension and table-layout. (Karen) - Add support for letter-spacing. Submitted by: Raymond Penners [EMAIL PROTECTED] No revision No revision 1.2.2.1 +1 -1 xml-fop/docs/examples/advanced/cid-fonts.fo Index: cid-fonts.fo === RCS file: /home/cvs/xml-fop/docs/examples/advanced/cid-fonts.fo,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- cid-fonts.fo 2001/05/18 09:55:46 1.2 +++ cid-fonts.fo 2001/12/06 21:28:18 1.2.2.1 @@ -70,7 +70,7 @@ /fox:outline - fo:page-sequence master-name=A4 + fo:page-sequence master-reference=A4 fo:flow flow-name=xsl-region-body fo:wrapper font-family=Times font-size=12pt text-align=justify 1.1.2.1 +5 -5 xml-fop/docs/examples/advanced/giro.fo Index: giro.fo === RCS file:
