Replace font in samples with LatoLatin

.appveyor.yml

@@ -89,12 +89,13 @@ after_build:
     7z a RmlUi-%VS_SHORTNAME%-%PLATFORM_NAME%.zip Bin/ Include/ Samples/ Build.txt readme.md changelog.md LICENSE.txt Dependencies/freetype-%FREETYPE_VER%/ Dependencies/rlottie/COPYING Dependencies/rlottie/licenses/
     
     mkdir Samples\Dependencies\freetype-%FREETYPE_VER%, Samples\Dependencies\rlottie, Samples\Dependencies\rlottie\licenses
-    cp Include/RmlUi/Core/Containers/LICENSE.txt Samples/LICENSE.Core.Thirdparty.txt
-    cp Source/Debugger/LICENSE.txt Samples/LICENSE.Debugger.Thirdparty.txt
+    cp LICENSE.txt Samples/LICENSE.txt
+    cp Include/RmlUi/Core/Containers/LICENSE.txt Samples/LICENSE.Core.ThirdParty.txt
+    cp Source/Debugger/LICENSE.txt Samples/LICENSE.Debugger.ThirdParty.txt
     cp Dependencies/freetype-%FREETYPE_VER%/*.TXT Samples/Dependencies/freetype-%FREETYPE_VER%
     cp Dependencies/rlottie/COPYING Samples/Dependencies/rlottie
     cp Dependencies/rlottie/licenses/* Samples/Dependencies/rlottie/licenses
-    IF "%PLATFORM_NAME%"=="win64" 7z a RmlUi-%PLATFORM_NAME%-samples-only.zip LICENSE.txt .\Samples\* -r -xr!src\ -x!shell\ -x!luainvaders\
+    IF "%PLATFORM_NAME%"=="win64" 7z a RmlUi-%PLATFORM_NAME%-samples-only.zip .\Samples\* -r -xr!src\ -x!shell\ -x!luainvaders\
     
 for:
 -

Samples/assets/LICENSE.txt

@@ -1,6 +1,121 @@
-The Noto Emoji font, located in the file 'NotoEmoji-Regular.ttf', is part of the Noto Project. See google.com/get/noto for more information. The font is licensed under the SIL Open Font License v1.1. Full license stated below.
+The RmlUi samples include fonts that are separately licensed. They are listed
+below along with their licenses.
 
+-----------------------------------------------------------
+-----------------------------------------------------------
+---    Lato                                             ---
+---    http://www.latofonts.com/                        ---
+---                                                     ---
+---    LatoLatin-Bold.ttf                               ---
+---    LatoLatin-BoldItalic.ttf                         ---
+---    LatoLatin-Italic.ttf                             ---
+---    LatoLatin-Regular.ttf                            ---
+-----------------------------------------------------------
+-----------------------------------------------------------
+
+Copyright (c) 2010-2015, Łukasz Dziedzic ([email protected]),
+with Reserved Font Name Lato.
+
+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.
+
+
+-----------------------------------------------------------
+-----------------------------------------------------------
+---    Noto Emoji                                       ---
+---    https://www.google.com/get/noto/                 ---
+---                                                     ---
+---    NotoEmoji-Regular.ttf                            ---
+-----------------------------------------------------------
 -----------------------------------------------------------
 
 This Font Software is licensed under the SIL Open Font License,

Samples/assets/invader.rcss

@@ -132,7 +132,7 @@
 
 body
 {
-	font-family: Delicious;
+	font-family: LatoLatin;
 	font-weight: normal;
 	font-style: normal;
 	font-size: 15px;
@@ -156,7 +156,7 @@ div#title_bar
 	z-index: 1;
 
 	position: absolute;
-	top: 0px;
+	top: 3px;
 	left: 0px;
 	
 	text-align: left;
@@ -180,10 +180,10 @@ div#title_bar span
 	padding-top: 17px;
 	padding-bottom: 51px;
 
-	font-size: 22px;
+	font-size: 20px;
 	font-weight: bold;
 	
-	font-effect: glow(1px black);
+	font-effect: glow(2px 2px 0px 1px #1117);
 
 	decorator: tiled-horizontal( title-bar-l, title-bar-c, title-bar-r );
 }
@@ -229,7 +229,7 @@ h1
 	font-size: 16px;
 	font-weight: bold;
 
-	font-effect: shadow(1px 1px black);
+	font-effect: glow(1px 1px 1px 1px #1117);
 }
 
 
@@ -254,12 +254,12 @@ input.submit
 	display: inline-block;
 
 	width: 159px;
-	height: 37px;
+	height: 35px;
 
-	padding-top: 8px;
+	padding-top: 10px;
 	vertical-align: -18px;
 
-	font-size: 18px;
+	font-size: 16px;
 	text-align: center;
 	tab-index: auto;
 
@@ -269,8 +269,7 @@ input.submit
 button:focus,
 input.submit:focus
 {
-	font-weight: bold;
-	font-effect: shadow(1px 1px black);
+	font-effect: blur(3px #fff);
 }
 
 button:hover,

Samples/basic/animation/data/animation.rml

@@ -12,6 +12,18 @@
 			perspective: 3000px;
 			/*opacity: 0;*/
 		}
