group formation bug removed in stage 3.

Height of the input images should be same for all glyphs

Author: sayedzeeshan

.gitignore

@@ -1,4 +1,6 @@
 launch.json
 test/test_bench.py
 test/obj/*
-release
+release
+source/obj
+*.pkl

setup.py

@@ -3,7 +3,7 @@
 setup(
   name = 'ligature_kerning',
   packages = find_packages(),
-  version = '0.0.1',
+  version = '0.0.3',
   license='MIT',
   description = 'Nasteeq ligatures kerning for OpenType (TruType) Fonts',
   author = 'Sayed Zeeshan Asghar',
@@ -22,7 +22,7 @@
     'opencv-python >= 4.5.2.0'
   ],
   classifiers=[
-    'Development Status :: 1 - Beta',
+    'Development Status :: 3 - Beta',
     'Intended Audience :: Users',
     'Topic :: Fonts :: Kerning',
     'License :: MIT License',

source/__pycache__/groups.cpython-39.pyc

@@ -4,9 +4,9 @@
 nCols = 10
 nRows = 10
 
-shifts = [100, 100, 175, 175, 175, 200, 200, 200, 200, 200]
-left_threshold = [100, 100, 100, 100, 100, 100, 50, 50, 50, 100]
-right_threshold = [200, 200, 200, 200, 200, 200, 200, 200, 150, 100]
+shifts = []
+left_threshold = []
+right_threshold = []
 HeighAdjustment = [0,-200,-100,-100,-50,-20,-20,0,0,-50]; # should always be non-positive
 weights = [0.8,0.15,0.05] #must sum up to 1.0
 exceptions = {} #needs to be populated first before calling form_groups_from_tables function
@@ -136,16 +136,23 @@ def form_groups_from_tables(Keys,Lookup,LHeightsData,RHeightsData,LCollisionList
                 indL[j+1,k] = a[0]
     for k  in range(0,nCols):
         indL[nRows,k] = len(LMaster[k])
+        for j in range(nRows-1,1,-1):
+            if indL[j,k] == -2: 
+                indL[j,k] = indL[j+1,k]
+                indL[j+1,k] = -2
         indL[0,k] = 0
 
     for j in range(0,nRows-1):
         for k in range(0,nCols):
             a  = np.argwhere(RMaster[k][:,1] < thresh[j,k]) 
             if a.any():
-                indR[j+1,k] = a[0]
+                indR[j,k] = a[0]
     for k  in range(0,nCols):
         indR[nRows,k] = len(RMaster[k])
-        indR[0,k] = 0
+        for j in range(nRows-1,1,-1):
+            if indR[j,k] == -2: 
+                indR[j,k] = indR[j+1,k]
+                indR[j+1,k] = -2
 
     LeftGroups = {}
     RightGroups = {}

source/__pycache__/heights.cpython-39.pyc

@@ -10,8 +10,8 @@
 
 BASE_DIR = "C:/Ligatures"
 nBins = 11
-minHeight = 710
-maxHeight = 780
+minHeight = 417
+maxHeight = 1400
 shiftX = 200
 scaling = 4.9 #2048 units per em font assumption, images are 300 dpi
 DESC_RATE = 0.2 # per x-unit rate at which the bottom heigh descends where there is glyph data (extrapolation)
@@ -32,6 +32,7 @@
 NUM_PIXEL_SCAN = 9 #number of horizontal pixels to scan 
 dXValid = [10,20,40,50,100] #valid values for dX
 LookUp = {} #instantiate an empty dictionary
+GlyphHeight = []
 haroofExceptions = ["alef.png","alefwah"] #define exception haroof here, these will have differnt default extrpolation height
 animation = "|/-\\"
 def set_base_dir(loc):
@@ -49,26 +50,47 @@ def calc_glyph_heights(baseDir,dX,enableKasheeda):
     symbolDir = baseDir+"/Symbols/"
     kasheedaDir = baseDir+"/Ligatures_Kashida/"
     kasheedaHaroofDir = baseDir+"/Haroof_Kashida/"
-    numGlyphs += regular_glyphs(ligatureDir,dX)
-    print("Number of  glyphs processed: " + str(numGlyphs))
+    numGlyphs = regular_glyphs(ligatureDir,dX,GlyphHeight)
+    if numGlyphs == 0:
+        print("Please check the input folder. Exiting now ")
+        return 0
+    else:
+        print("Number of  glyphs processed: " + str(numGlyphs))
     # regular Haroof processing
-    numGlyphs += haroof_glyphs(haroofDir,dX)
-    print("Number of glyphs processed: " + str(numGlyphs))
-    numGlyphs += symbol_glyphs(symbolDir,dX)
-    print("Number of glyphs processed: " + str(numGlyphs))
-    if enableKasheeda == 1:
-        numGlyphs += regular_glyphs(kasheedaDir,dX)
+    numGlyphs = haroof_glyphs(haroofDir,dX,GlyphHeight)
+    if numGlyphs == 0:
+        print("Please check the input folder. Exiting now ")
+        return 0
+    else:
+        print("Number of  glyphs processed: " + str(numGlyphs))
+    numGlyphs = symbol_glyphs(symbolDir,dX,GlyphHeight)
+    if numGlyphs == 0:
+        print("Please check the input folder. Exiting now ")
+        return 0
+    else:
         print("Number of  glyphs processed: " + str(numGlyphs))
+    if enableKasheeda == 1:
+        numGlyphs = regular_glyphs(kasheedaDir,dX,GlyphHeight)
+        if numGlyphs == 0:
+            print("Please check the input folder. Exiting now ")
+            return 0
+        else:
+            print("Number of  glyphs processed: " + str(numGlyphs))
         # kasheeda Haroof processing
-        numGlyphs += haroof_glyphs(kasheedaHaroofDir,dX)
-        print("Number of glyphs processed: " + str(numGlyphs))
+        numGlyphs = haroof_glyphs(kasheedaHaroofDir,dX,GlyphHeight)
+        if numGlyphs == 0:
+            print("Please check the input folder. Exiting now ")
+            return 0
+        else:
+            print("Number of  glyphs processed: " + str(numGlyphs))
     if numGlyphs == 0:
         print("Zero glyphs processed. Please check if the images are placed in correct directories.\n")
+        return 0
     else:
         print("All glyphs processed successfully")
     return LookUp
 
-def regular_glyphs(dir,dX):
+def regular_glyphs(dir,dX,GlyphHeight):
      numGlyphs = 0
      idx = 0
      for filepath in glob.iglob(dir + '**/*.png', recursive=True):
