From 6b699b060de765112fa03435b4afbd258262d1fb Mon Sep 17 00:00:00 2001
From: Sergey Poznyakoff <gray@gnu.org.ua>
Date: Fri, 6 Mar 2009 00:13:37 +0200
Subject: Lots of formatting kludges

---
 wiki2html.py |  2 +-
 wiki2text.py | 27 ++++++++++++++++++++-------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/wiki2html.py b/wiki2html.py
index faab18b..63e1ec3 100644
--- a/wiki2html.py
+++ b/wiki2html.py
@@ -155,7 +155,7 @@ class HtmlWikiMarkup (WikiMarkup):
         return "<b>" + self.concat(elt[1]) + "</b>"
                                               
     def str_hdr(self, elt):
-        level = elt[1]
+        level = elt[1] + 1
         if level > 4:
             level = 4
         return "<h%s>%s</h%s>" % (level, self.format(elt[2]), level)
diff --git a/wiki2text.py b/wiki2text.py
index 09bd86a..5fcd718 100644
--- a/wiki2text.py
+++ b/wiki2text.py
@@ -18,6 +18,7 @@
 from wikimarkup import *
 from types import TupleType
 from wikins import wiki_ns_re, wiki_ns
+import re
 import urllib
 
 class TextWikiMarkup (WikiMarkup):
@@ -67,9 +68,17 @@ class TextWikiMarkup (WikiMarkup):
     def fmtlink(self, elt, istmpl):
         arg = self.format(elt[1][0])
         if len(elt[1]) > 1:
-            text = self.format(elt[1][1])
+            s = map(self.format, elt[1])
+            text = s[1]
         else:
+            s = None
             text = None
+
+        if s:
+            if s[0] == 'disambigR':
+                return ""
+            if len(s) > 1 and s[1] == 'thumb':
+                return ""
         (qual,sep,tgt) = arg.partition(':')
         if tgt != '':
             ns = self.wiki_ns_name(qual)
@@ -143,7 +152,7 @@ class TextWikiMarkup (WikiMarkup):
                             string += "  "
                         else:
                             string += " "
-                    string += s.rstrip(" ")
+                    string += s
             else:
                 string = elt[1]
         elif elt[0] == PARA:
@@ -156,7 +165,7 @@ class TextWikiMarkup (WikiMarkup):
             for x in elt[1]:
                 s = self.format(x)
                 if s:
-                    string += " " + s.rstrip(" ")
+                    string += " " + s
             string = "_" + string.lstrip(" ") + "_"
         elif elt[0] == BOLD:
             string = ""
@@ -167,12 +176,16 @@ class TextWikiMarkup (WikiMarkup):
                         string += "  "
                     else:
                         string += " "
-                string += s.rstrip(" ")
+                string += s
             string = string.upper()
         elif elt[0] == LINK:
             string = self.fmtlink(elt, False)
         elif elt[0] == TMPL:
-            string = '[' + self.fmtlink(elt, True) + ']'
+            s = self.fmtlink(elt, True)
+            if s:
+                string = '[' + s + ']'
+            else:
+                string = s
         elif elt[0] == BAR:
             w = self.width
             if w < 5:
@@ -196,9 +209,9 @@ class TextWikiMarkup (WikiMarkup):
                     string += "\n"
                 x = self.format(s)
                 if type == ENVUNNUM:
-                    string += self.indent(lev, "- " + x.lstrip(" "))
+                    string += self.fmtpara(self.indent(lev, "- " + x.lstrip(" ")))
                 elif type == ENVNUM:
-                    string += self.indent(lev, "%d. %s" % (n, x)) 
+                    string += self.fmtpara(self.indent(lev, "%d. %s" % (n, x)))
                     n += 1
             if not string.endswith("\n"):
                 string += "\n"
-- 
cgit v1.2.1