+		section
+		{
+			display: block;
+			position: absolute;
+			width: 20%;
+			height: 80%;
+		}
+		#fps
+		{
+			font-size: 0.85em;
+			text-align: left;
+		}
 		button {
 			margin-top: 50px;
 		}
@@ -225,35 +237,36 @@
 </head>
 
 <body template="window">
-<div style="width: 20%; height: 80%; position: absolute;">
-	<div style="font-size: 0.85em; text-align: left;" id="fps"></div>
+<section>
+	<div id="fps"/>
 	<button id="start_game">Start Game</button><br />
 	<button id="high_scores" onkeydown="hello">High Scores</button><br />
 	<button id="options">Options</button><br />
 	<button id="help">Help</button><br />
 	<button id="exit" onclick="exit">Exit</button>
-</div>
+</section>
 
-<div id="performance"/>
+<section id="performance"/>
 
-<div style="width: 20%; height: 80%;position: absolute; left: 28%;" id="transform_tests">
-	<div style="font-size: 1.5em; text-align: left;">Test transform animations</div>
+<section style="left: 28%;" id="transform_tests">
+	<h1>Test transform animations</h1>
 	<div class="container"><div class="plain" id="generic">Generic form conversion.</div></div>
 	<div class="container"><div class="plain" id="combine">Match different transform primitive sizes</div></div>
 	<div class="container"><div class="plain" id="decomposition">Force full matrix decomposition</div></div>
-</div>
+</section>
 
-<div style="width: 20%; height: 80%;position: absolute; left: 52%;" id="mixed_units_tests">
-	<div style="font-size: 1.5em; text-align: left;">Mixed units tests</div>
+<section style="left: 52%;" id="mixed_units_tests">
+	<h1>Mixed units tests</h1>
 	<div class="container"><div class="plain" id="abs_rel">Pixel vs percentage.</div></div>
 	<div class="container"><div class="plain" id="abs_rel_transform">Pixel vs percentage transform.</div></div>
 	<div class="container"><div class="plain" id="animation_event">Animation event</div><div class="plain" id="keyevent_response">Events (press arrow keys)</div></div>
-</div>
-<div style="width: 20%; height: 80%;position: absolute; left: 75%;" id="transition_tests">
-	<div style="font-size: 1.5em; text-align: left;">Transition tests</div>
+</section>
+
+<section style="left: 75%;" id="transition_tests">
+	<h1>Transition tests</h1>
 	<div class="container"><div class="plain" id="transition_test">Transition test (hover)</div></div>
 	<div class="container"><div class="plain" id="transition_class" onclick="add_class">Transition class (click)</div></div>
 	<div class="container"><div class="plain" id="keyframes_test">Keyframes test</div><div class="plain" id="keyframes_missing_keys"/></div>
-</div>
+</section>
 </body>
 </rml>

