Added back in strikethrough support

nw/core/tohtml.py

@@ -116,14 +116,28 @@ class ToHtml(Tokenizer):
         """Convert the list of text tokens into a HTML document saved
         to theResult.
         """
-        htmlTags = {
-            self.FMT_B_B : "<strong>",
-            self.FMT_B_E : "</strong>",
-            self.FMT_I_B : "<em>",
-            self.FMT_I_E : "</em>",
-            self.FMT_S_B : "<strong><em>",
-            self.FMT_S_E : "</em></strong>",
-        }
+        if self.genMode == self.M_PREVIEW:
+            htmlTags = {     # HTML4 + CSS2
+                self.FMT_B_B : "<b>",
+                self.FMT_B_E : "</b>",
+                self.FMT_I_B : "<i>",
+                self.FMT_I_E : "</i>",
+                self.FMT_S_B : "<b><i>",
+                self.FMT_S_E : "</i></b>",
+                self.FMT_D_B : "<span style='text-decoration: line-through;'>",
+                self.FMT_D_E : "</span>",
+            }
+        else:
+            htmlTags = {     # HTML5
+                self.FMT_B_B : "<strong>",
+                self.FMT_B_E : "</strong>",
+                self.FMT_I_B : "<em>",
+                self.FMT_I_E : "</em>",
+                self.FMT_S_B : "<strong><em>",
+                self.FMT_S_E : "</em></strong>",
+                self.FMT_D_B : "<del>",
+                self.FMT_D_E : "</del>",
+            }
 
         if self.isNovel and self.genMode != self.M_PREVIEW:
             # For novel files for export, we bump the titles one level

nw/core/tokenizer.py

@@ -46,6 +46,8 @@ class Tokenizer():
     FMT_I_E    =  4 # End italics
     FMT_S_B    =  5 # Begin bold italic
     FMT_S_E    =  6 # End bold italic
+    FMT_D_B    =  7 # Begin strikeout
+    FMT_D_E    =  8 # End strikeout
 
     T_EMPTY    =  1 # Empty line (new paragraph)
     T_SYNOPSIS =  2 # Synopsis comment
@@ -292,16 +294,18 @@ class Tokenizer():
         The format of the token list is an entry with a four-tuple for
         each line in the file. The tuple is as follows:
           1: The type of the block, self.T_*
-          2: The text content of the block, without leading tags
-          3: The internal formatting map of the text, self.FMT_*
-          4: The style of the block, self.A_*
+          2: The line in file where this block occurred
+          3: The text content of the block, without leading tags
+          4: The internal formatting map of the text, self.FMT_*
+          5: The style of the block, self.A_*
         """
 
         # RegExes for adding formatting tags within text lines
         rxFormats = [
-            (QRegularExpression(nwRegEx.FMT_BI), [None, self.FMT_S_B, None, self.FMT_S_E]),
-            (QRegularExpression(nwRegEx.FMT_B),  [None, self.FMT_B_B, None, self.FMT_B_E]),
             (QRegularExpression(nwRegEx.FMT_I),  [None, self.FMT_I_B, None, self.FMT_I_E]),
+            (QRegularExpression(nwRegEx.FMT_B),  [None, self.FMT_B_B, None, self.FMT_B_E]),
+            (QRegularExpression(nwRegEx.FMT_BI), [None, self.FMT_S_B, None, self.FMT_S_E]),
+            (QRegularExpression(nwRegEx.FMT_ST), [None, self.FMT_D_B, None, self.FMT_D_E]),
         ]
 
         self.theTokens = []