update

OrestisVaggelis · Mar 20, 2014 · 236e2b6 · 236e2b6
1 parent 15abdea
commit 236e2b6
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 27 deletions.
diff --git a/Makefile b/Makefile
@@ -257,7 +257,7 @@ TARGETS_COMMON = $(PREFIX1).automorf.bin $(PREFIX1).autobil.bin $(PREFIX1).autog
      $(PREFIX2).autolex.bin $(PREFIX2).rlx.bin \
      $(PREFIX1).t1x.bin $(PREFIX1).t2x.bin $(PREFIX1).t3x.bin \
      $(PREFIX2).t1x.bin $(PREFIX2).t2x.bin $(PREFIX2).t3x.bin \
-     $(PREFIX1).prob $(PREFIX2).prob
+     $(PREFIX1).prob 
 
 EXTRA_DIST = $(BASENAME).$(PREFIX1).dix \
            $(BASENAME).$(PREFIX1).lrx \
@@ -627,6 +627,8 @@ uninstall-am: uninstall-apertium_ell_engDATA
 	uninstall-apertium_ell_engDATA
 
 
+#$(PREFIX2).prob
+
 $(PREFIX1).automorf.bin: $(AP_SRC1)/apertium-$(LANG1).$(LANG1).dix $(AP_SRC1)/apertium-$(LANG1).$(LANG1).acx
 	apertium-validate-acx $(AP_SRC1)/apertium-$(LANG1).$(LANG1).acx
 	apertium-validate-dictionary $<
@@ -704,8 +706,7 @@ $(PREFIX2).autolex.bin: $(BASENAME).$(PREFIX2).lrx
 $(PREFIX1).prob: $(AP_LIB1)/$(LANG1).prob
 	cp $< $@
 
-$(PREFIX2).prob: $(AP_LIB2)/$(LANG2).prob
-	cp $< $@
+#$(PREFIX2).prob: $(AP_LIB2)/$(LANG2).prob
 
 ###############################################################################
 ###############################################################################

diff --git a/Makefile.am b/Makefile.am
@@ -13,7 +13,9 @@ TARGETS_COMMON = $(PREFIX1).automorf.bin $(PREFIX1).autobil.bin $(PREFIX1).autog
      $(PREFIX2).autolex.bin $(PREFIX2).rlx.bin \
      $(PREFIX1).t1x.bin $(PREFIX1).t2x.bin $(PREFIX1).t3x.bin \
      $(PREFIX2).t1x.bin $(PREFIX2).t2x.bin $(PREFIX2).t3x.bin \
-     $(PREFIX1).prob $(PREFIX2).prob
+     $(PREFIX1).prob 
+
+#$(PREFIX2).prob
 
 $(PREFIX1).automorf.bin: $(AP_SRC1)/apertium-$(LANG1).$(LANG1).dix $(AP_SRC1)/apertium-$(LANG1).$(LANG1).acx
 	apertium-validate-acx $(AP_SRC1)/apertium-$(LANG1).$(LANG1).acx
@@ -93,8 +95,7 @@ $(PREFIX2).autolex.bin: $(BASENAME).$(PREFIX2).lrx
 $(PREFIX1).prob: $(AP_LIB1)/$(LANG1).prob
 	cp $< $@
 
-$(PREFIX2).prob: $(AP_LIB2)/$(LANG2).prob
-	cp $< $@
+#$(PREFIX2).prob: $(AP_LIB2)/$(LANG2).prob
 
 ###############################################################################
 ## Translation modes

diff --git a/apertium-ell-eng.ell-eng.dix b/apertium-ell-eng.ell-eng.dix
@@ -76,8 +76,8 @@
 	<e><p><l>They<s n="prn"/></l><r>Αυτοί<s n="prn"/></r></p></e>
 
 	<!-- SECTION: Conjuctions -->
-    <e><p><l>and<s n="cnjcoo"/></l><r>και<s n="cnjcoo"/></r></p></e>
-    <e><p><l>but<s n="cnjcoo"/></l><r>αλλά<s n="cnjcoo"/></r></p></e>
+    <e><p><l>και<s n="cnjcoo"/></l><r>and<s n="cnjcoo"/></r></p></e>
+    <e><p><l>αλλά<s n="cnjcoo"/></l><r>but<s n="cnjcoo"/></r></p></e>
 
     <!-- SECTION: Colours --> 	<!-- To be reviewed... -->
     <e><p><l>μαύρο<s n="n"/><s n="f"/></l><r>black<s n="n"/></r></p></e>

diff --git a/apertium-ell-eng.ell-eng.t1x b/apertium-ell-eng.ell-eng.t1x
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<transfer>
+<transfer default="chunk">
 
 
 <section-def-cats>
@@ -60,23 +60,31 @@
 
 
 <section-rules>
-
-	<rule>
-   <pattern>
-     <pattern-item n="nom"/>
-   </pattern>
-   <action>
-     <out>
-       <lu>
-         <clip pos="1" side="tl" part="lem"/>
-         <clip pos="1" side="tl" part="a_nom"/>
-         <clip pos="1" side="tl" part="nbr"/>
-       </lu>
-     </out>
-   	</action>
-	</rule>
-
-	<rule>
+    <rule comment="REGLA: nom">
+      <pattern>
+        <pattern-item n="nom"/>
+      </pattern>
+      <action>
+        <out>
+          <chunk name="n" case="caseFirstWord">
+            <tags>
+              <tag><lit-tag v="SN"/></tag>
+              <tag><clip pos="1" side="sl" part="a_gen"/></tag>
+              <tag><clip pos="1" side="tl" part="a_nbr"/></tag>
+              <tag><clip pos="1" side="sl" part="a_case"/></tag>
+            </tags>
+            <lu>
+              <clip pos="1" side="tl" part="lemh"/>
+              <clip pos="1" side="tl" part="a_nom"/>
+              <clip pos="1" side="tl" part="a_nbr"/>
+              <clip pos="1" side="tl" part="lemq"/>
+            </lu>
+          </chunk>
+        </out>
+      </action>
+    </rule>
+
+  <rule>
    <pattern>
      <pattern-item n="vrb"/>
    </pattern>
@@ -97,7 +105,7 @@
        </lu>
      </out>
    </action>
-	</rule>
+  </rule>
 
 <rule>
    <pattern>