Index: branches/apertium-separable/examples/convert-mwe-att.py
===================================================================
--- branches/apertium-separable/examples/convert-mwe-att.py	(revision 80590)
+++ branches/apertium-separable/examples/convert-mwe-att.py	(nonexistent)
@@ -1,39 +0,0 @@
-import sys;
-
-for line in sys.stdin.readlines(): #{
-
-	if line.strip() == '': #{
-		continue
-	#}
-	
-	row = line.strip('\n').split('\t');
-
-	# Final state
-	if len(row) == 1: #{
-		print(row[0]);
-		continue;
-	#}
-	
-	# Replace word boundary symbol with the special one
-	if row[2] == '+': #{
-		row[2] = '<$>';
-	#}
-	if row[3] == '+': #{
-		row[3] = '<$>';
-	#}
-	
-	# Replace ~ symbol with <ANY_TAG> and add a loop
-	if row[2] == '~': #{
-		row[2] = '<ANY_TAG>';
-		#print('%s\t%s\t%s\t%s' % (row[1], row[1], row[2], 'ε'));
-		print('%s\t%s\t%s\t%s' % (row[1], row[1], row[2], row[2]));
-	#}
-#	if row[3] == '~': #{
-#		row[3] = '<ANY_TAG>';
-#		print('%s\t%s\t%s\t%s' % (row[1], row[1], row[3], row[3]));
-#		print('%s\t%s\t%s\t%s' % (row[1], row[1], 'ε', row[3]));
-#	#}
-
-
-	print('\t'.join(row));
-#}
Index: branches/apertium-separable/examples/xml_graph.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/apertium-separable/examples/xml_graph.png
===================================================================
--- branches/apertium-separable/examples/xml_graph.png	(revision 80590)
+++ branches/apertium-separable/examples/xml_graph.png	(nonexistent)

Property changes on: branches/apertium-separable/examples/xml_graph.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: branches/apertium-separable/examples/new-example.dix
===================================================================
--- branches/apertium-separable/examples/new-example.dix	(revision 80590)
+++ branches/apertium-separable/examples/new-example.dix	(revision 80591)
@@ -6,6 +6,7 @@
   <sdefs>
     <sdef n="adj"/>
     <sdef n="adv"/>
+    <sdef n="cnjcoo"/>
     <sdef n="det"/>
     <sdef n="n"/>
     <sdef n="np"/>
@@ -97,9 +98,9 @@
     </pardef>
     <pardef n="SAdv">
       <e><par n="adv"/></e>
-      <e><par n="adv"/><par n="freq-adv"></e>
+      <e><par n="adv"/><par n="freq-adv"/></e>
       <e><par n="freq-adv"/></e>
-      <e><par n="freq-adv"/><par n="adv"></e>
+      <e><par n="freq-adv"/><par n="adv"/></e>
     </pardef>
     <pardef n="SN">
       <e><par n="n"/></e>
@@ -140,7 +141,7 @@
     </e>
     <e lm="blow out of the water" c="vencer">
       <p><l>blow</l><r>blow<g><b/>out<b/>of<b/>the<b/>water</g></r></p><i><s n="vblex"/><t/><j/></i>
-      <par n="SN"/><p><l>out<t/></b>of<t/><b/>the<t/><b/>water<t/></l><r></r></p>
+      <par n="SN"/><p><l>out<t/><b/>of<t/><b/>the<t/><b/>water<t/></l><r></r></p>
     </e>
     <e lm="bring down" c="hacer desaparecer, bajar">
       <p><l>bring</l><r>bring<g><b/>down</g></r></p><i><s n="vblex"/><t/><j/></i>
