switch to em spacing (for hidpi), use renamed font to fix #4747

app/src/processing/app/ui/Toolkit.java

@@ -1005,6 +1005,7 @@ static public String getSansFontName() {
   static public Font getSansFont(int size, int style) {
     if (sansFont == null) {
       try {
+        /*
         // check for an installed version, because they cause nasty conflicts
         // https://github.com/processing/processing/issues/4747
         if (Platform.isWindows()) {
@@ -1024,6 +1025,9 @@ static public Font getSansFont(int size, int style) {
         if (sansBoldFont == null) {
           sansBoldFont = createFont("SourceSansPro-Semibold.ttf", size);
         }
+        */
+        sansFont = createFont("ProcessingSansPro-Regular.ttf", size);
+        sansBoldFont = createFont("SourceSansPro-Semibold.ttf", size);
 
         // additional language constraints
         if ("el".equals(Language.getLanguage())) {

build/shared/lib/fonts/ProcessingSansPro-LICENSE.txt

@@ -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.

build/shared/lib/welcome/generic.html

@@ -10,21 +10,26 @@
 
       body {
         padding: 20px;
-        /* Use the Processing font */
-        font-family: "Source Sans Pro";
+        font-family: "Processing Sans Pro", sans-serif;
       }
 
       h1 {
         margin-bottom: 0;
-        font-size: 16px;
-        font-family: "Source Sans Pro Semibold", sans-serif;
+        /* can't get the Semibold to work properly */
+        font-family: "Processing Sans Pro", sans-serif;
+        font-size: 1.3em; /*16px;*/
         font-weight: normal;
+      /*
+        font-size: 1.15em;
+        font-family: "Processing Sans Pro", sans-serif;
+        font-weight: 600;
+      */
       }
 
-      p {
+      p, td {
         margin-bottom: 0;
-        font-size: 11px;
-        line-height: 12px;
+        font-size: 0.975em; /*11px*/
+        line-height: 1.05em; /*12px*/
       }
 
       table {

build/shared/lib/welcome/sketchbook.html

@@ -10,26 +10,31 @@
 
       body {
         padding: 20px;
-        /* Use the Processing font */
-        font-family: "Source Sans Pro", sans-serif;
+        font-family: "Processing Sans Pro", sans-serif;
       }
 
       h1 {
-        margin: 0;
-        font-size: 16px;
-        font-family: "Source Sans Pro Semibold", sans-serif;
+        margin-bottom: 0;
+        /* can't get the Semibold to work properly */
+        font-family: "Processing Sans Pro", sans-serif;
+        font-size: 1.3em; /*16px;*/
         font-weight: normal;
+      /*
+        font-size: 1.15em;
+        font-family: "Processing Sans Pro", sans-serif;
+        font-weight: 600;
+      */
       }
 
-      p {
+      p, td {
         margin-bottom: 0;
-        font-size: 11px;
-        line-height: 12px;
+        font-size: 0.975em; /*11px*/
+        line-height: 1.05em; /*12px*/
       }
 
       table {
-        margin: 10px 0 0 0;
-        padding: 0;
+        margin-top: 10px;
+        margin-bottom: 0;
       }
 
       p.inset, table.inset {
@@ -40,7 +45,6 @@
       a {
         color: #2c7bb5;
         text-decoration: none;
-        font-family: "Source Sans Pro Semibold", sans-serif;
       }
 
       #startButton {

todo.txt

@@ -3,6 +3,8 @@ X check for already-exported folders before trying to remove them
 X   was spewing 'file not found' errors into the console
 X NVIDIA driver problems (and means to check)
 _   https://github.com/processing/processing/issues/4853
+_ put the reference (and examples?) into .zip files
+_   unzipping the app takes forever
 
 cleaning
 X Contribution Manager does not show all libraries until filter cleared