Author: ssteiner
Date: Thu Jun 16 12:34:17 2022
New Revision: 1901965
URL: http://svn.apache.org/viewvc?rev=1901965&view=rev
Log:
FOP-3078: Fix position of macron glyph
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/DefaultScriptProcessor.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/complexscripts/scripts/DefaultScriptTestCase.java
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/DefaultScriptProcessor.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/DefaultScriptProcessor.java?rev=1901965&r1=1901964&r2=1901965&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/DefaultScriptProcessor.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/DefaultScriptProcessor.java
Thu Jun 16 12:34:17 2022
@@ -153,7 +153,8 @@ public class DefaultScriptProcessor exte
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;
}
}
Modified:
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/complexscripts/scripts/DefaultScriptTestCase.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/complexscripts/scripts/DefaultScriptTestCase.java?rev=1901965&r1=1901964&r2=1901965&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/complexscripts/scripts/DefaultScriptTestCase.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/complexscripts/scripts/DefaultScriptTestCase.java
Thu Jun 16 12:34:17 2022
@@ -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]);
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscr...@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-h...@xmlgraphics.apache.org
