From f807c15ff15211b9735ec98dbd5d0dd653f34759 Mon Sep 17 00:00:00 2001 From: Simon Steiner Date: Tue, 31 May 2022 14:01:24 +0000 Subject: [PATCH] FOP-2969: Reorder glyphs with no width git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1901453 13f79535-47bb-0310-9956-ffa450edef68 --- .../scripts/DefaultScriptProcessor.java | 2 +- .../scripts/HebrewScriptProcessor.java | 31 +++++++++++ .../scripts/ScriptProcessor.java | 2 + .../scripts/DefaultScriptTestCase.java | 52 +++++++++++++++++++ 4 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 fop-core/src/main/java/org/apache/fop/complexscripts/scripts/HebrewScriptProcessor.java create mode 100644 fop-core/src/test/java/org/apache/fop/complexscripts/scripts/DefaultScriptTestCase.java 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 275fb20dc..16c130a3e 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 @@ -151,7 +151,7 @@ public class DefaultScriptProcessor extends ScriptProcessor { } protected boolean isReorderedMark(GlyphDefinitionTable gdef, int[] glyphs, int[] unscaledWidths, int index) { - return gdef.isGlyphClass(glyphs[index], GlyphDefinitionTable.GLYPH_CLASS_MARK) && (unscaledWidths[index] != 0); + return gdef.isGlyphClass(glyphs[index], GlyphDefinitionTable.GLYPH_CLASS_MARK); } } diff --git a/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/HebrewScriptProcessor.java b/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/HebrewScriptProcessor.java new file mode 100644 index 000000000..d772fe337 --- /dev/null +++ b/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/HebrewScriptProcessor.java @@ -0,0 +1,31 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* $Id$ */ +package org.apache.fop.complexscripts.scripts; + +import org.apache.fop.complexscripts.fonts.GlyphDefinitionTable; + +public class HebrewScriptProcessor extends DefaultScriptProcessor { + HebrewScriptProcessor(String script) { + super(script); + } + + protected boolean isReorderedMark(GlyphDefinitionTable gdef, int[] glyphs, int[] unscaledWidths, int index) { + return gdef.isGlyphClass(glyphs[index], GlyphDefinitionTable.GLYPH_CLASS_MARK) && (unscaledWidths[index] != 0); + } +} diff --git a/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/ScriptProcessor.java b/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/ScriptProcessor.java index 389cb9d12..497320291 100644 --- a/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/ScriptProcessor.java +++ b/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/ScriptProcessor.java @@ -247,6 +247,8 @@ public abstract class ScriptProcessor { sp = IndicScriptProcessor.makeProcessor(script); } else if (sc == CharScript.SCRIPT_THAI) { sp = new ThaiScriptProcessor(script); + } else if (sc == CharScript.SCRIPT_HEBREW) { + sp = new HebrewScriptProcessor(script); } else { sp = new DefaultScriptProcessor(script); } 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 new file mode 100644 index 000000000..96d3ba04f --- /dev/null +++ b/fop-core/src/test/java/org/apache/fop/complexscripts/scripts/DefaultScriptTestCase.java @@ -0,0 +1,52 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* $Id$ */ +package org.apache.fop.complexscripts.scripts; + +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; + +import org.junit.Assert; +import org.junit.Test; + +import org.apache.fop.complexscripts.fonts.GlyphClassTable; +import org.apache.fop.complexscripts.fonts.GlyphDefinitionTable; +import org.apache.fop.complexscripts.fonts.GlyphSubtable; +import org.apache.fop.complexscripts.fonts.OTFScript; +import org.apache.fop.fonts.CMapSegment; +import org.apache.fop.fonts.MultiByteFont; + +public class DefaultScriptTestCase { + @Test + public void testProcessor() { + String in = "\u00F6\u0323"; + MultiByteFont font = new MultiByteFont(null, null); + font.setWidthArray(new int[0]); + font.setCMap(new CMapSegment[]{new CMapSegment('\u0323', '\u0323', 1)}); + List entries = Arrays.asList(0, GlyphDefinitionTable.GLYPH_CLASS_BASE, + GlyphDefinitionTable.GLYPH_CLASS_MARK); + GlyphSubtable table = GlyphDefinitionTable.createSubtable(1, "lu0d", 0, 0, 1, + GlyphClassTable.createClassTable(entries), null); + font.setGDEF( + new GlyphDefinitionTable(Collections.singletonList(table), new HashMap())); + String actual = font.reorderCombiningMarks(in, null, OTFScript.DEFAULT, null, null).toString(); + Assert.assertEquals(actual.charAt(0), 803); + } +} -- 2.39.5