From 6a0eaa083e7831582b655c5c8e8a4fbb1a2d2aa3 Mon Sep 17 00:00:00 2001 From: Simon Steiner Date: Thu, 16 Jun 2022 12:49:48 +0000 Subject: Revert FOP-3078: Fix position of macron glyph git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1901968 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/fop/complexscripts/scripts/DefaultScriptProcessor.java | 3 +-- .../org/apache/fop/complexscripts/scripts/DefaultScriptTestCase.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) 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 11f20eaf3..0de1a2058 100644 --- 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,8 +153,7 @@ 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]; - int paindex = Math.min(pa.length - 1, index); - return gdef.isGlyphClass(glyphs[index], GlyphDefinitionTable.GLYPH_CLASS_MARK) && pa[paindex] != 0; + return gdef.isGlyphClass(glyphs[index], GlyphDefinitionTable.GLYPH_CLASS_MARK) && pa[0] != 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 b1439a0ba..ba4ddf554 100644 --- 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 @@ -58,7 +58,7 @@ public class DefaultScriptTestCase { 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); + Assert.assertEquals(actual.charAt(0), 57344); } private MultiByteFont getFont() { -- cgit v1.2.3