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 [5/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/GlyphProcessingState.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphProcessingState.java?rev=1479969&r1=1479968&r2=1479969&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphProcessingState.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphProcessingState.java Tue May 7 16:23:13 2013
@@ -89,14 +89,14 @@ public class GlyphProcessingState {
* @param feature feature identifier
* @param sct script context tester (or null)
*/
- protected GlyphProcessingState (GlyphSequence gs, String script, String language, String feature, ScriptContextTester sct) {
+ protected GlyphProcessingState(GlyphSequence gs, String script, String language, String feature, ScriptContextTester sct) {
this.script = script;
this.language = language;
this.feature = feature;
this.igs = gs;
this.indexLast = gs.getGlyphCount();
this.sct = sct;
- this.gct = (sct != null) ? sct.getTester (feature) : null;
+ this.gct = (sct != null) ? sct.getTester(feature) : null;
this.ignoreBase = new GlyphTester() { public boolean test(int gi, int flags) { return isIgnoredBase(gi, flags); } };
this.ignoreLigature = new GlyphTester() { public boolean test(int gi, int flags) { return isIgnoredLigature(gi, flags); } };
this.ignoreMark = new GlyphTester() { public boolean test(int gi, int flags) { return isIgnoredMark(gi, flags); } };
@@ -107,9 +107,9 @@ public class GlyphProcessingState {
* except as follows: input glyph sequence is copied deep except for its characters array.
* @param s existing processing state to copy from
*/
- protected GlyphProcessingState (GlyphProcessingState s) {
- this (new GlyphSequence (s.igs), s.script, s.language, s.feature, s.sct);
- setPosition (s.index);
+ protected GlyphProcessingState(GlyphProcessingState s) {
+ this (new GlyphSequence(s.igs), s.script, s.language, s.feature, s.sct);
+ setPosition(s.index);
}
/**
@@ -120,7 +120,7 @@ public class GlyphProcessingState {
* @param feature feature identifier
* @param sct script context tester (or null)
*/
- protected GlyphProcessingState reset (GlyphSequence gs, String script, String language, String feature, ScriptContextTester sct) {
+ protected GlyphProcessingState reset(GlyphSequence gs, String script, String language, String feature, ScriptContextTester sct) {
this.gdef = null;
this.script = script;
this.language = language;
@@ -132,7 +132,7 @@ public class GlyphProcessingState {
this.lookupFlags = 0;
this.classMatchSet = 0;
this.sct = sct;
- this.gct = (sct != null) ? sct.getTester (feature) : null;
+ this.gct = (sct != null) ? sct.getTester(feature) : null;
this.ignoreBase = new GlyphTester() { public boolean test(int gi, int flags) { return isIgnoredBase(gi, flags); } };
this.ignoreLigature = new GlyphTester() { public boolean test(int gi, int flags) { return isIgnoredLigature(gi, flags); } };
this.ignoreMark = new GlyphTester() { public boolean test(int gi, int flags) { return isIgnoredMark(gi, flags); } };
@@ -145,7 +145,7 @@ public class GlyphProcessingState {
* Set governing glyph definition table.
* @param gdef glyph definition table (or null, to unset)
*/
- public void setGDEF (GlyphDefinitionTable gdef) {
+ public void setGDEF(GlyphDefinitionTable gdef) {
if (this.gdef == null) {
this.gdef = gdef;
} else if (gdef == null) {
@@ -165,7 +165,7 @@ public class GlyphProcessingState {
* Set governing lookup flags
* @param flags lookup flags (or zero, to unset)
*/
- public void setLookupFlags (int flags) {
+ public void setLookupFlags(int flags) {
if (this.lookupFlags == 0) {
this.lookupFlags = flags;
} else if (flags == 0) {
@@ -186,7 +186,7 @@ public class GlyphProcessingState {
* @param gi glyph index that may be used to determine which match set applies
* @return class match set (zero may indicate unset or no set)
*/
- public int getClassMatchSet (int gi) {
+ public int getClassMatchSet(int gi) {
return 0;
}
@@ -194,7 +194,7 @@ public class GlyphProcessingState {
* Set default ignore tester.
* @param ignoreDefault glyph tester (or null, to unset)
*/
- public void setIgnoreDefault (GlyphTester ignoreDefault) {
+ public void setIgnoreDefault(GlyphTester ignoreDefault) {
if (this.ignoreDefault == null) {
this.ignoreDefault = ignoreDefault;
} else if (ignoreDefault == null) {
@@ -217,11 +217,11 @@ public class GlyphProcessingState {
* this state is to be reset.
* @param st glyph subtable to use for update
*/
- public void updateSubtableState (GlyphSubtable st) {
+ public void updateSubtableState(GlyphSubtable st) {
if (this.subtable != st) {
- setGDEF (st.getGDEF());
- setLookupFlags (st.getFlags());
- setIgnoreDefault (getIgnoreTester (getLookupFlags()));
+ setGDEF(st.getGDEF());
+ setLookupFlags(st.getFlags());
+ setIgnoreDefault(getIgnoreTester(getLookupFlags()));
this.subtable = st;
}
}
@@ -240,7 +240,7 @@ public class GlyphProcessingState {
* @throws IndexOutOfBoundsException if index is less than zero
* or exceeds last valid position
*/
- public void setPosition (int index) throws IndexOutOfBoundsException {
+ public void setPosition(int index) throws IndexOutOfBoundsException {
if ((index >= 0) && (index <= indexLast)) {
this.index = index;
} else {
@@ -262,7 +262,7 @@ public class GlyphProcessingState {
* @return true if one or more glyph remains
*/
public boolean hasNext() {
- return hasNext (1);
+ return hasNext(1);
}
/**
@@ -271,7 +271,7 @@ public class GlyphProcessingState {
* @param count of glyphs to test
* @return true if at least <code>count</code> glyphs are available
*/
- public boolean hasNext (int count) {
+ public boolean hasNext(int count) {
return (index + count) <= indexLast;
}
@@ -303,7 +303,7 @@ public class GlyphProcessingState {
* @return true if one or more glyph remains
*/
public boolean hasPrev() {
- return hasPrev (1);
+ return hasPrev(1);
}
/**
@@ -312,7 +312,7 @@ public class GlyphProcessingState {
* @param count of glyphs to test
* @return true if at least <code>count</code> glyphs are available
*/
- public boolean hasPrev (int count) {
+ public boolean hasPrev(int count) {
return (index - count) >= 0;
}
@@ -348,7 +348,7 @@ public class GlyphProcessingState {
* @throws IndexOutOfBoundsException if count would cause consumption
* to exceed count of glyphs in input glyph sequence
*/
- public int consume (int count) throws IndexOutOfBoundsException {
+ public int consume(int count) throws IndexOutOfBoundsException {
if ((consumed + count) <= indexLast) {
consumed += count;
return consumed;
@@ -379,12 +379,12 @@ public class GlyphProcessingState {
* @return glyph at specified offset from current position
* @throws IndexOutOfBoundsException if no glyph available at offset
*/
- public int getGlyph (int offset) throws IndexOutOfBoundsException {
+ public int getGlyph(int offset) throws IndexOutOfBoundsException {
int i = index + offset;
if ((i >= 0) && (i < indexLast)) {
- return igs.getGlyph (i);
+ return igs.getGlyph(i);
} else {
- throw new IndexOutOfBoundsException ("attempting index at " + i);
+ throw new IndexOutOfBoundsException("attempting index at " + i);
}
}
@@ -394,7 +394,7 @@ public class GlyphProcessingState {
* @throws IndexOutOfBoundsException if no glyph available
*/
public int getGlyph() throws IndexOutOfBoundsException {
- return getGlyph (0);
+ return getGlyph(0);
}
/**
@@ -403,12 +403,12 @@ public class GlyphProcessingState {
* @param glyph to set at specified offset from current position
* @throws IndexOutOfBoundsException if specified offset is not valid position
*/
- public void setGlyph (int offset, int glyph) throws IndexOutOfBoundsException {
+ public void setGlyph(int offset, int glyph) throws IndexOutOfBoundsException {
int i = index + offset;
if ((i >= 0) && (i < indexLast)) {
- igs.setGlyph (i, glyph);
+ igs.setGlyph(i, glyph);
} else {
- throw new IndexOutOfBoundsException ("attempting index at " + i);
+ throw new IndexOutOfBoundsException("attempting index at " + i);
}
}
@@ -418,12 +418,12 @@ public class GlyphProcessingState {
* @return character association of glyph at current position
* @throws IndexOutOfBoundsException if offset results in an invalid index into input glyph sequence
*/
- public GlyphSequence.CharAssociation getAssociation (int offset) throws IndexOutOfBoundsException {
+ public GlyphSequence.CharAssociation getAssociation(int offset) throws IndexOutOfBoundsException {
int i = index + offset;
if ((i >= 0) && (i < indexLast)) {
- return igs.getAssociation (i);
+ return igs.getAssociation(i);
} else {
- throw new IndexOutOfBoundsException ("attempting index at " + i);
+ throw new IndexOutOfBoundsException("attempting index at " + i);
}
}
@@ -433,7 +433,7 @@ public class GlyphProcessingState {
* @throws IndexOutOfBoundsException if no glyph available
*/
public GlyphSequence.CharAssociation getAssociation() throws IndexOutOfBoundsException {
- return getAssociation (0);
+ return getAssociation(0);
}
/**
@@ -452,39 +452,39 @@ public class GlyphProcessingState {
* @throws IndexOutOfBoundsException if offset or count results in an
* invalid index into input glyph sequence
*/
- public int[] getGlyphs (int offset, int count, boolean reverseOrder, GlyphTester ignoreTester, int[] glyphs, int[] counts) throws IndexOutOfBoundsException {
+ public int[] getGlyphs(int offset, int count, boolean reverseOrder, GlyphTester ignoreTester, int[] glyphs, int[] counts) throws IndexOutOfBoundsException {
if (count < 0) {
- count = getGlyphsAvailable (offset, reverseOrder, ignoreTester) [ 0 ];
+ count = getGlyphsAvailable(offset, reverseOrder, ignoreTester) [ 0 ];
}
int start = index + offset;
if (start < 0) {
- throw new IndexOutOfBoundsException ("will attempt index at " + start);
+ throw new IndexOutOfBoundsException("will attempt index at " + start);
} else if (! reverseOrder && ((start + count) > indexLast)) {
- throw new IndexOutOfBoundsException ("will attempt index at " + (start + count));
+ throw new IndexOutOfBoundsException("will attempt index at " + (start + count));
} else if (reverseOrder && ((start + 1) < count)) {
- throw new IndexOutOfBoundsException ("will attempt index at " + (start - count));
+ throw new IndexOutOfBoundsException("will attempt index at " + (start - count));
}
if (glyphs == null) {
glyphs = new int [ count ];
} else if (glyphs.length != count) {
- throw new IllegalArgumentException ("glyphs array is non-null, but its length (" + glyphs.length + "), is not equal to count (" + count + ")");
+ throw new IllegalArgumentException("glyphs array is non-null, but its length (" + glyphs.length + "), is not equal to count (" + count + ")");
}
if (! reverseOrder) {
- return getGlyphsForward (start, count, ignoreTester, glyphs, counts);
+ return getGlyphsForward(start, count, ignoreTester, glyphs, counts);
} else {
- return getGlyphsReverse (start, count, ignoreTester, glyphs, counts);
+ return getGlyphsReverse(start, count, ignoreTester, glyphs, counts);
}
}
- private int[] getGlyphsForward (int start, int count, GlyphTester ignoreTester, int[] glyphs, int[] counts) throws IndexOutOfBoundsException {
+ private int[] getGlyphsForward(int start, int count, GlyphTester ignoreTester, int[] glyphs, int[] counts) throws IndexOutOfBoundsException {
int counted = 0;
int ignored = 0;
for (int i = start, n = indexLast; (i < n) && (counted < count); i++) {
- int gi = getGlyph (i - index);
+ int gi = getGlyph(i - index);
if (gi == 65535) {
ignored++;
} else {
- if ((ignoreTester == null) || ! ignoreTester.test (gi, getLookupFlags())) {
+ if ((ignoreTester == null) || ! ignoreTester.test(gi, getLookupFlags())) {
glyphs [ counted++ ] = gi;
} else {
ignored++;
@@ -498,15 +498,15 @@ public class GlyphProcessingState {
return glyphs;
}
- private int[] getGlyphsReverse (int start, int count, GlyphTester ignoreTester, int[] glyphs, int[] counts) throws IndexOutOfBoundsException {
+ private int[] getGlyphsReverse(int start, int count, GlyphTester ignoreTester, int[] glyphs, int[] counts) throws IndexOutOfBoundsException {
int counted = 0;
int ignored = 0;
for (int i = start; (i >= 0) && (counted < count); i--) {
- int gi = getGlyph (i - index);
+ int gi = getGlyph(i - index);
if (gi == 65535) {
ignored++;
} else {
- if ((ignoreTester == null) || ! ignoreTester.test (gi, getLookupFlags())) {
+ if ((ignoreTester == null) || ! ignoreTester.test(gi, getLookupFlags())) {
glyphs [ counted++ ] = gi;
} else {
ignored++;
@@ -534,8 +534,8 @@ public class GlyphProcessingState {
* @throws IndexOutOfBoundsException if offset or count results in an
* invalid index into input glyph sequence
*/
- public int[] getGlyphs (int offset, int count, int[] glyphs, int[] counts) throws IndexOutOfBoundsException {
- return getGlyphs (offset, count, offset < 0, ignoreDefault, glyphs, counts);
+ public int[] getGlyphs(int offset, int count, int[] glyphs, int[] counts) throws IndexOutOfBoundsException {
+ return getGlyphs(offset, count, offset < 0, ignoreDefault, glyphs, counts);
}
/**
@@ -544,7 +544,7 @@ public class GlyphProcessingState {
* @throws IndexOutOfBoundsException if no glyph available
*/
public int[] getGlyphs() throws IndexOutOfBoundsException {
- return getGlyphs (0, indexLast - index, false, null, null, null);
+ return getGlyphs(0, indexLast - index, false, null, null, null);
}
/**
@@ -563,8 +563,8 @@ public class GlyphProcessingState {
* @throws IndexOutOfBoundsException if offset or count results in an
* invalid index into input glyph sequence
*/
- public int[] getIgnoredGlyphs (int offset, int count, boolean reverseOrder, GlyphTester ignoreTester, int[] glyphs, int[] counts) throws IndexOutOfBoundsException {
- return getGlyphs (offset, count, reverseOrder, new NotGlyphTester (ignoreTester), glyphs, counts);
+ public int[] getIgnoredGlyphs(int offset, int count, boolean reverseOrder, GlyphTester ignoreTester, int[] glyphs, int[] counts) throws IndexOutOfBoundsException {
+ return getGlyphs(offset, count, reverseOrder, new NotGlyphTester(ignoreTester), glyphs, counts);
}
/**
@@ -576,8 +576,8 @@ public class GlyphProcessingState {
* @throws IndexOutOfBoundsException if offset or count results in an
* invalid index into input glyph sequence
*/
- public int[] getIgnoredGlyphs (int offset, int count) throws IndexOutOfBoundsException {
- return getIgnoredGlyphs (offset, count, offset < 0, ignoreDefault, null, null);
+ public int[] getIgnoredGlyphs(int offset, int count) throws IndexOutOfBoundsException {
+ return getIgnoredGlyphs(offset, count, offset < 0, ignoreDefault, null, null);
}
/**
@@ -589,8 +589,8 @@ public class GlyphProcessingState {
* @throws IndexOutOfBoundsException if offset results in an
* invalid index into input glyph sequence
*/
- public boolean isIgnoredGlyph (int offset, GlyphTester ignoreTester) throws IndexOutOfBoundsException {
- return (ignoreTester != null) && ignoreTester.test (getGlyph (offset), getLookupFlags());
+ public boolean isIgnoredGlyph(int offset, GlyphTester ignoreTester) throws IndexOutOfBoundsException {
+ return (ignoreTester != null) && ignoreTester.test(getGlyph(offset), getLookupFlags());
}
/**
@@ -601,8 +601,8 @@ public class GlyphProcessingState {
* @throws IndexOutOfBoundsException if offset results in an
* invalid index into input glyph sequence
*/
- public boolean isIgnoredGlyph (int offset) throws IndexOutOfBoundsException {
- return isIgnoredGlyph (offset, ignoreDefault);
+ public boolean isIgnoredGlyph(int offset) throws IndexOutOfBoundsException {
+ return isIgnoredGlyph(offset, ignoreDefault);
}
/**
@@ -612,7 +612,7 @@ public class GlyphProcessingState {
* invalid index into input glyph sequence
*/
public boolean isIgnoredGlyph() throws IndexOutOfBoundsException {
- return isIgnoredGlyph (getPosition());
+ return isIgnoredGlyph(getPosition());
}
/**
@@ -625,29 +625,29 @@ public class GlyphProcessingState {
* @throws IndexOutOfBoundsException if offset or count results in an
* invalid index into input glyph sequence
*/
- public int[] getGlyphsAvailable (int offset, boolean reverseOrder, GlyphTester ignoreTester) throws IndexOutOfBoundsException {
+ public int[] getGlyphsAvailable(int offset, boolean reverseOrder, GlyphTester ignoreTester) throws IndexOutOfBoundsException {
int start = index + offset;
if ((start < 0) || (start > indexLast)) {
return new int[] { 0, 0 };
} else if (! reverseOrder) {
- return getGlyphsAvailableForward (start, ignoreTester);
+ return getGlyphsAvailableForward(start, ignoreTester);
} else {
- return getGlyphsAvailableReverse (start, ignoreTester);
+ return getGlyphsAvailableReverse(start, ignoreTester);
}
}
- private int[] getGlyphsAvailableForward (int start, GlyphTester ignoreTester) throws IndexOutOfBoundsException {
+ private int[] getGlyphsAvailableForward(int start, GlyphTester ignoreTester) throws IndexOutOfBoundsException {
int counted = 0;
int ignored = 0;
if (ignoreTester == null) {
counted = indexLast - start;
} else {
for (int i = start, n = indexLast; i < n; i++) {
- int gi = getGlyph (i - index);
+ int gi = getGlyph(i - index);
if (gi == 65535) {
ignored++;
} else {
- if (ignoreTester.test (gi, getLookupFlags())) {
+ if (ignoreTester.test(gi, getLookupFlags())) {
ignored++;
} else {
counted++;
@@ -658,18 +658,18 @@ public class GlyphProcessingState {
return new int[] { counted, ignored };
}
- private int[] getGlyphsAvailableReverse (int start, GlyphTester ignoreTester) throws IndexOutOfBoundsException {
+ private int[] getGlyphsAvailableReverse(int start, GlyphTester ignoreTester) throws IndexOutOfBoundsException {
int counted = 0;
int ignored = 0;
if (ignoreTester == null) {
counted = start + 1;
} else {
for (int i = start; i >= 0; i--) {
- int gi = getGlyph (i - index);
+ int gi = getGlyph(i - index);
if (gi == 65535) {
ignored++;
} else {
- if (ignoreTester.test (gi, getLookupFlags())) {
+ if (ignoreTester.test(gi, getLookupFlags())) {
ignored++;
} else {
counted++;
@@ -690,8 +690,8 @@ public class GlyphProcessingState {
* @throws IndexOutOfBoundsException if offset or count results in an
* invalid index into input glyph sequence
*/
- public int[] getGlyphsAvailable (int offset, boolean reverseOrder) throws IndexOutOfBoundsException {
- return getGlyphsAvailable (offset, reverseOrder, ignoreDefault);
+ public int[] getGlyphsAvailable(int offset, boolean reverseOrder) throws IndexOutOfBoundsException {
+ return getGlyphsAvailable(offset, reverseOrder, ignoreDefault);
}
/**
@@ -703,8 +703,8 @@ public class GlyphProcessingState {
* @throws IndexOutOfBoundsException if offset or count results in an
* invalid index into input glyph sequence
*/
- public int[] getGlyphsAvailable (int offset) throws IndexOutOfBoundsException {
- return getGlyphsAvailable (offset, offset < 0);
+ public int[] getGlyphsAvailable(int offset) throws IndexOutOfBoundsException {
+ return getGlyphsAvailable(offset, offset < 0);
}
/**
@@ -723,43 +723,43 @@ public class GlyphProcessingState {
* @throws IndexOutOfBoundsException if offset or count results in an
* invalid index into input glyph sequence
*/
- public GlyphSequence.CharAssociation[] getAssociations (int offset, int count, boolean reverseOrder, GlyphTester ignoreTester, GlyphSequence.CharAssociation[] associations, int[] counts)
+ public GlyphSequence.CharAssociation[] getAssociations(int offset, int count, boolean reverseOrder, GlyphTester ignoreTester, GlyphSequence.CharAssociation[] associations, int[] counts)
throws IndexOutOfBoundsException {
if (count < 0) {
- count = getGlyphsAvailable (offset, reverseOrder, ignoreTester) [ 0 ];
+ count = getGlyphsAvailable(offset, reverseOrder, ignoreTester) [ 0 ];
}
int start = index + offset;
if (start < 0) {
- throw new IndexOutOfBoundsException ("will attempt index at " + start);
+ throw new IndexOutOfBoundsException("will attempt index at " + start);
} else if (! reverseOrder && ((start + count) > indexLast)) {
- throw new IndexOutOfBoundsException ("will attempt index at " + (start + count));
+ throw new IndexOutOfBoundsException("will attempt index at " + (start + count));
} else if (reverseOrder && ((start + 1) < count)) {
- throw new IndexOutOfBoundsException ("will attempt index at " + (start - count));
+ throw new IndexOutOfBoundsException("will attempt index at " + (start - count));
}
if (associations == null) {
associations = new GlyphSequence.CharAssociation [ count ];
} else if (associations.length != count) {
- throw new IllegalArgumentException ("associations array is non-null, but its length (" + associations.length + "), is not equal to count (" + count + ")");
+ throw new IllegalArgumentException("associations array is non-null, but its length (" + associations.length + "), is not equal to count (" + count + ")");
}
if (! reverseOrder) {
- return getAssociationsForward (start, count, ignoreTester, associations, counts);
+ return getAssociationsForward(start, count, ignoreTester, associations, counts);
} else {
- return getAssociationsReverse (start, count, ignoreTester, associations, counts);
+ return getAssociationsReverse(start, count, ignoreTester, associations, counts);
}
}
- private GlyphSequence.CharAssociation[] getAssociationsForward (int start, int count, GlyphTester ignoreTester, GlyphSequence.CharAssociation[] associations, int[] counts)
+ private GlyphSequence.CharAssociation[] getAssociationsForward(int start, int count, GlyphTester ignoreTester, GlyphSequence.CharAssociation[] associations, int[] counts)
throws IndexOutOfBoundsException {
int counted = 0;
int ignored = 0;
for (int i = start, n = indexLast, k = 0; i < n; i++) {
- int gi = getGlyph (i - index);
+ int gi = getGlyph(i - index);
if (gi == 65535) {
ignored++;
} else {
- if ((ignoreTester == null) || ! ignoreTester.test (gi, getLookupFlags())) {
+ if ((ignoreTester == null) || ! ignoreTester.test(gi, getLookupFlags())) {
if (k < count) {
- associations [ k++ ] = getAssociation (i - index);
+ associations [ k++ ] = getAssociation(i - index);
counted++;
} else {
break;
@@ -776,18 +776,18 @@ public class GlyphProcessingState {
return associations;
}
- private GlyphSequence.CharAssociation[] getAssociationsReverse (int start, int count, GlyphTester ignoreTester, GlyphSequence.CharAssociation[] associations, int[] counts)
+ private GlyphSequence.CharAssociation[] getAssociationsReverse(int start, int count, GlyphTester ignoreTester, GlyphSequence.CharAssociation[] associations, int[] counts)
throws IndexOutOfBoundsException {
int counted = 0;
int ignored = 0;
for (int i = start, k = 0; i >= 0; i--) {
- int gi = getGlyph (i - index);
+ int gi = getGlyph(i - index);
if (gi == 65535) {
ignored++;
} else {
- if ((ignoreTester == null) || ! ignoreTester.test (gi, getLookupFlags())) {
+ if ((ignoreTester == null) || ! ignoreTester.test(gi, getLookupFlags())) {
if (k < count) {
- associations [ k++ ] = getAssociation (i - index);
+ associations [ k++ ] = getAssociation(i - index);
counted++;
} else {
break;
@@ -814,8 +814,8 @@ public class GlyphProcessingState {
* @throws IndexOutOfBoundsException if offset or count results in an
* invalid index into input glyph sequence
*/
- public GlyphSequence.CharAssociation[] getAssociations (int offset, int count) throws IndexOutOfBoundsException {
- return getAssociations (offset, count, offset < 0, ignoreDefault, null, null);
+ public GlyphSequence.CharAssociation[] getAssociations(int offset, int count) throws IndexOutOfBoundsException {
+ return getAssociations(offset, count, offset < 0, ignoreDefault, null, null);
}
/**
@@ -834,9 +834,9 @@ public class GlyphProcessingState {
* @throws IndexOutOfBoundsException if offset or count results in an
* invalid index into input glyph sequence
*/
- public GlyphSequence.CharAssociation[] getIgnoredAssociations (int offset, int count, boolean reverseOrder, GlyphTester ignoreTester, GlyphSequence.CharAssociation[] associations, int[] counts)
+ public GlyphSequence.CharAssociation[] getIgnoredAssociations(int offset, int count, boolean reverseOrder, GlyphTester ignoreTester, GlyphSequence.CharAssociation[] associations, int[] counts)
throws IndexOutOfBoundsException {
- return getAssociations (offset, count, reverseOrder, new NotGlyphTester (ignoreTester), associations, counts);
+ return getAssociations(offset, count, reverseOrder, new NotGlyphTester(ignoreTester), associations, counts);
}
/**
@@ -849,8 +849,8 @@ public class GlyphProcessingState {
* @throws IndexOutOfBoundsException if offset or count results in an
* invalid index into input glyph sequence
*/
- public GlyphSequence.CharAssociation[] getIgnoredAssociations (int offset, int count) throws IndexOutOfBoundsException {
- return getIgnoredAssociations (offset, count, offset < 0, ignoreDefault, null, null);
+ public GlyphSequence.CharAssociation[] getIgnoredAssociations(int offset, int count) throws IndexOutOfBoundsException {
+ return getIgnoredAssociations(offset, count, offset < 0, ignoreDefault, null, null);
}
/**
@@ -866,7 +866,7 @@ public class GlyphProcessingState {
* @throws IndexOutOfBoundsException if offset or count results in an
* invalid index into input glyph sequence
*/
- public boolean replaceInput (int offset, int count, GlyphSequence gs, int gsOffset, int gsCount) throws IndexOutOfBoundsException {
+ public boolean replaceInput(int offset, int count, GlyphSequence gs, int gsOffset, int gsCount) throws IndexOutOfBoundsException {
int nig = (igs != null) ? igs.getGlyphCount() : 0;
int position = getPosition() + offset;
if (position < 0) {
@@ -887,23 +887,23 @@ public class GlyphProcessingState {
gsCount = nrg - gsOffset;
}
int ng = nig + gsCount - count;
- IntBuffer gb = IntBuffer.allocate (ng);
- List al = new ArrayList (ng);
+ IntBuffer gb = IntBuffer.allocate(ng);
+ List al = new ArrayList(ng);
for (int i = 0, n = position; i < n; i++) {
- gb.put (igs.getGlyph (i));
- al.add (igs.getAssociation (i));
+ gb.put(igs.getGlyph(i));
+ al.add(igs.getAssociation(i));
}
for (int i = gsOffset, n = gsOffset + gsCount; i < n; i++) {
- gb.put (gs.getGlyph (i));
- al.add (gs.getAssociation (i));
+ gb.put(gs.getGlyph(i));
+ al.add(gs.getAssociation(i));
}
for (int i = position + count, n = nig; i < n; i++) {
- gb.put (igs.getGlyph (i));
- al.add (igs.getAssociation (i));
+ gb.put(igs.getGlyph(i));
+ al.add(igs.getAssociation(i));
}
gb.flip();
- if (igs.compareGlyphs (gb) != 0) {
- this.igs = new GlyphSequence (igs.getCharacters(), gb, al);
+ if (igs.compareGlyphs(gb) != 0) {
+ this.igs = new GlyphSequence(igs.getCharacters(), gb, al);
this.indexLast = gb.limit();
return true;
} else {
@@ -921,8 +921,8 @@ public class GlyphProcessingState {
* @throws IndexOutOfBoundsException if offset or count results in an
* invalid index into input glyph sequence
*/
- public boolean replaceInput (int offset, int count, GlyphSequence gs) throws IndexOutOfBoundsException {
- return replaceInput (offset, count, gs, 0, gs.getGlyphCount());
+ public boolean replaceInput(int offset, int count, GlyphSequence gs) throws IndexOutOfBoundsException {
+ return replaceInput(offset, count, gs, 0, gs.getGlyphCount());
}
/**
@@ -935,16 +935,16 @@ public class GlyphProcessingState {
* @throws IndexOutOfBoundsException if offset or count results in an
* invalid index into input glyph sequence
*/
- public int erase (int offset, int[] glyphs) throws IndexOutOfBoundsException {
+ public int erase(int offset, int[] glyphs) throws IndexOutOfBoundsException {
int start = index + offset;
if ((start < 0) || (start > indexLast)) {
- throw new IndexOutOfBoundsException ("will attempt index at " + start);
+ throw new IndexOutOfBoundsException("will attempt index at " + start);
} else {
int erased = 0;
for (int i = start - index, n = indexLast - start; i < n; i++) {
- int gi = getGlyph (i);
+ int gi = getGlyph(i);
if (gi == glyphs [ erased ]) {
- setGlyph (i, 65535);
+ setGlyph(i, 65535);
erased++;
}
}
@@ -962,7 +962,7 @@ public class GlyphProcessingState {
if (gct == null) {
return true;
} else {
- return gct.test (script, language, feature, igs, index, getLookupFlags());
+ return gct.test(script, language, feature, igs, index, getLookupFlags());
}
}
@@ -979,9 +979,9 @@ public class GlyphProcessingState {
* @param gi glyph index to test
* @return true if glyph definition table records glyph as a base glyph; otherwise, false
*/
- public boolean isBase (int gi) {
+ public boolean isBase(int gi) {
if (gdef != null) {
- return gdef.isGlyphClass (gi, GlyphDefinitionTable.GLYPH_CLASS_BASE);
+ return gdef.isGlyphClass(gi, GlyphDefinitionTable.GLYPH_CLASS_BASE);
} else {
return false;
}
@@ -994,8 +994,8 @@ public class GlyphProcessingState {
* @param flags that apply to lookup in scope
* @return true if glyph definition table records glyph as a base glyph; otherwise, false
*/
- public boolean isIgnoredBase (int gi, int flags) {
- return ((flags & GlyphSubtable.LF_IGNORE_BASE) != 0) && isBase (gi);
+ public boolean isIgnoredBase(int gi, int flags) {
+ return ((flags & GlyphSubtable.LF_IGNORE_BASE) != 0) && isBase(gi);
}
/**
@@ -1004,9 +1004,9 @@ public class GlyphProcessingState {
* @param gi glyph index to test
* @return true if glyph definition table records glyph as a ligature glyph; otherwise, false
*/
- public boolean isLigature (int gi) {
+ public boolean isLigature(int gi) {
if (gdef != null) {
- return gdef.isGlyphClass (gi, GlyphDefinitionTable.GLYPH_CLASS_LIGATURE);
+ return gdef.isGlyphClass(gi, GlyphDefinitionTable.GLYPH_CLASS_LIGATURE);
} else {
return false;
}
@@ -1019,8 +1019,8 @@ public class GlyphProcessingState {
* @param flags that apply to lookup in scope
* @return true if glyph definition table records glyph as a ligature glyph; otherwise, false
*/
- public boolean isIgnoredLigature (int gi, int flags) {
- return ((flags & GlyphSubtable.LF_IGNORE_LIGATURE) != 0) && isLigature (gi);
+ public boolean isIgnoredLigature(int gi, int flags) {
+ return ((flags & GlyphSubtable.LF_IGNORE_LIGATURE) != 0) && isLigature(gi);
}
/**
@@ -1029,9 +1029,9 @@ public class GlyphProcessingState {
* @param gi glyph index to test
* @return true if glyph definition table records glyph as a mark glyph; otherwise, false
*/
- public boolean isMark (int gi) {
+ public boolean isMark(int gi) {
if (gdef != null) {
- return gdef.isGlyphClass (gi, GlyphDefinitionTable.GLYPH_CLASS_MARK);
+ return gdef.isGlyphClass(gi, GlyphDefinitionTable.GLYPH_CLASS_MARK);
} else {
return false;
}
@@ -1044,12 +1044,12 @@ public class GlyphProcessingState {
* @param flags that apply to lookup in scope
* @return true if glyph definition table records glyph as a ligature glyph; otherwise, false
*/
- public boolean isIgnoredMark (int gi, int flags) {
+ public boolean isIgnoredMark(int gi, int flags) {
if ((flags & GlyphSubtable.LF_IGNORE_MARK) != 0) {
- return isMark (gi);
+ return isMark(gi);
} else if ((flags & GlyphSubtable.LF_MARK_ATTACHMENT_TYPE) != 0) {
int lac = (flags & GlyphSubtable.LF_MARK_ATTACHMENT_TYPE) >> 8;
- int gac = gdef.getMarkAttachClass (gi);
+ int gac = gdef.getMarkAttachClass(gi);
return (gac != lac);
} else {
return false;
@@ -1061,26 +1061,26 @@ public class GlyphProcessingState {
* @param flags lookup flags
* @return a glyph tester
*/
- public GlyphTester getIgnoreTester (int flags) {
+ public GlyphTester getIgnoreTester(int flags) {
if ((flags & GlyphSubtable.LF_IGNORE_BASE) != 0) {
if ((flags & (GlyphSubtable.LF_IGNORE_LIGATURE | GlyphSubtable.LF_IGNORE_MARK)) == 0) {
return ignoreBase;
} else {
- return getCombinedIgnoreTester (flags);
+ return getCombinedIgnoreTester(flags);
}
}
if ((flags & GlyphSubtable.LF_IGNORE_LIGATURE) != 0) {
if ((flags & (GlyphSubtable.LF_IGNORE_BASE | GlyphSubtable.LF_IGNORE_MARK)) == 0) {
return ignoreLigature;
} else {
- return getCombinedIgnoreTester (flags);
+ return getCombinedIgnoreTester(flags);
}
}
if ((flags & GlyphSubtable.LF_IGNORE_MARK) != 0) {
if ((flags & (GlyphSubtable.LF_IGNORE_BASE | GlyphSubtable.LF_IGNORE_LIGATURE)) == 0) {
return ignoreMark;
} else {
- return getCombinedIgnoreTester (flags);
+ return getCombinedIgnoreTester(flags);
}
}
return null;
@@ -1091,7 +1091,7 @@ public class GlyphProcessingState {
* @param flags lookup flags
* @return a glyph tester
*/
- public GlyphTester getCombinedIgnoreTester (int flags) {
+ public GlyphTester getCombinedIgnoreTester(int flags) {
GlyphTester[] gta = new GlyphTester [ 3 ];
int ngt = 0;
if ((flags & GlyphSubtable.LF_IGNORE_BASE) != 0) {
@@ -1103,7 +1103,7 @@ public class GlyphProcessingState {
if ((flags & GlyphSubtable.LF_IGNORE_MARK) != 0) {
gta [ ngt++ ] = ignoreMark;
}
- return getCombinedOrTester (gta, ngt);
+ return getCombinedOrTester(gta, ngt);
}
/**
@@ -1112,9 +1112,9 @@ public class GlyphProcessingState {
* @param ngt number of glyph testers present in specified array
* @return a combined OR glyph tester
*/
- public GlyphTester getCombinedOrTester (GlyphTester[] gta, int ngt) {
+ public GlyphTester getCombinedOrTester(GlyphTester[] gta, int ngt) {
if (ngt > 0) {
- return new CombinedOrGlyphTester (gta, ngt);
+ return new CombinedOrGlyphTester(gta, ngt);
} else {
return null;
}
@@ -1126,9 +1126,9 @@ public class GlyphProcessingState {
* @param ngt number of glyph testers present in specified array
* @return a combined AND glyph tester
*/
- public GlyphTester getCombinedAndTester (GlyphTester[] gta, int ngt) {
+ public GlyphTester getCombinedAndTester(GlyphTester[] gta, int ngt) {
if (ngt > 0) {
- return new CombinedAndGlyphTester (gta, ngt);
+ return new CombinedAndGlyphTester(gta, ngt);
} else {
return null;
}
@@ -1138,16 +1138,16 @@ public class GlyphProcessingState {
private static class CombinedOrGlyphTester implements GlyphTester {
private GlyphTester[] gta;
private int ngt;
- CombinedOrGlyphTester (GlyphTester[] gta, int ngt) {
+ CombinedOrGlyphTester(GlyphTester[] gta, int ngt) {
this.gta = gta;
this.ngt = ngt;
}
/** {@inheritDoc} */
- public boolean test (int gi, int flags) {
+ public boolean test(int gi, int flags) {
for (int i = 0, n = ngt; i < n; i++) {
GlyphTester gt = gta [ i ];
if (gt != null) {
- if (gt.test (gi, flags)) {
+ if (gt.test(gi, flags)) {
return true;
}
}
@@ -1160,16 +1160,16 @@ public class GlyphProcessingState {
private static class CombinedAndGlyphTester implements GlyphTester {
private GlyphTester[] gta;
private int ngt;
- CombinedAndGlyphTester (GlyphTester[] gta, int ngt) {
+ CombinedAndGlyphTester(GlyphTester[] gta, int ngt) {
this.gta = gta;
this.ngt = ngt;
}
/** {@inheritDoc} */
- public boolean test (int gi, int flags) {
+ public boolean test(int gi, int flags) {
for (int i = 0, n = ngt; i < n; i++) {
GlyphTester gt = gta [ i ];
if (gt != null) {
- if (! gt.test (gi, flags)) {
+ if (! gt.test(gi, flags)) {
return false;
}
}
@@ -1181,13 +1181,13 @@ public class GlyphProcessingState {
/** NOT glyph tester */
private static class NotGlyphTester implements GlyphTester {
private GlyphTester gt;
- NotGlyphTester (GlyphTester gt) {
+ NotGlyphTester(GlyphTester gt) {
this.gt = gt;
}
/** {@inheritDoc} */
- public boolean test (int gi, int flags) {
+ public boolean test(int gi, int flags) {
if (gt != null) {
- if (gt.test (gi, flags)) {
+ if (gt.test(gi, flags)) {
return false;
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitution.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitution.java?rev=1479969&r1=1479968&r2=1479969&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitution.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitution.java Tue May 7 16:23:13 2013
@@ -37,6 +37,6 @@ public interface GlyphSubstitution {
* @return true if the glyph subtable was applied, meaning that the current context matches the
* associated input context glyph coverage table
*/
- boolean substitute (GlyphSubstitutionState ss);
+ boolean substitute(GlyphSubstitutionState ss);
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionState.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionState.java?rev=1479969&r1=1479968&r2=1479969&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionState.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionState.java Tue May 7 16:23:13 2013
@@ -61,10 +61,10 @@ public class GlyphSubstitutionState exte
* @param feature feature identifier
* @param sct script context tester (or null)
*/
- public GlyphSubstitutionState (GlyphSequence gs, String script, String language, String feature, ScriptContextTester sct) {
- super (gs, script, language, feature, sct);
- this.ogb = IntBuffer.allocate (gs.getGlyphCount());
- this.oal = new ArrayList (gs.getGlyphCount());
+ public GlyphSubstitutionState(GlyphSequence gs, String script, String language, String feature, ScriptContextTester sct) {
+ super(gs, script, language, feature, sct);
+ this.ogb = IntBuffer.allocate(gs.getGlyphCount());
+ this.oal = new ArrayList(gs.getGlyphCount());
this.predications = gs.getPredications();
}
@@ -73,10 +73,10 @@ public class GlyphSubstitutionState exte
* except as follows: input glyph sequence is copied deep except for its characters array.
* @param ss existing positioning state to copy from
*/
- public GlyphSubstitutionState (GlyphSubstitutionState ss) {
- super (ss);
- this.ogb = IntBuffer.allocate (indexLast);
- this.oal = new ArrayList (indexLast);
+ public GlyphSubstitutionState(GlyphSubstitutionState ss) {
+ super(ss);
+ this.ogb = IntBuffer.allocate(indexLast);
+ this.oal = new ArrayList(indexLast);
}
/**
@@ -87,11 +87,11 @@ public class GlyphSubstitutionState exte
* @param feature feature identifier
* @param sct script context tester (or null)
*/
- public GlyphSubstitutionState reset (GlyphSequence gs, String script, String language, String feature, ScriptContextTester sct) {
- super.reset (gs, script, language, feature, sct);
+ public GlyphSubstitutionState reset(GlyphSequence gs, String script, String language, String feature, ScriptContextTester sct) {
+ super.reset(gs, script, language, feature, sct);
this.alternatesIndex = null;
- this.ogb = IntBuffer.allocate (gs.getGlyphCount());
- this.oal = new ArrayList (gs.getGlyphCount());
+ this.ogb = IntBuffer.allocate(gs.getGlyphCount());
+ this.oal = new ArrayList(gs.getGlyphCount());
this.predications = gs.getPredications();
return this;
}
@@ -100,7 +100,7 @@ public class GlyphSubstitutionState exte
* Set alternates indices.
* @param alternates array of alternates indices ordered by coverage index
*/
- public void setAlternates (int[] alternates) {
+ public void setAlternates(int[] alternates) {
this.alternatesIndex = alternates;
}
@@ -113,7 +113,7 @@ public class GlyphSubstitutionState exte
* @param ci coverage index
* @return an alternates index
*/
- public int getAlternatesIndex (int ci) {
+ public int getAlternatesIndex(int ci) {
if (alternatesIndex == null) {
return 0;
} else if ((ci < 0) || (ci > alternatesIndex.length)) {
@@ -129,15 +129,15 @@ public class GlyphSubstitutionState exte
* @param a character association that applies to glyph
* @param predication a predication value to add to association A if predications enabled
*/
- public void putGlyph (int glyph, GlyphSequence.CharAssociation a, Object predication) {
+ public void putGlyph(int glyph, GlyphSequence.CharAssociation a, Object predication) {
if (! ogb.hasRemaining()) {
- ogb = growBuffer (ogb);
+ ogb = growBuffer(ogb);
}
- ogb.put (glyph);
+ ogb.put(glyph);
if (predications && (predication != null)) {
- a.setPredication (feature, predication);
+ a.setPredication(feature, predication);
}
- oal.add (a);
+ oal.add(a);
}
/**
@@ -146,12 +146,12 @@ public class GlyphSubstitutionState exte
* @param associations array of character associations that apply to glyphs
* @param predication optional predicaion object to be associated with glyphs' associations
*/
- public void putGlyphs (int[] glyphs, GlyphSequence.CharAssociation[] associations, Object predication) {
+ public void putGlyphs(int[] glyphs, GlyphSequence.CharAssociation[] associations, Object predication) {
assert glyphs != null;
assert associations != null;
assert associations.length >= glyphs.length;
for (int i = 0, n = glyphs.length; i < n; i++) {
- putGlyph (glyphs [ i ], associations [ i ], predication);
+ putGlyph(glyphs [ i ], associations [ i ], predication);
}
}
@@ -163,9 +163,9 @@ public class GlyphSubstitutionState exte
public GlyphSequence getOutput() {
int position = ogb.position();
if (position > 0) {
- ogb.limit (position);
+ ogb.limit(position);
ogb.rewind();
- return new GlyphSequence (igs.getCharacters(), ogb, oal);
+ return new GlyphSequence(igs.getCharacters(), ogb, oal);
} else {
return igs;
}
@@ -181,10 +181,10 @@ public class GlyphSubstitutionState exte
* @return true if subtable applied, or false if it did not (e.g., its
* input coverage table did not match current input context)
*/
- public boolean apply (GlyphSubstitutionSubtable st) {
+ public boolean apply(GlyphSubstitutionSubtable st) {
assert st != null;
- updateSubtableState (st);
- boolean applied = st.substitute (this);
+ updateSubtableState(st);
+ boolean applied = st.substitute(this);
return applied;
}
@@ -198,7 +198,7 @@ public class GlyphSubstitutionState exte
* the lookups are to apply, and to be consumed once the application has finished
* @return true if lookups are non-null and non-empty; otherwise, false
*/
- public boolean apply (GlyphTable.RuleLookup[] lookups, int nig) {
+ public boolean apply(GlyphTable.RuleLookup[] lookups, int nig) {
// int nbg = index;
int nlg = indexLast - (index + nig);
int nog = 0;
@@ -210,20 +210,20 @@ public class GlyphSubstitutionState exte
GlyphTable.LookupTable lt = l.getLookup();
if (lt != null) {
// perform substitution on a copy of previous state
- GlyphSubstitutionState ss = new GlyphSubstitutionState (this);
+ GlyphSubstitutionState ss = new GlyphSubstitutionState(this);
// apply lookup table substitutions
- GlyphSequence gs = lt.substitute (ss, l.getSequenceIndex());
+ GlyphSequence gs = lt.substitute(ss, l.getSequenceIndex());
// replace current input sequence starting at current position with result
- if (replaceInput (0, -1, gs)) {
+ if (replaceInput(0, -1, gs)) {
nog = gs.getGlyphCount() - nlg;
}
}
}
}
// output glyphs and associations
- putGlyphs (getGlyphs (0, nog, false, null, null, null), getAssociations (0, nog, false, null, null, null), null);
+ putGlyphs(getGlyphs(0, nog, false, null, null, null), getAssociations(0, nog, false, null, null, null), null);
// consume replaced input glyphs
- consume (nog);
+ consume(nog);
return true;
} else {
return false;
@@ -238,16 +238,16 @@ public class GlyphSubstitutionState exte
super.applyDefault();
int gi = getGlyph();
if (gi != 65535) {
- putGlyph (gi, getAssociation(), null);
+ putGlyph(gi, getAssociation(), null);
}
}
- private static IntBuffer growBuffer (IntBuffer ib) {
+ private static IntBuffer growBuffer(IntBuffer ib) {
int capacity = ib.capacity();
int capacityNew = capacity * 2;
- IntBuffer ibNew = IntBuffer.allocate (capacityNew);
+ IntBuffer ibNew = IntBuffer.allocate(capacityNew);
ib.rewind();
- return ibNew.put (ib);
+ return ibNew.put(ib);
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionSubtable.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionSubtable.java?rev=1479969&r1=1479968&r2=1479969&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionSubtable.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionSubtable.java Tue May 7 16:23:13 2013
@@ -43,8 +43,8 @@ public abstract class GlyphSubstitutionS
* @param format subtable format
* @param coverage subtable coverage table
*/
- protected GlyphSubstitutionSubtable (String id, int sequence, int flags, int format, GlyphCoverageTable coverage) {
- super (id, sequence, flags, format, coverage);
+ protected GlyphSubstitutionSubtable(String id, int sequence, int flags, int format, GlyphCoverageTable coverage) {
+ super(id, sequence, flags, format, coverage);
}
/** {@inheritDoc} */
@@ -54,11 +54,11 @@ public abstract class GlyphSubstitutionS
/** {@inheritDoc} */
public String getTypeName() {
- return GlyphSubstitutionTable.getLookupTypeName (getType());
+ return GlyphSubstitutionTable.getLookupTypeName(getType());
}
/** {@inheritDoc} */
- public boolean isCompatible (GlyphSubtable subtable) {
+ public boolean isCompatible(GlyphSubtable subtable) {
return subtable instanceof GlyphSubstitutionSubtable;
}
@@ -68,7 +68,7 @@ public abstract class GlyphSubstitutionS
}
/** {@inheritDoc} */
- public boolean substitute (GlyphSubstitutionState ss) {
+ public boolean substitute(GlyphSubstitutionState ss) {
return false;
}
@@ -85,7 +85,7 @@ public abstract class GlyphSubstitutionS
* @param sequenceIndex if non negative, then apply subtables only at specified sequence index
* @return output glyph sequence
*/
- public static final GlyphSequence substitute (GlyphSubstitutionState ss, GlyphSubstitutionSubtable[] sta, int sequenceIndex) {
+ public static final GlyphSequence substitute(GlyphSubstitutionState ss, GlyphSubstitutionSubtable[] sta, int sequenceIndex) {
int sequenceStart = ss.getPosition();
boolean appliedOneShot = false;
while (ss.hasNext()) {
@@ -93,9 +93,9 @@ public abstract class GlyphSubstitutionS
if (! appliedOneShot && ss.maybeApplicable()) {
for (int i = 0, n = sta.length; ! applied && (i < n); i++) {
if (sequenceIndex < 0) {
- applied = ss.apply (sta [ i ]);
+ applied = ss.apply(sta [ i ]);
} else if (ss.getPosition() == (sequenceStart + sequenceIndex)) {
- applied = ss.apply (sta [ i ]);
+ applied = ss.apply(sta [ i ]);
if (applied) {
appliedOneShot = true;
}
@@ -120,9 +120,9 @@ public abstract class GlyphSubstitutionS
* @param sct script context tester
* @return output glyph sequence
*/
- public static final GlyphSequence substitute (GlyphSequence gs, String script, String language, String feature, GlyphSubstitutionSubtable[] sta, ScriptContextTester sct) {
+ public static final GlyphSequence substitute(GlyphSequence gs, String script, String language, String feature, GlyphSubstitutionSubtable[] sta, ScriptContextTester sct) {
synchronized (state) {
- return substitute (state.reset (gs, script, language, feature, sct), sta, -1);
+ return substitute(state.reset(gs, script, language, feature, sct), sta, -1);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org