diff --git a/CHANGELOG.md b/CHANGELOG.md index 298a451..4078b8b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # 0.4.3 - * Favour Noto Sans font which seems to work better for unicode symbols on Fedora + * Ship Noto Sans Symbols2 font, which seems to work better for unicode symbols on Fedora # 0.4.2 diff --git a/bouquin/fonts/NotoSansSymbols2-Regular.ttf b/bouquin/fonts/NotoSansSymbols2-Regular.ttf new file mode 100644 index 0000000..7816268 Binary files /dev/null and b/bouquin/fonts/NotoSansSymbols2-Regular.ttf differ diff --git a/bouquin/fonts/OFL.txt b/bouquin/fonts/OFL.txt new file mode 100644 index 0000000..106e5d8 --- /dev/null +++ b/bouquin/fonts/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2022 The Noto Project Authors (https://github.com/notofonts/symbols) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +https://openfontlicense.org + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/bouquin/markdown_editor.py b/bouquin/markdown_editor.py index 31dfc82..ef1590e 100644 --- a/bouquin/markdown_editor.py +++ b/bouquin/markdown_editor.py @@ -6,6 +6,7 @@ from pathlib import Path from PySide6.QtGui import ( QFont, + QFontDatabase, QFontMetrics, QImage, QTextCharFormat, @@ -41,11 +42,13 @@ class MarkdownEditor(QTextEdit): self.setAcceptRichText(False) # Normal text - self.qfont = QFont("Noto Sans") - self.qfont.setStyleName("Regular") - self.qfont.setPointSize(11) + base_dir = Path(__file__).resolve().parent + font_path = base_dir / "fonts" / "NotoSansSymbols2-Regular.ttf" + font_id = QFontDatabase.addApplicationFont(str(font_path)) + families = QFontDatabase.applicationFontFamilies(font_id) + font_family = families[0] + self.qfont = QFont(font_family, 11) self.setFont(self.qfont) - self.document().setDefaultFont(self.qfont) self._apply_line_spacing() # 1.25× initial spacing diff --git a/bouquin/markdown_highlighter.py b/bouquin/markdown_highlighter.py index 35b8991..06fa57a 100644 --- a/bouquin/markdown_highlighter.py +++ b/bouquin/markdown_highlighter.py @@ -98,22 +98,12 @@ class MarkdownHighlighter(QSyntaxHighlighter): self.link_format.setFontUnderline(True) self.link_format.setAnchor(True) - # Base size from the document/editor font - doc = self.document() - base_font = doc.defaultFont() if doc is not None else QGuiApplication.font() - base_size = base_font.pointSizeF() - if base_size <= 0: - base_size = 10.0 # fallback - # Checkboxes: make them a bit bigger so they stand out - fixed = QFont("Noto Sans", 11) - fixed.setStyleName("Regular") + # Checkboxes self.checkbox_format = QTextCharFormat() - self.checkbox_format.setFontFamily(fixed.family()) self.checkbox_format.setVerticalAlignment(QTextCharFormat.AlignMiddle) # Bullets self.bullet_format = QTextCharFormat() - self.checkbox_format.setFontFamily(fixed.family()) # Markdown syntax (the markers themselves) - make invisible self.syntax_format = QTextCharFormat()