[prev in list] [next in list] [prev in thread] [next in thread] 

List:       fop-cvs
Subject:    cvs commit: xml-fop/src/java/org/apache/fop/fo/properties IndentPropertyMaker.java
From:       bckfnn () apache ! org
Date:       2004-09-22 19:19:36
Message-ID: 20040922191936.51623.qmail () minotaur ! apache ! org
[Download RAW message or body]

bckfnn      2004/09/22 12:19:36

  Modified:    src/java/org/apache/fop/fo/properties
                        IndentPropertyMaker.java
  Log:
  Calculate the [start|end]-indent in the first 2 cases in 5.3.2. The last
  case (no absolute margin specified) still needs more work.
  
  Revision  Changes    Path
  1.7       +5 -6      \
xml-fop/src/java/org/apache/fop/fo/properties/IndentPropertyMaker.java  
  Index: IndentPropertyMaker.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/IndentPropertyMaker.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- IndentPropertyMaker.java	22 May 2004 21:44:37 -0000	1.6
  +++ IndentPropertyMaker.java	22 Sep 2004 19:19:36 -0000	1.7
  @@ -77,12 +77,11 @@
           // Calculate the values as described in 5.3.2.
           try {
               Numeric v = new FixedLength(0);
  -            /*
  -            if (!propertyList.getFObj().generatesInlineAreas()) {
  -                String propName = FOPropertyMapping.getPropertyName(this.propId);
  -                v = v.add(propertyList.getInherited(propName).getNumeric());
  +            if (!propertyList.getFObj().generatesReferenceAreas()) {
  +                // The inherited_value_of([start|end]-indent)
  +                v = NumericOp.addition(v, \
propertyList.getInherited(this.baseMaker.propId).getNumeric());  }
  -            */
  +            // The corresponding absolute margin-[right|left}.
               v = NumericOp.addition(v, \
                propertyList.get(propertyList.getWritingMode(lr_tb, rl_tb, \
                tb_rl)).getNumeric());
               v = NumericOp.addition(v, getCorresponding(paddingCorresponding, \
                propertyList).getNumeric());
               v = NumericOp.addition(v, getCorresponding(borderWidthCorresponding, \
propertyList).getNumeric());  
  
  

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


[prev in list] [next in list] [prev in thread] [next in thread]