FOP-3180: Glyph positions ignored when using a custom font by João André Gonçalves

Author: simonsteiner1984

batik-bridge/src/main/java/org/apache/batik/bridge/GlyphLayout.java

@@ -1341,7 +1341,7 @@ protected void doExplicitGlyphLayout() {
  gv.setGlyphTransform(i, glyphTransform);
  }
 
- aciIndex += gv.getCharacterCount(i,i);
+ aciIndex = getAciIndex(aciIndex, i);
  if (aciIndex >= charMap.length)
  aciIndex = charMap.length-1;
  ch = aci.setIndex(aciIndex+aciStart);
@@ -1435,7 +1435,7 @@ else if (glyphOrientationAngle == 180)
  transparentStart = -1;
  }
  }
- aciIndex += gv.getCharacterCount(i,i);
+ aciIndex = getAciIndex(aciIndex, i);
  if (aciIndex >= charMap.length)
  aciIndex = charMap.length-1;
  ch = aci.setIndex(aciIndex+aciStart);
@@ -1451,6 +1451,10 @@ else if (glyphOrientationAngle == 180)
  pathApplied = false;
  }
 
+ protected int getAciIndex(int aciIndex, int loopIndex) {
+ return aciIndex + gv.getCharacterCount(loopIndex, loopIndex);
+ }
+
  /**
  * Does any spacing adjustments that may have been specified.
  */
@@ -1886,7 +1890,7 @@ protected void doPathLayout() {
  }
  currentPosition += glyphAdvance;
  glyphOffset += nextGlyphOffset;
- currentChar += gv.getCharacterCount(i,i);
+ currentChar = getAciIndex(currentChar, i);
  if (currentChar >= charMap.length)
  currentChar = charMap.length-1;
  ch = aci.setIndex(currentChar+start);