Skip to content

Commit

Permalink
Small update ⚾
Browse files Browse the repository at this point in the history
- Removing Plex
- Adding Trykker and Sofia Sans
- Updating Readme/To-Do/Notes
  • Loading branch information
fairybow committed Mar 13, 2023
1 parent 80d5cb5 commit 8a5e279
Show file tree
Hide file tree
Showing 15 changed files with 198 additions and 7 deletions.
5 changes: 5 additions & 0 deletions Fernanda/docs/Notes.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
### Qt MT Options
- Qt Positioning
- Qt WebChannel
- Qt WebEngine

### Old shields

<p align="center">
Expand Down
8 changes: 8 additions & 0 deletions Fernanda/docs/To-do.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# To-do

## General
- [ ] Convert two liners to one liners where applicable (when early return on a single liner)
- [ ] Startup "recovery" folder (if active temp exists and has contents, move it to recovery location)
- [ ] Add known issues, and relevant things, to GitHub issues
- [ ] An "appearance" menu popup, with the themes and font size slider, adding system fonts selection (plus a SMALLER amount of fonts Fernanda comes with, with Mononoki as default), then remove custom fonts feature
- [ ] Remove blank switch options
- [ ] Double-up on identical switch cases
- [ ] Export All vs Export Selected/Single
Expand Down Expand Up @@ -92,6 +96,8 @@
- [ ] Wrap for parentheses and other closables
- [ ] If a filter was just applied, backspace should function as undo
- [ ] Make thin cursor change color when there's a selection?
- [ ] Weight slider
- [ ] Then remove fonts that can't accomodate - be picky!
- [x] ~~Animate scroll bar~~
- [x] ~~Typewriter mode~~
- [x] ~~Avoid passing entire document for cursor underpaint lol~~
Expand All @@ -114,6 +120,7 @@
- [ ] Auto-delete spaces before punctuation
- [ ] Quote wrapping does not account for non-American punctuation/quote order
- [ ] Add guillemets (both versions)?
- [ ] A selector for quote key appropriate dialog punctuation (diff options for inward vs outward guillemets)
- [ ] On enter-press if the next `char` is closing parenthesis, quote, etc., then apply a skip before new line?
- [x] ~~`autoClose()` (or in PTE `proximalChars()`) on end-of-line / blank line causes crash (possibly just at beginning of any block)~~
- [x] ~~Avoid passing entire document lol~~
Expand All @@ -139,6 +146,7 @@
- [x] ~~Toggle-specific menu~~

