Layout changed to account for fo:region-body borders and padding when

determining printable width and height for each page.

Various method nitpicks also fixed.


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

1 files changed, 4 insertions, 4 deletions

diff --git a/src/java/org/apache/fop/util/CharUtilities.java b/src/java/org/apache/fop/util/CharUtilities.java
index c03c407ba..c1ceb7c78 100644
--- a/src/java/org/apache/fop/util/CharUtilities.java
+++ b/src/java/org/apache/fop/util/CharUtilities.java
@@ -111,12 +111,12 @@ public class CharUtilities {
 
     /**
      * Helper method to determine if the character is a
-     * space with normal behaviour. Normal behaviour means that
+     * space with normal behavior. Normal behavior means that
      * it's not non-breaking.
      * @param c character to inspect
      * @return True if the character is a normal space
      */
-    public static boolean isSpace(char c) {
+    public static boolean isBreakableSpace(char c) {
         return (c == ' '
                || (c >= '\u2000' && c <= '\u200B'));
 //         c == '\u2000'                   // en quad
@@ -139,7 +139,7 @@ public class CharUtilities {
      * @param c character to check
      * @return True if the character is a nbsp
      */
-    public static boolean isNBSP(char c) {
+    public static boolean isNonBreakableSpace(char c) {
         return
             (c == '\u00A0'      // no-break space
             || c == '\u202F'    // narrow no-break space
@@ -153,7 +153,7 @@ public class CharUtilities {
      * @return True if the character represents any kind of space
      */
     public static boolean isAnySpace(char c) {
-        boolean ret = (isSpace(c) || isNBSP(c));
+        boolean ret = (isBreakableSpace(c) || isNonBreakableSpace(c));
         return ret;
     }
 }