diff --git a/fonts.json b/fonts.json index 52ae335..8479b7d 100644 --- a/fonts.json +++ b/fonts.json @@ -1025,11 +1025,11 @@ "mplus": { "author": "Coji Morishita", "ligatures": false, - "name": "M+", + "name": "M PLUS Code", "rendering": "vector", "style": "sans", - "zerostyle": "slashed", - "website": "http://mplus-fonts.sourceforge.jp", + "zerostyle": "dotted", + "website": "https://mplusfonts.github.io", "year": 2003 }, "nanum-gothic-coding": { diff --git a/fonts/resources/mplus/license.txt b/fonts/resources/mplus/license.txt index 379b9cc..b038fd1 100755 --- a/fonts/resources/mplus/license.txt +++ b/fonts/resources/mplus/license.txt @@ -1,16 +1,93 @@ -M+ FONTS Copyright (C) 2002-2008 M+ FONTS PROJECT +Copyright 2021 The M+ FONTS Project Authors (https://github.com/coz-m/MPLUS_FONTS) -- - -LICENSE_E +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://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. -These fonts are free softwares. -Unlimited permission is granted to use, copy, and distribute it, with -or without modification, either commercially and noncommercially. -THESE FONTS ARE PROVIDED "AS IS" WITHOUT WARRANTY. +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. -http://mplus-fonts.sourceforge.jp/mplus-outline-fonts/ \ No newline at end of file +"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/fonts/resources/mplus/mplus-bold.ttf b/fonts/resources/mplus/mplus-bold.ttf new file mode 100644 index 0000000..3e62be1 Binary files /dev/null and b/fonts/resources/mplus/mplus-bold.ttf differ diff --git a/fonts/resources/mplus/mplus-bold.woff b/fonts/resources/mplus/mplus-bold.woff deleted file mode 100755 index 6a9943b..0000000 Binary files a/fonts/resources/mplus/mplus-bold.woff and /dev/null differ diff --git a/fonts/resources/mplus/mplus-light.woff b/fonts/resources/mplus/mplus-light.woff deleted file mode 100755 index bdf17cb..0000000 Binary files a/fonts/resources/mplus/mplus-light.woff and /dev/null differ diff --git a/fonts/resources/mplus/mplus-medium.woff b/fonts/resources/mplus/mplus-medium.woff deleted file mode 100755 index d19cba4..0000000 Binary files a/fonts/resources/mplus/mplus-medium.woff and /dev/null differ diff --git a/fonts/resources/mplus/mplus-thin.woff b/fonts/resources/mplus/mplus-thin.woff deleted file mode 100755 index c77f491..0000000 Binary files a/fonts/resources/mplus/mplus-thin.woff and /dev/null differ diff --git a/fonts/resources/mplus/mplus.ttf b/fonts/resources/mplus/mplus.ttf new file mode 100644 index 0000000..bfe46cf Binary files /dev/null and b/fonts/resources/mplus/mplus.ttf differ diff --git a/fonts/resources/mplus/mplus.woff b/fonts/resources/mplus/mplus.woff deleted file mode 100755 index 8ddb817..0000000 Binary files a/fonts/resources/mplus/mplus.woff and /dev/null differ diff --git a/fonts/stylesheets/fonts.less b/fonts/stylesheets/fonts.less index ea13636..0aa18c9 100755 --- a/fonts/stylesheets/fonts.less +++ b/fonts/stylesheets/fonts.less @@ -256,8 +256,8 @@ .font ( 'monoid', normal, italic, 'monoid/monoid-italic.ttf' ); .font ( 'monoid', normal, normal, 'monoid/monoid.ttf' ); -.font ( 'mplus', bold, normal, 'mplus/mplus-bold.woff' ); -.font ( 'mplus', normal, normal, 'mplus/mplus.woff' ); +.font ( 'mplus', bold, normal, 'mplus/mplus-bold.ttf' ); +.font ( 'mplus', normal, normal, 'mplus/mplus.ttf' ); .font ( 'nanum-gothic-coding', bold, normal, 'nanum-gothic-coding/nanum-gothic-coding-bold.ttf' ); .font ( 'nanum-gothic-coding', normal, normal, 'nanum-gothic-coding/nanum-gothic-coding.ttf'); diff --git a/fonts/stylesheets/stylesheet.css b/fonts/stylesheets/stylesheet.css index 7c3426b..fa6c5bf 100755 --- a/fonts/stylesheets/stylesheet.css +++ b/fonts/stylesheets/stylesheet.css @@ -1094,13 +1094,13 @@ font-family: 'mplus'; font-weight: bold; font-style: normal; - src: url('../resources/mplus/mplus-bold.woff'); + src: url('../resources/mplus/mplus-bold.ttf'); } @font-face { font-family: 'mplus'; font-weight: normal; font-style: normal; - src: url('../resources/mplus/mplus.woff'); + src: url('../resources/mplus/mplus.ttf'); } @font-face { font-family: 'nanum-gothic-coding';