You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by vh...@apache.org on 2013/05/07 18:23:17 UTC

svn commit: r1479969 [9/16] - in /xmlgraphics/fop/trunk: ./ src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/ src/codegen/unicode/java/org/apache/fop/hyphenation/ src/java/org/apache/fop/afp/ src/java/org/apache/fop/afp/modca/ src/java/org/a...

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/Positionable.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/Positionable.java?rev=1479969&r1=1479968&r2=1479969&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/Positionable.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/Positionable.java Tue May  7 16:23:13 2013
@@ -44,7 +44,7 @@ public interface Positionable {
      * @return array (sequence) of 4-tuples of placement [PX,PY] and advance [AX,AY] adjustments, in that order,
      * with one 4-tuple for each element of glyph sequence, or null if no non-zero adjustment applies
      */
-    int[][] performPositioning (CharSequence cs, String script, String language, int fontSize);
+    int[][] performPositioning(CharSequence cs, String script, String language, int fontSize);
 
     /**
      * Perform glyph positioning using an implied font size.
@@ -54,6 +54,6 @@ public interface Positionable {
      * @return array (sequence) of 4-tuples of placement [PX,PY] and advance [AX,AY] adjustments, in that order,
      * with one 4-tuple for each element of glyph sequence, or null if no non-zero adjustment applies
      */
-    int[][] performPositioning (CharSequence cs, String script, String language);
+    int[][] performPositioning(CharSequence cs, String script, String language);
 
 }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/Substitutable.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/Substitutable.java?rev=1479969&r1=1479968&r2=1479969&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/Substitutable.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/Substitutable.java Tue May  7 16:23:13 2013
