--- a/py/gadict_c5.py	Thu Sep 15 15:42:52 2016 +0300
+++ b/py/gadict_c5.py	Thu Sep 15 17:48:20 2016 +0300
@@ -65,54 +65,28 @@
 FOUT.write("\n")
 
 
-def attr_key(item):
-    (word, (pron, attrs)) = item
-    if not attrs:
-        return "zzz"
-    best_vattr = None
-    for attr in attrs:
-        if attr in ["v1", "v2", "v3"]:
-            if not best_vattr or (best_vattr and best_vattr > attr):
-                best_vattr = attr
-    if best_vattr:
-        return best_vattr
-    for attr in attrs:                      # single/plural
-        if attr in ["s"]:
-            return attr
-    for attr in attrs:                      # comparative/superlative
-        if attr in ["comp"]:
-            return attr
-    for attr in attrs:                      # Am/Br/Au
-        if attr in ["Am"]:
-            return attr
-    return "zzz"
-
-
-for idx in range(1, len(DOM)):
-    article = DOM[idx]
+for (headwords, translations) in DOM[1:]:
     FOUT.write("_____\n\n")
-    title = "; ".join(article[0].keys())
+    title = "; ".join([h.headword for h in headwords])
     FOUT.write(title)
     FOUT.write("\n\n")
-    defs = article[0].items()
-    defs = sorted(defs, key = attr_key)
-    for (word, (pron, attrs)) in defs:
+    for hw in headwords:
         FOUT.write("  ")
-        FOUT.write(word)
-        if pron is not None:
+        FOUT.write(hw.headword)
+        if hw.pron is not None:
             FOUT.write(" [")
-            FOUT.write(pron)
+            FOUT.write(hw.pron)
             FOUT.write("]")
-        if len(attrs) > 0:
+        if len(hw.attrs) > 0:
             FOUT.write(" ")
-            l = ["«"+x+"»" for x in attrs]
+            l = ["«"+x+"»" for x in hw.attrs]
             l.sort()
             FOUT.write(", ".join(l))
         FOUT.write("\n")
     FOUT.write("\n")
-    for sense in article[1]:
+    for sense in translations:
         if not sense:
-            raise Exception("""Empty sense for article: """ + article[0].__iter__().__next__())
+            raise Exception("""Empty sense for article: """ + headwords.__iter__().__next__())
         FOUT.write("  ")
         if sense.pos:
             FOUT.write("«")