Merge ../birdfont-2.x

Changed files (2)

• modified libbirdfont/ExportTool.vala
• modified libbirdfont/Preview.vala

Diff

diff --git a/libbirdfont/ExportTool.vala b/libbirdfont/ExportTool.valaindex cad0eb8..e0a94ce 100644--- a/libbirdfont/ExportTool.vala+++ b/libbirdfont/ExportTool.vala@@ -441,10 +441,7 @@ os.put_string (  <div> 	<h3 class="big"></h3>-	<p class="big">-		<span class="capstosmallcaps">OTF</span> features, -		<span class="swashes">like swashes </span>-		<span class="alternates">alternates &amp; </span> small caps, can be added +	<p class="big">OTF features, like swashes alternates &amp; </span> small caps, can be added  		to the font.</span> 	</p> </div>diff --git a/libbirdfont/Preview.vala b/libbirdfont/Preview.valaindex d5b22c0..8a9dee4 100644--- a/libbirdfont/Preview.vala+++ b/libbirdfont/Preview.vala@@ -155,6 +155,7 @@ public class Preview : FontDisplay { 			warning (e.message); 			warning ("Failed to load html into canvas."); 		}+		 		return sb.str; 	}