Merge branch 'dev' into main

docs/CHANGELOG.md

@@ -1,9 +1,13 @@
 # A→Z+T Changelog
 
+# Version 0.9.7
+- Substantial reworking of reports, which all now run in the background, and with improved initial placement of tables.
+- Git integration works, both for updating A→Z+T and for language data. If your data is in a git repository, A→Z+T can make automatic commits for you, as well as pull and push from/to a respository on flash drive for sharing.
+
 # Version 0.9.4
-- Zulgo workshop tweaks
--lots of issues surrounding weird interface on their computer. For instance, the square consonant pushes everything off their screen, becausae of large space in buttons... 
-- A number of additions to make the update process smoother (now you can restart or retry, as appropriate, from the notification window) 
+## Zulgo workshop tweaks
+- lots of issues surrounding weird interface on their computer. For instance, the square consonant pushes everything off their screen, becausae of large space in buttons...
+- A number of additions to make the update process smoother (now you can restart or retry, as appropriate, from the notification window)
 - Multiple attempts to fix auto-reboot on Windows —sorry, nothing working yet.
 
 # Version 0.9.3

lift.py

@@ -1105,85 +1105,89 @@ def clist(self): #This variable gives lists, to iterate over.
         c['pvd']={}
         c['pvd'][2]=['bh','dh','gh','gb',
                     'bb','dd','gg', #French
-                    'gw','dw', 'ɗw', #gnd
+                    # 'gw','dw', 'ɗw', #gnd
                     'mb','nd','ŋg',
                     'Mb', 'Bw', #tsh
                     ]
         c['pvd'][3]=[
-                    'ndw', 'ŋgw' #gnd
+                    # 'ndw', 'ŋgw' #gnd
                     ]
         c['pvd'][1]=['b','B','d','g','ɡ'] #,'G' messes with profiles
         c['p']={}
         c['p'][2]=['kk','kp','cc','pp','pt','tt','ck',
-                    'kw','tw',
+                    # 'kw','tw',
                     'Pk','Pw' #tsh
                     ] #gnd
         c['p'][1]=['p','P','ɓ','Ɓ','t','ɗ','ɖ','c','k','q']
         c['fvd']={}
-        c['fvd'][2]=['bh','vh','zh']
+        c['fvd'][2]=['bh','vh','zh',
+                    # 'zw' #gnd
+                    ]
         c['fvd'][1]=['j','J','v','z','Z','ʒ','ð','ɣ'] #problems w x?
         c['f']={}
         c['f'][3]=['sch']
         c['f'][2]=['ch','ph','sh','hh','pf','bv','ff','sc','ss','th',
-                    'hw' #gnd
+                    # 'hw','sw' #gnd
                     ]
         #Assuming x is voiceless, per IPA and most useage...
         c['f'][1]=['F','f','s','ʃ','θ','x','h'] #not 'S'
         c['avd']={}
         c['avd'][2]=['dj','dz','dʒ']
-        c['avd'][3]=['ndz','dzw'] #gnd
-        c['avd'][4]=['ndzw'] #gnd
+        c['avd'][3]=['ndz',
+                    # 'dzw' #gnd
+                    ]
+        # c['avd'][4]=['ndzw'] #gnd
         c['a']={}
         c['a'][3]=['chk','tch']
         c['a'][2]=['ts','tʃ']
         c['lfvd']={}
-        c['lfvd'][3]=['zlw']
+        # c['lfvd'][3]=['zlw']
         c['lfvd'][2]=['zl']
         c['lfvd'][1]=['ɮ']
         c['lf']={}
-        c['lf'][3]=['slw']
+        # c['lf'][3]=['slw']
         c['lf'][2]=['sl']
         c['lf'][1]=['ɬ']
         c['pn']={}
         """If these appear, they should always be single consonants."""
         c['pn'][2]=['ᵐb','ᵐp','ᵐv','ᵐf','ⁿd','ⁿt','ᵑg','ⁿg','ᵑg','ⁿk','ᵑk',
                     'ⁿj','ⁿs','ⁿz']
         x={} #dict to put all hypothetical segements in, by category
