12 files changed, 802 insertions, 457 deletions

diff --git a/tests/test_html.py b/tests/test_html.py
index 3da57f6..5a15cb8 100644
--- a/tests/test_html.py
+++ b/tests/test_html.py
@@ -1,14 +1,14 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 from __future__ import print_function
 import unittest
-from WikiTrans.wiki2html  import HtmlWiktionaryMarkup
-from WikiTest import populateMethods
+from wikitrans.wiki2html  import HtmlWikiMarkup
+from wikitest import populate_methods
 
-class TestWiktionaryMarkup (unittest.TestCase):
+class TestWikiMarkup (unittest.TestCase):
     pass
 
-populateMethods(TestWiktionaryMarkup, HtmlWiktionaryMarkup, '.html')
+populate_methods(TestWikiMarkup, HtmlWikiMarkup, '.html')
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/test_texi.py b/tests/test_texi.py
index 75314c9..ddd26c7 100644
--- a/tests/test_texi.py
+++ b/tests/test_texi.py
@@ -1,14 +1,14 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 from __future__ import print_function
 import unittest
-from WikiTrans.wiki2texi  import TexiWikiMarkup
-from WikiTest import populateMethods
+from wikitrans.wiki2texi  import TexiWikiMarkup
+from wikitest import populate_methods
 
 class TestTexiWikiMarkup (unittest.TestCase):
     pass
 
-populateMethods(TestTexiWikiMarkup, TexiWikiMarkup, '.texi')
+populate_methods(TestTexiWikiMarkup, TexiWikiMarkup, '.texi')
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/test_text.py b/tests/test_text.py
index a06f519..b3d0a12 100644
--- a/tests/test_text.py
+++ b/tests/test_text.py
@@ -1,14 +1,14 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 from __future__ import print_function
 import unittest
-from WikiTrans.wiki2text  import TextWiktionaryMarkup
-from WikiTest import populateMethods
+from wikitrans.wiki2text  import TextWikiMarkup
+from wikitest import populate_methods
 
-class TestTextWiktionaryMarkup (unittest.TestCase):
+class TestTextWikiMarkup (unittest.TestCase):
     pass
 
-populateMethods(TestTextWiktionaryMarkup, TextWiktionaryMarkup, '.text')
+populate_methods(TestTextWikiMarkup, TextWikiMarkup, '.text')
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/WikiTest.py b/tests/wikitest.py
index 1429f5e..ff26227 100644
--- a/tests/WikiTest.py
+++ b/tests/wikitest.py
@@ -1,13 +1,13 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 from __future__ import print_function
 from glob import glob
 import os.path
 
-def MarkupTest(classname, name_in, name_out):
+def wiki_markup_test(classname, name_in, name_out):
     fh = open(name_out)
     buf = ''.join(fh.readlines()).strip()
     fh.close()
     hwm = classname(filename=name_in, lang="en")
     hwm.parse()
 
@@ -16,16 +16,16 @@ def MarkupTest(classname, name_in, name_out):
 
     # fail
     print("\n>>>%s<<<" % buf)
     print(">>>%s<<<" % str(hwm).strip())
     return False
 
-def populateMethods(cls, wcls, suffix):
+def populate_methods(cls, wcls, suffix):
     def settest(self, base, wiki_name, pat_name):
         def dyntest(self):
-            self.assertTrue(MarkupTest(wcls, wiki_name, pat_name))
+            self.assertTrue(wiki_markup_test(wcls, wiki_name, pat_name))
         meth = 'test_' + wcls.__name__ + '_' + base
         dyntest.__name__ = meth
         setattr(cls, meth, dyntest)
     for file in glob('testdata/*.wiki'):
         if os.path.isfile(file):
             patfile = file[:len(file) - 5] + suffix
diff --git a/WikiTrans/__init__.py b/wikitrans/__init__.py
index 5832e38..5832e38 100644
--- a/WikiTrans/__init__.py
+++ b/wikitrans/__init__.py
diff --git a/WikiTrans/wiki2html.py b/wikitrans/wiki2html.py
index 6147642..ce65bae 100644
--- a/WikiTrans/wiki2html.py
+++ b/wikitrans/wiki2html.py
@@ -12,16 +12,27 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+"""
+Wiki markup to HTML translator.
+
+Classes:
+
+HtmlWikiMarkup       -- Converts Wiki material to HTML.
+HtmlWiktionaryMarkup -- Reserved for future use. Currently does the same as
+                        HtmlWikiMarkup.
+
+"""
+
 from __future__ import print_function
-from WikiTrans.wikimarkup import *
-from WikiTrans.wikitoken import *
-from WikiTrans.wikins import wiki_ns_re, wiki_ns
+from wikitrans.wikimarkup import *
+from wikitrans.wikitoken import *
+from wikitrans.wikins import wiki_ns_re, wiki_ns
 import re
 try:
     from urllib import quote as url_quote
 except ImportError:
     from urllib.parse import quote as url_quote
 
@@ -76,22 +87,22 @@ class HtmlLinkNode(HtmlSeqNode):
                     text = self.parser.langtab[qual]
             else:
                 tgt = self.parser.mktgt(tgt)
         else:
             tgt = self.parser.mktgt(arg)
         return "<a href=\"%s\">%s</a>" % (tgt,
-                                          text if (text and text != '') \
-                                               else arg)
+                                          text if (text and text != '') else arg)
 
 class HtmlRefNode(WikiRefNode):
     def format(self):
         target = self.ref
         text = self.content.format()
-        return "<a href=\"%s\">%s</a>" % (target,
-                                          text if (text and text != '') \
-                                                   else target)
+        return "<a href=\"%s\">%s</a>" % (
+            target,
+            text if (text and text != '') else target
+        )
 
 class HtmlFontNode(HtmlSeqNode):
     def format(self):
         comm = { 'IT': 'i',
                  'BOLD': 'b' }
         s = '<%s>' % comm[self.type]
@@ -149,20 +160,20 @@ class HtmlTagNode(WikiTagNode):
         elif self.tag == 'references':
             s = '<div class="references">\n'
             s += '<ol class="references">\n'
             n = 0
             for ref in self.parser.references:
                 n += 1 
-                s += ('<li id="cite_note-%d">' + \
-                       '<span class="mw-cite-backlink">' + \
-                       '<b><a href="#cite_ref-%d">^</a></b>' + \
-                       '</span>' + \
-                       '<span class="reference-text">' + \
-                       ref.content.format() + \
+                s += ('<li id="cite_note-%d">'
+                      + '<span class="mw-cite-backlink">'
+                      + '<b><a href="#cite_ref-%d">^</a></b>'
+                      + '</span>'
+                      + '<span class="reference-text">'
+                      + ref.content.format()