Clean up Markdown build code

tests/test_core/test_core_tohtml.py

@@ -316,7 +316,6 @@ def testCoreToHtml_ConvertDirect(mockGUI):
     # Title
     html._tokens = [
         (html.T_TITLE, 1, "A Title", [], html.A_PBB | html.A_CENTRE),
-        (html.T_EMPTY, 1, "", [], html.A_NONE),
     ]
     html.doConvert()
     assert html.result == (
@@ -327,7 +326,6 @@ def testCoreToHtml_ConvertDirect(mockGUI):
     # Unnumbered
     html._tokens = [
         (html.T_HEAD2, 1, "Prologue", [], html.A_PBB),
-        (html.T_EMPTY, 1, "", [], html.A_NONE),
     ]
     html.doConvert()
     assert html.result == (
@@ -341,7 +339,6 @@ def testCoreToHtml_ConvertDirect(mockGUI):
     # Separator
     html._tokens = [
         (html.T_SEP, 1, "* * *", [], html.A_CENTRE),
-        (html.T_EMPTY, 1, "", [], html.A_NONE),
     ]
     html.doConvert()
     assert html.result == "<p class='sep' style='text-align: center;'>* * *</p>\n"
@@ -349,7 +346,6 @@ def testCoreToHtml_ConvertDirect(mockGUI):
     # Skip
     html._tokens = [
         (html.T_SKIP, 1, "", [], html.A_NONE),
-        (html.T_EMPTY, 1, "", [], html.A_NONE),
     ]
     html.doConvert()
     assert html.result == "<p class='skip'>&nbsp;</p>\n"
@@ -425,8 +421,7 @@ def testCoreToHtml_ConvertDirect(mockGUI):
 
     # Indent Left
     html._tokens = [
-        (html.T_TEXT,  1, "Some text ...", [], html.A_IND_L),
-        (html.T_EMPTY, 2, "", [], html.A_NONE),
+        (html.T_TEXT, 1, "Some text ...", [], html.A_IND_L),
     ]
     html.doConvert()
     assert html.result == (
@@ -435,8 +430,7 @@ def testCoreToHtml_ConvertDirect(mockGUI):
 
     # Indent Right
     html._tokens = [
-        (html.T_TEXT,  1, "Some text ...", [], html.A_IND_R),
-        (html.T_EMPTY, 2, "", [], html.A_NONE),
+        (html.T_TEXT, 1, "Some text ...", [], html.A_IND_R),
     ]
     html.doConvert()
     assert html.result == (

tests/test_core/test_core_tokenizer.py

@@ -1835,7 +1835,7 @@ def testCoreToken_SceneSeparators(mockGUI):
     # ===========================
     # Requires a fresh builder class
     md = ToMarkdown(project)
-    md.setExtendedMarkdown()
+    md.setExtendedMarkdown(True)
     md._isNovel = True
 
     md._text = (

tests/test_core/test_core_tomarkdown.py

@@ -82,7 +82,7 @@ def testCoreToMarkdown_ConvertParagraphs(mockGUI):
     toMD._isFirst = True
 
     # Text for Extended Markdown
-    toMD.setExtendedMarkdown()
+    toMD.setExtendedMarkdown(True)
     toMD._text = "Some **nested bold and _italic_ and ~~strikethrough~~ text** here\n"
     toMD.tokenizeText()
     toMD.doConvert()
@@ -91,7 +91,7 @@ def testCoreToMarkdown_ConvertParagraphs(mockGUI):
     )
 
     # Text for Standard Markdown
-    toMD.setStandardMarkdown()
+    toMD.setExtendedMarkdown(False)
     toMD._text = "Some **nested bold and _italic_ and ~~strikethrough~~ text** here\n"
     toMD.tokenizeText()
     toMD.doConvert()
@@ -100,7 +100,7 @@ def testCoreToMarkdown_ConvertParagraphs(mockGUI):
     )
 
     # Shortcodes for Extended Markdown
-    toMD.setExtendedMarkdown()
+    toMD.setExtendedMarkdown(True)
     toMD._text = (
         "Some [b]bold[/b], [i]italic[/i], [s]strike[/s], [u]underline[/u], [m]mark[/m], "
         "super[sup]script[/sup], sub[sub]script[/sub] here\n"
@@ -113,7 +113,7 @@ def testCoreToMarkdown_ConvertParagraphs(mockGUI):
     )
 
     # Shortcodes for Standard Markdown
-    toMD.setStandardMarkdown()
+    toMD.setExtendedMarkdown(False)
     toMD._text = (
         "Some [b]bold[/b], [i]italic[/i], [s]strike[/s], [u]underline[/u], [m]mark[/m], "
         "super[sup]script[/sup], sub[sub]script[/sub] here\n"
@@ -215,6 +215,7 @@ def testCoreToMarkdown_ConvertDirect(mockGUI):
     toMD = ToMarkdown(project)
 
     toMD._isNovel = True
+    toMD.setExtendedMarkdown(False)
 
     # Special Titles
     # ==============
@@ -222,7 +223,6 @@ def testCoreToMarkdown_ConvertDirect(mockGUI):
     # Title
     toMD._tokens = [
         (toMD.T_TITLE, 1, "A Title", [], toMD.A_PBB | toMD.A_CENTRE),
-        (toMD.T_EMPTY, 1, "", [], toMD.A_NONE),
     ]
     toMD.doConvert()
     assert toMD.result == "# A Title\n\n"
@@ -233,7 +233,6 @@ def testCoreToMarkdown_ConvertDirect(mockGUI):
     # Separator
     toMD._tokens = [
         (toMD.T_SEP, 1, "* * *", [], toMD.A_CENTRE),
-        (toMD.T_EMPTY, 1, "", [], toMD.A_NONE),
     ]
     toMD.doConvert()
     assert toMD.result == "* * *\n\n"
@@ -241,7 +240,6 @@ def testCoreToMarkdown_ConvertDirect(mockGUI):
     # Skip
     toMD._tokens = [
         (toMD.T_SKIP, 1, "", [], toMD.A_NONE),
-        (toMD.T_EMPTY, 1, "", [], toMD.A_NONE),
     ]
     toMD.doConvert()
     assert toMD.result == "\n\n"

tests/test_core/test_core_toodt.py

@@ -683,7 +683,6 @@ def testCoreToOdt_ConvertDirect(mockGUI):
     doc = ToOdt(project, isFlat=True)
     doc._tokens = [
         (doc.T_TEXT, 1, "This is a paragraph", [], doc.A_JUSTIFY),
-        (doc.T_EMPTY, 1, "", [], doc.A_NONE),
     ]
     doc.initDocument()
     doc.doConvert()
@@ -704,7 +703,6 @@ def testCoreToOdt_ConvertDirect(mockGUI):
     doc = ToOdt(project, isFlat=True)
     doc._tokens = [
         (doc.T_TEXT, 1, "This is a paragraph", [], doc.A_PBA),
-        (doc.T_EMPTY, 1, "", [], doc.A_NONE),
     ]
     doc.initDocument()
     doc.doConvert()

tests/test_tools/test_tools_manussettings.py

@@ -677,13 +677,11 @@ def testBuildSettings_Output(qtbot, nwGUI):
     assert outTab.odtPageCountOffset.value() == 0
     assert outTab.htmlAddStyles.isChecked() is False
     assert outTab.htmlPreserveTabs.isChecked() is False
-    assert outTab.mdPreserveBreaks.isChecked() is True
 
     # Toggle all
     outTab.odtAddColours.setChecked(True)
     outTab.htmlAddStyles.setChecked(True)
     outTab.htmlPreserveTabs.setChecked(True)
-    outTab.mdPreserveBreaks.setChecked(False)
 
     # Change Values
     outTab.odtPageCountOffset.setValue(1)
@@ -697,7 +695,6 @@ def testBuildSettings_Output(qtbot, nwGUI):
     assert build.getInt("odt.pageCountOffset") == 1
     assert build.getBool("html.addStyles") is True
     assert build.getBool("html.preserveTabs") is True
-    assert build.getBool("md.preserveBreaks") is False
 
     # Reset header format
     outTab.btnPageHeader.click()