Cleaned up the nw/convert folder a bit

2019-10-26 22:24:59 +02:00
parent b9608dcdbd
commit 753b248b9f
11 changed files with 143 additions and 115 deletions
@@ -276,97 +276,6 @@ class Tokenizer():

        return

-    def doConvert(self):
-        """Converts the tokenized text into plain text.
-        """
-
-        if self.wordWrap > 0:
-            tWrap = textwrap.TextWrapper(
-                width                = self.wordWrap,
-                initial_indent       = "",
-                subsequent_indent    = "",
-                expand_tabs          = True,
-                replace_whitespace   = True,
-                fix_sentence_endings = False,
-                break_long_words     = True,
-                drop_whitespace      = True,
-                break_on_hyphens     = True,
-                tabsize              = 8,
-                max_lines            = None
-            )
-
-        self.theResult = ""
-        thisPar = []
-        for tType, tText, tFormat, tAlign in self.theTokens:
-
-            # First check if we have a comment or plain text, as they need some
-            # extra replacing before we proceed to wrapping and final formatting.
-            if tType == self.T_COMMENT:
-                tText = "[%s]" % tText
-
-            elif tType == self.T_TEXT:
-                tTemp = tText
-                for xPos, xLen, xFmt in reversed(tFormat):
-                    tTemp = tTemp[:xPos]+tTemp[xPos+xLen:]
-                tText = tTemp
-
-            tLen = len(tText)
-
-            # The text can now be word wrapped, if we have requested this and it's needed.
-            if tAlign == self.A_CENTRE:
-                if self.wordWrap > 0:
-                    if tLen > self.wordWrap:
-                        aText = tWrap.wrap(tText)
-                        for n in range(len(aText)):
-                            aText[n] = self._centreText(aText[n],self.wordWrap)
-                        tText = "\n".join(aText)
-                    else:
-                        tText = self._centreText(tText,self.wordWrap)
-            else:
-                if self.wordWrap > 0 and tLen > self.wordWrap:
-                    tText = tWrap.fill(tText)
-
-            # Then the text can receive final formatting before we append it to the results.
-            # We also store text lines in a buffer and merge them only when we find an empty line,
-            # indicating a new paragraph.
-            if tType == self.T_EMPTY:
-                if len(thisPar) > 0:
-                    self.theResult += "%s\n\n" % " ".join(thisPar)
-                thisPar = []
-
-            elif tType == self.T_HEAD1:
-                uLine = "="*min(tLen,self.wordWrap)
-                if tAlign == self.A_CENTRE:
-                    uLine = self._centreText(uLine,self.wordWrap)
-                self.theResult += "%s\n%s\n\n" % (tText,uLine)
-
-            elif tType == self.T_HEAD2:
-                uLine = "~"*min(tLen,self.wordWrap)
-                self.theResult += "%s\n%s\n\n" % (tText,uLine)
-
-            elif tType == self.T_HEAD3:
-                uLine = "-"*min(tLen,self.wordWrap)
-                self.theResult += "%s\n%s\n\n" % (tText,uLine)
-
-            elif tType == self.T_HEAD4:
-                self.theResult += "%s\n\n" % tText
-
-            elif tType == self.T_SEP:
-                if self.wordWrap > 0 and tLen < self.wordWrap:
-                    tText = self._centreText(tText,self.wordWrap)
-                self.theResult += "%s\n\n" % tText
-
-            elif tType == self.T_TEXT:
-                thisPar.append(tText)
-
-            elif tType == self.T_COMMENT and self.doComments:
-                self.theResult += "%s\n\n" % tText
-
-            elif tType == self.T_COMMAND and self.doCommands:
-                self.theResult += "%s\n\n" % tText
-
-        return
-
    def windowsEndings(self):
        self.theResult = self.theResult.replace("\n","\r\n")
        return