You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by lf...@apache.org on 2004/12/06 14:55:19 UTC

cvs commit: xml-fop/src/java/org/apache/fop/layoutmgr TextLayoutManager.java

lfurini     2004/12/06 05:55:18

  Modified:    src/java/org/apache/fop/layoutmgr TextLayoutManager.java
  Log:
  Using the constant LineLayoutManager.DEFAULT_SPACE_WIDTH instead of the font-dependant wordSpaceIPD.opt when creating auxiliary glue items for start and end alignment
  
  Revision  Changes    Path
  1.28      +4 -4      xml-fop/src/java/org/apache/fop/layoutmgr/TextLayoutManager.java
  
  Index: TextLayoutManager.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/TextLayoutManager.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- TextLayoutManager.java	24 Nov 2004 21:07:30 -0000	1.27
  +++ TextLayoutManager.java	6 Dec 2004 13:55:18 -0000	1.28
  @@ -720,14 +720,14 @@
                                         (short) 1, (short) 0,
                                         wordSpaceIPD, false));
                       returnList.add
  -                        (new KnuthGlue(0, 3 * wordSpaceIPD.opt, 0,
  +                        (new KnuthGlue(0, 3 * LineLayoutManager.DEFAULT_SPACE_WIDTH, 0,
                                          new LeafPosition(this, vecAreaInfo.size() - 1), false));
                       returnList.add
                           (new KnuthPenalty(0, 0, false,
                                             new LeafPosition(this, -1), true));
                       returnList.add
                           (new KnuthGlue(wordSpaceIPD.opt,
  -                                       - 3 * wordSpaceIPD.opt, 0,
  +                                       - 3 * LineLayoutManager.DEFAULT_SPACE_WIDTH, 0,
                                          new LeafPosition(this, -1), true));
                       iNextStart ++;
                       break;
  @@ -1016,14 +1016,14 @@
                   case EN_START  : // fall through
                   case EN_END    :
                       returnList.add
  -                        (new KnuthGlue(0, 3 * wordSpaceIPD.opt, 0,
  +                        (new KnuthGlue(0, 3 * LineLayoutManager.DEFAULT_SPACE_WIDTH, 0,
                                          new LeafPosition(this, iReturnedIndex), false));
                       returnList.add
                           (new KnuthPenalty(0, 0, false,
                                             new LeafPosition(this, -1), true));
                       returnList.add
                           (new KnuthGlue(wordSpaceIPD.opt,
  -                                       - 3 * wordSpaceIPD.opt, 0,
  +                                       - 3 * LineLayoutManager.DEFAULT_SPACE_WIDTH, 0,
                                          new LeafPosition(this, -1), true));
                       iReturnedIndex ++;
                       break;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org