### Pane
- [ ] Nav shortcuts should temporarily expand Pane if collapsed
- [ ] Persist selected-item highlight between saves/moves
- [ ] `persistentEditor()` or an input dialog for `rename()`? (`openPersistentEditor(itemModel->indexFromItem(temp_item));`)
- [x] ~~Style scrollbars~~
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
Copyright © 2017 IBM Corp. with Reserved Font Name "Plex"
Copyright 2019 The Sofia Sans Project Authors (https://github.com/lettersoup/Sofia-Sans)

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:
http://scripts.sil.org/OFL


-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
Expand Down Expand Up @@ -89,4 +90,4 @@ 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.
OTHER DEALINGS IN THE FONT SOFTWARE.
81 changes: 81 additions & 0 deletions Fernanda/docs/fonts/Sofia Sans/README.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
Sofia Sans Variable Font
========================

This download contains Sofia Sans as both variable fonts and static fonts.

Sofia Sans is a variable font with this axis:
wght

This means all the styles are contained in these files:
SofiaSans-VariableFont_wght.ttf
SofiaSans-Italic-VariableFont_wght.ttf

If your app fully supports variable fonts, you can now pick intermediate styles
that aren’t available as static fonts. Not all apps support variable fonts, and
in those cases you can use the static font files for Sofia Sans:
static/SofiaSans-Thin.ttf
static/SofiaSans-ExtraLight.ttf
static/SofiaSans-Light.ttf
static/SofiaSans-Regular.ttf
static/SofiaSans-Medium.ttf
static/SofiaSans-SemiBold.ttf
static/SofiaSans-Bold.ttf
static/SofiaSans-ExtraBold.ttf
static/SofiaSans-Black.ttf
static/SofiaSans-ThinItalic.ttf
static/SofiaSans-ExtraLightItalic.ttf
static/SofiaSans-LightItalic.ttf
static/SofiaSans-Italic.ttf
static/SofiaSans-MediumItalic.ttf
static/SofiaSans-SemiBoldItalic.ttf
static/SofiaSans-BoldItalic.ttf
static/SofiaSans-ExtraBoldItalic.ttf
static/SofiaSans-BlackItalic.ttf

Get started
-----------

1. Install the font files you want to use

2. Use your app's font picker to view the font family and all the
available styles

Learn more about variable fonts
-------------------------------

https://developers.google.com/web/fundamentals/design-and-ux/typography/variable-fonts
https://variablefonts.typenetwork.com
https://medium.com/variable-fonts

In desktop apps

https://theblog.adobe.com/can-variable-fonts-illustrator-cc
https://helpx.adobe.com/nz/photoshop/using/fonts.html#variable_fonts

Online

https://developers.google.com/fonts/docs/getting_started
https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Fonts/Variable_Fonts_Guide
https://developer.microsoft.com/en-us/microsoft-edge/testdrive/demos/variable-fonts

Installing fonts

MacOS: https://support.apple.com/en-us/HT201749
Linux: https://www.google.com/search?q=how+to+install+a+font+on+gnu%2Blinux
Windows: https://support.microsoft.com/en-us/help/314960/how-to-install-or-remove-a-font-in-windows

Android Apps

https://developers.google.com/fonts/docs/android
https://developer.android.com/guide/topics/ui/look-and-feel/downloadable-fonts

License
-------
Please read the full license text (OFL.txt) to understand the permissions,
restrictions and requirements for usage, redistribution, and modification.

You can use them in your products & projects – print or digital,
commercial or otherwise.

This isn't legal advice, please consider consulting a lawyer and see the full
license for all details.
94 changes: 94 additions & 0 deletions Fernanda/docs/fonts/Trykker/OFL.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
Copyright (c) 2011 by Sorkin Type Co (www.sorkintype.com),
with Reserved Font Name "Trykker".

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:
http://scripts.sil.org/OFL


-----------------------------------------------------------
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.
Binary file removed Fernanda/docs/zips/fonts/IBM Plex TrueType.zip
Binary file not shown.
Binary file removed Fernanda/docs/zips/fonts/Roboto.zip
Binary file not shown.
Binary file added Fernanda/docs/zips/fonts/Sofia_Sans.zip
Binary file not shown.
Binary file added Fernanda/docs/zips/fonts/Trykker.zip
Binary file not shown.
3 changes: 2 additions & 1 deletion Fernanda/resources/fonts.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,15 @@
<file>fonts/Courier Prime.ttf</file>
<file>fonts/Day Roman.ttf</file>
<file>fonts/Fixedsys Excelsior.ttf</file>
<file>fonts/IBM Plex Sans.ttf</file>
<file>fonts/Iosevka.ttf</file>
<file>fonts/Mononoki.ttf</file>
<file>fonts/More Perfect DOS VGA.ttf</file>
<file>fonts/Noto Serif.ttf</file>
<file>fonts/Nouveau IBM.ttf</file>
<file>fonts/OpenDyslexic.otf</file>
<file>fonts/Sofia Sans.ttf</file>
<file>fonts/Source Sans Pro.ttf</file>
<file>fonts/Trykker.ttf</file>
<file>fonts/Ysabeau.ttf</file>
</qresource>
</RCC>
Binary file removed Fernanda/resources/fonts/IBM Plex Sans.ttf
Binary file not shown.
Binary file added Fernanda/resources/fonts/Sofia Sans.ttf
Binary file not shown.
Binary file added Fernanda/resources/fonts/Trykker.ttf
Binary file not shown.
4 changes: 2 additions & 2 deletions Fernanda/source/Version.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@

#pragma once

#define VER_FILEVERSION 0,27,0,59
#define VER_FILEVERSION_STR "v0.27.0-beta59"
#define VER_FILEVERSION 0,27,1,60
#define VER_FILEVERSION_STR "v0.27.1-beta60"
#define VER_PRODUCTVERSION VER_FILEVERSION
#define VER_PRODUCTVERSION_STR VER_FILEVERSION_STR
#define VER_COMPANYNAME_STR "fairybow"
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@

<p align="center">
<img src="./Fernanda/docs/screens/main_screen_2_alt.png" alt="PNG of 'Fernanda v0.26.1-beta57'"/>
<a href="https://github.com/fairybow/Fernanda/releases/"><img src="https://img.shields.io/github/v/release/fairybow/Fernanda?include_prereleases&color=d74f4b&style=flat&labelColor=lightgrey" alt="Latest Release"/></a>
<a href="https://github.com/fairybow/Fernanda/releases/"><img src="https://img.shields.io/github/v/release/fairybow/Fernanda?include_prereleases&color=eae9e8&style=flat&labelColor=lightgrey" alt="Latest Release"/></a>
<a href="LICENSE"><img src="https://img.shields.io/github/license/fairybow/Fernanda?color=1c404d&style=flat&labelColor=lightgrey" alt="License: GPL-3.0"/></a>
<br>
<a href="https://www.7-zip.org/"><img src="https://img.shields.io/badge/7--Zip-v22.01-eae9e8?style=flat&labelColor=lightgrey" alt="7-Zip v22.01"/></a>
<a href="https://www.7-zip.org/"><img src="https://img.shields.io/badge/7--Zip-v22.01-d74f4b?style=flat&labelColor=lightgrey" alt="7-Zip v22.01"/></a>
<a href="https://github.com/rikyoz/bit7z"><img src="https://img.shields.io/badge/Bit7z-v4.0.0--RC-orange?style=flat&labelColor=lightgrey" alt="Bit7z v4.0.0-RC"/></a>
<a href="https://www.qt.io/"><img src="https://img.shields.io/badge/Qt-v6.4.2-green?style=flat&labelColor=lightgrey" alt="Qt v6.4.2"/></a>
<br>
Expand Down Expand Up @@ -240,6 +240,7 @@ In my mind, near-finished work can be revised in other programs. So, some things

If I think of something big, I'll try to add it right here. Otherwise, these things, of varying importance or levels of commitment, will also appear in [To-do.md](./Fernanda/docs/To-do.md).

- More traditional appearance and font selection menus, using system fonts
- Persist undo/redo stacks between file changes
- Separators and possibly customizable file icons, for better mental organization at-a-glance
- Simple storage of links and research materials
Expand Down

0 comments on commit 8a5e279

Please sign in to comment.