Minor changes.

* wiki2text.py: The constructor keyword argument markup allows to
inhibit any markup
* wikicvt.py: New command line option -o (--option).
Admit - as input file name.

1 files changed, 15 insertions, 3 deletions

diff --git a/wiki2text.py b/wiki2text.py
index 66563a6..51a7853 100644
--- a/wiki2text.py
+++ b/wiki2text.py
@@ -24,9 +24,15 @@ class TextWikiMarkup (WikiMarkup):
     A (general-purpose Wiki->Text translator class.
     """
 
+    # Output width
     width = 80
-    num = 0
+    # Do not show references.
     references = False
+    # Provide a minimum markup
+    markup = True
+
+    # Number of current element in the environment
+    num = 0
     
     def __init__(self, *args, **keywords):
         WikiMarkup.__init__(self, *args, **keywords)
@@ -34,6 +40,8 @@ class TextWikiMarkup (WikiMarkup):
             self.width = keywords['width']
         if 'refs' in keywords:
             self.references = keywords['refs']
+        if 'markup' in keywords:
+            self.markup = keywords['markup']
             
     def target(self, t):
         (qual,sep,tgt) = t.partition(':')
@@ -86,10 +94,14 @@ class TextWikiMarkup (WikiMarkup):
         return self.xref(self.fmtok(tok[2], env), self.fmtok(tok[1], env))
 
     def str_it(self, tok, env):
-        return "_" + self.fmtok(tok[1], env) + "_"
+        if self.markup:
+            return "_" + self.fmtok(tok[1], env) + "_"
+        return self.fmtok(tok[1], env);
                                           
     def str_bold(self, tok, env):
-        return self.fmtok(tok[1], env).upper()
+        if self.markup:
+            return self.fmtok(tok[1], env).upper()
+        return self.fmtok(tok[1], env);
                                               
     def str_hdr(self, tok, env):
         level = tok[1]