From: Florian Brosch <flo.brosch@gmail.com>
Date: Sat, 23 Aug 2014 05:57:02 +0000 (+0200)
Subject: html: add <meta charset="UTF-8"/>
X-Git-Tag: 0.37.1~3^2~53
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=aa0fa2da0f5e0b1ab6ace926866342b803504941;p=thirdparty%2Fvala.git

html: add <meta charset="UTF-8"/>
---

diff --git a/src/libvaladoc/html/basicdoclet.vala b/src/libvaladoc/html/basicdoclet.vala
index e048f7392..7247f2b52 100644
--- a/src/libvaladoc/html/basicdoclet.vala
+++ b/src/libvaladoc/html/basicdoclet.vala
@@ -1101,6 +1101,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
 	protected void write_file_header (string css, string js, string? title) {
 		writer.start_tag ("html");
 		writer.start_tag ("head");
+		writer.simple_tag ("meta", {"charset", "UTF-8"});
 		if (title == null) {
 			writer.start_tag ("title")
 				.text ("Vala Binding Reference")
diff --git a/src/libvaladoc/html/htmlmarkupwriter.vala b/src/libvaladoc/html/htmlmarkupwriter.vala
index 3a6b4b2e9..3c2f0cfb8 100644
--- a/src/libvaladoc/html/htmlmarkupwriter.vala
+++ b/src/libvaladoc/html/htmlmarkupwriter.vala
@@ -88,6 +88,7 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter {
 		return name != "html"
 			&& name != "head"
 			&& name != "title"
+			&& name != "meta"
 			&& name != "link"
 			&& name != "body"
 			&& name != "div"
@@ -109,6 +110,7 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter {
 
 	protected override bool content_inline_element (string name) {
 		return name == "title"
+			|| name == "meta"
 			|| name == "p"
 			|| name == "a"
 			|| name == "h1"