diff -r 56efc13e456e -r 8d8940307e44 UI/Previewers/PreviewerHTML.py
--- a/UI/Previewers/PreviewerHTML.py Sun Jan 01 18:13:13 2017 +0100
+++ b/UI/Previewers/PreviewerHTML.py Mon Jan 02 12:49:04 2017 +0100
@@ -164,13 +164,15 @@
extension = ""
if extension in \
Preferences.getEditor("PreviewHtmlFileNameExtensions") or \
- editor.getLanguage() == "HTML":
+ editor.getLanguage() == "HTML":
language = "HTML"
elif extension in \
- Preferences.getEditor("PreviewMarkdownFileNameExtensions"):
+ Preferences.getEditor("PreviewMarkdownFileNameExtensions") or \
+ editor.getLanguage().lower() == "markdown":
language = "Markdown"
elif extension in \
- Preferences.getEditor("PreviewRestFileNameExtensions"):
+ Preferences.getEditor("PreviewRestFileNameExtensions") or \
+ editor.getLanguage().lower() == "restructuredtext":
language = "ReST"
else:
self.__setHtml(fn, self.tr(
@@ -186,10 +188,11 @@
else:
rootPath = ""
- self.__processingThread.process(
- fn, language, editor.text(),
- self.ssiCheckBox.isChecked(), rootPath,
- Preferences.getEditor("PreviewRestUseSphinx"))
+ if bool(editor.text()):
+ self.__processingThread.process(
+ fn, language, editor.text(),
+ self.ssiCheckBox.isChecked(), rootPath,
+ Preferences.getEditor("PreviewRestUseSphinx"))
def __setHtml(self, filePath, html):
"""
@@ -338,11 +341,6 @@
"""
htmlReady = pyqtSignal(str, str)
- DefaultStaticPath = os.path.join(
- os.path.abspath(os.path.dirname(__file__)), 'sphinx_default')
- StaticRegexp = re.compile(r'(src|href)=["\']_static([\s\w/\.]+?)["\']',
- re.IGNORECASE)
-
def __init__(self, parent=None):
"""
Constructor
@@ -537,13 +535,6 @@
fh.close()
finally:
shutil.rmtree(tempDir)
-
- # Replace the "_static/..." references inserted by Sphinx with absolute
- # links to the specified DefaultStaticPath replacement.
- def replace(m):
- return '{0}="file://{1}{2}"'.format(
- m.group(1), self.DefaultStaticPath, m.group(2))
- html = re.sub(self.StaticRegexp, replace, html)
return html
