From 0f9e17cb99a3debba16c0003c49d815ac28aa43b Mon Sep 17 00:00:00 2001
From: ftyers <ftyers@72bbbca6-d526-0410-a7d9-f06f51895060>
Date: Sun, 16 Dec 2007 22:10:04 +0000
Subject: [PATCH] =?utf8?q?Add=20a=20rule=20for=20NP=20na=20NP=20=E2=86=92?=
 =?utf8?q?=20NP-gen=20NP-gen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: https://apertium.svn.sourceforge.net/svnroot/apertium@3037 72bbbca6-d526-0410-a7d9-f06f51895060
---
 apertium-sh-mk/apertium-sh-mk.mk-sh.t1x  |  10 +--
 apertium-sh-mk/apertium-sh-mk.mk-sh.t2x  |  68 ++++++++++++++++
 apertium-sh-mk/apertium-sh-mk.sh.dix.xml | 136 +++++++++++++++++++++++++++++++
 3 files changed, 209 insertions(+), 5 deletions(-)

diff --git a/apertium-sh-mk/apertium-sh-mk.mk-sh.t1x b/apertium-sh-mk/apertium-sh-mk.mk-sh.t1x
index 942cf008..12c3d7db 100644
--- a/apertium-sh-mk/apertium-sh-mk.mk-sh.t1x
+++ b/apertium-sh-mk/apertium-sh-mk.mk-sh.t1x
@@ -572,7 +572,7 @@
              </equal>
            </test>
            <out>
-             <chunk name="prep" case="caseFirstWord">
+             <chunk name="prep__o" case="caseFirstWord">
                <tags>
                  <tag><lit-tag v="SP"/></tag>
                  <tag><lit-tag v="loc"/></tag>
@@ -595,7 +595,7 @@
              </equal>
            </test>
            <out>
-             <chunk name="prep" case="caseFirstWord">
+             <chunk name="prep__u" case="caseFirstWord">
                <tags>
                  <tag><lit-tag v="SP"/></tag>
                  <tag><lit-tag v="loc"/></tag>
@@ -618,7 +618,7 @@
              </equal>
            </test>
            <out>
-             <chunk name="prep" case="caseFirstWord">
+             <chunk name="prep__iz" case="caseFirstWord">
                <tags>
                  <tag><lit-tag v="SP"/></tag>
                  <tag><lit-tag v="gen"/></tag>
@@ -648,7 +648,7 @@
              </and>
            </test>
            <out>
-             <chunk name="prep" case="caseFirstWord">
+             <chunk name="prep__na" case="caseFirstWord">
                <tags>
                  <tag><lit-tag v="SP"/></tag>
                  <tag><lit-tag v="loc"/></tag>
@@ -677,7 +677,7 @@
              </and>
            </test>
            <out>
-             <chunk name="prep" case="caseFirstWord">
+             <chunk name="prep__na" case="caseFirstWord">
                <tags>
                  <tag><lit-tag v="SP"/></tag>
                  <tag><lit-tag v="acc"/></tag>
diff --git a/apertium-sh-mk/apertium-sh-mk.mk-sh.t2x b/apertium-sh-mk/apertium-sh-mk.mk-sh.t2x
index bc7f0c8d..eac4e0b1 100644
--- a/apertium-sh-mk/apertium-sh-mk.mk-sh.t2x
+++ b/apertium-sh-mk/apertium-sh-mk.mk-sh.t2x
@@ -101,6 +101,74 @@
       </action>
     </rule>
 
+    <rule comment="REGLA: SN SP SN">
+      <pattern>
+        <pattern-item n="SN"/>
+        <pattern-item n="SP"/>
+        <pattern-item n="SN"/>
+      </pattern>
+      <action>
+        <choose>
+          <when>
+            <test>
+              <equal>
+                <clip pos="2" part="lem"/>
+                <lit v="prep__na"/>
+              </equal>
+            </test>
+            <out>
+              <chunk>
+                <clip pos="1" part="lem"/>
+                <clip pos="1" part="a_sintagma"/>
+                <clip pos="1" part="gen"/>
+                <clip pos="1" part="nbr"/>
+                <lit-tag v="gen"/>
+                <clip pos="1" part="chcontent"/>
+              </chunk>
+              <b/>
+              <chunk>
+                <clip pos="3" part="lem"/>
+                <clip pos="3" part="a_sintagma"/>
+                <clip pos="3" part="gen"/>
+                <clip pos="3" part="nbr"/>
+                <lit-tag v="gen"/>
+                <clip pos="3" part="chcontent"/>
+              </chunk>
+            </out>
+          </when>
+          <otherwise>
+            <out>
+              <chunk>
+                <clip pos="1" part="lem"/>
+                <clip pos="1" part="a_sintagma"/>
+                <clip pos="1" part="gen"/>
+                <clip pos="1" part="nbr"/>
+                <clip pos="1" part="cas"/>
+                <clip pos="1" part="chcontent"/>
+              </chunk>
+              <b/>
+              <chunk>
+                <clip pos="2" part="lem"/>
+                <clip pos="2" part="tags"/>
+                <clip pos="2" part="chcontent"/>
+              </chunk>
+              <b/>
+              <chunk>
+                <clip pos="3" part="lem"/>
+                <clip pos="3" part="a_sintagma"/>
+                <clip pos="3" part="gen"/>
+                <clip pos="3" part="nbr"/>
+                <clip pos="3" part="cas"/>
+                <clip pos="3" part="chcontent"/>
+              </chunk>
+            </out>
+          </otherwise>
+        </choose>
+      </action>
+    </rule>
+
+
+
     <rule comment="REGLA: SP SN CNJCOO SN">
       <pattern>
         <pattern-item n="SP"/>
