Merge PR #396: Typography

flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java

@@ -534,7 +534,7 @@ public abstract class FlatLaf
 		// use active value for all fonts to allow changing fonts in all components with:
 		//     UIManager.put( "defaultFont", myFont );
 		// (this is similar as in Nimbus L&F)
-		Object activeFont = new ActiveFont( null, -1, 0, 0, 0, 0 );
+		Object activeFont = new ActiveFont( null, null, -1, 0, 0, 0, 0 );
 
 		// override fonts
 		for( Object key : defaults.keySet() ) {
@@ -618,7 +618,7 @@ public abstract class FlatLaf
 
 	/** @since 1.1 */
 	public static ActiveValue createActiveFontValue( float scaleFactor ) {
-		return new ActiveFont( null, -1, 0, 0, 0, scaleFactor );
+		return new ActiveFont( null, null, -1, 0, 0, 0, scaleFactor );
 	}
 
 	/**
@@ -1221,6 +1221,7 @@ public abstract class FlatLaf
 	static class ActiveFont
 		implements ActiveValue
 	{
+		private final String baseFontKey;
 		private final List<String> families;
 		private final int style;
 		private final int styleChange;
@@ -1230,7 +1231,9 @@ public abstract class FlatLaf
 
 		// cache (scaled/derived) font
 		private FontUIResource font;
-		private Font lastDefaultFont;
+		private Font lastBaseFont;
+
+		private boolean inCreateValue;
 
 		/**
 		 * @param families list of font families, or {@code null}
@@ -1241,9 +1244,10 @@ public abstract class FlatLaf
 		 * @param relativeSize added to size of base font, or {@code 0}
 		 * @param scaleSize multiply size of base font, or {@code 0}
 		 */
-		ActiveFont( List<String> families, int style, int styleChange,
+		ActiveFont( String baseFontKey, List<String> families, int style, int styleChange,
 			int absoluteSize, int relativeSize, float scaleSize )
 		{
+			this.baseFontKey = baseFontKey;
 			this.families = families;
 			this.style = style;
 			this.styleChange = styleChange;
@@ -1254,16 +1258,30 @@ public abstract class FlatLaf
 
 		@Override
 		public Object createValue( UIDefaults table ) {
-			Font defaultFont = UIManager.getFont( "defaultFont" );
+			if( inCreateValue )
+				throw new IllegalStateException( "FlatLaf: endless recursion in font" );
 
-			// fallback (to avoid NPE in case that this is used in another Laf)
-			if( defaultFont == null )
-				defaultFont = UIManager.getFont( "Label.font" );
+			Font baseFont = null;
 
-			if( lastDefaultFont != defaultFont ) {
-				lastDefaultFont = defaultFont;
+			inCreateValue = true;
+			try {
+				if( baseFontKey != null )
+					baseFont = (Font) UIDefaultsLoader.lazyUIManagerGet( baseFontKey );
 
-				font = derive( defaultFont, fontSize -> UIScale.scale( fontSize ) );
+				if( baseFont == null )
+					baseFont = UIManager.getFont( "defaultFont" );
+
+				// fallback (to avoid NPE in case that this is used in another Laf)
+				if( baseFont == null )
+					baseFont = UIManager.getFont( "Label.font" );
+			} finally {
+				inCreateValue = false;
+			}
+
+			if( lastBaseFont != baseFont ) {
+				lastBaseFont = baseFont;
+
+				font = derive( baseFont, fontSize -> UIScale.scale( fontSize ) );
 			}
 
 			return font;

flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java

@@ -441,10 +441,7 @@ class UIDefaultsLoader
 			// check whether value type is specified in the value
 			if( value.startsWith( "#" ) )
 				valueType = ValueType.COLOR;
-			else if( value.startsWith( "\"" ) && value.indexOf( '"', 1 ) == value.length() - 1 ) {
-				valueType = ValueType.STRING;
-				value = value.substring( 1, value.length() - 1 );
-			} else if( value.startsWith( TYPE_PREFIX ) ) {
+			else if( value.startsWith( TYPE_PREFIX ) ) {
 				int end = value.indexOf( TYPE_PREFIX_END );
 				if( end != -1 ) {
 					try {
@@ -536,6 +533,12 @@ class UIDefaultsLoader
 			case GRAYFILTER:	return parseGrayFilter( value );
 			case UNKNOWN:
 			default:
+				// string
+				if( value.startsWith( "\"" ) && value.endsWith( "\"" ) ) {
+					resultValueType[0] = ValueType.STRING;
+					return value.substring( 1, value.length() - 1 );
+				}
+
 				// colors
 				Object color = parseColorOrFunction( value, resolver, false );
 				if( color != null ) {
@@ -1051,7 +1054,7 @@ class UIDefaultsLoader
 	}
 
 	/**
-	 * Syntax: [normal] [bold|+bold|-bold] [italic|+italic|-italic] [<size>|+<incr>|-<decr>|<percent>%] [family[, family]]
+	 * Syntax: [normal] [bold|+bold|-bold] [italic|+italic|-italic] [<size>|+<incr>|-<decr>|<percent>%] [family[, family]] [$baseFontKey]
 	 */
 	private static Object parseFont( String value ) {
 		Object font = fontCache.get( value );
@@ -1064,6 +1067,7 @@ class UIDefaultsLoader
 		int relativeSize = 0;
 		float scaleSize = 0;
 		List<String> families = null;
+		String baseFontKey = null;
 
 		// use StreamTokenizer to split string because it supports quoted strings
 		StreamTokenizer st = new StreamTokenizer( new StringReader( value ) );
@@ -1113,6 +1117,12 @@ class UIDefaultsLoader
 								scaleSize = parseInteger( param.substring( 0, param.length() - 1 ), true ) / 100f;
 							else
 								absoluteSize = parseInteger( param, true );
+						} else if( firstChar == '$' ) {
+							// reference to base font
+							if( baseFontKey != null )
+								throw new IllegalArgumentException( "baseFontKey specified more than once in '" + value + "'" );
+
+							baseFontKey = param.substring( 1 );
 						} else {
 							// font family
 							if( families == null )
@@ -1139,7 +1149,7 @@ class UIDefaultsLoader
 				throw new IllegalArgumentException( "can not use '+italic' and '-italic' in '" + value + "'" );
 		}
 
-		font = new FlatLaf.ActiveFont( families, style, styleChange, absoluteSize, relativeSize, scaleSize );
+		font = new FlatLaf.ActiveFont( baseFontKey, families, style, styleChange, absoluteSize, relativeSize, scaleSize );
 		fontCache.put( value, font );
 		return font;
 	}
@@ -1292,7 +1302,7 @@ class UIDefaultsLoader
 	 * For use in LazyValue to get value for given key from UIManager and report error
 	 * if not found. If key is prefixed by '?', then no error is reported.
 	 */
-	private static Object lazyUIManagerGet( String uiKey ) {
+	static Object lazyUIManagerGet( String uiKey ) {
 		boolean optional = false;
 		if( uiKey.startsWith( OPTIONAL_PREFIX ) ) {
 			uiKey = uiKey.substring( OPTIONAL_PREFIX.length() );

flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties

@@ -26,6 +26,68 @@
 #       Instead copy and modify only those properties that you need to alter.
 #
 
+#---- typography / fonts ----
+
+# headings
+h00.font = +24
+h0.font = +18
+h1.font = +12 $semibold.font
+h2.font = +6 $semibold.font
+h3.font = +3 $semibold.font
+h4.font = bold
+
+h1.regular.font = +12
+h2.regular.font = +6
+h3.regular.font = +3
+
+# text
+large.font = +2
+medium.font = -1
+small.font = -2
+mini.font = -3
+
+# default font
+#defaultFont = ...
+
+# font weights
+#  Windows
+[win]light.font = "Segoe UI Light"
+[win]semibold.font = "Segoe UI Semibold"
+#  macOS
+[mac]light.font = "HelveticaNeue-Thin"
+[mac]semibold.font = "HelveticaNeue-Medium"
+#  Linux
+[linux]light.font = "Lato Light", "Ubuntu Light", "Cantarell Light"
+[linux]semibold.font = "Lato Semibold", "Ubuntu Medium"
+#  fallback for unknown platform
+light.font = +0
+semibold.font = +0
+
+# monospaced
+[win]monospaced.font = Consolas, "Courier New", Monospaced
+[mac]monospaced.font = Menlo, Monospaced
+[linux]monospaced.font = "Liberation Mono", "Ubuntu Mono", Monospaced
+monospaced.font = Monospaced
+
+# styles
+[style].h00 = font: $h00.font
+[style].h0 = font: $h0.font
+[style].h1 = font: $h1.font
+[style].h2 = font: $h2.font
+[style].h3 = font: $h3.font
+[style].h4 = font: $h4.font
+[style].h1.regular = font: $h1.regular.font
+[style].h2.regular = font: $h2.regular.font
+[style].h3.regular = font: $h3.regular.font
+[style].large = font: $large.font
+[style].medium = font: $medium.font
+[style].small = font: $small.font
+[style].mini = font: $mini.font
+[style].light = font: $light.font
+[style].semibold = font: $semibold.font
+[style].monospaced = font: $monospaced.font
+
+
 #---- UI delegates ----
 
 ButtonUI = com.formdev.flatlaf.ui.FlatButtonUI