cvs commit: xml-fop/src/org/apache/fop/fo FOText.java

2003-03-02 Thread pietsch 
pietsch 2003/03/02 05:04:16

  Modified:src/org/apache/fop/fo Tag: fop-0_20_2-maintain FOText.java
  Log:
  Fixed destructive data mangling while preparing text for small-caps
  font variation. The fix is simplisitc and can cause small caps
  text to be expensive in terms of memory consumption and processing
  time.
  PR: 1171
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.24.2.8  +6 -3  xml-fop/src/org/apache/fop/fo/FOText.java
  
  Index: FOText.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FOText.java,v
  retrieving revision 1.24.2.7
  retrieving revision 1.24.2.8
  diff -u -r1.24.2.7 -r1.24.2.8
  --- FOText.java   25 Feb 2003 12:56:54 -  1.24.2.7
  +++ FOText.java   2 Mar 2003 13:04:15 -   1.24.2.8
  @@ -209,6 +209,7 @@
   
   // parse text for upper/lower case and call addRealText
   char c;
  +char newdata[] = new char[end];
   boolean isLowerCase;
   int caseStart;
   FontState fontStateToUse;
  @@ -221,7 +222,9 @@
   == (java.lang.Character.isLetter(c)
java.lang.Character.isLowerCase(c))) {
   if (isLowerCase) {
  -data[i] = java.lang.Character.toUpperCase(c);
  +newdata[i] = java.lang.Character.toUpperCase(c);
  +} else {
  +newdata[i] = c;
   }
   i++;
   if (i == end)
  @@ -235,7 +238,7 @@
   }
   int index = addRealText(ba, fontStateToUse, red, green, blue,
   wrapOption, ls, whiteSpaceCollapse,
  -data, caseStart, i, textState,
  +newdata, caseStart, i, textState,
   vAlign);
   if (index != -1) {
   return index;
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: xml-fop/src/org/apache/fop/fo FOText.java

2002-08-09 Thread keiron 

keiron  2002/08/09 03:56:03

  Modified:src/org/apache/fop/fo FOText.java
  Log:
  fixed compile error
  
  Revision  ChangesPath
  1.38  +1 -4  xml-fop/src/org/apache/fop/fo/FOText.java
  
  Index: FOText.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FOText.java,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- FOText.java   20 Jun 2002 09:14:12 -  1.37
  +++ FOText.java   9 Aug 2002 10:56:03 -   1.38
  @@ -14,7 +14,6 @@
   import org.apache.fop.fo.properties.*;
   import org.apache.fop.apps.FOPException;
   import org.apache.fop.layoutmgr.LayoutManager;
  -import org.apache.fop.layoutmgr.TextLayoutManager;
   import org.apache.fop.layoutmgr.TextBPLayoutManager;
   import org.apache.fop.apps.StructureHandler;
   
  @@ -77,8 +76,6 @@
   ca = new char[length];
   System.arraycopy(tmp, 0, ca, 0, length);
   }
  -// list.add(new TextLayoutManager(this, ca, textInfo));
  - // TEST VARIANT USING Karen's BreakPoss scheme
   list.add(new TextBPLayoutManager(this, ca, textInfo));
   }
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: xml-fop/src/org/apache/fop/fo FOText.java FObj.java

2002-03-08 Thread keiron 

keiron  02/03/08 07:41:47

  Modified:src/org/apache/fop/fo FOText.java FObj.java
  Log:
  removed unneeded imports
  
  Revision  ChangesPath
  1.30  +1 -2  xml-fop/src/org/apache/fop/fo/FOText.java
  
  Index: FOText.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FOText.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- FOText.java   8 Jan 2002 09:52:16 -   1.29
  +++ FOText.java   8 Mar 2002 15:41:47 -   1.30
  @@ -1,5 +1,5 @@
   /*
  - * $Id: FOText.java,v 1.29 2002/01/08 09:52:16 keiron Exp $
  + * $Id: FOText.java,v 1.30 2002/03/08 15:41:47 keiron 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.
  @@ -15,7 +15,6 @@
   import org.apache.fop.datatypes.*;
   import org.apache.fop.fo.properties.*;
   import org.apache.fop.apps.FOPException;
  -import org.apache.fop.system.BufferManager;
   import org.apache.fop.layoutmgr.LayoutManager;
   import org.apache.fop.layoutmgr.TextLayoutManager;
   
  
  
  
  1.28  +1 -2  xml-fop/src/org/apache/fop/fo/FObj.java
  
  Index: FObj.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FObj.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- FObj.java 21 Nov 2001 22:13:36 -  1.27
  +++ FObj.java 8 Mar 2002 15:41:47 -   1.28
  @@ -1,5 +1,5 @@
   /*
  - * $Id: FObj.java,v 1.27 2001/11/21 22:13:36 klease Exp $
  + * $Id: FObj.java,v 1.28 2002/03/08 15:41:47 keiron 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.
  @@ -17,7 +17,6 @@
   import org.apache.fop.layout.Area;
   import org.apache.fop.layout.AreaClass;
   import org.apache.fop.layout.LinkSet;
  -import org.apache.fop.system.BufferManager;
   import org.apache.fop.fo.flow.Marker;
   
   // Java
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]