Index: nursery/apertium-rus-ukr/apertium-rus-ukr.rus-ukr.t1x
===================================================================
--- nursery/apertium-rus-ukr/apertium-rus-ukr.rus-ukr.t1x	(revision 81615)
+++ nursery/apertium-rus-ukr/apertium-rus-ukr.rus-ukr.t1x	(revision 81616)
@@ -109,8 +109,15 @@
      <attr-item tags="adj.itg"/>
   </def-attr>
 
+  <def-attr n="a_cmp">
+     <attr-item tags="cmp"/>
+  </def-attr>
+
   <def-attr n="a_vrb">
      <attr-item tags="vblex"/>
+     <attr-item tags="vbmod"/>
+     <attr-item tags="vbser"/>
+     <attr-item tags="vbhaver"/>
   </def-attr>
 
   <def-attr n="asp">
@@ -156,6 +163,7 @@
      <attr-item tags="f"/>
      <attr-item tags="nt"/>
      <attr-item tags="mf"/>
+     <attr-item tags="mfn"/>
   </def-attr>
 
   <def-attr n="prs">
@@ -258,6 +266,33 @@
     </choose>
   </def-macro>
 
+  <def-macro n="short" npar="1">
+    
+    <choose>
+      <when>
+        <test><equal><clip pos="1" side="tl" part="anim"/><lit-tag v=""/></equal></test>
+        <let><clip pos="1" side="tl" part="anim"/><lit-tag v="an"/></let>
+      </when>
+    </choose>
+    <choose>
+      <when>
+        <test><equal><clip pos="1" side="tl" part="cas"/><lit-tag v=""/></equal></test>
+        <let><clip pos="1" side="tl" part="cas"/><lit-tag v="nom"/></let>
+      </when>
+    </choose>
+
+    <choose>
+      <when>
+        <test><equal><clip pos="1" side="sl" part="a_cmp"/><lit-tag v="cmp"/></equal></test> 
+        <let><clip pos="1" side="sl" part="a_cmp"/><lit-tag v=""/></let>
+        <let><clip pos="1" side="tl" part="tags"/><concat><clip pos="1" side="tl" part="tags"/><lit-tag v="m.an.sg.nom"/></concat></let>
+      </when>
+      <otherwise>
+        <let><clip pos="1" side="tl" part="tags"/><concat><lit-tag v="adj"/><clip pos="1" side="sl" part="gen"/><lit-tag v="an"/><clip pos="1" side="sl" part="nbr"/><lit-tag v="nom"/></concat></let>
+      </otherwise>
+    </choose>
+  </def-macro>
+
 </section-def-macros>
 
 
@@ -370,18 +405,7 @@
     </pattern>
     <action>
       <call-macro n="case_adapter1"><with-param pos="1"/></call-macro>
-      <choose>
-        <when>
-          <test><equal><clip pos="1" side="tl" part="anim"/><lit-tag v=""/></equal></test>
-          <let><clip pos="1" side="tl" part="anim"/><lit-tag v="an"/></let>
-        </when>
-      </choose>
-      <choose>
-        <when>
-          <test><equal><clip pos="1" side="tl" part="cas"/><lit-tag v=""/></equal></test>
-          <let><clip pos="1" side="tl" part="cas"/><lit-tag v="nom"/></let>
-        </when>
-      </choose>
+      <!-- <call-macro n="short"><with-param pos="1"/></call-macro> -->
        <out>
         <chunk name="prtcpl" case="caseFirstWord">
           <tags>
@@ -391,6 +415,7 @@
             <clip pos="1" side="tl" part="lemh"/>
             <clip pos="1" side="tl" part="a_vrb"/>
             <clip pos="1" side="tl" part="asp"/>
+            <clip pos="1" side="tl" part="trans"/>
             <lit-tag v="pp.pasv"/>
             <clip pos="1" side="tl" part="gen"/>
             <clip pos="1" side="tl" part="anim"/>
@@ -443,6 +468,7 @@
     </pattern>
     <action>
       <call-macro n="case_adapter1"><with-param pos="1"/></call-macro>
+
       <out>
         <chunk name="pp_actv" case="caseFirstWord">
           <tags>
@@ -580,7 +606,7 @@
   </rule>
 
 
-<!--   <rule comment="RULE: Short adjective → Adjective">
+  <rule comment="RULE: Short adjective → Adjective">
      <pattern>
        <pattern-item n="adj_short"/>
      </pattern>
@@ -606,7 +632,7 @@
          </chunk>
      </out>
      </action>
-  </rule> -->
+  </rule>
 
   <rule comment="RULE: Adjective → Adjective">
     <pattern>