mirror of
https://github.com/processing/processing4.git
synced 2026-06-16 04:26:26 +02:00
include Source Sans and use it as the default font
This commit is contained in:
Ben Fry
@@ -126,6 +126,7 @@
|
||||
<fileset dir="src">
|
||||
<include name="processing/opengl/shaders/*.glsl" />
|
||||
<include name="processing/opengl/cursors/*.png" />
|
||||
<include name="font/ProcessingSansPro-*" />
|
||||
<include name="icon/*.png" />
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
@@ -0,0 +1,98 @@
|
||||
"Processing Sans" fonts are just "Source Sans", but renamed to
|
||||
prevent conflicts on Windows with other versions of Source Sans.
|
||||
https://github.com/processing/processing/issues/4747
|
||||
|
||||
|
||||
Copyright 2010, 2012, 2014 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.
|
||||
Binary file not shown.
@@ -4237,7 +4237,18 @@ public class PGraphics extends PImage implements PConstants {
|
||||
* Used by PGraphics to remove the requirement for loading a font.
|
||||
*/
|
||||
protected PFont createDefaultFont(float size) {
|
||||
Font baseFont = new Font("Lucida Sans", Font.PLAIN, 1);
|
||||
Font baseFont;
|
||||
try {
|
||||
// For 4.0 alpha 4 and later, include a built-in font
|
||||
InputStream input = getClass().getResourceAsStream("/font/ProcessingSansPro-Regular.ttf");
|
||||
baseFont = Font.createFont(Font.TRUETYPE_FONT, input);
|
||||
|
||||
} catch (Exception e) {
|
||||
// Fall back to how this was handled in 3.x, ugly!
|
||||
e.printStackTrace(); // dammit
|
||||
baseFont = new Font("Lucida Sans", Font.PLAIN, 1);
|
||||
}
|
||||
// Create a PFont from this java.awt.Font
|
||||
return createFont(baseFont, size, true, null, false);
|
||||
}
|
||||
|
||||
|
||||
@@ -10,6 +10,8 @@ X implement auto-download for JNA updates
|
||||
X “Exception in thread "Contribution Uninstaller" NullPointerException” during Remove
|
||||
X https://github.com/processing/processing4/issues/174
|
||||
X catch NoClassDefError in Platform.deleteFile() (still unclear of its cause)
|
||||
X need to set a nicer default font
|
||||
X increases export size, but impact is so worth it
|
||||
|
||||
earlier
|
||||
o further streamline the downloader
|
||||
@@ -33,8 +35,6 @@ _ include JNA so that sketches can also scale properly?
|
||||
_ what happens re: getting scaled/high-res graphics?
|
||||
_ make that a preference? (and double the size by default?)
|
||||
|
||||
_ need to set a nicer default font
|
||||
_ increases export size, but impact is so worth it
|
||||
_ new FloatList(float...)
|
||||
|
||||
already fixed in 4.x? (confirm/close on release)
|
||||
|
||||
Reference in New Issue
Block a user