diff --git a/nw/convert/tohtml.py b/nw/convert/tohtml.py index da97242a..98835a9a 100644 --- a/nw/convert/tohtml.py +++ b/nw/convert/tohtml.py @@ -73,7 +73,6 @@ class ToHtml(Tokenizer): self.theResult += "%s\n" % (hStyle,tText) elif tType == self.T_HEAD3: - print(tText) self.theResult += "%s\n" % (hStyle,tText) elif tType == self.T_HEAD4: diff --git a/nw/convert/tokenizer.py b/nw/convert/tokenizer.py index 93366888..2636b2e9 100644 --- a/nw/convert/tokenizer.py +++ b/nw/convert/tokenizer.py @@ -26,12 +26,12 @@ logger = logging.getLogger(__name__) class Tokenizer(): - FMT_B_B = "" # Begin bold - FMT_B_E = "" # End bold - FMT_I_B = "" # Begin italics - FMT_I_E = "" # End italics - FMT_U_B = "" # Begin underline - FMT_U_E = "" # End underline + FMT_B_B = 1 # Begin bold + FMT_B_E = 2 # End bold + FMT_I_B = 3 # Begin italics + FMT_I_E = 4 # End italics + FMT_U_B = 5 # Begin underline + FMT_U_E = 6 # End underline T_EMPTY = 1 # Empty line (new paragraph) T_COMMENT = 2 # Comment line diff --git a/nw/convert/tomarkdown.py b/nw/convert/tomarkdown.py index c7aa54de..50db3d9c 100644 --- a/nw/convert/tomarkdown.py +++ b/nw/convert/tomarkdown.py @@ -27,7 +27,7 @@ class ToMarkdown(Tokenizer): def doConvert(self): - htmlTags = { + mdTags = { self.FMT_B_B : "**", self.FMT_B_E : "**", self.FMT_I_B : "_", @@ -63,7 +63,7 @@ class ToMarkdown(Tokenizer): elif tType == self.T_TEXT: tTemp = tText for xPos, xLen, xFmt in reversed(tFormat): - tTemp = tTemp[:xPos]+tTemp[xPos+xLen:] + tTemp = tTemp[:xPos]+mdTags[xFmt]+tTemp[xPos+xLen:] tText = tTemp tLen = len(tText)