added FontGroup

Author: ncannasse

h2d/Font.hx

@@ -141,6 +141,10 @@ enum FontType {
 		@param smoothing The smoothing of edge. Lower value lead to sharper edges. Value of -1 sets it to automatic.
 	**/
 	SignedDistanceField(channel : SDFChannel, alphaCutoff : Float, smoothing : Float);
+	/**
+		A font group is a virtual font that contains one or several sub fonts that can be selected with h2d.Text.resolveSubFont.
+	**/
+	FontGroup;
 }
 
 /**
@@ -185,6 +189,12 @@ class Font {
 		Defaults to `hxd.Charset.getDefault()`.
 	**/
 	public var charset : hxd.Charset;
+
+	/**
+		Subfonts will be selected when assigned with the `h2d.Text.resolveSubFont` method.
+	**/
+	public var subFonts : Array<Font>;
+
 	var glyphs : Map<Int,FontChar>;
 	var nullChar : FontChar;
 	var defaultChar : FontChar;

h2d/HtmlText.hx

@@ -177,7 +177,7 @@ class HtmlText extends Text {
 	public dynamic function loadFont( name : String ) : Font {
 		var f = defaultLoadFont(name);
 		if (f == null) return this.font;
-		else return f;
+		return resolveFont(f);
 	}
 
 	/**

h2d/Text.hx

@@ -137,14 +137,24 @@ class Text extends Drawable {
 	**/
 	public function new( font : Font, ?parent : h2d.Object ) {
 		super(parent);
-		this.font = font;
+		this.font = resolveFont(font);
 		textAlign = Left;
 		text = "";
 		currentText = "";
 		textColor = 0xFFFFFF;
 	}
 
-	function set_font(font) {
+	function resolveFont(font:Font) {
+		while( true ) {
+			if( font == null || font.type != FontGroup ) return font;
+			var sub = resolveSubFont(font, this);
+			if( font == sub ) throw "Recursive font";
+			font = sub;
+		}
+	}
+
+	function set_font(font:Font) {
+		font = resolveFont(font);
 		if( this.font == font ) return font;
 		this.font = font;
 		if ( font != null ) {
@@ -165,6 +175,8 @@ class Text extends Drawable {
 					sdfShader.smoothing = smoothing;
 					sdfShader.channel = channel;
 					sdfShader.autoSmoothing = smoothing == -1;
+				case FontGroup:
+					throw "assert";
 			}
 		}
 		if( glyphs != null ) glyphs.remove();
@@ -541,4 +553,8 @@ class Text extends Drawable {
 		addBounds(relativeTo, out, x, y, w, h);
 	}
 
+	public static dynamic function resolveSubFont( fnt : Font, text : Text ) : Font {
+		return fnt.subFonts[0];
+	}
+
 }

h2d/domkit/BaseComponents.hx

@@ -198,6 +198,15 @@ class CustomParser extends domkit.CssValue.ValueParser {
 				#else
 				return hxd.res.DefaultFont.get();
 				#end
+			case VCall("group",fonts):
+				#if macro
+				for( f in fonts )
+					parseFont(f);
+				#else
+				var fnt = @:privateAccess new h2d.Font("group",0,FontGroup);
+				fnt.subFonts = [for( f in fonts ) parseFont(f)];
+				return fnt;
+				#end
 			case VGroup(args):
 				var args = args.copy();
 				path = parsePath(args[0]);