@@ -84,8 +106,10 @@ def regular_glyphs(dir,dX):
             return 0
 
         H, W = im.shape
-        if H < minHeight or H > maxHeight:
-            print("Image height should be between "+str(minHeight)+" pixels and "+str(maxHeight)+" pixels.")
+        if len(GlyphHeight) == 0:
+            GlyphHeight.append(H)
+        if H < minHeight or H > maxHeight or H != GlyphHeight[0]:
+            print("Image height should be between "+str(minHeight)+" pixels and "+str(maxHeight)+" pixels. All images should have the exact same height")
             print("Program exiting now")
             return 0
         numGlyphs += 1
@@ -163,7 +187,7 @@ def regular_glyphs(dir,dX):
         LookUp[filename[0:-4]] = extents
      return numGlyphs
 
-def haroof_glyphs(dir,dX):
+def haroof_glyphs(dir,dX,GlyphHeight):
     numGlyphs = 0
     for filepath in glob.iglob(dir + '**/*.png', recursive=True):
         exceptionFlag = 0
@@ -175,8 +199,8 @@ def haroof_glyphs(dir,dX):
             print("Unsuccessful in reading image (check if glyph directory is not empty)\n exiting now\n")
             return 0
         H, W = im.shape
-        if H < minHeight or H > maxHeight:
-            print("Image height should be between "+str(minHeight)+" pixels and "+str(maxHeight)+" pixels.")
+        if H < minHeight or H > maxHeight or H != GlyphHeight[0]:
+            print("Image height should be between "+str(minHeight)+" pixels and "+str(maxHeight)+" pixels. All images should have the exact same height")
             print("Program exiting now")
             return 0
         numGlyphs += 1
@@ -251,7 +275,7 @@ def haroof_glyphs(dir,dX):
         LookUp[filename[0:-4]] = extents
     return numGlyphs
 
-def symbol_glyphs(dir,dX):
+def symbol_glyphs(dir,dX,GlyphHeight):
     numGlyphs = 0
     for filepath in glob.iglob(dir + '**/*.png', recursive=True):
         filename = os.path.basename(filepath)
@@ -262,8 +286,8 @@ def symbol_glyphs(dir,dX):
             print("Unsuccessful in reading image (check if glyph directory is not empty)\n exiting now\n")
             return 0
         H, W = im.shape
-        if H < minHeight or H > maxHeight:
-            print("Image height should be between "+str(minHeight)+" pixels and "+str(maxHeight)+" pixels.")
+        if H < minHeight or H > maxHeight or H != GlyphHeight[0]:
+            print("Image height should be between "+str(minHeight)+" pixels and "+str(maxHeight)+" pixels. All images should have the exact same height")
             print("Program exiting now")
             return 0
         numGlyphs += 1

source/__pycache__/ligature_kerning.cpython-39.pyc

@@ -7,7 +7,7 @@
 
 def process_stage_1():
     if ps.parse_settings_file("settings.txt") == 1:
-        LookUp = cgh.calc_glyph_heights(ps.base_dir[0],10,0)
+        LookUp = cgh.calc_glyph_heights(ps.base_dir[0],10,ps.kasheeda)
         if len(LookUp) > 0:
             slo.save_obj(LookUp,'GlyphHeightsDictionary')
             return 1
@@ -37,6 +37,10 @@ def process_stage_3():
     if ps.parse_settings_file("settings.txt") == 1:
         for count, str in enumerate(ps.exstr):
             gp.add_exception(str,ps.prof[count],ps.adj[count])
+        for i in range(0,len(ps.shft[0])):
+            gp.shifts.append(ps.shft[0][i])
+            gp.left_threshold.append(ps.lt_th[0][i])
+            gp.right_threshold.append(ps.rt_th[0][i])
         LeftTable = slo.load_obj('LeftTable')
         RightTable =slo.load_obj('RightTable')
         LeftList=slo.load_obj('LeftList')