eric: comparison UI/Previewers/PreviewerHTML.py

-:159e6057ad34
+:9ef6a28f1694
 """
 from __future__ import unicode_literals
 try:  # Only for Py2
-basestring
 import StringIO as io   # __IGNORE_EXCEPTION__
 except (ImportError, NameError):
 import io       # __IGNORE_WARNING__
 import os
 if bool(editor.text()):
 self.__processingThread.process(
 fn, language, editor.text(),
 self.ssiCheckBox.isChecked(), rootPath,
-Preferences.getEditor("PreviewRestUseSphinx"))
+Preferences.getEditor("PreviewRestUseSphinx"),
+Preferences.getEditor("PreviewMarkdownNLtoBR"),
+Preferences.getEditor("PreviewMarkdownHTMLFormat"),
+Preferences.getEditor("PreviewRestDocutilsHTMLFormat"))
 def __setHtml(self, filePath, html):
 """
 Private method to set the HTML to the view and restore the scroll bars
 positions.
 super(PreviewProcessingThread, self).__init__()
 self.__lock = threading.Lock()
 def process(self, filePath, language, text, ssiEnabled, rootPath,
-useSphinx):
+useSphinx, convertNewLineToBreak, markdownHtmlFormat,
+restDocutilsHtmlFormat):
 """
 Public method to convert the given text to HTML.
 @param filePath file path of the text (string)
 @param language language of the text (string)
 @param ssiEnabled flag indicating to do some (limited) SSI processing
 (boolean)
 @param rootPath root path to be used for SSI processing (str)
 @param useSphinx flag indicating to use Sphinx to generate the
 ReST preview (boolean)
+@param convertNewLineToBreak flag indicating to convert new lines
+to HTML break (Markdown only) (boolean)
+@param markdownHtmlFormat HTML format to be generated by markdown
+(string)
+@param restDocutilsHtmlFormat HTML format to be generated by docutils
+(string)
 """
 with self.__lock:
 self.__filePath = filePath
 self.__language = language
 self.__text = text
 self.__ssiEnabled = ssiEnabled
 self.__rootPath = rootPath
 self.__haveData = True
 self.__useSphinx = useSphinx
+self.__convertNewLineToBreak = convertNewLineToBreak
+self.__markdownHtmlFormat = markdownHtmlFormat
+self.__restDocutilsHtmlFormat = restDocutilsHtmlFormat
 if not self.isRunning():
 self.start(QThread.LowPriority)
 def run(self):
 """
 language = self.__language
 text = self.__text
 ssiEnabled = self.__ssiEnabled
 rootPath = self.__rootPath
 useSphinx = self.__useSphinx
+convertNewLineToBreak = self.__convertNewLineToBreak
+markdownHtmlFormat = self.__markdownHtmlFormat
+restDocutilsHtmlFormat = self.__restDocutilsHtmlFormat
 self.__haveData = False
 html = self.__getHtml(language, text, ssiEnabled, filePath,
-rootPath, useSphinx)
+rootPath, useSphinx, convertNewLineToBreak,
+markdownHtmlFormat, restDocutilsHtmlFormat)
 with self.__lock:
 if not self.__haveData:
 self.htmlReady.emit(filePath, html)
 break
 # else - next iteration
 def __getHtml(self, language, text, ssiEnabled, filePath, rootPath,
-useSphinx):
+useSphinx, convertNewLineToBreak, markdownHtmlFormat,
+restDocutilsHtmlFormat):
 """
 Private method to process the given text depending upon the given
 language.
 @param language language of the text (string)
 (boolean)
 @param filePath file path of the text (string)
 @param rootPath root path to be used for SSI processing (str)
 @param useSphinx flag indicating to use Sphinx to generate the
 ReST preview (boolean)
