Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-08 18:54:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

improve HorizontalLine/HeaderLine

Browse Source
This commit is contained in:
un-pogaz 2023-04-27 14:19:48 +02:00
parent 80dace9d43
commit e18950ea04
1 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/calibre/gui2/markdown_syntax_highlighter.py
View File

@ -29,8 +29,8 @@ class MarkdownHighlighter(QSyntaxHighlighter):
'BlockQuote': re.compile(r'(?u)^\s*>+\s*'), 'BlockQuote': re.compile(r'(?u)^\s*>+\s*'),
'BlockQuoteCount': re.compile('^[ \t]*>[ \t]?'), 'BlockQuoteCount': re.compile('^[ \t]*>[ \t]?'),
'CodeSpan': re.compile('(?P<delim>`+).+?(?P=delim)'), 'CodeSpan': re.compile('(?P<delim>`+).+?(?P=delim)'),
'HR': re.compile(r'(?u)^(\s*(\*|-)\s*){3,}$'), 'HeaderLine': re.compile(r'(?u)^(\s*(-|=)\s*){3,}$'),
'eHR': re.compile(r'(?u)^(\s*(\*|=)\s*){3,}$'), 'HR': re.compile(r'(?u)^(\s*(\*|-|_)\s*){3,}$'),
'Html': re.compile('<.+?>') 'Html': re.compile('<.+?>')
} }
@ -43,6 +43,7 @@ class MarkdownHighlighter(QSyntaxHighlighter):
'Image': "image", 'Image': "image",
'HeaderAtx': "header", 'HeaderAtx': "header",
'Header': "header", 'Header': "header",
'HeaderLine': "header",
'CodeBlock': "codeblock", 'CodeBlock': "codeblock",
'UnorderedList': "unorderedlist", 'UnorderedList': "unorderedlist",
'UnorderedListStar': "unorderedlist", 'UnorderedListStar': "unorderedlist",
@ -51,7 +52,6 @@ class MarkdownHighlighter(QSyntaxHighlighter):
'BlockQuoteCount': "blockquote", 'BlockQuoteCount': "blockquote",
'CodeSpan': "codespan", 'CodeSpan': "codespan",
'HR': "line", 'HR': "line",
'eHR': "line",
'Html': "html", 'Html': "html",
} }
@ -166,23 +166,8 @@ class MarkdownHighlighter(QSyntaxHighlighter):
def highlightHorizontalLine(self, text, cursor, bf, strt): def highlightHorizontalLine(self, text, cursor, bf, strt):
found = False found = False
for mo in re.finditer(self.MARKDOWN_KEYS_REGEX['HR'],text):
prevBlock = self.currentBlock().previous()
prevCursor = QTextCursor(prevBlock)
prev = prevBlock.text()
prevAscii = str(prev.replace('\u2029','\n'))
if prevAscii.strip():
#print "Its a header"
prevCursor.select(QTextCursor.SelectionType.LineUnderCursor)
#prevCursor.setCharFormat(self.MARKDOWN_KWS_FORMAT['Header'])
formatRange = QTextLayout.FormatRange()
formatRange.format = self.MARKDOWN_KWS_FORMAT['Header']
formatRange.length = prevCursor.block().length()
formatRange.start = 0
prevCursor.block().layout().setFormats([formatRange])
self.setFormat(mo.start()+strt, mo.end() - mo.start(), self.MARKDOWN_KWS_FORMAT['HR'])
for mo in re.finditer(self.MARKDOWN_KEYS_REGEX['eHR'],text): for mo in re.finditer(self.MARKDOWN_KEYS_REGEX['HeaderLine'],text):
prevBlock = self.currentBlock().previous() prevBlock = self.currentBlock().previous()
prevCursor = QTextCursor(prevBlock) prevCursor = QTextCursor(prevBlock)
prev = prevBlock.text() prev = prevBlock.text()
@ -192,11 +177,16 @@ class MarkdownHighlighter(QSyntaxHighlighter):
prevCursor.select(QTextCursor.SelectionType.LineUnderCursor) prevCursor.select(QTextCursor.SelectionType.LineUnderCursor)
#prevCursor.setCharFormat(self.MARKDOWN_KWS_FORMAT['Header']) #prevCursor.setCharFormat(self.MARKDOWN_KWS_FORMAT['Header'])
formatRange = QTextLayout.FormatRange() formatRange = QTextLayout.FormatRange()
formatRange.format = self.MARKDOWN_KWS_FORMAT['Header'] formatRange.format = self.MARKDOWN_KWS_FORMAT['HeaderLine']
formatRange.length = prevCursor.block().length() formatRange.length = prevCursor.block().length()
formatRange.start = 0 formatRange.start = 0
prevCursor.block().layout().setFormats([formatRange]) prevCursor.block().layout().setFormats([formatRange])
self.setFormat(mo.start()+strt, mo.end() - mo.start(), self.MARKDOWN_KWS_FORMAT['HeaderLine'])
return True
for mo in re.finditer(self.MARKDOWN_KEYS_REGEX['HR'],text):
self.setFormat(mo.start()+strt, mo.end() - mo.start(), self.MARKDOWN_KWS_FORMAT['HR']) self.setFormat(mo.start()+strt, mo.end() - mo.start(), self.MARKDOWN_KWS_FORMAT['HR'])
found = True
return found return found
def highlightAtxHeader(self, text, cursor, bf, strt): def highlightAtxHeader(self, text, cursor, bf, strt):