r96797 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r96796‎ | r96797 | r96798 >
Date:17:12, 11 September 2011
Author:huji
Status:ok (Comments)
Tags:
Comment:
Reverting r96783 r96787 and r96788; adding IranianSans font, which is not GPL based but is a free font; including IranianSans's license
Modified paths:
  • /trunk/extensions/WebFonts/fonts/fa/DejaVuSans.eot (deleted) (history)
  • /trunk/extensions/WebFonts/fonts/fa/DejaVuSans.ttf (deleted) (history)
  • /trunk/extensions/WebFonts/fonts/fa/DejaVuSans.woff (deleted) (history)
  • /trunk/extensions/WebFonts/fonts/fa/IranianSans.eot (added) (history)
  • /trunk/extensions/WebFonts/fonts/fa/IranianSans.ttf (added) (history)
  • /trunk/extensions/WebFonts/fonts/fa/IranianSans.woff (added) (history)
  • /trunk/extensions/WebFonts/fonts/fa/IranianSansLicense.txt (added) (history)

Diff [purge]

Index: trunk/extensions/WebFonts/fonts/fa/DejaVuSans.ttf
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/extensions/WebFonts/fonts/fa/DejaVuSans.woff
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/extensions/WebFonts/fonts/fa/DejaVuSans.eot
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/extensions/WebFonts/fonts/fa/IranianSans.ttf
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/WebFonts/fonts/fa/IranianSans.ttf
___________________________________________________________________
Added: svn:mime-type
11 + application/octet-stream
Index: trunk/extensions/WebFonts/fonts/fa/IranianSans.woff
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/WebFonts/fonts/fa/IranianSans.woff
___________________________________________________________________
Added: svn:mime-type
22 + application/octet-stream
Index: trunk/extensions/WebFonts/fonts/fa/IranianSansLicense.txt
@@ -0,0 +1,59 @@
 2+=======================================================================
 3+THIS PACKAGE IS FREE SOFTWARE BUT IS NOT GPL. PLEASE READ THE FOLLOWING
 4+LICENSE FOR DETAILS OF YOUR RIGHTS:
 5+=======================================================================
 6+
 7+Arabic Script Glyphs, OpenType Layout and TrueType Instructions (c) 2007 by Iranian National Initiative for Free and Open Source Software (www.foss.ir) See license details in section one.
 8+
 9+Latin Glyph Outlines Copyright (c) 2003 by Bitstream, Inc. See license details in section two.
 10+
 11+
 12+-----------------------------------------------------------------------
 13+
 14+
 15+SECTION ONE - Iranian National Initiative for Free and Open Source Software Font License
 16+
 17+
 18+Copyright (c) 2007 by Iranian National Initiative for Free and Open Source Software,
 19+All Rights Reserved.
 20+
 21+"Iranian Sans" is a service mark of Iranian National Initiative for Free and Open Source Software
 22+
 23+Permission is hereby granted, free of charge, to any person obtaining a copy of the fonts accompanying this license ("Fonts") and associated documentation files (the "Font Software"), to reproduce and distribute the Font Software, including without limitation the rights to use, copy, merge, publish, distribute, copies of the Font Software, and to permit persons to whom the Font Software is furnished to do so, subject to the following conditions:
 24+
 25+The above copyright and trademark notices and this permission notice shall be included in all copies of one or more of the Font Software typefaces.
 26+
 27+The Font Software may be modified, altered, or added to, and in particular the designs of glyphs or characters in the Fonts may be modified and additional glyphs or characters may be added to the Fonts, only if the fonts are renamed to names not containing the word "Iranian".
 28+
 29+This License becomes null and void to the extent applicable to Fonts or Font Software that has been modified and is distributed either under the "Iranian" names or claimed to be endorsed or associated with Iranian National Initiative for Free and Open Source Software.
 30+
 31+The Font Software may be sold as part of a larger software package provided that: a) No copy of one or more of the Font Software typefaces may be sold by itself or as part of a package that only consists of a collection of fonts and associated supplementary documentation and utilities. b) No price is charged or associated with any of the Font Software typefaces themselves. So, the price of the package with or without the Font Software typefaces should be the same.
 32+
 33+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 NON-INFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL "IRANIAN NATIONAL INITIATIVE FOR FREE AND OPEN SOURCE SOFTWARE" 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.
 34+
 35+Except as contained in this notice, the names of "Iranian", "Iranian Sans", "Iranian National Initiative for Free and Open Source Software" or "www.foss.ir" shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Font Software without prior written authorization from the Iranian National Initiative for Free and Open Source Software. For further information, contact: fonts (at) foss (dot) ir.
 36+
 37+
 38+-----------------------------------------------------------------------
 39+
 40+
 41+SECTION TWO - Bitstream, Inc. License
 42+
 43+
 44+Copyright (c) 2003 by Bitstream, Inc.
 45+All Rights Reserved.
 46+Bitstream Vera is a trademark of Bitstream, Inc.
 47+
 48+Permission is hereby granted, free of charge, to any person obtaining a copy of the fonts accompanying this license ("Fonts") and associated documentation files (the "Font Software"), to reproduce and distribute the Font Software, including without limitation the rights to use, copy, merge, publish, distribute, and/or sell copies of the Font Software, and to permit persons to whom the Font Software is furnished to do so, subject to the following conditions:
 49+
 50+The above copyright and trademark notices and this permission notice shall be included in all copies of one or more of the Font Software typefaces.
 51+
 52+The Font Software may be modified, altered, or added to, and in particular the designs of glyphs or characters in the Fonts may be modified and additional glyphs or characters may be added to the Fonts, only if the fonts are renamed to names not containing either the words "Bitstream" or the word "Vera".
 53+
 54+This License becomes null and void to the extent applicable to Fonts or Font Software that has been modified and is distributed under the "Bitstream Vera" names.
 55+
 56+The Font Software may be sold as part of a larger software package but no copy of one or more of the Font Software typefaces may be sold by itself.
 57+
 58+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 BITSTREAM OR THE GNOME FOUNDATION 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.
 59+
 60+Except as contained in this notice, the names of Gnome, the Gnome Foundation, and Bitstream Inc., shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Font Software without prior written authorization from the Gnome Foundation or Bitstream Inc., respectively. For further information, contact: fonts at gnome dot org.
Property changes on: trunk/extensions/WebFonts/fonts/fa/IranianSansLicense.txt
___________________________________________________________________
Added: svn:eol-style
161 + native
Index: trunk/extensions/WebFonts/fonts/fa/IranianSans.eot
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/WebFonts/fonts/fa/IranianSans.eot
___________________________________________________________________
Added: svn:mime-type
262 + application/octet-stream

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r96783Adding Persian (Farsi) web-fonts. Please see my comment on the MediaWiki/Spec...huji15:09, 11 September 2011
r96787Adding WOFF version of DeJaVuSans font, follow up to r96783huji15:33, 11 September 2011
r96788Removing the executable bit from font files, follow up r96783huji15:40, 11 September 2011

Comments

#Comment by Huji (talk | contribs)   17:34, 11 September 2011

Here is a demo for those interested to see how IranianSans looks like:

http://toolserver.org/~huji/webfont/

Status & tagging log