+@param convertNewLineToBreak flag indicating to convert new lines
+to HTML break (Markdown only) (boolean)
+@param markdownHtmlFormat HTML format to be generated by markdown
+(string)
+@param restDocutilsHtmlFormat HTML format to be generated by docutils
+(string)
 @return processed HTML text (string)
 """
 if language == "HTML":
 if ssiEnabled:
 return self.__processSSI(text, filePath, rootPath)
 else:
 return text
 elif language == "Markdown":
-return self.__convertMarkdown(text)
+return self.__convertMarkdown(text, convertNewLineToBreak,
+markdownHtmlFormat)
 elif language == "ReST":
-return self.__convertReST(text, useSphinx)
+return self.__convertReST(text, useSphinx, restDocutilsHtmlFormat)
 else:
 return self.tr(
 "<p>No preview available for this type of file.</p>")
 def __processSSI(self, txt, filename, root):
 incTxt = ""
 txt = txt[:incMatch.start(0)] + incTxt + txt[incMatch.end(0):]
 return txt
-def __convertReST(self, text, useSphinx):
+def __convertReST(self, text, useSphinx, restDocutilsHtmlFormat):
 """
 Private method to convert ReST text into HTML.
 @param text text to be processed (string)
 @param useSphinx flag indicating to use Sphinx to generate the
 ReST preview (boolean)
+@param restDocutilsHtmlFormat HTML format to be generated by docutils
+(string)
 @return processed HTML (string)
 """
 if useSphinx:
 return self.__convertReSTSphinx(text)
 else:
-return self.__convertReSTDocutils(text)
+return self.__convertReSTDocutils(text, restDocutilsHtmlFormat)
 def __convertReSTSphinx(self, text):
 """
 Private method to convert ReST text into HTML using 'sphinx'.
 finally:
 shutil.rmtree(tempDir)
 return html
-def __convertReSTDocutils(self, text):
+def __convertReSTDocutils(self, text, htmlFormat):
 """
 Private method to convert ReST text into HTML using 'docutils'.
 @param text text to be processed (string)
+@param htmlFormat HTML format to be generated (string)
 @return processed HTML (string)
 """
 if 'sphinx' in sys.modules:
 # Make sure any Sphinx polution of docutils has been removed.
 unloadKeys = [k for k in sys.modules.keys()
 """this page.</a></p>""")
 # redirect sys.stderr because we are not interested in it here
 origStderr = sys.stderr
 sys.stderr = io.StringIO()
-html = docutils.core.publish_string(text, writer_name='html')\
+html = docutils.core.publish_string(
-.decode("utf-8")
+text, writer_name=htmlFormat.lower()).decode("utf-8")
 sys.stderr = origStderr
 return html
-def __convertMarkdown(self, text):
+def __convertMarkdown(self, text, convertNewLineToBreak, htmlFormat):
 """
 Private method to convert Markdown text into HTML.
 @param text text to be processed (string)
+@param convertNewLineToBreak flag indicating to convert new lines
+to HTML break (Markdown only) (boolean)
+@param htmlFormat HTML format to be generated by markdown (string)
 @return processed HTML (string)
 """
 try:
 import markdown     # __IGNORE_EXCEPTION__
 except ImportError:
 try:
 import mdx_mathjax  # __IGNORE_EXCEPTION__ __IGNORE_WARNING__
 except ImportError:
 #mathjax doesn't require import statement if installed as extension
 pass
-extensions = ['fenced_code', 'nl2br', 'extra']
+if convertNewLineToBreak:
+extensions = ['fenced_code', 'nl2br', 'extra']
+else:
+extensions = ['fenced_code', 'extra']
 # version 2.0 supports only extension names, not instances
 if markdown.version_info[0] > 2 or \
 (markdown.version_info[0] == 2 and
 markdown.version_info[1] > 0):
 md.inlinePatterns.add('del', del_tag, '>not_strong')
 extensions.append(_StrikeThroughExtension())
 try:
-return markdown.markdown(text, extensions + ['mathjax'])
+return markdown.markdown(text, extensions=extensions + ['mathjax'],
+output_format=htmlFormat.lower())
 except (ImportError, ValueError):
 # markdown raises ValueError or ImportError, depends on version
 # It is not clear, how to distinguish missing mathjax from other
 # errors. So keep going without mathjax.
-return markdown.markdown(text, extensions)
+return markdown.markdown(text, extensions=extensions,
+output_format=htmlFormat.lower())

Mercurial Repositories > eric / file comparison

comparison: UI/Previewers/PreviewerHTML.py

UI/Previewers/PreviewerHTML.py