Author: vhennebert
Date: Mon Jul 27 15:37:07 2009
New Revision: 798191
URL: http://svn.apache.org/viewvc?rev=798191&view=rev
Log:
Bugfix: make hyphenated paragraphs work with changing IPD
Modified:
xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
xmlgraphics/fop/branches/Temp_ChangingIPDHack/test/layoutengine/standard-testcases/flow_changing-ipd_1.xml
Modified:
xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java?rev=798191&r1=798190&r2=798191&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
(original)
+++
xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
Mon Jul 27 15:37:07 2009
@@ -174,6 +174,11 @@
private LineLayoutPossibilities lineLayouts;
private List lineLayoutsList;
private int ipd = 0;
+ /**
+ * When layout must be re-started due to a change of IPD, there is no need
+ * to perform hyphenation on the remaining Knuth sequence once again.
+ */
+ private boolean hyphenationPerformed;
/**
* this constant is used to create elements when text-align is center:
@@ -786,7 +791,8 @@
this);
if (hyphenationProperties.hyphenate.getEnum() == EN_TRUE
- && fobj.getWrapOption() != EN_NO_WRAP) {
+ && fobj.getWrapOption() != EN_NO_WRAP &&
!hyphenationPerformed) {
+ hyphenationPerformed = true;
findHyphenationPoints(currPar);
}
Modified:
xmlgraphics/fop/branches/Temp_ChangingIPDHack/test/layoutengine/standard-testcases/flow_changing-ipd_1.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ChangingIPDHack/test/layoutengine/standard-testcases/flow_changing-ipd_1.xml?rev=798191&r1=798190&r2=798191&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ChangingIPDHack/test/layoutengine/standard-testcases/flow_changing-ipd_1.xml
(original)
+++
xmlgraphics/fop/branches/Temp_ChangingIPDHack/test/layoutengine/standard-testcases/flow_changing-ipd_1.xml
Mon Jul 27 15:37:07 2009
@@ -39,7 +39,7 @@
</fo:page-sequence-master>
</fo:layout-master-set>
<fo:page-sequence master-reference="pages">
- <fo:flow flow-name="xsl-region-body">
+ <fo:flow flow-name="xsl-region-body" language="en" hyphenate="true">
<fo:block text-align="justify" id="surrounding"
space-before.minimum="10pt"
space-before.optimum="12pt"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
