foray-commit Mailing List for FOray (Page 15)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 13528
          http://sourceforge.net/p/foray/code/13528
Author:   victormote
Date:     2025-04-27 12:35:03 +0000 (Sun, 27 Apr 2025)
Log Message:
-----------
Improvements to Cmap04.

Modified Paths:
--------------
    trunk/foray/foray-font/src/main/java/org/foray/font/ttf/table/Cmap04Table.java
    trunk/foray/foray-font/src/main/java/org/foray/font/ttf/table/CmapTable.java

Added Paths:
-----------
    trunk/foray/foray-font/src/test/java/org/foray/font/ttf/table/Cmap04TableTests.java

Modified: trunk/foray/foray-font/src/main/java/org/foray/font/ttf/table/Cmap04Table.java
===================================================================

--- trunk/foray/foray-font/src/main/java/org/foray/font/ttf/table/Cmap04Table.java	2025-04-27 10:38:57 UTC (rev 13527)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/ttf/table/Cmap04Table.java	2025-04-27 12:35:03 UTC (rev 13528)
@@ -30,6 +30,8 @@
 
 import org.axsl.ps.Encoding;
 
+import org.checkerframework.checker.signedness.qual.Unsigned;
+
 /**
  * Class containing a set of 16-bit Unicode ranges that sequentially map to the same-sized range of glyph indexes.
  * The contents are analogous to a Format 4 TrueType Font cmap table (from which this class derives its name).
@@ -43,19 +45,18 @@
     public class Entry {
 
         /** The first Unicode code point in this entry. */
-        private int unicodeStart;
+        private @Unsigned short unicodeStart;
 
         /** The last Unicode code point in this entry.*/
-        private int unicodeEnd;
+        private @Unsigned short unicodeEnd;
 
         /** The starting glyph index for this entry. This index points to the glyph
          * representing {@link #unicodeStart}. */
-        private char glyphStartIndex;
+        private @Unsigned short glyphStartIndex;
 
         /** The list of non-contiguous entries, if any, for this entry.
          * For contiguous entries, this will be null.
-         * For non-contiguous entries, this array contains the glyph Indexes for the
-         * range of Unicode characters. */
+         * For non-contiguous entries, this array contains the glyph Indexes for the range of Unicode characters. */
         private CharSequence glyphIndexes;
 
         /**
@@ -66,7 +67,8 @@
          * @param glyphStartIndex The starting glyph index mapped by this mapping.
          * This is the encoded value for {@code unicodeStart}.
          */
