diff --git a/app/qml/FontPixels.qml b/app/qml/FontPixels.qml index a22f897..8b96190 100644 --- a/app/qml/FontPixels.qml +++ b/app/qml/FontPixels.qml @@ -62,7 +62,7 @@ QtObject{ ListElement{ name: "TERMINUS_SCALED" text: "Terminus (Modern)" - source: "fonts/modern-terminus/TerminusTTF-4.38.2.ttf" + source: "fonts/modern-terminus/TerminusTTF-4.46.0.ttf" lineSpacing: 1 pixelSize: 12 baseScaling: 3.0 diff --git a/app/qml/FontScanlines.qml b/app/qml/FontScanlines.qml index b678d57..c618aed 100644 --- a/app/qml/FontScanlines.qml +++ b/app/qml/FontScanlines.qml @@ -62,7 +62,7 @@ QtObject{ ListElement{ name: "TERMINUS_SCALED" text: "Terminus (Modern)" - source: "fonts/modern-terminus/TerminusTTF-4.38.2.ttf" + source: "fonts/modern-terminus/TerminusTTF-4.46.0.ttf" lineSpacing: 1 pixelSize: 12 baseScaling: 3.0 diff --git a/app/qml/Fonts.qml b/app/qml/Fonts.qml index f4a6b96..c8d3915 100644 --- a/app/qml/Fonts.qml +++ b/app/qml/Fonts.qml @@ -57,7 +57,7 @@ QtObject{ ListElement{ name: "TERMINUS_SCALED" text: "Terminus (Modern)" - source: "fonts/modern-terminus/TerminusTTF-4.38.2.ttf" + source: "fonts/modern-terminus/TerminusTTF-4.46.0.ttf" lineSpacing: 1 pixelSize: 12 baseScaling: 3.0 @@ -188,7 +188,7 @@ QtObject{ ListElement{ name: "TERMINUS" text: "HD: Terminus (Modern)" - source: "fonts/modern-terminus/TerminusTTF-4.38.2.ttf" + source: "fonts/modern-terminus/TerminusTTF-4.46.0.ttf" lineSpacing: 0.1 pixelSize: 35 fontWidth: 1.0 diff --git a/app/qml/fonts/modern-terminus/COPYING b/app/qml/fonts/modern-terminus/COPYING new file mode 100644 index 0000000..c964194 --- /dev/null +++ b/app/qml/fonts/modern-terminus/COPYING @@ -0,0 +1,97 @@ +Copyright (c) 2010 Dimitar Toshkov Zhekov, +with Reserved Font Name "Terminus Font". + +Copyright (c) 2011 Tilman Blumenbach, +with Reserved Font Name "Terminus (TTF)". + +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. diff --git a/app/qml/fonts/modern-terminus/TerminusTTF-4.38.2.ttf b/app/qml/fonts/modern-terminus/TerminusTTF-4.38.2.ttf deleted file mode 100644 index 0e9e421..0000000 Binary files a/app/qml/fonts/modern-terminus/TerminusTTF-4.38.2.ttf and /dev/null differ diff --git a/app/qml/fonts/modern-terminus/TerminusTTF-4.46.0.ttf b/app/qml/fonts/modern-terminus/TerminusTTF-4.46.0.ttf new file mode 100644 index 0000000..eafa3a6 Binary files /dev/null and b/app/qml/fonts/modern-terminus/TerminusTTF-4.46.0.ttf differ diff --git a/app/qml/fonts/modern-terminus/TerminusTTF-Bold-4.38.2.ttf b/app/qml/fonts/modern-terminus/TerminusTTF-Bold-4.38.2.ttf deleted file mode 100644 index 059f662..0000000 Binary files a/app/qml/fonts/modern-terminus/TerminusTTF-Bold-4.38.2.ttf and /dev/null differ diff --git a/app/qml/resources.qrc b/app/qml/resources.qrc index c27f626..0291ea2 100644 --- a/app/qml/resources.qrc +++ b/app/qml/resources.qrc @@ -30,7 +30,6 @@ FontScanlines.qml fonts/1977-apple2/PrintChar21.ttf fonts/1971-ibm-3278/3270Medium.ttf - fonts/modern-terminus/TerminusTTF-4.38.2.ttf Storage.qml CRTMainMenuBar.qml SettingsPerformanceTab.qml @@ -52,5 +51,6 @@ fonts/1985-ibm-pc-vga/PxPlus_IBM_VGA8.ttf fonts/1977-commodore-pet/PetMe.ttf BurnInEffect.qml + fonts/modern-terminus/TerminusTTF-4.46.0.ttf