From c9bf349de7a66074d1dec940a82510bd4c1bcd98 Mon Sep 17 00:00:00 2001
From: Star Brilliant <m13253@hotmail.com>
Date: Wed, 25 Feb 2015 19:55:35 +0800
Subject: [PATCH] Fix https://github.com/m13253/BiliDan/issues/24

---
 danmaku2ass.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/danmaku2ass.py b/danmaku2ass.py
index fa916aa..49cf09d 100755
--- a/danmaku2ass.py
+++ b/danmaku2ass.py
@@ -175,15 +175,15 @@ def ReadCommentsBilibili(f, fontsize):
             p = str(comment.getAttribute('p')).split(',')
             assert len(p) >= 5
             assert p[1] in ('1', '4', '5', '6', '7', '8')
-            if p[1] != '7':
+            if p[1] in ('1', '4', '5', '6'):
                 c = str(comment.childNodes[0].wholeText).replace('/n', '\n')
                 size = int(p[2])*fontsize/25.0
                 yield (float(p[0]), int(p[4]), i, c, {'1': 0, '4': 2, '5': 1, '6': 3}[p[1]], int(p[3]), size, (c.count('\n')+1)*size, CalculateLength(c)*size)
-            elif p[1] == '8':
-                pass  # ignore scripted comment
-            else:  # positioned comment
+            elif p[1] == '7':  # positioned comment
                 c = str(comment.childNodes[0].wholeText)
                 yield (float(p[0]), int(p[4]), i, c, 'bilipos', int(p[3]), int(p[2]), 0, 0)
+            elif p[1] == '8':
+                pass  # ignore scripted comment
         except (AssertionError, AttributeError, IndexError, TypeError, ValueError):
             logging.warning(_('Invalid comment: %s') % comment.toxml())
             continue