-        public Entry(final int unicodeStart, final int unicodeEnd, final char glyphStartIndex) {
+        public Entry(final @Unsigned short unicodeStart, final @Unsigned short unicodeEnd,
+                final @Unsigned short glyphStartIndex) {
             this.unicodeStart = unicodeStart;
             this.unicodeEnd = unicodeEnd;
             this.glyphStartIndex = glyphStartIndex;
@@ -80,7 +82,8 @@
          * @param glyphIndexes The array of encoded glyph indexes corresponding to
          * the range {@code unicodeStart} through {@code unicodeEnd}.
          */
-        public Entry(final int unicodeStart, final int unicodeEnd, final CharSequence glyphIndexes) {
+        public Entry(final @Unsigned short unicodeStart, final @Unsigned short unicodeEnd,
+                final CharSequence glyphIndexes) {
             this.unicodeStart = unicodeStart;
             this.unicodeEnd = unicodeEnd;
             this.glyphIndexes = glyphIndexes;
@@ -160,18 +163,16 @@
     /** The array of entries. */
     private Entry[] entries;
 
-    /** Counter to the last entry added. */
+    /** Index to the last entry added. */
     private int lastEntryAdded = -1;
 
     /**
      * Constructor.
-     * @param name The name of this encoding.
      * @param expectedEntries The number of expected entries in this encoding.
      * Setting this to the correct value will result in more efficient
      * processing.
      */
-    public Cmap04Table(final String name, final int expectedEntries) {
-        this.name = name;
+    public Cmap04Table(final int expectedEntries) {
         this.entries = new Entry[expectedEntries];
     }
 
@@ -200,9 +201,10 @@
      * @param glyphStartIndex The starting glyph index for this map.
      * This index is the encoded value for {@code unicodeStart}.
      */
-    public void addEntry(final int unicodeStart, final int unicodeEnd, final char glyphStartIndex) {
-        final Entry newEntry = new Entry(unicodeStart, unicodeEnd,
-                glyphStartIndex);
+    public void addEntry(final @Unsigned int unicodeStart, final @Unsigned int unicodeEnd,
+            final @Unsigned int glyphStartIndex) {
+        final Entry newEntry = new Entry((@Unsigned short) unicodeStart, (@Unsigned short) unicodeEnd,
+                (@Unsigned short) glyphStartIndex);
         addEntry(newEntry);
     }
 
@@ -213,8 +215,8 @@
      * @param glyphIndexes The array of glyph indexes corresponding to the range {@code unicodeStart} through
      * {@code unicodeEnd}.
      */
-    public void addEntry(final int unicodeStart, final int unicodeEnd, final CharSequence glyphIndexes) {
-        final Entry newEntry = new Entry(unicodeStart, unicodeEnd, glyphIndexes);
+    public void addEntry(final int unicodeStart, final @Unsigned int unicodeEnd, final CharSequence glyphIndexes) {
+        final Entry newEntry = new Entry((@Unsigned short) unicodeStart, (@Unsigned short) unicodeEnd, glyphIndexes);
         addEntry(newEntry);
     }
 

Modified: trunk/foray/foray-font/src/main/java/org/foray/font/ttf/table/CmapTable.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/ttf/table/CmapTable.java	2025-04-27 10:38:57 UTC (rev 13527)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/ttf/table/CmapTable.java	2025-04-27 12:35:03 UTC (rev 13528)
@@ -30,9 +30,12 @@
 
 import org.foray.common.RandomAccessInput;
 import org.foray.font.ttf.RoTable;
+import org.foray.fontParse.ttf.TtfRandomAccessInput;
 
 import org.axsl.ps.Encoding;
 
+import org.checkerframework.checker.signedness.qual.Unsigned;
+
 import java.io.IOException;
 
 /**
@@ -80,7 +83,7 @@
      * @return The parsed instance.
      * @throws IOException For I/O Error.
      */
-    public static CmapTable parse(final RandomAccessInput input, final int offset, final int length,
+    public static CmapTable parse(final TtfRandomAccessInput input, final int offset, final int length,
             final String fontPostScriptName) throws IOException {
         input.seek(offset);
         final CmapTable cmap = new CmapTable();
@@ -138,7 +141,7 @@
      * @return The parsed Cmap4a instance.
      * @throws IOException For I/O Error.
      */
-    private static Encoding parseCMap(final RandomAccessInput input, final int tableOffset,
+    private static Encoding parseCMap(final TtfRandomAccessInput input, final int tableOffset,
             final long offsetToParse, final String fontPostScriptName) throws IOException {
         input.seek(tableOffset + offsetToParse);
         final int formatHigh = input.readUnsignedShort();
@@ -168,7 +171,7 @@
      * @return The parsed Cmap4a format 4 table.
      * @throws IOException For I/O Error.
      */
-    private static Cmap04Table parseCMap04(final RandomAccessInput raInput, final String fontPostScriptName)
+    private static Cmap04Table parseCMap04(final TtfRandomAccessInput raInput, final String fontPostScriptName)
             throws IOException {
         /* Format and Length have already been read. */
         /* Skip version */
@@ -181,13 +184,13 @@
         /* Skip rangeShift. */
         raInput.skipBytes(RoTable.USHORT_BYTES);
 
-        final int[] endCount = new int[segCountX2 / 2];
+        final @Unsigned short[] endCount = new @Unsigned short[segCountX2 / 2];
         final int[] startCount = new int[segCountX2 / 2];
         final int deltas[] = new int[segCountX2 / 2];
         final int rangeOffset[] = new int[segCountX2 / 2];
 
         for (int i = 0; i < (segCountX2 / 2); i++) {
-            endCount[i] = (char) raInput.readUnsignedShort();
+            endCount[i] = raInput.read_uint16();
         }
 
         /* Skip reservedPad. */
@@ -208,13 +211,12 @@
         final int glyphIdArrayOffset = (int) raInput.getOffset();
 
         // Parse the table entries and build a CMap4 from them.
-        final String encodingName = "internal-" + fontPostScriptName;
-        final Cmap04Table cmap04 = new Cmap04Table(encodingName, segCountX2 / 2);
+        final Cmap04Table cmap04 = new Cmap04Table(segCountX2 / 2);
         for (int i = 0; i < startCount.length; i++) {
             if (rangeOffset[i] == 0) {
                 cmap04.addEntry(startCount[i],
                         endCount[i],
-                        (char) (startCount[i] + deltas[i]));
+                        (short) (startCount[i] + deltas[i]));
             } else {
                 final char[] computedIndexes = new char[endCount[i]
                         - startCount[i] + 1];

Added: trunk/foray/foray-font/src/test/java/org/foray/font/ttf/table/Cmap04TableTests.java
===================================================================
--- trunk/foray/foray-font/src/test/java/org/foray/font/ttf/table/Cmap04TableTests.java	                        (rev 0)
+++ trunk/foray/foray-font/src/test/java/org/foray/font/ttf/table/Cmap04TableTests.java	2025-04-27 12:35:03 UTC (rev 13528)
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2025 The FOray Project.
+ *      http://www.foray.org
+ *
+ * Licensed 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.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ *      Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ * $LastChangedBy$
+ */
+package org.foray.font.ttf.table;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Tests of {@link Cmap04Table}.
+ */
+public class Cmap04TableTests {
+
+    /**
+     * Test of creating and using a Type 04 Cmap table.
+     * Since we neither need to create nor use the optimization fields, we ignore them for these tests.
+     * All we care about is whether we can accurately encode & decode.
+     */
+    @Test
+    @Disabled
+    public void test01() {
+        final Cmap04Table out = new Cmap04Table(5);
+        /* Add some contiguous segments. */
+        out.addEntry(20, 30, (short) 100);
+        out.addEntry(120, 130, (short) 200);
+
+        /* Add some non-contiguous segments. */
+        out.addEntry(220, 230, "abc");
+        out.addEntry(320, 330, "xyz");
+        out.addEntry(Character.MAX_VALUE, Character.MAX_VALUE, (short) 0);
+
+        assertFalse(out.canEncode(1));
+        assertTrue(out.canEncode(225));
+
+        assertEquals(401, out.encode(321));
+        assertEquals(321, out.decode(401));
+    }
+
+}


Property changes on: trunk/foray/foray-font/src/test/java/org/foray/font/ttf/table/Cmap04TableTests.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





2006	Jan	Feb	Mar (139)	Apr (98)	May (250)	Jun (394)	Jul (84)	Aug (13)	Sep (420)	Oct (186)	Nov (1)	Dec (3)
2007	Jan (108)	Feb (202)	Mar (291)	Apr (247)	May (374)	Jun (227)	Jul (231)	Aug (60)	Sep (31)	Oct (45)	Nov (18)	Dec
2008	Jan (38)	Feb (71)	Mar (142)	Apr	May (59)	Jun (6)	Jul (10)	Aug	Sep	Oct	Nov	Dec
2009	Jan (12)	Feb (4)	Mar (88)	Apr (121)	May (17)	Jun (30)	Jul	Aug (5)	Sep	Oct (1)	Nov	Dec
2010	Jan (11)	Feb (76)	Mar (11)	Apr	May (11)	Jun	Jul	Aug (44)	Sep (14)	Oct (7)	Nov	Dec
2011	Jan	Feb	Mar	Apr	May (9)	Jun	Jul	Aug	Sep	Oct (10)	Nov	Dec
2012	Jan	Feb	Mar	Apr	May	Jun (3)	Jul (4)	Aug	Sep	Oct	Nov	Dec
2016	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (168)
2017	Jan (77)	Feb (11)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2018	Jan	Feb	Mar (1)	Apr (6)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2019	Jan	Feb (88)	Mar (118)	Apr (1)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2020	Jan	Feb	Mar	Apr	May (6)	Jun	Jul	Aug	Sep	Oct	Nov	Dec (141)
2021	Jan (170)	Feb (20)	Mar	Apr	May	Jun	Jul (1)	Aug	Sep	Oct (62)	Nov (189)	Dec (162)
2022	Jan (201)	Feb (118)	Mar (8)	Apr	May (2)	Jun (47)	Jul (19)	Aug (14)	Sep (3)	Oct	Nov (28)	Dec (235)
2023	Jan (112)	Feb (23)	Mar (2)	Apr (2)	May	Jun (1)	Jul	Aug (70)	Sep (92)	Oct (20)	Nov (1)	Dec (1)
2024	Jan	Feb	Mar (1)	Apr (1)	May (14)	Jun (11)	Jul (1)	Aug	Sep	Oct	Nov	Dec
2025	Jan (10)	Feb (29)	Mar	Apr (162)	May (245)	Jun (83)	Jul	Aug (1)	Sep	Oct	Nov	Dec

foray-commit Mailing List for FOray (Page 15)

Modular XSL-FO Implementation for Java.

foray-commit — FOray repository commit log messages