Index: compile_rules_graph.py
==================================================================
--- compile_rules_graph.py
+++ compile_rules_graph.py
@@ -21,15 +21,12 @@
     s = re.sub(r"(morph|analyse|value|displayInfo)[(]\\(\d+)", 'g_\\1(lToken[\\2+nTokenOffset]', s)
     s = re.sub(r"(select|exclude|define|define_from)[(][\\](\d+)", 'g_\\1(lToken[\\2+nTokenOffset]', s)
     s = re.sub(r"(tag_before|tag_after)[(][\\](\d+)", 'g_\\1(lToken[\\2+nTokenOffset], dTags', s)
     s = re.sub(r"space_after[(][\\](\d+)", 'g_space_between_tokens(lToken[\\1+nTokenOffset], lToken[\\1+nTokenOffset+1]', s)
     s = re.sub(r"analyse_with_next[(][\\](\d+)", 'g_merged_analyse(lToken[\\1+nTokenOffset], lToken[\\1+nTokenOffset+1]', s)
-    #s = re.sub(r"(switchGender|has(?:(?:Mas|Fem)Form)|Simil)[(]\\(\d+)", '\\1(lToken[\\2+nTokenOffset]["sValue"]', s)
     s = re.sub(r"(morph|analyse|value)\(>1", 'g_\\1(lToken[nLastToken+1]', s)                       # next token
     s = re.sub(r"(morph|analyse|value)\(<1", 'g_\\1(lToken[nTokenOffset]', s)                       # previous token
-    #s = re.sub(r"[\\](\d+)\.is(upper|lower|title)\(\)", 'lToken[\\1+nTokenOffset]["sValue"].is\\2()', s)
-    #s = re.sub(r"[\\](\d+)\.(startswith|endswith)\(", 'lToken[\\1+nTokenOffset]["sValue"].\\2(', s)
     s = re.sub(r"\bspell *[(]", '_oSpellChecker.isValid(', s)
     s = re.sub(r"\bbefore\(\s*", 'look(sSentence[:lToken[1+nTokenOffset]["nStart"]], ', s)          # before(s)
     s = re.sub(r"\bafter\(\s*", 'look(sSentence[lToken[nLastToken]["nEnd"]:], ', s)                 # after(s)
     s = re.sub(r"\bbefore0\(\s*", 'look(sSentence0[:lToken[1+nTokenOffset]["nStart"]], ', s)        # before0(s)
     s = re.sub(r"\bafter0\(\s*", 'look(sSentence[lToken[nLastToken]["nEnd"]:], ', s)                # after0(s)
@@ -56,11 +53,11 @@
             bSelectedGroup = sToken.startswith("(") and sToken.endswith(")")
             if bSelectedGroup:
                 sToken = sToken[1:-1]
             lNewToken = sToken[1:-1].split("|")
             if not lTokenLines:
-                lTokenLines = [ [s]  for s  in lNewToken ]
+                lTokenLines = [ ["("+s+")"]  for s  in lNewToken ]  if bSelectedGroup  else [ [s]  for s  in lNewToken ]
                 if bNullPossible:
                     lTokenLines.extend([ []  for i  in range(len(lNewToken)+1) ])
             else:
                 lNewTemp = []
                 if bNullPossible:
@@ -102,10 +99,12 @@
     # print(iLine, "//", sRuleName, "//", sTokenLine, "//", sActions, "//", nPriority)
     for lToken in genTokenLines(sTokenLine, dDef):
         # Calculate positions
         dPos = {}   # key: iGroup, value: iToken
         iGroup = 0
+        if iLine == 2211:
+            print(lToken)
         for i, sToken in enumerate(lToken):
             if sToken.startswith("(") and sToken.endswith(")"):
                 lToken[i] = sToken[1:-1]
                 iGroup += 1
                 dPos[iGroup] = i + 1    # we add 1, for we count tokens from 1 to n (not from 0)
@@ -311,11 +310,11 @@
                 nPriority = int(m.group(2)[1:]) if m.group(2)  else -1
             else:
                 print("Error at rule group: ", sLine, " -- line:", i)
                 break
         elif re.search("^    +<<- ", sLine) or sLine.startswith("        ") \
-                or re.search("^    +#", sLine) or re.search(r"^    [-~=>/](?:\d(?::\d+|)|)>> ", sLine) :
+                or re.search("^    +#", sLine) or re.search(r"^    [-~=>/](?:\d\.?(?::\.?\d+|)|)>> ", sLine) :
             # actions
             sActions += " " + sLine.strip()
         elif re.match("[  ]*$", sLine):
             # empty line to end merging
             if not lTokenLine:
@@ -347,17 +346,19 @@
                 lPreparedRule.append(lRule)
         # Graph creation
         oDARG = darg.DARG(lPreparedRule, sLang)
         dAllGraph[sGraphName] = oDARG.createGraph()
         # Debugging
-        #print("\nGRAPH:", sGraphName)
-        #for e in lPreparedRule:
-        #    if e[-2] == "##4239":
-        #        print(e)
-        #    print(e)
-        #for k, v in dAllGraph[sGraphName].items():
-        #    print(k, "\t", v)
+        if False:
+            print("\nRULES:")
+            for e in lPreparedRule:
+                if e[-2] == "##2211":
+                    print(e)
+        if False:
+            print("\nGRAPH:", sGraphName)
+            for k, v in dAllGraph[sGraphName].items():
+                print(k, "\t", v)
 
     # creating file with all functions callable by rules
     print("  creating callables...")
     sPyCallables = "# generated code, do not edit\n"
     #sJSCallables = "// generated code, do not edit\nconst oEvalFunc = {\n"