diff --git a/apertium-sh-mk/apertium-sh-mk.sh.dix.xml b/apertium-sh-mk/apertium-sh-mk.sh.dix.xml
index d378caab..a1400cee 100644
--- a/apertium-sh-mk/apertium-sh-mk.sh.dix.xml
+++ b/apertium-sh-mk/apertium-sh-mk.sh.dix.xml
@@ -6950,6 +6950,7 @@
       </e>
     </pardef>
 
+
     <!-- This paradigm probably needs fixing: West forms with je not e -->
     <pardef n="vid/eti__vblex">
       <e>
@@ -7115,6 +7116,139 @@
     </pardef>
 
 
+    <pardef n="izb/rati__vblex">
+      <!-- Future forms are different between east and west -->
+      <group alt="sh">
+        <e>
+          <p>
+            <l>ra</l>
+            <r>rati<s n="vblex"/><s n="inf"/></r>
+          </p>
+         <par n="C__ću"/>
+        </e>
+        <e>
+          <p>
+            <l>rat</l>
+            <r>rati<s n="vblex"/><s n="inf"/></r>
+          </p>
+          <par n="C__ću"/>
+        </e>
+      </group>
+      <group alt="sh_HR">
+        <e>
+          <p>
+            <l>rat</l>
+            <r>rati<s n="vblex"/><s n="inf"/></r>
+          </p>
+          <par n="C__ću"/>
+        </e>
+      </group>
+      <group alt="sh_SR">
+        <e>
+          <p>
+            <l>ra</l>
+            <r>rati<s n="vblex"/><s n="inf"/></r>
+          </p>
+         <par n="C__ću"/>
+        </e>
+      </group>
+      <group alt="sh_BS">
+        <e>
+          <p>
+            <l>ra</l>
+            <r>rati<s n="vblex"/><s n="inf"/></r>
+          </p>
+         <par n="C__ću"/>
+        </e>
+      </group>
+
+      <e>
+        <p>
+         <l>rati</l>
+         <r>rati<s n="vblex"/><s n="inf"/></r>
+       </p>
+      </e>
+      <e>
+        <p>
+         <l>eri</l>
+         <r>rati<s n="vblex"/><s n="imp"/></r>
+       </p>
+      </e>
+      <e>
+        <p>
+         <l>erem</l>
+         <r>rati<s n="vblex"/><s n="pri"/><s n="p1"/><s n="sg"/></r>
+       </p>
+      </e>
+      <e>
+        <p>
+         <l>ereš</l>
+         <r>rati<s n="vblex"/><s n="pri"/><s n="p2"/><s n="sg"/></r>
+       </p>
+      </e>
+      <e>
+        <p>
+         <l>ere</l>
+         <r>rati<s n="vblex"/><s n="pri"/><s n="p3"/><s n="sg"/></r>
+       </p>
+      </e>
+      <e>
+        <p>
+         <l>eremo</l>
+         <r>rati<s n="vblex"/><s n="pri"/><s n="p1"/><s n="pl"/></r>
+       </p>
+      </e>
+      <e>
+        <p>
+         <l>erete</l>
+         <r>rati<s n="vblex"/><s n="pri"/><s n="p2"/><s n="pl"/></r>
+       </p>
+      </e>
+      <e>
+        <p>
+         <l>eru</l>
+         <r>rati<s n="vblex"/><s n="pri"/><s n="p3"/><s n="pl"/></r>
+       </p>
+      </e>
+      <e>
+        <p>
+         <l>rah</l>
+         <r>rati<s n="vblex"/><s n="aor"/><s n="p1"/><s n="sg"/></r>
+       </p>
+      </e>
+      <e>
+        <p>
+         <l>ra</l>
+         <r>rati<s n="vblex"/><s n="aor"/><s n="p2"/><s n="sg"/></r>
+       </p>
+      </e>
+      <e>
+        <p>
+         <l>ra</l>
+         <r>rati<s n="vblex"/><s n="aor"/><s n="p3"/><s n="sg"/></r>
+       </p>
+      </e>
+      <e>
+        <p>
+         <l>rasmo</l>
+         <r>rati<s n="vblex"/><s n="aor"/><s n="p1"/><s n="pl"/></r>
+       </p>
+      </e>
+      <e>
+        <p>
+         <l>raste</l>
+         <r>rati<s n="vblex"/><s n="aor"/><s n="p2"/><s n="pl"/></r>
+       </p>
+      </e>
+      <e>
+        <p>
+         <l>raše</l>
+         <r>rati<s n="vblex"/><s n="aor"/><s n="p3"/><s n="pl"/></r>
+       </p>
+      </e>
+    </pardef>
+
+
 
     <pardef n="jeb/ati__vblex">
       <!-- Future forms are different between east and west -->
@@ -8394,6 +8528,8 @@
     <e lm="moliti"><i>mol</i><par n="mol/iti__vblex"/></e>
     <e lm="raditi"><i>rad</i><par n="mol/iti__vblex"/></e>
 
+    <e lm="izbrati"><i>izb</i><par n="izb/rati__vblex"/></e>
+
     <e lm="moći"><i>mo</i><par n="mo/ći__vbmod"/></e>
     <e lm="hoću"><i>ho</i><par n="ho/ću__vbmod"/></e>
 
-- 
2.11.4.GIT