replace forEach() in new thai features

opentypejs · Mar 9, 2023 · 66c9899 · 66c9899
1 parent 74e189e
commit 66c9899
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 18 deletions.
diff --git a/src/bidi.js b/src/bidi.js
@@ -200,12 +200,12 @@ function applyUnicodeVariationSequences() {
 function applyThaiFeatures() {
     checkGlyphIndexStatus.call(this);
     const ranges = this.tokenizer.getContextRanges('thaiWord');
-    ranges.forEach(range => {
+    for(let i = 0; i < ranges.length; i++) {
+        const range = ranges[i];
         if (this.hasFeatureEnabled('thai', 'liga')) thaiLigatures.call(this, range);
         if (this.hasFeatureEnabled('thai', 'rlig')) thaiRequiredLigatures.call(this, range);
         if (this.hasFeatureEnabled('thai', 'ccmp')) thaiGlyphComposition.call(this, range);
-    });
-
+    }
 }
 
 /**

diff --git a/src/features/thai/thaiGlyphComposition.js b/src/features/thai/thaiGlyphComposition.js
@@ -23,18 +23,19 @@ function thaiGlyphComposition(range) {
     const script = 'thai';
     let tokens = this.tokenizer.getRangeTokens(range);
     let contextParams = getContextParams(tokens, 0);
-    contextParams.context.forEach((glyphIndex, index) => {
+    for(let index = 0; index < contextParams.context.length; index++) {
         contextParams.setCurrentIndex(index);
         let substitutions = this.query.lookupFeature({
             tag: 'ccmp', script, contextParams
         });
         if (substitutions.length) {
-            substitutions.forEach(
-                action => applySubstitution(action, tokens, index)
-            );
+            for(let i = 0; i < substitutions.length; i++) {
+                const action = substitutions[i];
+                applySubstitution(action, tokens, index);
+            }
             contextParams = getContextParams(tokens, index);
         }
-    });
+    }
 }
 
 export default thaiGlyphComposition;
diff --git a/src/features/thai/thaiLigatures.js b/src/features/thai/thaiLigatures.js
@@ -5,6 +5,9 @@
 import { ContextParams } from '../../tokenizer.js';
 import applySubstitution from '../applySubstitution.js';
 
+// @TODO: use commonFeatureUtils.js for reduction of code duplication
+// once #564 has been merged.
+
 /**
   * Update context params
   * @param {any} tokens a list of tokens
@@ -23,18 +26,19 @@ function thaiLigatures(range) {
     const script = 'thai';
     let tokens = this.tokenizer.getRangeTokens(range);
     let contextParams = getContextParams(tokens, 0);
-    contextParams.context.forEach((glyphIndex, index) => {
+    for(let index = 0; index < contextParams.context.length; index++) {
         contextParams.setCurrentIndex(index);
         let substitutions = this.query.lookupFeature({
             tag: 'liga', script, contextParams
         });
         if (substitutions.length) {
-            substitutions.forEach(
-                action => applySubstitution(action, tokens, index)
-            );
+            for(let i = 0; i < substitutions.length; i++) {
+                const action = substitutions[i];
+                applySubstitution(action, tokens, index);
+            }
             contextParams = getContextParams(tokens, index);
         }
-    });
+    }
 }
 
 export default thaiLigatures;
diff --git a/src/features/thai/thaiRequiredLigatures.js b/src/features/thai/thaiRequiredLigatures.js
@@ -5,6 +5,9 @@
 import { ContextParams } from '../../tokenizer.js';
 import applySubstitution from '../applySubstitution.js';
 
+// @TODO: use commonFeatureUtils.js for reduction of code duplication
+// once #564 has been merged.
+
 /**
  * Update context params
  * @param {any} tokens a list of tokens
@@ -23,18 +26,19 @@ function thaiRequiredLigatures(range) {
     const script = 'thai';
     let tokens = this.tokenizer.getRangeTokens(range);
     let contextParams = getContextParams(tokens, 0);
-    contextParams.context.forEach((glyphIndex, index) => {
+    for(let index = 0; index < contextParams.context.length; index++) {
         contextParams.setCurrentIndex(index);
         let substitutions = this.query.lookupFeature({
             tag: 'rlig', script, contextParams
         });
         if (substitutions.length) {
-            substitutions.forEach(
-                action => applySubstitution(action, tokens, index)
-            );
+            for(let i = 0; i < substitutions.length; i++) {
+                const action = substitutions[i];
+                applySubstitution(action, tokens, index);
+            }
             contextParams = getContextParams(tokens, index);
         }
-    });
+    }
 }
 
 export default thaiRequiredLigatures;