Index: staging/apertium-eng-kaz/Coding_challenge/evaluation_text1.kaz.txt
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: staging/apertium-eng-kaz/apertium-eng-kaz.eng-kaz.dix
===================================================================
--- staging/apertium-eng-kaz/apertium-eng-kaz.eng-kaz.dix	(revision 70091)
+++ staging/apertium-eng-kaz/apertium-eng-kaz.eng-kaz.dix	(revision 70092)
@@ -8121,7 +8121,7 @@
 <e><p><l>petanque<s n="n"/></l><r>петанг<s n="n"/></r></p></e>
 <e><p><l>petiole<s n="n"/></l><r>жапырақ<b/>кесіндісі<s n="n"/><s n="px3sp"/></r></p></e>
 <e><p><l>petrochemical<s n="n"/></l><r>мұнайхимиялық<s n="n"/></r></p></e>
-<e><p><l>petro<s n="n"/></l><r>мұнай<s n="n"/></r></p></e>
+<e><p><l>petrol<s n="n"/></l><r>мұнай<s n="n"/></r></p></e>
 <e><p><l>petroglyph<s n="n"/></l><r>петроглиф<s n="n"/></r></p></e>
 <e><p><l>petrography<s n="n"/></l><r>петрография<s n="n"/></r></p></e>
 <e><p><l>petrology<s n="n"/></l><r>петрология<s n="n"/></r></p></e>
Index: staging/apertium-eng-kaz/apertium-eng-kaz.eng.dix
===================================================================
--- staging/apertium-eng-kaz/apertium-eng-kaz.eng.dix	(revision 70091)
+++ staging/apertium-eng-kaz/apertium-eng-kaz.eng.dix	(revision 70092)
@@ -86309,6 +86309,8 @@
 
                             <e lm="sawdust" i=""><i>sawdust</i><par n="house__n"/></e>
 
+                            <e lm="jerk" i=""><i>jerk</i><par n="house__n"/></e>
+
                             <e lm="kneejerk" i=""><i>kneejerk</i><par n="house__n"/></e>
 
                             <e lm="knee-jerk" i=""><i>knee-jerk</i><par n="house__n"/></e>
Index: staging/apertium-eng-kaz/apertium-eng-kaz.kaz-eng.t1x
===================================================================
--- staging/apertium-eng-kaz/apertium-eng-kaz.kaz-eng.t1x	(revision 70091)
+++ staging/apertium-eng-kaz/apertium-eng-kaz.kaz-eng.t1x	(revision 70092)
@@ -247,10 +247,10 @@
  <cat-item tags="n.*.attr"/>
  <cat-item tags="n.*.*.subst.*"/>
       <cat-item tags="np.al"/>
-
+      <cat-item tags="np.al.*"/>
 <cat-item tags="n.acr.*"/>
-
-      <cat-item tags="np.al.*"/>
+      <cat-item tags="np.org"/>
+      <cat-item tags="np.org.*"/>
    <!--   <cat-item tags="np.cog"/>
       <cat-item tags="np.cog.*"/>-->
       <cat-item tags="np.unk"/>
@@ -935,6 +935,7 @@
       <attr-item tags="ger"/>
       <attr-item tags="pprs"/>
       <attr-item tags="gna_perf"/>
+      <attr-item tags="ger_perf"/>
       <attr-item tags="gna9"/>
       <attr-item tags="prc_impf"/>
       <attr-item tags="ger_past"/>
@@ -2056,7 +2057,10 @@
                 </when>
 <when>
                    <test>
+<or>
                    <equal><clip pos="1" side="sl" part="a_tns"/><lit-tag v="gna_perf"/></equal>
+                   <equal><clip pos="1" side="sl" part="a_tns"/><lit-tag v="ger_perf"/></equal>
+</or>
                       </test>
                  <let><clip pos="1" side="tl" part="a_tns"/><lit-tag v="pres"/></let>
 
@@ -4318,7 +4322,47 @@
                 </when>
 
            </choose>
+<choose>
+<when>
+                   <test>
+                  
+  <equal><clip pos="1" side="sl" part="lemh"/><lit v="бол"/></equal>
+
+                      </test>
         <out>
+          <chunk name="have-to-inf-be" case="caseFirstWord">
+            <tags>
+              <tag> <lit-tag v="SV"/></tag>
+
+
+ <tag> <lit-tag v="PD"/></tag>
+ <tag> <lit-tag v="ND"/></tag>
+
+</tags>
+<lu>
+          <lit v="have"/>  
+        <lit-tag v="vbmod"/>
+	<lit-tag v="inf"/>
+<lit v="#"/> 
+
+<b/>
+          <lit v="to"/> 
+
+
+</lu>
+<b/>
+
+            <lu>
+             <clip pos="1" side="tl" part="lem"/>
+              <lit-tag v="vbser"/>
+              <lit-tag v="inf"/>
+           <!--   <clip pos="1" side="tl" part="lemq"/>-->
+                 </lu>
+          </chunk>
+        </out>
+                </when>
+<otherwise>
+        <out>
           <chunk name="have-to-inf" case="caseFirstWord">
             <tags>
               <tag> <lit-tag v="SV"/></tag>
@@ -4349,6 +4393,8 @@
                  </lu>
           </chunk>
         </out>
+</otherwise>
+           </choose>
         <call-macro n="reset-vars1">
           <with-param pos="1"/>
         </call-macro>
@@ -4355,11 +4401,127 @@
       </action>
     </rule>
 
