Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added editor highlighting for markdown.

Browse Source
This commit is contained in:
Veronica K. B. Olsen
2019-04-06 16:50:42 +02:00
parent 7126e59bc7
commit aee91ef925
4 changed files with 155 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nw/gui/doceditor.py
+26 -19
View File
@@ -13,9 +13,11 @@
import logging
import nw
from PyQt5.QtWidgets import QWidget, QTextEdit, QHBoxLayout, QVBoxLayout, QFrame, QSplitter, QToolBar, QAction, QScrollArea
from PyQt5.QtCore import Qt, QSize, QSizeF
from PyQt5.QtGui import QIcon, QFont
from PyQt5.QtWidgets import QWidget, QTextEdit, QHBoxLayout, QVBoxLayout, QFrame, QSplitter, QToolBar, QAction, QScrollArea
from PyQt5.QtCore import Qt, QSize, QSizeF
from PyQt5.QtGui import QIcon, QFont, QTextCursor, QTextFormat, QTextBlockFormat
from nw.gui.dochighlight import GuiDocHighlighter
logger = logging.getLogger(__name__)
@@ -31,6 +33,8 @@ class GuiDocEditor(QWidget):
self.guiEditor = QTextEdit()
self.guiEditor.setVerticalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
self.hLight = GuiDocHighlighter(self.guiEditor.document())
self.setLayout(self.outerBox)
self.metaPane = QFrame()
@@ -55,29 +59,32 @@ class GuiDocEditor(QWidget):
# self.guiEditor.setFixedWidth(600)
self.guiEditor.setMinimumWidth(600)
self.guiEditor.setAcceptRichText(False)
# self.guiEditor.setCurrentFont(self.docFont)
# self.guiEditor.setContentsMargins(20,20,20,20)
self.guiEditor.setStyleSheet(
"QTextEdit {background-color: #ffffff;};"
)
self.guiEditor.setStyleSheet("""
QTextEdit {
background-color: #ffffff;
}
""")
theDoc = self.guiEditor.document()
theDoc.setDefaultFont(QFont("Source Sans Pro",13))
theDoc.setDocumentMargin(20)
theDoc.setTextWidth(600)
# theDoc.setPageSize(QSizeF(600,600))
theDoc.setDefaultStyleSheet("""
body {
background-color: #ffffff;
}
p {
text-indent: 0px;
margin: 4px 0px;
text-align: justify;
}
p+p {
text-indent: 40px;
}
""")
# theDoc.setDefaultStyleSheet("""
# body {
# background-color: #ffffff;
# }
# p {
# text-indent: 0px;
# margin: 4px 0px;
# text-align: justify;
# }
# p+p {
# text-indent: 40px;
# }
# """)
logger.debug("DocEditor initialisation complete")
nw/gui/dochighlight.py
+108
View File
@@ -0,0 +1,108 @@
# -*- coding: utf-8 -*
"""novelWriter GUI Document Highlighter
novelWriter – GUI Document Highlighter
========================================
Syntax highlighting for MarkDown
File History:
Created: 2019-04-06 [0.0.1]
"""
import logging
import nw
from PyQt5.QtCore import QRegularExpression
from PyQt5.QtGui import QColor, QTextCharFormat, QFont, QSyntaxHighlighter
logger = logging.getLogger(__name__)
class GuiDocHighlighter(QSyntaxHighlighter):
def __init__(self, theDoc):
QSyntaxHighlighter.__init__(self, theDoc)
logger.debug("Initialising DocHighlighter ...")
self.mainConf = nw.CONFIG
self.theDoc = theDoc
self.hStyles = {
"header1" : self._makeFormat(( 0, 0,200,255),"bold",20),
"header2" : self._makeFormat(( 0, 0,200,255),"bold",18),
"header3" : self._makeFormat(( 0, 0,200,255),"bold",16),
"header4" : self._makeFormat(( 0, 0,200,255),"bold",14),
"bold" : self._makeFormat((192,150, 0,255),"bold"),
"italic" : self._makeFormat(( 0, 0, 0,255),"italic"),
"strike" : self._makeFormat(( 0, 0, 0,255),"strike"),
"underline" : self._makeFormat(( 0, 0, 0,255),"underline"),
"dialogue" : self._makeFormat(( 0,150, 0,255)),
"hidden" : self._makeFormat((100,100,100,255)),
"keyword" : self._makeFormat((192,150, 0,255)),
"value" : self._makeFormat(( 0,150, 0,255)),
}
self.hRules = [
(r"^#{1}[^#].*[^\n]", 0, self.hStyles["header1"]),
(r"^#{2}[^#].*[^\n]", 0, self.hStyles["header2"]),
(r"^#{3}[^#].*[^\n]", 0, self.hStyles["header3"]),
(r"^#{4}[^#].*[^\n]", 0, self.hStyles["header4"]),
(r"\*{2}(.+?)\*{2}", 0, self.hStyles["bold"]),
(r"\/{2}(.+?)\/{2}", 0, self.hStyles["italic"]),
(r"~{2}(.+?)~{2}", 0, self.hStyles["strike"]),
(r"_{2}(.+?)_{2}", 0, self.hStyles["underline"]),
(r'"(.+?)"', 0, self.hStyles["dialogue"]),
(r"«(.+?)»", 0, self.hStyles["dialogue"]),
(r"“(.+?)”", 0, self.hStyles["dialogue"]),
(r"^(@.+?)\s*:\s*(.+?)$", 1, self.hStyles["keyword"]),
(r"^(@.+?)\s*:\s*(.+?)$", 2, self.hStyles["value"]),
(r"^%.*$", 0, self.hStyles["hidden"]),
]
# Build a QRegExp for each pattern
self.rules = [(QRegularExpression(a),b,c) for (a,b,c) in self.hRules]
logger.debug("DocHighlighter initialisation complete")
return
def _makeFormat(self, fmtCol=None, fmtStyle=None, fmtSize=None):
theFormat = QTextCharFormat()
if fmtCol is not None:
theCol = QColor()
if isinstance(fmtCol,str):
theCol.setNamedColor(fmtCol)
else:
theCol.setRgb(*fmtCol)
theFormat.setForeground(theCol)
if fmtStyle is not None:
if "bold" in fmtStyle:
theFormat.setFontWeight(QFont.Bold)
if "italic" in fmtStyle:
theFormat.setFontItalic(True)
if "strike" in fmtStyle:
theFormat.setFontStrikeOut(True)
if "underline" in fmtStyle:
theFormat.setFontUnderline(True)
if isinstance(fmtSize,int):
theFormat.setFontPointSize(fmtSize)
return theFormat
def highlightBlock(self, theText):
for rX, nth, fmt in self.rules:
rxItt = rX.globalMatch(theText, 0)
while rxItt.hasNext():
rxMatch = rxItt.next()
xPos = rxMatch.capturedStart(nth)
xLen = rxMatch.capturedLength(nth)
# logger.verbose("Captured[%d]: '%s'" % (nth,rxMatch.captured(nth)))
# print(rxMatch.capturedTexts())
self.setFormat(xPos, xLen, fmt)
self.setCurrentBlockState(0)
# END Class DocHighlighter