Samples/basic/databinding/data/databinding.rml

@@ -217,6 +217,10 @@ li {
 			<input type="text" name="email"/>
 			<input type="password" name="password"/>
 		</div>
+		<h2>Rating</h2>
+		<div>
+			<input type="range" name="rating" min="0" max="100" step="1" value="50" onchange="rating" data-value="rating"/> <span id="rating">{{rating}}</span><span id="rating_emoji">&nbsp;</span>
+		</div>
 		<h2>Favorite animal: {{ animal }}</h2>
 		<div>
 			<input type="radio" name="animal" value="dog" data-checked="animal"/> Dog
@@ -234,10 +238,6 @@ li {
 			<li data-if="pasta">• Pasta is squiggly good!</li>
 			<li data-if="lasagne">• Lasagne is delicous!</li>
 		</div>
-		<h2>Rating</h2>
-		<div>
-			<input type="range" name="rating" min="0" max="100" step="1" value="50" onchange="rating" data-value="rating"/> <span id="rating">{{rating}}</span><span id="rating_emoji">&nbsp;</span>
-		</div>
 		<h2>Subject</h2>
 		<div>
 			<!--<select name="subject" data-value="selected_subject">

Samples/basic/demo/data/demo.rml

@@ -40,7 +40,7 @@ body.window
 {
 	width: 1300px;
 	height: 750px;
-	min-width: 1030px;
+	min-width: 1040px;
 	min-height: 300px;
 	max-width: -1px;
 	max-height: -1px;
@@ -75,7 +75,7 @@ tab
 	line-height: 40px;
 	display: inline-block;
 	
-	font-size: 16px;
+	font-size: 15px;
 	color: #ddd;
 	text-align: center;
 	
@@ -438,7 +438,8 @@ form h2 {
 	display: block;
 	font-size: 16px;
 	font-weight: bold;
-	margin-top: 8px;
+	margin-top: 0.6em;
+	margin-bottom: 0.4em;
 }
 #rating {
 	display: inline-block;
@@ -477,19 +478,18 @@ progressbar {
 	margin-bottom: 0;
 }
 #gauge_value, #progress_value {
-	font-size: 18px;
+	font-size: 16px;
 	color: #4ADB2D;
 	text-align: right;
-	width: 50px;
+	width: 53px;
 	font-effect: outline( 2px #555 );
 }
 #gauge_value {
-	margin: 30px 0 0 18px;
+	margin: 34px 0 0 18px;
 }
 #progress_value { 
 	margin-left: -20px;
 	display: inline-block;
-	vertical-align: -3px;
 }
 
 

Samples/basic/drag/data/icon.rcss

@@ -20,10 +20,3 @@ icon
     
     drag: clone;
 }
-
-icon:drag
-{
-    /* Since this is an ad-hoc element, we need to define the font face to 
-       avoid runtime warnings about not having a font-family defined       */
-    font-family: Delicious;
-}

Samples/shell/src/Shell.cpp

@@ -39,18 +39,21 @@
 /// Loads the default fonts from the given path.
 void Shell::LoadFonts(const char* directory)
 {
-	Rml::String font_names[5];
-	font_names[0] = "Delicious-Roman.otf";
-	font_names[1] = "Delicious-Italic.otf";
-	font_names[2] = "Delicious-Bold.otf";
-	font_names[3] = "Delicious-BoldItalic.otf";
-	font_names[4] = "NotoEmoji-Regular.ttf";
-
-	const int fallback_face = 4;
-
-	for (size_t i = 0; i < sizeof(font_names) / sizeof(Rml::String); i++)
+	struct FontFace {
+		Rml::String filename;
+		bool fallback_face;
+	};
+	FontFace font_faces[] = {
+		{ "LatoLatin-Regular.ttf",    false },
+		{ "LatoLatin-Italic.ttf",     false },
+		{ "LatoLatin-Bold.ttf",       false },
+		{ "LatoLatin-BoldItalic.ttf", false },
+		{ "NotoEmoji-Regular.ttf",    true  },
+	};
+
+	for (const FontFace& face : font_faces)
 	{
-		Rml::LoadFontFace(Rml::String(directory) + font_names[i], i == fallback_face);
+		Rml::LoadFontFace(Rml::String(directory) + face.filename, face.fallback_face);
 	}
 }
 