+<rule comment="RULE: have to go"> <!--Men baruym kerek-->
+      <pattern>
+	<pattern-item n="v-gerund"/>
+        <pattern-item n="kerek"/>
+        <pattern-item n="cop"/>
+      </pattern>
+      <action>
+        <call-macro n="conv-case1">
+          <with-param pos="1"/>
+        </call-macro>
+        <call-macro n="conv-number1">
+          <with-param pos="1"/>
+        </call-macro>
+<call-macro n="remove-poss">
+          <with-param pos="1"/>
+        </call-macro>
+ <choose>
+               <when>
+                   <test>
+                   
+                       <equal><clip pos="1" side="sl" part="a_pers"/><lit-tag v="p2"/></equal>
+                      </test>
+                 <let><clip pos="1" side="tl" part="a_nbr"/><lit v=""/></let>
+           <let><clip pos="1" side="tl" part="a_pers"/><lit v=""/></let>
 
+                </when>
+<when>
+                   <test>
+                   <and>
+                       <equal><clip pos="1" side="sl" part="a_pers"/><lit-tag v="p1"/></equal>
+                       <equal><clip pos="1" side="sl" part="a_nbr"/><lit-tag v="pl"/></equal>
+                     </and>
+                      </test>
+                 <let><clip pos="1" side="tl" part="a_nbr"/><lit v=""/></let>
+           <let><clip pos="1" side="tl" part="a_pers"/><lit v=""/></let>
+                </when>
 
+           </choose>
+   <choose>
+<when>
+                   <test>
+                  
+  <equal><clip pos="1" side="sl" part="lemh"/><lit v="бол"/></equal>
 
+                      </test>
+                 <out>
+          <chunk name="have-to-inf-be" case="caseFirstWord">
+            <tags>
+              <tag> <lit-tag v="SV"/></tag>
 
 
+ <tag> <lit-tag v="PD"/></tag>
+ <tag> <lit-tag v="ND"/></tag>
+
+</tags>
+<lu>
+          <lit v="have"/>  
+        <lit-tag v="vbmod"/>
+	<lit-tag v="inf"/>
+<lit v="#"/> 
+
+<b/>
+          <lit v="to"/> 
+
+
+</lu>
+<b/>
+
+            <lu>
+             <clip pos="1" side="tl" part="lem"/>
+              <lit-tag v="vbser"/>
+              <lit-tag v="inf"/>
+           <!--   <clip pos="1" side="tl" part="lemq"/>-->
+                 </lu>
+          </chunk>
+        </out>
+                </when>
+<otherwise>
+        <out>
+          <chunk name="have-to-inf" case="caseFirstWord">
+            <tags>
+              <tag> <lit-tag v="SV"/></tag>
+
+
+ <tag> <lit-tag v="PD"/></tag>
+ <tag> <lit-tag v="ND"/></tag>
+
+</tags>
+<lu>
+          <lit v="have"/>  
+        <lit-tag v="vbmod"/>
+	<lit-tag v="inf"/>
+<lit v="#"/> 
+
+<b/>
+          <lit v="to"/> 
+
+
+</lu>
+<b/>
+
+            <lu>
+             <clip pos="1" side="tl" part="lem"/>
+              <lit-tag v="vblex"/>
+              <lit-tag v="inf"/>
+           <!--   <clip pos="1" side="tl" part="lemq"/>-->
+                 </lu>
+          </chunk>
+        </out>
+</otherwise>
+           </choose>
+        <call-macro n="reset-vars1">
+          <with-param pos="1"/>
+        </call-macro>
+      </action>
+    </rule>
+
+
+
+
+
 <rule comment="RULE: VP-cop-past"> <!--Mende kitap bar-->
       <pattern>
         <pattern-item n="bar"/>
@@ -7197,6 +7359,9 @@
         <call-macro n="conv-number1">
           <with-param pos="1"/>
         </call-macro>
+<call-macro n="choose_case_and_postposition2">
+          <with-param pos="1"/>
+        </call-macro>
 
  <choose>
                  <when>
@@ -7314,6 +7479,43 @@
                    <test>
                <and>
  <equal><clip pos="1" side="sl" part="lemh"/><lit v="бұл"/></equal>
+ <equal><clip pos="1" side="sl" part="a_cas"/><lit-tag v="abl"/></equal>
+
+</and>
+                  </test>
+
+               
+        <out>
+          <chunk name="this-pronoun" case="caseFirstWord">
+            <tags>
+              <tag><var n="sntype"/></tag>
+	<tag><clip pos="1" side="sl" part="a_mf"/></tag>
+	              <tag><var n="number"/></tag>
+              
+            </tags>
+<lu>
+<var n="postposition_lu"/>
+</lu>
+<b/>
+            <lu>
+               <clip pos="1" side="tl" part="lemh"/>
+            <lit-tag v="prn"/>
+	<lit-tag v="obj"/>
+<lit-tag v="p3"/>
+<lit-tag v="nt"/>
+<lit-tag v="sg"/>
+               <clip pos="1" side="tl" part="lemq"/>
+  	
+             
+	
+            </lu>
+          </chunk>
+        </out>
+ </when>
+<when>
+                   <test>
+               <and>
+ <equal><clip pos="1" side="sl" part="lemh"/><lit v="бұл"/></equal>
  <equal><clip pos="1" side="sl" part="a_cas"/><lit-tag v="acc"/></equal>
 
 </and>
@@ -7364,6 +7566,10 @@
 	              <tag><var n="number"/></tag>
               
             </tags>
+<lu>
+<var n="postposition_lu"/>
+</lu>
+<b/>
             <lu>
 	<clip pos="1" side="tl" part="lemh"/>
             <lit-tag v="prn"/>