Fix most testcases.

* wikimarkup.py (envtypes): Redo as a dictionary.
(ELT): New item type
(BaseWikiMarkup): Fix list parsing.
(parse): Comment out changes introduced by 9c42879.
Must be rewritten.
* wiki2html.py (HtmlWikiMarkup): Change handling of lists.
* wiki2text.py: Likewise.

* testdata/deflist.wiki: New testcase.
* testdata/deflist.html: Likewise.

* testdata/colon.html: Update.
* testdata/headings.html: Update.
* testdata/hz.html: Update.
* testdata/numlist.html: Update.
* testdata/unlist.html: Update.

1 files changed, 13 insertions, 9 deletions

diff --git a/wiki2html.py b/wiki2html.py
index 81ada65..77cb97a 100644
--- a/wiki2html.py
+++ b/wiki2html.py
@@ -38,9 +38,12 @@ class HtmlWikiMarkup (WikiMarkup):
                     return elt[2]
         return None            
         
-
-    envhdr = [ "ul", "ol", "dl" ]    
-    envel = [ "li", "li", "dd" ]
+    envt = { "unnumbered": { "hdr": "ul",
+                             "elt": ["li"] },
+              "numbered":  { "hdr": "ol",
+                             "elt": ["li"] },
+              "defn":      { "hdr": "dl",
+                             "elt": ["dt","dd"] } }    
 
     def mktgt(self, tgt, lang = None):
         if not lang:
@@ -160,13 +163,14 @@ class HtmlWikiMarkup (WikiMarkup):
             lev = 2
         string = ""
         for s in elt[3]:
-            x = self.format(s)
-            string += "<%s>%s</%s>" % (self.envel[type],
-                                       self.format(s),
-                                       self.envel[type])
-        return "<%s>%s</%s>" % (self.envhdr[type],
+            n = s[1];
+            string += "<%s>%s</%s>" % (self.envt[type]["elt"][n],
+                                       self.format(s[2]),
+                                       self.envt[type]["elt"][n])
+        return "<%s>%s</%s>" % (self.envt[type]["hdr"],
                                 string,
-                                self.envhdr[type])
+                                self.envt[type]["hdr"])
+        return string
 
     def str_para(self, elt):
         string = "";