treat endchar operator with 4 arguments as seac operator (fix #322)

package.json

@@ -13,7 +13,7 @@
   ],
   "scripts": {
     "test": "run-s build mocha",
-    "mocha": "mocha",
+    "mocha": "mocha -g \"seac\"",
     "build": "parcel build",
     "prepublish": "run-s clean trie:** build",
     "trie:data": "node src/opentype/shapers/generate-data.js",

src/glyph/CFFGlyph.js

@@ -1,5 +1,7 @@
 import Glyph from './Glyph';
 import Path from './Path';
+import { StandardEncoding } from '../cff/CFFEncodings';
+import CFFStandardStrings from '../cff/CFFStandardStrings';
 
 /**
  * Represents an OpenType PostScript glyph, in the Compact Font Format.
@@ -57,6 +59,9 @@ export default class CFFGlyph extends Glyph {
     let vsindex = privateDict.vsindex;
     let variationProcessor = this._font._variationProcessor;
 
+    let encodingVector;
+    const font = this._font;
+
     function checkWidth() {
       if (width == null) {
         width = stack.shift() + privateDict.nominalWidthX;
@@ -80,6 +85,14 @@ export default class CFFGlyph extends Glyph {
       path.moveTo(x, y);
       open = true;
     }
+
+    function glyphForName(name) {
+      if (!encodingVector) {
+        encodingVector = cff.topDict.charset.glyphs.map(g => CFFStandardStrings[g]);
+      }
+      const glyphId = Math.max(0, encodingVector.indexOf(name) + 1); // .notdef is not included, hence + 1
+      return font.getGlyph(glyphId);
+    };
 
     let parse = function () {
       while (stream.pos < end) {
@@ -168,7 +181,23 @@ export default class CFFGlyph extends Glyph {
                 break;
               }
 
-              if (stack.length > 0) {
+              if(stack.length >= 4) {
+                // Type 2 Charstring Format Appendix C
+                // treat like Type 1 seac command (standard encoding accented character)
+                const acharName = StandardEncoding?.[stack.pop()];
+                const bcharName = StandardEncoding?.[stack.pop()];
+                const ady = stack.pop();
+                const adx = stack.pop();
+                // const asb = stack.pop(); // ignored for Type 2
+
+                const achar = glyphForName(acharName);
+                const bchar = glyphForName(bcharName);
+
+                const aPathShifted = achar.path.translate(adx, ady);
+                path.commands = [...bchar.path.commands, ...aPathShifted.commands];
+
+                open = false;
+              } else if (stack.length > 0) {
                 checkWidth();
               }
 

test/data/unicode/OFL.txt

@@ -0,0 +1,88 @@
+TestCFFThree
+Copyright © 2023 Unicode, Inc.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+---------------------------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+---------------------------------------------------------------------------
+
+PREAMBLE
+
+The goals of the Open Font License (OFL) are to stimulate worldwide development
+of collaborative font projects, to support the font creation efforts of academic
+and linguistic communities, and to provide a free and open framework in which
+fonts may be shared and improved in partnership with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and redistributed
+freely as long as they are not sold by themselves. The fonts, including any
+derivative works, can be bundled, embedded, redistributed and/or sold with any
+software provided that any reserved names are not used by derivative works. The
+fonts and derivatives, however, cannot be released under any other type of license.
+The requirement for fonts to remain under this license does not apply to any
+document created using the fonts or their derivatives.
+
+DEFINITIONS
+
+"Font Software" refers to the set of files released by the Copyright Holder(s) under
+this license and clearly marked as such. This may include source files, build
+scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the copyright
+statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting, or
+substituting -- in part or in whole -- any of the components of the Original Version,
+by changing formats or by porting the Font Software to a new environment.
+
+"Author" refers to any designer, engineer, programmer, technical writer or other
+person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of the
+Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell
+modified and unmodified copies of the Font Software, subject to the following
+conditions:
+
+1) Neither the Font Software nor any of its individual components, in Original or
+Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled, redistributed
+and/or sold with any software, provided that each copy contains the above copyright
+notice and this license. These can be included either as stand-alone text files,
+human-readable headers or in the appropriate machine-readable metadata fields within
+text or binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font Name(s) unless
+explicit written permission is granted by the corresponding Copyright Holder. This
+restriction only applies to the primary font name as presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font Software shall
+not be used to promote, endorse or advertise any Modified Version, except to
+acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s) or with
+their explicit written permission.
+
+5) The Font Software, modified or unmodified, in part or in whole, must be distributed
+entirely under this license, and must not be distributed under any other license. The
+requirement for fonts to remain under this license does not apply to any document
+created using the Font Software.
+
+TERMINATION
+
+This license becomes null and void if any of the above conditions are not met.
+
+DISCLAIMER
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER
+RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR
+INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.

test/glyphs.js

@@ -138,6 +138,12 @@ describe('glyphs', function () {
       let glyph = font.getGlyph(5);
       return assert.equal(glyph.name, 'D');
     });
+
+    it('should handle seac-like endchar operators', function () {
+      let font2 = fontkit.openSync(new URL('data/unicode/TestCFFThree.otf', import.meta.url));
+      assert.equal(font2.getGlyph(3).path.toSVG(), 'M203 367C227 440 248 512 268 588L272 588C293 512 314 440 338 367L369 267L172 267ZM3 0L88 0L151 200L390 200L452 0L541 0L319 656L225 656ZM300 653L342 694L201 861L143 806Z');
+      assert.equal(font2.getGlyph(4).path.toSVG(), 'M323 -12C457 -12 558 60 558 271L558 656L478 656L478 269C478 111 410 61 323 61C237 61 170 111 170 269L170 656L87 656L87 271C87 60 189 -12 323 -12ZM220 727C248 727 269 749 269 777C269 805 248 827 220 827C191 827 170 805 170 777C170 749 191 727 220 727ZM412 727C441 727 462 749 462 777C462 805 441 827 412 827C384 827 363 805 363 777C363 749 384 727 412 727Z');
+    })
   });
 
   describe('CFF glyphs (CID font)', function () {