[MediaWiki-commits] [Gerrit] Downloaded open source font from http://unifoundry.com/unifo... - change (mediawiki...ZeroBanner)
jenkins-bot has submitted this change and it was merged. Change subject: Downloaded open source font from http://unifoundry.com/unifont.html .. Downloaded open source font from http://unifoundry.com/unifont.html Change-Id: I75a62cb6a663c869b52aba1cf30761d8460be708 --- M ZeroBanner.php A unifont/LICENSE.txt A unifont/README A unifont/unifont_csur-7.0.03.ttf 4 files changed, 374 insertions(+), 2 deletions(-) Approvals: Yurik: Looks good to me, approved jenkins-bot: Verified diff --git a/ZeroBanner.php b/ZeroBanner.php index f8e34db..51774d1 100644 --- a/ZeroBanner.php +++ b/ZeroBanner.php @@ -119,7 +119,7 @@ $wgZeroBannerClusterDomain = 'org'; /** @var false|string $wgZeroBannerFontSize size of the font used for the image. When given, ignores *ImageSize vals */ -$wgZeroBannerFontSize = false; +$wgZeroBannerFontSize = '10'; /** @var string $wgZeroBannerImageSize size of the image banner. A 3px border will be added */ $wgZeroBannerImageSize = '174x'; @@ -128,7 +128,7 @@ $wgZeroBannerErrImageSize = '194x'; /** @var string|false $wgZeroBannerFont use a specific font for image banners */ -$wgZeroBannerFont = false; // 'FreeSans' ? +$wgZeroBannerFont = __DIR__ . '/unifont/unifont_csur-7.0.03.ttf'; $hook = 'ZeroBanner\\PageRenderingHooks::'; $wgHooks['BeforePageDisplayMobile'][] = $hook . 'onBeforePageDisplay'; diff --git a/unifont/LICENSE.txt b/unifont/LICENSE.txt new file mode 100644 index 000..6b540a8 --- /dev/null +++ b/unifont/LICENSE.txt @@ -0,0 +1,371 @@ +LICENSE +--- +The source code for everything except the compiled fonts in this current +release is licensed as follows: + + License for this current distribution of program source + files (i.e., everything except the fonts) is released under + the terms of the GNU General Public License version 2, + or (at your option) a later version. + + See the section below for a copy of the GNU General Public License + version 2. + +The license for the compiled fonts is covered by the above GPL terms +with the GNU font embedding exception, as follows: + + As a special exception, if you create a document which uses this font, + and embed this font or unaltered portions of this font into the document, + this font does not by itself cause the resulting document to be covered + by the GNU General Public License. This exception does not however + invalidate any other reasons why the document might be covered by the + GNU General Public License. If you modify this font, you may extend + this exception to your version of the font, but you are not obligated + to do so. If you do not wish to do so, delete this exception statement + from your version. + +See http://www.gnu.org/licenses/gpl-faq.html#FontException; for more details. + + +GPL VERSION 2 +- + +GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy,
[MediaWiki-commits] [Gerrit] Downloaded open source font from http://unifoundry.com/unifo... - change (mediawiki...ZeroBanner)
Yurik has uploaded a new change for review. https://gerrit.wikimedia.org/r/165699 Change subject: Downloaded open source font from http://unifoundry.com/unifont.html .. Downloaded open source font from http://unifoundry.com/unifont.html Change-Id: I75a62cb6a663c869b52aba1cf30761d8460be708 --- M ZeroBanner.php A unifont/LICENSE.txt A unifont/README A unifont/unifont_csur-7.0.03.ttf 4 files changed, 374 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ZeroBanner refs/changes/99/165699/1 diff --git a/ZeroBanner.php b/ZeroBanner.php index f8e34db..51774d1 100644 --- a/ZeroBanner.php +++ b/ZeroBanner.php @@ -119,7 +119,7 @@ $wgZeroBannerClusterDomain = 'org'; /** @var false|string $wgZeroBannerFontSize size of the font used for the image. When given, ignores *ImageSize vals */ -$wgZeroBannerFontSize = false; +$wgZeroBannerFontSize = '10'; /** @var string $wgZeroBannerImageSize size of the image banner. A 3px border will be added */ $wgZeroBannerImageSize = '174x'; @@ -128,7 +128,7 @@ $wgZeroBannerErrImageSize = '194x'; /** @var string|false $wgZeroBannerFont use a specific font for image banners */ -$wgZeroBannerFont = false; // 'FreeSans' ? +$wgZeroBannerFont = __DIR__ . '/unifont/unifont_csur-7.0.03.ttf'; $hook = 'ZeroBanner\\PageRenderingHooks::'; $wgHooks['BeforePageDisplayMobile'][] = $hook . 'onBeforePageDisplay'; diff --git a/unifont/LICENSE.txt b/unifont/LICENSE.txt new file mode 100644 index 000..6b540a8 --- /dev/null +++ b/unifont/LICENSE.txt @@ -0,0 +1,371 @@ +LICENSE +--- +The source code for everything except the compiled fonts in this current +release is licensed as follows: + + License for this current distribution of program source + files (i.e., everything except the fonts) is released under + the terms of the GNU General Public License version 2, + or (at your option) a later version. + + See the section below for a copy of the GNU General Public License + version 2. + +The license for the compiled fonts is covered by the above GPL terms +with the GNU font embedding exception, as follows: + + As a special exception, if you create a document which uses this font, + and embed this font or unaltered portions of this font into the document, + this font does not by itself cause the resulting document to be covered + by the GNU General Public License. This exception does not however + invalidate any other reasons why the document might be covered by the + GNU General Public License. If you modify this font, you may extend + this exception to your version of the font, but you are not obligated + to do so. If you do not wish to do so, delete this exception statement + from your version. + +See http://www.gnu.org/licenses/gpl-faq.html#FontException; for more details. + + +GPL VERSION 2 +- + +GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you