FOP-3078: Fix position of macron glyph

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

diff --git a/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/DefaultScriptProcessor.java b/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/DefaultScriptProcessor.java
index 0de1a2058c7566cac51d0d10f71a1a227a006625..11f20eaf3d53071205f3a6accfee3212e36c832c 100644 (file)
--- a/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/DefaultScriptProcessor.java
+++ b/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/DefaultScriptProcessor.java
@@ -153,7 +153,8 @@ public class DefaultScriptProcessor extends ScriptProcessor {
 
     protected boolean isReorderedMark(GlyphDefinitionTable gdef, int[] glyphs, int[] unscaledWidths, int index, int[] pa) {
         pa = (pa != null) ? pa : new int[1];
-        return gdef.isGlyphClass(glyphs[index], GlyphDefinitionTable.GLYPH_CLASS_MARK) && pa[0] != 0;
+        int paindex = Math.min(pa.length - 1, index);
+        return gdef.isGlyphClass(glyphs[index], GlyphDefinitionTable.GLYPH_CLASS_MARK) && pa[paindex] != 0;
     }
 
 }

diff --git a/fop-core/src/test/java/org/apache/fop/complexscripts/scripts/DefaultScriptTestCase.java b/fop-core/src/test/java/org/apache/fop/complexscripts/scripts/DefaultScriptTestCase.java
index b8357068b19387e653d037771ceb80ea76abe239..b1439a0ba374897e88c298cac090758f2272cff8 100644 (file)
--- a/fop-core/src/test/java/org/apache/fop/complexscripts/scripts/DefaultScriptTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/complexscripts/scripts/DefaultScriptTestCase.java
@@ -52,6 +52,15 @@ public class DefaultScriptTestCase {
         Assert.assertEquals(actual.charAt(0), 57344);
     }
 
+    @Test
+    public void testProcessorReorder2() {
+        String in = "\u00F6\u0323";
+        int[][] gpa = new int[2][2];
+        gpa[1][1] = 1;
+        String actual = getFont().reorderCombiningMarks(in, gpa, OTFScript.DEFAULT, null, null).toString();
+        Assert.assertEquals(actual.charAt(0), 803);
+    }
+
     private MultiByteFont getFont() {
         MultiByteFont font = new MultiByteFont(null, null);
         font.setWidthArray(new int[0]);