aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Ogorodnik <Simon.Ogorodnik@jetbrains.com>2016-11-01 17:56:17 +0300
committerSimon Ogorodnik <Simon.Ogorodnik@jetbrains.com>2016-11-01 19:11:13 +0300
commitb10acb958c5f6eae54c7bea6cfa0d263bbcce55d (patch)
tree78c9bda2f697ba85f9bba34d7a4d797ddb422f44
parent5daeb3e01c5f2975c1663b79ca80a037f3f335b0 (diff)
downloaddokka-b10acb958c5f6eae54c7bea6cfa0d263bbcce55d.tar.gz
dokka-b10acb958c5f6eae54c7bea6cfa0d263bbcce55d.tar.bz2
dokka-b10acb958c5f6eae54c7bea6cfa0d263bbcce55d.zip
Fix for GH#94 : meta charset for Html format
Diffstat
-rw-r--r--core/src/main/kotlin/Formats/HtmlTemplateService.kt1
-rw-r--r--core/testdata/format/bracket.html1
-rw-r--r--core/testdata/format/brokenLink.html1
-rw-r--r--core/testdata/format/classWithCompanionObject.html1
-rw-r--r--core/testdata/format/codeSpan.html1
-rw-r--r--core/testdata/format/crossLanguage/kotlinExtendsJava/Bar.html1
-rw-r--r--core/testdata/format/deprecated.class.html1
-rw-r--r--core/testdata/format/deprecated.package.html1
-rw-r--r--core/testdata/format/entity.html1
-rw-r--r--core/testdata/format/htmlEscaping.html1
-rw-r--r--core/testdata/format/javaDeprecated.html1
-rw-r--r--core/testdata/format/javaLinkTag.html1
-rw-r--r--core/testdata/format/javaLinkTagWithLabel.html1
-rw-r--r--core/testdata/format/javaSeeTag.html1
-rw-r--r--core/testdata/format/javaSupertype.html1
-rw-r--r--core/testdata/format/linkWithLabel.html1
-rw-r--r--core/testdata/format/linkWithStarProjection.html1
-rw-r--r--core/testdata/format/markdownInLinks.html1
-rw-r--r--core/testdata/format/orderedList.html1
-rw-r--r--core/testdata/format/overloads.html1
-rw-r--r--core/testdata/format/overloadsWithDescription.html1
-rw-r--r--core/testdata/format/overloadsWithDifferentDescriptions.html1
-rw-r--r--core/testdata/format/parameterAnchor.html1
-rw-r--r--core/testdata/format/parenthesis.html1
-rw-r--r--core/testdata/format/returnWithLink.html1
-rw-r--r--core/testdata/format/see.html1
-rw-r--r--core/testdata/format/tripleBackticks.html1
-rw-r--r--core/testdata/format/typeLink.html1
-rw-r--r--core/testdata/format/uninterpretedEmphasisCharacters.html1
29 files changed, 29 insertions, 0 deletions
diff --git a/core/src/main/kotlin/Formats/HtmlTemplateService.kt b/core/src/main/kotlin/Formats/HtmlTemplateService.kt
index 7efb94a1..010bc702 100644
--- a/core/src/main/kotlin/Formats/HtmlTemplateService.kt
+++ b/core/src/main/kotlin/Formats/HtmlTemplateService.kt
@@ -19,6 +19,7 @@ interface HtmlTemplateService {
override fun appendHeader(to: StringBuilder, title: String?, basePath: Path) {
to.appendln("<HTML>")
to.appendln("<HEAD>")
+ to.appendln("<meta charset=\"UTF-8\">")
if (title != null) {
to.appendln("<title>$title</title>")
}
diff --git a/core/testdata/format/bracket.html b/core/testdata/format/bracket.html
index 8f4310c3..a76ff885 100644
--- a/core/testdata/format/bracket.html
+++ b/core/testdata/format/bracket.html
@@ -1,5 +1,6 @@
<HTML>
<HEAD>
+<meta charset="UTF-8">
<title>foo - test</title>
</HEAD>
<BODY>
diff --git a/core/testdata/format/brokenLink.html b/core/testdata/format/brokenLink.html
index 8803781a..d1b8ccb0 100644
--- a/core/testdata/format/brokenLink.html
+++ b/core/testdata/format/brokenLink.html
@@ -1,5 +1,6 @@
<HTML>
<HEAD>
+<meta charset="UTF-8">
<title>f - test</title>
</HEAD>
<BODY>
diff --git a/core/testdata/format/classWithCompanionObject.html b/core/testdata/format/classWithCompanionObject.html
index 376bae9b..4a9d143a 100644
--- a/core/testdata/format/classWithCompanionObject.html
+++ b/core/testdata/format/classWithCompanionObject.html
@@ -1,5 +1,6 @@
<HTML>
<HEAD>
+<meta charset="UTF-8">
<title>Klass - test</title>
</HEAD>
<BODY>
diff --git a/core/testdata/format/codeSpan.html b/core/testdata/format/codeSpan.html
index f28e6957..33cbdba3 100644
--- a/core/testdata/format/codeSpan.html
+++ b/core/testdata/format/codeSpan.html
@@ -1,5 +1,6 @@
<HTML>
<HEAD>
+<meta charset="UTF-8">
<title>foo - test</title>
</HEAD>
<BODY>
diff --git a/core/testdata/format/crossLanguage/kotlinExtendsJava/Bar.html b/core/testdata/format/crossLanguage/kotlinExtendsJava/Bar.html
index ca0725a0..3cf9be00 100644
--- a/core/testdata/format/crossLanguage/kotlinExtendsJava/Bar.html
+++ b/core/testdata/format/crossLanguage/kotlinExtendsJava/Bar.html
@@ -1,5 +1,6 @@
<HTML>
<HEAD>
+<meta charset="UTF-8">
<title>Bar - test</title>
</HEAD>
<BODY>
diff --git a/core/testdata/format/deprecated.class.html b/core/testdata/format/deprecated.class.html
index 4d998c69..66eb9ff1 100644
--- a/core/testdata/format/deprecated.class.html
+++ b/core/testdata/format/deprecated.class.html
@@ -1,5 +1,6 @@
<HTML>
<HEAD>
+<meta charset="UTF-8">
</HEAD>
<BODY>
<a href="test/index">test</a>&nbsp;/&nbsp;<a href="test/-c/index">C</a><br/>
diff --git a/core/testdata/format/deprecated.package.html b/core/testdata/format/deprecated.package.html
index f12cb81e..739a84db 100644
--- a/core/testdata/format/deprecated.package.html
+++ b/core/testdata/format/deprecated.package.html
@@ -1,5 +1,6 @@
<HTML>
<HEAD>
+<meta charset="UTF-8">
<title>root package - test</title>
</HEAD>
<BODY>
diff --git a/core/testdata/format/entity.html b/core/testdata/format/entity.html
index db6f833f..fe787a99 100644
--- a/core/testdata/format/entity.html
+++ b/core/testdata/format/entity.html
@@ -1,5 +1,6 @@
<HTML>
<HEAD>
+<meta charset="UTF-8">
<title>Bar - test</title>
</HEAD>
<BODY>
diff --git a/core/testdata/format/htmlEscaping.html b/core/testdata/format/htmlEscaping.html
index 7ddcec8e..fd9a3235 100644
--- a/core/testdata/format/htmlEscaping.html
+++ b/core/testdata/format/htmlEscaping.html
@@ -1,5 +1,6 @@
<HTML>
<HEAD>
+<meta charset="UTF-8">
<title>x - test</title>
</HEAD>
<BODY>
diff --git a/core/testdata/format/javaDeprecated.html b/core/testdata/format/javaDeprecated.html
index 619a3d5a..67c5fd8f 100644
--- a/core/testdata/format/javaDeprecated.html
+++ b/core/testdata/format/javaDeprecated.html
@@ -1,5 +1,6 @@
<HTML>
<HEAD>
+<meta charset="UTF-8">
<title>Foo.foo - test</title>
</HEAD>
<BODY>
diff --git a/core/testdata/format/javaLinkTag.html b/core/testdata/format/javaLinkTag.html
index 20940cc2..62fb6299 100644
--- a/core/testdata/format/javaLinkTag.html
+++ b/core/testdata/format/javaLinkTag.html
@@ -1,5 +1,6 @@
<HTML>
<HEAD>
+<meta charset="UTF-8">
<title>Foo - test</title>
</HEAD>
<BODY>
diff --git a/core/testdata/format/javaLinkTagWithLabel.html b/core/testdata/format/javaLinkTagWithLabel.html
index 9194229a..61302f82 100644
--- a/core/testdata/format/javaLinkTagWithLabel.html
+++ b/core/testdata/format/javaLinkTagWithLabel.html
@@ -1,5 +1,6 @@
<HTML>
<HEAD>
+<meta charset="UTF-8">
<title>Foo - test</title>
</HEAD>
<BODY>
diff --git a/core/testdata/format/javaSeeTag.html b/core/testdata/format/javaSeeTag.html
index 607375fc..6044b60f 100644
--- a/core/testdata/format/javaSeeTag.html
+++ b/core/testdata/format/javaSeeTag.html
@@ -1,5 +1,6 @@
<HTML>
<HEAD>
+<meta charset="UTF-8">
<title>Foo - test</title>
</HEAD>
<BODY>
diff --git a/core/testdata/format/javaSupertype.html b/core/testdata/format/javaSupertype.html
index 421fe7a0..89003291 100644
--- a/core/testdata/format/javaSupertype.html
+++ b/core/testdata/format/javaSupertype.html
@@ -1,5 +1,6 @@
<HTML>
<HEAD>
+<meta charset="UTF-8">
<title>C.Bar - test</title>
</HEAD>
<BODY>
diff --git a/core/testdata/format/linkWithLabel.html b/core/testdata/format/linkWithLabel.html
index 8c7d228c..fbaecd2b 100644
--- a/core/testdata/format/linkWithLabel.html
+++ b/core/testdata/format/linkWithLabel.html
@@ -1,5 +1,6 @@
<HTML>
<HEAD>
+<meta charset="UTF-8">
<title>Bar - test</title>
</HEAD>
<BODY>
diff --git a/core/testdata/format/linkWithStarProjection.html b/core/testdata/format/linkWithStarProjection.html
index c810f3f4..3e4e884b 100644
--- a/core/testdata/format/linkWithStarProjection.html
+++ b/core/testdata/format/linkWithStarProjection.html
@@ -1,5 +1,6 @@
<HTML>
<HEAD>
+<meta charset="UTF-8">
<title>KClassLoader - test</title>
</HEAD>
<BODY>
diff --git a/core/testdata/format/markdownInLinks.html b/core/testdata/format/markdownInLinks.html
index 46c2944a..9571f60f 100644
--- a/core/testdata/format/markdownInLinks.html
+++ b/core/testdata/format/markdownInLinks.html
@@ -1,5 +1,6 @@
<HTML>
<HEAD>
+<meta charset="UTF-8">
<title>foo - test</title>
</HEAD>
<BODY>
diff --git a/core/testdata/format/orderedList.html b/core/testdata/format/orderedList.html
index 518fbf5a..fa24e080 100644
--- a/core/testdata/format/orderedList.html
+++ b/core/testdata/format/orderedList.html
@@ -1,5 +1,6 @@
<HTML>
<HEAD>
+<meta charset="UTF-8">
<title>Bar - test</title>
</HEAD>
<BODY>
diff --git a/core/testdata/format/overloads.html b/core/testdata/format/overloads.html
index ae50668a..5e9bdbd3 100644
--- a/core/testdata/format/overloads.html
+++ b/core/testdata/format/overloads.html
@@ -1,5 +1,6 @@
<HTML>
<HEAD>
+<meta charset="UTF-8">
<title>root package - test</title>
</HEAD>
<BODY>
diff --git a/core/testdata/format/overloadsWithDescription.html b/core/testdata/format/overloadsWithDescription.html
index aacdebfd..09b92e66 100644
--- a/core/testdata/format/overloadsWithDescription.html
+++ b/core/testdata/format/overloadsWithDescription.html
@@ -1,5 +1,6 @@
<HTML>
<HEAD>
+<meta charset="UTF-8">
<title>f - test</title>
</HEAD>
<BODY>
diff --git a/core/testdata/format/overloadsWithDifferentDescriptions.html b/core/testdata/format/overloadsWithDifferentDescriptions.html
index 83849f23..4d621d33 100644
--- a/core/testdata/format/overloadsWithDifferentDescriptions.html
+++ b/core/testdata/format/overloadsWithDifferentDescriptions.html
@@ -1,5 +1,6 @@
<HTML>
<HEAD>
+<meta charset="UTF-8">
<title>f - test</title>
</HEAD>
<BODY>
diff --git a/core/testdata/format/parameterAnchor.html b/core/testdata/format/parameterAnchor.html
index 5a51e171..15532a6d 100644
--- a/core/testdata/format/parameterAnchor.html
+++ b/core/testdata/format/parameterAnchor.html
@@ -1,5 +1,6 @@
<HTML>
<HEAD>
+<meta charset="UTF-8">
<title>processFiles - test</title>
</HEAD>
<BODY>
diff --git a/core/testdata/format/parenthesis.html b/core/testdata/format/parenthesis.html
index 65272af2..6f3c1d6b 100644
--- a/core/testdata/format/parenthesis.html
+++ b/core/testdata/format/parenthesis.html
@@ -1,5 +1,6 @@
<HTML>
<HEAD>
+<meta charset="UTF-8">
<title>foo - test</title>
</HEAD>
<BODY>
diff --git a/core/testdata/format/returnWithLink.html b/core/testdata/format/returnWithLink.html
index 7a52391b..f6e918dd 100644
--- a/core/testdata/format/returnWithLink.html
+++ b/core/testdata/format/returnWithLink.html
@@ -1,5 +1,6 @@
<HTML>
<HEAD>
+<meta charset="UTF-8">
<title>foo - test</title>
</HEAD>
<BODY>
diff --git a/core/testdata/format/see.html b/core/testdata/format/see.html
index d9d1df13..d350d6b7 100644
--- a/core/testdata/format/see.html
+++ b/core/testdata/format/see.html
@@ -1,5 +1,6 @@
<HTML>
<HEAD>
+<meta charset="UTF-8">
</HEAD>
<BODY>
<a href="test/index">test</a>&nbsp;/&nbsp;<a href="test/quux">quux</a><br/>
diff --git a/core/testdata/format/tripleBackticks.html b/core/testdata/format/tripleBackticks.html
index 5b6c9fd3..5b3aef82 100644
--- a/core/testdata/format/tripleBackticks.html
+++ b/core/testdata/format/tripleBackticks.html
@@ -1,5 +1,6 @@
<HTML>
<HEAD>
+<meta charset="UTF-8">
<title>f - test</title>
</HEAD>
<BODY>
diff --git a/core/testdata/format/typeLink.html b/core/testdata/format/typeLink.html
index 68c7b487..ba42ef18 100644
--- a/core/testdata/format/typeLink.html
+++ b/core/testdata/format/typeLink.html
@@ -1,5 +1,6 @@
<HTML>
<HEAD>
+<meta charset="UTF-8">
<title>Bar - test</title>
</HEAD>
<BODY>
diff --git a/core/testdata/format/uninterpretedEmphasisCharacters.html b/core/testdata/format/uninterpretedEmphasisCharacters.html
index 62850fb0..32e57c04 100644
--- a/core/testdata/format/uninterpretedEmphasisCharacters.html
+++ b/core/testdata/format/uninterpretedEmphasisCharacters.html
@@ -1,5 +1,6 @@
<HTML>
<HEAD>
+<meta charset="UTF-8">
<title>foo - test</title>
</HEAD>
<BODY>
generated by cgit (git 2.46.0) at 2024-11-27 02:17:59 +0000