@@ -46,7 +46,7 @@ public interface Substitutable {
      * @return output sequence (represented as a character sequence, where each character in the returned sequence
      * denotes "font characters", i.e., character codes that map directly (1-1) to their associated glyphs
      */
-    CharSequence performSubstitution (CharSequence cs, String script, String language);
+    CharSequence performSubstitution(CharSequence cs, String script, String language);
 
     /**
      * Reorder combining marks in character sequence so that they precede (within the sequence) the base
@@ -59,6 +59,6 @@ public interface Substitutable {
      * @param language a language identifier
      * @return output sequence containing reordered "font characters"
      */
-    CharSequence reorderCombiningMarks (CharSequence cs, int[][] gpa, String script, String language);
+    CharSequence reorderCombiningMarks(CharSequence cs, int[][] gpa, String script, String language);
 
 }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/ArabicScriptProcessor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/ArabicScriptProcessor.java?rev=1479969&r1=1479968&r2=1479969&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/ArabicScriptProcessor.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/ArabicScriptProcessor.java Tue May  7 16:23:13 2013
@@ -75,49 +75,49 @@ public class ArabicScriptProcessor exten
     private static class SubstitutionScriptContextTester implements ScriptContextTester {
         private static Map/*<String,GlyphContextTester>*/ testerMap = new HashMap/*<String,GlyphContextTester>*/();
         static {
-            testerMap.put ("fina", new GlyphContextTester() {
-                    public boolean test (String script, String language, String feature, GlyphSequence gs, int index, int flags) {
-                        return inFinalContext (script, language, feature, gs, index, flags);
+            testerMap.put("fina", new GlyphContextTester() {
+                    public boolean test(String script, String language, String feature, GlyphSequence gs, int index, int flags) {
+                        return inFinalContext(script, language, feature, gs, index, flags);
                     }
                 });
-            testerMap.put ("init", new GlyphContextTester() {
-                    public boolean test (String script, String language, String feature, GlyphSequence gs, int index, int flags) {
-                        return inInitialContext (script, language, feature, gs, index, flags);
+            testerMap.put("init", new GlyphContextTester() {
+                    public boolean test(String script, String language, String feature, GlyphSequence gs, int index, int flags) {
+                        return inInitialContext(script, language, feature, gs, index, flags);
                     }
                 });
-            testerMap.put ("isol", new GlyphContextTester() {
-                    public boolean test (String script, String language, String feature, GlyphSequence gs, int index, int flags) {
-                        return inIsolateContext (script, language, feature, gs, index, flags);
+            testerMap.put("isol", new GlyphContextTester() {
+                    public boolean test(String script, String language, String feature, GlyphSequence gs, int index, int flags) {
+                        return inIsolateContext(script, language, feature, gs, index, flags);
                     }
                 });
-            testerMap.put ("liga", new GlyphContextTester() {
-                    public boolean test (String script, String language, String feature, GlyphSequence gs, int index, int flags) {
-                        return inLigatureContext (script, language, feature, gs, index, flags);
+            testerMap.put("liga", new GlyphContextTester() {
+                    public boolean test(String script, String language, String feature, GlyphSequence gs, int index, int flags) {
+                        return inLigatureContext(script, language, feature, gs, index, flags);
                     }
                 });
-            testerMap.put ("medi", new GlyphContextTester() {
-                    public boolean test (String script, String language, String feature, GlyphSequence gs, int index, int flags) {
-                        return inMedialContext (script, language, feature, gs, index, flags);
+            testerMap.put("medi", new GlyphContextTester() {
+                    public boolean test(String script, String language, String feature, GlyphSequence gs, int index, int flags) {
+                        return inMedialContext(script, language, feature, gs, index, flags);
                     }
                 });
         }
-        public GlyphContextTester getTester (String feature) {
-            return (GlyphContextTester) testerMap.get (feature);
+        public GlyphContextTester getTester(String feature) {
+            return (GlyphContextTester) testerMap.get(feature);
         }
     }
 
     private static class PositioningScriptContextTester implements ScriptContextTester {
         private static Map/*<String,GlyphContextTester>*/ testerMap = new HashMap/*<String,GlyphContextTester>*/();
-        public GlyphContextTester getTester (String feature) {
-            return (GlyphContextTester) testerMap.get (feature);
+        public GlyphContextTester getTester(String feature) {
+            return (GlyphContextTester) testerMap.get(feature);
         }
     }
 
     private final ScriptContextTester subContextTester;
     private final ScriptContextTester posContextTester;
 
-    ArabicScriptProcessor (String script) {
-        super (script);
+    ArabicScriptProcessor(String script) {
+        super(script);
         this.subContextTester = new SubstitutionScriptContextTester();
         this.posContextTester = new PositioningScriptContextTester();
     }
@@ -144,26 +144,26 @@ public class ArabicScriptProcessor exten
 
     /** {@inheritDoc} */
     @Override
-    public GlyphSequence reorderCombiningMarks (GlyphDefinitionTable gdef, GlyphSequence gs, int[][] gpa, String script, String language) {
+    public GlyphSequence reorderCombiningMarks(GlyphDefinitionTable gdef, GlyphSequence gs, int[][] gpa, String script, String language) {
         // a side effect of BIDI reordering is to order combining marks before their base, so we need to override the default here to
         // prevent double reordering
         return gs;
     }
 
-    private static boolean inFinalContext (String script, String language, String feature, GlyphSequence gs, int index, int flags) {
-        GlyphSequence.CharAssociation a = gs.getAssociation (index);
-        int[] ca = gs.getCharacterArray (false);
+    private static boolean inFinalContext(String script, String language, String feature, GlyphSequence gs, int index, int flags) {
+        GlyphSequence.CharAssociation a = gs.getAssociation(index);
+        int[] ca = gs.getCharacterArray(false);
         int   nc = gs.getCharacterCount();
         if (nc == 0) {
             return false;
         } else {
             int s = a.getStart();
             int e = a.getEnd();
-            if (! hasFinalPrecedingContext (ca, nc, s, e)) {
+            if (! hasFinalPrecedingContext(ca, nc, s, e)) {
                 return false;
-            } else if (forcesFinalThisContext (ca, nc, s, e)) {
+            } else if (forcesFinalThisContext(ca, nc, s, e)) {
                 return true;
-            } else if (! hasFinalFollowingContext (ca, nc, s, e)) {
+            } else if (! hasFinalFollowingContext(ca, nc, s, e)) {
                 return false;
             } else {
                 return true;
@@ -171,18 +171,18 @@ public class ArabicScriptProcessor exten
         }
     }
 
-    private static boolean inInitialContext (String script, String language, String feature, GlyphSequence gs, int index, int flags) {
-        GlyphSequence.CharAssociation a = gs.getAssociation (index);
-        int[] ca = gs.getCharacterArray (false);
+    private static boolean inInitialContext(String script, String language, String feature, GlyphSequence gs, int index, int flags) {
+        GlyphSequence.CharAssociation a = gs.getAssociation(index);
+        int[] ca = gs.getCharacterArray(false);
         int   nc = gs.getCharacterCount();
         if (nc == 0) {
             return false;
         } else {
             int s = a.getStart();
             int e = a.getEnd();
-            if (! hasInitialPrecedingContext (ca, nc, s, e)) {
+            if (! hasInitialPrecedingContext(ca, nc, s, e)) {
                 return false;
-            } else if (! hasInitialFollowingContext (ca, nc, s, e)) {
+            } else if (! hasInitialFollowingContext(ca, nc, s, e)) {
                 return false;
             } else {
                 return true;
@@ -190,8 +190,8 @@ public class ArabicScriptProcessor exten
         }
     }
 
-    private static boolean inIsolateContext (String script, String language, String feature, GlyphSequence gs, int index, int flags) {
-        GlyphSequence.CharAssociation a = gs.getAssociation (index);
+    private static boolean inIsolateContext(String script, String language, String feature, GlyphSequence gs, int index, int flags) {
+        GlyphSequence.CharAssociation a = gs.getAssociation(index);
         int   nc = gs.getCharacterCount();
         if (nc == 0) {
             return false;
@@ -202,18 +202,18 @@ public class ArabicScriptProcessor exten
         }
     }
 
-    private static boolean inLigatureContext (String script, String language, String feature, GlyphSequence gs, int index, int flags) {
-        GlyphSequence.CharAssociation a = gs.getAssociation (index);
-        int[] ca = gs.getCharacterArray (false);
+    private static boolean inLigatureContext(String script, String language, String feature, GlyphSequence gs, int index, int flags) {
+        GlyphSequence.CharAssociation a = gs.getAssociation(index);
+        int[] ca = gs.getCharacterArray(false);
         int   nc = gs.getCharacterCount();
         if (nc == 0) {
             return false;
         } else {
             int s = a.getStart();
             int e = a.getEnd();
-            if (! hasLigaturePrecedingContext (ca, nc, s, e)) {
+            if (! hasLigaturePrecedingContext(ca, nc, s, e)) {
                 return false;
-            } else if (! hasLigatureFollowingContext (ca, nc, s, e)) {
+            } else if (! hasLigatureFollowingContext(ca, nc, s, e)) {
                 return false;
             } else {
                 return true;
@@ -221,20 +221,20 @@ public class ArabicScriptProcessor exten
         }
     }
 
-    private static boolean inMedialContext (String script, String language, String feature, GlyphSequence gs, int index, int flags) {
-        GlyphSequence.CharAssociation a = gs.getAssociation (index);
-        int[] ca = gs.getCharacterArray (false);
+    private static boolean inMedialContext(String script, String language, String feature, GlyphSequence gs, int index, int flags) {
+        GlyphSequence.CharAssociation a = gs.getAssociation(index);
+        int[] ca = gs.getCharacterArray(false);
         int   nc = gs.getCharacterCount();
         if (nc == 0) {
             return false;
         } else {
             int s = a.getStart();
             int e = a.getEnd();
-            if (! hasMedialPrecedingContext (ca, nc, s, e)) {
+            if (! hasMedialPrecedingContext(ca, nc, s, e)) {
                 return false;
-            } else if (! hasMedialThisContext (ca, nc, s, e)) {
+            } else if (! hasMedialThisContext(ca, nc, s, e)) {
                 return false;
-            } else if (! hasMedialFollowingContext (ca, nc, s, e)) {
+            } else if (! hasMedialFollowingContext(ca, nc, s, e)) {
                 return false;
             } else {
                 return true;
@@ -242,14 +242,14 @@ public class ArabicScriptProcessor exten
         }
     }
 
-    private static boolean hasFinalPrecedingContext (int[] ca, int nc, int s, int e) {
+    private static boolean hasFinalPrecedingContext(int[] ca, int nc, int s, int e) {
         int chp = 0;
         int clp = 0;
         for (int i = s; i > 0; i--) {
             int k = i - 1;
             if ((k >= 0) && (k < nc)) {
                 chp = ca [ k ];
-                clp = BidiClass.getBidiClass (chp);
+                clp = BidiClass.getBidiClass(chp);
                 if (clp != BidiConstants.NSM) {
                     break;
                 }
@@ -257,14 +257,14 @@ public class ArabicScriptProcessor exten
         }
         if (clp != BidiConstants.AL) {
             return false;
-        } else if (hasIsolateInitial (chp)) {
+        } else if (hasIsolateInitial(chp)) {
             return false;
         } else {
             return true;
         }
     }
 
-    private static boolean forcesFinalThisContext (int[] ca, int nc, int s, int e) {
+    private static boolean forcesFinalThisContext(int[] ca, int nc, int s, int e) {
         int chl = 0;
         int cll = 0;
         for (int i = 0, n = e - s; i < n; i++) {
@@ -272,7 +272,7 @@ public class ArabicScriptProcessor exten
             int j = s + k;
             if ((j >= 0) && (j < nc)) {
                 chl = ca [ j ];
-                cll = BidiClass.getBidiClass (chl);
+                cll = BidiClass.getBidiClass(chl);
                 if (cll != BidiConstants.NSM) {
                     break;
                 }
@@ -281,40 +281,40 @@ public class ArabicScriptProcessor exten
         if (cll != BidiConstants.AL) {
             return false;
         }
-        if (hasIsolateInitial (chl)) {
+        if (hasIsolateInitial(chl)) {
             return true;
         } else {
             return false;
         }
     }
 
-    private static boolean hasFinalFollowingContext (int[] ca, int nc, int s, int e) {
+    private static boolean hasFinalFollowingContext(int[] ca, int nc, int s, int e) {
         int chf = 0;
         int clf = 0;
         for (int i = e, n = nc; i < n; i++) {
             chf = ca [ i ];
-            clf = BidiClass.getBidiClass (chf);
+            clf = BidiClass.getBidiClass(chf);
             if (clf != BidiConstants.NSM) {
                 break;
             }
         }
         if (clf != BidiConstants.AL) {
             return true;
-        } else if (hasIsolateFinal (chf)) {
+        } else if (hasIsolateFinal(chf)) {
             return true;
         } else {
             return false;
         }
     }
 
-    private static boolean hasInitialPrecedingContext (int[] ca, int nc, int s, int e) {
+    private static boolean hasInitialPrecedingContext(int[] ca, int nc, int s, int e) {
         int chp = 0;
         int clp = 0;
         for (int i = s; i > 0; i--) {
             int k = i - 1;
             if ((k >= 0) && (k < nc)) {
                 chp = ca [ k ];
-                clp = BidiClass.getBidiClass (chp);
+                clp = BidiClass.getBidiClass(chp);
                 if (clp != BidiConstants.NSM) {
                     break;
                 }
@@ -322,40 +322,40 @@ public class ArabicScriptProcessor exten
         }
         if (clp != BidiConstants.AL) {
             return true;
-        } else if (hasIsolateInitial (chp)) {
+        } else if (hasIsolateInitial(chp)) {
             return true;
         } else {
             return false;
         }
     }
 
-    private static boolean hasInitialFollowingContext (int[] ca, int nc, int s, int e) {
+    private static boolean hasInitialFollowingContext(int[] ca, int nc, int s, int e) {
         int chf = 0;
         int clf = 0;
         for (int i = e, n = nc; i < n; i++) {
             chf = ca [ i ];
-            clf = BidiClass.getBidiClass (chf);
+            clf = BidiClass.getBidiClass(chf);
             if (clf != BidiConstants.NSM) {
                 break;
             }
         }
         if (clf != BidiConstants.AL) {
             return false;
-        } else if (hasIsolateFinal (chf)) {
+        } else if (hasIsolateFinal(chf)) {
             return false;
         } else {
             return true;
         }
     }
 
-    private static boolean hasMedialPrecedingContext (int[] ca, int nc, int s, int e) {
+    private static boolean hasMedialPrecedingContext(int[] ca, int nc, int s, int e) {
         int chp = 0;
         int clp = 0;
         for (int i = s; i > 0; i--) {
             int k = i - 1;
             if ((k >= 0) && (k < nc)) {
                 chp = ca [ k ];
-                clp = BidiClass.getBidiClass (chp);
+                clp = BidiClass.getBidiClass(chp);
                 if (clp != BidiConstants.NSM) {
                     break;
                 }
@@ -363,21 +363,21 @@ public class ArabicScriptProcessor exten
         }
         if (clp != BidiConstants.AL) {
             return false;
-        } else if (hasIsolateInitial (chp)) {
+        } else if (hasIsolateInitial(chp)) {
             return false;
         } else {
             return true;
         }
     }
 
-    private static boolean hasMedialThisContext (int[] ca, int nc, int s, int e) {
+    private static boolean hasMedialThisContext(int[] ca, int nc, int s, int e) {
         int chf = 0;    // first non-NSM char in [s,e)
         int clf = 0;
         for (int i = 0, n = e - s; i < n; i++) {
             int k = s + i;
             if ((k >= 0) && (k < nc)) {
                 chf = ca [ s + i ];
-                clf = BidiClass.getBidiClass (chf);
+                clf = BidiClass.getBidiClass(chf);
                 if (clf != BidiConstants.NSM) {
                     break;
                 }
@@ -393,7 +393,7 @@ public class ArabicScriptProcessor exten
             int j = s + k;
             if ((j >= 0) && (j < nc)) {
                 chl = ca [ j ];
-                cll = BidiClass.getBidiClass (chl);
+                cll = BidiClass.getBidiClass(chl);
                 if (cll != BidiConstants.NSM) {
                     break;
                 }
@@ -402,44 +402,44 @@ public class ArabicScriptProcessor exten
         if (cll != BidiConstants.AL) {
             return false;
         }
-        if (hasIsolateFinal (chf)) {
+        if (hasIsolateFinal(chf)) {
             return false;
-        } else if (hasIsolateInitial (chl)) {
+        } else if (hasIsolateInitial(chl)) {
             return false;
         } else {
             return true;
         }
     }
 
-    private static boolean hasMedialFollowingContext (int[] ca, int nc, int s, int e) {
+    private static boolean hasMedialFollowingContext(int[] ca, int nc, int s, int e) {
         int chf = 0;
         int clf = 0;
         for (int i = e, n = nc; i < n; i++) {
             chf = ca [ i ];
-            clf = BidiClass.getBidiClass (chf);
+            clf = BidiClass.getBidiClass(chf);
             if (clf != BidiConstants.NSM) {
                 break;
             }
         }
         if (clf != BidiConstants.AL) {
             return false;
-        } else if (hasIsolateFinal (chf)) {
+        } else if (hasIsolateFinal(chf)) {
             return false;
         } else {
             return true;
         }
     }
 
-    private static boolean hasLigaturePrecedingContext (int[] ca, int nc, int s, int e) {
+    private static boolean hasLigaturePrecedingContext(int[] ca, int nc, int s, int e) {
         return true;
     }
 
-    private static boolean hasLigatureFollowingContext (int[] ca, int nc, int s, int e) {
+    private static boolean hasLigatureFollowingContext(int[] ca, int nc, int s, int e) {
         int chf = 0;
         int clf = 0;
         for (int i = e, n = nc; i < n; i++) {
             chf = ca [ i ];
-            clf = BidiClass.getBidiClass (chf);
+            clf = BidiClass.getBidiClass(chf);
             if (clf != BidiConstants.NSM) {
                 break;
             }
@@ -504,8 +504,8 @@ public class ArabicScriptProcessor exten
         0x06EF  // REH WITH INVERTED V
     };
 
-    private static boolean hasIsolateInitial (int ch) {
-        return Arrays.binarySearch (isolatedInitials, ch) >= 0;
+    private static boolean hasIsolateInitial(int ch) {
+        return Arrays.binarySearch(isolatedInitials, ch) >= 0;
     }
 
     /**
@@ -516,8 +516,8 @@ public class ArabicScriptProcessor exten
         0x0621  // HAMZA
     };
 
-    private static boolean hasIsolateFinal (int ch) {
-        return Arrays.binarySearch (isolatedFinals, ch) >= 0;
+    private static boolean hasIsolateFinal(int ch) {
+        return Arrays.binarySearch(isolatedFinals, ch) >= 0;
     }
 
 }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/DefaultScriptProcessor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/DefaultScriptProcessor.java?rev=1479969&r1=1479968&r2=1479969&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/DefaultScriptProcessor.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/DefaultScriptProcessor.java Tue May  7 16:23:13 2013
@@ -49,8 +49,8 @@ public class DefaultScriptProcessor exte
         "mkmk"                                                  // mark to mark positioning
     };
 
-    DefaultScriptProcessor (String script) {
-        super (script);
+    DefaultScriptProcessor(String script) {
+        super(script);
     }
 
     @Override
@@ -79,20 +79,20 @@ public class DefaultScriptProcessor exte
 
     @Override
     /** {@inheritDoc} */
-    public GlyphSequence reorderCombiningMarks (GlyphDefinitionTable gdef, GlyphSequence gs, int[][] gpa, String script, String language) {
+    public GlyphSequence reorderCombiningMarks(GlyphDefinitionTable gdef, GlyphSequence gs, int[][] gpa, String script, String language) {
         int   ng  = gs.getGlyphCount();
-        int[] ga  = gs.getGlyphArray (false);
+        int[] ga  = gs.getGlyphArray(false);
         int   nm  = 0;
         // count combining marks
         for (int i = 0; i < ng; i++) {
             int gid = ga [ i ];
-            if (gdef.isGlyphClass (gid, GlyphDefinitionTable.GLYPH_CLASS_MARK)) {
+            if (gdef.isGlyphClass(gid, GlyphDefinitionTable.GLYPH_CLASS_MARK)) {
                 nm++;
             }
         }
         // only reorder if there is at least one mark and at least one non-mark glyph
         if ((nm > 0) && ((ng - nm) > 0)) {
-            GlyphSequence.CharAssociation[] aa = gs.getAssociations (0, -1);
+            GlyphSequence.CharAssociation[] aa = gs.getAssociations(0, -1);
             int[] nga = new int [ ng ];
             int[][] npa = (gpa != null) ? new int [ ng ][] : null;
             GlyphSequence.CharAssociation[] naa = new GlyphSequence.CharAssociation [ ng ];
@@ -104,7 +104,7 @@ public class DefaultScriptProcessor exte
                 int gid = ga [ i ];
                 int[] pa = (gpa != null) ? gpa [ i ] : null;
                 GlyphSequence.CharAssociation ca = aa [ i ];
-                if (gdef.isGlyphClass (gid, GlyphDefinitionTable.GLYPH_CLASS_MARK)) {
+                if (gdef.isGlyphClass(gid, GlyphDefinitionTable.GLYPH_CLASS_MARK)) {
                     nga [ k ] = gid;
                     naa [ k ] = ca;
                     if (npa != null) {
@@ -140,9 +140,9 @@ public class DefaultScriptProcessor exte
             }
             assert k == ng;
             if (npa != null) {
-                System.arraycopy (npa, 0, gpa, 0, ng);
+                System.arraycopy(npa, 0, gpa, 0, ng);
             }
-            return new GlyphSequence (gs, null, nga, null, null, naa, null);
+            return new GlyphSequence(gs, null, nga, null, null, naa, null);
         } else {
             return gs;
         }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/DevanagariScriptProcessor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/DevanagariScriptProcessor.java?rev=1479969&r1=1479968&r2=1479969&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/DevanagariScriptProcessor.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/DevanagariScriptProcessor.java Tue May  7 16:23:13 2013
@@ -42,8 +42,8 @@ public class DevanagariScriptProcessor e
     /** logging instance */
     private static final Log log = LogFactory.getLog(DevanagariScriptProcessor.class);                                  // CSOK: ConstantNameCheck
 
-    DevanagariScriptProcessor (String script) {
-        super (script);
+    DevanagariScriptProcessor(String script) {
+        super(script);
     }
 
     @Override
@@ -53,12 +53,12 @@ public class DevanagariScriptProcessor e
 
     @Override
     // find rightmost pre-base matra
-    protected int findPreBaseMatra (GlyphSequence gs) {
+    protected int findPreBaseMatra(GlyphSequence gs) {
         int   ng = gs.getGlyphCount();
         int   lk = -1;
         for (int i = ng; i > 0; i--) {
             int k = i - 1;
-            if (containsPreBaseMatra (gs, k)) {
+            if (containsPreBaseMatra(gs, k)) {
                 lk = k;
                 break;
             }
@@ -68,13 +68,13 @@ public class DevanagariScriptProcessor e
 
     @Override
     // find leftmost pre-base matra target, starting from source
-    protected int findPreBaseMatraTarget (GlyphSequence gs, int source) {
+    protected int findPreBaseMatraTarget(GlyphSequence gs, int source) {
         int   ng = gs.getGlyphCount();
         int   lk = -1;
         for (int i = (source < ng) ? source : ng; i > 0; i--) {
             int k = i - 1;
-            if (containsConsonant (gs, k)) {
-                if (containsHalfConsonant (gs, k)) {
+            if (containsConsonant(gs, k)) {
+                if (containsHalfConsonant(gs, k)) {
                     lk = k;
                 } else if (lk == -1) {
                     lk = k;
@@ -86,39 +86,39 @@ public class DevanagariScriptProcessor e
         return lk;
     }
 
-    private static boolean containsPreBaseMatra (GlyphSequence gs, int k) {
-        GlyphSequence.CharAssociation a = gs.getAssociation (k);
-        int[] ca = gs.getCharacterArray (false);
+    private static boolean containsPreBaseMatra(GlyphSequence gs, int k) {
+        GlyphSequence.CharAssociation a = gs.getAssociation(k);
+        int[] ca = gs.getCharacterArray(false);
         for (int i = a.getStart(), e = a.getEnd(); i < e; i++) {
-            if (isPreM (ca [ i ])) {
+            if (isPreM(ca [ i ])) {
                 return true;
             }
         }
         return false;
     }
 
-    private static boolean containsConsonant (GlyphSequence gs, int k) {
-        GlyphSequence.CharAssociation a = gs.getAssociation (k);
-        int[] ca = gs.getCharacterArray (false);
+    private static boolean containsConsonant(GlyphSequence gs, int k) {
+        GlyphSequence.CharAssociation a = gs.getAssociation(k);
+        int[] ca = gs.getCharacterArray(false);
         for (int i = a.getStart(), e = a.getEnd(); i < e; i++) {
-            if (isC (ca [ i ])) {
+            if (isC(ca [ i ])) {
                 return true;
             }
         }
         return false;
     }
 
-    private static boolean containsHalfConsonant (GlyphSequence gs, int k) {
-        Boolean half = (Boolean) gs.getAssociation (k) . getPredication ("half");
+    private static boolean containsHalfConsonant(GlyphSequence gs, int k) {
+        Boolean half = (Boolean) gs.getAssociation(k) . getPredication("half");
         return (half != null) ? half.booleanValue() : false;
     }
 
     @Override
-    protected int findReph (GlyphSequence gs) {
+    protected int findReph(GlyphSequence gs) {
         int   ng = gs.getGlyphCount();
         int   li = -1;
         for (int i = 0; i < ng; i++) {
-            if (containsReph (gs, i)) {
+            if (containsReph(gs, i)) {
                 li = i;
                 break;
             }
@@ -127,14 +127,14 @@ public class DevanagariScriptProcessor e
     }
 
     @Override
-    protected int findRephTarget (GlyphSequence gs, int source) {
+    protected int findRephTarget(GlyphSequence gs, int source) {
         int   ng = gs.getGlyphCount();
         int   c1 = -1;
         int   c2 = -1;
         // first candidate target is after first non-half consonant
         for (int i = 0; i < ng; i++) {
-            if ((i != source) && containsConsonant (gs, i)) {
-                if (! containsHalfConsonant (gs, i)) {
+            if ((i != source) && containsConsonant(gs, i)) {
+                if (! containsHalfConsonant(gs, i)) {
                     c1 = i + 1;
                     break;
                 }
@@ -142,9 +142,9 @@ public class DevanagariScriptProcessor e
         }
         // second candidate target is after last non-prebase matra after first candidate or before first syllable or vedic mark
         for (int i = (c1 >= 0) ? c1 : 0; i < ng; i++) {
-            if (containsMatra (gs, i) && ! containsPreBaseMatra (gs, i)) {
+            if (containsMatra(gs, i) && ! containsPreBaseMatra(gs, i)) {
                 c2 = i + 1;
-            } else if (containsOtherMark (gs, i)) {
+            } else if (containsOtherMark(gs, i)) {
                 c2 = i;
                 break;
             }
@@ -158,27 +158,27 @@ public class DevanagariScriptProcessor e
         }
     }
 
-    private static boolean containsReph (GlyphSequence gs, int k) {
-        Boolean rphf = (Boolean) gs.getAssociation (k) . getPredication ("rphf");
+    private static boolean containsReph(GlyphSequence gs, int k) {
+        Boolean rphf = (Boolean) gs.getAssociation(k) . getPredication("rphf");
         return (rphf != null) ? rphf.booleanValue() : false;
     }
 
-    private static boolean containsMatra (GlyphSequence gs, int k) {
-        GlyphSequence.CharAssociation a = gs.getAssociation (k);
-        int[] ca = gs.getCharacterArray (false);
+    private static boolean containsMatra(GlyphSequence gs, int k) {
+        GlyphSequence.CharAssociation a = gs.getAssociation(k);
+        int[] ca = gs.getCharacterArray(false);
         for (int i = a.getStart(), e = a.getEnd(); i < e; i++) {
-            if (isM (ca [ i ])) {
+            if (isM(ca [ i ])) {
                 return true;
             }
         }
         return false;
     }
 
-    private static boolean containsOtherMark (GlyphSequence gs, int k) {
-        GlyphSequence.CharAssociation a = gs.getAssociation (k);
-        int[] ca = gs.getCharacterArray (false);
+    private static boolean containsOtherMark(GlyphSequence gs, int k) {
+        GlyphSequence.CharAssociation a = gs.getAssociation(k);
+        int[] ca = gs.getCharacterArray(false);
         for (int i = a.getStart(), e = a.getEnd(); i < e; i++) {
-            switch (typeOf (ca [ i ])) {
+            switch (typeOf(ca [ i ])) {
             case C_T:   // tone (e.g., udatta, anudatta)
             case C_A:   // accent (e.g., acute, grave)
             case C_O:   // other (e.g., candrabindu, anusvara, visarga, etc)
@@ -191,18 +191,18 @@ public class DevanagariScriptProcessor e
     }
 
     private static class DevanagariSyllabizer extends DefaultSyllabizer {
-        DevanagariSyllabizer (String script, String language) {
-            super (script, language);
+        DevanagariSyllabizer(String script, String language) {
+            super(script, language);
         }
         @Override
         // | C ...
-        protected int findStartOfSyllable (int[] ca, int s, int e) {
+        protected int findStartOfSyllable(int[] ca, int s, int e) {
             if ((s < 0) || (s >= e)) {
                 return -1;
             } else {
                 while (s < e) {
                     int c = ca [ s ];
-                    if (isC (c)) {
+                    if (isC(c)) {
                         break;
                     } else {
                         s++;
@@ -213,7 +213,7 @@ public class DevanagariScriptProcessor e
         }
         @Override
         // D* L? | ...
-        protected int findEndOfSyllable (int[] ca, int s, int e) {
+        protected int findEndOfSyllable(int[] ca, int s, int e) {
             if ((s < 0) || (s >= e)) {
                 return -1;
             } else {
@@ -221,12 +221,12 @@ public class DevanagariScriptProcessor e
                 int nl = 0;
                 int i;
                 // consume dead consonants
-                while ((i = isDeadConsonant (ca, s, e)) > s) {
+                while ((i = isDeadConsonant(ca, s, e)) > s) {
                     s = i;
                     nd++;
                 }
                 // consume zero or one live consonant
-                if ((i = isLiveConsonant (ca, s, e)) > s) {
+                if ((i = isLiveConsonant(ca, s, e)) > s) {
                     s = i;
                     nl++;
                 }
@@ -234,7 +234,7 @@ public class DevanagariScriptProcessor e
             }
         }
         // D := ( C N? H )?
-        private int isDeadConsonant (int[] ca, int s, int e) {
+        private int isDeadConsonant(int[] ca, int s, int e) {
             if (s < 0) {
                 return -1;
             } else {
@@ -246,7 +246,7 @@ public class DevanagariScriptProcessor e
                     // C
                     if ((s + i) < e) {
                         c = ca [ s + i ];
-                        if (isC (c)) {
+                        if (isC(c)) {
                             i++;
                             nc++;
                         } else {
@@ -256,14 +256,14 @@ public class DevanagariScriptProcessor e
                     // N?
                     if ((s + i) < e) {
                         c = ca [ s + 1 ];
-                        if (isN (c)) {
+                        if (isN(c)) {
                             i++;
                         }
                     }
                     // H
                     if ((s + i) < e) {
                         c = ca [ s + i ];
-                        if (isH (c)) {
+                        if (isH(c)) {
                             i++;
                             nh++;
                         } else {
@@ -275,7 +275,7 @@ public class DevanagariScriptProcessor e
             }
         }
         // L := ( (C|V) N? X* )?; where X = ( MATRA | ACCENT MARK | TONE MARK | OTHER MARK )
-        private int isLiveConsonant (int[] ca, int s, int e) {
+        private int isLiveConsonant(int[] ca, int s, int e) {
             if (s < 0) {
                 return -1;
             } else {
@@ -288,10 +288,10 @@ public class DevanagariScriptProcessor e
                     // C
                     if ((s + i) < e) {
                         c = ca [ s + i ];
-                        if (isC (c)) {
+                        if (isC(c)) {
                             i++;
                             nc++;
-                        } else if (isV (c)) {
+                        } else if (isV(c)) {
                             i++;
                             nv++;
                         } else {
@@ -301,14 +301,14 @@ public class DevanagariScriptProcessor e
                     // N?
                     if ((s + i) < e) {
                         c = ca [ s + i ];
-                        if (isN (c)) {
+                        if (isN(c)) {
                             i++;
                         }
                     }
                     // X*
                     while ((s + i) < e) {
                         c = ca [ s + i ];
-                        if (isX (c)) {
+                        if (isX(c)) {
                             i++;
                             nx++;
                         } else {
@@ -320,7 +320,7 @@ public class DevanagariScriptProcessor e
                 if (nx == 0) {
                     if ((s + i) < e) {
                         c = ca [ s + i ];
-                        if (isH (c)) {
+                        if (isH(c)) {
                             if (nc > 0) {
                                 nc--;
                             } else if (nv > 0) {
@@ -493,7 +493,7 @@ public class DevanagariScriptProcessor e
         }
     }
     static boolean isType(int c, int t) {
-        return typeOf (c) == t;
+        return typeOf(c) == t;
     }
     static boolean hasFlag(int c, int f) {
         if ((c >= ccaStart) && (c < ccaEnd)) {
@@ -524,7 +524,7 @@ public class DevanagariScriptProcessor e
         return isType(c,C_M) && hasFlag(c,C_PRE);
     }
     static boolean isX(int c) {
-        switch (typeOf (c)) {
+        switch (typeOf(c)) {
         case C_M: // matra (combining vowel)
         case C_A: // accent mark
         case C_T: // tone mark

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/GujaratiScriptProcessor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/GujaratiScriptProcessor.java?rev=1479969&r1=1479968&r2=1479969&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/GujaratiScriptProcessor.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/GujaratiScriptProcessor.java Tue May  7 16:23:13 2013
@@ -42,8 +42,8 @@ public class GujaratiScriptProcessor ext
     /** logging instance */
     private static final Log log = LogFactory.getLog(GujaratiScriptProcessor.class);                                  // CSOK: ConstantNameCheck
 
-    GujaratiScriptProcessor (String script) {
-        super (script);
+    GujaratiScriptProcessor(String script) {
+        super(script);
     }
 
     @Override
@@ -53,12 +53,12 @@ public class GujaratiScriptProcessor ext
 
     @Override
     // find rightmost pre-base matra
-    protected int findPreBaseMatra (GlyphSequence gs) {
+    protected int findPreBaseMatra(GlyphSequence gs) {
         int   ng = gs.getGlyphCount();
         int   lk = -1;
         for (int i = ng; i > 0; i--) {
             int k = i - 1;
-            if (containsPreBaseMatra (gs, k)) {
+            if (containsPreBaseMatra(gs, k)) {
                 lk = k;
                 break;
             }
@@ -68,13 +68,13 @@ public class GujaratiScriptProcessor ext
 
     @Override
     // find leftmost pre-base matra target, starting from source
-    protected int findPreBaseMatraTarget (GlyphSequence gs, int source) {
+    protected int findPreBaseMatraTarget(GlyphSequence gs, int source) {
         int   ng = gs.getGlyphCount();
         int   lk = -1;
         for (int i = (source < ng) ? source : ng; i > 0; i--) {
             int k = i - 1;
-            if (containsConsonant (gs, k)) {
-                if (containsHalfConsonant (gs, k)) {
+            if (containsConsonant(gs, k)) {
+                if (containsHalfConsonant(gs, k)) {
                     lk = k;
                 } else if (lk == -1) {
                     lk = k;
@@ -86,39 +86,39 @@ public class GujaratiScriptProcessor ext
         return lk;
     }
 
-    private static boolean containsPreBaseMatra (GlyphSequence gs, int k) {
-        GlyphSequence.CharAssociation a = gs.getAssociation (k);
-        int[] ca = gs.getCharacterArray (false);
+    private static boolean containsPreBaseMatra(GlyphSequence gs, int k) {
+        GlyphSequence.CharAssociation a = gs.getAssociation(k);
+        int[] ca = gs.getCharacterArray(false);
         for (int i = a.getStart(), e = a.getEnd(); i < e; i++) {
-            if (isPreM (ca [ i ])) {
+            if (isPreM(ca [ i ])) {
                 return true;
             }
         }
         return false;
     }
 
-    private static boolean containsConsonant (GlyphSequence gs, int k) {
-        GlyphSequence.CharAssociation a = gs.getAssociation (k);
-        int[] ca = gs.getCharacterArray (false);
+    private static boolean containsConsonant(GlyphSequence gs, int k) {
+        GlyphSequence.CharAssociation a = gs.getAssociation(k);
+        int[] ca = gs.getCharacterArray(false);
         for (int i = a.getStart(), e = a.getEnd(); i < e; i++) {
-            if (isC (ca [ i ])) {
+            if (isC(ca [ i ])) {
                 return true;
             }
         }
         return false;
     }
 
-    private static boolean containsHalfConsonant (GlyphSequence gs, int k) {
-        Boolean half = (Boolean) gs.getAssociation (k) . getPredication ("half");
+    private static boolean containsHalfConsonant(GlyphSequence gs, int k) {
+        Boolean half = (Boolean) gs.getAssociation(k) . getPredication("half");
         return (half != null) ? half.booleanValue() : false;
     }
 
     @Override
-    protected int findReph (GlyphSequence gs) {
+    protected int findReph(GlyphSequence gs) {
         int   ng = gs.getGlyphCount();
         int   li = -1;
         for (int i = 0; i < ng; i++) {
-            if (containsReph (gs, i)) {
+            if (containsReph(gs, i)) {
                 li = i;
                 break;
             }
@@ -127,14 +127,14 @@ public class GujaratiScriptProcessor ext
     }
 
     @Override
-    protected int findRephTarget (GlyphSequence gs, int source) {
+    protected int findRephTarget(GlyphSequence gs, int source) {
         int   ng = gs.getGlyphCount();
         int   c1 = -1;
         int   c2 = -1;
         // first candidate target is after first non-half consonant
         for (int i = 0; i < ng; i++) {
-            if ((i != source) && containsConsonant (gs, i)) {
-                if (! containsHalfConsonant (gs, i)) {
+            if ((i != source) && containsConsonant(gs, i)) {
+                if (! containsHalfConsonant(gs, i)) {
                     c1 = i + 1;
                     break;
                 }
@@ -142,9 +142,9 @@ public class GujaratiScriptProcessor ext
         }
         // second candidate target is after last non-prebase matra after first candidate or before first syllable or vedic mark
         for (int i = (c1 >= 0) ? c1 : 0; i < ng; i++) {
-            if (containsMatra (gs, i) && ! containsPreBaseMatra (gs, i)) {
+            if (containsMatra(gs, i) && ! containsPreBaseMatra(gs, i)) {
                 c2 = i + 1;
-            } else if (containsOtherMark (gs, i)) {
+            } else if (containsOtherMark(gs, i)) {
                 c2 = i;
                 break;
             }
@@ -158,27 +158,27 @@ public class GujaratiScriptProcessor ext
         }
     }
 
-    private static boolean containsReph (GlyphSequence gs, int k) {
-        Boolean rphf = (Boolean) gs.getAssociation (k) . getPredication ("rphf");
+    private static boolean containsReph(GlyphSequence gs, int k) {
+        Boolean rphf = (Boolean) gs.getAssociation(k) . getPredication("rphf");
         return (rphf != null) ? rphf.booleanValue() : false;
     }
 
-    private static boolean containsMatra (GlyphSequence gs, int k) {
-        GlyphSequence.CharAssociation a = gs.getAssociation (k);
-        int[] ca = gs.getCharacterArray (false);
+    private static boolean containsMatra(GlyphSequence gs, int k) {
+        GlyphSequence.CharAssociation a = gs.getAssociation(k);
+        int[] ca = gs.getCharacterArray(false);
         for (int i = a.getStart(), e = a.getEnd(); i < e; i++) {
-            if (isM (ca [ i ])) {
+            if (isM(ca [ i ])) {
                 return true;
             }
         }
         return false;
     }
 
-    private static boolean containsOtherMark (GlyphSequence gs, int k) {
-        GlyphSequence.CharAssociation a = gs.getAssociation (k);
-        int[] ca = gs.getCharacterArray (false);
+    private static boolean containsOtherMark(GlyphSequence gs, int k) {
+        GlyphSequence.CharAssociation a = gs.getAssociation(k);
+        int[] ca = gs.getCharacterArray(false);
         for (int i = a.getStart(), e = a.getEnd(); i < e; i++) {
-            switch (typeOf (ca [ i ])) {
+            switch (typeOf(ca [ i ])) {
             case C_T:   // tone (e.g., udatta, anudatta)
             case C_A:   // accent (e.g., acute, grave)
             case C_O:   // other (e.g., candrabindu, anusvara, visarga, etc)
@@ -191,18 +191,18 @@ public class GujaratiScriptProcessor ext
     }
 
     private static class GujaratiSyllabizer extends DefaultSyllabizer {
-        GujaratiSyllabizer (String script, String language) {
-            super (script, language);
+        GujaratiSyllabizer(String script, String language) {
+            super(script, language);
         }
         @Override
         // | C ...
-        protected int findStartOfSyllable (int[] ca, int s, int e) {
+        protected int findStartOfSyllable(int[] ca, int s, int e) {
             if ((s < 0) || (s >= e)) {
                 return -1;
             } else {
                 while (s < e) {
                     int c = ca [ s ];
-                    if (isC (c)) {
+                    if (isC(c)) {
                         break;
                     } else {
                         s++;
@@ -213,7 +213,7 @@ public class GujaratiScriptProcessor ext
         }
         @Override
         // D* L? | ...
-        protected int findEndOfSyllable (int[] ca, int s, int e) {
+        protected int findEndOfSyllable(int[] ca, int s, int e) {
             if ((s < 0) || (s >= e)) {
                 return -1;
             } else {
@@ -221,12 +221,12 @@ public class GujaratiScriptProcessor ext
                 int nl = 0;
                 int i;
                 // consume dead consonants
-                while ((i = isDeadConsonant (ca, s, e)) > s) {
+                while ((i = isDeadConsonant(ca, s, e)) > s) {
                     s = i;
                     nd++;
                 }
                 // consume zero or one live consonant
-                if ((i = isLiveConsonant (ca, s, e)) > s) {
+                if ((i = isLiveConsonant(ca, s, e)) > s) {
                     s = i;
                     nl++;
                 }
@@ -234,7 +234,7 @@ public class GujaratiScriptProcessor ext
             }
         }
         // D := ( C N? H )?
-        private int isDeadConsonant (int[] ca, int s, int e) {
+        private int isDeadConsonant(int[] ca, int s, int e) {
             if (s < 0) {
                 return -1;
             } else {
@@ -246,7 +246,7 @@ public class GujaratiScriptProcessor ext
                     // C
                     if ((s + i) < e) {
                         c = ca [ s + i ];
-                        if (isC (c)) {
+                        if (isC(c)) {
                             i++;
                             nc++;
                         } else {
@@ -256,14 +256,14 @@ public class GujaratiScriptProcessor ext
                     // N?
                     if ((s + i) < e) {
                         c = ca [ s + 1 ];
-                        if (isN (c)) {
+                        if (isN(c)) {
                             i++;
                         }
                     }
                     // H
                     if ((s + i) < e) {
                         c = ca [ s + i ];
-                        if (isH (c)) {
+                        if (isH(c)) {
                             i++;
                             nh++;
                         } else {
@@ -275,7 +275,7 @@ public class GujaratiScriptProcessor ext
             }
         }
         // L := ( (C|V) N? X* )?; where X = ( MATRA | ACCENT MARK | TONE MARK | OTHER MARK )
-        private int isLiveConsonant (int[] ca, int s, int e) {
+        private int isLiveConsonant(int[] ca, int s, int e) {
             if (s < 0) {
                 return -1;
             } else {
@@ -288,10 +288,10 @@ public class GujaratiScriptProcessor ext
                     // C
                     if ((s + i) < e) {
                         c = ca [ s + i ];
-                        if (isC (c)) {
+                        if (isC(c)) {
                             i++;
                             nc++;
-                        } else if (isV (c)) {
+                        } else if (isV(c)) {
                             i++;
                             nv++;
                         } else {
@@ -301,14 +301,14 @@ public class GujaratiScriptProcessor ext
                     // N?
                     if ((s + i) < e) {
                         c = ca [ s + i ];
-                        if (isN (c)) {
+                        if (isN(c)) {
                             i++;
                         }
                     }
                     // X*
                     while ((s + i) < e) {
                         c = ca [ s + i ];
-                        if (isX (c)) {
+                        if (isX(c)) {
                             i++;
                             nx++;
                         } else {
@@ -320,7 +320,7 @@ public class GujaratiScriptProcessor ext
                 if (nx == 0) {
                     if ((s + i) < e) {
                         c = ca [ s + i ];
-                        if (isH (c)) {
+                        if (isH(c)) {
                             if (nc > 0) {
                                 nc--;
                             } else if (nv > 0) {
@@ -493,7 +493,7 @@ public class GujaratiScriptProcessor ext
         }
     }
     static boolean isType(int c, int t) {
-        return typeOf (c) == t;
+        return typeOf(c) == t;
     }
     static boolean hasFlag(int c, int f) {
         if ((c >= ccaStart) && (c < ccaEnd)) {
@@ -524,7 +524,7 @@ public class GujaratiScriptProcessor ext
         return isType(c,C_M) && hasFlag(c,C_PRE);
     }
     static boolean isX(int c) {
-        switch (typeOf (c)) {
+        switch (typeOf(c)) {
         case C_M: // matra (combining vowel)
         case C_A: // accent mark
         case C_T: // tone mark

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/GurmukhiScriptProcessor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/GurmukhiScriptProcessor.java?rev=1479969&r1=1479968&r2=1479969&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/GurmukhiScriptProcessor.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/GurmukhiScriptProcessor.java Tue May  7 16:23:13 2013
@@ -43,8 +43,8 @@ public class GurmukhiScriptProcessor ext
     /** logging instance */
     private static final Log log = LogFactory.getLog(GurmukhiScriptProcessor.class);                                  // CSOK: ConstantNameCheck
 
-    GurmukhiScriptProcessor (String script) {
-        super (script);
+    GurmukhiScriptProcessor(String script) {
+        super(script);
     }
 
     @Override
@@ -54,12 +54,12 @@ public class GurmukhiScriptProcessor ext
 
     @Override
     // find rightmost pre-base matra
-    protected int findPreBaseMatra (GlyphSequence gs) {
+    protected int findPreBaseMatra(GlyphSequence gs) {
         int   ng = gs.getGlyphCount();
         int   lk = -1;
         for (int i = ng; i > 0; i--) {
             int k = i - 1;
-            if (containsPreBaseMatra (gs, k)) {
+            if (containsPreBaseMatra(gs, k)) {
                 lk = k;
                 break;
             }
@@ -69,13 +69,13 @@ public class GurmukhiScriptProcessor ext
 
     @Override
     // find leftmost pre-base matra target, starting from source
-    protected int findPreBaseMatraTarget (GlyphSequence gs, int source) {
+    protected int findPreBaseMatraTarget(GlyphSequence gs, int source) {
         int   ng = gs.getGlyphCount();
         int   lk = -1;
         for (int i = (source < ng) ? source : ng; i > 0; i--) {
             int k = i - 1;
-            if (containsConsonant (gs, k)) {
-                if (containsHalfConsonant (gs, k)) {
+            if (containsConsonant(gs, k)) {
+                if (containsHalfConsonant(gs, k)) {
                     lk = k;
                 } else if (lk == -1) {
                     lk = k;
@@ -87,39 +87,39 @@ public class GurmukhiScriptProcessor ext
         return lk;
     }
 
-    private static boolean containsPreBaseMatra (GlyphSequence gs, int k) {
-        GlyphSequence.CharAssociation a = gs.getAssociation (k);
-        int[] ca = gs.getCharacterArray (false);
+    private static boolean containsPreBaseMatra(GlyphSequence gs, int k) {
+        GlyphSequence.CharAssociation a = gs.getAssociation(k);
+        int[] ca = gs.getCharacterArray(false);
         for (int i = a.getStart(), e = a.getEnd(); i < e; i++) {
-            if (isPreM (ca [ i ])) {
+            if (isPreM(ca [ i ])) {
                 return true;
             }
         }
         return false;
     }
 
-    private static boolean containsConsonant (GlyphSequence gs, int k) {
-        GlyphSequence.CharAssociation a = gs.getAssociation (k);
-        int[] ca = gs.getCharacterArray (false);
+    private static boolean containsConsonant(GlyphSequence gs, int k) {
+        GlyphSequence.CharAssociation a = gs.getAssociation(k);
+        int[] ca = gs.getCharacterArray(false);
         for (int i = a.getStart(), e = a.getEnd(); i < e; i++) {
-            if (isC (ca [ i ])) {
+            if (isC(ca [ i ])) {
                 return true;
             }
         }
         return false;
     }
 
-    private static boolean containsHalfConsonant (GlyphSequence gs, int k) {
-        Boolean half = (Boolean) gs.getAssociation (k) . getPredication ("half");
+    private static boolean containsHalfConsonant(GlyphSequence gs, int k) {
+        Boolean half = (Boolean) gs.getAssociation(k) . getPredication("half");
         return (half != null) ? half.booleanValue() : false;
     }
 
     @Override
-    protected int findReph (GlyphSequence gs) {
+    protected int findReph(GlyphSequence gs) {
         int   ng = gs.getGlyphCount();
         int   li = -1;
         for (int i = 0; i < ng; i++) {
-            if (containsReph (gs, i)) {
+            if (containsReph(gs, i)) {
                 li = i;
                 break;
             }
@@ -128,14 +128,14 @@ public class GurmukhiScriptProcessor ext
     }
 
     @Override
-    protected int findRephTarget (GlyphSequence gs, int source) {
+    protected int findRephTarget(GlyphSequence gs, int source) {
         int   ng = gs.getGlyphCount();
         int   c1 = -1;
         int   c2 = -1;
         // first candidate target is after first non-half consonant
         for (int i = 0; i < ng; i++) {
-            if ((i != source) && containsConsonant (gs, i)) {
-                if (! containsHalfConsonant (gs, i)) {
+            if ((i != source) && containsConsonant(gs, i)) {
+                if (! containsHalfConsonant(gs, i)) {
                     c1 = i + 1;
                     break;
                 }
@@ -143,9 +143,9 @@ public class GurmukhiScriptProcessor ext
         }
         // second candidate target is after last non-prebase matra after first candidate or before first syllable or vedic mark
         for (int i = (c1 >= 0) ? c1 : 0; i < ng; i++) {
-            if (containsMatra (gs, i) && ! containsPreBaseMatra (gs, i)) {
+            if (containsMatra(gs, i) && ! containsPreBaseMatra(gs, i)) {
                 c2 = i + 1;
-            } else if (containsOtherMark (gs, i)) {
+            } else if (containsOtherMark(gs, i)) {
                 c2 = i;
                 break;
             }
@@ -159,27 +159,27 @@ public class GurmukhiScriptProcessor ext
         }
     }
 
-    private static boolean containsReph (GlyphSequence gs, int k) {
-        Boolean rphf = (Boolean) gs.getAssociation (k) . getPredication ("rphf");
+    private static boolean containsReph(GlyphSequence gs, int k) {
+        Boolean rphf = (Boolean) gs.getAssociation(k) . getPredication("rphf");
         return (rphf != null) ? rphf.booleanValue() : false;
     }
 
-    private static boolean containsMatra (GlyphSequence gs, int k) {
-        GlyphSequence.CharAssociation a = gs.getAssociation (k);
-        int[] ca = gs.getCharacterArray (false);
+    private static boolean containsMatra(GlyphSequence gs, int k) {
+        GlyphSequence.CharAssociation a = gs.getAssociation(k);
+        int[] ca = gs.getCharacterArray(false);
         for (int i = a.getStart(), e = a.getEnd(); i < e; i++) {
-            if (isM (ca [ i ])) {
+            if (isM(ca [ i ])) {
                 return true;
             }
         }
         return false;
     }
 
-    private static boolean containsOtherMark (GlyphSequence gs, int k) {
-        GlyphSequence.CharAssociation a = gs.getAssociation (k);
-        int[] ca = gs.getCharacterArray (false);
+    private static boolean containsOtherMark(GlyphSequence gs, int k) {
+        GlyphSequence.CharAssociation a = gs.getAssociation(k);
+        int[] ca = gs.getCharacterArray(false);
         for (int i = a.getStart(), e = a.getEnd(); i < e; i++) {
-            switch (typeOf (ca [ i ])) {
+            switch (typeOf(ca [ i ])) {
             case C_T:   // tone (e.g., udatta, anudatta)
             case C_A:   // accent (e.g., acute, grave)
             case C_O:   // other (e.g., candrabindu, anusvara, visarga, etc)
@@ -192,18 +192,18 @@ public class GurmukhiScriptProcessor ext
     }
 
     private static class GurmukhiSyllabizer extends DefaultSyllabizer {
-        GurmukhiSyllabizer (String script, String language) {
-            super (script, language);
+        GurmukhiSyllabizer(String script, String language) {
+            super(script, language);
         }
         @Override
         // | C ...
-        protected int findStartOfSyllable (int[] ca, int s, int e) {
+        protected int findStartOfSyllable(int[] ca, int s, int e) {
             if ((s < 0) || (s >= e)) {
                 return -1;
             } else {
                 while (s < e) {
                     int c = ca [ s ];
-                    if (isC (c)) {
+                    if (isC(c)) {
                         break;
                     } else {
                         s++;
@@ -214,7 +214,7 @@ public class GurmukhiScriptProcessor ext
         }
         @Override
         // D* L? | ...
-        protected int findEndOfSyllable (int[] ca, int s, int e) {
+        protected int findEndOfSyllable(int[] ca, int s, int e) {
             if ((s < 0) || (s >= e)) {
                 return -1;
             } else {
@@ -222,12 +222,12 @@ public class GurmukhiScriptProcessor ext
                 int nl = 0;
                 int i;
                 // consume dead consonants
-                while ((i = isDeadConsonant (ca, s, e)) > s) {
+                while ((i = isDeadConsonant(ca, s, e)) > s) {
                     s = i;
                     nd++;
                 }
                 // consume zero or one live consonant
-                if ((i = isLiveConsonant (ca, s, e)) > s) {
+                if ((i = isLiveConsonant(ca, s, e)) > s) {
                     s = i;
                     nl++;
                 }
@@ -235,7 +235,7 @@ public class GurmukhiScriptProcessor ext
             }
         }
         // D := ( C N? H )?
-        private int isDeadConsonant (int[] ca, int s, int e) {
+        private int isDeadConsonant(int[] ca, int s, int e) {
             if (s < 0) {
                 return -1;
             } else {
@@ -247,7 +247,7 @@ public class GurmukhiScriptProcessor ext
                     // C
                     if ((s + i) < e) {
                         c = ca [ s + i ];
-                        if (isC (c)) {
+                        if (isC(c)) {
                             i++;
                             nc++;
                         } else {
@@ -257,14 +257,14 @@ public class GurmukhiScriptProcessor ext
                     // N?
                     if ((s + i) < e) {
                         c = ca [ s + 1 ];
-                        if (isN (c)) {
+                        if (isN(c)) {
                             i++;
                         }
                     }
                     // H
                     if ((s + i) < e) {
                         c = ca [ s + i ];
-                        if (isH (c)) {
+                        if (isH(c)) {
                             i++;
                             nh++;
                         } else {
@@ -276,7 +276,7 @@ public class GurmukhiScriptProcessor ext
             }
         }
         // L := ( (C|V) N? X* )?; where X = ( MATRA | ACCENT MARK | TONE MARK | OTHER MARK )
-        private int isLiveConsonant (int[] ca, int s, int e) {
+        private int isLiveConsonant(int[] ca, int s, int e) {
             if (s < 0) {
                 return -1;
             } else {
@@ -289,10 +289,10 @@ public class GurmukhiScriptProcessor ext
                     // C
                     if ((s + i) < e) {
                         c = ca [ s + i ];
-                        if (isC (c)) {
+                        if (isC(c)) {
                             i++;
                             nc++;
-                        } else if (isV (c)) {
+                        } else if (isV(c)) {
                             i++;
                             nv++;
                         } else {
@@ -302,14 +302,14 @@ public class GurmukhiScriptProcessor ext
                     // N?
                     if ((s + i) < e) {
                         c = ca [ s + i ];
-                        if (isN (c)) {
+                        if (isN(c)) {
                             i++;
                         }
                     }
                     // X*
                     while ((s + i) < e) {
                         c = ca [ s + i ];
-                        if (isX (c)) {
+                        if (isX(c)) {
                             i++;
                             nx++;
                         } else {
@@ -321,7 +321,7 @@ public class GurmukhiScriptProcessor ext
                 if (nx == 0) {
                     if ((s + i) < e) {
                         c = ca [ s + i ];
-                        if (isH (c)) {
+                        if (isH(c)) {
                             if (nc > 0) {
                                 nc--;
                             } else if (nv > 0) {
@@ -494,7 +494,7 @@ public class GurmukhiScriptProcessor ext
         }
     }
     static boolean isType(int c, int t) {
-        return typeOf (c) == t;
+        return typeOf(c) == t;
     }
     static boolean hasFlag(int c, int f) {
         if ((c >= ccaStart) && (c < ccaEnd)) {
@@ -525,7 +525,7 @@ public class GurmukhiScriptProcessor ext
         return isType(c,C_M) && hasFlag(c,C_PRE);
     }
     static boolean isX(int c) {
-        switch (typeOf (c)) {
+        switch (typeOf(c)) {
         case C_M: // matra (combining vowel)
         case C_A: // accent mark
         case C_T: // tone mark
@@ -543,8 +543,8 @@ public class GurmukhiScriptProcessor ext
     }
 
     @Override
-    public GlyphSequence reorderCombiningMarks (GlyphDefinitionTable gdef, GlyphSequence gs, int[][] gpa, String script, String language) {
-        return super.reorderCombiningMarks (gdef, gs, gpa, script, language);
+    public GlyphSequence reorderCombiningMarks(GlyphDefinitionTable gdef, GlyphSequence gs, int[][] gpa, String script, String language) {
+        return super.reorderCombiningMarks(gdef, gs, gpa, script, language);
     }
 
 }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/IndicScriptProcessor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/IndicScriptProcessor.java?rev=1479969&r1=1479968&r2=1479969&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/IndicScriptProcessor.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/IndicScriptProcessor.java Tue May  7 16:23:13 2013
@@ -105,15 +105,15 @@ public class IndicScriptProcessor extend
 
     private static class SubstitutionScriptContextTester implements ScriptContextTester {
         private static Map/*<String,GlyphContextTester>*/ testerMap = new HashMap/*<String,GlyphContextTester>*/();
-        public GlyphContextTester getTester (String feature) {
-            return (GlyphContextTester) testerMap.get (feature);
+        public GlyphContextTester getTester(String feature) {
+            return (GlyphContextTester) testerMap.get(feature);
         }
     }
 
     private static class PositioningScriptContextTester implements ScriptContextTester {
         private static Map/*<String,GlyphContextTester>*/ testerMap = new HashMap/*<String,GlyphContextTester>*/();
-        public GlyphContextTester getTester (String feature) {
-            return (GlyphContextTester) testerMap.get (feature);
+        public GlyphContextTester getTester(String feature) {
+            return (GlyphContextTester) testerMap.get(feature);
         }
     }
 
@@ -122,28 +122,28 @@ public class IndicScriptProcessor extend
      * @param script tag
      * @return script processor instance
      */
-    public static ScriptProcessor makeProcessor (String script) {
-        switch (CharScript.scriptCodeFromTag (script)) {
+    public static ScriptProcessor makeProcessor(String script) {
+        switch (CharScript.scriptCodeFromTag(script)) {
         case CharScript.SCRIPT_DEVANAGARI:
         case CharScript.SCRIPT_DEVANAGARI_2:
-            return new DevanagariScriptProcessor (script);
+            return new DevanagariScriptProcessor(script);
         case CharScript.SCRIPT_GUJARATI:
         case CharScript.SCRIPT_GUJARATI_2:
-            return new GujaratiScriptProcessor (script);
+            return new GujaratiScriptProcessor(script);
         case CharScript.SCRIPT_GURMUKHI:
         case CharScript.SCRIPT_GURMUKHI_2:
-            return new GurmukhiScriptProcessor (script);
+            return new GurmukhiScriptProcessor(script);
         // [TBD] implement other script processors
         default:
-            return new IndicScriptProcessor (script);
+            return new IndicScriptProcessor(script);
         }
     }
 
     private final ScriptContextTester subContextTester;
     private final ScriptContextTester posContextTester;
 
-    IndicScriptProcessor (String script) {
-        super (script);
+    IndicScriptProcessor(String script) {
+        super(script);
         this.subContextTester = new SubstitutionScriptContextTester();
         this.posContextTester = new PositioningScriptContextTester();
     }
@@ -180,38 +180,38 @@ public class IndicScriptProcessor extend
 
     /** {@inheritDoc} */
     @Override
-    public GlyphSequence substitute (GlyphSequence gs, String script, String language, GlyphTable.UseSpec[] usa, ScriptContextTester sct) {
+    public GlyphSequence substitute(GlyphSequence gs, String script, String language, GlyphTable.UseSpec[] usa, ScriptContextTester sct) {
         assert usa != null;
         // 1. syllabize
-        GlyphSequence[] sa = syllabize (gs, script, language);
+        GlyphSequence[] sa = syllabize(gs, script, language);
         // 2. process each syllable
         for (int i = 0, n = sa.length; i < n; i++) {
             GlyphSequence s = sa [ i ];
             // apply basic shaping subs
             for (int j = 0, m = usa.length; j < m; j++) {
                 GlyphTable.UseSpec us = usa [ j ];
-                if (isBasicShapingUse (us)) {
-                    s.setPredications (true);
-                    s = us.substitute (s, script, language, sct);
+                if (isBasicShapingUse(us)) {
+                    s.setPredications(true);
+                    s = us.substitute(s, script, language, sct);
                 }
             }
             // reorder pre-base matra
-            s = reorderPreBaseMatra (s);
+            s = reorderPreBaseMatra(s);
             // reorder reph
-            s = reorderReph (s);
+            s = reorderReph(s);
             // apply presentation subs
             for (int j = 0, m = usa.length; j < m; j++) {
                 GlyphTable.UseSpec us = usa [ j ];
-                if (isPresentationUse (us)) {
-                    s.setPredications (true);
-                    s = us.substitute (s, script, language, sct);
+                if (isPresentationUse(us)) {
+                    s.setPredications(true);
+                    s = us.substitute(s, script, language, sct);
                 }
             }
             // record result
             sa [ i ] = s;
         }
         // 3. return reassembled substituted syllables
-        return unsyllabize (gs, sa);
+        return unsyllabize(gs, sa);
     }
 
     /**
@@ -222,12 +222,12 @@ public class IndicScriptProcessor extend
         return null;
     }
 
-    private GlyphSequence[] syllabize (GlyphSequence gs, String script, String language) {
-        return Syllabizer.getSyllabizer (script, language, getSyllabizerClass()) . syllabize (gs);
+    private GlyphSequence[] syllabize(GlyphSequence gs, String script, String language) {
+        return Syllabizer.getSyllabizer(script, language, getSyllabizerClass()) . syllabize(gs);
     }
 
-    private GlyphSequence unsyllabize (GlyphSequence gs, GlyphSequence[] sa) {
-        return GlyphSequence.join (gs, sa);
+    private GlyphSequence unsyllabize(GlyphSequence gs, GlyphSequence[] sa) {
+        return GlyphSequence.join(gs, sa);
     }
 
     private static Set<String> basicShapingFeatures;
@@ -248,13 +248,13 @@ public class IndicScriptProcessor extend
     static {
         basicShapingFeatures = new HashSet<String>();
         for (String s : basicShapingFeatureStrings) {
-            basicShapingFeatures.add (s);
+            basicShapingFeatures.add(s);
         }
     }
-    private boolean isBasicShapingUse (GlyphTable.UseSpec us) {
+    private boolean isBasicShapingUse(GlyphTable.UseSpec us) {
         assert us != null;
         if (basicShapingFeatures != null) {
-            return basicShapingFeatures.contains (us.getFeature());
+            return basicShapingFeatures.contains(us.getFeature());
         } else {
             return false;
         }
@@ -272,25 +272,25 @@ public class IndicScriptProcessor extend
     static {
         presentationFeatures = new HashSet<String>();
         for (String s : presentationFeatureStrings) {
-            presentationFeatures.add (s);
+            presentationFeatures.add(s);
         }
     }
-    private boolean isPresentationUse (GlyphTable.UseSpec us) {
+    private boolean isPresentationUse(GlyphTable.UseSpec us) {
         assert us != null;
         if (presentationFeatures != null) {
-            return presentationFeatures.contains (us.getFeature());
+            return presentationFeatures.contains(us.getFeature());
         } else {
             return false;
         }
     }
 
-    private GlyphSequence reorderPreBaseMatra (GlyphSequence gs) {
+    private GlyphSequence reorderPreBaseMatra(GlyphSequence gs) {
         int source;
-        if ((source = findPreBaseMatra (gs)) >= 0) {
+        if ((source = findPreBaseMatra(gs)) >= 0) {
             int target;
-            if ((target = findPreBaseMatraTarget (gs, source)) >= 0) {
+            if ((target = findPreBaseMatraTarget(gs, source)) >= 0) {
                 if (target != source) {
-                    gs = reorder (gs, source, target);
+                    gs = reorder(gs, source, target);
                 }
             }
         }
@@ -302,7 +302,7 @@ public class IndicScriptProcessor extend
      * @param gs input sequence
      * @return index of pre-base matra or -1 if not found
      */
-    protected int findPreBaseMatra (GlyphSequence gs) {
+    protected int findPreBaseMatra(GlyphSequence gs) {
         return -1;
     }
 
@@ -312,17 +312,17 @@ public class IndicScriptProcessor extend
      * @param source index of pre-base matra
      * @return index of pre-base matra target or -1
      */
-    protected int findPreBaseMatraTarget (GlyphSequence gs, int source) {
+    protected int findPreBaseMatraTarget(GlyphSequence gs, int source) {
         return -1;
     }
 
-    private GlyphSequence reorderReph (GlyphSequence gs) {
+    private GlyphSequence reorderReph(GlyphSequence gs) {
         int source;
-        if ((source = findReph (gs)) >= 0) {
+        if ((source = findReph(gs)) >= 0) {
             int target;
-            if ((target = findRephTarget (gs, source)) >= 0) {
+            if ((target = findRephTarget(gs, source)) >= 0) {
                 if (target != source) {
-                    gs = reorder (gs, source, target);
+                    gs = reorder(gs, source, target);
                 }
             }
         }
@@ -334,7 +334,7 @@ public class IndicScriptProcessor extend
      * @param gs input sequence
      * @return index of reph or -1 if not found
      */
-    protected int findReph (GlyphSequence gs) {
+    protected int findReph(GlyphSequence gs) {
         return -1;
     }
 
@@ -344,18 +344,18 @@ public class IndicScriptProcessor extend
      * @param source index of reph
      * @return index of reph target or -1
      */
-    protected int findRephTarget (GlyphSequence gs, int source) {
+    protected int findRephTarget(GlyphSequence gs, int source) {
         return -1;
     }
 
-    private GlyphSequence reorder (GlyphSequence gs, int source, int target) {
-        return GlyphSequence.reorder (gs, source, 1, target);
+    private GlyphSequence reorder(GlyphSequence gs, int source, int target) {
+        return GlyphSequence.reorder(gs, source, 1, target);
     }
 
     /** {@inheritDoc} */
     @Override
-    public boolean position (GlyphSequence gs, String script, String language, int fontSize, GlyphTable.UseSpec[] usa, int[] widths, int[][] adjustments, ScriptContextTester sct) {
-        boolean adjusted = super.position (gs, script, language, fontSize, usa, widths, adjustments, sct);
+    public boolean position(GlyphSequence gs, String script, String language, int fontSize, GlyphTable.UseSpec[] usa, int[] widths, int[][] adjustments, ScriptContextTester sct) {
+        boolean adjusted = super.position(gs, script, language, fontSize, usa, widths, adjustments, sct);
         return adjusted;
     }
 
@@ -363,7 +363,7 @@ public class IndicScriptProcessor extend
     protected abstract static class Syllabizer implements Comparable {
         private String script;
         private String language;
-        Syllabizer (String script, String language) {
+        Syllabizer(String script, String language) {
             this.script = script;
             this.language = language;
         }
@@ -373,7 +373,7 @@ public class IndicScriptProcessor extend
          * @param gs input glyph sequence
          * @return segmented syllabic glyph sequences
          */
-        abstract GlyphSequence[] syllabize (GlyphSequence gs);
+        abstract GlyphSequence[] syllabize(GlyphSequence gs);
         /** {@inheritDoc} */
         public int hashCode() {
             int hc = 0;
@@ -382,12 +382,12 @@ public class IndicScriptProcessor extend
             return hc;
         }
         /** {@inheritDoc} */
-        public boolean equals (Object o) {
+        public boolean equals(Object o) {
             if (o instanceof Syllabizer) {
                 Syllabizer s = (Syllabizer) o;
-                if (! s.script.equals (script)) {
+                if (! s.script.equals(script)) {
                     return false;
-                } else if (! s.language.equals (language)) {
+                } else if (! s.language.equals(language)) {
                     return false;
                 } else {
                     return true;
@@ -397,12 +397,12 @@ public class IndicScriptProcessor extend
             }
         }
         /** {@inheritDoc} */
-        public int compareTo (Object o) {
+        public int compareTo(Object o) {
             int d;
             if (o instanceof Syllabizer) {
                 Syllabizer s = (Syllabizer) o;
-                if ((d = script.compareTo (s.script)) == 0) {
-                    d = language.compareTo (s.language);
+                if ((d = script.compareTo(s.script)) == 0) {
+                    d = language.compareTo(s.language);
                 }
             } else {
                 d = -1;
@@ -410,25 +410,25 @@ public class IndicScriptProcessor extend
             return d;
         }
         private static Map<String,Syllabizer> syllabizers = new HashMap<String,Syllabizer>();
-        static Syllabizer getSyllabizer (String script, String language, Class<? extends Syllabizer> syllabizerClass) {
-            String sid = makeSyllabizerId (script, language);
-            Syllabizer s = syllabizers.get (sid);
+        static Syllabizer getSyllabizer(String script, String language, Class<? extends Syllabizer> syllabizerClass) {
+            String sid = makeSyllabizerId(script, language);
+            Syllabizer s = syllabizers.get(sid);
             if (s == null) {
-                if ((s = makeSyllabizer (script, language, syllabizerClass)) == null) {
-                    s = new DefaultSyllabizer (script, language);
+                if ((s = makeSyllabizer(script, language, syllabizerClass)) == null) {
+                    s = new DefaultSyllabizer(script, language);
                 }
-                syllabizers.put (sid, s);
+                syllabizers.put(sid, s);
             }
             return s;
         }
-        static String makeSyllabizerId (String script, String language) {
+        static String makeSyllabizerId(String script, String language) {
             return script + ":" + language;
         }
-        static Syllabizer makeSyllabizer (String script, String language, Class<? extends Syllabizer> syllabizerClass) {
+        static Syllabizer makeSyllabizer(String script, String language, Class<? extends Syllabizer> syllabizerClass) {
             Syllabizer s;
             try {
-                Constructor<? extends Syllabizer> cf = syllabizerClass.getDeclaredConstructor (new Class[] { String.class, String.class });
-                s = (Syllabizer) cf.newInstance (script, language);
+                Constructor<? extends Syllabizer> cf = syllabizerClass.getDeclaredConstructor(new Class[] { String.class, String.class });
+                s = (Syllabizer) cf.newInstance(script, language);
             } catch (NoSuchMethodException e) {
                 s = null;
             } catch (InstantiationException e) {
@@ -444,18 +444,18 @@ public class IndicScriptProcessor extend
 
     /** Default syllabizer. */
     protected static class DefaultSyllabizer extends Syllabizer {
-        DefaultSyllabizer (String script, String language) {
-            super (script, language);
+        DefaultSyllabizer(String script, String language) {
+            super(script, language);
         }
         /** {@inheritDoc} */
         @Override
-        GlyphSequence[] syllabize (GlyphSequence gs) {
-            int[] ca = gs.getCharacterArray (false);
+        GlyphSequence[] syllabize(GlyphSequence gs) {
+            int[] ca = gs.getCharacterArray(false);
             int   nc = gs.getCharacterCount();
             if (nc == 0) {
                 return new GlyphSequence[] { gs };
             } else {
-                return segmentize (gs, segmentize (ca, nc));
+                return segmentize(gs, segmentize(ca, nc));
             }
         }
         /**
@@ -464,30 +464,30 @@ public class IndicScriptProcessor extend
          * @param nc number of characters in sequence
          * @return array of syllable segments
          */
-        protected Segment[] segmentize (int[] ca, int nc) {
-            Vector<Segment> sv = new Vector<Segment> (nc);
+        protected Segment[] segmentize(int[] ca, int nc) {
+            Vector<Segment> sv = new Vector<Segment>(nc);
             for (int s = 0, e = nc; s < e; ) {
                 int i;
-                if ((i = findStartOfSyllable (ca, s, e)) > s) {
+                if ((i = findStartOfSyllable(ca, s, e)) > s) {
                     // from s to i is non-syllable segment
-                    sv.add (new Segment (s, i, Segment.OTHER));
+                    sv.add(new Segment(s, i, Segment.OTHER));
                     s = i; // move s to start of syllable
                 } else if (i > s) {
                     // from s to e is non-syllable segment
-                    sv.add (new Segment (s, e, Segment.OTHER));
+                    sv.add(new Segment(s, e, Segment.OTHER));
                     s = e; // move s to end of input sequence
                 }
-                if ((i = findEndOfSyllable (ca, s, e)) > s) {
+                if ((i = findEndOfSyllable(ca, s, e)) > s) {
                     // from s to i is syllable segment
-                    sv.add (new Segment (s, i, Segment.SYLLABLE));
+                    sv.add(new Segment(s, i, Segment.SYLLABLE));
                     s = i; // move s to end of syllable
                 } else {
                     // from s to e is non-syllable segment
-                    sv.add (new Segment (s, e, Segment.OTHER));
+                    sv.add(new Segment(s, e, Segment.OTHER));
                     s = e; // move s to end of input sequence
                 }
             }
-            return sv.toArray (new Segment [ sv.size() ]);
+            return sv.toArray(new Segment [ sv.size() ]);
         }
         /**
          * Construct array of glyph sequences from original glyph sequence and segment array.
@@ -495,28 +495,28 @@ public class IndicScriptProcessor extend
          * @param sa segment array
          * @return array of glyph sequences each belonging to an (ordered) segment in SA
          */
-        protected GlyphSequence[] segmentize (GlyphSequence gs, Segment[] sa) {
+        protected GlyphSequence[] segmentize(GlyphSequence gs, Segment[] sa) {
             int   ng = gs.getGlyphCount();
-            int[] ga = gs.getGlyphArray (false);
-            GlyphSequence.CharAssociation[] aa = gs.getAssociations (0, -1);
+            int[] ga = gs.getGlyphArray(false);
+            GlyphSequence.CharAssociation[] aa = gs.getAssociations(0, -1);
             Vector<GlyphSequence> nsv = new Vector<GlyphSequence>();
             for (int i = 0, ns = sa.length; i < ns; i++) {
                 Segment s = sa [ i ];
-                Vector<Integer> ngv = new Vector<Integer> (ng);
-                Vector<GlyphSequence.CharAssociation> nav = new Vector<GlyphSequence.CharAssociation> (ng);
+                Vector<Integer> ngv = new Vector<Integer>(ng);
+                Vector<GlyphSequence.CharAssociation> nav = new Vector<GlyphSequence.CharAssociation>(ng);
                 for (int j = 0; j < ng; j++) {
                     GlyphSequence.CharAssociation ca = aa [ j ];
-                    if (ca.contained (s.getOffset(), s.getCount())) {
-                        ngv.add (ga [ j ]);
-                        nav.add (ca);
+                    if (ca.contained(s.getOffset(), s.getCount())) {
+                        ngv.add(ga [ j ]);
+                        nav.add(ca);
                     }
                 }
                 if (ngv.size() > 0) {
-                    nsv.add (new GlyphSequence (gs, null, toIntArray (ngv), null, null, nav.toArray (new GlyphSequence.CharAssociation [ nav.size() ]), null));
+                    nsv.add(new GlyphSequence(gs, null, toIntArray(ngv), null, null, nav.toArray(new GlyphSequence.CharAssociation [ nav.size() ]), null));
                 }
             }
             if (nsv.size() > 0) {
-                return nsv.toArray (new GlyphSequence [ nsv.size() ]);
+                return nsv.toArray(new GlyphSequence [ nsv.size() ]);
             } else {
                 return new GlyphSequence[] { gs };
             }
@@ -528,7 +528,7 @@ public class IndicScriptProcessor extend
          * @param e end index
          * @return index of start or E if no start found
          */
-        protected int findStartOfSyllable (int[] ca, int s, int e) {
+        protected int findStartOfSyllable(int[] ca, int s, int e) {
             return e;
         }
         /**
@@ -538,14 +538,14 @@ public class IndicScriptProcessor extend
          * @param e end index
          * @return index of start or S if no end found
          */
-        protected int findEndOfSyllable (int[] ca, int s, int e) {
+        protected int findEndOfSyllable(int[] ca, int s, int e) {
             return s;
         }
-        private static int[] toIntArray (Vector<Integer> iv) {
+        private static int[] toIntArray(Vector<Integer> iv) {
             int ni = iv.size();
             int[] ia = new int [ iv.size() ];
             for (int i = 0, n = ni; i < n; i++) {
-                ia [ i ] = (int) iv.get (i);
+                ia [ i ] = (int) iv.get(i);
             }
             return ia;
         }
@@ -561,7 +561,7 @@ public class IndicScriptProcessor extend
         private int end;
         private int type;
 
-        Segment (int start, int end, int type) {
+        Segment(int start, int end, int type) {
             this.start = start;
             this.end = end;
             this.type = type;



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