plint

commit dfc2c542a0c34afbf620e0077097afdfafad54b5
parent e6479d57ec77be0354af7ac9f4aae250f8a17785
Author: Antoine Amarilli <a3nm@a3nm.net>
Date:   Sun, 10 Jul 2011 22:44:52 -0400

revert previous order after all, it makes more sense

Diffstat:
template.py
 | 
8
++++----
test/baudelaire.tpl
 | 
8
++++----
test/boileau.tpl
 | 
8
++++----
test/chan.tpl
 | 
8
++++----
test/genre.tpl
 | 
8
++++----
test/metric.tpl
 | 
2
+-

6 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/template.py b/template.py
@@ -122,13 +122,13 @@ class Template:
     split = l.split(' ')
     metric = split[0]
     if len(split) >= 2:
-      femid = split[1]
+      myid = split[1]
     else:
-      femid = str(self.pattern_line_no) # unique
+      myid = str(self.pattern_line_no) # unique
     if len(split) >= 3:
-      myid = split[2]
+      femid = split[2]
     else:
-      myid = str(self.pattern_line_no) # unique
+      femid = str(self.pattern_line_no) # unique
     idsplit = myid.split(':')
     if len(idsplit) >= 2:
       rhyme = [int(x) for x in idsplit[-1].split('|')]
diff --git a/test/baudelaire.tpl b/test/baudelaire.tpl
@@ -1,4 +1,4 @@
-6/6 A X
-6/6 B x
-6/6 B x
-6/6 A X
+6/6 X A
+6/6 x B
+6/6 x B
+6/6 X A
diff --git a/test/boileau.tpl b/test/boileau.tpl
@@ -1,4 +1,4 @@
-6/6 !X A:1|2
-6/6 !X A:1|2
-6/6 !x B:1|2
-6/6 !x B:1|2
+6/6 A:1|2 !X
+6/6 A:1|2 !X
+6/6 B:1|2 !x
+6/6 B:1|2 !x
diff --git a/test/chan.tpl b/test/chan.tpl
@@ -1,4 +1,4 @@
-6/6 A X
-6/6 A X
-6/6 B Y
-6/6 B Y
+6/6 X A
+6/6 X A
+6/6 Y B
+6/6 Y B
diff --git a/test/genre.tpl b/test/genre.tpl
@@ -1,4 +1,4 @@
-1 X A
-1 x A
-1 x A
-1 X A
+1 A X
+1 A x
+1 A x
+1 A X
diff --git a/test/metric.tpl b/test/metric.tpl
@@ -1 +1 @@
-6/6
+6/6