Merge pull request #260 from vkbo/fixes

Fixes
This commit is contained in:
Veronica K. Berglyd Olsen
2020-05-29 21:07:55 +02:00
committed by GitHub
3 changed files with 9 additions and 4 deletions
+3 -2
View File
@@ -183,10 +183,11 @@ class nwQuotes():
# END Class nwQuotes # END Class nwQuotes
class nwUnicode: class nwUnicode:
"""Suppoted unicode character constants and translation maps. """Suppoted unicode character constants and translation maps for HTML.
""" """
# Unicode Constants # Unicode Constants
# =================
## Quotation Marks ## Quotation Marks
U_QUOT = "\u0022" # Quotation mark U_QUOT = "\u0022" # Quotation mark
@@ -216,7 +217,6 @@ class nwUnicode:
## Other ## Other
U_NBSP = "\u00a0" # Non-breaking space U_NBSP = "\u00a0" # Non-breaking space
U_PARA = "\u2029" # Paragraph separator
U_CHECK = "\u2714" # Heavy check mark U_CHECK = "\u2714" # Heavy check mark
U_MULT = "\u2715" # Multiplication x U_MULT = "\u2715" # Multiplication x
@@ -231,6 +231,7 @@ class nwUnicode:
U_LTRIS = "\u25c2" # Left-pointing triangle, small U_LTRIS = "\u25c2" # Left-pointing triangle, small
# HTML Equivalents # HTML Equivalents
# ================
## Quotes ## Quotes
H_QUOT = """ H_QUOT = """
+1 -1
View File
@@ -573,7 +573,7 @@ class GuiConfigEditEditingTab(QWidget):
"Big document limit", "Big document limit",
self.bigDocLimit, self.bigDocLimit,
"Disables full spell checking over the size limit.", "Disables full spell checking over the size limit.",
theUnit="kb" theUnit="kB"
) )
return return
+5 -1
View File
@@ -391,9 +391,13 @@ class GuiDocEditor(QTextEdit):
uses QTextEdit->toPlainText for Qt versions lower than 5.9, and uses QTextEdit->toPlainText for Qt versions lower than 5.9, and
the QDocument->toRawText for higher version. The latter the QDocument->toRawText for higher version. The latter
preserves non-breaking spaces, which the former does not. preserves non-breaking spaces, which the former does not.
We still want to get rid of page and line separators though.
See: https://doc.qt.io/qt-5/qtextdocument.html#toPlainText
""" """
if self.mainConf.verQtValue >= 50900: if self.mainConf.verQtValue >= 50900:
theText = self.qDocument.toRawText().replace(nwUnicode.U_PARA,"\n") theText = self.qDocument.toRawText()
theText = theText.replace("\u2028", "\n") # Line separators
theText = theText.replace("\u2029", "\n") # Paragraph separators
else: else:
theText = self.toPlainText() theText = self.toPlainText()
return theText return theText