Index: branches/apertium-separable/scripts/convert-mwe-att.py
===================================================================
--- branches/apertium-separable/scripts/convert-mwe-att.py	(nonexistent)
+++ branches/apertium-separable/scripts/convert-mwe-att.py	(revision 80591)
@@ -0,0 +1,39 @@
+import sys;
+
+for line in sys.stdin.readlines(): #{
+
+	if line.strip() == '': #{
+		continue
+	#}
+	
+	row = line.strip('\n').split('\t');
+
+	# Final state
+	if len(row) == 1: #{
+		print(row[0]);
+		continue;
+	#}
+	
+	# Replace word boundary symbol with the special one
+	if row[2] == '+': #{
+		row[2] = '<$>';
+	#}
+	if row[3] == '+': #{
+		row[3] = '<$>';
+	#}
+	
+	# Replace ~ symbol with <ANY_TAG> and add a loop
+	if row[2] == '~': #{
+		row[2] = '<ANY_TAG>';
+		#print('%s\t%s\t%s\t%s' % (row[1], row[1], row[2], 'ε'));
+		print('%s\t%s\t%s\t%s' % (row[1], row[1], row[2], row[2]));
+	#}
+#	if row[3] == '~': #{
+#		row[3] = '<ANY_TAG>';
+#		print('%s\t%s\t%s\t%s' % (row[1], row[1], row[3], row[3]));
+#		print('%s\t%s\t%s\t%s' % (row[1], row[1], 'ε', row[3]));
+#	#}
+
+
+	print('\t'.join(row));
+#}
Index: branches/apertium-separable/src/TODO
===================================================================
--- branches/apertium-separable/src/TODO	(revision 80590)
+++ branches/apertium-separable/src/TODO	(nonexistent)
@@ -1,3 +0,0 @@
-^take<vblex><past>$ ^one<prn><tn><mf><sg>$ ^out of<pr>$ ^ten<num><sp>$
-shouldn't be re-ordered
-
Index: branches/apertium-separable/takeout/takeout.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/apertium-separable/takeout/takeout.png
===================================================================
--- branches/apertium-separable/takeout/takeout.png	(revision 80590)
+++ branches/apertium-separable/takeout/takeout.png	(nonexistent)

Property changes on: branches/apertium-separable/takeout/takeout.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: branches/apertium-separable/takeout/takeout.dot
===================================================================
--- branches/apertium-separable/takeout/takeout.dot	(revision 80590)
+++ branches/apertium-separable/takeout/takeout.dot	(nonexistent)
@@ -1,56 +0,0 @@
-digraph G {
-rankdir=LR
-node [shape=circle];
-	0->1 [label="t:t"];
-	1->2 [label="a:a"];
-	2->3 [label="k:k"];
-	3->4 [label="e:e"];
-	4->5 [label="ε:#"];
-	5->6 [label="ε: "];
-	6->7 [label="ε:o"];
-	7->8 [label="ε:u"];
-	8->9 [label="ε:t"];
-	9->10 [label="<vblex>:<vblex>"];
-	10->11 [label="<ANY_TAG>:<ANY_TAG>"];
-	11->10 [label="ε:ε"];
-	11->12 [label="<$>:<$>"];
-	12->30 [label="ε:ε"];
-	12->22 [label="ε:ε"];
-	12->13 [label="<ANY_CHAR>:<ANY_CHAR>"];
-	13->12 [label="ε:ε"];
-	13->14 [label="<prn>:<prn>"];
-	13->17 [label="<np>:<np>"];
-	13->20 [label="<det>:<det>"];
-	14->15 [label="<ANY_TAG>:<ANY_TAG>"];
-	15->14 [label="ε:ε"];
-	15->16 [label="<$>:<$>"];
-	16->30 [label="ε:ε"];
-	17->18 [label="<ANY_TAG>:<ANY_TAG>"];
-	18->17 [label="ε:ε"];
-	18->19 [label="<$>:<$>"];
-	19->30 [label="ε:ε"];
-	20->21 [label="<ANY_TAG>:<ANY_TAG>"];
-	21->20 [label="ε:ε"];
-	21->22 [label="<$>:<$>"];
-	22->26 [label="ε:ε"];
-	22->23 [label="<ANY_CHAR>:<ANY_CHAR>"];
-	23->22 [label="ε:ε"];
-	23->24 [label="<adj>:<adj>"];
-	24->25 [label="ε:ε"];
-	24->25 [label="<ANY_TAG>:<ANY_TAG>"];
-	25->24 [label="ε:ε"];
-	25->26 [label="<$>:<$>"];
-	26->27 [label="<ANY_CHAR>:<ANY_CHAR>"];
-	27->26 [label="ε:ε"];
-	27->23 [label="<adj>:<adj>"];
-	27->28 [label="<n>:<n>"];
-	28->29 [label="<ANY_TAG>:<ANY_TAG>"];
-	29->28 [label="ε:ε"];
-	29->30 [label="<$>:<$>"];
-	30->31 [label="o:ε"];
-	31->32 [label="u:ε"];
-	32->33 [label="t:ε"];
-	33->34 [label="<ANY_TAG>:ε"];
-	34->35 [label="<$>:ε"];
-	35 [style=double];
-}