From: Vincent Hennebert <vhennebert@apache.org>
Date: Mon, 13 Jan 2014 20:39:34 +0000 (+0000)
Subject: Brought the branch in sync with rev. r1556164 of trunk
X-Git-Tag: fop-2_0~137^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=37c00cdf4e9bc4b922c5961bd3f38f7ed0f0d3f0;p=xmlgraphics-fop.git

Brought the branch in sync with rev. r1556164 of trunk


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_InlineContainer@1557840 13f79535-47bb-0310-9956-ffa450edef68
---

37c00cdf4e9bc4b922c5961bd3f38f7ed0f0d3f0
diff --cc src/java/org/apache/fop/fo/flow/InlineContainer.java
index bcff3dc72,cf970c325..5c95fa34e
--- a/src/java/org/apache/fop/fo/flow/InlineContainer.java
+++ b/src/java/org/apache/fop/fo/flow/InlineContainer.java
@@@ -87,7 -96,8 +87,8 @@@ public class InlineContainer extends FO
          overflow = pList.get(PR_OVERFLOW).getEnum();
          referenceOrientation = pList.get(PR_REFERENCE_ORIENTATION).getNumeric();
          writingModeTraits = new WritingModeTraits(
-                 WritingMode.valueOf(pList.get(PR_WRITING_MODE).getEnum()));
 -            WritingMode.valueOf(pList.get(PR_WRITING_MODE).getEnum()),
 -            pList.getExplicit(PR_WRITING_MODE) != null);
++                WritingMode.valueOf(pList.get(PR_WRITING_MODE).getEnum()),
++                pList.getExplicit(PR_WRITING_MODE) != null);
      }
  
      /**
@@@ -174,26 -181,20 +175,34 @@@
          return lineHeight;
      }
  
 -    /** @return the "overflow" FO trait */
 -    public int getOverflow() {
 -        return overflow;
 +    public Length getAlignmentAdjust() {
 +        return alignmentAdjust;
      }
  
 -    /** @return the "reference-orientation" FO trait */
 -    public int getReferenceOrientation() {
 -        return referenceOrientation.getValue();
 +    public int getAlignmentBaseline() {
 +        return alignmentBaseline;
 +    }
 +
 +    public Length getBaselineShift() {
 +        return baselineShift;
 +    }
 +
 +    public int getDominantBaseline() {
 +        return dominantBaseline;
 +    }
 +
 +    public WritingMode getWritingMode() {
 +        return writingModeTraits.getWritingMode();
      }
  
+     /**
 -     * Obtain inline progression direction.
 -     * @return the inline progression direction
++     * Obtain writing mode explicit indicator.
++     * @return the writing mode explicit indicator
+      */
++    public boolean getExplicitWritingMode() {
++        return writingModeTraits.getExplicitWritingMode();
++    }
++
      public Direction getInlineProgressionDirection() {
          return writingModeTraits.getInlineProgressionDirection();
      }
@@@ -219,9 -265,9 +228,14 @@@
          return false;
      }
  
 +    @Override
 +    public boolean generatesReferenceAreas() {
 +        return true;
 +    }
 +
+     @Override
+     protected boolean isBidiBoundary(boolean propagate) {
+         return getExplicitWritingMode();
+     }
+ 
  }