Samples/tutorial/datagrid/data/tutorial.rcss

@@ -1,6 +1,6 @@
 @spritesheet theme 
 {
-	src: ../../../assets/invader.tga;
+	src: /assets/invader.tga;
 
 	title-bar-l: 147px 0px 82px 85px;
 	title-bar-c: 229px 0px  1px 85px;
@@ -41,7 +41,7 @@
 
 body
 {
-	font-family: Delicious;
+	font-family: LatoLatin;
 	font-weight: normal;
 	font-style: normal;
 	font-size: 15px;
@@ -61,7 +61,7 @@ body.window
 div#title-bar
 {
 	position: absolute;
-	top: -43px;
+	top: -40px;
 }
 
 div#title-bar span
@@ -71,10 +71,10 @@ div#title-bar span
 	padding-top: 17px;
 	padding-bottom: 48px;
 
-	font-size: 22px;
+	font-size: 20px;
 	font-weight: bold;
 
-	font-effect: shadow(2px 2px black);
+	font-effect: glow(2px 2px 0px 1px #1117);
 	
 	decorator: tiled-horizontal( title-bar-l, title-bar-c, title-bar-r );
 }

Samples/tutorial/datagrid_tree/data/tutorial.rcss

@@ -1,6 +1,6 @@
 @spritesheet theme 
 {
-	src: ../../../assets/invader.tga;
+	src: /assets/invader.tga;
 
 	title-bar-l: 147px 0px 82px 85px;
 	title-bar-c: 229px 0px  1px 85px;
@@ -41,7 +41,7 @@
 
 body
 {
-	font-family: Delicious;
+	font-family: LatoLatin;
 	font-weight: normal;
 	font-style: normal;
 	font-size: 15px;
@@ -61,7 +61,7 @@ body.window
 div#title-bar
 {
 	position: absolute;
-	top: -43px;
+	top: -40px;
 }
 
 div#title-bar span
@@ -71,10 +71,10 @@ div#title-bar span
 	padding-top: 17px;
 	padding-bottom: 48px;
 
-	font-size: 22px;
+	font-size: 20px;
 	font-weight: bold;
 
-	font-effect: shadow(2px 2px black);
+	font-effect: glow(2px 2px 0px 1px #1117);
 	
 	decorator: tiled-horizontal( title-bar-l, title-bar-c, title-bar-r );
 }

Samples/tutorial/drag/data/tutorial.rcss

@@ -16,7 +16,7 @@ icon
     padding: 60px 10px 0px 10px;
     margin: 10px;
     
-    decorator: image( ../../../assets/present.tga );
+    decorator: image( /assets/present.tga );
     
     font-size: 12px;
     text-align: center;

Samples/tutorial/template/data/tutorial.rcss

@@ -1,6 +1,6 @@
 @spritesheet theme 
 {
-	src: ../../../assets/invader.tga;
+	src: /assets/invader.tga;
 
 	window-tl: 0px 0px 133px 140px;
 	window-t:  134px 0px 1px 140px;
@@ -15,7 +15,7 @@
 
 body
 {
-	font-family: Delicious;
+	font-family: LatoLatin;
 	font-weight: normal;
 	font-style: normal;
 	font-size: 15px;

Tests/Data/description.rml

@@ -4,9 +4,6 @@
 <link type="text/rcss" href="style.rcss"/>
 <style>
 	body {
-		font-family: Delicious;
-		font-weight: normal;
-		font-style: normal;
 		font-size: 17px;
 		color: #444;
 		position: absolute;

Tests/Data/style.rcss

@@ -20,7 +20,7 @@ input.radio {
 }
 
 body {
-	font-family: Delicious;
+	font-family: LatoLatin;
 	font-weight: normal;
 	font-style: normal;
 	font-size: 14px;