-        for nglyphs in [4,3,2,1]:
-            if nglyphs == 4:
-                consvar='Cqg'
-                dconsvar='Dqg'
-            elif nglyphs == 3:
-                consvar='Ctg'
-                dconsvar='Dtg'
-            elif nglyphs == 2:
-                consvar='Cdg'
-                dconsvar='Ddg'
-            elif nglyphs == 1:
+        c['G']={1:['ẅ','y','Y','w','W']}
+        c['N']={1:['m','M','n','ŋ','ɲ','ɱ']} #'N', messed with profiles
+        c['N'][2]=['mm','ŋŋ','ny','gn','nn']
+        c['N'][3]=["ng'"]
+        """Non-Nasal/Glide Sonorants"""
+        c['S']={1:['l','r']}
+        c['S'][2]=['rh','wh','ll','rr',
+                    # 'rw','lw' #gnd
+                    ]
+        for stype in c:
+            if stype in ['ʔ','G','N','S']: #'V'?
+                consvar=stype
+            elif 'vd' in stype:
+                consvar='D'
+            else:
                 consvar='C'
-                dconsvar='D'
-            x[consvar]=list() #to store valid consonants in
-            x[dconsvar]=list() #to store valid depressor consonants in
-            for stype in c:
-                if c[stype].get(nglyphs) is not None:
-                    if 'vd' in stype:
-                        x[dconsvar]+=c[stype][nglyphs]
-                    else:
-                        x[consvar]+=c[stype][nglyphs]
+            for nglyphs in [i for i in range(5) if i in c[stype]]:
+                for glyph in [i for i in c[stype][nglyphs]
+                                if not set(['w','ʷ'])&set(i)
+                                ]:
+                    try:
+                        c[stype][nglyphs+1]+=[glyph+'w']
+                    except KeyError:
+                        c[stype][nglyphs+1]=[glyph+'w']
+            for nglyphs,varsfx in [(4,'qg'),(3,'tg'),(2,'dg'),(1,'')]:
+                if c[stype].get(nglyphs):
+                    try:
+                        x[consvar+varsfx]+=c[stype][nglyphs]
+                    except KeyError:
+                        x[consvar+varsfx]=c[stype][nglyphs]
         x['ʔ']=['ʔ',
                 "ꞌ", #Latin Small Letter Saltillo
                 "'", #Tag Apostrophe
                 'ʼ'  #modifier letter apostrophe
                 ]
-        x['G']=['ẅ','y','Y','w','W']
-        x['N']=['m','M','n','ŋ','ɲ','ɱ'] #'N', messed with profiles
-        x['Ndg']=['mm','ŋŋ','ny','gn','nn']
-        x['Ntg']=["ng'"]
-        """Non-Nasal/Glide Sonorants"""
-        x['S']=['l','r']
-        x['Sdg']=['rh','wh','ll','rr',
-                    'rw','lw' #gnd
-                    ]
         x['V']=[
                 #decomposed first:
                 #tilde (decomposed):
@@ -2855,7 +2859,7 @@ def printurllog(lift):
     # filename="/home/kentr/Assignment/Tools/WeSay/tsp/TdN.lift"
     # filename="/home/kentr/Assignment/Tools/WeSay/tsp/TdN.lift_2021-12-06.txt"
     # filename="/home/kentr/Assignment/Tools/WeSay/eto/eto.lift"
-    filename="/home/kentr/Assignment/Tools/WeSay/eto/Eton.lift"
+    # filename="/home/kentr/Assignment/Tools/WeSay/eto/Eton.lift"
     # filename="/home/kentr/Assignment/Tools/WeSay/bqg/Kusuntu.lift"
     # filename="/home/kentr/Assignment/Tools/WeSay/CAWL_demo/SILCAWL.lift"
     lift=Lift(filename)
@@ -2911,9 +2915,20 @@ def printurllog(lift):
             @lang='gnd'][text='location']/text"""
     """why is location taken as a text value??!? maybe it should be cleared
     once used?"""
-    formvaluenode=lift.get("example/form/text", senseid=senseid,
-        analang=analang, location=location, showurl=True).get('node')
-    print(formvaluenode)
+    senseids=lift.get('sense',
+                        # field='tone',
+                        toneUFvalue='Nom_CVCVC_1',
+                        # tonevalue=group,
+                        # path=['example'],
+                        showurl=True
+                        ).get('senseid')
+    print(senseids)
+    for senseid in senseids:
+        value=lift.get("sense/field/form/text",
+                path=["toneUFfield"],
+                senseid=senseid,
+                showurl=True).get('text')
+        log.info("{}: {}".format(senseid,value))
     exit()
     lf=lift.fieldtext(ftype='ph')
     # ,location=check,