diff options
| author | Jeremias Maerki <jeremias@apache.org> | 2005-05-13 19:16:54 +0000 |
|---|---|---|
| committer | Jeremias Maerki <jeremias@apache.org> | 2005-05-13 19:16:54 +0000 |
| commit | e835307c9373bed3a8f41bb43e4faee15fdaf548 (patch) | |
| tree | 04b42bcff456d9216e96b4cfcb572c59baba76e1 /src/java/org/apache/fop/traits | |
| parent | da85c0b44d79ca790b51fcc0e2700c30e72e9260 (diff) | |
| download | xmlgraphics-fop-e835307c9373bed3a8f41bb43e4faee15fdaf548.tar.gz xmlgraphics-fop-e835307c9373bed3a8f41bb43e4faee15fdaf548.zip | |
Merge of branch Temp_KnuthStylePageBreaking back into HEAD.
Temp_KnuthStylePageBreaking branch and HEAD have been tagged prior to the merge, so merging uncommitted work from the branch should be easier.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198627 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/fop/traits')
| -rw-r--r-- | src/java/org/apache/fop/traits/LayoutProps.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/java/org/apache/fop/traits/LayoutProps.java b/src/java/org/apache/fop/traits/LayoutProps.java index d4dee2653..b0129f632 100644 --- a/src/java/org/apache/fop/traits/LayoutProps.java +++ b/src/java/org/apache/fop/traits/LayoutProps.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. + * Copyright 1999-2005 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,6 +18,7 @@ package org.apache.fop.traits; +import org.apache.fop.datatypes.KeepValue; import org.apache.fop.fo.Constants; /** @@ -29,6 +30,13 @@ public class LayoutProps { public int breakBefore; // enum constant BreakBefore.xxx public int breakAfter; // enum constant BreakAfter.xxx + public KeepValue keepWithPrevious; /*LF*/ + public KeepValue keepWithNext; /*LF*/ + public KeepValue keepTogether; /*LF*/ + public int orphans; /*LF*/ + public int widows; /*LF*/ + public int blockProgressionUnit; /*LF*/ + public int lineStackingStrategy; /*LF*/ public boolean bIsSpan; public SpaceVal spaceBefore; public SpaceVal spaceAfter; |