diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi index 2b1129aa..f18360e5 100644 --- a/PowerEditor/installer/nppSetup.nsi +++ b/PowerEditor/installer/nppSetup.nsi @@ -489,10 +489,7 @@ Section -"Notepad++" mainSection SetOverwrite off File "..\bin\shortcuts.xml" - File "..\bin\SourceCodePro-Regular.ttf" - File "..\bin\SourceCodePro-Bold.ttf" - File "..\bin\SourceCodePro-It.ttf" - File "..\bin\SourceCodePro-BoldIt.ttf" + ; Set Section Files and Shortcuts SetOverwrite on diff --git a/PowerEditor/installer/packageAll.bat b/PowerEditor/installer/packageAll.bat index ac775b24..75b7670b 100644 --- a/PowerEditor/installer/packageAll.bat +++ b/PowerEditor/installer/packageAll.bat @@ -47,14 +47,7 @@ copy /Y ..\bin\"notepad++.exe" .\minimalist\ If ErrorLevel 1 PAUSE copy /Y ..\bin\SciLexer.dll .\minimalist\ If ErrorLevel 1 PAUSE -copy /Y ..\src\fonts\sourceCodePro\SourceCodePro-Regular.ttf .\minimalist\ -If ErrorLevel 1 PAUSE -copy /Y ..\src\fonts\sourceCodePro\SourceCodePro-Bold.ttf .\minimalist\ -If ErrorLevel 1 PAUSE -copy /Y ..\src\fonts\sourceCodePro\SourceCodePro-It.ttf .\minimalist\ -If ErrorLevel 1 PAUSE -copy /Y ..\src\fonts\sourceCodePro\SourceCodePro-BoldIt.ttf .\minimalist\ -If ErrorLevel 1 PAUSE + rem Notepad++ Unicode package @@ -95,14 +88,7 @@ copy /Y ..\bin\"notepad++.exe" .\zipped.package.release\ If ErrorLevel 1 PAUSE copy /Y ..\bin\SciLexer.dll .\zipped.package.release\ If ErrorLevel 1 PAUSE -copy /Y ..\src\fonts\sourceCodePro\SourceCodePro-Regular.ttf .\zipped.package.release\ -If ErrorLevel 1 PAUSE -copy /Y ..\src\fonts\sourceCodePro\SourceCodePro-Bold.ttf .\zipped.package.release\ -If ErrorLevel 1 PAUSE -copy /Y ..\src\fonts\sourceCodePro\SourceCodePro-It.ttf .\zipped.package.release\ -If ErrorLevel 1 PAUSE -copy /Y ..\src\fonts\sourceCodePro\SourceCodePro-BoldIt.ttf .\zipped.package.release\ -If ErrorLevel 1 PAUSE + rem Plugins copy /Y "..\bin\plugins\NppFTP.dll" .\zipped.package.release\plugins\ diff --git a/PowerEditor/src/fonts/sourceCodePro/LICENSE.txt b/PowerEditor/src/fonts/sourceCodePro/LICENSE.txt deleted file mode 100644 index d154618a..00000000 --- a/PowerEditor/src/fonts/sourceCodePro/LICENSE.txt +++ /dev/null @@ -1,93 +0,0 @@ -Copyright 2010, 2012 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries. - -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/PowerEditor/src/fonts/sourceCodePro/SourceCodePro-Bold.ttf b/PowerEditor/src/fonts/sourceCodePro/SourceCodePro-Bold.ttf deleted file mode 100644 index e0c576f1..00000000 Binary files a/PowerEditor/src/fonts/sourceCodePro/SourceCodePro-Bold.ttf and /dev/null differ diff --git a/PowerEditor/src/fonts/sourceCodePro/SourceCodePro-BoldIt.ttf b/PowerEditor/src/fonts/sourceCodePro/SourceCodePro-BoldIt.ttf deleted file mode 100644 index 9a4010d8..00000000 Binary files a/PowerEditor/src/fonts/sourceCodePro/SourceCodePro-BoldIt.ttf and /dev/null differ diff --git a/PowerEditor/src/fonts/sourceCodePro/SourceCodePro-It.ttf b/PowerEditor/src/fonts/sourceCodePro/SourceCodePro-It.ttf deleted file mode 100644 index e7f1541e..00000000 Binary files a/PowerEditor/src/fonts/sourceCodePro/SourceCodePro-It.ttf and /dev/null differ diff --git a/PowerEditor/src/fonts/sourceCodePro/SourceCodePro-Regular.ttf b/PowerEditor/src/fonts/sourceCodePro/SourceCodePro-Regular.ttf deleted file mode 100644 index 437f4728..00000000 Binary files a/PowerEditor/src/fonts/sourceCodePro/SourceCodePro-Regular.ttf and /dev/null differ diff --git a/PowerEditor/src/stylers.model.xml b/PowerEditor/src/stylers.model.xml index 5d1f89c3..3906ffec 100644 --- a/PowerEditor/src/stylers.model.xml +++ b/PowerEditor/src/stylers.model.xml @@ -799,8 +799,8 @@ - - + +